Merge branch 'main' of https://homelab.tailf7f81b.ts.net/tschesky/AppleHillsProduction

2025-12-16 21:39:50 +01:00
parent cf23e9ad38 4063e66362
commit 0ff3fbbc70
14 changed files with 280 additions and 89 deletions
--- a/Assets/Prefabs/Minigames/DivingForPictures/QuarryMonster.prefab
+++ b/Assets/Prefabs/Minigames/DivingForPictures/QuarryMonster.prefab
@@ -46,6 +46,7 @@ RectTransform:
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!212 &8447572436637192077
 SpriteRenderer:
+  serializedVersion: 2
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
@@ -91,6 +92,7 @@ SpriteRenderer:
  m_SortingLayerID: 0
  m_SortingLayer: 0
  m_SortingOrder: 2
+  m_MaskInteraction: 0
  m_Sprite: {fileID: -9125130289615156199, guid: 1021fffcba2a03d40ae5371555089a22, type: 3}
  m_Color: {r: 1, g: 1, b: 1, a: 1}
  m_FlipX: 0
@@ -100,7 +102,6 @@ SpriteRenderer:
  m_AdaptiveModeThreshold: 0.5
  m_SpriteTileMode: 0
  m_WasSpriteAssigned: 1
-  m_MaskInteraction: 0
  m_SpriteSortPoint: 0
 --- !u!58 &4998672042618199381
 CircleCollider2D:
@@ -151,6 +152,7 @@ MonoBehaviour:
  m_Name: 
  m_EditorClassIdentifier: 
  detectionCollider: {fileID: 4998672042618199381}
+  proximityIndicator: {fileID: 5329236367077024222}
  monsterClips:
  - {fileID: 8300000, guid: 30abed376d8a6914191b1bf3fcf60ad4, type: 3}
  - {fileID: 8300000, guid: d8af9afe04d49fe45aa8b92d26a8bb9e, type: 3}
@@ -158,7 +160,6 @@ MonoBehaviour:
  - {fileID: 8300000, guid: 6ff3fbda41c71d941aec69b7056b8341, type: 3}
  - {fileID: 8300000, guid: 3d0c4641496e430449ec0538f89cac29, type: 3}
  - {fileID: 8300000, guid: 1bfc562c713739c408d220a9de9a5240, type: 3}
-  playerAudioSource: {fileID: 0}
  monsterSpottedAudio: {fileID: 6418180475301049370, guid: 552945b348ea52749a29b5e327b8eab1, type: 2}
 --- !u!222 &8725474797166928194
 CanvasRenderer:
@@ -348,6 +349,7 @@ Transform:
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!212 &229656908633211390
 SpriteRenderer:
+  serializedVersion: 2
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
@@ -393,6 +395,7 @@ SpriteRenderer:
  m_SortingLayerID: 0
  m_SortingLayer: 0
  m_SortingOrder: 0
+  m_MaskInteraction: 0
  m_Sprite: {fileID: 7400855017442887979, guid: 5b93832cb7470ca4586e9ee5640b2c25, type: 3}
  m_Color: {r: 1, g: 1, b: 1, a: 1}
  m_FlipX: 0
@@ -402,7 +405,6 @@ SpriteRenderer:
  m_AdaptiveModeThreshold: 0.5
  m_SpriteTileMode: 0
  m_WasSpriteAssigned: 1
-  m_MaskInteraction: 0
  m_SpriteSortPoint: 0
 --- !u!1 &5329236367077024222
 GameObject:
@@ -451,6 +453,7 @@ CanvasRenderer:
  m_CullTransparentMesh: 1
 --- !u!212 &1007575356016584257
 SpriteRenderer:
+  serializedVersion: 2
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
@@ -496,6 +499,7 @@ SpriteRenderer:
  m_SortingLayerID: 0
  m_SortingLayer: 0
  m_SortingOrder: 0
+  m_MaskInteraction: 0
  m_Sprite: {fileID: -1042073035024568290, guid: 0bbb26ed6c3670b4293fca36266cacd6, type: 3}
  m_Color: {r: 1, g: 1, b: 1, a: 1}
  m_FlipX: 0
@@ -505,7 +509,6 @@ SpriteRenderer:
  m_AdaptiveModeThreshold: 0.5
  m_SpriteTileMode: 0
  m_WasSpriteAssigned: 1
-  m_MaskInteraction: 0
  m_SpriteSortPoint: 0
 --- !u!1 &5413791071529450429
 GameObject:
@@ -541,6 +544,7 @@ Transform:
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!212 &6069960697164849265
 SpriteRenderer:
+  serializedVersion: 2
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
@@ -586,6 +590,7 @@ SpriteRenderer:
  m_SortingLayerID: 0
  m_SortingLayer: 0
  m_SortingOrder: 3
+  m_MaskInteraction: 0
  m_Sprite: {fileID: -6961586202046793095, guid: b7db73d33c7f1cb4bba316c12a0cc2fc, type: 3}
  m_Color: {r: 1, g: 1, b: 1, a: 1}
  m_FlipX: 0
@@ -595,5 +600,4 @@ SpriteRenderer:
  m_AdaptiveModeThreshold: 0.5
  m_SpriteTileMode: 0
  m_WasSpriteAssigned: 1
-  m_MaskInteraction: 0
  m_SpriteSortPoint: 0
--- a/Assets/Prefabs/Minigames/DivingForPictures/QuarryMonster_monster_head1_1.prefab
+++ b/Assets/Prefabs/Minigames/DivingForPictures/QuarryMonster_monster_head1_1.prefab
@@ -12,6 +12,10 @@ PrefabInstance:
      propertyPath: m_Name
      value: QuarryMonster_monster_head1_1
      objectReference: {fileID: 0}
+    - target: {fileID: 3714732064953161914, guid: 7754d064d743d1b419acb859c2db6121, type: 3}
+      propertyPath: proximityIndicator
+      value: 
+      objectReference: {fileID: 2600949834545141394}
    - target: {fileID: 6779310478082390115, guid: 7754d064d743d1b419acb859c2db6121, type: 3}
      propertyPath: m_LocalPosition.x
      value: 0
@@ -57,3 +61,8 @@ PrefabInstance:
    m_AddedGameObjects: []
    m_AddedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: 7754d064d743d1b419acb859c2db6121, type: 3}
+--- !u!1 &2600949834545141394 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 5329236367077024222, guid: 7754d064d743d1b419acb859c2db6121, type: 3}
+  m_PrefabInstance: {fileID: 7921038058497292108}
+  m_PrefabAsset: {fileID: 0}
--- a/Assets/Prefabs/Minigames/DivingForPictures/QuarryMonster_monster_head2_0.prefab
+++ b/Assets/Prefabs/Minigames/DivingForPictures/QuarryMonster_monster_head2_0.prefab
@@ -12,6 +12,10 @@ PrefabInstance:
      propertyPath: m_Name
      value: QuarryMonster_monster_head2_0
      objectReference: {fileID: 0}
+    - target: {fileID: 3714732064953161914, guid: 7754d064d743d1b419acb859c2db6121, type: 3}
+      propertyPath: proximityIndicator
+      value: 
+      objectReference: {fileID: 2683229114311619924}
    - target: {fileID: 5319963476921229849, guid: 7754d064d743d1b419acb859c2db6121, type: 3}
      propertyPath: m_Controller
      value: 
@@ -66,10 +70,15 @@ PrefabInstance:
      objectReference: {fileID: -7812277834941893986, guid: e9ac6c3e349f9b247a0ea03665da57ce, type: 3}
    - target: {fileID: 8447572436637192077, guid: 7754d064d743d1b419acb859c2db6121, type: 3}
      propertyPath: m_SortingLayer
-      value: 32709
+      value: 0
      objectReference: {fileID: 0}
    m_RemovedComponents: []
    m_RemovedGameObjects: []
    m_AddedGameObjects: []
    m_AddedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: 7754d064d743d1b419acb859c2db6121, type: 3}
+--- !u!1 &2683229114311619924 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 5329236367077024222, guid: 7754d064d743d1b419acb859c2db6121, type: 3}
+  m_PrefabInstance: {fileID: 7839076539202245770}
+  m_PrefabAsset: {fileID: 0}
--- a/Assets/Prefabs/Minigames/DivingForPictures/QuarryMonster_monster_head3_0.prefab
+++ b/Assets/Prefabs/Minigames/DivingForPictures/QuarryMonster_monster_head3_0.prefab
@@ -12,17 +12,21 @@ PrefabInstance:
      propertyPath: m_Name
      value: QuarryMonster_monster_head3_0
      objectReference: {fileID: 0}
+    - target: {fileID: 3714732064953161914, guid: 7754d064d743d1b419acb859c2db6121, type: 3}
+      propertyPath: proximityIndicator
+      value: 
+      objectReference: {fileID: 8570471056331183209}
    - target: {fileID: 5319963476921229849, guid: 7754d064d743d1b419acb859c2db6121, type: 3}
      propertyPath: m_Controller
      value: 
      objectReference: {fileID: 9100000, guid: 094c957fe60c6cf44931aa216570afd7, type: 2}
    - target: {fileID: 6779310478082390115, guid: 7754d064d743d1b419acb859c2db6121, type: 3}
      propertyPath: m_LocalPosition.x
-      value: 2.46
+      value: 0
      objectReference: {fileID: 0}
    - target: {fileID: 6779310478082390115, guid: 7754d064d743d1b419acb859c2db6121, type: 3}
      propertyPath: m_LocalPosition.y
-      value: -1.79
+      value: 0
      objectReference: {fileID: 0}
    - target: {fileID: 6779310478082390115, guid: 7754d064d743d1b419acb859c2db6121, type: 3}
      propertyPath: m_LocalPosition.z
@@ -65,3 +69,8 @@ PrefabInstance:
    m_AddedGameObjects: []
    m_AddedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: 7754d064d743d1b419acb859c2db6121, type: 3}
+--- !u!1 &8570471056331183209 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 5329236367077024222, guid: 7754d064d743d1b419acb859c2db6121, type: 3}
+  m_PrefabInstance: {fileID: 4541086625678702007}
+  m_PrefabAsset: {fileID: 0}
--- a/Assets/Prefabs/Minigames/DivingForPictures/QuarryMonster_monster_head4_0.prefab
+++ b/Assets/Prefabs/Minigames/DivingForPictures/QuarryMonster_monster_head4_0.prefab
@@ -12,17 +12,21 @@ PrefabInstance:
      propertyPath: m_Name
      value: QuarryMonster_monster_head4_0
      objectReference: {fileID: 0}
+    - target: {fileID: 3714732064953161914, guid: 7754d064d743d1b419acb859c2db6121, type: 3}
+      propertyPath: proximityIndicator
+      value: 
+      objectReference: {fileID: 6444740853843644247}
    - target: {fileID: 5319963476921229849, guid: 7754d064d743d1b419acb859c2db6121, type: 3}
      propertyPath: m_Controller
      value: 
      objectReference: {fileID: 9100000, guid: 7dfd9b960984c0341b20afa16b274f5c, type: 2}
    - target: {fileID: 6779310478082390115, guid: 7754d064d743d1b419acb859c2db6121, type: 3}
      propertyPath: m_LocalPosition.x
-      value: 2.46
+      value: 0
      objectReference: {fileID: 0}
    - target: {fileID: 6779310478082390115, guid: 7754d064d743d1b419acb859c2db6121, type: 3}
      propertyPath: m_LocalPosition.y
-      value: -1.79
+      value: 0
      objectReference: {fileID: 0}
    - target: {fileID: 6779310478082390115, guid: 7754d064d743d1b419acb859c2db6121, type: 3}
      propertyPath: m_LocalPosition.z
@@ -65,3 +69,8 @@ PrefabInstance:
    m_AddedGameObjects: []
    m_AddedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: 7754d064d743d1b419acb859c2db6121, type: 3}
+--- !u!1 &6444740853843644247 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 5329236367077024222, guid: 7754d064d743d1b419acb859c2db6121, type: 3}
+  m_PrefabInstance: {fileID: 1190377006705176201}
+  m_PrefabAsset: {fileID: 0}