Part 1 update

Winter part 1 update finished - Build settings changed to be compatible, changed stacktrace and exception catching - Fixed various bugs - disabled status effects for time being
MoAzza98 · Dec 5, 2023 · fa8717d · fa8717d
1 parent 9460566
commit fa8717d
Show file tree

Hide file tree

Showing 19 changed files with 2,230 additions and 2,192 deletions.
diff --git a/ToyoWorld/Assets/Game/Map Area.prefab b/ToyoWorld/Assets/Game/Map Area.prefab
@@ -59,7 +59,7 @@ BoxCollider:
   m_IsTrigger: 1
   m_Enabled: 1
   serializedVersion: 2
-  m_Size: {x: 2, y: 2, z: 2}
+  m_Size: {x: 3.3230238, y: 1.3304148, z: 3.224678}
   m_Center: {x: 0, y: 0, z: 0}
 --- !u!114 &929499299132377464
 MonoBehaviour:
@@ -75,15 +75,15 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   wildToyos:
   - _base: {fileID: 11400000, guid: d31c6f72ff87779479154004af0c3be8, type: 2}
-    level: 5
+    level: 9
   - _base: {fileID: 11400000, guid: 367b69783d687164c8b3bd6e73c75f0d, type: 2}
-    level: 4
+    level: 7
   - _base: {fileID: 11400000, guid: 66a117fce3f63c44aa83ceac320559b0, type: 2}
-    level: 5
+    level: 10
   - _base: {fileID: 11400000, guid: 8a0a3b15aa5c3d741a5b863fa90170a9, type: 2}
-    level: 5
+    level: 11
   - _base: {fileID: 11400000, guid: 3b62de8f0c738a5449b76631eacfa326, type: 2}
-    level: 7
+    level: 14
 --- !u!114 &929499299132377467
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -101,4 +101,4 @@ MonoBehaviour:
   wildToyo:
     _base: {fileID: 0}
     level: 0
-  mapArea: {fileID: 0}
+  mapArea: {fileID: 929499299132377464}
diff --git a/ToyoWorld/Assets/Game/Resources/Moves/Dark Doctrine.asset b/ToyoWorld/Assets/Game/Resources/Moves/Dark Doctrine.asset
@@ -25,6 +25,8 @@ MonoBehaviour:
       boost: 2
     - stat: 2
       boost: 2
+    status: 0
+    volatileStatus: 0
   effectPrefab: {fileID: 2569992915501827505, guid: 50ef1cf6736038a4cbe05b1660091ff1, type: 3}
   _moveDestination: 0
   _moveTarget: 0
diff --git a/ToyoWorld/Assets/Game/Resources/Player.prefab b/ToyoWorld/Assets/Game/Resources/Player.prefab
@@ -3320,8 +3320,14 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   toyoParty:
+  - _base: {fileID: 11400000, guid: 3b62de8f0c738a5449b76631eacfa326, type: 2}
+    level: 16
+  - _base: {fileID: 11400000, guid: 8a0a3b15aa5c3d741a5b863fa90170a9, type: 2}
+    level: 12
   - _base: {fileID: 11400000, guid: 367b69783d687164c8b3bd6e73c75f0d, type: 2}
     level: 9
+  - _base: {fileID: 11400000, guid: 2d4468d8b44182f4097f9a6351a8081f, type: 2}
+    level: 11
 --- !u!114 &6693271465997393536
 MonoBehaviour:
   m_ObjectHideFlags: 0

diff --git a/ToyoWorld/Assets/Game/Resources/Toyos/Deathmaker.asset b/ToyoWorld/Assets/Game/Resources/Toyos/Deathmaker.asset
@@ -30,5 +30,5 @@ MonoBehaviour:
     level: 1
   - moveBase: {fileID: 11400000, guid: 967672abc5cbbec4c87505feaf23b910, type: 2}
     level: 1
-  - moveBase: {fileID: 11400000, guid: 1183d8e99be1a0d48895c323969fbf6a, type: 2}
+  - moveBase: {fileID: 11400000, guid: e900f1caf317c3147b1045636a153bcc, type: 2}
     level: 1
diff --git a/ToyoWorld/Assets/Game/Resources/Toyos/Faerela.asset b/ToyoWorld/Assets/Game/Resources/Toyos/Faerela.asset
@@ -30,5 +30,5 @@ MonoBehaviour:
     level: 0
   - moveBase: {fileID: 11400000, guid: b4a9dc05e1ffcdf42bd8148fcedea86d, type: 2}
     level: 0
-  - moveBase: {fileID: 11400000, guid: 652d5939b02809c4cb42c9d90e79144d, type: 2}
+  - moveBase: {fileID: 11400000, guid: 15ed93c3682b98741ada70a1b82ded91, type: 2}
     level: 0
diff --git a/ToyoWorld/Assets/Game/Resources/Toyos/Flipbit.asset b/ToyoWorld/Assets/Game/Resources/Toyos/Flipbit.asset
@@ -30,5 +30,5 @@ MonoBehaviour:
     level: 0
   - moveBase: {fileID: 11400000, guid: 967672abc5cbbec4c87505feaf23b910, type: 2}
     level: 0
-  - moveBase: {fileID: 11400000, guid: 81710407d7afb314abe7f618946976d3, type: 2}
+  - moveBase: {fileID: 11400000, guid: 967672abc5cbbec4c87505feaf23b910, type: 2}
     level: 0
diff --git a/ToyoWorld/Assets/Game/Resources/Toyos/Lordraga.asset b/ToyoWorld/Assets/Game/Resources/Toyos/Lordraga.asset
@@ -26,7 +26,7 @@ MonoBehaviour:
   learnableMoves:
   - moveBase: {fileID: 11400000, guid: 3d8b6b27d04085a47bdde80a3dc19f56, type: 2}
     level: 0
-  - moveBase: {fileID: 11400000, guid: 5d1d9721507b3894b89db77a66c62a16, type: 2}
+  - moveBase: {fileID: 11400000, guid: cf0ce3af0050901469020990f64a4be6, type: 2}
     level: 0
   - moveBase: {fileID: 11400000, guid: 277fd751075efec468d2685eb94368e7, type: 2}
     level: 0

diff --git a/ToyoWorld/Assets/Game/UI/UnitHUD.prefab b/ToyoWorld/Assets/Game/UI/UnitHUD.prefab
@@ -31,7 +31,7 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 5349878487658460437}
-  m_RootOrder: 3
+  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -107,7 +107,7 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 5349878487658460437}
-  m_RootOrder: 4
+  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -187,7 +187,7 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 5349878487658460437}
-  m_RootOrder: 0
+  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0.5}
   m_AnchorMax: {x: 0, y: 0.5}
@@ -425,7 +425,7 @@ RectTransform:
   - {fileID: 5349878486802994139}
   - {fileID: 5349878487012784058}
   m_Father: {fileID: 5349878487658460437}
-  m_RootOrder: 2
+  m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0.5}
   m_AnchorMax: {x: 1, y: 0.5}
@@ -719,11 +719,11 @@ RectTransform:
   m_LocalScale: {x: 1.3152839, y: 1.3152839, z: 1.3152839}
   m_ConstrainProportionsScale: 0
   m_Children:
+  - {fileID: 2775658904285106811}
+  - {fileID: 994119491885952773}
   - {fileID: 5349878486639180182}
   - {fileID: 5349878487883669659}
   - {fileID: 5349878486964744051}
-  - {fileID: 2775658904285106811}
-  - {fileID: 994119491885952773}
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -900,7 +900,7 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 5349878487658460437}
-  m_RootOrder: 1
+  m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 1}
   m_AnchorMax: {x: 1, y: 1}

diff --git a/ToyoWorld/Assets/Scenes/BossBattle.unity b/ToyoWorld/Assets/Scenes/BossBattle.unity
@@ -9863,7 +9863,7 @@ AudioSource:
   OutputAudioMixerGroup: {fileID: 0}
   m_audioClip: {fileID: 8300000, guid: 0cbcdc6904addad49b15e090f48296b0, type: 3}
   m_PlayOnAwake: 1
-  m_Volume: 0.15
+  m_Volume: 0.3
   m_Pitch: 1
   Loop: 1
   Mute: 0
@@ -9954,7 +9954,7 @@ MonoBehaviour:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1772491286}
-  m_Enabled: 0
+  m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 91433d2335f9bc64890f7e2360685845, type: 3}
   m_Name: