Added New Glow for the Combination of items, changed the position of gardener dialogue, changed position of the balls, changed soundbird cameraswitcher, changed hammerbird lurespot sprite order.

2025-11-03 11:43:05 +01:00
parent 011901eb8f
commit eb63086466
7 changed files with 208 additions and 130 deletions
--- a/Assets/Art/Sprites/Spritesheets/Quarry/LuringSpots/LuringspotC.png.meta
+++ b/Assets/Art/Sprites/Spritesheets/Quarry/LuringSpots/LuringspotC.png.meta
@@ -134,7 +134,7 @@ TextureImporter:
        width: 2463
        height: 1368
      alignment: 9
-      pivot: {x: 0.48564804, y: 0.6863182}
+      pivot: {x: 0.5, y: 0.91438836}
      border: {x: 0, y: 0, z: 0, w: 0}
      customData: 
      outline: []
--- a/Assets/Art/Sprites/UI/AlertExtra.png
+++ b/Assets/Art/Sprites/UI/AlertExtra.png
--- a/Assets/Art/Sprites/UI/BackgroundCombGlow.png
+++ b/Assets/Art/Sprites/UI/BackgroundCombGlow.png
--- a/Assets/Art/Sprites/UI/BackgroundCombGlow.png.meta
+++ b/Assets/Art/Sprites/UI/BackgroundCombGlow.png.meta
@@ -0,0 +1,156 @@
+fileFormatVersion: 2
+guid: 34bd87b3ddf2a094c8b6e4700837321b
+TextureImporter:
+  internalIDToNameTable:
+  - first:
+      213: -8520225520565161345
+    second: BackgroundCombGlow_0
+  externalObjects: {}
+  serializedVersion: 13
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+    flipGreenChannel: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 2
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 4
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 4
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 4
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites:
+    - serializedVersion: 2
+      name: BackgroundCombGlow_0
+      rect:
+        serializedVersion: 2
+        x: 135
+        y: 40
+        width: 939
+        height: 910
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      customData: 
+      outline: []
+      physicsShape: []
+      tessellationDetail: -1
+      bones: []
+      spriteID: f72fe78f70412c980800000000000000
+      internalID: -8520225520565161345
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    outline: []
+    customData: 
+    physicsShape: []
+    bones: []
+    spriteID: 
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    spriteCustomMetadata:
+      entries: []
+    nameFileIdTable:
+      BackgroundCombGlow_0: -8520225520565161345
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Art/Sprites/UI/BackgroundGlow.png
+++ b/Assets/Art/Sprites/UI/BackgroundGlow.png
--- a/Assets/Art/Sprites/UI/BunflersHint.png
+++ b/Assets/Art/Sprites/UI/BunflersHint.png
--- a/Assets/Scenes/Levels/Quarry.unity
+++ b/Assets/Scenes/Levels/Quarry.unity
@@ -4179,15 +4179,15 @@ PolygonCollider2D:
  m_AutoTiling: 0
  m_Points:
    m_Paths:
-    - - {x: 18.206917, y: -3.2164154}
-      - {x: 15.989956, y: 7.754614}
-      - {x: 5.7938147, y: 12.7522545}
-      - {x: -5.3158455, y: 12.050785}
-      - {x: -13.387878, y: 3.8281536}
-      - {x: -13.1246395, y: -5.2735977}
-      - {x: -2.7819796, y: -6.329212}
-      - {x: 7.729368, y: -6.7437744}
-      - {x: 15.2197, y: -6.076187}
+    - - {x: 19.89507, y: -0.24526215}
+      - {x: 18.015743, y: 9.982977}
+      - {x: 7.6845465, y: 12.7522545}
+      - {x: -15.512295, y: 13.40131}
+      - {x: -45.732895, y: 10.378187}
+      - {x: -45.73976, y: -26.274223}
+      - {x: -17.975353, y: -33.33966}
+      - {x: 20.694387, y: -26.326347}
+      - {x: 19.94653, y: -11.07312}
  m_UseDelaunayMesh: 0
 --- !u!4 &217207255
 Transform:
@@ -437709,119 +437709,6 @@ Transform:
  m_CorrespondingSourceObject: {fileID: 9067462609398217044, guid: 6cbcaf4eb20e63e4fb462f6fb1ada3a7, type: 3}
  m_PrefabInstance: {fileID: 514383803}
  m_PrefabAsset: {fileID: 0}
--- !u!1 &515824553
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 515824556}
-  - component: {fileID: 515824555}
-  - component: {fileID: 515824554}
-  m_Layer: 0
-  m_Name: ThoughtBubbleExample
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 0
--- !u!212 &515824554
-SpriteRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 515824553}
-  m_Enabled: 1
-  m_CastShadows: 0
-  m_ReceiveShadows: 0
-  m_DynamicOccludee: 1
-  m_StaticShadowCaster: 0
-  m_MotionVectors: 1
-  m_LightProbeUsage: 1
-  m_ReflectionProbeUsage: 1
-  m_RayTracingMode: 0
-  m_RayTraceProcedural: 0
-  m_RayTracingAccelStructBuildFlagsOverride: 0
-  m_RayTracingAccelStructBuildFlags: 1
-  m_SmallMeshCulling: 1
-  m_ForceMeshLod: -1
-  m_MeshLodSelectionBias: 0
-  m_RenderingLayerMask: 1
-  m_RendererPriority: 0
-  m_Materials:
-  - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2}
-  m_StaticBatchInfo:
-    firstSubMesh: 0
-    subMeshCount: 0
-  m_StaticBatchRoot: {fileID: 0}
-  m_ProbeAnchor: {fileID: 0}
-  m_LightProbeVolumeOverride: {fileID: 0}
-  m_ScaleInLightmap: 1
-  m_ReceiveGI: 1
-  m_PreserveUVs: 0
-  m_IgnoreNormalsForChartDetection: 0
-  m_ImportantGI: 0
-  m_StitchLightmapSeams: 1
-  m_SelectedEditorRenderState: 0
-  m_MinimumChartSize: 4
-  m_AutoUVMaxDistance: 0.5
-  m_AutoUVMaxAngle: 89
-  m_LightmapParameters: {fileID: 0}
-  m_GlobalIlluminationMeshLod: 0
-  m_SortingLayerID: -1132846201
-  m_SortingLayer: 1
-  m_SortingOrder: 5
-  m_Sprite: {fileID: -5183369656504278108, guid: c42378f5c592d2e419febb47325d501f, type: 3}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_FlipX: 0
-  m_FlipY: 0
-  m_DrawMode: 0
-  m_Size: {x: 5.75, y: 4.75}
-  m_AdaptiveModeThreshold: 0.5
-  m_SpriteTileMode: 0
-  m_WasSpriteAssigned: 1
-  m_MaskInteraction: 0
-  m_SpriteSortPoint: 0
--- !u!95 &515824555
-Animator:
-  serializedVersion: 7
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 515824553}
-  m_Enabled: 1
-  m_Avatar: {fileID: 0}
-  m_Controller: {fileID: 9100000, guid: 4e0f7b1ec0f2a1140bbf9539024ace40, type: 2}
-  m_CullingMode: 0
-  m_UpdateMode: 0
-  m_ApplyRootMotion: 0
-  m_LinearVelocityBlending: 0
-  m_StabilizeFeet: 0
-  m_AnimatePhysics: 0
-  m_WarningMessage: 
-  m_HasTransformHierarchy: 1
-  m_AllowConstantClipSamplingOptimization: 1
-  m_KeepAnimatorStateOnDisable: 0
-  m_WriteDefaultValuesOnDisable: 0
--- !u!4 &515824556
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 515824553}
-  serializedVersion: 2
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 68.95, y: 41.27, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 0}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &519077569
 GameObject:
  m_ObjectHideFlags: 0
@@ -442272,11 +442159,11 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 6638967295122936466, guid: f4ac8282240dd544e9a92e7635486fd1, type: 3}
      propertyPath: m_LocalPosition.x
-      value: 148.72
+      value: 146.63
      objectReference: {fileID: 0}
    - target: {fileID: 6638967295122936466, guid: f4ac8282240dd544e9a92e7635486fd1, type: 3}
      propertyPath: m_LocalPosition.y
-      value: -2.52
+      value: -5.78
      objectReference: {fileID: 0}
    - target: {fileID: 6638967295122936466, guid: f4ac8282240dd544e9a92e7635486fd1, type: 3}
      propertyPath: m_LocalPosition.z
@@ -448346,11 +448233,11 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 6638967295122936466, guid: f4ac8282240dd544e9a92e7635486fd1, type: 3}
      propertyPath: m_LocalPosition.x
-      value: 120.79
+      value: 131.46
      objectReference: {fileID: 0}
    - target: {fileID: 6638967295122936466, guid: f4ac8282240dd544e9a92e7635486fd1, type: 3}
      propertyPath: m_LocalPosition.y
-      value: -0.42
+      value: -4.66
      objectReference: {fileID: 0}
    - target: {fileID: 6638967295122936466, guid: f4ac8282240dd544e9a92e7635486fd1, type: 3}
      propertyPath: m_LocalPosition.z
@@ -449049,11 +448936,11 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 6638967295122936466, guid: f4ac8282240dd544e9a92e7635486fd1, type: 3}
      propertyPath: m_LocalPosition.x
-      value: 117.359985
+      value: 122.61
      objectReference: {fileID: 0}
    - target: {fileID: 6638967295122936466, guid: f4ac8282240dd544e9a92e7635486fd1, type: 3}
      propertyPath: m_LocalPosition.y
-      value: -8.030001
+      value: -4.63
      objectReference: {fileID: 0}
    - target: {fileID: 6638967295122936466, guid: f4ac8282240dd544e9a92e7635486fd1, type: 3}
      propertyPath: m_LocalPosition.z
@@ -449951,6 +449838,14 @@ PrefabInstance:
      propertyPath: defaultState
      value: 
      objectReference: {fileID: 917099765}
+    - target: {fileID: 5094947904662320956, guid: 4b7426bc1f8736749b68973653f4dbfb, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0.09
+      objectReference: {fileID: 0}
+    - target: {fileID: 5094947904662320956, guid: 4b7426bc1f8736749b68973653f4dbfb, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 3.44
+      objectReference: {fileID: 0}
    - target: {fileID: 5181221738455605092, guid: 4b7426bc1f8736749b68973653f4dbfb, type: 3}
      propertyPath: m_Camera
      value: 
@@ -449991,6 +449886,14 @@ PrefabInstance:
      propertyPath: m_AnchoredPosition.y
      value: 0
      objectReference: {fileID: 0}
+    - target: {fileID: 8361739881193827101, guid: 4b7426bc1f8736749b68973653f4dbfb, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 7.439999
+      objectReference: {fileID: 0}
+    - target: {fileID: 8361739881193827101, guid: 4b7426bc1f8736749b68973653f4dbfb, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 11.47
+      objectReference: {fileID: 0}
    - target: {fileID: 9074453772172382270, guid: 4b7426bc1f8736749b68973653f4dbfb, type: 3}
      propertyPath: chaseSpline
      value: 
@@ -454463,6 +454366,10 @@ PrefabInstance:
    serializedVersion: 3
    m_TransformParent: {fileID: 0}
    m_Modifications:
+    - target: {fileID: 2790478271624144664, guid: ae9b91dd59f66a348a8c888106aa0815, type: 3}
+      propertyPath: m_Sprite
+      value: 
+      objectReference: {fileID: -8520225520565161345, guid: 34bd87b3ddf2a094c8b6e4700837321b, type: 3}
    - target: {fileID: 3843529282689729675, guid: ae9b91dd59f66a348a8c888106aa0815, type: 3}
      propertyPath: m_LocalPosition.x
      value: -20.839
@@ -471303,6 +471210,10 @@ PrefabInstance:
      propertyPath: onCorrectItemSlotted.m_PersistentCalls.m_Calls.Array.data[1].m_Target
      value: 
      objectReference: {fileID: 2126981195}
+    - target: {fileID: 4669531401967178852, guid: 3346526f3046f424196615241a307104, type: 3}
+      propertyPath: m_Sprite
+      value: 
+      objectReference: {fileID: -8520225520565161345, guid: 34bd87b3ddf2a094c8b6e4700837321b, type: 3}
    - target: {fileID: 5835735262203788332, guid: 3346526f3046f424196615241a307104, type: 3}
      propertyPath: m_Name
      value: LureSpotB
@@ -471429,6 +471340,14 @@ PrefabInstance:
      propertyPath: onCorrectItemSlotted.m_PersistentCalls.m_Calls.Array.data[1].m_Target
      value: 
      objectReference: {fileID: 1516406291}
+    - target: {fileID: 1828079450404796388, guid: df01157608cce6447b7ccde0bfa290e1, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: -0.404
+      objectReference: {fileID: 0}
+    - target: {fileID: 1828079450404796388, guid: df01157608cce6447b7ccde0bfa290e1, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 2.725
+      objectReference: {fileID: 0}
    - target: {fileID: 6583016841553003224, guid: df01157608cce6447b7ccde0bfa290e1, type: 3}
      propertyPath: m_LocalPosition.x
      value: 7.37
@@ -471473,6 +471392,10 @@ PrefabInstance:
      propertyPath: m_Name
      value: LureSpotC
      objectReference: {fileID: 0}
+    - target: {fileID: 7964773102256504836, guid: df01157608cce6447b7ccde0bfa290e1, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 3.138
+      objectReference: {fileID: 0}
    m_RemovedComponents: []
    m_RemovedGameObjects: []
    m_AddedGameObjects: []
@@ -472408,5 +472331,4 @@ SceneRoots:
  - {fileID: 1794862441}
  - {fileID: 1374202465}
  - {fileID: 519077570}
-  - {fileID: 515824556}
  - {fileID: 708284666}