nightly v1.8.0.0 (12/2)

ipodtouch0218 · Dec 3, 2023 · 8d5de4d · 8d5de4d
1 parent 83f1363
commit 8d5de4d
Show file tree

Hide file tree

Showing 21 changed files with 990 additions and 1,226 deletions.
diff --git a/Assets/Resources/Prefabs/Enemy/BlueKoopa.prefab b/Assets/Resources/Prefabs/Enemy/BlueKoopa.prefab
@@ -36,7 +36,7 @@ PrefabInstance:
     - target: {fileID: 2331939488413250953, guid: 8cf8f49ac0882ed44953ea53ff901f11,
         type: 3}
       propertyPath: NetworkedBehaviours.Array.size
-      value: 4
+      value: 3
       objectReference: {fileID: 0}
     - target: {fileID: 2331939488413250953, guid: 8cf8f49ac0882ed44953ea53ff901f11,
         type: 3}
@@ -58,11 +58,6 @@ PrefabInstance:
       propertyPath: NetworkedBehaviours.Array.data[2]
       value: 
       objectReference: {fileID: 3083286020391254374}
-    - target: {fileID: 2331939488413250953, guid: 8cf8f49ac0882ed44953ea53ff901f11,
-        type: 3}
-      propertyPath: NetworkedBehaviours.Array.data[3]
-      value: 
-      objectReference: {fileID: 5331423829766708029}
     - target: {fileID: 2331939488413250953, guid: 8cf8f49ac0882ed44953ea53ff901f11,
         type: 3}
       propertyPath: SimulationBehaviours.Array.data[0]
@@ -265,15 +260,3 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 7a384a75a1c0645459861c223ac33652, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
---- !u!114 &5331423829766708029 stripped
-MonoBehaviour:
-  m_CorrespondingSourceObject: {fileID: 3613858551789527266, guid: 8cf8f49ac0882ed44953ea53ff901f11,
-    type: 3}
-  m_PrefabInstance: {fileID: 8924450616560860127}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2074886471065804745}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 1039544458, guid: e725a070cec140c4caffb81624c8c787, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
diff --git a/Assets/Resources/Prefabs/Enemy/Bobomb.prefab b/Assets/Resources/Prefabs/Enemy/Bobomb.prefab
@@ -122,8 +122,6 @@ GameObject:
   - component: {fileID: -3689537593968581114}
   - component: {fileID: 1441508528031699944}
   - component: {fileID: 6128206130774469154}
-  - component: {fileID: 1819210150938506519}
-  - component: {fileID: 161037357079201089}
   m_Layer: 9
   m_Name: Bobomb
   m_TagString: Untagged
@@ -175,7 +173,7 @@ MonoBehaviour:
   collideWithOtherEnemies: 1
   dieWhenInsideBlock: 1
   flipSpriteRenderer: 1
-  fusionHitbox: {fileID: 161037357079201089}
+  fusionHitbox: {fileID: 0}
   hitbox: {fileID: 3286581577125373962}
   animator: {fileID: 8735478572021304808}
   legacyAnimation: {fileID: 0}
@@ -391,13 +389,12 @@ MonoBehaviour:
   ObjectInterest: 0
   _DestroyWhenStateAuthorityLeaves: 0
   _AllowStateAuthorityOverride: 0
-  Flags: 2305
+  Flags: 264449
   NestedObjects: []
   NetworkedBehaviours:
   - {fileID: 3286581577125373967}
   - {fileID: -2214749743101336736}
   - {fileID: 6128206130774469154}
-  - {fileID: 1819210150938506519}
 --- !u!114 &6128206130774469154
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -433,41 +430,3 @@ MonoBehaviour:
   maxFloorAngle: 70
   interpolationTeleportDistance: 1
   bounceOnImpacts: 0
---- !u!114 &1819210150938506519
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3286581577125373952}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 1039544458, guid: e725a070cec140c4caffb81624c8c787, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  Config: 3
-  BroadRadius: 0.26
-  Offset: {x: 0, y: 0.1875, z: 0}
-  GizmosColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
-  Hitboxes:
-  - {fileID: 161037357079201089}
---- !u!114 &161037357079201089
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3286581577125373952}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 1014831617, guid: e725a070cec140c4caffb81624c8c787, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  Type: 1
-  SphereRadius: 0
-  CapsuleRadius: 0
-  BoxExtents: {x: 0.1575, y: 0.1575, z: 0}
-  CapsuleHeight: 0
-  Offset: {x: 0, y: 0.1875, z: 0}
-  Root: {fileID: 1819210150938506519}
-  GizmosColor: {r: 1, g: 0.92156863, b: 0.015686275, a: 1}
diff --git a/Assets/Resources/Prefabs/Enemy/BulletBill.prefab b/Assets/Resources/Prefabs/Enemy/BulletBill.prefab
@@ -4989,8 +4989,6 @@ GameObject:
   - component: {fileID: 5407584048357268515}
   - component: {fileID: 6213839771229971201}
   - component: {fileID: 2108662388035762444}
-  - component: {fileID: 5805536510871160121}
-  - component: {fileID: 5538623755841512650}
   m_Layer: 10
   m_Name: BulletBill
   m_TagString: Untagged
@@ -5044,7 +5042,7 @@ MonoBehaviour:
   collideWithOtherEnemies: 0
   dieWhenInsideBlock: 0
   flipSpriteRenderer: 0
-  fusionHitbox: {fileID: 5538623755841512650}
+  fusionHitbox: {fileID: 0}
   hitbox: {fileID: 2627485830306083576}
   animator: {fileID: 0}
   legacyAnimation: {fileID: 5184426367989315057}
@@ -5250,7 +5248,6 @@ MonoBehaviour:
   - {fileID: 2721581803245764244}
   - {fileID: 3529903825791625940}
   - {fileID: 2108662388035762444}
-  - {fileID: 5805536510871160121}
 --- !u!114 &2108662388035762444
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -5286,44 +5283,6 @@ MonoBehaviour:
   maxFloorAngle: 70
   interpolationTeleportDistance: 1
   bounceOnImpacts: 0
---- !u!114 &5805536510871160121
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2627485830306083579}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 1039544458, guid: e725a070cec140c4caffb81624c8c787, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  Config: 3
-  BroadRadius: 0.35
-  Offset: {x: 0, y: 0.15, z: 0}
-  GizmosColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
-  Hitboxes:
-  - {fileID: 5538623755841512650}
---- !u!114 &5538623755841512650
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2627485830306083579}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 1014831617, guid: e725a070cec140c4caffb81624c8c787, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  Type: 1
-  SphereRadius: 0
-  CapsuleRadius: 0
-  BoxExtents: {x: 0.255, y: 0.15, z: 0}
-  CapsuleHeight: 0
-  Offset: {x: 0, y: 0.15, z: 0}
-  Root: {fileID: 5805536510871160121}
-  GizmosColor: {r: 1, g: 0.92156863, b: 0.015686275, a: 1}
 --- !u!1 &2855663874240651994
 GameObject:
   m_ObjectHideFlags: 0

diff --git a/Assets/Resources/Prefabs/Enemy/Goomba.prefab b/Assets/Resources/Prefabs/Enemy/Goomba.prefab
@@ -129,8 +129,6 @@ GameObject:
   - component: {fileID: 5674404523704379184}
   - component: {fileID: 8059900885248764230}
   - component: {fileID: 4636113223263193814}
-  - component: {fileID: 5387141680540000291}
-  - component: {fileID: 5049607885718933112}
   m_Layer: 9
   m_Name: Goomba
   m_TagString: Untagged
@@ -182,7 +180,7 @@ MonoBehaviour:
   collideWithOtherEnemies: 1
   dieWhenInsideBlock: 1
   flipSpriteRenderer: 0
-  fusionHitbox: {fileID: 5049607885718933112}
+  fusionHitbox: {fileID: 0}
   hitbox: {fileID: 7523289063499453452}
   animator: {fileID: 0}
   legacyAnimation: {fileID: 2072787540995169967}
@@ -390,13 +388,12 @@ MonoBehaviour:
   ObjectInterest: 0
   _DestroyWhenStateAuthorityLeaves: 0
   _AllowStateAuthorityOverride: 0
-  Flags: 2305
+  Flags: 264449
   NestedObjects: []
   NetworkedBehaviours:
   - {fileID: 7523289063499453453}
   - {fileID: 2884479414836889194}
   - {fileID: 4636113223263193814}
-  - {fileID: 5387141680540000291}
 --- !u!114 &4636113223263193814
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -432,41 +429,3 @@ MonoBehaviour:
   maxFloorAngle: 70
   interpolationTeleportDistance: 1
   bounceOnImpacts: 0
---- !u!114 &5387141680540000291
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7523289063499453450}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 1039544458, guid: e725a070cec140c4caffb81624c8c787, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  Config: 3
-  BroadRadius: 0.25
-  Offset: {x: 0, y: 0.21, z: 0}
-  GizmosColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
-  Hitboxes:
-  - {fileID: 5049607885718933112}
---- !u!114 &5049607885718933112
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7523289063499453450}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 1014831617, guid: e725a070cec140c4caffb81624c8c787, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  Type: 1
-  SphereRadius: 0
-  CapsuleRadius: 0
-  BoxExtents: {x: 0.15, y: 0.19, z: 0}
-  CapsuleHeight: 0
-  Offset: {x: 0, y: 0.21, z: 0}
-  Root: {fileID: 5387141680540000291}
-  GizmosColor: {r: 1, g: 0.92156863, b: 0.015686275, a: 1}
diff --git a/Assets/Resources/Prefabs/Enemy/Koopa.prefab b/Assets/Resources/Prefabs/Enemy/Koopa.prefab
@@ -154,8 +154,6 @@ GameObject:
   - component: {fileID: 3399800873378663516}
   - component: {fileID: 4462257224907729137}
   - component: {fileID: 5521876106847805377}
-  - component: {fileID: 3429113869676871066}
-  - component: {fileID: 1452744309787896686}
   m_Layer: 9
   m_Name: Koopa
   m_TagString: Untagged
@@ -207,7 +205,7 @@ MonoBehaviour:
   collideWithOtherEnemies: 1
   dieWhenInsideBlock: 1
   flipSpriteRenderer: 0
-  fusionHitbox: {fileID: 1452744309787896686}
+  fusionHitbox: {fileID: 0}
   hitbox: {fileID: 8836298984178612584}
   animator: {fileID: 3696720750550087088}
   legacyAnimation: {fileID: 0}
@@ -443,7 +441,6 @@ MonoBehaviour:
   - {fileID: 8836298984178612580}
   - {fileID: 7052311415719264077}
   - {fileID: 5521876106847805377}
-  - {fileID: 3429113869676871066}
 --- !u!114 &5521876106847805377
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -479,41 +476,3 @@ MonoBehaviour:
   maxFloorAngle: 70
   interpolationTeleportDistance: 1
   bounceOnImpacts: 0
---- !u!114 &3429113869676871066
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8836298984178612590}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 1039544458, guid: e725a070cec140c4caffb81624c8c787, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  Config: 3
-  BroadRadius: 0.5
-  Offset: {x: 0, y: 0, z: 0}
-  GizmosColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
-  Hitboxes:
-  - {fileID: 1452744309787896686}
---- !u!114 &1452744309787896686
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8836298984178612590}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 1014831617, guid: e725a070cec140c4caffb81624c8c787, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  Type: 1
-  SphereRadius: 0
-  CapsuleRadius: 0
-  BoxExtents: {x: 0.15, y: 0.255, z: 1}
-  CapsuleHeight: 0
-  Offset: {x: 0, y: 0.06, z: 0}
-  Root: {fileID: 3429113869676871066}
-  GizmosColor: {r: 1, g: 0.92156863, b: 0.015686275, a: 1}
diff --git a/Assets/Resources/Prefabs/Enemy/PiranhaPlant.prefab b/Assets/Resources/Prefabs/Enemy/PiranhaPlant.prefab
@@ -247,8 +247,6 @@ GameObject:
   m_Component:
   - component: {fileID: 4904021044407665645}
   - component: {fileID: 1094213376118772922}
-  - component: {fileID: 8284551372080845912}
-  - component: {fileID: 6666574227332119760}
   m_Layer: 0
   m_Name: Hitbox
   m_TagString: Untagged
@@ -316,44 +314,6 @@ BoxCollider2D:
   serializedVersion: 2
   m_Size: {x: 0.45, y: 0.75}
   m_EdgeRadius: 0
---- !u!114 &8284551372080845912
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6138843839452149636}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 1039544458, guid: e725a070cec140c4caffb81624c8c787, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  Config: 3
-  BroadRadius: 0.48
-  Offset: {x: 0, y: 0.36, z: 0}
-  GizmosColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
-  Hitboxes:
-  - {fileID: 6666574227332119760}
---- !u!114 &6666574227332119760
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6138843839452149636}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 1014831617, guid: e725a070cec140c4caffb81624c8c787, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  Type: 1
-  SphereRadius: 0
-  CapsuleRadius: 0
-  BoxExtents: {x: 0.225, y: 0.375, z: 0}
-  CapsuleHeight: 0
-  Offset: {x: 0, y: 0.375, z: 0}
-  Root: {fileID: 8284551372080845912}
-  GizmosColor: {r: 1, g: 0.92156863, b: 0.015686275, a: 1}
 --- !u!1 &6254190274066690703
 GameObject:
   m_ObjectHideFlags: 0
@@ -417,7 +377,7 @@ MonoBehaviour:
   collideWithOtherEnemies: 1
   dieWhenInsideBlock: 0
   flipSpriteRenderer: 0
-  fusionHitbox: {fileID: 6666574227332119760}
+  fusionHitbox: {fileID: 0}
   hitbox: {fileID: 1094213376118772922}
   animator: {fileID: 863355600414429673}
   legacyAnimation: {fileID: 0}
@@ -449,4 +409,3 @@ MonoBehaviour:
   NestedObjects: []
   NetworkedBehaviours:
   - {fileID: 3689884099564413062}
-  - {fileID: 8284551372080845912}