diff --git a/Assets/Resources/Prefabs/Enemy/BlueKoopa.prefab b/Assets/Resources/Prefabs/Enemy/BlueKoopa.prefab index 9bac3ee768..cea146ca6c 100644 --- 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 index af680453c1..97079a94a4 100644 --- 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 index 0491eff0e7..e2be42e5dd 100644 --- 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 index 446704ff8a..4aa7c2ebbc 100644 --- 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 index 659415cd66..9e2bc292d7 100644 --- 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 index d74a1d8113..cb52b3770f 100644 --- 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} diff --git a/Assets/Resources/Prefabs/Enemy/Spiny.prefab b/Assets/Resources/Prefabs/Enemy/Spiny.prefab index 07b7553093..6c31298584 100644 --- a/Assets/Resources/Prefabs/Enemy/Spiny.prefab +++ b/Assets/Resources/Prefabs/Enemy/Spiny.prefab @@ -16,8 +16,6 @@ GameObject: - component: {fileID: 5072740182388110993} - component: {fileID: 8953494174965512807} - component: {fileID: 8932310739204336522} - - component: {fileID: 4058743376998638202} - - component: {fileID: 9117317993469272409} m_Layer: 9 m_Name: Spiny m_TagString: Untagged @@ -69,7 +67,7 @@ MonoBehaviour: collideWithOtherEnemies: 1 dieWhenInsideBlock: 1 flipSpriteRenderer: 1 - fusionHitbox: {fileID: 9117317993469272409} + fusionHitbox: {fileID: 0} hitbox: {fileID: 1435431862184428453} animator: {fileID: 1376368638781678059} legacyAnimation: {fileID: 0} @@ -298,13 +296,12 @@ MonoBehaviour: ObjectInterest: 0 _DestroyWhenStateAuthorityLeaves: 0 _AllowStateAuthorityOverride: 0 - Flags: 2305 + Flags: 264449 NestedObjects: [] NetworkedBehaviours: - {fileID: 618591213112214914} - {fileID: 618591213112214912} - {fileID: 8932310739204336522} - - {fileID: 4058743376998638202} --- !u!114 &8932310739204336522 MonoBehaviour: m_ObjectHideFlags: 0 @@ -340,44 +337,6 @@ MonoBehaviour: maxFloorAngle: 70 interpolationTeleportDistance: 1 bounceOnImpacts: 0 ---- !u!114 &4058743376998638202 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1435431862184428451} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 1039544458, guid: e725a070cec140c4caffb81624c8c787, type: 3} - m_Name: - m_EditorClassIdentifier: - Config: 3 - BroadRadius: 0.23 - Offset: {x: 0, y: -0.06, z: 0} - GizmosColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} - Hitboxes: - - {fileID: 9117317993469272409} ---- !u!114 &9117317993469272409 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1435431862184428451} - 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.15, z: 0} - CapsuleHeight: 0 - Offset: {x: 0, y: -0.06, z: 0} - Root: {fileID: 4058743376998638202} - GizmosColor: {r: 1, g: 0.92156863, b: 0.015686275, a: 1} --- !u!1 &2736979299832079342 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Prefabs/Fireball.prefab b/Assets/Resources/Prefabs/Fireball.prefab index 073d2bd90d..6698c51969 100644 --- a/Assets/Resources/Prefabs/Fireball.prefab +++ b/Assets/Resources/Prefabs/Fireball.prefab @@ -1,6 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &659021581619780521 +--- !u!1 &1548958548204985091 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -8,38 +8,38 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 101126463348194867} - - component: {fileID: 6930344890943084446} - - component: {fileID: 5045179533202429967} + - component: {fileID: 5446675658584946157} + - component: {fileID: 1500413864370149687} + - component: {fileID: 6790543450083052571} m_Layer: 9 - m_Name: FireballWall + m_Name: IceballWall m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &101126463348194867 +--- !u!4 &5446675658584946157 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 659021581619780521} + m_GameObject: {fileID: 1548958548204985091} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0.140625, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 3150262645453679834} + m_Father: {fileID: 6465369964127994634} m_RootOrder: -1 m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0} ---- !u!198 &6930344890943084446 +--- !u!198 &1500413864370149687 ParticleSystem: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 659021581619780521} + m_GameObject: {fileID: 1548958548204985091} serializedVersion: 8 lengthInSec: 0.4 simulationSpeed: 1 @@ -1366,9 +1366,9 @@ ParticleSystem: maxColor: {r: 1, g: 1, b: 1, a: 1} maxGradient: serializedVersion: 2 - key0: {r: 0.8705883, g: 0, b: 0, a: 1} - key1: {r: 1, g: 0.6784314, b: 0, a: 1} - key2: {r: 1, g: 0.9803077, b: 0.3915094, a: 0} + key0: {r: 0.75, g: 0.93590283, b: 1, a: 1} + key1: {r: 1, g: 1, b: 1, a: 1} + key2: {r: 0.6556604, g: 0.8613716, b: 1, a: 0} key3: {r: 0, g: 0, b: 0, a: 0} key4: {r: 0, g: 0, b: 0, a: 0} key5: {r: 0, g: 0, b: 0, a: 0} @@ -4814,14 +4814,14 @@ ParticleSystem: m_PostInfinity: 2 m_RotationOrder: 4 vectorLabel1_3: W ---- !u!199 &5045179533202429967 +--- !u!199 &6790543450083052571 ParticleSystemRenderer: serializedVersion: 6 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 659021581619780521} + m_GameObject: {fileID: 1548958548204985091} m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 @@ -4886,7 +4886,7 @@ ParticleSystemRenderer: m_MeshWeighting2: 1 m_MeshWeighting3: 1 m_MaskInteraction: 0 ---- !u!1 &1011982274984717421 +--- !u!1 &2831720757334314441 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -4894,643 +4894,52 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1011982274984717416} - - component: {fileID: 1164692562165207756} - - component: {fileID: -1769135492019179076} - - component: {fileID: 3843124130648117525} - - component: {fileID: 844320328102276428} - - component: {fileID: 2644380969240041381} - - component: {fileID: 5158080774805734746} - - component: {fileID: 1200111384242601477} - - component: {fileID: 4930450600683655096} + - component: {fileID: 8983482655770573808} + - component: {fileID: 4642690893467340785} + - component: {fileID: 3296380514566804478} m_Layer: 9 - m_Name: Fireball + m_Name: FireballWall m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &1011982274984717416 +--- !u!4 &8983482655770573808 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1011982274984717421} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_GameObject: {fileID: 2831720757334314441} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0.140625, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 3150262645453679834} - m_Father: {fileID: 0} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1164692562165207756 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1011982274984717421} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 0145365c476308445a9e47dafba82648, type: 3} - m_Name: - m_EditorClassIdentifier: - _FacingRight: - _value: 0 - _IsActive: - _value: 0 - body: {fileID: 5158080774805734746} - sfx: {fileID: 3843124130648117525} - checkForNearbyPlayersWhenRespawning: 1 - _Owner: {fileID: 0} - _AlreadyBounced: - _value: 0 - _IsIceball: - _value: 0 - _BreakEffectAnimCounter: 0 - iceBreak: {fileID: 1425112719999528230} - fireBreak: {fileID: 6930344890943084446} - iceTrail: {fileID: 9011454779400335023} - fireTrail: {fileID: 5044812112945403417} - iceGraphics: {fileID: 2135618848759859508} - fireGraphics: {fileID: 5079778509045743664} - ourTeamColor: {r: 0.7, g: 0.7, b: 0.7, a: 1} - enemyTeamColor: {r: 1, g: 1, b: 1, a: 1} - fireSpeed: 6.25 - iceSpeed: 4.25 - bounceHeight: 6.75 - terminalVelocity: 6.25 - renderers: - - {fileID: 4710279457085823811} - - {fileID: 7450112483459336877} - hitbox: {fileID: -1769135492019179076} ---- !u!61 &-1769135492019179076 -BoxCollider2D: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1011982274984717421} - m_Enabled: 1 - m_Density: 1 - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_ForceSendLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_ForceReceiveLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_ContactCaptureLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_CallbackLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_IsTrigger: 0 - m_UsedByEffector: 0 - m_UsedByComposite: 0 - m_Offset: {x: 0, y: 0.1375} - m_SpriteTilingProperty: - border: {x: 0, y: 0, z: 0, w: 0} - pivot: {x: 0.5, y: 0} - oldSize: {x: 0.11, y: 0.11} - newSize: {x: 0.11, y: 0.11} - adaptiveTilingThreshold: 0.5 - drawMode: 0 - adaptiveTiling: 0 - m_AutoTiling: 0 - serializedVersion: 2 - m_Size: {x: 0.275, y: 0.275} - m_EdgeRadius: 0 ---- !u!82 &3843124130648117525 -AudioSource: + m_Children: [] + m_Father: {fileID: 6465369964127994634} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0} +--- !u!198 &4642690893467340785 +ParticleSystem: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1011982274984717421} - m_Enabled: 1 - serializedVersion: 4 - OutputAudioMixerGroup: {fileID: -8359218312643153770, guid: b73add24eb026c844b85593f8bab1f8c, - type: 2} - m_audioClip: {fileID: 0} - m_PlayOnAwake: 0 - m_Volume: 1 - m_Pitch: 1 - Loop: 0 - Mute: 0 - Spatialize: 0 - SpatializePostEffects: 0 - Priority: 128 - DopplerLevel: 1 - MinDistance: 1 - MaxDistance: 500 - Pan2D: 0 - rolloffMode: 0 - BypassEffects: 0 - BypassListenerEffects: 0 - BypassReverbZones: 0 - rolloffCustomCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - panLevelCustomCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - spreadCustomCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - reverbZoneMixCustomCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 ---- !u!114 &844320328102276428 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1011982274984717421} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e996f15526c6efc41a2844bb5666b6ce, type: 3} - m_Name: - m_EditorClassIdentifier: - audioSources: - - {fileID: 3843124130648117525} - soundOrigin: {fileID: 1011982274984717416} - soundRange: 12 - maxPanning: 0.8 - useDistanceToCamera: 0 ---- !u!114 &2644380969240041381 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1011982274984717421} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -1552182283, guid: e725a070cec140c4caffb81624c8c787, type: 3} - m_Name: - m_EditorClassIdentifier: - SortKey: 3028589391 - ObjectInterest: 0 - _DestroyWhenStateAuthorityLeaves: 0 - _AllowStateAuthorityOverride: 0 - Flags: 264449 - NestedObjects: [] - NetworkedBehaviours: - - {fileID: 1164692562165207756} - - {fileID: 5158080774805734746} - - {fileID: 1200111384242601477} ---- !u!114 &5158080774805734746 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1011982274984717421} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 7a384a75a1c0645459861c223ac33652, type: 3} - m_Name: - m_EditorClassIdentifier: - _Velocity: {x: 0, y: 0} - _Freeze: - _value: 0 - _IsKinematic: - _value: 0 - _LockX: - _value: 0 - _LockY: - _value: 0 - _Gravity: {x: 0, y: 0} - _Data: - Flags: 0 - FloorAngle: 0 - _TileContacts: - Data: 0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 - _ObjectContacts: - Data: 0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 - _PreviousTickPosition: {x: 0, y: 0} - _PreviousTickVelocity: {x: 0, y: 0} - activeCollider: {fileID: -1769135492019179076} - maxFloorAngle: 70 - interpolationTeleportDistance: 1 - bounceOnImpacts: 0 ---- !u!114 &1200111384242601477 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1011982274984717421} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 1039544458, guid: e725a070cec140c4caffb81624c8c787, type: 3} - m_Name: - m_EditorClassIdentifier: - Config: 3 - BroadRadius: 0.2 - Offset: {x: 0, y: 0.1375, z: 0} - GizmosColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} - Hitboxes: - - {fileID: 4930450600683655096} ---- !u!114 &4930450600683655096 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1011982274984717421} - 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.1375, y: 0.1375, z: 1} - CapsuleHeight: 0 - Offset: {x: 0, y: 0.1375, z: 0} - Root: {fileID: 1200111384242601477} - GizmosColor: {r: 1, g: 0.92156863, b: 0.015686275, a: 1} ---- !u!1 &2135618848759859508 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3427681855993351045} - - component: {fileID: 4710279457085823811} - - component: {fileID: 8640911904975915065} - m_Layer: 9 - m_Name: IceGraphics - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &3427681855993351045 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2135618848759859508} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 2.5, y: 2.5, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 3150262645453679834} - m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &4710279457085823811 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2135618848759859508} - 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_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} - 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_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 500 - m_Sprite: {fileID: 5353841184698615464, guid: eddf8ec042b3e614e925d846a27642df, - type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 0.11, y: 0.11} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 ---- !u!114 &8640911904975915065 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2135618848759859508} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 41c5d135866d4444088fd55baaa2ae03, type: 3} - m_Name: - m_EditorClassIdentifier: - isDisplaying: 1 - runInEditor: 0 - frame: 0.5826652 - fps: 12 - frames: - - {fileID: 5353841184698615464, guid: eddf8ec042b3e614e925d846a27642df, type: 3} - - {fileID: 750297706712597742, guid: eddf8ec042b3e614e925d846a27642df, type: 3} - - {fileID: -8127487528002223245, guid: eddf8ec042b3e614e925d846a27642df, type: 3} - - {fileID: -3915765450054648673, guid: eddf8ec042b3e614e925d846a27642df, type: 3} - sRenderer: {fileID: 4710279457085823811} - image: {fileID: 0} ---- !u!1 &5079778509045743664 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3913916938386061855} - - component: {fileID: 7450112483459336877} - - component: {fileID: 6699095901315088683} - m_Layer: 9 - m_Name: FireGraphics - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &3913916938386061855 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5079778509045743664} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 2.5, y: 2.5, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 3150262645453679834} - m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &7450112483459336877 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5079778509045743664} - 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_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} - 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_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 500 - m_Sprite: {fileID: 5353841184698615464, guid: 8b4c76bfff99dba4b90ef29e19c39f48, - type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 0.11, y: 0.11} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 ---- !u!114 &6699095901315088683 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5079778509045743664} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 41c5d135866d4444088fd55baaa2ae03, type: 3} - m_Name: - m_EditorClassIdentifier: - isDisplaying: 1 - runInEditor: 0 - frame: 0.5826652 - fps: 12 - frames: - - {fileID: 5353841184698615464, guid: 8b4c76bfff99dba4b90ef29e19c39f48, type: 3} - - {fileID: 750297706712597742, guid: 8b4c76bfff99dba4b90ef29e19c39f48, type: 3} - - {fileID: -8127487528002223245, guid: 8b4c76bfff99dba4b90ef29e19c39f48, type: 3} - - {fileID: -3915765450054648673, guid: 8b4c76bfff99dba4b90ef29e19c39f48, type: 3} - sRenderer: {fileID: 7450112483459336877} - image: {fileID: 0} ---- !u!1 &6123894138715371252 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3150262645453679834} - m_Layer: 0 - m_Name: Graphics - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &3150262645453679834 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6123894138715371252} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 3427681855993351045} - - {fileID: 3913916938386061855} - - {fileID: 6147013916618370303} - - {fileID: 8254471918769390731} - - {fileID: 5059717370905105433} - - {fileID: 101126463348194867} - m_Father: {fileID: 1011982274984717416} - m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &7767286867914000799 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6147013916618370303} - - component: {fileID: 9011454779400335023} - - component: {fileID: 3057083681274117263} - m_Layer: 9 - m_Name: IceTrail - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &6147013916618370303 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7767286867914000799} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0.1375, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 3150262645453679834} - m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0} ---- !u!198 &9011454779400335023 -ParticleSystem: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7767286867914000799} - serializedVersion: 8 - lengthInSec: 5 - simulationSpeed: 1 - stopAction: 0 - cullingMode: 0 - ringBufferMode: 0 - ringBufferLoopRange: {x: 0, y: 1} - emitterVelocityMode: 1 - looping: 1 - prewarm: 0 - playOnAwake: 0 - useUnscaledTime: 0 - autoRandomSeed: 1 - startDelay: + m_GameObject: {fileID: 2831720757334314441} + serializedVersion: 8 + lengthInSec: 0.4 + simulationSpeed: 1 + stopAction: 0 + cullingMode: 0 + ringBufferMode: 0 + ringBufferLoopRange: {x: 0, y: 1} + emitterVelocityMode: 1 + looping: 0 + prewarm: 0 + playOnAwake: 0 + useUnscaledTime: 0 + autoRandomSeed: 1 + startDelay: serializedVersion: 2 minMaxState: 0 scalar: 0 @@ -5593,7 +5002,7 @@ ParticleSystem: startLifetime: serializedVersion: 2 minMaxState: 0 - scalar: 0.25 + scalar: 0.4 minScalar: 5 maxCurve: serializedVersion: 2 @@ -5646,7 +5055,7 @@ ParticleSystem: startSpeed: serializedVersion: 2 minMaxState: 0 - scalar: 0 + scalar: 1 minScalar: 5 maxCurve: serializedVersion: 2 @@ -5764,7 +5173,7 @@ ParticleSystem: startSize: serializedVersion: 2 minMaxState: 0 - scalar: 0.12 + scalar: 0.4 minScalar: 1 maxCurve: serializedVersion: 2 @@ -6141,7 +5550,7 @@ ParticleSystem: ShapeModule: serializedVersion: 6 enabled: 1 - type: 18 + type: 0 angle: 25 length: 5 boxThickness: {x: 0, y: 0, z: 0} @@ -6149,7 +5558,7 @@ ParticleSystem: donutRadius: 0.2 m_Position: {x: 0, y: 0, z: 0} m_Rotation: {x: 0, y: 0, z: 0} - m_Scale: {x: 0, y: 0, z: 1} + m_Scale: {x: 1, y: 1, z: 1} placementMode: 0 m_MeshMaterialIndex: 0 m_MeshNormalOffset: 0 @@ -6228,7 +5637,7 @@ ParticleSystem: sphericalDirectionAmount: 0 randomPositionAmount: 0 radius: - value: 1 + value: 0.17 mode: 0 spread: 0 speed: @@ -6347,7 +5756,7 @@ ParticleSystem: rateOverTime: serializedVersion: 2 minMaxState: 0 - scalar: 20 + scalar: 0 minScalar: 10 maxCurve: serializedVersion: 2 @@ -6450,10 +5859,68 @@ ParticleSystem: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - m_BurstCount: 0 - m_Bursts: [] + m_BurstCount: 1 + m_Bursts: + - serializedVersion: 2 + time: 0 + countCurve: + serializedVersion: 2 + minMaxState: 3 + scalar: 20 + minScalar: 10 + maxCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + minCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + cycleCount: 1 + repeatInterval: 0.01 + probability: 1 SizeModule: - enabled: 0 + enabled: 1 curve: serializedVersion: 2 minMaxState: 1 @@ -6467,16 +5934,16 @@ ParticleSystem: value: 1 inSlope: 0 outSlope: 0 - tangentMode: 34 + tangentMode: 0 weightedMode: 0 inWeight: 0 outWeight: 0 - serializedVersion: 3 time: 1 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 34 + value: 0 + inSlope: -2 + outSlope: -2 + tangentMode: 0 weightedMode: 0 inWeight: 0 outWeight: 0 @@ -6777,7 +6244,7 @@ ParticleSystem: m_RotationOrder: 4 separateAxes: 0 ColorModule: - enabled: 0 + enabled: 1 gradient: serializedVersion: 2 minMaxState: 1 @@ -6845,8 +6312,8 @@ ParticleSystem: m_NumAlphaKeys: 2 UVModule: serializedVersion: 2 - enabled: 1 - mode: 1 + enabled: 0 + mode: 0 timeMode: 0 fps: 30 frameOverTime: @@ -6964,9 +6431,7 @@ ParticleSystem: uvChannelMask: -1 rowMode: 1 sprites: - - sprite: {fileID: -8077568, guid: eddf8ec042b3e614e925d846a27642df, type: 3} - - sprite: {fileID: -2140104179, guid: eddf8ec042b3e614e925d846a27642df, type: 3} - - sprite: {fileID: -456267274, guid: eddf8ec042b3e614e925d846a27642df, type: 3} + - sprite: {fileID: 0} flipU: 0 flipV: 0 VelocityModule: @@ -7561,7 +7026,7 @@ ParticleSystem: m_Curve: serializedVersion: 2 minMaxState: 0 - scalar: -0.2 + scalar: 0 minScalar: 0 maxCurve: serializedVersion: 2 @@ -8394,9 +7859,9 @@ ParticleSystem: m_Curve: - serializedVersion: 3 time: 0 - value: 0 + value: -1 inSlope: 0 - outSlope: 1 + outSlope: 2 tangentMode: 0 weightedMode: 0 inWeight: 0.33333334 @@ -8404,7 +7869,7 @@ ParticleSystem: - serializedVersion: 3 time: 1 value: 1 - inSlope: 1 + inSlope: 2 outSlope: 0 tangentMode: 0 weightedMode: 0 @@ -8447,9 +7912,9 @@ ParticleSystem: m_Curve: - serializedVersion: 3 time: 0 - value: 0 + value: -1 inSlope: 0 - outSlope: 1 + outSlope: 2 tangentMode: 0 weightedMode: 0 inWeight: 0.33333334 @@ -8457,7 +7922,7 @@ ParticleSystem: - serializedVersion: 3 time: 1 value: 1 - inSlope: 1 + inSlope: 2 outSlope: 0 tangentMode: 0 weightedMode: 0 @@ -8500,9 +7965,9 @@ ParticleSystem: m_Curve: - serializedVersion: 3 time: 0 - value: 0 + value: -1 inSlope: 0 - outSlope: 1 + outSlope: 2 tangentMode: 0 weightedMode: 0 inWeight: 0.33333334 @@ -8510,7 +7975,7 @@ ParticleSystem: - serializedVersion: 3 time: 1 value: 1 - inSlope: 1 + inSlope: 2 outSlope: 0 tangentMode: 0 weightedMode: 0 @@ -9106,13 +8571,7 @@ ParticleSystem: multiplyColliderForceByParticleSize: 0 multiplyColliderForceByParticleSpeed: 0 multiplyColliderForceByCollisionAngle: 1 - m_Planes: - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} + m_Planes: [] m_Dampen: serializedVersion: 2 minMaxState: 0 @@ -9293,13 +8752,7 @@ ParticleSystem: exit: 0 colliderQueryMode: 0 radiusScale: 1 - primitives: - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} + primitives: [] SubModule: serializedVersion: 2 enabled: 0 @@ -10247,28 +9700,646 @@ ParticleSystem: m_PostInfinity: 2 m_RotationOrder: 4 vectorLabel1_3: W ---- !u!199 &3057083681274117263 +--- !u!199 &3296380514566804478 ParticleSystemRenderer: serializedVersion: 6 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7767286867914000799} + m_GameObject: {fileID: 2831720757334314441} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 0 + m_ReflectionProbeUsage: 0 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: fe55c9f2059d4b746b0316bf31fe2bc5, 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: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: -755315459 + m_SortingLayer: 1 + m_SortingOrder: 0 + m_RenderMode: 0 + m_MeshDistribution: 0 + m_SortMode: 0 + m_MinParticleSize: 0 + m_MaxParticleSize: 0.5 + m_CameraVelocityScale: 0 + m_VelocityScale: 0 + m_LengthScale: 2 + m_SortingFudge: 0 + m_NormalDirection: 1 + m_ShadowBias: 0 + m_RenderAlignment: 0 + m_Pivot: {x: 0, y: 0, z: 0} + m_Flip: {x: 0, y: 0, z: 0} + m_UseCustomVertexStreams: 0 + m_EnableGPUInstancing: 1 + m_ApplyActiveColorSpace: 1 + m_AllowRoll: 1 + m_FreeformStretching: 0 + m_RotateWithStretchDirection: 1 + m_VertexStreams: 00010304 + m_Mesh: {fileID: 0} + m_Mesh1: {fileID: 0} + m_Mesh2: {fileID: 0} + m_Mesh3: {fileID: 0} + m_MeshWeighting: 1 + m_MeshWeighting1: 1 + m_MeshWeighting2: 1 + m_MeshWeighting3: 1 + m_MaskInteraction: 0 +--- !u!1 &6307920351473437675 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6226578532214227705} + - component: {fileID: 8651299207531114259} + - component: {fileID: 7106104143976697841} + - component: {fileID: 9189821280459049679} + - component: {fileID: 640823366960692209} + - component: {fileID: 6500263477727160936} + - component: {fileID: 1567886918184217558} + m_Layer: 9 + m_Name: Fireball + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6226578532214227705 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6307920351473437675} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 6102423714800591244} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &8651299207531114259 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6307920351473437675} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0145365c476308445a9e47dafba82648, type: 3} + m_Name: + m_EditorClassIdentifier: + _FacingRight: + _value: 0 + _IsActive: + _value: 0 + body: {fileID: 640823366960692209} + sfx: {fileID: 3352135142510587373} + checkForNearbyPlayersWhenRespawning: 1 + _Owner: {fileID: 0} + _AlreadyBounced: + _value: 0 + _IsIceball: + _value: 0 + _InactiveTick: 0 + iceBreak: {fileID: 1500413864370149687} + fireBreak: {fileID: 4642690893467340785} + iceTrail: {fileID: 8753930268045016890} + fireTrail: {fileID: 5202007457111186492} + iceGraphics: {fileID: 6313951447176480054} + fireGraphics: {fileID: 7243713612715078606} + ourTeamColor: {r: 0.7, g: 0.7, b: 0.7, a: 1} + enemyTeamColor: {r: 1, g: 1, b: 1, a: 1} + fireSpeed: 6.25 + iceSpeed: 4.25 + bounceHeight: 6.75 + terminalVelocity: 6.25 + renderers: + - {fileID: 6983710913193508245} + - {fileID: 5329144335610595165} + hitbox: {fileID: 7106104143976697841} +--- !u!61 &7106104143976697841 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6307920351473437675} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0.1375} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0} + oldSize: {x: 0.11, y: 0.11} + newSize: {x: 0.11, y: 0.11} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 0.275, y: 0.275} + m_EdgeRadius: 0 +--- !u!114 &9189821280459049679 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6307920351473437675} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -1552182283, guid: e725a070cec140c4caffb81624c8c787, type: 3} + m_Name: + m_EditorClassIdentifier: + SortKey: 135777654 + ObjectInterest: 0 + _DestroyWhenStateAuthorityLeaves: 0 + _AllowStateAuthorityOverride: 0 + Flags: 264449 + NestedObjects: [] + NetworkedBehaviours: + - {fileID: 8651299207531114259} + - {fileID: 640823366960692209} + - {fileID: 6500263477727160936} +--- !u!114 &640823366960692209 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6307920351473437675} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7a384a75a1c0645459861c223ac33652, type: 3} + m_Name: + m_EditorClassIdentifier: + _Velocity: {x: 0, y: 0} + _Freeze: + _value: 0 + _IsKinematic: + _value: 0 + _LockX: + _value: 0 + _LockY: + _value: 0 + _Gravity: {x: 0, y: 0} + _Data: + Flags: 0 + FloorAngle: 0 + _TileContacts: + Data: 0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 + _ObjectContacts: + Data: 0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 + _PreviousTickPosition: {x: 0, y: 0} + _PreviousTickVelocity: {x: 0, y: 0} + activeCollider: {fileID: 7106104143976697841} + maxFloorAngle: 70 + interpolationTeleportDistance: 1 + bounceOnImpacts: 0 +--- !u!114 &6500263477727160936 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6307920351473437675} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1039544458, guid: e725a070cec140c4caffb81624c8c787, type: 3} + m_Name: + m_EditorClassIdentifier: + Config: 3 + BroadRadius: 0.2 + Offset: {x: 0, y: 0.1375, z: 0} + GizmosColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + Hitboxes: + - {fileID: 1567886918184217558} +--- !u!114 &1567886918184217558 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6307920351473437675} + 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.1375, y: 0.1375, z: 1} + CapsuleHeight: 0 + Offset: {x: 0, y: 0.1375, z: 0} + Root: {fileID: 6500263477727160936} + GizmosColor: {r: 1, g: 0.92156863, b: 0.015686275, a: 1} +--- !u!1 &6313951447176480054 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2272710620091358615} + - component: {fileID: 6983710913193508245} + - component: {fileID: 7118529404408818850} + m_Layer: 9 + m_Name: IceGraphics + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2272710620091358615 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6313951447176480054} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 2.5, y: 2.5, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 6102423714800591244} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &6983710913193508245 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6313951447176480054} + 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_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + 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_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 500 + m_Sprite: {fileID: 5353841184698615464, guid: eddf8ec042b3e614e925d846a27642df, + type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 0.11, y: 0.11} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!114 &7118529404408818850 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6313951447176480054} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 41c5d135866d4444088fd55baaa2ae03, type: 3} + m_Name: + m_EditorClassIdentifier: + isDisplaying: 1 + runInEditor: 0 + frame: 0.5826652 + fps: 12 + frames: + - {fileID: 5353841184698615464, guid: eddf8ec042b3e614e925d846a27642df, type: 3} + - {fileID: 750297706712597742, guid: eddf8ec042b3e614e925d846a27642df, type: 3} + - {fileID: -8127487528002223245, guid: eddf8ec042b3e614e925d846a27642df, type: 3} + - {fileID: -3915765450054648673, guid: eddf8ec042b3e614e925d846a27642df, type: 3} + sRenderer: {fileID: 6983710913193508245} + image: {fileID: 0} +--- !u!1 &6601159735957875036 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6465369964127994634} + - component: {fileID: 3352135142510587373} + - component: {fileID: 6918891137257771784} + m_Layer: 9 + m_Name: BreakEffect + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6465369964127994634 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6601159735957875036} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 5446675658584946157} + - {fileID: 8983482655770573808} + m_Father: {fileID: 6102423714800591244} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!82 &3352135142510587373 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6601159735957875036} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: -8359218312643153770, guid: b73add24eb026c844b85593f8bab1f8c, + type: 2} + m_audioClip: {fileID: 0} + m_PlayOnAwake: 1 + m_Volume: 1 + m_Pitch: 1 + Loop: 0 + Mute: 0 + Spatialize: 0 + SpatializePostEffects: 0 + Priority: 128 + DopplerLevel: 1 + MinDistance: 1 + MaxDistance: 500 + Pan2D: 0 + rolloffMode: 0 + BypassEffects: 0 + BypassListenerEffects: 0 + BypassReverbZones: 0 + rolloffCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + panLevelCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + spreadCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 +--- !u!114 &6918891137257771784 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6601159735957875036} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e996f15526c6efc41a2844bb5666b6ce, type: 3} + m_Name: + m_EditorClassIdentifier: + audioSources: + - {fileID: 3352135142510587373} + soundOrigin: {fileID: 6465369964127994634} + soundRange: 12 + maxPanning: 0.8 + useDistanceToCamera: 0 +--- !u!1 &6817442949190414024 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6102423714800591244} + m_Layer: 9 + m_Name: Graphics + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6102423714800591244 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6817442949190414024} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 2272710620091358615} + - {fileID: 3437905331129197368} + - {fileID: 2963240724454673592} + - {fileID: 5082207059470328561} + - {fileID: 6465369964127994634} + m_Father: {fileID: 6226578532214227705} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &7243713612715078606 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3437905331129197368} + - component: {fileID: 5329144335610595165} + - component: {fileID: 9162743564300288012} + m_Layer: 9 + m_Name: FireGraphics + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3437905331129197368 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7243713612715078606} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 2.5, y: 2.5, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 6102423714800591244} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &5329144335610595165 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7243713612715078606} m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 m_StaticShadowCaster: 0 m_MotionVectors: 1 - m_LightProbeUsage: 0 - m_ReflectionProbeUsage: 0 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 m_RayTracingMode: 0 m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: fe55c9f2059d4b746b0316bf31fe2bc5, type: 2} + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -10281,45 +10352,50 @@ ParticleSystemRenderer: m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 3 + m_SelectedEditorRenderState: 0 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 5 - m_RenderMode: 0 - m_MeshDistribution: 0 - m_SortMode: 0 - m_MinParticleSize: 0 - m_MaxParticleSize: 0.5 - m_CameraVelocityScale: 0 - m_VelocityScale: 0 - m_LengthScale: 2 - m_SortingFudge: 0 - m_NormalDirection: 1 - m_ShadowBias: 0 - m_RenderAlignment: 0 - m_Pivot: {x: 0, y: 0, z: 0} - m_Flip: {x: 0, y: 0, z: 0} - m_UseCustomVertexStreams: 0 - m_EnableGPUInstancing: 1 - m_ApplyActiveColorSpace: 1 - m_AllowRoll: 1 - m_FreeformStretching: 0 - m_RotateWithStretchDirection: 1 - m_VertexStreams: 00010304 - m_Mesh: {fileID: 0} - m_Mesh1: {fileID: 0} - m_Mesh2: {fileID: 0} - m_Mesh3: {fileID: 0} - m_MeshWeighting: 1 - m_MeshWeighting1: 1 - m_MeshWeighting2: 1 - m_MeshWeighting3: 1 + m_SortingOrder: 500 + m_Sprite: {fileID: 5353841184698615464, guid: 8b4c76bfff99dba4b90ef29e19c39f48, + type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 0.11, y: 0.11} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 m_MaskInteraction: 0 ---- !u!1 &8143467996169431833 + m_SpriteSortPoint: 0 +--- !u!114 &9162743564300288012 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7243713612715078606} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 41c5d135866d4444088fd55baaa2ae03, type: 3} + m_Name: + m_EditorClassIdentifier: + isDisplaying: 1 + runInEditor: 0 + frame: 0.5826652 + fps: 12 + frames: + - {fileID: 5353841184698615464, guid: 8b4c76bfff99dba4b90ef29e19c39f48, type: 3} + - {fileID: 750297706712597742, guid: 8b4c76bfff99dba4b90ef29e19c39f48, type: 3} + - {fileID: -8127487528002223245, guid: 8b4c76bfff99dba4b90ef29e19c39f48, type: 3} + - {fileID: -3915765450054648673, guid: 8b4c76bfff99dba4b90ef29e19c39f48, type: 3} + sRenderer: {fileID: 5329144335610595165} + image: {fileID: 0} +--- !u!1 &7524634318836740490 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -10327,9 +10403,9 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 5059717370905105433} - - component: {fileID: 5044812112945403417} - - component: {fileID: 2679537811781022993} + - component: {fileID: 5082207059470328561} + - component: {fileID: 5202007457111186492} + - component: {fileID: 2887448907472742947} m_Layer: 9 m_Name: FireTrail m_TagString: Untagged @@ -10337,28 +10413,28 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &5059717370905105433 +--- !u!4 &5082207059470328561 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8143467996169431833} + m_GameObject: {fileID: 7524634318836740490} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0.1375, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 3150262645453679834} + m_Father: {fileID: 6102423714800591244} m_RootOrder: -1 m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0} ---- !u!198 &5044812112945403417 +--- !u!198 &5202007457111186492 ParticleSystem: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8143467996169431833} + m_GameObject: {fileID: 7524634318836740490} serializedVersion: 8 lengthInSec: 5 simulationSpeed: 1 @@ -15089,14 +15165,14 @@ ParticleSystem: m_PostInfinity: 2 m_RotationOrder: 4 vectorLabel1_3: W ---- !u!199 &2679537811781022993 +--- !u!199 &2887448907472742947 ParticleSystemRenderer: serializedVersion: 6 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8143467996169431833} + m_GameObject: {fileID: 7524634318836740490} m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 @@ -15161,7 +15237,7 @@ ParticleSystemRenderer: m_MeshWeighting2: 1 m_MeshWeighting3: 1 m_MaskInteraction: 0 ---- !u!1 &8849523932906004753 +--- !u!1 &8566834211625758416 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -15169,47 +15245,47 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 8254471918769390731} - - component: {fileID: 1425112719999528230} - - component: {fileID: 3886210157150429879} + - component: {fileID: 2963240724454673592} + - component: {fileID: 8753930268045016890} + - component: {fileID: 6505870195547170246} m_Layer: 9 - m_Name: IceballWall + m_Name: IceTrail m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &8254471918769390731 +--- !u!4 &2963240724454673592 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8849523932906004753} + m_GameObject: {fileID: 8566834211625758416} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0.140625, z: 0} + m_LocalPosition: {x: 0, y: 0.1375, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 3150262645453679834} + m_Father: {fileID: 6102423714800591244} m_RootOrder: -1 m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0} ---- !u!198 &1425112719999528230 +--- !u!198 &8753930268045016890 ParticleSystem: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8849523932906004753} + m_GameObject: {fileID: 8566834211625758416} serializedVersion: 8 - lengthInSec: 0.4 + lengthInSec: 5 simulationSpeed: 1 stopAction: 0 cullingMode: 0 ringBufferMode: 0 ringBufferLoopRange: {x: 0, y: 1} emitterVelocityMode: 1 - looping: 0 + looping: 1 prewarm: 0 playOnAwake: 0 useUnscaledTime: 0 @@ -15277,7 +15353,7 @@ ParticleSystem: startLifetime: serializedVersion: 2 minMaxState: 0 - scalar: 0.4 + scalar: 0.25 minScalar: 5 maxCurve: serializedVersion: 2 @@ -15330,7 +15406,7 @@ ParticleSystem: startSpeed: serializedVersion: 2 minMaxState: 0 - scalar: 1 + scalar: 0 minScalar: 5 maxCurve: serializedVersion: 2 @@ -15448,7 +15524,7 @@ ParticleSystem: startSize: serializedVersion: 2 minMaxState: 0 - scalar: 0.4 + scalar: 0.12 minScalar: 1 maxCurve: serializedVersion: 2 @@ -15825,7 +15901,7 @@ ParticleSystem: ShapeModule: serializedVersion: 6 enabled: 1 - type: 0 + type: 18 angle: 25 length: 5 boxThickness: {x: 0, y: 0, z: 0} @@ -15833,7 +15909,7 @@ ParticleSystem: donutRadius: 0.2 m_Position: {x: 0, y: 0, z: 0} m_Rotation: {x: 0, y: 0, z: 0} - m_Scale: {x: 1, y: 1, z: 1} + m_Scale: {x: 0, y: 0, z: 1} placementMode: 0 m_MeshMaterialIndex: 0 m_MeshNormalOffset: 0 @@ -15912,7 +15988,7 @@ ParticleSystem: sphericalDirectionAmount: 0 randomPositionAmount: 0 radius: - value: 0.17 + value: 1 mode: 0 spread: 0 speed: @@ -16031,7 +16107,7 @@ ParticleSystem: rateOverTime: serializedVersion: 2 minMaxState: 0 - scalar: 0 + scalar: 20 minScalar: 10 maxCurve: serializedVersion: 2 @@ -16134,68 +16210,10 @@ ParticleSystem: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - m_BurstCount: 1 - m_Bursts: - - serializedVersion: 2 - time: 0 - countCurve: - serializedVersion: 2 - minMaxState: 3 - scalar: 20 - minScalar: 10 - maxCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 1 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - minCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 1 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - cycleCount: 1 - repeatInterval: 0.01 - probability: 1 + m_BurstCount: 0 + m_Bursts: [] SizeModule: - enabled: 1 + enabled: 0 curve: serializedVersion: 2 minMaxState: 1 @@ -16209,16 +16227,16 @@ ParticleSystem: value: 1 inSlope: 0 outSlope: 0 - tangentMode: 0 + tangentMode: 34 weightedMode: 0 inWeight: 0 outWeight: 0 - serializedVersion: 3 time: 1 - value: 0 - inSlope: -2 - outSlope: -2 - tangentMode: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 34 weightedMode: 0 inWeight: 0 outWeight: 0 @@ -16519,7 +16537,7 @@ ParticleSystem: m_RotationOrder: 4 separateAxes: 0 ColorModule: - enabled: 1 + enabled: 0 gradient: serializedVersion: 2 minMaxState: 1 @@ -16527,9 +16545,9 @@ ParticleSystem: maxColor: {r: 1, g: 1, b: 1, a: 1} maxGradient: serializedVersion: 2 - key0: {r: 0.75, g: 0.93590283, b: 1, a: 1} - key1: {r: 1, g: 1, b: 1, a: 1} - key2: {r: 0.6556604, g: 0.8613716, b: 1, a: 0} + key0: {r: 0.8705883, g: 0, b: 0, a: 1} + key1: {r: 1, g: 0.6784314, b: 0, a: 1} + key2: {r: 1, g: 0.9803077, b: 0.3915094, a: 0} key3: {r: 0, g: 0, b: 0, a: 0} key4: {r: 0, g: 0, b: 0, a: 0} key5: {r: 0, g: 0, b: 0, a: 0} @@ -16587,8 +16605,8 @@ ParticleSystem: m_NumAlphaKeys: 2 UVModule: serializedVersion: 2 - enabled: 0 - mode: 0 + enabled: 1 + mode: 1 timeMode: 0 fps: 30 frameOverTime: @@ -16706,7 +16724,9 @@ ParticleSystem: uvChannelMask: -1 rowMode: 1 sprites: - - sprite: {fileID: 0} + - sprite: {fileID: -8077568, guid: eddf8ec042b3e614e925d846a27642df, type: 3} + - sprite: {fileID: -2140104179, guid: eddf8ec042b3e614e925d846a27642df, type: 3} + - sprite: {fileID: -456267274, guid: eddf8ec042b3e614e925d846a27642df, type: 3} flipU: 0 flipV: 0 VelocityModule: @@ -17301,7 +17321,7 @@ ParticleSystem: m_Curve: serializedVersion: 2 minMaxState: 0 - scalar: 0 + scalar: -0.2 minScalar: 0 maxCurve: serializedVersion: 2 @@ -18134,9 +18154,9 @@ ParticleSystem: m_Curve: - serializedVersion: 3 time: 0 - value: -1 + value: 0 inSlope: 0 - outSlope: 2 + outSlope: 1 tangentMode: 0 weightedMode: 0 inWeight: 0.33333334 @@ -18144,7 +18164,7 @@ ParticleSystem: - serializedVersion: 3 time: 1 value: 1 - inSlope: 2 + inSlope: 1 outSlope: 0 tangentMode: 0 weightedMode: 0 @@ -18187,9 +18207,9 @@ ParticleSystem: m_Curve: - serializedVersion: 3 time: 0 - value: -1 + value: 0 inSlope: 0 - outSlope: 2 + outSlope: 1 tangentMode: 0 weightedMode: 0 inWeight: 0.33333334 @@ -18197,7 +18217,7 @@ ParticleSystem: - serializedVersion: 3 time: 1 value: 1 - inSlope: 2 + inSlope: 1 outSlope: 0 tangentMode: 0 weightedMode: 0 @@ -18240,9 +18260,9 @@ ParticleSystem: m_Curve: - serializedVersion: 3 time: 0 - value: -1 + value: 0 inSlope: 0 - outSlope: 2 + outSlope: 1 tangentMode: 0 weightedMode: 0 inWeight: 0.33333334 @@ -18250,7 +18270,7 @@ ParticleSystem: - serializedVersion: 3 time: 1 value: 1 - inSlope: 2 + inSlope: 1 outSlope: 0 tangentMode: 0 weightedMode: 0 @@ -18846,7 +18866,13 @@ ParticleSystem: multiplyColliderForceByParticleSize: 0 multiplyColliderForceByParticleSpeed: 0 multiplyColliderForceByCollisionAngle: 1 - m_Planes: [] + m_Planes: + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} m_Dampen: serializedVersion: 2 minMaxState: 0 @@ -19027,7 +19053,13 @@ ParticleSystem: exit: 0 colliderQueryMode: 0 radiusScale: 1 - primitives: [] + primitives: + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} SubModule: serializedVersion: 2 enabled: 0 @@ -19975,14 +20007,14 @@ ParticleSystem: m_PostInfinity: 2 m_RotationOrder: 4 vectorLabel1_3: W ---- !u!199 &3886210157150429879 +--- !u!199 &6505870195547170246 ParticleSystemRenderer: serializedVersion: 6 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8849523932906004753} + m_GameObject: {fileID: 8566834211625758416} m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 @@ -20014,9 +20046,9 @@ ParticleSystemRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: -755315459 - m_SortingLayer: 1 - m_SortingOrder: 0 + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 5 m_RenderMode: 0 m_MeshDistribution: 0 m_SortMode: 0 diff --git a/Assets/Scenes/MainMenu.unity b/Assets/Scenes/MainMenu.unity index b72afc0a4c..097688f1a7 100644 --- a/Assets/Scenes/MainMenu.unity +++ b/Assets/Scenes/MainMenu.unity @@ -2343,10 +2343,10 @@ RectTransform: m_Father: {fileID: 823064026} m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 24} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 130, y: -484} + m_SizeDelta: {x: 260, y: 24} m_Pivot: {x: 0.5, y: 1} --- !u!114 &66575388 MonoBehaviour: @@ -2481,9 +2481,9 @@ RectTransform: m_Father: {fileID: 698007182} m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 130, y: -110} m_SizeDelta: {x: 260, y: 24} m_Pivot: {x: 0.5, y: 1} --- !u!114 &75133766 @@ -2633,9 +2633,9 @@ RectTransform: m_Father: {fileID: 698007182} m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 130, y: -136} m_SizeDelta: {x: 260, y: 24} m_Pivot: {x: 0.5, y: 1} --- !u!114 &75580657 @@ -2784,9 +2784,9 @@ RectTransform: m_Father: {fileID: 698007182} m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 130, y: -188} m_SizeDelta: {x: 260, y: 24} m_Pivot: {x: 0.5, y: 1} --- !u!114 &77529301 @@ -2934,10 +2934,10 @@ RectTransform: m_Father: {fileID: 823064026} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 30} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 130, y: -19} + m_SizeDelta: {x: 260, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &80074248 MonoBehaviour: @@ -3975,9 +3975,9 @@ RectTransform: m_Father: {fileID: 698007182} m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 130, y: -15} m_SizeDelta: {x: 260, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &153817299 @@ -6885,9 +6885,9 @@ RectTransform: m_Father: {fileID: 698007182} m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 130, y: -32} m_SizeDelta: {x: 260, y: 24} m_Pivot: {x: 0.5, y: 1} --- !u!114 &256353508 @@ -14164,9 +14164,9 @@ RectTransform: m_Father: {fileID: 698007182} m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 130, y: -255} m_SizeDelta: {x: 260, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &402645375 @@ -15608,10 +15608,10 @@ RectTransform: m_Father: {fileID: 823064026} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 34} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 130, y: -98} + m_SizeDelta: {x: 260, y: 34} m_Pivot: {x: 0.5, y: 1} --- !u!114 &438218786 MonoBehaviour: @@ -16401,7 +16401,7 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 36.4 + m_fontSize: 36.35 m_fontSizeBase: 24 m_fontWeight: 400 m_enableAutoSizing: 1 @@ -17040,10 +17040,10 @@ RectTransform: m_Father: {fileID: 823064026} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 24} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 130, y: -36} + m_SizeDelta: {x: 260, y: 24} m_Pivot: {x: 0.5, y: 1} --- !u!114 &485322299 MonoBehaviour: @@ -23536,10 +23536,10 @@ RectTransform: m_Father: {fileID: 823064026} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 34} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 130, y: -62} + m_SizeDelta: {x: 260, y: 34} m_Pivot: {x: 0.5, y: 1} --- !u!114 &574816556 MonoBehaviour: @@ -24778,10 +24778,10 @@ RectTransform: m_Father: {fileID: 823064026} m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 24} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 130, y: -134} + m_SizeDelta: {x: 260, y: 24} m_Pivot: {x: 0.5, y: 1} --- !u!114 &644584041 MonoBehaviour: @@ -26682,10 +26682,10 @@ RectTransform: m_Father: {fileID: 823064026} m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 0, y: -321} + m_SizeDelta: {x: 260, y: 322} m_Pivot: {x: 0, y: 0.5} --- !u!114 &698007183 MonoBehaviour: @@ -28213,9 +28213,9 @@ RectTransform: m_Father: {fileID: 698007182} m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 130, y: -84} m_SizeDelta: {x: 260, y: 24} m_Pivot: {x: 0.5, y: 1} --- !u!114 &745954561 @@ -36971,9 +36971,9 @@ RectTransform: m_Father: {fileID: 698007182} m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 130, y: -214} m_SizeDelta: {x: 260, y: 24} m_Pivot: {x: 0.5, y: 1} --- !u!114 &899502179 @@ -43992,9 +43992,9 @@ RectTransform: m_Father: {fileID: 698007182} m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 130, y: -298} m_SizeDelta: {x: 260, y: 24} m_Pivot: {x: 0.5, y: 1} --- !u!114 &1259822364 @@ -46463,8 +46463,8 @@ MonoBehaviour: m_TargetGraphic: {fileID: 47220571} m_HandleRect: {fileID: 47220570} m_Direction: 2 - m_Value: 0.99999964 - m_Size: 0.67460775 + m_Value: 1.0000004 + m_Size: 0.6740643 m_NumberOfSteps: 0 m_OnValueChanged: m_PersistentCalls: @@ -49736,9 +49736,9 @@ RectTransform: m_Father: {fileID: 698007182} m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 130, y: -58} m_SizeDelta: {x: 260, y: 24} m_Pivot: {x: 0.5, y: 1} --- !u!114 &1488925096 @@ -75174,9 +75174,9 @@ RectTransform: m_Father: {fileID: 698007182} m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 130, y: -284} m_SizeDelta: {x: 260, y: 24} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1585506762 @@ -75848,7 +75848,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0.000030517578} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 0} --- !u!114 &1603668786 @@ -76027,13 +76027,13 @@ RectTransform: - {fileID: 1037881117} - {fileID: 1324877903} - {fileID: 820727546} + - {fileID: 276608279} + - {fileID: 2146222519} - {fileID: 1248603849} - {fileID: 805109805} - {fileID: 1349017560} - {fileID: 986802542} - {fileID: 2127289170} - - {fileID: 276608279} - - {fileID: 2146222519} - {fileID: 566761497} m_Father: {fileID: 0} m_RootOrder: 2 @@ -89285,9 +89285,9 @@ RectTransform: m_Father: {fileID: 698007182} m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 130, y: -162} m_SizeDelta: {x: 260, y: 24} m_Pivot: {x: 0.5, y: 1} --- !u!114 &2007433170 diff --git a/Assets/Scripts/BuildInfo.cs b/Assets/Scripts/BuildInfo.cs index 20e9ad9d41..252f6c0f11 100644 --- a/Assets/Scripts/BuildInfo.cs +++ b/Assets/Scripts/BuildInfo.cs @@ -1 +1 @@ -public static class BuildInfo{public static string BUILD_TIME = "11/26/2023 12:49:14 AM";} +public static class BuildInfo{public static string BUILD_TIME = "12/2/2023 11:36:07 PM";} diff --git a/Assets/Scripts/Camera/CameraController.cs.meta b/Assets/Scripts/Camera/CameraController.cs.meta index 2afea42b42..4634ca8587 100644 --- a/Assets/Scripts/Camera/CameraController.cs.meta +++ b/Assets/Scripts/Camera/CameraController.cs.meta @@ -4,7 +4,7 @@ MonoImporter: externalObjects: {} serializedVersion: 2 defaultReferences: [] - executionOrder: 3 + executionOrder: 4 icon: {instanceID: 0} userData: assetBundleName: diff --git a/Assets/Scripts/Entity/Enemy/HoldableEntity.cs b/Assets/Scripts/Entity/Enemy/HoldableEntity.cs index f24be9c881..49126d6771 100644 --- a/Assets/Scripts/Entity/Enemy/HoldableEntity.cs +++ b/Assets/Scripts/Entity/Enemy/HoldableEntity.cs @@ -44,13 +44,12 @@ public override void FixedUpdateNetwork() { if (Holder) { body.Velocity = Holder.body.Velocity; body.Position = Holder.body.Position + (Vector2) holderOffset; - - fusionHitbox.HitboxActive = hitbox.enabled = false; + hitbox.enabled = false; body.IsKinematic = true; CheckForEntityCollisions(); } else { - fusionHitbox.HitboxActive = hitbox.enabled = true; + hitbox.enabled = true; body.IsKinematic = false; base.FixedUpdateNetwork(); } diff --git a/Assets/Scripts/Entity/Enemy/KillableEntity.cs b/Assets/Scripts/Entity/Enemy/KillableEntity.cs index ea2eaf299f..855797c482 100644 --- a/Assets/Scripts/Entity/Enemy/KillableEntity.cs +++ b/Assets/Scripts/Entity/Enemy/KillableEntity.cs @@ -89,7 +89,6 @@ public override Vector2 FrozenOffset { [SerializeField] protected bool flipSpriteRenderer = false; //---Components - [SerializeField] public Hitbox fusionHitbox; [SerializeField] public BoxCollider2D hitbox; [SerializeField] protected Animator animator; [SerializeField] protected LegacyAnimateSpriteRenderer legacyAnimation; @@ -97,7 +96,6 @@ public override Vector2 FrozenOffset { public override void OnValidate() { base.OnValidate(); - if (!fusionHitbox) fusionHitbox = GetComponent(); if (!hitbox) hitbox = GetComponent(); if (!animator) animator = GetComponentInChildren(); if (!sRenderer) sRenderer = GetComponentInChildren(); @@ -379,7 +377,6 @@ public override void Freeze(FrozenCube cube) { public override void Unfreeze(UnfreezeReason reasonByte) { IsFrozen = false; hitbox.enabled = true; - fusionHitbox.HitboxActive = true; SpecialKill(false, false, 0); } diff --git a/Assets/Scripts/Entity/Enemy/Koopa.cs b/Assets/Scripts/Entity/Enemy/Koopa.cs index 5e836cfe01..f4fc613199 100644 --- a/Assets/Scripts/Entity/Enemy/Koopa.cs +++ b/Assets/Scripts/Entity/Enemy/Koopa.cs @@ -92,8 +92,7 @@ public override void FixedUpdateNetwork() { PhysicsDataStruct data = body.Data; if (IsInShell) { hitbox.size = inShellHitboxSize; - fusionHitbox.BoxExtents = hitbox.size * 0.5f; - fusionHitbox.Offset = hitbox.offset = inShellHitboxOffset; + hitbox.offset = inShellHitboxOffset; if (IsStationary) { if (data.OnGround && body.Velocity.y < 1) @@ -106,8 +105,7 @@ public override void FixedUpdateNetwork() { } } else { hitbox.size = outShellHitboxSize; - fusionHitbox.BoxExtents = hitbox.size * 0.5f; - fusionHitbox.Offset = hitbox.offset = outShellHitboxOffset; + hitbox.offset = outShellHitboxOffset; } if (!Holder && !IsStationary) { diff --git a/Assets/Scripts/Entity/Enemy/PiranhaPlant.cs b/Assets/Scripts/Entity/Enemy/PiranhaPlant.cs index 1582910671..7d44e4600e 100644 --- a/Assets/Scripts/Entity/Enemy/PiranhaPlant.cs +++ b/Assets/Scripts/Entity/Enemy/PiranhaPlant.cs @@ -62,7 +62,7 @@ public override void FixedUpdateNetwork() { } if (IsDead) { - fusionHitbox.HitboxActive = hitbox.enabled = false; + hitbox.enabled = false; PopupAnimationTime = 0; ChompTimer = TickTimer.None; return; @@ -99,7 +99,7 @@ public override void FixedUpdateNetwork() { float change = (1f / popupTime) * Runner.DeltaTime * (chomping ? 1 : -1); PopupAnimationTime = Mathf.Clamp01(PopupAnimationTime + change); - fusionHitbox.HitboxActive = hitbox.enabled = PopupAnimationTime >= 0.01f; + hitbox.enabled = PopupAnimationTime >= 0.01f; hitbox.transform.localPosition = new(0, (PopupAnimationTime - 1) * popupDistance, 0); } diff --git a/Assets/Scripts/Entity/Fireball.cs b/Assets/Scripts/Entity/Fireball.cs index 47ee765161..fcc36bd9c1 100644 --- a/Assets/Scripts/Entity/Fireball.cs +++ b/Assets/Scripts/Entity/Fireball.cs @@ -5,6 +5,7 @@ using NSMB.Extensions; using NSMB.Game; using NSMB.Tiles; +using NSMB.Utils; namespace NSMB.Entities { @@ -20,7 +21,8 @@ public class Fireball : BasicEntity, IPlayerInteractable, IFireballInteractable [Networked] private float CurrentSpeed { get; set; } [Networked] public NetworkBool AlreadyBounced { get; set; } [Networked] public NetworkBool IsIceball { get; set; } - [Networked] public byte BreakEffectAnimCounter { get; set; } + [Networked] public int InactiveTick { get; set; } + [Networked] private Vector2 BreakEffectLocation { get; set; } //---Serialized Variables [SerializeField] private ParticleSystem iceBreak, fireBreak, iceTrail, fireTrail; @@ -59,7 +61,7 @@ public void Initialize(PlayerController owner, Vector2 spawnpoint, bool ice, boo body.Position = spawnpoint; body.Freeze = false; body.Velocity = new(CurrentSpeed * (FacingRight ? 1 : -1), -CurrentSpeed); - Object.AssignInputAuthority(owner.Object.InputAuthority); + Runner.SetIsSimulated(Object, !owner.IsProxy); } public override void Spawned() { @@ -86,7 +88,7 @@ public override void Render() { public override void FixedUpdateNetwork() { body.Freeze = !IsActive; - hitbox.enabled = IsActive; + gameObject.layer = IsActive ? Layers.LayerEntity : Layers.LayerEntityNoGroundEntity; if (!IsActive) { body.Velocity = Vector2.zero; @@ -156,8 +158,8 @@ private bool CheckForEntityCollision() { continue; if (collidedObject.GetComponentInParent() is IFireballInteractable interactable) { - // Don't interact with our owner - if (interactable is PlayerController player && player == Owner) + // Don't interact with players in this way + if (interactable is PlayerController) continue; bool result = IsIceball ? interactable.InteractWithIceball(this) : interactable.InteractWithFireball(this); @@ -174,12 +176,20 @@ private bool CheckForEntityCollision() { //---BasicEntity overrides public override void DespawnEntity(object data = null) { - if (data is not bool playEffect || playEffect) - BreakEffectAnimCounter++; + if (data is not bool playEffect || playEffect) { + if (body.Position.y > GameManager.Instance.LevelMinY && GameManager.Instance.GameState != Enums.GameState.Ended) { + if (body.Position == BreakEffectLocation) { + BreakEffectLocation += Vector2.up * 0.01f; + } else { + BreakEffectLocation = body.Position; + } + } + } IsActive = false; - hitbox.enabled = IsActive; + InactiveTick = Runner.Tick; body.Freeze = true; + body.Position = new(0, -1000); // Bodge... } public override void OnIsActiveChanged() { @@ -215,12 +225,12 @@ public override void OnIsActiveChanged() { //---IPlayerInteractable overrides public void InteractWithPlayer(PlayerController player, PhysicsDataStruct.IContactStruct contact = null) { // If we're not active, don't collide. - if (!IsActive) - return; + //if (!IsActive) + // return; // Don't interact with proxies - if (IsProxy) - return; + //if (IsProxy) + // return; // Check if they own us. If so, don't collide. if (Owner == player) @@ -321,25 +331,18 @@ protected override void HandleRenderChanges(bool fillBuffer, ref NetworkBehaviou foreach (var change in ChangesBuffer) { switch (change) { - case nameof(BreakEffectAnimCounter): - OnBreakEffectAnimCounterChanged(); + case nameof(BreakEffectLocation): + OnBreakEffectLocationChanged(); break; } } } - public void OnBreakEffectAnimCounterChanged() { + public void OnBreakEffectLocationChanged() { if (GameManager.Instance.GameState != Enums.GameState.Playing) return; - // Don't play particles below the killplane - if (body.Position.y < GameManager.Instance.LevelMinY) - return; - - // Or if the game is over - if (GameManager.Instance.GameState == Enums.GameState.Ended) - return; - + sfx.transform.position = BreakEffectLocation; if (IsIceball) { iceBreak.Play(); sfx.PlayOneShot(Enums.Sounds.Powerup_Iceball_Break); diff --git a/Assets/Scripts/Entity/Player/PlayerController.cs b/Assets/Scripts/Entity/Player/PlayerController.cs index 57bace97d4..6c373f6f75 100644 --- a/Assets/Scripts/Entity/Player/PlayerController.cs +++ b/Assets/Scripts/Entity/Player/PlayerController.cs @@ -23,7 +23,6 @@ public class PlayerController : FreezableEntity, IPlayerInteractable, IBeforeTic //---Static Variables private static readonly List CollidedObjects = new(16); private static readonly List LagCompensatedBuffer = new(16); - private static readonly ContactPoint2D[] TileContactBuffer = new ContactPoint2D[32]; private static readonly Vector3 ZeroPointFive = Vector3.one * 0.5f; private static readonly Vector2 GroundpoundStartUpwardsVelocity = Vector2.up * 1.5f; diff --git a/Assets/Scripts/Entity/World Elements/FrozenCube.cs b/Assets/Scripts/Entity/World Elements/FrozenCube.cs index 27daaddf4d..6d20a0d2b0 100644 --- a/Assets/Scripts/Entity/World Elements/FrozenCube.cs +++ b/Assets/Scripts/Entity/World Elements/FrozenCube.cs @@ -9,7 +9,6 @@ namespace NSMB.Entities { - //[OrderAfter(typeof(NetworkPhysicsSimulation2D), typeof(BasicEntity), typeof(FreezableEntity), typeof(PlayerController))] public class FrozenCube : HoldableEntity { //---Networked Variables @@ -42,8 +41,7 @@ public override void Spawned() { sRenderer.size = CubeSize; hitbox.size = CubeSize - (Vector2.one * 0.05f); - fusionHitbox.BoxExtents = hitbox.size * 0.5f; - fusionHitbox.Offset = hitbox.offset = CubeSize * Vector2.up * 0.5f; + hitbox.offset = CubeSize * Vector2.up * 0.5f; AutoBreakTimer = TickTimer.CreateFromSeconds(Runner, autoBreak); flying = FrozenEntity.IsFlying; @@ -59,13 +57,14 @@ public override void Spawned() { body.LockX = true; transform.position = new(transform.position.x, transform.position.y, -4.5f); + Runner.SetIsSimulated(Object, true); } public override void Despawned(NetworkRunner runner, bool hasState) { Instantiate(PrefabList.Instance.Particle_IceBreak, transform.position, Quaternion.identity); } - public void LateUpdate() { + public override void Render() { if (!Object || IsDead) return; diff --git a/Assets/Scripts/Entity/World Elements/FrozenCube.cs.meta b/Assets/Scripts/Entity/World Elements/FrozenCube.cs.meta index 33402f332f..ab67163fb7 100644 --- a/Assets/Scripts/Entity/World Elements/FrozenCube.cs.meta +++ b/Assets/Scripts/Entity/World Elements/FrozenCube.cs.meta @@ -4,7 +4,7 @@ MonoImporter: externalObjects: {} serializedVersion: 2 defaultReferences: [] - executionOrder: 0 + executionOrder: 1 icon: {instanceID: 0} userData: assetBundleName: diff --git a/Assets/Scripts/Entity/World Elements/SpinnerAnimator.cs.meta b/Assets/Scripts/Entity/World Elements/SpinnerAnimator.cs.meta index c144627a86..601d4632e4 100644 --- a/Assets/Scripts/Entity/World Elements/SpinnerAnimator.cs.meta +++ b/Assets/Scripts/Entity/World Elements/SpinnerAnimator.cs.meta @@ -4,7 +4,7 @@ MonoImporter: externalObjects: {} serializedVersion: 2 defaultReferences: [] - executionOrder: 2 + executionOrder: 3 icon: {instanceID: 0} userData: assetBundleName: diff --git a/Assets/Scripts/UI/CopyNdsTextureRect.cs.meta b/Assets/Scripts/UI/CopyNdsTextureRect.cs.meta index 0dacc04f8c..af0f19bb8c 100644 --- a/Assets/Scripts/UI/CopyNdsTextureRect.cs.meta +++ b/Assets/Scripts/UI/CopyNdsTextureRect.cs.meta @@ -4,7 +4,7 @@ MonoImporter: externalObjects: {} serializedVersion: 2 defaultReferences: [] - executionOrder: 1 + executionOrder: 2 icon: {instanceID: 0} userData: assetBundleName: