fix: final

06025510 · Nigel Sahl · b0636e54 · 06025510
Commit 06025510 authored 1 year ago by Nigel Sahl
--- a/IF3210-2024-Unity-AFK/Assets/Level/Scenes/Main 2.unity
+++ b/IF3210-2024-Unity-AFK/Assets/Level/Scenes/Main 2.unity
@@ -3025,6 +3025,84 @@ Transform:
  m_CorrespondingSourceObject: {fileID: 4424112051086032, guid: ebd56a6d944d9a446986d0cb28d5338d, type: 3}
  m_PrefabInstance: {fileID: 449764974}
  m_PrefabAsset: {fileID: 0}
+--- !u!1001 &329931789
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 60253137160692316, guid: c98aeaa500ff50d48ac11ae3f232869a, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 15.03598
+      objectReference: {fileID: 0}
+    - target: {fileID: 60253137160692316, guid: c98aeaa500ff50d48ac11ae3f232869a, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 79.90636
+      objectReference: {fileID: 0}
+    - target: {fileID: 60253137160692316, guid: c98aeaa500ff50d48ac11ae3f232869a, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 1.55388
+      objectReference: {fileID: 0}
+    - target: {fileID: 60253137160692316, guid: c98aeaa500ff50d48ac11ae3f232869a, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 60253137160692316, guid: c98aeaa500ff50d48ac11ae3f232869a, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 60253137160692316, guid: c98aeaa500ff50d48ac11ae3f232869a, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 60253137160692316, guid: c98aeaa500ff50d48ac11ae3f232869a, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 60253137160692316, guid: c98aeaa500ff50d48ac11ae3f232869a, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 60253137160692316, guid: c98aeaa500ff50d48ac11ae3f232869a, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 60253137160692316, guid: c98aeaa500ff50d48ac11ae3f232869a, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 348045508547534544, guid: c98aeaa500ff50d48ac11ae3f232869a, type: 3}
+      propertyPath: MainPlayer
+      value: 
+      objectReference: {fileID: 803879370}
+    - target: {fileID: 348045508547534544, guid: c98aeaa500ff50d48ac11ae3f232869a, type: 3}
+      propertyPath: positionToOwner.Array.size
+      value: 2
+      objectReference: {fileID: 0}
+    - target: {fileID: 348045508547534544, guid: c98aeaa500ff50d48ac11ae3f232869a, type: 3}
+      propertyPath: positionToOwner.Array.data[0]
+      value: 
+      objectReference: {fileID: 329931791}
+    - target: {fileID: 348045508547534544, guid: c98aeaa500ff50d48ac11ae3f232869a, type: 3}
+      propertyPath: positionToOwner.Array.data[1]
+      value: 
+      objectReference: {fileID: 332599545}
+    - target: {fileID: 837070589710612710, guid: c98aeaa500ff50d48ac11ae3f232869a, type: 3}
+      propertyPath: m_Name
+      value: King
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: c98aeaa500ff50d48ac11ae3f232869a, type: 3}
+--- !u!1 &329931791 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 9201246382918732124, guid: c98aeaa500ff50d48ac11ae3f232869a, type: 3}
+  m_PrefabInstance: {fileID: 329931789}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1 &330974320 stripped
 GameObject:
  m_CorrespondingSourceObject: {fileID: 1151832108952812, guid: 6c33ac13022677c4bb7913d9d496a50e, type: 3}
@@ -3236,6 +3314,11 @@ PrefabInstance:
      insertIndex: -1
      addedObject: {fileID: 1804109466}
  m_SourcePrefab: {fileID: 100100000, guid: 0d2909c3862e975479d5eb092d70d279, type: 3}
+--- !u!1 &332599545 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 58360307679841736, guid: c98aeaa500ff50d48ac11ae3f232869a, type: 3}
+  m_PrefabInstance: {fileID: 329931789}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &345278042
 PrefabInstance:
  m_ObjectHideFlags: 0
@@ -8040,51 +8123,51 @@ PrefabInstance:
    serializedVersion: 3
    m_TransformParent: {fileID: 0}
    m_Modifications:
-    - target: {fileID: 100008, guid: 5ddee63852f56514dad5a9e1740480de, type: 3}
+    - target: {fileID: 100008, guid: 68f6db1b2fbfdfc489f82573e32a13d5, type: 3}
      propertyPath: m_Name
      value: OrbHeal
      objectReference: {fileID: 0}
-    - target: {fileID: 100008, guid: 5ddee63852f56514dad5a9e1740480de, type: 3}
+    - target: {fileID: 100008, guid: 68f6db1b2fbfdfc489f82573e32a13d5, type: 3}
      propertyPath: m_IsActive
      value: 0
      objectReference: {fileID: 0}
-    - target: {fileID: 400008, guid: 5ddee63852f56514dad5a9e1740480de, type: 3}
+    - target: {fileID: 400008, guid: 68f6db1b2fbfdfc489f82573e32a13d5, type: 3}
      propertyPath: m_LocalPosition.x
      value: 33.19978
      objectReference: {fileID: 0}
-    - target: {fileID: 400008, guid: 5ddee63852f56514dad5a9e1740480de, type: 3}
+    - target: {fileID: 400008, guid: 68f6db1b2fbfdfc489f82573e32a13d5, type: 3}
      propertyPath: m_LocalPosition.y
      value: -4.3997126
      objectReference: {fileID: 0}
-    - target: {fileID: 400008, guid: 5ddee63852f56514dad5a9e1740480de, type: 3}
+    - target: {fileID: 400008, guid: 68f6db1b2fbfdfc489f82573e32a13d5, type: 3}
      propertyPath: m_LocalPosition.z
      value: 49.32073
      objectReference: {fileID: 0}
-    - target: {fileID: 400008, guid: 5ddee63852f56514dad5a9e1740480de, type: 3}
+    - target: {fileID: 400008, guid: 68f6db1b2fbfdfc489f82573e32a13d5, type: 3}
      propertyPath: m_LocalRotation.w
      value: 1
      objectReference: {fileID: 0}
-    - target: {fileID: 400008, guid: 5ddee63852f56514dad5a9e1740480de, type: 3}
+    - target: {fileID: 400008, guid: 68f6db1b2fbfdfc489f82573e32a13d5, type: 3}
      propertyPath: m_LocalRotation.x
      value: 0
      objectReference: {fileID: 0}
-    - target: {fileID: 400008, guid: 5ddee63852f56514dad5a9e1740480de, type: 3}
+    - target: {fileID: 400008, guid: 68f6db1b2fbfdfc489f82573e32a13d5, type: 3}
      propertyPath: m_LocalRotation.y
      value: 0
      objectReference: {fileID: 0}
-    - target: {fileID: 400008, guid: 5ddee63852f56514dad5a9e1740480de, type: 3}
+    - target: {fileID: 400008, guid: 68f6db1b2fbfdfc489f82573e32a13d5, type: 3}
      propertyPath: m_LocalRotation.z
      value: 0
      objectReference: {fileID: 0}
-    - target: {fileID: 400008, guid: 5ddee63852f56514dad5a9e1740480de, type: 3}
+    - target: {fileID: 400008, guid: 68f6db1b2fbfdfc489f82573e32a13d5, type: 3}
      propertyPath: m_LocalEulerAnglesHint.x
      value: 0
      objectReference: {fileID: 0}
-    - target: {fileID: 400008, guid: 5ddee63852f56514dad5a9e1740480de, type: 3}
+    - target: {fileID: 400008, guid: 68f6db1b2fbfdfc489f82573e32a13d5, type: 3}
      propertyPath: m_LocalEulerAnglesHint.y
      value: 0
      objectReference: {fileID: 0}
-    - target: {fileID: 400008, guid: 5ddee63852f56514dad5a9e1740480de, type: 3}
+    - target: {fileID: 400008, guid: 68f6db1b2fbfdfc489f82573e32a13d5, type: 3}
      propertyPath: m_LocalEulerAnglesHint.z
      value: 0
      objectReference: {fileID: 0}
@@ -8092,16 +8175,15 @@ PrefabInstance:
      propertyPath: player
      value: 
      objectReference: {fileID: 803879370}
+    - target: {fileID: 3614688502589247029, guid: 68f6db1b2fbfdfc489f82573e32a13d5, type: 3}
+      propertyPath: player
+      value: 
+      objectReference: {fileID: 803879370}
    m_RemovedComponents: []
    m_RemovedGameObjects: []
    m_AddedGameObjects: []
    m_AddedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: 5ddee63852f56514dad5a9e1740480de, type: 3}
+  m_SourcePrefab: {fileID: 100100000, guid: 68f6db1b2fbfdfc489f82573e32a13d5, type: 3}
--- !u!1 &951915983 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 100008, guid: 5ddee63852f56514dad5a9e1740480de, type: 3}
-  m_PrefabInstance: {fileID: 951915982}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1 &963194225
 GameObject:
  m_ObjectHideFlags: 0
@@ -10984,10 +11066,18 @@ PrefabInstance:
      propertyPath: MainPlayer
      value: 
      objectReference: {fileID: 803879370}
+    - target: {fileID: 3657383671722862, guid: fe44ef7cfa14aeb4bafaab57bef8bcd7, type: 3}
+      propertyPath: spawnKerocoCooldown
+      value: 25
+      objectReference: {fileID: 0}
    - target: {fileID: 125898456715854681, guid: fe44ef7cfa14aeb4bafaab57bef8bcd7, type: 3}
      propertyPath: m_Name
      value: KepalaKeroco
      objectReference: {fileID: 0}
+    - target: {fileID: 125898456715854681, guid: fe44ef7cfa14aeb4bafaab57bef8bcd7, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
    - target: {fileID: 789422231072659939, guid: fe44ef7cfa14aeb4bafaab57bef8bcd7, type: 3}
      propertyPath: m_LocalPosition.x
      value: 9.28
@@ -14958,31 +15048,22 @@ PrefabInstance:
      value: 
      objectReference: {fileID: 803879370}
    - target: {fileID: 348045508547534544, guid: c98aeaa500ff50d48ac11ae3f232869a, type: 3}
-      propertyPath: playerWeapons.Array.data[0]
+      propertyPath: targetLayer.m_Bits
-      value: 
+      value: 8
-      objectReference: {fileID: 236008272}
+      objectReference: {fileID: 0}
-    - target: {fileID: 348045508547534544, guid: c98aeaa500ff50d48ac11ae3f232869a, type: 3}
-      propertyPath: playerWeapons.Array.data[1]
-      value: 
-      objectReference: {fileID: 705761236}
-    - target: {fileID: 348045508547534544, guid: c98aeaa500ff50d48ac11ae3f232869a, type: 3}
-      propertyPath: playerWeapons.Array.data[2]
-      value: 
-      objectReference: {fileID: 8450388614318271695}
    - target: {fileID: 837070589710612710, guid: c98aeaa500ff50d48ac11ae3f232869a, type: 3}
      propertyPath: m_Name
      value: King
      objectReference: {fileID: 0}
+    - target: {fileID: 837070589710612710, guid: c98aeaa500ff50d48ac11ae3f232869a, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
    m_RemovedComponents: []
    m_RemovedGameObjects: []
    m_AddedGameObjects: []
    m_AddedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: c98aeaa500ff50d48ac11ae3f232869a, type: 3}
--- !u!1 &1790942473 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 837070589710612710, guid: c98aeaa500ff50d48ac11ae3f232869a, type: 3}
-  m_PrefabInstance: {fileID: 1790942472}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &1800556984
 PrefabInstance:
  m_ObjectHideFlags: 0
@@ -16929,6 +17010,11 @@ Transform:
  m_CorrespondingSourceObject: {fileID: 1130455608505835520, guid: 4dd21ac6e33aa6146a7b7b0367332af1, type: 3}
  m_PrefabInstance: {fileID: 201340806}
  m_PrefabAsset: {fileID: 0}
+--- !u!1 &2091342201 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 837070589710612710, guid: c98aeaa500ff50d48ac11ae3f232869a, type: 3}
+  m_PrefabInstance: {fileID: 329931789}
+  m_PrefabAsset: {fileID: 0}
 --- !u!4 &2091533281 stripped
 Transform:
  m_CorrespondingSourceObject: {fileID: 5381386135662447605, guid: 21a364ddeffc797439f2a5721660b0e6, type: 3}
@@ -17664,6 +17750,10 @@ PrefabInstance:
      propertyPath: m_Name
      value: General
      objectReference: {fileID: 0}
+    - target: {fileID: 2392205708116502428, guid: 1019550c11621c349ba0ba1bcafb4a2c, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
    - target: {fileID: 3060480472799935782, guid: 1019550c11621c349ba0ba1bcafb4a2c, type: 3}
      propertyPath: m_LocalPosition.x
      value: 13.713942
@@ -17900,10 +17990,18 @@ PrefabInstance:
      propertyPath: m_Name
      value: Keroco
      objectReference: {fileID: 0}
+    - target: {fileID: 1030568321855449875, guid: 7464348af7ec1b04cb63ed8a62f74b87, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
    - target: {fileID: 2541506280352382561, guid: 7464348af7ec1b04cb63ed8a62f74b87, type: 3}
      propertyPath: MainPlayer
      value: 
      objectReference: {fileID: 803879370}
+    - target: {fileID: 2541506280352382561, guid: 7464348af7ec1b04cb63ed8a62f74b87, type: 3}
+      propertyPath: attackRange
+      value: 3
+      objectReference: {fileID: 0}
    - target: {fileID: 6362556716749362280, guid: 7464348af7ec1b04cb63ed8a62f74b87, type: 3}
      propertyPath: m_LocalPosition.x
      value: 19.58
@@ -18102,6 +18200,10 @@ PrefabInstance:
      propertyPath: m_Name
      value: BearIncrease
      objectReference: {fileID: 0}
+    - target: {fileID: 810414018641897104, guid: 9af55e16e07f7214daaebd1f64defd8d, type: 3}
+      propertyPath: m_TagString
+      value: Enemy
+      objectReference: {fileID: 0}
    - target: {fileID: 6017016057415308320, guid: 9af55e16e07f7214daaebd1f64defd8d, type: 3}
      propertyPath: m_LocalPosition.x
      value: 14.36
@@ -18315,7 +18417,7 @@ PrefabInstance:
    - target: {fileID: 2710870401587581456, guid: aa6f29a441791614eb4b0f78ec563f40, type: 3}
      propertyPath: orbs.Array.data[2]
      value: 
-      objectReference: {fileID: 951915983}
+      objectReference: {fileID: 0}
    - target: {fileID: 3777290212366644686, guid: aa6f29a441791614eb4b0f78ec563f40, type: 3}
      propertyPath: terrain
      value: 
@@ -18327,7 +18429,7 @@ PrefabInstance:
    - target: {fileID: 3777290212366644686, guid: aa6f29a441791614eb4b0f78ec563f40, type: 3}
      propertyPath: EnemyKingRef
      value: 
-      objectReference: {fileID: 1790942473}
+      objectReference: {fileID: 2091342201}
    - target: {fileID: 3777290212366644686, guid: aa6f29a441791614eb4b0f78ec563f40, type: 3}
      propertyPath: kingCountMax
      value: 0
@@ -18652,6 +18754,7 @@ SceneRoots:
  - {fileID: 936607851}
  - {fileID: 1970064229465066262}
  - {fileID: 7242710482768570079}
+  - {fileID: 329931789}
  - {fileID: 4950877034845451912}
  - {fileID: 697611184958665259}
  - {fileID: 1324482148}