diff --git a/Assets/Animations/Player/LargeMario.controller b/Assets/Animations/Player/LargeMario.controller index 024891872e..c434767011 100644 --- a/Assets/Animations/Player/LargeMario.controller +++ b/Assets/Animations/Player/LargeMario.controller @@ -2541,7 +2541,7 @@ AnimatorStateMachine: m_ChildStates: - serializedVersion: 1 m_State: {fileID: 1845189190766526232} - m_Position: {x: 390, y: -60, z: 0} + m_Position: {x: 380, y: -50, z: 0} - serializedVersion: 1 m_State: {fileID: 8826979694417718771} m_Position: {x: 330, y: -240, z: 0} @@ -7699,6 +7699,7 @@ AnimatorState: - {fileID: 4894904616591535691} - {fileID: 9069095688745646150} - {fileID: -7498916699414110505} + - {fileID: 3330693736813034973} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -8118,7 +8119,7 @@ AnimatorStateTransition: m_Mute: 0 m_IsExit: 0 serializedVersion: 3 - m_TransitionDuration: 0.03 + m_TransitionDuration: 0.1 m_TransitionOffset: 0 m_ExitTime: 0.0000000013882355 m_HasExitTime: 0 @@ -8592,6 +8593,31 @@ AnimatorStateTransition: m_InterruptionSource: 4 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 +--- !u!1101 &3330693736813034973 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: walljump + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 1434773044762740820} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1101 &3346518834524555779 AnimatorStateTransition: m_ObjectHideFlags: 1 diff --git a/Assets/Photon/Fusion/Resources/NetworkProjectConfig.fusion b/Assets/Photon/Fusion/Resources/NetworkProjectConfig.fusion index 68a0883940..a874988429 100644 --- a/Assets/Photon/Fusion/Resources/NetworkProjectConfig.fusion +++ b/Assets/Photon/Fusion/Resources/NetworkProjectConfig.fusion @@ -31,7 +31,7 @@ "ReliableDataTransferModes": 3 }, "HostMigration": { - "EnableAutoUpdate": false, + "EnableAutoUpdate": true, "UpdateDelay": 10 }, "NetworkConditions": { diff --git a/Assets/Resources/Data/credits.txt b/Assets/Resources/Data/credits.txt index ffd5dcf57a..c6692b9f9f 100644 --- a/Assets/Resources/Data/credits.txt +++ b/Assets/Resources/Data/credits.txt @@ -36,12 +36,12 @@ AtwerJ Bilhal Cecilia Davo -Dede Filipianosol Flandre Scarlet Flichka Freeze HatsuneMiku +haywireghost HD Erick Games Hyruyoshi Iketarou diff --git a/Assets/Resources/Data/lang/en-us.json b/Assets/Resources/Data/lang/en-us.json index 636de35112..36b0bd7637 100644 --- a/Assets/Resources/Data/lang/en-us.json +++ b/Assets/Resources/Data/lang/en-us.json @@ -84,6 +84,11 @@ "ui.options.audio.mutemusic": "Mute Music when window loses focus", "ui.options.audio.mutesfx": "Mute SFX when window loses focus", "ui.options.audio.directionalaudio": "Directional Audio", + "ui.options.audio.specialpowerupmusic": "Special Powerup Music", + "ui.options.audio.specialpowerupmusic.starman": "Starman Only", + "ui.options.audio.specialpowerupmusic.megamushroom": "Mega Mushroom Only", + "ui.options.audio.specialpowerupmusic.both": "Both Starman & Mega Mushroom", + "ui.options.audio.specialpowerupmusic.localonly": "Disable Special Powerup Music for Other Players", "ui.options.controls.header.keyboardprimary": "Keyboard Primary", "ui.options.controls.header.keyboardsecondary": "Keyboard Secondary", "ui.options.controls.header.gamepadprimary": "Gamepad Primary", @@ -156,6 +161,8 @@ "ui.inroom.settings.room.roomidhidden": "", "ui.inroom.buttons.start": "Start Game", "ui.inroom.buttons.starting": "Starting in {countdown}...", + "ui.inroom.buttons.readyup": "Ready Up!", + "ui.inroom.buttons.unready": "Unready", "ui.inroom.buttons.exit": "Exit Room", "ui.inroom.chat.prompt": "Enter text...", "ui.inroom.chat.send": "Send", diff --git a/Assets/Resources/Prefabs/BigStar.prefab b/Assets/Resources/Prefabs/BigStar.prefab index ddfd3b9743..6f7850f9e3 100644 --- a/Assets/Resources/Prefabs/BigStar.prefab +++ b/Assets/Resources/Prefabs/BigStar.prefab @@ -4854,6 +4854,8 @@ GameObject: - component: {fileID: 8025866746367081787} - component: {fileID: -4356651289696895989} - component: {fileID: 4392193488416578036} + - component: {fileID: 1779108696006128181} + - component: {fileID: 9186129651980250131} m_Layer: 9 m_Name: BigStar m_TagString: Untagged @@ -5137,6 +5139,7 @@ MonoBehaviour: NetworkedBehaviours: - {fileID: 1973747262660636110} - {fileID: 4392193488416578036} + - {fileID: 1779108696006128181} --- !u!114 &4392193488416578036 MonoBehaviour: m_ObjectHideFlags: 0 @@ -5168,11 +5171,48 @@ MonoBehaviour: Data: 0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 _PreviousTickPosition: {x: 0, y: 0} _PreviousTickVelocity: {x: 0, y: 0} - interpolationTarget: {fileID: 8519953457714558423} activeCollider: {fileID: 1973747262660636111} maxFloorAngle: 70 interpolationTeleportDistance: 1 bounceOnImpacts: 0 +--- !u!114 &1779108696006128181 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1973747262660636106} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1039544458, guid: e725a070cec140c4caffb81624c8c787, type: 3} + m_Name: + m_EditorClassIdentifier: + Config: 3 + BroadRadius: 0.55 + Offset: {x: 0, y: 0, z: 0} + GizmosColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + Hitboxes: + - {fileID: 9186129651980250131} +--- !u!114 &9186129651980250131 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1973747262660636106} + 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.375, y: 0.375, z: 1} + CapsuleHeight: 0 + Offset: {x: 0, y: 0, z: 0} + Root: {fileID: 1779108696006128181} + GizmosColor: {r: 1, g: 0.92156863, b: 0.015686275, a: 1} --- !u!1 &6306428316705399139 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Prefabs/Enemy/BlueKoopa.prefab b/Assets/Resources/Prefabs/Enemy/BlueKoopa.prefab index cea146ca6c..9bac3ee768 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: 3 + value: 4 objectReference: {fileID: 0} - target: {fileID: 2331939488413250953, guid: 8cf8f49ac0882ed44953ea53ff901f11, type: 3} @@ -58,6 +58,11 @@ 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] @@ -260,3 +265,15 @@ 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 0dc607c5cc..af680453c1 100644 --- a/Assets/Resources/Prefabs/Enemy/Bobomb.prefab +++ b/Assets/Resources/Prefabs/Enemy/Bobomb.prefab @@ -122,6 +122,8 @@ 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 @@ -173,6 +175,7 @@ MonoBehaviour: collideWithOtherEnemies: 1 dieWhenInsideBlock: 1 flipSpriteRenderer: 1 + fusionHitbox: {fileID: 161037357079201089} hitbox: {fileID: 3286581577125373962} animator: {fileID: 8735478572021304808} legacyAnimation: {fileID: 0} @@ -394,6 +397,7 @@ MonoBehaviour: - {fileID: 3286581577125373967} - {fileID: -2214749743101336736} - {fileID: 6128206130774469154} + - {fileID: 1819210150938506519} --- !u!114 &6128206130774469154 MonoBehaviour: m_ObjectHideFlags: 0 @@ -429,3 +433,41 @@ 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 1c5bbd027b..0491eff0e7 100644 --- a/Assets/Resources/Prefabs/Enemy/BulletBill.prefab +++ b/Assets/Resources/Prefabs/Enemy/BulletBill.prefab @@ -50,7 +50,7 @@ ParticleSystem: emitterVelocityMode: 1 looping: 1 prewarm: 0 - playOnAwake: 1 + playOnAwake: 0 useUnscaledTime: 0 autoRandomSeed: 1 startDelay: @@ -4989,6 +4989,8 @@ 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 @@ -5042,6 +5044,7 @@ MonoBehaviour: collideWithOtherEnemies: 0 dieWhenInsideBlock: 0 flipSpriteRenderer: 0 + fusionHitbox: {fileID: 5538623755841512650} hitbox: {fileID: 2627485830306083576} animator: {fileID: 0} legacyAnimation: {fileID: 5184426367989315057} @@ -5241,12 +5244,13 @@ MonoBehaviour: ObjectInterest: 0 _DestroyWhenStateAuthorityLeaves: 0 _AllowStateAuthorityOverride: 0 - Flags: 2305 + Flags: 264449 NestedObjects: [] NetworkedBehaviours: - {fileID: 2721581803245764244} - {fileID: 3529903825791625940} - {fileID: 2108662388035762444} + - {fileID: 5805536510871160121} --- !u!114 &2108662388035762444 MonoBehaviour: m_ObjectHideFlags: 0 @@ -5282,6 +5286,44 @@ 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 99799db2e7..446704ff8a 100644 --- a/Assets/Resources/Prefabs/Enemy/Goomba.prefab +++ b/Assets/Resources/Prefabs/Enemy/Goomba.prefab @@ -129,6 +129,8 @@ 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 @@ -180,6 +182,7 @@ MonoBehaviour: collideWithOtherEnemies: 1 dieWhenInsideBlock: 1 flipSpriteRenderer: 0 + fusionHitbox: {fileID: 5049607885718933112} hitbox: {fileID: 7523289063499453452} animator: {fileID: 0} legacyAnimation: {fileID: 2072787540995169967} @@ -393,6 +396,7 @@ MonoBehaviour: - {fileID: 7523289063499453453} - {fileID: 2884479414836889194} - {fileID: 4636113223263193814} + - {fileID: 5387141680540000291} --- !u!114 &4636113223263193814 MonoBehaviour: m_ObjectHideFlags: 0 @@ -428,3 +432,41 @@ 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 be31321043..659415cd66 100644 --- a/Assets/Resources/Prefabs/Enemy/Koopa.prefab +++ b/Assets/Resources/Prefabs/Enemy/Koopa.prefab @@ -154,6 +154,8 @@ 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 @@ -205,6 +207,7 @@ MonoBehaviour: collideWithOtherEnemies: 1 dieWhenInsideBlock: 1 flipSpriteRenderer: 0 + fusionHitbox: {fileID: 1452744309787896686} hitbox: {fileID: 8836298984178612584} animator: {fileID: 3696720750550087088} legacyAnimation: {fileID: 0} @@ -434,12 +437,13 @@ MonoBehaviour: ObjectInterest: 0 _DestroyWhenStateAuthorityLeaves: 0 _AllowStateAuthorityOverride: 0 - Flags: 2305 + Flags: 264449 NestedObjects: [] NetworkedBehaviours: - {fileID: 8836298984178612580} - {fileID: 7052311415719264077} - {fileID: 5521876106847805377} + - {fileID: 3429113869676871066} --- !u!114 &5521876106847805377 MonoBehaviour: m_ObjectHideFlags: 0 @@ -475,3 +479,41 @@ 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 26cd95cb57..d74a1d8113 100644 --- a/Assets/Resources/Prefabs/Enemy/PiranhaPlant.prefab +++ b/Assets/Resources/Prefabs/Enemy/PiranhaPlant.prefab @@ -247,6 +247,8 @@ GameObject: m_Component: - component: {fileID: 4904021044407665645} - component: {fileID: 1094213376118772922} + - component: {fileID: 8284551372080845912} + - component: {fileID: 6666574227332119760} m_Layer: 0 m_Name: Hitbox m_TagString: Untagged @@ -314,6 +316,44 @@ 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 @@ -377,6 +417,7 @@ MonoBehaviour: collideWithOtherEnemies: 1 dieWhenInsideBlock: 0 flipSpriteRenderer: 0 + fusionHitbox: {fileID: 6666574227332119760} hitbox: {fileID: 1094213376118772922} animator: {fileID: 863355600414429673} legacyAnimation: {fileID: 0} @@ -404,7 +445,8 @@ MonoBehaviour: ObjectInterest: 1 _DestroyWhenStateAuthorityLeaves: 0 _AllowStateAuthorityOverride: 0 - Flags: 2305 + Flags: 264449 NestedObjects: [] NetworkedBehaviours: - {fileID: 3689884099564413062} + - {fileID: 8284551372080845912} diff --git a/Assets/Resources/Prefabs/Enemy/Spiny.prefab b/Assets/Resources/Prefabs/Enemy/Spiny.prefab index 6ee1eabeb9..07b7553093 100644 --- a/Assets/Resources/Prefabs/Enemy/Spiny.prefab +++ b/Assets/Resources/Prefabs/Enemy/Spiny.prefab @@ -16,6 +16,8 @@ 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 @@ -67,6 +69,7 @@ MonoBehaviour: collideWithOtherEnemies: 1 dieWhenInsideBlock: 1 flipSpriteRenderer: 1 + fusionHitbox: {fileID: 9117317993469272409} hitbox: {fileID: 1435431862184428453} animator: {fileID: 1376368638781678059} legacyAnimation: {fileID: 0} @@ -301,6 +304,7 @@ MonoBehaviour: - {fileID: 618591213112214914} - {fileID: 618591213112214912} - {fileID: 8932310739204336522} + - {fileID: 4058743376998638202} --- !u!114 &8932310739204336522 MonoBehaviour: m_ObjectHideFlags: 0 @@ -336,6 +340,44 @@ 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 807a8a3b4b..073d2bd90d 100644 --- a/Assets/Resources/Prefabs/Fireball.prefab +++ b/Assets/Resources/Prefabs/Fireball.prefab @@ -4901,6 +4901,8 @@ GameObject: - component: {fileID: 844320328102276428} - component: {fileID: 2644380969240041381} - component: {fileID: 5158080774805734746} + - component: {fileID: 1200111384242601477} + - component: {fileID: 4930450600683655096} m_Layer: 9 m_Name: Fireball m_TagString: Untagged @@ -5141,11 +5143,12 @@ MonoBehaviour: ObjectInterest: 0 _DestroyWhenStateAuthorityLeaves: 0 _AllowStateAuthorityOverride: 0 - Flags: 2305 + Flags: 264449 NestedObjects: [] NetworkedBehaviours: - {fileID: 1164692562165207756} - {fileID: 5158080774805734746} + - {fileID: 1200111384242601477} --- !u!114 &5158080774805734746 MonoBehaviour: m_ObjectHideFlags: 0 @@ -5177,11 +5180,48 @@ MonoBehaviour: Data: 0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 _PreviousTickPosition: {x: 0, y: 0} _PreviousTickVelocity: {x: 0, y: 0} - interpolationTarget: {fileID: 3150262645453679834} 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 diff --git a/Assets/Resources/Prefabs/FrozenCube.prefab b/Assets/Resources/Prefabs/FrozenCube.prefab index b84bd73b95..8072e21078 100644 --- a/Assets/Resources/Prefabs/FrozenCube.prefab +++ b/Assets/Resources/Prefabs/FrozenCube.prefab @@ -15,6 +15,8 @@ GameObject: - component: {fileID: -4211955845073762521} - component: {fileID: 3997958104174501866} - component: {fileID: 3575323815080525926} + - component: {fileID: 4917212830917736075} + - component: {fileID: 3006671777509063445} m_Layer: 14 m_Name: FrozenCube m_TagString: frozencube @@ -273,6 +275,7 @@ MonoBehaviour: NetworkedBehaviours: - {fileID: 5742616016131993260} - {fileID: 3575323815080525926} + - {fileID: 4917212830917736075} --- !u!114 &3575323815080525926 MonoBehaviour: m_ObjectHideFlags: 0 @@ -304,11 +307,48 @@ MonoBehaviour: Data: 0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 _PreviousTickPosition: {x: 0, y: 0} _PreviousTickVelocity: {x: 0, y: 0} - interpolationTarget: {fileID: 3560772426833456990} activeCollider: {fileID: 7126150137336674110} maxFloorAngle: 70 interpolationTeleportDistance: 1 bounceOnImpacts: 0 +--- !u!114 &4917212830917736075 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4465303805189439310} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1039544458, guid: e725a070cec140c4caffb81624c8c787, type: 3} + m_Name: + m_EditorClassIdentifier: + Config: 3 + BroadRadius: 1.5 + Offset: {x: 0, y: 1, z: 0} + GizmosColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + Hitboxes: + - {fileID: 3006671777509063445} +--- !u!114 &3006671777509063445 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4465303805189439310} + 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.25, y: 0.25, z: 0} + CapsuleHeight: 0 + Offset: {x: 0, y: 0.25, z: 0} + Root: {fileID: 4917212830917736075} + GizmosColor: {r: 1, g: 0.92156863, b: 0.015686275, a: 1} --- !u!1 &5906585881545024381 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Prefabs/Network/TilemapChunk.prefab b/Assets/Resources/Prefabs/Network/TilemapChunk.prefab index 0c37070ed4..162a9d9bf7 100644 --- a/Assets/Resources/Prefabs/Network/TilemapChunk.prefab +++ b/Assets/Resources/Prefabs/Network/TilemapChunk.prefab @@ -10,6 +10,7 @@ GameObject: m_Component: - component: {fileID: 2084930905717922039} - component: {fileID: 6049557798542441352} + - component: {fileID: 4922962586498095092} m_Layer: 0 m_Name: TilemapChunk m_TagString: Untagged @@ -24,13 +25,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 952464375624945634} - serializedVersion: 2 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: [] m_Father: {fileID: 0} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &6049557798542441352 MonoBehaviour: @@ -44,7 +45,27 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 2c33719b6058cda4c9a3669de683f83a, type: 3} m_Name: m_EditorClassIdentifier: + _ChunkX: 0 + _ChunkY: 0 _DirtyCounter: 0 _Tiles: - chunkX: 0 - chunkY: 0 +--- !u!114 &4922962586498095092 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 952464375624945634} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -1552182283, guid: e725a070cec140c4caffb81624c8c787, type: 3} + m_Name: + m_EditorClassIdentifier: + SortKey: 2596058406 + ObjectInterest: 1 + _DestroyWhenStateAuthorityLeaves: 0 + _AllowStateAuthorityOverride: 1 + Flags: 262145 + NestedObjects: [] + NetworkedBehaviours: + - {fileID: 6049557798542441352} diff --git a/Assets/Resources/Prefabs/Network/TilemapChunk.prefab.meta b/Assets/Resources/Prefabs/Network/TilemapChunk.prefab.meta index 88a4b39e01..a6a257e7a4 100644 --- a/Assets/Resources/Prefabs/Network/TilemapChunk.prefab.meta +++ b/Assets/Resources/Prefabs/Network/TilemapChunk.prefab.meta @@ -1,5 +1,7 @@ fileFormatVersion: 2 guid: 455c9006a61c18c42b6f40bbcc702e68 +labels: +- FusionPrefab PrefabImporter: externalObjects: {} userData: diff --git a/Assets/Resources/Prefabs/Static/GlobalController.prefab b/Assets/Resources/Prefabs/Static/GlobalController.prefab index a05fadaabb..4a32fec067 100644 --- a/Assets/Resources/Prefabs/Static/GlobalController.prefab +++ b/Assets/Resources/Prefabs/Static/GlobalController.prefab @@ -744,9 +744,10 @@ MonoBehaviour: BackImage: {fileID: 642796326953640977} _statSourceType: 0 _statId: 11 - StatsPerDefault: 0 WarnThreshold: Infinity ErrorThreshold: Infinity + _fusionStats: {fileID: 0} + CurrentAveraging: 0 _prevStatSourceType: 0 _prevStatId: 11 Height: 50 @@ -761,7 +762,6 @@ MonoBehaviour: LabelAvg: {fileID: 3386187569888437945} LabelLast: {fileID: 250545091140675869} LabelPer: {fileID: 3777236071234719720} - _viewDropdown: {fileID: 1284415430887361585} _avgBttn: {fileID: 0} --- !u!1 &120183250334874720 GameObject: @@ -823,9 +823,10 @@ MonoBehaviour: BackImage: {fileID: 733851372716810545} _statSourceType: 0 _statId: 8 - StatsPerDefault: 0 WarnThreshold: Infinity ErrorThreshold: Infinity + _fusionStats: {fileID: 0} + CurrentAveraging: 0 _prevStatSourceType: 0 _prevStatId: 8 Height: 50 @@ -840,7 +841,6 @@ MonoBehaviour: LabelAvg: {fileID: 2329522123232477150} LabelLast: {fileID: 5521215679319113103} LabelPer: {fileID: 3518790254577100123} - _viewDropdown: {fileID: 8314061201471326487} _avgBttn: {fileID: 0} --- !u!1 &124773306367690372 GameObject: @@ -1653,9 +1653,10 @@ MonoBehaviour: BackImage: {fileID: 5997487037254438652} _statSourceType: 0 _statId: 6 - StatsPerDefault: 0 WarnThreshold: Infinity ErrorThreshold: Infinity + _fusionStats: {fileID: 0} + CurrentAveraging: 0 _prevStatSourceType: 0 _prevStatId: 6 Height: 50 @@ -1670,7 +1671,6 @@ MonoBehaviour: LabelAvg: {fileID: 2587777232962847894} LabelLast: {fileID: 8651654077577904692} LabelPer: {fileID: 1657287485391113911} - _viewDropdown: {fileID: 3329107602078328636} _avgBttn: {fileID: 0} --- !u!1 &197998295086123825 GameObject: @@ -2923,6 +2923,112 @@ MonoBehaviour: loader: {fileID: 0} translationKey: hideOnWebGL: 0 +--- !u!1 &450293994584279393 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 513169403690637356} + - component: {fileID: 7526519907335235220} + - component: {fileID: 133036823315204454} + - component: {fileID: 5167725173034977038} + - component: {fileID: 551156421155030195} + m_Layer: 0 + m_Name: Box + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &513169403690637356 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 450293994584279393} + 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: 161420902757915932} + - {fileID: 5607666438956216428} + - {fileID: 6824658963838236847} + m_Father: {fileID: 7149153274013731236} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: -50, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7526519907335235220 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 450293994584279393} + m_CullTransparentMesh: 1 +--- !u!114 &133036823315204454 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 450293994584279393} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 332771783, guid: 4953af3e17ea87e4586d634426e4eb01, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &5167725173034977038 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 450293994584279393} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0b148fe25e99eb48b9724523833bab1, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Delegates: [] +--- !u!114 &551156421155030195 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 450293994584279393} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d4b43c74b8b68684abcbe13d72db54c3, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &500093706779999451 GameObject: m_ObjectHideFlags: 0 @@ -4465,9 +4571,10 @@ MonoBehaviour: BackImage: {fileID: 1826665933496820097} _statSourceType: 2 _statId: 0 - StatsPerDefault: 0 WarnThreshold: 120 ErrorThreshold: 500 + _fusionStats: {fileID: 0} + CurrentAveraging: 0 _prevStatSourceType: 2 _prevStatId: 0 Height: 50 @@ -4482,7 +4589,6 @@ MonoBehaviour: LabelAvg: {fileID: 876435443985980134} LabelLast: {fileID: 142523458223318561} LabelPer: {fileID: 118945859847932663} - _viewDropdown: {fileID: 17393715256365418} _avgBttn: {fileID: 0} --- !u!1 &734775630822834194 GameObject: @@ -5511,9 +5617,10 @@ MonoBehaviour: BackImage: {fileID: 6089389532436168210} _statSourceType: 2 _statId: 1 - StatsPerDefault: 0 WarnThreshold: Infinity ErrorThreshold: Infinity + _fusionStats: {fileID: 0} + CurrentAveraging: 0 _prevStatSourceType: 2 _prevStatId: 1 Height: 50 @@ -5528,7 +5635,6 @@ MonoBehaviour: LabelAvg: {fileID: 129453171141354693} LabelLast: {fileID: 8927498106435937871} LabelPer: {fileID: 4372928664211014655} - _viewDropdown: {fileID: 3751157538695516562} _avgBttn: {fileID: 0} --- !u!1 &931021387589626079 GameObject: @@ -6348,6 +6454,9 @@ MonoBehaviour: - {fileID: 6824207339685822795} - {fileID: 1568001787883181772} - {fileID: 2617900347259643390} + - {fileID: 5382179545061436095} + - {fileID: 6331288519241955632} + - {fileID: 8732365200367338877} image: {fileID: 8997379764913652068} --- !u!222 &7742166171336746491 CanvasRenderer: @@ -10386,9 +10495,11 @@ MonoBehaviour: graphicsNdsForceAspect: 0 graphicsNdsPixelPerfect: 0 graphicsNametags: 0 + audioSpecialPowerupMusic: 0 audioMuteMusicOnUnfocus: 0 audioMuteSFXOnUnfocus: 0 audioPanning: 0 + audioSpecialPowerupMusicLocalOnly: 0 controlsRumble: 0 controlsFireballSprint: 0 controlsAutoSprint: 0 @@ -11944,9 +12055,10 @@ MonoBehaviour: BackImage: {fileID: 3801149116360218426} _statSourceType: 0 _statId: 14 - StatsPerDefault: 0 WarnThreshold: Infinity ErrorThreshold: Infinity + _fusionStats: {fileID: 0} + CurrentAveraging: 0 _prevStatSourceType: 0 _prevStatId: 14 Height: 50 @@ -11961,7 +12073,6 @@ MonoBehaviour: LabelAvg: {fileID: 7493667627486375091} LabelLast: {fileID: 8936822852894803794} LabelPer: {fileID: 6548828940349172008} - _viewDropdown: {fileID: 54875344253250294} _avgBttn: {fileID: 0} --- !u!1 &1889871890491474850 GameObject: @@ -14471,6 +14582,142 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: Sample +--- !u!1 &2364660454386893933 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4078626837062416803} + - component: {fileID: 1530168364214532259} + - component: {fileID: 5401192972062997368} + m_Layer: 0 + m_Name: Label + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4078626837062416803 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2364660454386893933} + 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: [] + m_Father: {fileID: 7763166677755848528} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0.95, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1530168364214532259 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2364660454386893933} + m_CullTransparentMesh: 1 +--- !u!114 &5401192972062997368 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2364660454386893933} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: Disable Special Powerup Music for Other Players + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 38e8769007229044bb229d69f8cbae74, type: 2} + m_sharedMaterial: {fileID: 3023213983796840565, guid: 38e8769007229044bb229d69f8cbae74, + type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 40 + m_fontSizeBase: 40 + m_fontWeight: 400 + m_enableAutoSizing: 1 + m_fontSizeMin: 40 + m_fontSizeMax: 40 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 50 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 1 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!1 &2390855666597488871 GameObject: m_ObjectHideFlags: 0 @@ -18661,6 +18908,88 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: Prediction Delta Deviation (ms) +--- !u!1 &3063686943916911445 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7149153274013731236} + - component: {fileID: 6331288519241955632} + - component: {fileID: 4874636553619239975} + m_Layer: 0 + m_Name: AudioSpecialPowerupMusic + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &7149153274013731236 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3063686943916911445} + 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: 7273371935928409928} + - {fileID: 513169403690637356} + m_Father: {fileID: 6805564504335040957} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 586, y: -95} + m_SizeDelta: {x: 1172, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &6331288519241955632 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3063686943916911445} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 396ba8eaeed1ce44ba291e8083cfd8ae, type: 3} + m_Name: + m_EditorClassIdentifier: + rectTransform: {fileID: 0} + manager: {fileID: 2572987743764103034} + label: {fileID: 6915814673348286693} + loader: {fileID: 4874636553619239975} + translationKey: ui.options.audio.specialpowerupmusic + hideOnWebGL: 0 + value: 0 + options: + - None + - Starman + - MegaMushroom + - Both Starman & Mega Mushroom + leftButton: {fileID: 6820651797718997062} + rightButton: {fileID: 1645595105058893382} + display: {fileID: 4902473557420699033} + OnValueChanged: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &4874636553619239975 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3063686943916911445} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0245a440c750abe47a2929d561020748, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &3070644235075633813 GameObject: m_ObjectHideFlags: 0 @@ -18857,9 +19186,10 @@ MonoBehaviour: BackImage: {fileID: 2499899044889869121} _statSourceType: 0 _statId: 1 - StatsPerDefault: 0 WarnThreshold: 5 ErrorThreshold: 10 + _fusionStats: {fileID: 0} + CurrentAveraging: 0 _prevStatSourceType: 0 _prevStatId: 1 Height: 50 @@ -18874,7 +19204,6 @@ MonoBehaviour: LabelAvg: {fileID: 4660395529316863178} LabelLast: {fileID: 3185094433908468356} LabelPer: {fileID: 2423782757718365680} - _viewDropdown: {fileID: 2311834913640102276} _avgBttn: {fileID: 0} --- !u!1 &3084122031721064234 GameObject: @@ -21568,9 +21897,10 @@ MonoBehaviour: BackImage: {fileID: 3338289459664905246} _statSourceType: 0 _statId: 5 - StatsPerDefault: 0 WarnThreshold: Infinity ErrorThreshold: Infinity + _fusionStats: {fileID: 0} + CurrentAveraging: 0 _prevStatSourceType: 0 _prevStatId: 5 Height: 50 @@ -21585,7 +21915,6 @@ MonoBehaviour: LabelAvg: {fileID: 1433650640436077956} LabelLast: {fileID: 2551509096449657229} LabelPer: {fileID: 4926447807086503575} - _viewDropdown: {fileID: 986010283829367833} _avgBttn: {fileID: 0} --- !u!1 &3650839943466633181 GameObject: @@ -22124,9 +22453,10 @@ MonoBehaviour: BackImage: {fileID: 6093686703263554373} _statSourceType: 0 _statId: 9 - StatsPerDefault: 0 WarnThreshold: Infinity ErrorThreshold: Infinity + _fusionStats: {fileID: 0} + CurrentAveraging: 0 _prevStatSourceType: 0 _prevStatId: 9 Height: 50 @@ -22141,7 +22471,6 @@ MonoBehaviour: LabelAvg: {fileID: 3194824587878280978} LabelLast: {fileID: 1652543800492467943} LabelPer: {fileID: 6100049407240961934} - _viewDropdown: {fileID: 3244021166447466391} _avgBttn: {fileID: 0} --- !u!1 &3728293029964230248 GameObject: @@ -22767,9 +23096,10 @@ MonoBehaviour: BackImage: {fileID: 2669897661241635505} _statSourceType: 0 _statId: 10 - StatsPerDefault: 0 WarnThreshold: Infinity ErrorThreshold: Infinity + _fusionStats: {fileID: 0} + CurrentAveraging: 0 _prevStatSourceType: 0 _prevStatId: 10 Height: 50 @@ -22784,7 +23114,6 @@ MonoBehaviour: LabelAvg: {fileID: 4822657211287180803} LabelLast: {fileID: 3173518091035449594} LabelPer: {fileID: 2404199190632383306} - _viewDropdown: {fileID: 1488040111416494753} _avgBttn: {fileID: 0} --- !u!1 &3833350294597222339 GameObject: @@ -23621,6 +23950,142 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &3945449491932568777 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 161420902757915932} + - component: {fileID: 1054313175119703478} + - component: {fileID: 4902473557420699033} + m_Layer: 0 + m_Name: Display + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &161420902757915932 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3945449491932568777} + 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: [] + m_Father: {fileID: 513169403690637356} + m_RootOrder: -1 + 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_SizeDelta: {x: 0, y: -10} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1054313175119703478 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3945449491932568777} + m_CullTransparentMesh: 1 +--- !u!114 &4902473557420699033 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3945449491932568777} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: null + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 03bd50bb8343d1d4dbb0873e4c9abb95, type: 2} + m_sharedMaterial: {fileID: -4437592673344618727, guid: 03bd50bb8343d1d4dbb0873e4c9abb95, + type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 48 + m_fontSizeBase: 48 + m_fontWeight: 400 + m_enableAutoSizing: 1 + m_fontSizeMin: 0 + m_fontSizeMax: 48 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 256 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!1 &3947270968228917022 GameObject: m_ObjectHideFlags: 0 @@ -24679,9 +25144,10 @@ MonoBehaviour: BackImage: {fileID: 8619917838628064690} _statSourceType: 0 _statId: 12 - StatsPerDefault: 0 WarnThreshold: Infinity ErrorThreshold: Infinity + _fusionStats: {fileID: 0} + CurrentAveraging: 0 _prevStatSourceType: 0 _prevStatId: 12 Height: 50 @@ -24696,7 +25162,6 @@ MonoBehaviour: LabelAvg: {fileID: 2219757226885449853} LabelLast: {fileID: 9117687277274559743} LabelPer: {fileID: 5484728002236198020} - _viewDropdown: {fileID: 9109061004803458298} _avgBttn: {fileID: 0} --- !u!1 &4075435355540151166 GameObject: @@ -25043,6 +25508,82 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: fieldName: AudioMusicVolume +--- !u!1 &4165592764243859563 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8065219866109033800} + - component: {fileID: 7102716299013690606} + - component: {fileID: 1417143197735971706} + m_Layer: 0 + m_Name: Checkmark + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8065219866109033800 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4165592764243859563} + 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: [] + m_Father: {fileID: 4349192246674321776} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 28, y: 28} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7102716299013690606 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4165592764243859563} + m_CullTransparentMesh: 1 +--- !u!114 &1417143197735971706 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4165592764243859563} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: -1629956683, guid: df20d2e332e6cf5419ef06f1c92457f9, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &4191418922001376913 GameObject: m_ObjectHideFlags: 0 @@ -25300,6 +25841,9 @@ RectTransform: - {fileID: 482845321522797856} - {fileID: 5394935321685605559} - {fileID: 7432280581549211522} + - {fileID: 3922616517681612455} + - {fileID: 7149153274013731236} + - {fileID: 7763166677755848528} - {fileID: 5649760194933813324} - {fileID: 6961744895079111069} - {fileID: 6625234341880025844} @@ -27539,9 +28083,10 @@ MonoBehaviour: BackImage: {fileID: 5936277465019454613} _statSourceType: 0 _statId: 15 - StatsPerDefault: 0 WarnThreshold: Infinity ErrorThreshold: Infinity + _fusionStats: {fileID: 0} + CurrentAveraging: 0 _prevStatSourceType: 0 _prevStatId: 15 Height: 50 @@ -27556,7 +28101,6 @@ MonoBehaviour: LabelAvg: {fileID: 5570818320455777204} LabelLast: {fileID: 554143400676446130} LabelPer: {fileID: 7312690750457294213} - _viewDropdown: {fileID: 6441181479398283426} _avgBttn: {fileID: 0} --- !u!1 &4546197301932482835 GameObject: @@ -30898,9 +31442,10 @@ MonoBehaviour: BackImage: {fileID: 6162055964268719457} _statSourceType: 1 _statId: 1 - StatsPerDefault: 0 WarnThreshold: Infinity ErrorThreshold: Infinity + _fusionStats: {fileID: 0} + CurrentAveraging: 0 _prevStatSourceType: 1 _prevStatId: 1 HoldPeakTime: 0.1 @@ -30909,6 +31454,7 @@ MonoBehaviour: _showUITargets: 0 ValueLabel: {fileID: 5983325316962449688} Bar: {fileID: 8378150479195490334} + BarPeak: {fileID: 0} --- !u!1 &5121305662172822805 GameObject: m_ObjectHideFlags: 0 @@ -31738,9 +32284,10 @@ MonoBehaviour: BackImage: {fileID: 5309178450105848669} _statSourceType: 0 _statId: 3 - StatsPerDefault: 0 WarnThreshold: Infinity ErrorThreshold: Infinity + _fusionStats: {fileID: 0} + CurrentAveraging: 0 _prevStatSourceType: 0 _prevStatId: 3 Height: 50 @@ -31755,7 +32302,6 @@ MonoBehaviour: LabelAvg: {fileID: 1073735436392148418} LabelLast: {fileID: 7125396478988509382} LabelPer: {fileID: 3782326143697186019} - _viewDropdown: {fileID: 2853857960951253554} _avgBttn: {fileID: 0} --- !u!1 &5318432383617717944 GameObject: @@ -31817,9 +32363,10 @@ MonoBehaviour: BackImage: {fileID: 3231196972224546838} _statSourceType: 0 _statId: 4 - StatsPerDefault: 0 WarnThreshold: Infinity ErrorThreshold: Infinity + _fusionStats: {fileID: 0} + CurrentAveraging: 0 _prevStatSourceType: 0 _prevStatId: 4 Height: 50 @@ -31834,7 +32381,6 @@ MonoBehaviour: LabelAvg: {fileID: 5800923589628513354} LabelLast: {fileID: 2543232724276660204} LabelPer: {fileID: 3432208100098828121} - _viewDropdown: {fileID: 5827754688616244580} _avgBttn: {fileID: 0} --- !u!1 &5322617905966211126 GameObject: @@ -35898,9 +36444,10 @@ MonoBehaviour: BackImage: {fileID: 2473927751575368004} _statSourceType: 0 _statId: 7 - StatsPerDefault: 0 WarnThreshold: Infinity ErrorThreshold: Infinity + _fusionStats: {fileID: 0} + CurrentAveraging: 0 _prevStatSourceType: 0 _prevStatId: 7 Height: 50 @@ -35915,7 +36462,6 @@ MonoBehaviour: LabelAvg: {fileID: 4649799694152377681} LabelLast: {fileID: 7543588008153435342} LabelPer: {fileID: 3905151351006682748} - _viewDropdown: {fileID: 583893642725501941} _avgBttn: {fileID: 0} --- !u!1 &6188012320617383676 GameObject: @@ -37048,6 +37594,61 @@ RectTransform: m_AnchoredPosition: {x: 1, y: 0} m_SizeDelta: {x: 0, y: 12.5} m_Pivot: {x: 0, y: 0.5} +--- !u!1 &6327673432700590543 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3922616517681612455} + - component: {fileID: 5382179545061436095} + m_Layer: 0 + m_Name: AudioDivider (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &3922616517681612455 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6327673432700590543} + 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: [] + m_Father: {fileID: 6805564504335040957} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 586, y: -810} + m_SizeDelta: {x: 1172, y: 20} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &5382179545061436095 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6327673432700590543} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 04ad6da735527b648ab7d43836aaca4b, type: 3} + m_Name: + m_EditorClassIdentifier: + rectTransform: {fileID: 0} + manager: {fileID: 2572987743764103034} + label: {fileID: 0} + loader: {fileID: 0} + translationKey: + hideOnWebGL: 0 --- !u!1 &6343213159402279751 GameObject: m_ObjectHideFlags: 0 @@ -37183,6 +37784,131 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_AlphaFadeSpeed: 0.15 +--- !u!1 &6372007369050065023 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8600917149486874747} + - component: {fileID: 6536488187605093126} + - component: {fileID: 7437286877913936199} + - component: {fileID: 4201800120887804806} + m_Layer: 0 + m_Name: Toggle + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8600917149486874747 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6372007369050065023} + 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: 4349192246674321776} + m_Father: {fileID: 7763166677755848528} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.9, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 20} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &6536488187605093126 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6372007369050065023} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9085046f02f69544eb97fd06b6048fe2, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 0 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 0 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 2866243539619014825} + toggleTransition: 0 + graphic: {fileID: 1417143197735971706} + m_Group: {fileID: 0} + onValueChanged: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 2572987743764103034} + m_TargetAssemblyTypeName: NSMB.UI.Pause.Options.PauseOptionMenuManager, Assembly-CSharp + m_MethodName: SetCurrentOption + m_Mode: 2 + m_Arguments: + m_ObjectArgument: {fileID: 8732365200367338877} + m_ObjectArgumentAssemblyTypeName: NSMB.UI.Pause.Options.PauseOption, Assembly-CSharp + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + m_IsOn: 1 +--- !u!114 &7437286877913936199 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6372007369050065023} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0b148fe25e99eb48b9724523833bab1, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Delegates: [] +--- !u!114 &4201800120887804806 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6372007369050065023} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d4b43c74b8b68684abcbe13d72db54c3, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &6428713885912858409 GameObject: m_ObjectHideFlags: 0 @@ -37579,9 +38305,10 @@ MonoBehaviour: BackImage: {fileID: 8263734549325536150} _statSourceType: 0 _statId: 0 - StatsPerDefault: 0 WarnThreshold: Infinity ErrorThreshold: Infinity + _fusionStats: {fileID: 0} + CurrentAveraging: 0 _prevStatSourceType: 0 _prevStatId: 0 Height: 50 @@ -37596,7 +38323,6 @@ MonoBehaviour: LabelAvg: {fileID: 9101435458950470407} LabelLast: {fileID: 1828717048301535553} LabelPer: {fileID: 9139507697315002810} - _viewDropdown: {fileID: 2452438922973140139} _avgBttn: {fileID: 0} --- !u!1 &6466706357467753805 GameObject: @@ -38209,7 +38935,7 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 20.85 + m_fontSize: 36 m_fontSizeBase: 24 m_fontWeight: 400 m_enableAutoSizing: 1 @@ -38547,9 +39273,10 @@ MonoBehaviour: BackImage: {fileID: 3022202175217754294} _statSourceType: 2 _statId: 2 - StatsPerDefault: 0 WarnThreshold: Infinity ErrorThreshold: Infinity + _fusionStats: {fileID: 0} + CurrentAveraging: 0 _prevStatSourceType: 2 _prevStatId: 2 Height: 50 @@ -38564,7 +39291,6 @@ MonoBehaviour: LabelAvg: {fileID: 6236246557425796095} LabelLast: {fileID: 5601737540823085859} LabelPer: {fileID: 7974280965492885553} - _viewDropdown: {fileID: 6397661419205235626} _avgBttn: {fileID: 0} --- !u!1 &6579891842249040527 GameObject: @@ -39581,6 +40307,167 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 100 +--- !u!1 &6741292892661882801 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5607666438956216428} + - component: {fileID: 5941192280607408270} + - component: {fileID: 2098188307271458553} + - component: {fileID: 6820651797718997062} + - component: {fileID: 6684443996069104593} + m_Layer: 0 + m_Name: ArrowLeft + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5607666438956216428 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6741292892661882801} + 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: [] + m_Father: {fileID: 513169403690637356} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: -5, y: 0} + m_SizeDelta: {x: 20, y: 40} + m_Pivot: {x: 1, y: 0.5} +--- !u!222 &5941192280607408270 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6741292892661882801} + m_CullTransparentMesh: 1 +--- !u!114 &2098188307271458553 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6741292892661882801} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: -1361643289, guid: 4953af3e17ea87e4586d634426e4eb01, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &6820651797718997062 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6741292892661882801} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 0 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 2 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 1, g: 1, b: 1, a: 1} + m_PressedColor: {r: 1, g: 1, b: 1, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0 + m_SpriteState: + m_HighlightedSprite: {fileID: 2070558237, guid: 4953af3e17ea87e4586d634426e4eb01, + type: 3} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 431117608, guid: 4953af3e17ea87e4586d634426e4eb01, + type: 3} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 2098188307271458553} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 6331288519241955632} + m_TargetAssemblyTypeName: NSMB.UI.Pause.Options.ScrollablePauseOption, Assembly-CSharp + m_MethodName: OnLeftPress + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + - m_Target: {fileID: 2572987743764103034} + m_TargetAssemblyTypeName: NSMB.UI.Pause.Options.PauseOptionMenuManager, Assembly-CSharp + m_MethodName: SetCurrentOption + m_Mode: 2 + m_Arguments: + m_ObjectArgument: {fileID: 6331288519241955632} + m_ObjectArgumentAssemblyTypeName: NSMB.UI.Pause.Options.PauseOption, Assembly-CSharp + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 +--- !u!114 &6684443996069104593 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6741292892661882801} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0b148fe25e99eb48b9724523833bab1, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Delegates: [] --- !u!1 &6749013548302036304 GameObject: m_ObjectHideFlags: 0 @@ -40228,6 +41115,78 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: -20, y: 0} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &6890291858175527929 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7763166677755848528} + - component: {fileID: 8732365200367338877} + - component: {fileID: 3540664288043984378} + m_Layer: 0 + m_Name: AudioSpecialPowerupMusicLocalOnly + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &7763166677755848528 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6890291858175527929} + 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: 4078626837062416803} + - {fileID: 8600917149486874747} + m_Father: {fileID: 6805564504335040957} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 586, y: -980} + m_SizeDelta: {x: 1172, y: 40} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &8732365200367338877 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6890291858175527929} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 61682a4bcd698cf4b86162873a2e9b25, type: 3} + m_Name: + m_EditorClassIdentifier: + rectTransform: {fileID: 0} + manager: {fileID: 2572987743764103034} + label: {fileID: 5401192972062997368} + loader: {fileID: 3540664288043984378} + translationKey: ui.options.audio.specialpowerupmusic.localonly + hideOnWebGL: 0 + toggle: {fileID: 6536488187605093126} +--- !u!114 &3540664288043984378 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6890291858175527929} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d4e112e117f2f0e43894cd0050bda463, type: 3} + m_Name: + m_EditorClassIdentifier: + fieldName: audioSpecialPowerupMusicLocalOnly --- !u!1 &6908411786655884306 GameObject: m_ObjectHideFlags: 0 @@ -44555,9 +45514,10 @@ MonoBehaviour: BackImage: {fileID: 1096915375649508650} _statSourceType: 0 _statId: 13 - StatsPerDefault: 0 WarnThreshold: Infinity ErrorThreshold: Infinity + _fusionStats: {fileID: 0} + CurrentAveraging: 0 _prevStatSourceType: 0 _prevStatId: 13 Height: 50 @@ -44572,8 +45532,143 @@ MonoBehaviour: LabelAvg: {fileID: 5122493660701038184} LabelLast: {fileID: 5341031494758838295} LabelPer: {fileID: 556818388063971350} - _viewDropdown: {fileID: 8849459276393779965} _avgBttn: {fileID: 0} +--- !u!1 &7417852587978047799 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7273371935928409928} + - component: {fileID: 781566265822378869} + - component: {fileID: 6915814673348286693} + m_Layer: 0 + m_Name: Label + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7273371935928409928 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7417852587978047799} + 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: [] + m_Father: {fileID: 7149153274013731236} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &781566265822378869 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7417852587978047799} + m_CullTransparentMesh: 1 +--- !u!114 &6915814673348286693 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7417852587978047799} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: Window Mode + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 38e8769007229044bb229d69f8cbae74, type: 2} + m_sharedMaterial: {fileID: 3023213983796840565, guid: 38e8769007229044bb229d69f8cbae74, + type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 40 + m_fontSizeBase: 40 + m_fontWeight: 400 + m_enableAutoSizing: 1 + m_fontSizeMin: 40 + m_fontSizeMax: 40 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 50 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 1 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!1 &7423684613123640892 GameObject: m_ObjectHideFlags: 0 @@ -46141,9 +47236,10 @@ MonoBehaviour: BackImage: {fileID: 7347501096527585882} _statSourceType: 1 _statId: 0 - StatsPerDefault: 0 WarnThreshold: 20 ErrorThreshold: 100 + _fusionStats: {fileID: 0} + CurrentAveraging: 0 _prevStatSourceType: 1 _prevStatId: 0 HoldPeakTime: 0.1 @@ -46152,6 +47248,7 @@ MonoBehaviour: _showUITargets: 0 ValueLabel: {fileID: 226950248956410039} Bar: {fileID: 5714132703001577359} + BarPeak: {fileID: 0} --- !u!1 &7613230879560022273 GameObject: m_ObjectHideFlags: 0 @@ -46798,9 +47895,10 @@ MonoBehaviour: BackImage: {fileID: 311980867691846638} _statSourceType: 0 _statId: 2 - StatsPerDefault: 0 WarnThreshold: 5 ErrorThreshold: 10 + _fusionStats: {fileID: 0} + CurrentAveraging: 0 _prevStatSourceType: 0 _prevStatId: 2 Height: 50 @@ -46815,7 +47913,6 @@ MonoBehaviour: LabelAvg: {fileID: 4746661541134628070} LabelLast: {fileID: 954843219244501495} LabelPer: {fileID: 5680337194332101546} - _viewDropdown: {fileID: 1160975633069989191} _avgBttn: {fileID: 0} --- !u!1 &7752519977180381173 GameObject: @@ -50515,6 +51612,198 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &8242583035881805371 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6824658963838236847} + - component: {fileID: 3027015911885328666} + - component: {fileID: 8340889479570637341} + - component: {fileID: 1645595105058893382} + - component: {fileID: 8415875523676245917} + - component: {fileID: 3671162822612014372} + m_Layer: 0 + m_Name: ArrowRight + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6824658963838236847 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8242583035881805371} + 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: [] + m_Father: {fileID: 513169403690637356} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: 5, y: 0} + m_SizeDelta: {x: 20, y: 40} + m_Pivot: {x: 0, y: 0.5} +--- !u!222 &3027015911885328666 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8242583035881805371} + m_CullTransparentMesh: 1 +--- !u!114 &8340889479570637341 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8242583035881805371} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: -1569131217, guid: 4953af3e17ea87e4586d634426e4eb01, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &1645595105058893382 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8242583035881805371} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 0 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 2 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 1, g: 1, b: 1, a: 1} + m_PressedColor: {r: 1, g: 1, b: 1, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0 + m_SpriteState: + m_HighlightedSprite: {fileID: -1636898544, guid: 4953af3e17ea87e4586d634426e4eb01, + type: 3} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: -586779644, guid: 4953af3e17ea87e4586d634426e4eb01, + type: 3} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 8340889479570637341} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 6331288519241955632} + m_TargetAssemblyTypeName: NSMB.UI.Pause.Options.ScrollablePauseOption, Assembly-CSharp + m_MethodName: OnRightPress + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + - m_Target: {fileID: 2572987743764103034} + m_TargetAssemblyTypeName: NSMB.UI.Pause.Options.PauseOptionMenuManager, Assembly-CSharp + m_MethodName: SetCurrentOption + m_Mode: 2 + m_Arguments: + m_ObjectArgument: {fileID: 6331288519241955632} + m_ObjectArgumentAssemblyTypeName: NSMB.UI.Pause.Options.PauseOption, Assembly-CSharp + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 +--- !u!114 &8415875523676245917 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8242583035881805371} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0b148fe25e99eb48b9724523833bab1, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Delegates: [] +--- !u!114 &3671162822612014372 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8242583035881805371} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1aa08ab6e0800fa44ae55d278d1423e3, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Content: {fileID: 0} + m_Horizontal: 1 + m_Vertical: 1 + m_MovementType: 1 + m_Elasticity: 0.1 + m_Inertia: 1 + m_DecelerationRate: 0.135 + m_ScrollSensitivity: 1 + m_Viewport: {fileID: 0} + m_HorizontalScrollbar: {fileID: 0} + m_VerticalScrollbar: {fileID: 0} + m_HorizontalScrollbarVisibility: 0 + m_VerticalScrollbarVisibility: 0 + m_HorizontalScrollbarSpacing: 0 + m_VerticalScrollbarSpacing: 0 + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] --- !u!1 &8243043125458087776 GameObject: m_ObjectHideFlags: 0 @@ -52124,6 +53413,83 @@ MonoBehaviour: m_OnValueChanged: m_PersistentCalls: m_Calls: [] +--- !u!1 &8483608312775389942 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4349192246674321776} + - component: {fileID: 130962072996468481} + - component: {fileID: 2866243539619014825} + m_Layer: 0 + m_Name: Background + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4349192246674321776 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8483608312775389942} + 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: 8065219866109033800} + m_Father: {fileID: 8600917149486874747} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 28, y: 28} + m_Pivot: {x: 1, y: 0.5} +--- !u!222 &130962072996468481 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8483608312775389942} + m_CullTransparentMesh: 1 +--- !u!114 &2866243539619014825 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8483608312775389942} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: -1438454530, guid: df20d2e332e6cf5419ef06f1c92457f9, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &8510855236064050222 GameObject: m_ObjectHideFlags: 0 @@ -55165,53 +56531,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d358eee53e80c8a45be7aae6cb5d4a4d, type: 3} m_Name: m_EditorClassIdentifier: - RedrawInterval: 0.1 - _canvasType: 0 - _showButtonLabels: 0 - _maxHeaderHeight: 0 - CanvasScale: 5 - CanvasDistance: 0 - _gameObjectRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 1 - height: 1 - _overlayRect: - serializedVersion: 2 - x: 0.824 - y: 0.008 - width: 0.17199999 - height: 0.65 - _defaultLayout: 6 - _noTextOverlap: 0 - _noGraphShader: 0 - GraphColumnCount: 0 - _graphMaxWidth: 270 - _enableObjectStats: 0 - _object: {fileID: 0} - _objectTitleHeight: 48 - _objectIdsHeight: 60 - _objectMetersHeight: 90 - _runner: {fileID: 0} - InitializeAllGraphs: 1 - ConnectTo: 7 - _includedObjStats: 0 - _includedNetStats: 7 - _includedSimStats: 23838 - AutoDestroy: 0 - EnforceSingle: 1 - Guid: 3010424a-ef59 - _modifyColors: 1 - _graphColorGood: {r: 0.1, g: 0.5, b: 0.1, a: 0.2509804} - _graphColorWarn: {r: 0.75, g: 0.75, b: 0.2, a: 0.2509804} - _graphColorBad: {r: 0.9, g: 0.2, b: 0.2, a: 0.2509804} - _graphColorFlag: {r: 0.8, g: 0.75, b: 0, a: 0.2509804} - _fontColor: {r: 1, g: 1, b: 1, a: 1} - PanelColor: {r: 0.3, g: 0.3, b: 0.3, a: 0.9} - _simDataBackColor: {r: 0.1, g: 0.08, b: 0.08, a: 0.5019608} - _netDataBackColor: {r: 0.15, g: 0.14, b: 0.09, a: 0.5019608} - _objDataBackColor: {r: 0, g: 0.2, b: 0.4, a: 1} _simGraphs: - {fileID: 690042109163961063} - {fileID: 5786834651241559856} @@ -55236,6 +56555,7 @@ MonoBehaviour: - {fileID: 4314183055854627550} - {fileID: 2163948530427209746} - {fileID: 5507267271701599901} + _objIds: {fileID: 0} _titleText: {fileID: 4535876648271020625} _clearIcon: {fileID: 50377043062019953} _pauseIcon: {fileID: 1817001881213162295} @@ -55252,7 +56572,6 @@ MonoBehaviour: _canvas: {fileID: 6803791197413186015} _canvasRT: {fileID: 527068600529398534} _rootPanelRT: {fileID: 1982716895343254373} - _guidesRT: {fileID: 0} _headerRT: {fileID: 9055089929976211146} _statsPanelRT: {fileID: 5619867962335453829} _graphsLayoutRT: {fileID: 1165619577214835093} @@ -55261,8 +56580,6 @@ MonoBehaviour: _objectTitlePanelRT: {fileID: 7495248305593796982} _objectIdsGroupRT: {fileID: 3019114398203051996} _objectMetersPanelRT: {fileID: 7749628382798489844} - _clientIdPanelRT: {fileID: 0} - _authorityPanelRT: {fileID: 0} _titleButton: {fileID: 1588121405104250195} _objctButton: {fileID: 6970848165809851228} _clearButton: {fileID: 3128908928968043887} @@ -55270,6 +56587,64 @@ MonoBehaviour: _pauseButton: {fileID: 6604522132929454330} _closeButton: {fileID: 4549465032159791734} _canvsButton: {fileID: 7422970629306824293} + RedrawInterval: 0.1 + _canvasType: 0 + _showButtonLabels: 0 + _maxHeaderHeight: 0 + CanvasScale: 5 + CanvasDistance: 0 + _gameObjectRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + _overlayRect: + serializedVersion: 2 + x: 0.824 + y: 0.008 + width: 0.17199999 + height: 0.65 + _defaultLayout: 6 + _noTextOverlap: 0 + _noGraphShader: 0 + GraphColumnCount: 0 + _graphMaxWidth: 270 + _playerRef: 0 + _enableObjectStats: 0 + _object: {fileID: 0} + _objectTitleHeight: 48 + _objectIdsHeight: 60 + _objectMetersHeight: 90 + _runner: {fileID: 0} + RunnerFromSelected: 0 + InitializeAllGraphs: 1 + ConnectTo: 7 + _includedObjStats: + Mask: + values: 0000000000000000000000000000000000000000000000000000000000000000 + _includedNetStats: + Mask: + values: 0000000000000000000000000000000000000000000000000000000000000000 + _includedSimStats: + Mask: + values: a607000000000000000000000000000000000000000000000000000000000000 + AutoDestroy: 0 + EnforceSingle: 1 + Guid: 3010424a-ef59 + LabelFont: {fileID: 0} + ValueFont: {fileID: 0} + GraphShader: {fileID: 0} + _modifyColors: 1 + _graphColorGood: {r: 0.1, g: 0.5, b: 0.1, a: 0.2509804} + _graphColorWarn: {r: 0.75, g: 0.75, b: 0.2, a: 0.2509804} + _graphColorBad: {r: 0.9, g: 0.2, b: 0.2, a: 0.2509804} + _graphColorFlag: {r: 0.8, g: 0.75, b: 0, a: 0.2509804} + _fontColor: {r: 1, g: 1, b: 1, a: 1} + PanelColor: {r: 0.3, g: 0.3, b: 0.3, a: 0.9} + _simDataBackColor: {r: 0.1, g: 0.08, b: 0.08, a: 0.5019608} + _netDataBackColor: {r: 0.15, g: 0.14, b: 0.09, a: 0.5019608} + _objDataBackColor: {r: 0, g: 0.2, b: 0.4, a: 1} --- !u!1 &9120245329450423663 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/Levels/CustomBonus.unity b/Assets/Scenes/Levels/CustomBonus.unity index caef606417..9eb2793411 100644 --- a/Assets/Scenes/Levels/CustomBonus.unity +++ b/Assets/Scenes/Levels/CustomBonus.unity @@ -353,54 +353,6 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &179117807 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 179117808} - - component: {fileID: 179117809} - m_Layer: 0 - m_Name: TilemapChunk (1,0) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &179117808 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 179117807} - 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: [] - m_Father: {fileID: 493691704} - m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &179117809 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 179117807} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2c33719b6058cda4c9a3669de683f83a, type: 3} - m_Name: - m_EditorClassIdentifier: - _DirtyCounter: 0 - _Tiles: - chunkX: 1 - chunkY: 0 --- !u!1001 &284729839 PrefabInstance: m_ObjectHideFlags: 0 @@ -876,48 +828,48 @@ PrefabInstance: - target: {fileID: 184355828371754224, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} propertyPath: NetworkedBehaviours.Array.size - value: 10 + value: 2 objectReference: {fileID: 0} - target: {fileID: 184355828371754224, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} propertyPath: NetworkedBehaviours.Array.data[2] value: - objectReference: {fileID: 1365789664} + objectReference: {fileID: 0} - target: {fileID: 184355828371754224, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} propertyPath: NetworkedBehaviours.Array.data[3] value: - objectReference: {fileID: 179117809} + objectReference: {fileID: 0} - target: {fileID: 184355828371754224, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} propertyPath: NetworkedBehaviours.Array.data[4] value: - objectReference: {fileID: 1387154924} + objectReference: {fileID: 0} - target: {fileID: 184355828371754224, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} propertyPath: NetworkedBehaviours.Array.data[5] value: - objectReference: {fileID: 1216168276} + objectReference: {fileID: 0} - target: {fileID: 184355828371754224, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} propertyPath: NetworkedBehaviours.Array.data[6] value: - objectReference: {fileID: 642755136} + objectReference: {fileID: 0} - target: {fileID: 184355828371754224, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} propertyPath: NetworkedBehaviours.Array.data[7] value: - objectReference: {fileID: 810357460} + objectReference: {fileID: 0} - target: {fileID: 184355828371754224, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} propertyPath: NetworkedBehaviours.Array.data[8] value: - objectReference: {fileID: 1785595117} + objectReference: {fileID: 0} - target: {fileID: 184355828371754224, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} propertyPath: NetworkedBehaviours.Array.data[9] value: - objectReference: {fileID: 1254396679} + objectReference: {fileID: 0} - target: {fileID: 822077676654890402, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} propertyPath: m_AnchorMax.y @@ -1498,42 +1450,42 @@ PrefabInstance: type: 3} propertyPath: chunks.Array.data[0] value: - objectReference: {fileID: 1365789664} + objectReference: {fileID: 0} - target: {fileID: 3199354014281383139, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} propertyPath: chunks.Array.data[1] value: - objectReference: {fileID: 179117809} + objectReference: {fileID: 0} - target: {fileID: 3199354014281383139, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} propertyPath: chunks.Array.data[2] value: - objectReference: {fileID: 1387154924} + objectReference: {fileID: 0} - target: {fileID: 3199354014281383139, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} propertyPath: chunks.Array.data[3] value: - objectReference: {fileID: 1216168276} + objectReference: {fileID: 0} - target: {fileID: 3199354014281383139, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} propertyPath: chunks.Array.data[4] value: - objectReference: {fileID: 642755136} + objectReference: {fileID: 0} - target: {fileID: 3199354014281383139, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} propertyPath: chunks.Array.data[5] value: - objectReference: {fileID: 810357460} + objectReference: {fileID: 0} - target: {fileID: 3199354014281383139, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} propertyPath: chunks.Array.data[6] value: - objectReference: {fileID: 1785595117} + objectReference: {fileID: 0} - target: {fileID: 3199354014281383139, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} propertyPath: chunks.Array.data[7] value: - objectReference: {fileID: 1254396679} + objectReference: {fileID: 0} - target: {fileID: 3357010861536891764, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} propertyPath: m_AnchorMax.y @@ -4505,47 +4457,9 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] - m_AddedGameObjects: - - targetCorrespondingSourceObject: {fileID: 6381916647485414113, guid: 43d56bd18d06e9b4abe323618a20a228, - type: 3} - insertIndex: -1 - addedObject: {fileID: 1365789663} - - targetCorrespondingSourceObject: {fileID: 6381916647485414113, guid: 43d56bd18d06e9b4abe323618a20a228, - type: 3} - insertIndex: -1 - addedObject: {fileID: 179117808} - - targetCorrespondingSourceObject: {fileID: 6381916647485414113, guid: 43d56bd18d06e9b4abe323618a20a228, - type: 3} - insertIndex: -1 - addedObject: {fileID: 1387154923} - - targetCorrespondingSourceObject: {fileID: 6381916647485414113, guid: 43d56bd18d06e9b4abe323618a20a228, - type: 3} - insertIndex: -1 - addedObject: {fileID: 1216168275} - - targetCorrespondingSourceObject: {fileID: 6381916647485414113, guid: 43d56bd18d06e9b4abe323618a20a228, - type: 3} - insertIndex: -1 - addedObject: {fileID: 642755135} - - targetCorrespondingSourceObject: {fileID: 6381916647485414113, guid: 43d56bd18d06e9b4abe323618a20a228, - type: 3} - insertIndex: -1 - addedObject: {fileID: 810357459} - - targetCorrespondingSourceObject: {fileID: 6381916647485414113, guid: 43d56bd18d06e9b4abe323618a20a228, - type: 3} - insertIndex: -1 - addedObject: {fileID: 1785595116} - - targetCorrespondingSourceObject: {fileID: 6381916647485414113, guid: 43d56bd18d06e9b4abe323618a20a228, - type: 3} - insertIndex: -1 - addedObject: {fileID: 1254396680} + m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} ---- !u!4 &493691704 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 6381916647485414113, guid: 43d56bd18d06e9b4abe323618a20a228, - type: 3} - m_PrefabInstance: {fileID: 493691703} - m_PrefabAsset: {fileID: 0} --- !u!1 &496456190 GameObject: m_ObjectHideFlags: 0 @@ -4975,54 +4889,6 @@ Transform: m_Father: {fileID: 1292545025} m_RootOrder: -2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &642755134 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 642755135} - - component: {fileID: 642755136} - m_Layer: 0 - m_Name: TilemapChunk (4,0) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &642755135 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 642755134} - 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: [] - m_Father: {fileID: 493691704} - m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &642755136 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 642755134} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2c33719b6058cda4c9a3669de683f83a, type: 3} - m_Name: - m_EditorClassIdentifier: - _DirtyCounter: 0 - _Tiles: - chunkX: 4 - chunkY: 0 --- !u!1 &651702173 GameObject: m_ObjectHideFlags: 0 @@ -5317,54 +5183,6 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 52fa37521c30ebb40ab4cac4ef31be57, type: 3} ---- !u!1 &810357458 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 810357459} - - component: {fileID: 810357460} - m_Layer: 0 - m_Name: TilemapChunk (5,0) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &810357459 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 810357458} - 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: [] - m_Father: {fileID: 493691704} - m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &810357460 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 810357458} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2c33719b6058cda4c9a3669de683f83a, type: 3} - m_Name: - m_EditorClassIdentifier: - _DirtyCounter: 0 - _Tiles: - chunkX: 5 - chunkY: 0 --- !u!1 &815434331 GameObject: m_ObjectHideFlags: 0 @@ -6142,102 +5960,6 @@ SpriteMask: m_BackSortingOrder: -5 m_IsCustomRangeActive: 1 m_SpriteSortPoint: 0 ---- !u!1 &1216168274 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1216168275} - - component: {fileID: 1216168276} - m_Layer: 0 - m_Name: TilemapChunk (3,0) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1216168275 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1216168274} - 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: [] - m_Father: {fileID: 493691704} - m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1216168276 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1216168274} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2c33719b6058cda4c9a3669de683f83a, type: 3} - m_Name: - m_EditorClassIdentifier: - _DirtyCounter: 0 - _Tiles: - chunkX: 3 - chunkY: 0 ---- !u!1 &1254396678 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1254396680} - - component: {fileID: 1254396679} - m_Layer: 0 - m_Name: TilemapChunk (7,0) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &1254396679 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1254396678} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2c33719b6058cda4c9a3669de683f83a, type: 3} - m_Name: - m_EditorClassIdentifier: - _DirtyCounter: 0 - _Tiles: - chunkX: 7 - chunkY: 0 ---- !u!4 &1254396680 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1254396678} - 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: [] - m_Father: {fileID: 493691704} - m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1292545024 GameObject: m_ObjectHideFlags: 0 @@ -7458,54 +7180,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1347353330} m_PrefabAsset: {fileID: 0} ---- !u!1 &1365789662 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1365789663} - - component: {fileID: 1365789664} - m_Layer: 0 - m_Name: TilemapChunk (0,0) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1365789663 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1365789662} - 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: [] - m_Father: {fileID: 493691704} - m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1365789664 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1365789662} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2c33719b6058cda4c9a3669de683f83a, type: 3} - m_Name: - m_EditorClassIdentifier: - _DirtyCounter: 0 - _Tiles: - chunkX: 0 - chunkY: 0 --- !u!1 &1371898791 GameObject: m_ObjectHideFlags: 0 @@ -7590,54 +7264,6 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!1 &1387154922 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1387154923} - - component: {fileID: 1387154924} - m_Layer: 0 - m_Name: TilemapChunk (2,0) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1387154923 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1387154922} - 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: [] - m_Father: {fileID: 493691704} - m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1387154924 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1387154922} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2c33719b6058cda4c9a3669de683f83a, type: 3} - m_Name: - m_EditorClassIdentifier: - _DirtyCounter: 0 - _Tiles: - chunkX: 2 - chunkY: 0 --- !u!20 &1398915830 stripped Camera: m_CorrespondingSourceObject: {fileID: 482268096050949619, guid: 43d56bd18d06e9b4abe323618a20a228, @@ -8048,54 +7674,6 @@ Transform: m_Father: {fileID: 1292545025} m_RootOrder: -2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1785595115 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1785595116} - - component: {fileID: 1785595117} - m_Layer: 0 - m_Name: TilemapChunk (6,0) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1785595116 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1785595115} - 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: [] - m_Father: {fileID: 493691704} - m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1785595117 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1785595115} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2c33719b6058cda4c9a3669de683f83a, type: 3} - m_Name: - m_EditorClassIdentifier: - _DirtyCounter: 0 - _Tiles: - chunkX: 6 - chunkY: 0 --- !u!1 &1806822999 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/Levels/CustomDesert.unity b/Assets/Scenes/Levels/CustomDesert.unity index 43f684e9f7..2b4c43f7d6 100644 --- a/Assets/Scenes/Levels/CustomDesert.unity +++ b/Assets/Scenes/Levels/CustomDesert.unity @@ -444,54 +444,6 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!1 &208430886 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 208430887} - - component: {fileID: 208430888} - m_Layer: 0 - m_Name: TilemapChunk (1,0) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &208430887 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 208430886} - 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: [] - m_Father: {fileID: 493691704} - m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &208430888 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 208430886} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2c33719b6058cda4c9a3669de683f83a, type: 3} - m_Name: - m_EditorClassIdentifier: - _DirtyCounter: 0 - _Tiles: - chunkX: 1 - chunkY: 0 --- !u!4 &258566627 stripped Transform: m_CorrespondingSourceObject: {fileID: 5780648777663731100, guid: 946c21a210ac3094bba96c7e4190a452, @@ -716,54 +668,6 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 946c21a210ac3094bba96c7e4190a452, type: 3} ---- !u!1 &487554027 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 487554028} - - component: {fileID: 487554029} - m_Layer: 0 - m_Name: TilemapChunk (0,0) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &487554028 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 487554027} - 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: [] - m_Father: {fileID: 493691704} - m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &487554029 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 487554027} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2c33719b6058cda4c9a3669de683f83a, type: 3} - m_Name: - m_EditorClassIdentifier: - _DirtyCounter: 0 - _Tiles: - chunkX: 0 - chunkY: 0 --- !u!1001 &493691703 PrefabInstance: m_ObjectHideFlags: 0 @@ -785,33 +689,33 @@ PrefabInstance: - target: {fileID: 184355828371754224, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} propertyPath: NetworkedBehaviours.Array.size - value: 7 + value: 2 objectReference: {fileID: 0} - target: {fileID: 184355828371754224, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} propertyPath: NetworkedBehaviours.Array.data[2] value: - objectReference: {fileID: 487554029} + objectReference: {fileID: 0} - target: {fileID: 184355828371754224, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} propertyPath: NetworkedBehaviours.Array.data[3] value: - objectReference: {fileID: 208430888} + objectReference: {fileID: 0} - target: {fileID: 184355828371754224, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} propertyPath: NetworkedBehaviours.Array.data[4] value: - objectReference: {fileID: 1748542927} + objectReference: {fileID: 0} - target: {fileID: 184355828371754224, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} propertyPath: NetworkedBehaviours.Array.data[5] value: - objectReference: {fileID: 686049266} + objectReference: {fileID: 0} - target: {fileID: 184355828371754224, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} propertyPath: NetworkedBehaviours.Array.data[6] value: - objectReference: {fileID: 1296795456} + objectReference: {fileID: 0} - target: {fileID: 482268096050949388, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} propertyPath: m_LocalPosition.x @@ -1291,27 +1195,27 @@ PrefabInstance: type: 3} propertyPath: chunks.Array.data[0] value: - objectReference: {fileID: 487554029} + objectReference: {fileID: 0} - target: {fileID: 3199354014281383139, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} propertyPath: chunks.Array.data[1] value: - objectReference: {fileID: 208430888} + objectReference: {fileID: 0} - target: {fileID: 3199354014281383139, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} propertyPath: chunks.Array.data[2] value: - objectReference: {fileID: 1748542927} + objectReference: {fileID: 0} - target: {fileID: 3199354014281383139, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} propertyPath: chunks.Array.data[3] value: - objectReference: {fileID: 686049266} + objectReference: {fileID: 0} - target: {fileID: 3199354014281383139, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} propertyPath: chunks.Array.data[4] value: - objectReference: {fileID: 1296795456} + objectReference: {fileID: 0} - target: {fileID: 3357010861536891764, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} propertyPath: m_AnchorMax.y @@ -4140,39 +4044,13 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] - m_AddedGameObjects: - - targetCorrespondingSourceObject: {fileID: 6381916647485414113, guid: 43d56bd18d06e9b4abe323618a20a228, - type: 3} - insertIndex: -1 - addedObject: {fileID: 487554028} - - targetCorrespondingSourceObject: {fileID: 6381916647485414113, guid: 43d56bd18d06e9b4abe323618a20a228, - type: 3} - insertIndex: -1 - addedObject: {fileID: 208430887} - - targetCorrespondingSourceObject: {fileID: 6381916647485414113, guid: 43d56bd18d06e9b4abe323618a20a228, - type: 3} - insertIndex: -1 - addedObject: {fileID: 1748542926} - - targetCorrespondingSourceObject: {fileID: 6381916647485414113, guid: 43d56bd18d06e9b4abe323618a20a228, - type: 3} - insertIndex: -1 - addedObject: {fileID: 686049265} - - targetCorrespondingSourceObject: {fileID: 6381916647485414113, guid: 43d56bd18d06e9b4abe323618a20a228, - type: 3} - insertIndex: -1 - addedObject: {fileID: 1296795457} + m_AddedGameObjects: [] m_AddedComponents: - targetCorrespondingSourceObject: {fileID: 1782637388717286125, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} insertIndex: -1 addedObject: {fileID: 21742349} m_SourcePrefab: {fileID: 100100000, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} ---- !u!4 &493691704 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 6381916647485414113, guid: 43d56bd18d06e9b4abe323618a20a228, - type: 3} - m_PrefabInstance: {fileID: 493691703} - m_PrefabAsset: {fileID: 0} --- !u!1 &576595245 GameObject: m_ObjectHideFlags: 0 @@ -4303,54 +4181,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 600973052} m_PrefabAsset: {fileID: 0} ---- !u!1 &686049264 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 686049265} - - component: {fileID: 686049266} - m_Layer: 0 - m_Name: TilemapChunk (3,0) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &686049265 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 686049264} - 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: [] - m_Father: {fileID: 493691704} - m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &686049266 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 686049264} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2c33719b6058cda4c9a3669de683f83a, type: 3} - m_Name: - m_EditorClassIdentifier: - _DirtyCounter: 0 - _Tiles: - chunkX: 3 - chunkY: 0 --- !u!1 &694789568 GameObject: m_ObjectHideFlags: 0 @@ -4688,54 +4518,6 @@ Transform: m_Father: {fileID: 1292545025} m_RootOrder: -2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1296795455 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1296795457} - - component: {fileID: 1296795456} - m_Layer: 0 - m_Name: TilemapChunk (4,0) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &1296795456 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1296795455} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2c33719b6058cda4c9a3669de683f83a, type: 3} - m_Name: - m_EditorClassIdentifier: - _DirtyCounter: 0 - _Tiles: - chunkX: 4 - chunkY: 0 ---- !u!4 &1296795457 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1296795455} - 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: [] - m_Father: {fileID: 493691704} - m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1335867322 GameObject: m_ObjectHideFlags: 0 @@ -4909,54 +4691,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 19898558} m_PrefabAsset: {fileID: 0} ---- !u!1 &1748542925 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1748542926} - - component: {fileID: 1748542927} - m_Layer: 0 - m_Name: TilemapChunk (2,0) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1748542926 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1748542925} - 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: [] - m_Father: {fileID: 493691704} - m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1748542927 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1748542925} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2c33719b6058cda4c9a3669de683f83a, type: 3} - m_Name: - m_EditorClassIdentifier: - _DirtyCounter: 0 - _Tiles: - chunkX: 2 - chunkY: 0 --- !u!4 &1776949565 stripped Transform: m_CorrespondingSourceObject: {fileID: 5780648777663731100, guid: 946c21a210ac3094bba96c7e4190a452, diff --git a/Assets/Scenes/Levels/CustomGhost.unity b/Assets/Scenes/Levels/CustomGhost.unity index ca3ec239d6..003dcaaa72 100644 --- a/Assets/Scenes/Levels/CustomGhost.unity +++ b/Assets/Scenes/Levels/CustomGhost.unity @@ -371,54 +371,6 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 946c21a210ac3094bba96c7e4190a452, type: 3} ---- !u!1 &221030093 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 221030094} - - component: {fileID: 221030095} - m_Layer: 0 - m_Name: TilemapChunk (2,0) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &221030094 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 221030093} - 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: [] - m_Father: {fileID: 221915063} - m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &221030095 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 221030093} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2c33719b6058cda4c9a3669de683f83a, type: 3} - m_Name: - m_EditorClassIdentifier: - _DirtyCounter: 0 - _Tiles: - chunkX: 2 - chunkY: 0 --- !u!1001 &221915062 PrefabInstance: m_ObjectHideFlags: 0 @@ -435,48 +387,48 @@ PrefabInstance: - target: {fileID: 184355828371754224, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} propertyPath: NetworkedBehaviours.Array.size - value: 10 + value: 2 objectReference: {fileID: 0} - target: {fileID: 184355828371754224, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} propertyPath: NetworkedBehaviours.Array.data[2] value: - objectReference: {fileID: 1366369265} + objectReference: {fileID: 0} - target: {fileID: 184355828371754224, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} propertyPath: NetworkedBehaviours.Array.data[3] value: - objectReference: {fileID: 2012494286} + objectReference: {fileID: 0} - target: {fileID: 184355828371754224, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} propertyPath: NetworkedBehaviours.Array.data[4] value: - objectReference: {fileID: 221030095} + objectReference: {fileID: 0} - target: {fileID: 184355828371754224, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} propertyPath: NetworkedBehaviours.Array.data[5] value: - objectReference: {fileID: 472804294} + objectReference: {fileID: 0} - target: {fileID: 184355828371754224, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} propertyPath: NetworkedBehaviours.Array.data[6] value: - objectReference: {fileID: 1637410668} + objectReference: {fileID: 0} - target: {fileID: 184355828371754224, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} propertyPath: NetworkedBehaviours.Array.data[7] value: - objectReference: {fileID: 1833102346} + objectReference: {fileID: 0} - target: {fileID: 184355828371754224, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} propertyPath: NetworkedBehaviours.Array.data[8] value: - objectReference: {fileID: 1597621571} + objectReference: {fileID: 0} - target: {fileID: 184355828371754224, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} propertyPath: NetworkedBehaviours.Array.data[9] value: - objectReference: {fileID: 1452633031} + objectReference: {fileID: 0} - target: {fileID: 482268095346116753, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} propertyPath: m_CullingMask.m_Bits @@ -616,42 +568,42 @@ PrefabInstance: type: 3} propertyPath: chunks.Array.data[0] value: - objectReference: {fileID: 1366369265} + objectReference: {fileID: 0} - target: {fileID: 3199354014281383139, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} propertyPath: chunks.Array.data[1] value: - objectReference: {fileID: 2012494286} + objectReference: {fileID: 0} - target: {fileID: 3199354014281383139, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} propertyPath: chunks.Array.data[2] value: - objectReference: {fileID: 221030095} + objectReference: {fileID: 0} - target: {fileID: 3199354014281383139, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} propertyPath: chunks.Array.data[3] value: - objectReference: {fileID: 472804294} + objectReference: {fileID: 0} - target: {fileID: 3199354014281383139, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} propertyPath: chunks.Array.data[4] value: - objectReference: {fileID: 1637410668} + objectReference: {fileID: 0} - target: {fileID: 3199354014281383139, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} propertyPath: chunks.Array.data[5] value: - objectReference: {fileID: 1833102346} + objectReference: {fileID: 0} - target: {fileID: 3199354014281383139, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} propertyPath: chunks.Array.data[6] value: - objectReference: {fileID: 1597621571} + objectReference: {fileID: 0} - target: {fileID: 3199354014281383139, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} propertyPath: chunks.Array.data[7] value: - objectReference: {fileID: 1452633031} + objectReference: {fileID: 0} - target: {fileID: 3357010861536891764, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} propertyPath: m_AnchorMax.y @@ -6478,46 +6430,8 @@ PrefabInstance: type: 3} insertIndex: 0 addedObject: {fileID: 1388438156} - - targetCorrespondingSourceObject: {fileID: 6381916647485414113, guid: 43d56bd18d06e9b4abe323618a20a228, - type: 3} - insertIndex: -1 - addedObject: {fileID: 1366369264} - - targetCorrespondingSourceObject: {fileID: 6381916647485414113, guid: 43d56bd18d06e9b4abe323618a20a228, - type: 3} - insertIndex: -1 - addedObject: {fileID: 2012494285} - - targetCorrespondingSourceObject: {fileID: 6381916647485414113, guid: 43d56bd18d06e9b4abe323618a20a228, - type: 3} - insertIndex: -1 - addedObject: {fileID: 221030094} - - targetCorrespondingSourceObject: {fileID: 6381916647485414113, guid: 43d56bd18d06e9b4abe323618a20a228, - type: 3} - insertIndex: -1 - addedObject: {fileID: 472804293} - - targetCorrespondingSourceObject: {fileID: 6381916647485414113, guid: 43d56bd18d06e9b4abe323618a20a228, - type: 3} - insertIndex: -1 - addedObject: {fileID: 1637410667} - - targetCorrespondingSourceObject: {fileID: 6381916647485414113, guid: 43d56bd18d06e9b4abe323618a20a228, - type: 3} - insertIndex: -1 - addedObject: {fileID: 1833102345} - - targetCorrespondingSourceObject: {fileID: 6381916647485414113, guid: 43d56bd18d06e9b4abe323618a20a228, - type: 3} - insertIndex: -1 - addedObject: {fileID: 1597621570} - - targetCorrespondingSourceObject: {fileID: 6381916647485414113, guid: 43d56bd18d06e9b4abe323618a20a228, - type: 3} - insertIndex: -1 - addedObject: {fileID: 1452633032} m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} ---- !u!4 &221915063 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 6381916647485414113, guid: 43d56bd18d06e9b4abe323618a20a228, - type: 3} - m_PrefabInstance: {fileID: 221915062} - m_PrefabAsset: {fileID: 0} --- !u!1001 &425644985 PrefabInstance: m_ObjectHideFlags: 0 @@ -6617,54 +6531,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 930783500} m_PrefabAsset: {fileID: 0} ---- !u!1 &472804292 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 472804293} - - component: {fileID: 472804294} - m_Layer: 0 - m_Name: TilemapChunk (3,0) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &472804293 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 472804292} - 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: [] - m_Father: {fileID: 221915063} - m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &472804294 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 472804292} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2c33719b6058cda4c9a3669de683f83a, type: 3} - m_Name: - m_EditorClassIdentifier: - _DirtyCounter: 0 - _Tiles: - chunkX: 3 - chunkY: 0 --- !u!1001 &503160126 PrefabInstance: m_ObjectHideFlags: 0 @@ -21179,54 +21045,6 @@ Transform: m_Father: {fileID: 171571677} m_RootOrder: -2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1366369263 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1366369264} - - component: {fileID: 1366369265} - m_Layer: 0 - m_Name: TilemapChunk (0,0) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1366369264 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1366369263} - 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: [] - m_Father: {fileID: 221915063} - m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1366369265 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1366369263} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2c33719b6058cda4c9a3669de683f83a, type: 3} - m_Name: - m_EditorClassIdentifier: - _DirtyCounter: 0 - _Tiles: - chunkX: 0 - chunkY: 0 --- !u!1 &1388438155 GameObject: m_ObjectHideFlags: 0 @@ -21371,54 +21189,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: renderToTextureIfAvailable: 1 ---- !u!1 &1452633030 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1452633032} - - component: {fileID: 1452633031} - m_Layer: 0 - m_Name: TilemapChunk (7,0) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &1452633031 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1452633030} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2c33719b6058cda4c9a3669de683f83a, type: 3} - m_Name: - m_EditorClassIdentifier: - _DirtyCounter: 0 - _Tiles: - chunkX: 7 - chunkY: 0 ---- !u!4 &1452633032 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1452633030} - 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: [] - m_Father: {fileID: 221915063} - m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1452698145 PrefabInstance: m_ObjectHideFlags: 0 @@ -22101,102 +21871,6 @@ Tilemap: e31: 0 e32: 0 e33: 1 ---- !u!1 &1597621569 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1597621570} - - component: {fileID: 1597621571} - m_Layer: 0 - m_Name: TilemapChunk (6,0) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1597621570 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1597621569} - 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: [] - m_Father: {fileID: 221915063} - m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1597621571 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1597621569} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2c33719b6058cda4c9a3669de683f83a, type: 3} - m_Name: - m_EditorClassIdentifier: - _DirtyCounter: 0 - _Tiles: - chunkX: 6 - chunkY: 0 ---- !u!1 &1637410666 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1637410667} - - component: {fileID: 1637410668} - m_Layer: 0 - m_Name: TilemapChunk (4,0) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1637410667 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1637410666} - 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: [] - m_Father: {fileID: 221915063} - m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1637410668 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1637410666} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2c33719b6058cda4c9a3669de683f83a, type: 3} - m_Name: - m_EditorClassIdentifier: - _DirtyCounter: 0 - _Tiles: - chunkX: 4 - chunkY: 0 --- !u!1 &1666812607 GameObject: m_ObjectHideFlags: 0 @@ -22653,54 +22327,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1828501555} m_PrefabAsset: {fileID: 0} ---- !u!1 &1833102344 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1833102345} - - component: {fileID: 1833102346} - m_Layer: 0 - m_Name: TilemapChunk (5,0) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1833102345 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1833102344} - 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: [] - m_Father: {fileID: 221915063} - m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1833102346 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1833102344} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2c33719b6058cda4c9a3669de683f83a, type: 3} - m_Name: - m_EditorClassIdentifier: - _DirtyCounter: 0 - _Tiles: - chunkX: 5 - chunkY: 0 --- !u!1 &1865717358 GameObject: m_ObjectHideFlags: 0 @@ -23024,54 +22650,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1981730599} m_PrefabAsset: {fileID: 0} ---- !u!1 &2012494284 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2012494285} - - component: {fileID: 2012494286} - m_Layer: 0 - m_Name: TilemapChunk (1,0) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &2012494285 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2012494284} - 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: [] - m_Father: {fileID: 221915063} - m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &2012494286 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2012494284} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2c33719b6058cda4c9a3669de683f83a, type: 3} - m_Name: - m_EditorClassIdentifier: - _DirtyCounter: 0 - _Tiles: - chunkX: 1 - chunkY: 0 --- !u!1001 &2038410822 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/Levels/CustomJungle.unity b/Assets/Scenes/Levels/CustomJungle.unity index 2e95e8ecd2..19d3bb571b 100644 --- a/Assets/Scenes/Levels/CustomJungle.unity +++ b/Assets/Scenes/Levels/CustomJungle.unity @@ -361,54 +361,6 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &200374320 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 200374321} - - component: {fileID: 200374322} - m_Layer: 0 - m_Name: TilemapChunk (2,0) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &200374321 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 200374320} - 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: [] - m_Father: {fileID: 221915063} - m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &200374322 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 200374320} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2c33719b6058cda4c9a3669de683f83a, type: 3} - m_Name: - m_EditorClassIdentifier: - _DirtyCounter: 0 - _Tiles: - chunkX: 2 - chunkY: 0 --- !u!1001 &221915062 PrefabInstance: m_ObjectHideFlags: 0 @@ -425,48 +377,48 @@ PrefabInstance: - target: {fileID: 184355828371754224, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} propertyPath: NetworkedBehaviours.Array.size - value: 10 + value: 2 objectReference: {fileID: 0} - target: {fileID: 184355828371754224, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} propertyPath: NetworkedBehaviours.Array.data[2] value: - objectReference: {fileID: 1227713748} + objectReference: {fileID: 0} - target: {fileID: 184355828371754224, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} propertyPath: NetworkedBehaviours.Array.data[3] value: - objectReference: {fileID: 1781906355} + objectReference: {fileID: 0} - target: {fileID: 184355828371754224, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} propertyPath: NetworkedBehaviours.Array.data[4] value: - objectReference: {fileID: 200374322} + objectReference: {fileID: 0} - target: {fileID: 184355828371754224, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} propertyPath: NetworkedBehaviours.Array.data[5] value: - objectReference: {fileID: 1388448451} + objectReference: {fileID: 0} - target: {fileID: 184355828371754224, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} propertyPath: NetworkedBehaviours.Array.data[6] value: - objectReference: {fileID: 758239574} + objectReference: {fileID: 0} - target: {fileID: 184355828371754224, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} propertyPath: NetworkedBehaviours.Array.data[7] value: - objectReference: {fileID: 672741258} + objectReference: {fileID: 0} - target: {fileID: 184355828371754224, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} propertyPath: NetworkedBehaviours.Array.data[8] value: - objectReference: {fileID: 599743149} + objectReference: {fileID: 0} - target: {fileID: 184355828371754224, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} propertyPath: NetworkedBehaviours.Array.data[9] value: - objectReference: {fileID: 568056546} + objectReference: {fileID: 0} - target: {fileID: 822077676654890402, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} propertyPath: m_AnchorMax.y @@ -772,42 +724,42 @@ PrefabInstance: type: 3} propertyPath: chunks.Array.data[0] value: - objectReference: {fileID: 1227713748} + objectReference: {fileID: 0} - target: {fileID: 3199354014281383139, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} propertyPath: chunks.Array.data[1] value: - objectReference: {fileID: 1781906355} + objectReference: {fileID: 0} - target: {fileID: 3199354014281383139, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} propertyPath: chunks.Array.data[2] value: - objectReference: {fileID: 200374322} + objectReference: {fileID: 0} - target: {fileID: 3199354014281383139, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} propertyPath: chunks.Array.data[3] value: - objectReference: {fileID: 1388448451} + objectReference: {fileID: 0} - target: {fileID: 3199354014281383139, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} propertyPath: chunks.Array.data[4] value: - objectReference: {fileID: 758239574} + objectReference: {fileID: 0} - target: {fileID: 3199354014281383139, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} propertyPath: chunks.Array.data[5] value: - objectReference: {fileID: 672741258} + objectReference: {fileID: 0} - target: {fileID: 3199354014281383139, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} propertyPath: chunks.Array.data[6] value: - objectReference: {fileID: 599743149} + objectReference: {fileID: 0} - target: {fileID: 3199354014281383139, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} propertyPath: chunks.Array.data[7] value: - objectReference: {fileID: 568056546} + objectReference: {fileID: 0} - target: {fileID: 3357010861536891764, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} propertyPath: m_AnchorMax.y @@ -4967,47 +4919,9 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] - m_AddedGameObjects: - - targetCorrespondingSourceObject: {fileID: 6381916647485414113, guid: 43d56bd18d06e9b4abe323618a20a228, - type: 3} - insertIndex: -1 - addedObject: {fileID: 1227713747} - - targetCorrespondingSourceObject: {fileID: 6381916647485414113, guid: 43d56bd18d06e9b4abe323618a20a228, - type: 3} - insertIndex: -1 - addedObject: {fileID: 1781906354} - - targetCorrespondingSourceObject: {fileID: 6381916647485414113, guid: 43d56bd18d06e9b4abe323618a20a228, - type: 3} - insertIndex: -1 - addedObject: {fileID: 200374321} - - targetCorrespondingSourceObject: {fileID: 6381916647485414113, guid: 43d56bd18d06e9b4abe323618a20a228, - type: 3} - insertIndex: -1 - addedObject: {fileID: 1388448450} - - targetCorrespondingSourceObject: {fileID: 6381916647485414113, guid: 43d56bd18d06e9b4abe323618a20a228, - type: 3} - insertIndex: -1 - addedObject: {fileID: 758239573} - - targetCorrespondingSourceObject: {fileID: 6381916647485414113, guid: 43d56bd18d06e9b4abe323618a20a228, - type: 3} - insertIndex: -1 - addedObject: {fileID: 672741257} - - targetCorrespondingSourceObject: {fileID: 6381916647485414113, guid: 43d56bd18d06e9b4abe323618a20a228, - type: 3} - insertIndex: -1 - addedObject: {fileID: 599743148} - - targetCorrespondingSourceObject: {fileID: 6381916647485414113, guid: 43d56bd18d06e9b4abe323618a20a228, - type: 3} - insertIndex: -1 - addedObject: {fileID: 568056547} + m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} ---- !u!4 &221915063 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 6381916647485414113, guid: 43d56bd18d06e9b4abe323618a20a228, - type: 3} - m_PrefabInstance: {fileID: 221915062} - m_PrefabAsset: {fileID: 0} --- !u!1001 &307745639 PrefabInstance: m_ObjectHideFlags: 0 @@ -10410,54 +10324,6 @@ ParticleSystem: m_PostInfinity: 2 m_RotationOrder: 4 vectorLabel1_3: W ---- !u!1 &568056545 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 568056547} - - component: {fileID: 568056546} - m_Layer: 0 - m_Name: TilemapChunk (7,0) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &568056546 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 568056545} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2c33719b6058cda4c9a3669de683f83a, type: 3} - m_Name: - m_EditorClassIdentifier: - _DirtyCounter: 0 - _Tiles: - chunkX: 7 - chunkY: 0 ---- !u!4 &568056547 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 568056545} - 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: [] - m_Father: {fileID: 221915063} - m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &580939795 GameObject: m_ObjectHideFlags: 0 @@ -10557,102 +10423,6 @@ MonoBehaviour: m_EditorClassIdentifier: speed: 0.4 frequency: 0.5 ---- !u!1 &599743147 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 599743148} - - component: {fileID: 599743149} - m_Layer: 0 - m_Name: TilemapChunk (6,0) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &599743148 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 599743147} - 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: [] - m_Father: {fileID: 221915063} - m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &599743149 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 599743147} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2c33719b6058cda4c9a3669de683f83a, type: 3} - m_Name: - m_EditorClassIdentifier: - _DirtyCounter: 0 - _Tiles: - chunkX: 6 - chunkY: 0 ---- !u!1 &672741256 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 672741257} - - component: {fileID: 672741258} - m_Layer: 0 - m_Name: TilemapChunk (5,0) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &672741257 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 672741256} - 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: [] - m_Father: {fileID: 221915063} - m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &672741258 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 672741256} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2c33719b6058cda4c9a3669de683f83a, type: 3} - m_Name: - m_EditorClassIdentifier: - _DirtyCounter: 0 - _Tiles: - chunkX: 5 - chunkY: 0 --- !u!43 &683431987 Mesh: m_ObjectHideFlags: 0 @@ -10928,54 +10698,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 722196848} m_PrefabAsset: {fileID: 0} ---- !u!1 &758239572 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 758239573} - - component: {fileID: 758239574} - m_Layer: 0 - m_Name: TilemapChunk (4,0) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &758239573 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 758239572} - 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: [] - m_Father: {fileID: 221915063} - m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &758239574 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 758239572} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2c33719b6058cda4c9a3669de683f83a, type: 3} - m_Name: - m_EditorClassIdentifier: - _DirtyCounter: 0 - _Tiles: - chunkX: 4 - chunkY: 0 --- !u!1 &763815594 GameObject: m_ObjectHideFlags: 0 @@ -11999,54 +11721,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1226013432} m_PrefabAsset: {fileID: 0} ---- !u!1 &1227713746 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1227713747} - - component: {fileID: 1227713748} - m_Layer: 0 - m_Name: TilemapChunk (0,0) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1227713747 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1227713746} - 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: [] - m_Father: {fileID: 221915063} - m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1227713748 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1227713746} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2c33719b6058cda4c9a3669de683f83a, type: 3} - m_Name: - m_EditorClassIdentifier: - _DirtyCounter: 0 - _Tiles: - chunkX: 0 - chunkY: 0 --- !u!1001 &1247040660 PrefabInstance: m_ObjectHideFlags: 0 @@ -24230,54 +23904,6 @@ Transform: m_Father: {fileID: 171571677} m_RootOrder: -2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1388448449 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1388448450} - - component: {fileID: 1388448451} - m_Layer: 0 - m_Name: TilemapChunk (3,0) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1388448450 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1388448449} - 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: [] - m_Father: {fileID: 221915063} - m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1388448451 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1388448449} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2c33719b6058cda4c9a3669de683f83a, type: 3} - m_Name: - m_EditorClassIdentifier: - _DirtyCounter: 0 - _Tiles: - chunkX: 3 - chunkY: 0 --- !u!1 &1424851875 GameObject: m_ObjectHideFlags: 0 @@ -28149,54 +27775,6 @@ Transform: m_Father: {fileID: 171571677} m_RootOrder: -2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1781906353 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1781906354} - - component: {fileID: 1781906355} - m_Layer: 0 - m_Name: TilemapChunk (1,0) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1781906354 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1781906353} - 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: [] - m_Father: {fileID: 221915063} - m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1781906355 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1781906353} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2c33719b6058cda4c9a3669de683f83a, type: 3} - m_Name: - m_EditorClassIdentifier: - _DirtyCounter: 0 - _Tiles: - chunkX: 1 - chunkY: 0 --- !u!1 &1942555962 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/Levels/CustomSky.unity b/Assets/Scenes/Levels/CustomSky.unity index e220bf130b..1bd462cf4b 100644 --- a/Assets/Scenes/Levels/CustomSky.unity +++ b/Assets/Scenes/Levels/CustomSky.unity @@ -140,48 +140,48 @@ PrefabInstance: - target: {fileID: 184355828371754224, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} propertyPath: NetworkedBehaviours.Array.size - value: 10 + value: 2 objectReference: {fileID: 0} - target: {fileID: 184355828371754224, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} propertyPath: NetworkedBehaviours.Array.data[2] value: - objectReference: {fileID: 1865917029} + objectReference: {fileID: 0} - target: {fileID: 184355828371754224, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} propertyPath: NetworkedBehaviours.Array.data[3] value: - objectReference: {fileID: 1696835734} + objectReference: {fileID: 0} - target: {fileID: 184355828371754224, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} propertyPath: NetworkedBehaviours.Array.data[4] value: - objectReference: {fileID: 1940680510} + objectReference: {fileID: 0} - target: {fileID: 184355828371754224, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} propertyPath: NetworkedBehaviours.Array.data[5] value: - objectReference: {fileID: 996700534} + objectReference: {fileID: 0} - target: {fileID: 184355828371754224, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} propertyPath: NetworkedBehaviours.Array.data[6] value: - objectReference: {fileID: 1209553117} + objectReference: {fileID: 0} - target: {fileID: 184355828371754224, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} propertyPath: NetworkedBehaviours.Array.data[7] value: - objectReference: {fileID: 1540995087} + objectReference: {fileID: 0} - target: {fileID: 184355828371754224, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} propertyPath: NetworkedBehaviours.Array.data[8] value: - objectReference: {fileID: 1075910066} + objectReference: {fileID: 0} - target: {fileID: 184355828371754224, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} propertyPath: NetworkedBehaviours.Array.data[9] value: - objectReference: {fileID: 194974600} + objectReference: {fileID: 0} - target: {fileID: 822077676654890402, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} propertyPath: m_AnchorMax.y @@ -579,42 +579,42 @@ PrefabInstance: type: 3} propertyPath: chunks.Array.data[0] value: - objectReference: {fileID: 1865917029} + objectReference: {fileID: 0} - target: {fileID: 3199354014281383139, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} propertyPath: chunks.Array.data[1] value: - objectReference: {fileID: 1696835734} + objectReference: {fileID: 0} - target: {fileID: 3199354014281383139, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} propertyPath: chunks.Array.data[2] value: - objectReference: {fileID: 1940680510} + objectReference: {fileID: 0} - target: {fileID: 3199354014281383139, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} propertyPath: chunks.Array.data[3] value: - objectReference: {fileID: 996700534} + objectReference: {fileID: 0} - target: {fileID: 3199354014281383139, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} propertyPath: chunks.Array.data[4] value: - objectReference: {fileID: 1209553117} + objectReference: {fileID: 0} - target: {fileID: 3199354014281383139, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} propertyPath: chunks.Array.data[5] value: - objectReference: {fileID: 1540995087} + objectReference: {fileID: 0} - target: {fileID: 3199354014281383139, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} propertyPath: chunks.Array.data[6] value: - objectReference: {fileID: 1075910066} + objectReference: {fileID: 0} - target: {fileID: 3199354014281383139, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} propertyPath: chunks.Array.data[7] value: - objectReference: {fileID: 194974600} + objectReference: {fileID: 0} - target: {fileID: 3357010861536891764, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} propertyPath: m_AnchorMax.y @@ -2477,47 +2477,9 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] - m_AddedGameObjects: - - targetCorrespondingSourceObject: {fileID: 6381916647485414113, guid: 43d56bd18d06e9b4abe323618a20a228, - type: 3} - insertIndex: -1 - addedObject: {fileID: 1865917028} - - targetCorrespondingSourceObject: {fileID: 6381916647485414113, guid: 43d56bd18d06e9b4abe323618a20a228, - type: 3} - insertIndex: -1 - addedObject: {fileID: 1696835733} - - targetCorrespondingSourceObject: {fileID: 6381916647485414113, guid: 43d56bd18d06e9b4abe323618a20a228, - type: 3} - insertIndex: -1 - addedObject: {fileID: 1940680509} - - targetCorrespondingSourceObject: {fileID: 6381916647485414113, guid: 43d56bd18d06e9b4abe323618a20a228, - type: 3} - insertIndex: -1 - addedObject: {fileID: 996700533} - - targetCorrespondingSourceObject: {fileID: 6381916647485414113, guid: 43d56bd18d06e9b4abe323618a20a228, - type: 3} - insertIndex: -1 - addedObject: {fileID: 1209553116} - - targetCorrespondingSourceObject: {fileID: 6381916647485414113, guid: 43d56bd18d06e9b4abe323618a20a228, - type: 3} - insertIndex: -1 - addedObject: {fileID: 1540995086} - - targetCorrespondingSourceObject: {fileID: 6381916647485414113, guid: 43d56bd18d06e9b4abe323618a20a228, - type: 3} - insertIndex: -1 - addedObject: {fileID: 1075910065} - - targetCorrespondingSourceObject: {fileID: 6381916647485414113, guid: 43d56bd18d06e9b4abe323618a20a228, - type: 3} - insertIndex: -1 - addedObject: {fileID: 194974601} + m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} ---- !u!4 &383957 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 6381916647485414113, guid: 43d56bd18d06e9b4abe323618a20a228, - type: 3} - m_PrefabInstance: {fileID: 383956} - m_PrefabAsset: {fileID: 0} --- !u!1 &35940504 GameObject: m_ObjectHideFlags: 0 @@ -3274,54 +3236,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: speed: -0.14 ---- !u!1 &194974599 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 194974601} - - component: {fileID: 194974600} - m_Layer: 0 - m_Name: TilemapChunk (3,1) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &194974600 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 194974599} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2c33719b6058cda4c9a3669de683f83a, type: 3} - m_Name: - m_EditorClassIdentifier: - _DirtyCounter: 0 - _Tiles: - chunkX: 3 - chunkY: 1 ---- !u!4 &194974601 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 194974599} - 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: [] - m_Father: {fileID: 383957} - m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &216671710 PrefabInstance: m_ObjectHideFlags: 0 @@ -4598,102 +4512,6 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 946c21a210ac3094bba96c7e4190a452, type: 3} ---- !u!1 &996700532 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 996700533} - - component: {fileID: 996700534} - m_Layer: 0 - m_Name: TilemapChunk (3,0) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &996700533 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 996700532} - 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: [] - m_Father: {fileID: 383957} - m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &996700534 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 996700532} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2c33719b6058cda4c9a3669de683f83a, type: 3} - m_Name: - m_EditorClassIdentifier: - _DirtyCounter: 0 - _Tiles: - chunkX: 3 - chunkY: 0 ---- !u!1 &1075910064 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1075910065} - - component: {fileID: 1075910066} - m_Layer: 0 - m_Name: TilemapChunk (2,1) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1075910065 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1075910064} - 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: [] - m_Father: {fileID: 383957} - m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1075910066 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1075910064} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2c33719b6058cda4c9a3669de683f83a, type: 3} - m_Name: - m_EditorClassIdentifier: - _DirtyCounter: 0 - _Tiles: - chunkX: 2 - chunkY: 1 --- !u!1 &1146816019 GameObject: m_ObjectHideFlags: 0 @@ -4798,54 +4616,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 619063403} m_PrefabAsset: {fileID: 0} ---- !u!1 &1209553115 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1209553116} - - component: {fileID: 1209553117} - m_Layer: 0 - m_Name: TilemapChunk (0,1) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1209553116 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1209553115} - 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: [] - m_Father: {fileID: 383957} - m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1209553117 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1209553115} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2c33719b6058cda4c9a3669de683f83a, type: 3} - m_Name: - m_EditorClassIdentifier: - _DirtyCounter: 0 - _Tiles: - chunkX: 0 - chunkY: 1 --- !u!1 &1292545024 GameObject: m_ObjectHideFlags: 0 @@ -7215,54 +6985,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1502859943} m_PrefabAsset: {fileID: 0} ---- !u!1 &1540995085 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1540995086} - - component: {fileID: 1540995087} - m_Layer: 0 - m_Name: TilemapChunk (1,1) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1540995086 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1540995085} - 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: [] - m_Father: {fileID: 383957} - m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1540995087 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1540995085} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2c33719b6058cda4c9a3669de683f83a, type: 3} - m_Name: - m_EditorClassIdentifier: - _DirtyCounter: 0 - _Tiles: - chunkX: 1 - chunkY: 1 --- !u!1001 &1664264416 PrefabInstance: m_ObjectHideFlags: 0 @@ -7367,54 +7089,6 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 946c21a210ac3094bba96c7e4190a452, type: 3} ---- !u!1 &1696835732 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1696835733} - - component: {fileID: 1696835734} - m_Layer: 0 - m_Name: TilemapChunk (1,0) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1696835733 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1696835732} - 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: [] - m_Father: {fileID: 383957} - m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1696835734 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1696835732} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2c33719b6058cda4c9a3669de683f83a, type: 3} - m_Name: - m_EditorClassIdentifier: - _DirtyCounter: 0 - _Tiles: - chunkX: 1 - chunkY: 0 --- !u!1 &1784042130 GameObject: m_ObjectHideFlags: 0 @@ -10757,54 +10431,6 @@ Transform: m_Father: {fileID: 1292545025} m_RootOrder: -2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1865917027 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1865917028} - - component: {fileID: 1865917029} - m_Layer: 0 - m_Name: TilemapChunk (0,0) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1865917028 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1865917027} - 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: [] - m_Father: {fileID: 383957} - m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1865917029 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1865917027} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2c33719b6058cda4c9a3669de683f83a, type: 3} - m_Name: - m_EditorClassIdentifier: - _DirtyCounter: 0 - _Tiles: - chunkX: 0 - chunkY: 0 --- !u!1001 &1914232563 PrefabInstance: m_ObjectHideFlags: 0 @@ -10909,54 +10535,6 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 946c21a210ac3094bba96c7e4190a452, type: 3} ---- !u!1 &1940680508 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1940680509} - - component: {fileID: 1940680510} - m_Layer: 0 - m_Name: TilemapChunk (2,0) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1940680509 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1940680508} - 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: [] - m_Father: {fileID: 383957} - m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1940680510 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1940680508} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2c33719b6058cda4c9a3669de683f83a, type: 3} - m_Name: - m_EditorClassIdentifier: - _DirtyCounter: 0 - _Tiles: - chunkX: 2 - chunkY: 0 --- !u!1001 &2108825702 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/Levels/CustomVolcano.unity b/Assets/Scenes/Levels/CustomVolcano.unity index 943eca3d0d..64e7a2030a 100644 --- a/Assets/Scenes/Levels/CustomVolcano.unity +++ b/Assets/Scenes/Levels/CustomVolcano.unity @@ -124,54 +124,6 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} ---- !u!1 &44212095 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 44212096} - - component: {fileID: 44212097} - m_Layer: 0 - m_Name: TilemapChunk (1,1) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &44212096 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 44212095} - 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: [] - m_Father: {fileID: 493691704} - m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &44212097 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 44212095} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2c33719b6058cda4c9a3669de683f83a, type: 3} - m_Name: - m_EditorClassIdentifier: - _DirtyCounter: 0 - _Tiles: - chunkX: 1 - chunkY: 1 --- !u!1001 &59254272 PrefabInstance: m_ObjectHideFlags: 0 @@ -327,54 +279,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 556236951} m_PrefabAsset: {fileID: 0} ---- !u!1 &91936139 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 91936140} - - component: {fileID: 91936141} - m_Layer: 0 - m_Name: TilemapChunk (0,0) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &91936140 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 91936139} - 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: [] - m_Father: {fileID: 493691704} - m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &91936141 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 91936139} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2c33719b6058cda4c9a3669de683f83a, type: 3} - m_Name: - m_EditorClassIdentifier: - _DirtyCounter: 0 - _Tiles: - chunkX: 0 - chunkY: 0 --- !u!1 &133199009 GameObject: m_ObjectHideFlags: 0 @@ -533,54 +437,6 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &148602967 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 148602969} - - component: {fileID: 148602968} - m_Layer: 0 - m_Name: TilemapChunk (4,1) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &148602968 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 148602967} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2c33719b6058cda4c9a3669de683f83a, type: 3} - m_Name: - m_EditorClassIdentifier: - _DirtyCounter: 0 - _Tiles: - chunkX: 4 - chunkY: 1 ---- !u!4 &148602969 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 148602967} - 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: [] - m_Father: {fileID: 493691704} - m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &172899222 GameObject: m_ObjectHideFlags: 0 @@ -22976,58 +22832,58 @@ PrefabInstance: - target: {fileID: 184355828371754224, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} propertyPath: NetworkedBehaviours.Array.size - value: 12 + value: 2 objectReference: {fileID: 0} - target: {fileID: 184355828371754224, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} propertyPath: NetworkedBehaviours.Array.data[2] value: - objectReference: {fileID: 91936141} + objectReference: {fileID: 0} - target: {fileID: 184355828371754224, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} propertyPath: NetworkedBehaviours.Array.data[3] value: - objectReference: {fileID: 1601461545} + objectReference: {fileID: 0} - target: {fileID: 184355828371754224, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} propertyPath: NetworkedBehaviours.Array.data[4] value: - objectReference: {fileID: 1921269871} + objectReference: {fileID: 0} - target: {fileID: 184355828371754224, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} propertyPath: NetworkedBehaviours.Array.data[5] value: - objectReference: {fileID: 1691050734} + objectReference: {fileID: 0} - target: {fileID: 184355828371754224, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} propertyPath: NetworkedBehaviours.Array.data[6] value: - objectReference: {fileID: 1026359063} + objectReference: {fileID: 0} - target: {fileID: 184355828371754224, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} propertyPath: NetworkedBehaviours.Array.data[7] value: - objectReference: {fileID: 1454341702} + objectReference: {fileID: 0} - target: {fileID: 184355828371754224, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} propertyPath: NetworkedBehaviours.Array.data[8] value: - objectReference: {fileID: 44212097} + objectReference: {fileID: 0} - target: {fileID: 184355828371754224, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} propertyPath: NetworkedBehaviours.Array.data[9] value: - objectReference: {fileID: 840791146} + objectReference: {fileID: 0} - target: {fileID: 184355828371754224, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} propertyPath: NetworkedBehaviours.Array.data[10] value: - objectReference: {fileID: 1438108665} + objectReference: {fileID: 0} - target: {fileID: 184355828371754224, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} propertyPath: NetworkedBehaviours.Array.data[11] value: - objectReference: {fileID: 148602968} + objectReference: {fileID: 0} - target: {fileID: 482268096050949388, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} propertyPath: m_LocalPosition.x @@ -23317,52 +23173,52 @@ PrefabInstance: type: 3} propertyPath: chunks.Array.data[0] value: - objectReference: {fileID: 91936141} + objectReference: {fileID: 0} - target: {fileID: 3199354014281383139, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} propertyPath: chunks.Array.data[1] value: - objectReference: {fileID: 1601461545} + objectReference: {fileID: 0} - target: {fileID: 3199354014281383139, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} propertyPath: chunks.Array.data[2] value: - objectReference: {fileID: 1921269871} + objectReference: {fileID: 0} - target: {fileID: 3199354014281383139, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} propertyPath: chunks.Array.data[3] value: - objectReference: {fileID: 1691050734} + objectReference: {fileID: 0} - target: {fileID: 3199354014281383139, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} propertyPath: chunks.Array.data[4] value: - objectReference: {fileID: 1026359063} + objectReference: {fileID: 0} - target: {fileID: 3199354014281383139, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} propertyPath: chunks.Array.data[5] value: - objectReference: {fileID: 1454341702} + objectReference: {fileID: 0} - target: {fileID: 3199354014281383139, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} propertyPath: chunks.Array.data[6] value: - objectReference: {fileID: 44212097} + objectReference: {fileID: 0} - target: {fileID: 3199354014281383139, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} propertyPath: chunks.Array.data[7] value: - objectReference: {fileID: 840791146} + objectReference: {fileID: 0} - target: {fileID: 3199354014281383139, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} propertyPath: chunks.Array.data[8] value: - objectReference: {fileID: 1438108665} + objectReference: {fileID: 0} - target: {fileID: 3199354014281383139, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} propertyPath: chunks.Array.data[9] value: - objectReference: {fileID: 148602968} + objectReference: {fileID: 0} - target: {fileID: 3357010861536891764, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} propertyPath: m_AnchorMax.y @@ -27809,55 +27665,9 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] - m_AddedGameObjects: - - targetCorrespondingSourceObject: {fileID: 6381916647485414113, guid: 43d56bd18d06e9b4abe323618a20a228, - type: 3} - insertIndex: -1 - addedObject: {fileID: 91936140} - - targetCorrespondingSourceObject: {fileID: 6381916647485414113, guid: 43d56bd18d06e9b4abe323618a20a228, - type: 3} - insertIndex: -1 - addedObject: {fileID: 1601461544} - - targetCorrespondingSourceObject: {fileID: 6381916647485414113, guid: 43d56bd18d06e9b4abe323618a20a228, - type: 3} - insertIndex: -1 - addedObject: {fileID: 1921269870} - - targetCorrespondingSourceObject: {fileID: 6381916647485414113, guid: 43d56bd18d06e9b4abe323618a20a228, - type: 3} - insertIndex: -1 - addedObject: {fileID: 1691050733} - - targetCorrespondingSourceObject: {fileID: 6381916647485414113, guid: 43d56bd18d06e9b4abe323618a20a228, - type: 3} - insertIndex: -1 - addedObject: {fileID: 1026359062} - - targetCorrespondingSourceObject: {fileID: 6381916647485414113, guid: 43d56bd18d06e9b4abe323618a20a228, - type: 3} - insertIndex: -1 - addedObject: {fileID: 1454341701} - - targetCorrespondingSourceObject: {fileID: 6381916647485414113, guid: 43d56bd18d06e9b4abe323618a20a228, - type: 3} - insertIndex: -1 - addedObject: {fileID: 44212096} - - targetCorrespondingSourceObject: {fileID: 6381916647485414113, guid: 43d56bd18d06e9b4abe323618a20a228, - type: 3} - insertIndex: -1 - addedObject: {fileID: 840791145} - - targetCorrespondingSourceObject: {fileID: 6381916647485414113, guid: 43d56bd18d06e9b4abe323618a20a228, - type: 3} - insertIndex: -1 - addedObject: {fileID: 1438108664} - - targetCorrespondingSourceObject: {fileID: 6381916647485414113, guid: 43d56bd18d06e9b4abe323618a20a228, - type: 3} - insertIndex: -1 - addedObject: {fileID: 148602969} + m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} ---- !u!4 &493691704 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 6381916647485414113, guid: 43d56bd18d06e9b4abe323618a20a228, - type: 3} - m_PrefabInstance: {fileID: 493691703} - m_PrefabAsset: {fileID: 0} --- !u!1001 &502002788 PrefabInstance: m_ObjectHideFlags: 0 @@ -28496,54 +28306,6 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: df38f39e18bbdcf4b9b2ee15b49f1bb2, type: 3} ---- !u!1 &840791144 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 840791145} - - component: {fileID: 840791146} - m_Layer: 0 - m_Name: TilemapChunk (2,1) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &840791145 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 840791144} - 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: [] - m_Father: {fileID: 493691704} - m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &840791146 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 840791144} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2c33719b6058cda4c9a3669de683f83a, type: 3} - m_Name: - m_EditorClassIdentifier: - _DirtyCounter: 0 - _Tiles: - chunkX: 2 - chunkY: 1 --- !u!1 &842768652 GameObject: m_ObjectHideFlags: 0 @@ -42185,54 +41947,6 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 946c21a210ac3094bba96c7e4190a452, type: 3} ---- !u!1 &1026359061 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1026359062} - - component: {fileID: 1026359063} - m_Layer: 0 - m_Name: TilemapChunk (4,0) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1026359062 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1026359061} - 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: [] - m_Father: {fileID: 493691704} - m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1026359063 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1026359061} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2c33719b6058cda4c9a3669de683f83a, type: 3} - m_Name: - m_EditorClassIdentifier: - _DirtyCounter: 0 - _Tiles: - chunkX: 4 - chunkY: 0 --- !u!4 &1033501063 stripped Transform: m_CorrespondingSourceObject: {fileID: 5780648777663731100, guid: 946c21a210ac3094bba96c7e4190a452, @@ -42857,54 +42571,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 59254272} m_PrefabAsset: {fileID: 0} ---- !u!1 &1438108663 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1438108664} - - component: {fileID: 1438108665} - m_Layer: 0 - m_Name: TilemapChunk (3,1) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1438108664 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1438108663} - 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: [] - m_Father: {fileID: 493691704} - m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1438108665 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1438108663} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2c33719b6058cda4c9a3669de683f83a, type: 3} - m_Name: - m_EditorClassIdentifier: - _DirtyCounter: 0 - _Tiles: - chunkX: 3 - chunkY: 1 --- !u!1 &1443173857 GameObject: m_ObjectHideFlags: 0 @@ -42936,54 +42602,6 @@ Transform: m_Father: {fileID: 1292545025} m_RootOrder: -2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1454341700 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1454341701} - - component: {fileID: 1454341702} - m_Layer: 0 - m_Name: TilemapChunk (0,1) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1454341701 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1454341700} - 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: [] - m_Father: {fileID: 493691704} - m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1454341702 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1454341700} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2c33719b6058cda4c9a3669de683f83a, type: 3} - m_Name: - m_EditorClassIdentifier: - _DirtyCounter: 0 - _Tiles: - chunkX: 0 - chunkY: 1 --- !u!1001 &1502923638 PrefabInstance: m_ObjectHideFlags: 0 @@ -43358,54 +42976,6 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 946c21a210ac3094bba96c7e4190a452, type: 3} ---- !u!1 &1601461543 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1601461544} - - component: {fileID: 1601461545} - m_Layer: 0 - m_Name: TilemapChunk (1,0) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1601461544 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1601461543} - 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: [] - m_Father: {fileID: 493691704} - m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1601461545 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1601461543} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2c33719b6058cda4c9a3669de683f83a, type: 3} - m_Name: - m_EditorClassIdentifier: - _DirtyCounter: 0 - _Tiles: - chunkX: 1 - chunkY: 0 --- !u!1 &1605859849 GameObject: m_ObjectHideFlags: 0 @@ -43659,54 +43229,6 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: b9269a89e3e698d49b203e24f8b2e221, type: 3} ---- !u!1 &1691050732 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1691050733} - - component: {fileID: 1691050734} - m_Layer: 0 - m_Name: TilemapChunk (3,0) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1691050733 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1691050732} - 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: [] - m_Father: {fileID: 493691704} - m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1691050734 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1691050732} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2c33719b6058cda4c9a3669de683f83a, type: 3} - m_Name: - m_EditorClassIdentifier: - _DirtyCounter: 0 - _Tiles: - chunkX: 3 - chunkY: 0 --- !u!1 &1725107846 GameObject: m_ObjectHideFlags: 0 @@ -45126,54 +44648,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1683652980} m_PrefabAsset: {fileID: 0} ---- !u!1 &1921269869 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1921269870} - - component: {fileID: 1921269871} - m_Layer: 0 - m_Name: TilemapChunk (2,0) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1921269870 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1921269869} - 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: [] - m_Father: {fileID: 493691704} - m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1921269871 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1921269869} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2c33719b6058cda4c9a3669de683f83a, type: 3} - m_Name: - m_EditorClassIdentifier: - _DirtyCounter: 0 - _Tiles: - chunkX: 2 - chunkY: 0 --- !u!1001 &1961260949 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/Levels/DefaultBrickLevel.unity b/Assets/Scenes/Levels/DefaultBrickLevel.unity index c9641b25ff..3e022cceb2 100644 --- a/Assets/Scenes/Levels/DefaultBrickLevel.unity +++ b/Assets/Scenes/Levels/DefaultBrickLevel.unity @@ -4904,18 +4904,18 @@ PrefabInstance: - target: {fileID: 184355828371754224, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} propertyPath: NetworkedBehaviours.Array.size - value: 4 + value: 2 objectReference: {fileID: 0} - target: {fileID: 184355828371754224, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} propertyPath: NetworkedBehaviours.Array.data[2] value: - objectReference: {fileID: 2140295849} + objectReference: {fileID: 0} - target: {fileID: 184355828371754224, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} propertyPath: NetworkedBehaviours.Array.data[3] value: - objectReference: {fileID: 2146237090} + objectReference: {fileID: 0} - target: {fileID: 822077676654890402, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} propertyPath: m_AnchorMax.y @@ -5051,12 +5051,12 @@ PrefabInstance: type: 3} propertyPath: chunks.Array.data[0] value: - objectReference: {fileID: 2140295849} + objectReference: {fileID: 0} - target: {fileID: 3199354014281383139, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} propertyPath: chunks.Array.data[1] value: - objectReference: {fileID: 2146237090} + objectReference: {fileID: 0} - target: {fileID: 3357010861536891764, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} propertyPath: m_AnchorMax.y @@ -5920,23 +5920,9 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] - m_AddedGameObjects: - - targetCorrespondingSourceObject: {fileID: 6381916647485414113, guid: 43d56bd18d06e9b4abe323618a20a228, - type: 3} - insertIndex: -1 - addedObject: {fileID: 2140295848} - - targetCorrespondingSourceObject: {fileID: 6381916647485414113, guid: 43d56bd18d06e9b4abe323618a20a228, - type: 3} - insertIndex: -1 - addedObject: {fileID: 2146237091} + m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} ---- !u!4 &873727633 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 6381916647485414113, guid: 43d56bd18d06e9b4abe323618a20a228, - type: 3} - m_PrefabInstance: {fileID: 873727632} - m_PrefabAsset: {fileID: 0} --- !u!1 &990002637 GameObject: m_ObjectHideFlags: 0 @@ -7240,99 +7226,3 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1953587316} m_PrefabAsset: {fileID: 0} ---- !u!1 &2140295847 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2140295848} - - component: {fileID: 2140295849} - m_Layer: 0 - m_Name: TilemapChunk (0,0) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &2140295848 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2140295847} - 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: [] - m_Father: {fileID: 873727633} - m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &2140295849 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2140295847} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2c33719b6058cda4c9a3669de683f83a, type: 3} - m_Name: - m_EditorClassIdentifier: - _DirtyCounter: 0 - _Tiles: - chunkX: 0 - chunkY: 0 ---- !u!1 &2146237089 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2146237091} - - component: {fileID: 2146237090} - m_Layer: 0 - m_Name: TilemapChunk (1,0) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &2146237090 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2146237089} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2c33719b6058cda4c9a3669de683f83a, type: 3} - m_Name: - m_EditorClassIdentifier: - _DirtyCounter: 0 - _Tiles: - chunkX: 1 - chunkY: 0 ---- !u!4 &2146237091 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2146237089} - 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: [] - m_Father: {fileID: 873727633} - m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/Scenes/Levels/DefaultCastle.unity b/Assets/Scenes/Levels/DefaultCastle.unity index 8a9b899688..0d6063a0a4 100644 --- a/Assets/Scenes/Levels/DefaultCastle.unity +++ b/Assets/Scenes/Levels/DefaultCastle.unity @@ -3996,54 +3996,6 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &312518030 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 312518032} - - component: {fileID: 312518031} - m_Layer: 0 - m_Name: TilemapChunk (3,0) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &312518031 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 312518030} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2c33719b6058cda4c9a3669de683f83a, type: 3} - m_Name: - m_EditorClassIdentifier: - _DirtyCounter: 0 - _Tiles: - chunkX: 3 - chunkY: 0 ---- !u!4 &312518032 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 312518030} - 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: [] - m_Father: {fileID: 379146489} - m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &313093939 PrefabInstance: m_ObjectHideFlags: 0 @@ -11975,28 +11927,28 @@ PrefabInstance: - target: {fileID: 184355828371754224, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} propertyPath: NetworkedBehaviours.Array.size - value: 6 + value: 2 objectReference: {fileID: 0} - target: {fileID: 184355828371754224, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} propertyPath: NetworkedBehaviours.Array.data[2] value: - objectReference: {fileID: 1432783559} + objectReference: {fileID: 0} - target: {fileID: 184355828371754224, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} propertyPath: NetworkedBehaviours.Array.data[3] value: - objectReference: {fileID: 672478261} + objectReference: {fileID: 0} - target: {fileID: 184355828371754224, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} propertyPath: NetworkedBehaviours.Array.data[4] value: - objectReference: {fileID: 1876885316} + objectReference: {fileID: 0} - target: {fileID: 184355828371754224, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} propertyPath: NetworkedBehaviours.Array.data[5] value: - objectReference: {fileID: 312518031} + objectReference: {fileID: 0} - target: {fileID: 482268096050949388, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} propertyPath: m_LocalPosition.x @@ -12203,22 +12155,22 @@ PrefabInstance: type: 3} propertyPath: chunks.Array.data[0] value: - objectReference: {fileID: 1432783559} + objectReference: {fileID: 0} - target: {fileID: 3199354014281383139, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} propertyPath: chunks.Array.data[1] value: - objectReference: {fileID: 672478261} + objectReference: {fileID: 0} - target: {fileID: 3199354014281383139, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} propertyPath: chunks.Array.data[2] value: - objectReference: {fileID: 1876885316} + objectReference: {fileID: 0} - target: {fileID: 3199354014281383139, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} propertyPath: chunks.Array.data[3] value: - objectReference: {fileID: 312518031} + objectReference: {fileID: 0} - target: {fileID: 3357010861536891764, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} propertyPath: m_AnchorMax.y @@ -13838,31 +13790,9 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] - m_AddedGameObjects: - - targetCorrespondingSourceObject: {fileID: 6381916647485414113, guid: 43d56bd18d06e9b4abe323618a20a228, - type: 3} - insertIndex: -1 - addedObject: {fileID: 1432783558} - - targetCorrespondingSourceObject: {fileID: 6381916647485414113, guid: 43d56bd18d06e9b4abe323618a20a228, - type: 3} - insertIndex: -1 - addedObject: {fileID: 672478260} - - targetCorrespondingSourceObject: {fileID: 6381916647485414113, guid: 43d56bd18d06e9b4abe323618a20a228, - type: 3} - insertIndex: -1 - addedObject: {fileID: 1876885315} - - targetCorrespondingSourceObject: {fileID: 6381916647485414113, guid: 43d56bd18d06e9b4abe323618a20a228, - type: 3} - insertIndex: -1 - addedObject: {fileID: 312518032} + m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} ---- !u!4 &379146489 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 6381916647485414113, guid: 43d56bd18d06e9b4abe323618a20a228, - type: 3} - m_PrefabInstance: {fileID: 379146488} - m_PrefabAsset: {fileID: 0} --- !u!1001 &386921147 PrefabInstance: m_ObjectHideFlags: 0 @@ -14229,54 +14159,6 @@ Transform: m_Father: {fileID: 279632422} m_RootOrder: -2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &672478259 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 672478260} - - component: {fileID: 672478261} - m_Layer: 0 - m_Name: TilemapChunk (1,0) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &672478260 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 672478259} - 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: [] - m_Father: {fileID: 379146489} - m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &672478261 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 672478259} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2c33719b6058cda4c9a3669de683f83a, type: 3} - m_Name: - m_EditorClassIdentifier: - _DirtyCounter: 0 - _Tiles: - chunkX: 1 - chunkY: 0 --- !u!1001 &787259839 PrefabInstance: m_ObjectHideFlags: 0 @@ -14934,54 +14816,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1128370425} m_PrefabAsset: {fileID: 0} ---- !u!1 &1432783557 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1432783558} - - component: {fileID: 1432783559} - m_Layer: 0 - m_Name: TilemapChunk (0,0) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1432783558 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1432783557} - 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: [] - m_Father: {fileID: 379146489} - m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1432783559 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1432783557} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2c33719b6058cda4c9a3669de683f83a, type: 3} - m_Name: - m_EditorClassIdentifier: - _DirtyCounter: 0 - _Tiles: - chunkX: 0 - chunkY: 0 --- !u!1 &1525103740 GameObject: m_ObjectHideFlags: 0 @@ -15518,54 +15352,6 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1876885314 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1876885315} - - component: {fileID: 1876885316} - m_Layer: 0 - m_Name: TilemapChunk (2,0) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1876885315 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1876885314} - 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: [] - m_Father: {fileID: 379146489} - m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1876885316 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1876885314} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2c33719b6058cda4c9a3669de683f83a, type: 3} - m_Name: - m_EditorClassIdentifier: - _DirtyCounter: 0 - _Tiles: - chunkX: 2 - chunkY: 0 --- !u!1001 &2028860351 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/Levels/DefaultGrassLevel.unity b/Assets/Scenes/Levels/DefaultGrassLevel.unity index e673ff354f..83e04ef9c5 100644 --- a/Assets/Scenes/Levels/DefaultGrassLevel.unity +++ b/Assets/Scenes/Levels/DefaultGrassLevel.unity @@ -125,54 +125,6 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} ---- !u!1 &2430244 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2430245} - - component: {fileID: 2430246} - m_Layer: 0 - m_Name: TilemapChunk (0,0) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &2430245 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2430244} - 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: [] - m_Father: {fileID: 960646681} - m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &2430246 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2430244} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2c33719b6058cda4c9a3669de683f83a, type: 3} - m_Name: - m_EditorClassIdentifier: - _DirtyCounter: 0 - _Tiles: - chunkX: 0 - chunkY: 0 --- !u!1001 &57921653 PrefabInstance: m_ObjectHideFlags: 0 @@ -4169,54 +4121,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 653197854} m_PrefabAsset: {fileID: 0} ---- !u!1 &671113930 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 671113931} - - component: {fileID: 671113932} - m_Layer: 0 - m_Name: TilemapChunk (1,0) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &671113931 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 671113930} - 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: [] - m_Father: {fileID: 960646681} - m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &671113932 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 671113930} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2c33719b6058cda4c9a3669de683f83a, type: 3} - m_Name: - m_EditorClassIdentifier: - _DirtyCounter: 0 - _Tiles: - chunkX: 1 - chunkY: 0 --- !u!1001 &773708809 PrefabInstance: m_ObjectHideFlags: 0 @@ -4332,54 +4236,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 773708809} m_PrefabAsset: {fileID: 0} ---- !u!1 &836096072 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 836096073} - - component: {fileID: 836096074} - m_Layer: 0 - m_Name: TilemapChunk (2,0) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &836096073 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 836096072} - 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: [] - m_Father: {fileID: 960646681} - m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &836096074 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 836096072} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2c33719b6058cda4c9a3669de683f83a, type: 3} - m_Name: - m_EditorClassIdentifier: - _DirtyCounter: 0 - _Tiles: - chunkX: 2 - chunkY: 0 --- !u!1 &956522486 GameObject: m_ObjectHideFlags: 0 @@ -4472,28 +4328,28 @@ PrefabInstance: - target: {fileID: 184355828371754224, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} propertyPath: NetworkedBehaviours.Array.size - value: 6 + value: 2 objectReference: {fileID: 0} - target: {fileID: 184355828371754224, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} propertyPath: NetworkedBehaviours.Array.data[2] value: - objectReference: {fileID: 2430246} + objectReference: {fileID: 0} - target: {fileID: 184355828371754224, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} propertyPath: NetworkedBehaviours.Array.data[3] value: - objectReference: {fileID: 671113932} + objectReference: {fileID: 0} - target: {fileID: 184355828371754224, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} propertyPath: NetworkedBehaviours.Array.data[4] value: - objectReference: {fileID: 836096074} + objectReference: {fileID: 0} - target: {fileID: 184355828371754224, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} propertyPath: NetworkedBehaviours.Array.data[5] value: - objectReference: {fileID: 1232200757} + objectReference: {fileID: 0} - target: {fileID: 220628040255732582, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} propertyPath: m_AnchorMax.y @@ -4799,22 +4655,22 @@ PrefabInstance: type: 3} propertyPath: chunks.Array.data[0] value: - objectReference: {fileID: 2430246} + objectReference: {fileID: 0} - target: {fileID: 3199354014281383139, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} propertyPath: chunks.Array.data[1] value: - objectReference: {fileID: 671113932} + objectReference: {fileID: 0} - target: {fileID: 3199354014281383139, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} propertyPath: chunks.Array.data[2] value: - objectReference: {fileID: 836096074} + objectReference: {fileID: 0} - target: {fileID: 3199354014281383139, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} propertyPath: chunks.Array.data[3] value: - objectReference: {fileID: 1232200757} + objectReference: {fileID: 0} - target: {fileID: 3357010861536891764, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} propertyPath: m_AnchorMax.y @@ -6184,31 +6040,9 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] - m_AddedGameObjects: - - targetCorrespondingSourceObject: {fileID: 6381916647485414113, guid: 43d56bd18d06e9b4abe323618a20a228, - type: 3} - insertIndex: -1 - addedObject: {fileID: 2430245} - - targetCorrespondingSourceObject: {fileID: 6381916647485414113, guid: 43d56bd18d06e9b4abe323618a20a228, - type: 3} - insertIndex: -1 - addedObject: {fileID: 671113931} - - targetCorrespondingSourceObject: {fileID: 6381916647485414113, guid: 43d56bd18d06e9b4abe323618a20a228, - type: 3} - insertIndex: -1 - addedObject: {fileID: 836096073} - - targetCorrespondingSourceObject: {fileID: 6381916647485414113, guid: 43d56bd18d06e9b4abe323618a20a228, - type: 3} - insertIndex: -1 - addedObject: {fileID: 1232200758} + m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} ---- !u!4 &960646681 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 6381916647485414113, guid: 43d56bd18d06e9b4abe323618a20a228, - type: 3} - m_PrefabInstance: {fileID: 960646680} - m_PrefabAsset: {fileID: 0} --- !u!1 &992935484 GameObject: m_ObjectHideFlags: 0 @@ -6467,54 +6301,6 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1232200756 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1232200758} - - component: {fileID: 1232200757} - m_Layer: 0 - m_Name: TilemapChunk (3,0) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &1232200757 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1232200756} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2c33719b6058cda4c9a3669de683f83a, type: 3} - m_Name: - m_EditorClassIdentifier: - _DirtyCounter: 0 - _Tiles: - chunkX: 3 - chunkY: 0 ---- !u!4 &1232200758 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1232200756} - 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: [] - m_Father: {fileID: 960646681} - m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1542081885 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/Levels/DefaultPipes.unity b/Assets/Scenes/Levels/DefaultPipes.unity index c076e32206..4ed1c5180f 100644 --- a/Assets/Scenes/Levels/DefaultPipes.unity +++ b/Assets/Scenes/Levels/DefaultPipes.unity @@ -1702,54 +1702,6 @@ Transform: m_Father: {fileID: 2110129131} m_RootOrder: -2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &812804098 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 812804099} - - component: {fileID: 812804100} - m_Layer: 0 - m_Name: TilemapChunk (0,1) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &812804099 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 812804098} - 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: [] - m_Father: {fileID: 1003601256} - m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &812804100 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 812804098} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2c33719b6058cda4c9a3669de683f83a, type: 3} - m_Name: - m_EditorClassIdentifier: - _DirtyCounter: 0 - _Tiles: - chunkX: 0 - chunkY: 1 --- !u!1001 &831890586 PrefabInstance: m_ObjectHideFlags: 0 @@ -1886,48 +1838,48 @@ PrefabInstance: - target: {fileID: 184355828371754224, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} propertyPath: NetworkedBehaviours.Array.size - value: 10 + value: 2 objectReference: {fileID: 0} - target: {fileID: 184355828371754224, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} propertyPath: NetworkedBehaviours.Array.data[2] value: - objectReference: {fileID: 1978317513} + objectReference: {fileID: 0} - target: {fileID: 184355828371754224, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} propertyPath: NetworkedBehaviours.Array.data[3] value: - objectReference: {fileID: 1459354212} + objectReference: {fileID: 0} - target: {fileID: 184355828371754224, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} propertyPath: NetworkedBehaviours.Array.data[4] value: - objectReference: {fileID: 2125392943} + objectReference: {fileID: 0} - target: {fileID: 184355828371754224, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} propertyPath: NetworkedBehaviours.Array.data[5] value: - objectReference: {fileID: 1303856425} + objectReference: {fileID: 0} - target: {fileID: 184355828371754224, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} propertyPath: NetworkedBehaviours.Array.data[6] value: - objectReference: {fileID: 812804100} + objectReference: {fileID: 0} - target: {fileID: 184355828371754224, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} propertyPath: NetworkedBehaviours.Array.data[7] value: - objectReference: {fileID: 1558086768} + objectReference: {fileID: 0} - target: {fileID: 184355828371754224, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} propertyPath: NetworkedBehaviours.Array.data[8] value: - objectReference: {fileID: 1853598248} + objectReference: {fileID: 0} - target: {fileID: 184355828371754224, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} propertyPath: NetworkedBehaviours.Array.data[9] value: - objectReference: {fileID: 1403372457} + objectReference: {fileID: 0} - target: {fileID: 822077676654890402, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} propertyPath: m_AnchorMax.y @@ -2261,48 +2213,48 @@ PrefabInstance: - target: {fileID: 3199354014281383139, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} propertyPath: chunks.Array.size - value: 8 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3199354014281383139, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} propertyPath: chunks.Array.data[0] value: - objectReference: {fileID: 1978317513} + objectReference: {fileID: 0} - target: {fileID: 3199354014281383139, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} propertyPath: chunks.Array.data[1] value: - objectReference: {fileID: 1459354212} + objectReference: {fileID: 0} - target: {fileID: 3199354014281383139, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} propertyPath: chunks.Array.data[2] value: - objectReference: {fileID: 2125392943} + objectReference: {fileID: 0} - target: {fileID: 3199354014281383139, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} propertyPath: chunks.Array.data[3] value: - objectReference: {fileID: 1303856425} + objectReference: {fileID: 0} - target: {fileID: 3199354014281383139, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} propertyPath: chunks.Array.data[4] value: - objectReference: {fileID: 812804100} + objectReference: {fileID: 0} - target: {fileID: 3199354014281383139, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} propertyPath: chunks.Array.data[5] value: - objectReference: {fileID: 1558086768} + objectReference: {fileID: 0} - target: {fileID: 3199354014281383139, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} propertyPath: chunks.Array.data[6] value: - objectReference: {fileID: 1853598248} + objectReference: {fileID: 0} - target: {fileID: 3199354014281383139, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} propertyPath: chunks.Array.data[7] value: - objectReference: {fileID: 1403372457} + objectReference: {fileID: 0} - target: {fileID: 3326358755370376714, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} propertyPath: m_AnchorMax.y @@ -7296,47 +7248,9 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] - m_AddedGameObjects: - - targetCorrespondingSourceObject: {fileID: 6381916647485414113, guid: 43d56bd18d06e9b4abe323618a20a228, - type: 3} - insertIndex: -1 - addedObject: {fileID: 1978317512} - - targetCorrespondingSourceObject: {fileID: 6381916647485414113, guid: 43d56bd18d06e9b4abe323618a20a228, - type: 3} - insertIndex: -1 - addedObject: {fileID: 1459354211} - - targetCorrespondingSourceObject: {fileID: 6381916647485414113, guid: 43d56bd18d06e9b4abe323618a20a228, - type: 3} - insertIndex: -1 - addedObject: {fileID: 2125392942} - - targetCorrespondingSourceObject: {fileID: 6381916647485414113, guid: 43d56bd18d06e9b4abe323618a20a228, - type: 3} - insertIndex: -1 - addedObject: {fileID: 1303856424} - - targetCorrespondingSourceObject: {fileID: 6381916647485414113, guid: 43d56bd18d06e9b4abe323618a20a228, - type: 3} - insertIndex: -1 - addedObject: {fileID: 812804099} - - targetCorrespondingSourceObject: {fileID: 6381916647485414113, guid: 43d56bd18d06e9b4abe323618a20a228, - type: 3} - insertIndex: -1 - addedObject: {fileID: 1558086767} - - targetCorrespondingSourceObject: {fileID: 6381916647485414113, guid: 43d56bd18d06e9b4abe323618a20a228, - type: 3} - insertIndex: -1 - addedObject: {fileID: 1853598247} - - targetCorrespondingSourceObject: {fileID: 6381916647485414113, guid: 43d56bd18d06e9b4abe323618a20a228, - type: 3} - insertIndex: -1 - addedObject: {fileID: 1403372458} + m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} ---- !u!4 &1003601256 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 6381916647485414113, guid: 43d56bd18d06e9b4abe323618a20a228, - type: 3} - m_PrefabInstance: {fileID: 1003601255} - m_PrefabAsset: {fileID: 0} --- !u!114 &1012061036 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 8995129457460367436, guid: a3e7cb13a940dcc41a13d1d3c91396d1, @@ -8046,54 +7960,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1299022527} m_PrefabAsset: {fileID: 0} ---- !u!1 &1303856423 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1303856424} - - component: {fileID: 1303856425} - m_Layer: 0 - m_Name: TilemapChunk (3,0) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1303856424 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1303856423} - 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: [] - m_Father: {fileID: 1003601256} - m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1303856425 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1303856423} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2c33719b6058cda4c9a3669de683f83a, type: 3} - m_Name: - m_EditorClassIdentifier: - _DirtyCounter: 0 - _Tiles: - chunkX: 3 - chunkY: 0 --- !u!1001 &1356470352 PrefabInstance: m_ObjectHideFlags: 0 @@ -8334,102 +8200,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1360417018} m_PrefabAsset: {fileID: 0} ---- !u!1 &1403372456 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1403372458} - - component: {fileID: 1403372457} - m_Layer: 0 - m_Name: TilemapChunk (3,1) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &1403372457 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1403372456} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2c33719b6058cda4c9a3669de683f83a, type: 3} - m_Name: - m_EditorClassIdentifier: - _DirtyCounter: 0 - _Tiles: - chunkX: 3 - chunkY: 1 ---- !u!4 &1403372458 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1403372456} - 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: [] - m_Father: {fileID: 1003601256} - m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1459354210 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1459354211} - - component: {fileID: 1459354212} - m_Layer: 0 - m_Name: TilemapChunk (1,0) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1459354211 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1459354210} - 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: [] - m_Father: {fileID: 1003601256} - m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1459354212 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1459354210} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2c33719b6058cda4c9a3669de683f83a, type: 3} - m_Name: - m_EditorClassIdentifier: - _DirtyCounter: 0 - _Tiles: - chunkX: 1 - chunkY: 0 --- !u!1 &1500230910 GameObject: m_ObjectHideFlags: 0 @@ -8514,54 +8284,6 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!1 &1558086766 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1558086767} - - component: {fileID: 1558086768} - m_Layer: 0 - m_Name: TilemapChunk (1,1) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1558086767 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1558086766} - 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: [] - m_Father: {fileID: 1003601256} - m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1558086768 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1558086766} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2c33719b6058cda4c9a3669de683f83a, type: 3} - m_Name: - m_EditorClassIdentifier: - _DirtyCounter: 0 - _Tiles: - chunkX: 1 - chunkY: 1 --- !u!1001 &1677124335 PrefabInstance: m_ObjectHideFlags: 0 @@ -9145,54 +8867,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1809458995} m_PrefabAsset: {fileID: 0} ---- !u!1 &1853598246 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1853598247} - - component: {fileID: 1853598248} - m_Layer: 0 - m_Name: TilemapChunk (2,1) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1853598247 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1853598246} - 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: [] - m_Father: {fileID: 1003601256} - m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1853598248 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1853598246} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2c33719b6058cda4c9a3669de683f83a, type: 3} - m_Name: - m_EditorClassIdentifier: - _DirtyCounter: 0 - _Tiles: - chunkX: 2 - chunkY: 1 --- !u!1 &1890770085 GameObject: m_ObjectHideFlags: 0 @@ -26883,54 +26557,6 @@ Transform: m_Father: {fileID: 119551482} m_RootOrder: -2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1978317511 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1978317512} - - component: {fileID: 1978317513} - m_Layer: 0 - m_Name: TilemapChunk (0,0) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1978317512 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1978317511} - 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: [] - m_Father: {fileID: 1003601256} - m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1978317513 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1978317511} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2c33719b6058cda4c9a3669de683f83a, type: 3} - m_Name: - m_EditorClassIdentifier: - _DirtyCounter: 0 - _Tiles: - chunkX: 0 - chunkY: 0 --- !u!1 &2018240977 GameObject: m_ObjectHideFlags: 0 @@ -27028,54 +26654,6 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &2125392941 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2125392942} - - component: {fileID: 2125392943} - m_Layer: 0 - m_Name: TilemapChunk (2,0) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &2125392942 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2125392941} - 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: [] - m_Father: {fileID: 1003601256} - m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &2125392943 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2125392941} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2c33719b6058cda4c9a3669de683f83a, type: 3} - m_Name: - m_EditorClassIdentifier: - _DirtyCounter: 0 - _Tiles: - chunkX: 2 - chunkY: 0 --- !u!1001 &8995129457340740233 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/Levels/DefaultSnow.unity b/Assets/Scenes/Levels/DefaultSnow.unity index 0048806bcb..3d2c294c52 100644 --- a/Assets/Scenes/Levels/DefaultSnow.unity +++ b/Assets/Scenes/Levels/DefaultSnow.unity @@ -333,54 +333,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 62425386} m_PrefabAsset: {fileID: 0} ---- !u!1 &74513381 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 74513382} - - component: {fileID: 74513383} - m_Layer: 0 - m_Name: TilemapChunk (1,1) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &74513382 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 74513381} - 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: [] - m_Father: {fileID: 740302411} - m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &74513383 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 74513381} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2c33719b6058cda4c9a3669de683f83a, type: 3} - m_Name: - m_EditorClassIdentifier: - _DirtyCounter: 0 - _Tiles: - chunkX: 1 - chunkY: 1 --- !u!1 &89162345 GameObject: m_ObjectHideFlags: 0 @@ -717,102 +669,6 @@ Transform: m_Father: {fileID: 1681203918} m_RootOrder: -2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &275017148 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 275017149} - - component: {fileID: 275017150} - m_Layer: 0 - m_Name: TilemapChunk (2,1) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &275017149 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 275017148} - 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: [] - m_Father: {fileID: 740302411} - m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &275017150 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 275017148} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2c33719b6058cda4c9a3669de683f83a, type: 3} - m_Name: - m_EditorClassIdentifier: - _DirtyCounter: 0 - _Tiles: - chunkX: 2 - chunkY: 1 ---- !u!1 &281649551 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 281649553} - - component: {fileID: 281649552} - m_Layer: 0 - m_Name: TilemapChunk (7,1) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &281649552 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 281649551} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2c33719b6058cda4c9a3669de683f83a, type: 3} - m_Name: - m_EditorClassIdentifier: - _DirtyCounter: 0 - _Tiles: - chunkX: 7 - chunkY: 1 ---- !u!4 &281649553 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 281649551} - 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: [] - m_Father: {fileID: 740302411} - m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &284082368 GameObject: m_ObjectHideFlags: 0 @@ -1085,102 +941,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 418586526} m_PrefabAsset: {fileID: 0} ---- !u!1 &427509108 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 427509109} - - component: {fileID: 427509110} - m_Layer: 0 - m_Name: TilemapChunk (7,0) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &427509109 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 427509108} - 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: [] - m_Father: {fileID: 740302411} - m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &427509110 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 427509108} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2c33719b6058cda4c9a3669de683f83a, type: 3} - m_Name: - m_EditorClassIdentifier: - _DirtyCounter: 0 - _Tiles: - chunkX: 7 - chunkY: 0 ---- !u!1 &450710278 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 450710279} - - component: {fileID: 450710280} - m_Layer: 0 - m_Name: TilemapChunk (3,0) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &450710279 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 450710278} - 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: [] - m_Father: {fileID: 740302411} - m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &450710280 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 450710278} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2c33719b6058cda4c9a3669de683f83a, type: 3} - m_Name: - m_EditorClassIdentifier: - _DirtyCounter: 0 - _Tiles: - chunkX: 3 - chunkY: 0 --- !u!1001 &491309552 PrefabInstance: m_ObjectHideFlags: 0 @@ -1347,150 +1107,6 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &610667729 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 610667730} - - component: {fileID: 610667731} - m_Layer: 0 - m_Name: TilemapChunk (5,1) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &610667730 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 610667729} - 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: [] - m_Father: {fileID: 740302411} - m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &610667731 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 610667729} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2c33719b6058cda4c9a3669de683f83a, type: 3} - m_Name: - m_EditorClassIdentifier: - _DirtyCounter: 0 - _Tiles: - chunkX: 5 - chunkY: 1 ---- !u!1 &695053060 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 695053061} - - component: {fileID: 695053062} - m_Layer: 0 - m_Name: TilemapChunk (5,0) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &695053061 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 695053060} - 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: [] - m_Father: {fileID: 740302411} - m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &695053062 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 695053060} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2c33719b6058cda4c9a3669de683f83a, type: 3} - m_Name: - m_EditorClassIdentifier: - _DirtyCounter: 0 - _Tiles: - chunkX: 5 - chunkY: 0 ---- !u!1 &717341290 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 717341291} - - component: {fileID: 717341292} - m_Layer: 0 - m_Name: TilemapChunk (6,0) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &717341291 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 717341290} - 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: [] - m_Father: {fileID: 740302411} - m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &717341292 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 717341290} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2c33719b6058cda4c9a3669de683f83a, type: 3} - m_Name: - m_EditorClassIdentifier: - _DirtyCounter: 0 - _Tiles: - chunkX: 6 - chunkY: 0 --- !u!1001 &740302410 PrefabInstance: m_ObjectHideFlags: 0 @@ -1507,88 +1123,88 @@ PrefabInstance: - target: {fileID: 184355828371754224, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} propertyPath: NetworkedBehaviours.Array.size - value: 18 + value: 2 objectReference: {fileID: 0} - target: {fileID: 184355828371754224, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} propertyPath: NetworkedBehaviours.Array.data[2] value: - objectReference: {fileID: 1419237409} + objectReference: {fileID: 0} - target: {fileID: 184355828371754224, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} propertyPath: NetworkedBehaviours.Array.data[3] value: - objectReference: {fileID: 2052760065} + objectReference: {fileID: 0} - target: {fileID: 184355828371754224, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} propertyPath: NetworkedBehaviours.Array.data[4] value: - objectReference: {fileID: 1051396263} + objectReference: {fileID: 0} - target: {fileID: 184355828371754224, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} propertyPath: NetworkedBehaviours.Array.data[5] value: - objectReference: {fileID: 450710280} + objectReference: {fileID: 0} - target: {fileID: 184355828371754224, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} propertyPath: NetworkedBehaviours.Array.data[6] value: - objectReference: {fileID: 1498342848} + objectReference: {fileID: 0} - target: {fileID: 184355828371754224, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} propertyPath: NetworkedBehaviours.Array.data[7] value: - objectReference: {fileID: 695053062} + objectReference: {fileID: 0} - target: {fileID: 184355828371754224, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} propertyPath: NetworkedBehaviours.Array.data[8] value: - objectReference: {fileID: 717341292} + objectReference: {fileID: 0} - target: {fileID: 184355828371754224, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} propertyPath: NetworkedBehaviours.Array.data[9] value: - objectReference: {fileID: 427509110} + objectReference: {fileID: 0} - target: {fileID: 184355828371754224, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} propertyPath: NetworkedBehaviours.Array.data[10] value: - objectReference: {fileID: 1339551905} + objectReference: {fileID: 0} - target: {fileID: 184355828371754224, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} propertyPath: NetworkedBehaviours.Array.data[11] value: - objectReference: {fileID: 74513383} + objectReference: {fileID: 0} - target: {fileID: 184355828371754224, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} propertyPath: NetworkedBehaviours.Array.data[12] value: - objectReference: {fileID: 275017150} + objectReference: {fileID: 0} - target: {fileID: 184355828371754224, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} propertyPath: NetworkedBehaviours.Array.data[13] value: - objectReference: {fileID: 822931145} + objectReference: {fileID: 0} - target: {fileID: 184355828371754224, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} propertyPath: NetworkedBehaviours.Array.data[14] value: - objectReference: {fileID: 1821699845} + objectReference: {fileID: 0} - target: {fileID: 184355828371754224, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} propertyPath: NetworkedBehaviours.Array.data[15] value: - objectReference: {fileID: 610667731} + objectReference: {fileID: 0} - target: {fileID: 184355828371754224, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} propertyPath: NetworkedBehaviours.Array.data[16] value: - objectReference: {fileID: 1311632520} + objectReference: {fileID: 0} - target: {fileID: 184355828371754224, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} propertyPath: NetworkedBehaviours.Array.data[17] value: - objectReference: {fileID: 281649552} + objectReference: {fileID: 0} - target: {fileID: 822077676654890402, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} propertyPath: m_AnchorMax.y @@ -1922,82 +1538,82 @@ PrefabInstance: type: 3} propertyPath: chunks.Array.data[0] value: - objectReference: {fileID: 1419237409} + objectReference: {fileID: 0} - target: {fileID: 3199354014281383139, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} propertyPath: chunks.Array.data[1] value: - objectReference: {fileID: 2052760065} + objectReference: {fileID: 0} - target: {fileID: 3199354014281383139, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} propertyPath: chunks.Array.data[2] value: - objectReference: {fileID: 1051396263} + objectReference: {fileID: 0} - target: {fileID: 3199354014281383139, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} propertyPath: chunks.Array.data[3] value: - objectReference: {fileID: 450710280} + objectReference: {fileID: 0} - target: {fileID: 3199354014281383139, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} propertyPath: chunks.Array.data[4] value: - objectReference: {fileID: 1498342848} + objectReference: {fileID: 0} - target: {fileID: 3199354014281383139, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} propertyPath: chunks.Array.data[5] value: - objectReference: {fileID: 695053062} + objectReference: {fileID: 0} - target: {fileID: 3199354014281383139, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} propertyPath: chunks.Array.data[6] value: - objectReference: {fileID: 717341292} + objectReference: {fileID: 0} - target: {fileID: 3199354014281383139, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} propertyPath: chunks.Array.data[7] value: - objectReference: {fileID: 427509110} + objectReference: {fileID: 0} - target: {fileID: 3199354014281383139, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} propertyPath: chunks.Array.data[8] value: - objectReference: {fileID: 1339551905} + objectReference: {fileID: 0} - target: {fileID: 3199354014281383139, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} propertyPath: chunks.Array.data[9] value: - objectReference: {fileID: 74513383} + objectReference: {fileID: 0} - target: {fileID: 3199354014281383139, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} propertyPath: chunks.Array.data[10] value: - objectReference: {fileID: 275017150} + objectReference: {fileID: 0} - target: {fileID: 3199354014281383139, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} propertyPath: chunks.Array.data[11] value: - objectReference: {fileID: 822931145} + objectReference: {fileID: 0} - target: {fileID: 3199354014281383139, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} propertyPath: chunks.Array.data[12] value: - objectReference: {fileID: 1821699845} + objectReference: {fileID: 0} - target: {fileID: 3199354014281383139, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} propertyPath: chunks.Array.data[13] value: - objectReference: {fileID: 610667731} + objectReference: {fileID: 0} - target: {fileID: 3199354014281383139, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} propertyPath: chunks.Array.data[14] value: - objectReference: {fileID: 1311632520} + objectReference: {fileID: 0} - target: {fileID: 3199354014281383139, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} propertyPath: chunks.Array.data[15] value: - objectReference: {fileID: 281649552} + objectReference: {fileID: 0} - target: {fileID: 3326358755370376714, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} propertyPath: m_AnchorMax.y @@ -5544,79 +5160,9 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] - m_AddedGameObjects: - - targetCorrespondingSourceObject: {fileID: 6381916647485414113, guid: 43d56bd18d06e9b4abe323618a20a228, - type: 3} - insertIndex: -1 - addedObject: {fileID: 1419237408} - - targetCorrespondingSourceObject: {fileID: 6381916647485414113, guid: 43d56bd18d06e9b4abe323618a20a228, - type: 3} - insertIndex: -1 - addedObject: {fileID: 2052760064} - - targetCorrespondingSourceObject: {fileID: 6381916647485414113, guid: 43d56bd18d06e9b4abe323618a20a228, - type: 3} - insertIndex: -1 - addedObject: {fileID: 1051396262} - - targetCorrespondingSourceObject: {fileID: 6381916647485414113, guid: 43d56bd18d06e9b4abe323618a20a228, - type: 3} - insertIndex: -1 - addedObject: {fileID: 450710279} - - targetCorrespondingSourceObject: {fileID: 6381916647485414113, guid: 43d56bd18d06e9b4abe323618a20a228, - type: 3} - insertIndex: -1 - addedObject: {fileID: 1498342847} - - targetCorrespondingSourceObject: {fileID: 6381916647485414113, guid: 43d56bd18d06e9b4abe323618a20a228, - type: 3} - insertIndex: -1 - addedObject: {fileID: 695053061} - - targetCorrespondingSourceObject: {fileID: 6381916647485414113, guid: 43d56bd18d06e9b4abe323618a20a228, - type: 3} - insertIndex: -1 - addedObject: {fileID: 717341291} - - targetCorrespondingSourceObject: {fileID: 6381916647485414113, guid: 43d56bd18d06e9b4abe323618a20a228, - type: 3} - insertIndex: -1 - addedObject: {fileID: 427509109} - - targetCorrespondingSourceObject: {fileID: 6381916647485414113, guid: 43d56bd18d06e9b4abe323618a20a228, - type: 3} - insertIndex: -1 - addedObject: {fileID: 1339551904} - - targetCorrespondingSourceObject: {fileID: 6381916647485414113, guid: 43d56bd18d06e9b4abe323618a20a228, - type: 3} - insertIndex: -1 - addedObject: {fileID: 74513382} - - targetCorrespondingSourceObject: {fileID: 6381916647485414113, guid: 43d56bd18d06e9b4abe323618a20a228, - type: 3} - insertIndex: -1 - addedObject: {fileID: 275017149} - - targetCorrespondingSourceObject: {fileID: 6381916647485414113, guid: 43d56bd18d06e9b4abe323618a20a228, - type: 3} - insertIndex: -1 - addedObject: {fileID: 822931144} - - targetCorrespondingSourceObject: {fileID: 6381916647485414113, guid: 43d56bd18d06e9b4abe323618a20a228, - type: 3} - insertIndex: -1 - addedObject: {fileID: 1821699844} - - targetCorrespondingSourceObject: {fileID: 6381916647485414113, guid: 43d56bd18d06e9b4abe323618a20a228, - type: 3} - insertIndex: -1 - addedObject: {fileID: 610667730} - - targetCorrespondingSourceObject: {fileID: 6381916647485414113, guid: 43d56bd18d06e9b4abe323618a20a228, - type: 3} - insertIndex: -1 - addedObject: {fileID: 1311632519} - - targetCorrespondingSourceObject: {fileID: 6381916647485414113, guid: 43d56bd18d06e9b4abe323618a20a228, - type: 3} - insertIndex: -1 - addedObject: {fileID: 281649553} + m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} ---- !u!4 &740302411 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 6381916647485414113, guid: 43d56bd18d06e9b4abe323618a20a228, - type: 3} - m_PrefabInstance: {fileID: 740302410} - m_PrefabAsset: {fileID: 0} --- !u!1001 &780164218 PrefabInstance: m_ObjectHideFlags: 0 @@ -5727,54 +5273,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 780164218} m_PrefabAsset: {fileID: 0} ---- !u!1 &822931143 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 822931144} - - component: {fileID: 822931145} - m_Layer: 0 - m_Name: TilemapChunk (3,1) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &822931144 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 822931143} - 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: [] - m_Father: {fileID: 740302411} - m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &822931145 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 822931143} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2c33719b6058cda4c9a3669de683f83a, type: 3} - m_Name: - m_EditorClassIdentifier: - _DirtyCounter: 0 - _Tiles: - chunkX: 3 - chunkY: 1 --- !u!1001 &881536348 PrefabInstance: m_ObjectHideFlags: 0 @@ -6063,54 +5561,6 @@ Transform: m_Father: {fileID: 1681203918} m_RootOrder: -2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1051396261 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1051396262} - - component: {fileID: 1051396263} - m_Layer: 0 - m_Name: TilemapChunk (2,0) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1051396262 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1051396261} - 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: [] - m_Father: {fileID: 740302411} - m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1051396263 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1051396261} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2c33719b6058cda4c9a3669de683f83a, type: 3} - m_Name: - m_EditorClassIdentifier: - _DirtyCounter: 0 - _Tiles: - chunkX: 2 - chunkY: 0 --- !u!1001 &1123674083 PrefabInstance: m_ObjectHideFlags: 0 @@ -6430,102 +5880,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1193540787} m_PrefabAsset: {fileID: 0} ---- !u!1 &1311632518 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1311632519} - - component: {fileID: 1311632520} - m_Layer: 0 - m_Name: TilemapChunk (6,1) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1311632519 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1311632518} - 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: [] - m_Father: {fileID: 740302411} - m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1311632520 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1311632518} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2c33719b6058cda4c9a3669de683f83a, type: 3} - m_Name: - m_EditorClassIdentifier: - _DirtyCounter: 0 - _Tiles: - chunkX: 6 - chunkY: 1 ---- !u!1 &1339551903 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1339551904} - - component: {fileID: 1339551905} - m_Layer: 0 - m_Name: TilemapChunk (0,1) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1339551904 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1339551903} - 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: [] - m_Father: {fileID: 740302411} - m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1339551905 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1339551903} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2c33719b6058cda4c9a3669de683f83a, type: 3} - m_Name: - m_EditorClassIdentifier: - _DirtyCounter: 0 - _Tiles: - chunkX: 0 - chunkY: 1 --- !u!1 &1377143476 GameObject: m_ObjectHideFlags: 0 @@ -11566,54 +10920,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1397352865} m_PrefabAsset: {fileID: 0} ---- !u!1 &1419237407 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1419237408} - - component: {fileID: 1419237409} - m_Layer: 0 - m_Name: TilemapChunk (0,0) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1419237408 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1419237407} - 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: [] - m_Father: {fileID: 740302411} - m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1419237409 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1419237407} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2c33719b6058cda4c9a3669de683f83a, type: 3} - m_Name: - m_EditorClassIdentifier: - _DirtyCounter: 0 - _Tiles: - chunkX: 0 - chunkY: 0 --- !u!1 &1420868388 GameObject: m_ObjectHideFlags: 0 @@ -11755,54 +11061,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1451897965} m_PrefabAsset: {fileID: 0} ---- !u!1 &1498342846 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1498342847} - - component: {fileID: 1498342848} - m_Layer: 0 - m_Name: TilemapChunk (4,0) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1498342847 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1498342846} - 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: [] - m_Father: {fileID: 740302411} - m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1498342848 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1498342846} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2c33719b6058cda4c9a3669de683f83a, type: 3} - m_Name: - m_EditorClassIdentifier: - _DirtyCounter: 0 - _Tiles: - chunkX: 4 - chunkY: 0 --- !u!1 &1540209696 GameObject: m_ObjectHideFlags: 0 @@ -12578,54 +11836,6 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1821699843 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1821699844} - - component: {fileID: 1821699845} - m_Layer: 0 - m_Name: TilemapChunk (4,1) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1821699844 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1821699843} - 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: [] - m_Father: {fileID: 740302411} - m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1821699845 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1821699843} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2c33719b6058cda4c9a3669de683f83a, type: 3} - m_Name: - m_EditorClassIdentifier: - _DirtyCounter: 0 - _Tiles: - chunkX: 4 - chunkY: 1 --- !u!1 &1833677462 GameObject: m_ObjectHideFlags: 0 @@ -13207,54 +12417,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 2047202462} m_PrefabAsset: {fileID: 0} ---- !u!1 &2052760063 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2052760064} - - component: {fileID: 2052760065} - m_Layer: 0 - m_Name: TilemapChunk (1,0) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &2052760064 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2052760063} - 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: [] - m_Father: {fileID: 740302411} - m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &2052760065 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2052760063} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2c33719b6058cda4c9a3669de683f83a, type: 3} - m_Name: - m_EditorClassIdentifier: - _DirtyCounter: 0 - _Tiles: - chunkX: 1 - chunkY: 0 --- !u!1 &2109746336 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/MainMenu.unity b/Assets/Scenes/MainMenu.unity index 0e254906e7..b72afc0a4c 100644 --- a/Assets/Scenes/MainMenu.unity +++ b/Assets/Scenes/MainMenu.unity @@ -2343,9 +2343,9 @@ RectTransform: m_Father: {fileID: 823064026} m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -484} + 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_Pivot: {x: 0.5, y: 1} --- !u!114 &66575388 @@ -2395,7 +2395,7 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 0 + m_fontSize: 14 m_fontSizeBase: 13.6 m_fontWeight: 400 m_enableAutoSizing: 1 @@ -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: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 130, y: -110} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} 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: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 130, y: -136} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} 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: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 130, y: -188} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 260, y: 24} m_Pivot: {x: 0.5, y: 1} --- !u!114 &77529301 @@ -2934,9 +2934,9 @@ RectTransform: m_Father: {fileID: 823064026} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -19} + 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_Pivot: {x: 0.5, y: 0.5} --- !u!114 &80074248 @@ -2987,7 +2987,7 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 0 + m_fontSize: 18 m_fontSizeBase: 13.6 m_fontWeight: 400 m_enableAutoSizing: 1 @@ -3661,7 +3661,7 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 0 + m_fontSize: 14.6 m_fontSizeBase: 24 m_fontWeight: 400 m_enableAutoSizing: 1 @@ -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: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 130, y: -15} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 260, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &153817299 @@ -5599,7 +5599,7 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 0 + m_fontSize: 16.1 m_fontSizeBase: 24 m_fontWeight: 400 m_enableAutoSizing: 1 @@ -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: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 130, y: -32} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} 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: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 130, y: -255} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 260, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &402645375 @@ -14536,7 +14536,7 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 0 + m_fontSize: 18 m_fontSizeBase: 18 m_fontWeight: 400 m_enableAutoSizing: 1 @@ -15608,9 +15608,9 @@ RectTransform: m_Father: {fileID: 823064026} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -98} + 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_Pivot: {x: 0.5, y: 1} --- !u!114 &438218786 @@ -15660,7 +15660,7 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 0 + m_fontSize: 14 m_fontSizeBase: 21.8 m_fontWeight: 400 m_enableAutoSizing: 1 @@ -16401,7 +16401,7 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 0 + m_fontSize: 36.4 m_fontSizeBase: 24 m_fontWeight: 400 m_enableAutoSizing: 1 @@ -17040,9 +17040,9 @@ RectTransform: m_Father: {fileID: 823064026} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -36} + 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_Pivot: {x: 0.5, y: 1} --- !u!114 &485322299 @@ -17092,7 +17092,7 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 0 + m_fontSize: 14 m_fontSizeBase: 13.6 m_fontWeight: 400 m_enableAutoSizing: 1 @@ -23536,9 +23536,9 @@ RectTransform: m_Father: {fileID: 823064026} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -62} + 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_Pivot: {x: 0.5, y: 1} --- !u!114 &574816556 @@ -23588,7 +23588,7 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 0 + m_fontSize: 14 m_fontSizeBase: 13.6 m_fontWeight: 400 m_enableAutoSizing: 1 @@ -24778,9 +24778,9 @@ RectTransform: m_Father: {fileID: 823064026} m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -134} + 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_Pivot: {x: 0.5, y: 1} --- !u!114 &644584041 @@ -24830,7 +24830,7 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 0 + m_fontSize: 14 m_fontSizeBase: 13.6 m_fontWeight: 400 m_enableAutoSizing: 1 @@ -26261,7 +26261,7 @@ MonoBehaviour: m_RestoreOriginalTextOnEscape: 1 m_isRichTextEditingAllowed: 0 m_LineLimit: 0 - m_InputValidator: {fileID: 0} + m_InputValidator: {fileID: 11400000, guid: ee4154ff0ef5c4c469d499eaff5686a8, type: 2} --- !u!114 &678052436 MonoBehaviour: m_ObjectHideFlags: 0 @@ -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: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -321} - m_SizeDelta: {x: 260, y: 322} + 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_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: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 130, y: -84} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} 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: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 130, y: -214} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 260, y: 24} m_Pivot: {x: 0.5, y: 1} --- !u!114 &899502179 @@ -39658,7 +39658,7 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 0 + m_fontSize: 14 m_fontSizeBase: 24 m_fontWeight: 400 m_enableAutoSizing: 1 @@ -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: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 130, y: -298} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} 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: 1 - m_Size: 3.0693581e-15 + m_Value: 0.99999964 + m_Size: 0.67460775 m_NumberOfSteps: 0 m_OnValueChanged: m_PersistentCalls: @@ -46594,7 +46594,7 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 0 + m_fontSize: 18 m_fontSizeBase: 18 m_fontWeight: 400 m_enableAutoSizing: 1 @@ -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: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 130, y: -58} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} 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: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 130, y: -284} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} 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.0000038146973} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 0} --- !u!114 &1603668786 @@ -76268,8 +76268,8 @@ MonoBehaviour: m_ResetOnDeActivation: 1 m_RestoreOriginalTextOnEscape: 1 m_isRichTextEditingAllowed: 0 - m_LineLimit: 1 - m_InputValidator: {fileID: 0} + m_LineLimit: 2 + m_InputValidator: {fileID: 11400000, guid: 6bab8aecb0976b74ca10383b026430dd, type: 2} --- !u!114 &1621615366 MonoBehaviour: m_ObjectHideFlags: 0 @@ -81118,6 +81118,7 @@ RectTransform: - {fileID: 238321101} - {fileID: 695280296} - {fileID: 338309258} + - {fileID: 2081111231} - {fileID: 251906945} - {fileID: 2026729529} - {fileID: 1438361167} @@ -81161,6 +81162,7 @@ MonoBehaviour: firstButton: {fileID: 1195298276} chattingIcon: {fileID: 251906944} settingsIcon: {fileID: 2026729525} + readyIcon: {fileID: 2081111228} rootCanvas: {fileID: 1619623746} layout: {fileID: 1752548004} adminOnlyOptions: @@ -82438,7 +82440,7 @@ MonoBehaviour: m_TargetGraphic: {fileID: 1141870934} m_HandleRect: {fileID: 1141870933} m_Direction: 2 - m_Value: -0.00000015894572 + m_Value: 0 m_Size: 1 m_NumberOfSteps: 0 m_OnValueChanged: @@ -89283,9 +89285,9 @@ RectTransform: m_Father: {fileID: 698007182} m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 130, y: -162} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 260, y: 24} m_Pivot: {x: 0.5, y: 1} --- !u!114 &2007433170 @@ -90556,6 +90558,141 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 28} m_Pivot: {x: 0.5, y: 1} +--- !u!1 &2081111228 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2081111231} + - component: {fileID: 2081111230} + - component: {fileID: 2081111229} + m_Layer: 5 + m_Name: ReadyIcon + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!114 &2081111229 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2081111228} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: "\u30D8" + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: d42c556520644b148ada62f0b573e1a5, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: 5c5343180c3f4454ab0e0482e641c2cd, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4278255360 + m_fontColor: {r: 0, g: 1, b: 0, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 16 + m_fontSizeBase: 16 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &2081111230 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2081111228} + m_CullTransparentMesh: 1 +--- !u!224 &2081111231 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2081111228} + 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: [] + m_Father: {fileID: 1752548000} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -10, y: 0} + m_SizeDelta: {x: 88.74, y: 0} + m_Pivot: {x: 0, y: 0.5} --- !u!1 &2088446872 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ScriptableObjects/PrefabList.asset b/Assets/ScriptableObjects/PrefabList.asset index 3c6c590541..5bbac92357 100644 --- a/Assets/ScriptableObjects/PrefabList.asset +++ b/Assets/ScriptableObjects/PrefabList.asset @@ -16,10 +16,8 @@ MonoBehaviour: RawGuidValue: cf98b2b907b9bc74ab8c14624e3c5575 SessionDataHolder: RawGuidValue: 6fe1d2f7545d144468b4dbaf10fabd89 - GameDataHolder: - RawGuidValue: 6f681abe0b48a534cb6d0c74c31b3a5f - TilemapChunk: {fileID: 6049557798542441352, guid: 455c9006a61c18c42b6f40bbcc702e68, - type: 3} + TilemapChunk: + RawGuidValue: 455c9006a61c18c42b6f40bbcc702e68 Obj_Fireball: RawGuidValue: 00a2ef66a322a694c837b29404f2af49 Obj_LooseCoin: diff --git a/Assets/Scripts/BuildInfo.cs b/Assets/Scripts/BuildInfo.cs index f7358ea49f..20e9ad9d41 100644 --- a/Assets/Scripts/BuildInfo.cs +++ b/Assets/Scripts/BuildInfo.cs @@ -1 +1 @@ -public static class BuildInfo{public static string BUILD_TIME = "11/25/2023 3:07:33 AM";} +public static class BuildInfo{public static string BUILD_TIME = "11/26/2023 12:49:14 AM";} diff --git a/Assets/Scripts/Camera/CameraController.cs.meta b/Assets/Scripts/Camera/CameraController.cs.meta index 3bbbd76dbd..2afea42b42 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: 2 + executionOrder: 3 icon: {instanceID: 0} userData: assetBundleName: diff --git a/Assets/Scripts/Editor/TilemapChunkPopulator.cs b/Assets/Scripts/Editor/TilemapChunkPopulator.cs index 572f7c87fb..a46a42d257 100644 --- a/Assets/Scripts/Editor/TilemapChunkPopulator.cs +++ b/Assets/Scripts/Editor/TilemapChunkPopulator.cs @@ -56,7 +56,7 @@ private static void ProcessScene(string path) { int requiredChunksX = (int) Mathf.Ceil(gm.levelWidthTile / 16f); int requiredChunksY = (int) Mathf.Ceil(gm.levelHeightTile / 16f); - BoundsInt bounds = new(gm.levelMinTileX, gm.levelMinTileY , 0, requiredChunksX * 16, requiredChunksY * 16, 1); + BoundsInt bounds = new(gm.levelMinTileX, gm.levelMinTileY, 0, requiredChunksX * 16, requiredChunksY * 16, 1); TileBase[] tileBases = tilemap.GetTilesBlock(bounds); ushort[] tileIds = new ushort[tileBases.Length]; @@ -66,21 +66,6 @@ private static void ProcessScene(string path) { gm.originalTiles = tileIds; - // Create TilemapChunks - while (tileManager.transform.childCount > 0) - Object.DestroyImmediate(tileManager.transform.GetChild(0).gameObject); - tileManager.chunks.Clear(); - - for (int y = 0; y < requiredChunksY; y++) { - for (int x = 0; x < requiredChunksX; x++) { - TilemapChunk newObject = Object.Instantiate(tileManager.tilemapChunkPrefab, tileManager.transform); - newObject.chunkX = x; - newObject.chunkY = y; - newObject.name = $"TilemapChunk ({x},{y})"; - tileManager.chunks.Add(newObject); - } - } - Debug.Log($"Successfully saved level data. {uniqueTilesList.Count} unique tiles ({gm.levelWidthTile} x {gm.levelHeightTile} tiles, {requiredChunksX} x {requiredChunksY} chunks)."); EditorUtility.SetDirty(gm); EditorUtility.SetDirty(tileManager); diff --git a/Assets/Scripts/Entity/Enemy/HoldableEntity.cs b/Assets/Scripts/Entity/Enemy/HoldableEntity.cs index d652e06741..f24be9c881 100644 --- a/Assets/Scripts/Entity/Enemy/HoldableEntity.cs +++ b/Assets/Scripts/Entity/Enemy/HoldableEntity.cs @@ -45,11 +45,12 @@ public override void FixedUpdateNetwork() { body.Velocity = Holder.body.Velocity; body.Position = Holder.body.Position + (Vector2) holderOffset; - hitbox.enabled = false; + fusionHitbox.HitboxActive = hitbox.enabled = false; + body.IsKinematic = true; CheckForEntityCollisions(); } else { - hitbox.enabled = true; + fusionHitbox.HitboxActive = 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 e352978490..ea2eaf299f 100644 --- a/Assets/Scripts/Entity/Enemy/KillableEntity.cs +++ b/Assets/Scripts/Entity/Enemy/KillableEntity.cs @@ -89,6 +89,7 @@ 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; @@ -96,6 +97,7 @@ 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(); @@ -110,6 +112,8 @@ public virtual void Start() { public override void Spawned() { base.Spawned(); OnFacingRightChanged(); + + Runner.SetIsSimulated(Object, true); } public override void Render() { @@ -211,7 +215,8 @@ public virtual void SpecialKill(bool right, bool groundpound, int combo) { AngularVelocity = 400f * (FacingRight ? 1 : -1); body.Gravity = Vector2.down * 14.75f; - Runner.Spawn(PrefabList.Instance.Obj_LooseCoin, body.Position + hitbox.offset); + if (HasStateAuthority) + Runner.Spawn(PrefabList.Instance.Obj_LooseCoin, body.Position + hitbox.offset); } public virtual void Crushed() { @@ -374,6 +379,7 @@ 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 c58bc8b99e..5e836cfe01 100644 --- a/Assets/Scripts/Entity/Enemy/Koopa.cs +++ b/Assets/Scripts/Entity/Enemy/Koopa.cs @@ -11,7 +11,6 @@ namespace NSMB.Entities.Enemies { - //[OrderAfter(typeof(NetworkPhysicsSimulation2D))] public class Koopa : HoldableEntity { //---Networked Variables @@ -93,7 +92,8 @@ public override void FixedUpdateNetwork() { PhysicsDataStruct data = body.Data; if (IsInShell) { hitbox.size = inShellHitboxSize; - hitbox.offset = inShellHitboxOffset; + fusionHitbox.BoxExtents = hitbox.size * 0.5f; + fusionHitbox.Offset = hitbox.offset = inShellHitboxOffset; if (IsStationary) { if (data.OnGround && body.Velocity.y < 1) @@ -106,7 +106,8 @@ public override void FixedUpdateNetwork() { } } else { hitbox.size = outShellHitboxSize; - hitbox.offset = outShellHitboxOffset; + fusionHitbox.BoxExtents = hitbox.size * 0.5f; + fusionHitbox.Offset = hitbox.offset = outShellHitboxOffset; } if (!Holder && !IsStationary) { diff --git a/Assets/Scripts/Entity/Enemy/PiranhaPlant.cs b/Assets/Scripts/Entity/Enemy/PiranhaPlant.cs index 7d44e4600e..1582910671 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) { - hitbox.enabled = false; + fusionHitbox.HitboxActive = 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); - hitbox.enabled = PopupAnimationTime >= 0.01f; + fusionHitbox.HitboxActive = hitbox.enabled = PopupAnimationTime >= 0.01f; hitbox.transform.localPosition = new(0, (PopupAnimationTime - 1) * popupDistance, 0); } diff --git a/Assets/Scripts/Entity/EntityMover.cs b/Assets/Scripts/Entity/EntityMover.cs index bb4ebe2f48..58173c7cba 100644 --- a/Assets/Scripts/Entity/EntityMover.cs +++ b/Assets/Scripts/Entity/EntityMover.cs @@ -4,13 +4,14 @@ using Fusion; using NSMB.Tiles; using NSMB.Utils; +using NSMB.Entities.Player; [SimulationBehaviour(Modes = SimulationModes.Server | SimulationModes.Host | SimulationModes.Client, Stages = SimulationStages.Resimulate | SimulationStages.Forward)] public class EntityMover : NetworkBehaviour, IBeforeTick, IAfterTick, IAfterAllTicks, IRemotePrefabCreated { //---Static Variables private static readonly RaycastHit2D[] RaycastBuffer = new RaycastHit2D[32]; - private static readonly float Skin = 0.01f, LerpInterpValue = 0.33f; + private static readonly float Skin = 0.015f, LerpInterpValue = 0.33f; private static readonly int MaxIterations = 5; //---Networked Variables @@ -75,21 +76,9 @@ public unsafe override void Render() { if (Freeze) { newPosition = Position; - } else if ((IsProxy /* && InterpolationDataSource != InterpolationDataSources.Predicted*/) || !TryGetSnapshotsBuffers(out var from, out var to, out float alpha)) { - // Proxy interpolation with some smoothing: + } else if (TryGetSnapshotsBuffers(out var from, out var to, out float alpha)) { + // Snapshot interpolation with no smoothing: - if (interpolationTeleportDistance > 0 && Utils.WrappedDistance(previousRenderPosition, Position) > interpolationTeleportDistance) { - // Teleport over large distances - newPosition = Utils.WrapWorldLocation(Position); - } else { - // Interpolate from where we are to the next point. - Utils.UnwrapLocations(previousRenderPosition, Position, out Vector2 fromRelative, out Vector2 toRelative); - Vector2 difference = toRelative - fromRelative; - newPosition = Vector2.Lerp(previousRenderPosition, previousRenderPosition + difference, Mathf.Clamp01(LerpInterpValue - Time.deltaTime)); - newPosition = Utils.WrapWorldLocation(newPosition); - } - } else { - // State/Input Authority interpolation with no smoothing: (Vector2 fromVector, Vector2 toVector) = internalPositionPropertyReader.Read(from, to); if (interpolationTeleportDistance > 0 && Utils.WrappedDistance(fromVector, toVector) > interpolationTeleportDistance) { @@ -101,6 +90,19 @@ public unsafe override void Render() { newPosition = Vector2.Lerp(fromVectorRelative, toVectorRelative, alpha); newPosition = Utils.WrapWorldLocation(newPosition); } + } else { + // Fallback interpolation with some smoothing: + + if (interpolationTeleportDistance > 0 && Utils.WrappedDistance(previousRenderPosition, Position) > interpolationTeleportDistance) { + // Teleport over large distances + newPosition = Utils.WrapWorldLocation(Position); + } else { + // Interpolate from where we are to the next point. + Utils.UnwrapLocations(previousRenderPosition, Position, out Vector2 fromRelative, out Vector2 toRelative); + Vector2 difference = toRelative - fromRelative; + newPosition = Vector2.Lerp(previousRenderPosition, previousRenderPosition + difference, Mathf.Clamp01(LerpInterpValue - Time.deltaTime)); + newPosition = Utils.WrapWorldLocation(newPosition); + } } newPosition.z = transform.position.z; @@ -110,7 +112,7 @@ public unsafe override void Render() { public override void FixedUpdateNetwork() { ResetPhysicsData(); - if (!Freeze && (!IsProxy /* || InterpolationDataSource == InterpolationDataSources.Predicted*/)) { + if (!Freeze) { Vector2 movement; movement = CollideAndSlide(Position + ColliderOffset, Velocity * Runner.DeltaTime, false); if (!IsKinematic) @@ -154,6 +156,7 @@ private Vector2 CollideAndSlide(Vector2 raycastPos, Vector2 raycastVel, bool gra int filter = Layers.GetCollisionMask(activeCollider.gameObject.layer); int hits = Runner.GetPhysicsScene2D().BoxCast(raycastPos, size, 0, direction, distance, RaycastBuffer, filter); + for (int i = 0; i < hits; i++) { RaycastHit2D hit = RaycastBuffer[i]; diff --git a/Assets/Scripts/Entity/Fireball.cs b/Assets/Scripts/Entity/Fireball.cs index 9e29a35bfd..47ee765161 100644 --- a/Assets/Scripts/Entity/Fireball.cs +++ b/Assets/Scripts/Entity/Fireball.cs @@ -57,11 +57,9 @@ public void Initialize(PlayerController owner, Vector2 spawnpoint, bool ice, boo // Physics body.Position = spawnpoint; - //nrb.TeleportToPosition(spawnpoint, Vector3.zero); - //nrb.Rigidbody.position = spawnpoint; body.Freeze = false; body.Velocity = new(CurrentSpeed * (FacingRight ? 1 : -1), -CurrentSpeed); - //body.InterpolationDataSource = Owner.IsProxy ? InterpolationDataSources.Snapshots : InterpolationDataSources.Predicted; + Object.AssignInputAuthority(owner.Object.InputAuthority); } public override void Spawned() { diff --git a/Assets/Scripts/Entity/Player/PlayerAnimationController.cs b/Assets/Scripts/Entity/Player/PlayerAnimationController.cs index 8b84de5d24..c3f75f3313 100644 --- a/Assets/Scripts/Entity/Player/PlayerAnimationController.cs +++ b/Assets/Scripts/Entity/Player/PlayerAnimationController.cs @@ -348,7 +348,7 @@ private void HandleMiscStates() { float newZ = -4; if (controller.IsDead) newZ = -6; - else if (controller.CurrentPipe) + else if (controller.CurrentPipe || controller.IsFrozen) newZ = 1; transform.position = new(transform.position.x, transform.position.y, newZ); diff --git a/Assets/Scripts/Entity/Player/PlayerController.cs b/Assets/Scripts/Entity/Player/PlayerController.cs index 4f40b3d8ff..57bace97d4 100644 --- a/Assets/Scripts/Entity/Player/PlayerController.cs +++ b/Assets/Scripts/Entity/Player/PlayerController.cs @@ -212,7 +212,6 @@ public byte StarCombo { private BoxCollider2D[] hitboxes; //---Public Variables - [HideInInspector] public bool groundpoundLastFrame; [HideInInspector] public float powerupFlash; //---Serialized Variables @@ -476,9 +475,6 @@ public override void FixedUpdateNetwork() { NetworkButtons heldButtons = input.buttons; NetworkButtons pressedButtons = input.buttons.GetPressed(PreviousInputs.buttons); - // TODO: remove groundpoundLastFrame? Do we even need this anymore? - groundpoundLastFrame = IsGroundpounding; - if (!IsDead) { HandleGroundCollision(); IsOnGround |= GroundSnapCheck(); @@ -496,7 +492,6 @@ public override void FixedUpdateNetwork() { } } - UpdateTileProperties(); CheckForPowerupActions(input, PreviousInputs); HandleMovement(heldButtons, pressedButtons); } @@ -511,15 +506,16 @@ public override void FixedUpdateNetwork() { animationController.HandlePipeAnimation(); } + UpdateTileProperties(); UpdateHitbox(); if (!IsProxy) { // We can become stuck in a block after uncrouching if (!IsDead) HandleStuckInBlock(); - - transform.localScale = CalculateScale(false); } + + transform.localScale = CalculateScale(false); } #endregion @@ -617,12 +613,12 @@ private void CheckForEntityCollision() { LagCompensatedBuffer.Clear(); foreach (BoxCollider2D hitbox in hitboxes) { Runner.LagCompensation.OverlapBox( - body.Position + (body.Velocity * Runner.DeltaTime) + (hitbox.offset * transform.localScale), + body.Position + (hitbox.offset * transform.localScale), ((Vector3) (hitbox.size * 0.5f) + Vector3.forward).Multiply(transform.localScale), Quaternion.identity, Object.InputAuthority, LagCompensatedBuffer, - options: HitOptions.IgnoreInputAuthority | HitOptions.SubtickAccuracy | HitOptions.IncludeBox2D, + options: HitOptions.IgnoreInputAuthority | HitOptions.SubtickAccuracy | HitOptions.IgnoreInputAuthority | HitOptions.IncludeBox2D, clearHits: false); } @@ -631,6 +627,10 @@ private void CheckForEntityCollision() { foreach (LagCompensatedHit hit in LagCompensatedBuffer) { GameObject hitObject = hit.GameObject; + + if (!hit.Hitbox && hitObject.TryGetComponent(out _)) + continue; + PhysicsDataStruct.ObjectContact contact = new(); float angle = Vector2.SignedAngle(hit.Normal, Vector2.up); angle += 360 + 45; @@ -1207,13 +1207,18 @@ public void SpawnItem(NetworkPrefabRef prefab) { if (prefab == NetworkPrefabRef.Empty) prefab = Utils.Utils.GetRandomItem(this).prefab; - Runner.Spawn(prefab, new(body.Position.x, cameraController.CurrentPosition.y + 1.68f, 0), onBeforeSpawned: (runner, obj) => { - obj.GetComponent().OnBeforeSpawned(this); + Runner.Spawn(prefab, new(body.Position.x, body.Position.y, 0), onBeforeSpawned: (runner, obj) => { + Powerup p = obj.GetComponent(); + p.OnBeforeSpawned(this); + p.body.Position = body.Position; }); } private void SpawnStars(int amount, bool deathplane) { + if (!Runner.IsServer) + return; + GameManager gm = GameManager.Instance; bool fastStars = amount > 2 && Stars > 2; int starDirection = FacingRight ? 1 : 2; @@ -1577,10 +1582,10 @@ public void DoKnockback(bool fromRight, int starsToDrop, bool weak, NetworkObjec KnockbackWasOriginallyFacingRight = FacingRight; KnockbackTick = Runner.Tick; - Vector2Int tileLoc = Utils.Utils.WorldToTilemapPosition(body.Position); - TileBase tile = Utils.Utils.GetTileAtTileLocation(tileLoc + (fromRight ? Vector2Int.left : Vector2Int.right)); - if (!weak && tile) - fromRight = !fromRight; + //Vector2Int tileLoc = Utils.Utils.WorldToTilemapPosition(body.Position); + //TileBase tile = Utils.Utils.GetTileAtTileLocation(tileLoc + (fromRight ? Vector2Int.left : Vector2Int.right)); + //if (!weak && tile) + // fromRight = !fromRight; body.Velocity = new Vector2( (fromRight ? -1 : 1) * @@ -2254,7 +2259,7 @@ private float CalculateSlopeMaxSpeedOffset(float floorAngle) { private static readonly Vector2 StuckInBlockSizeCheck = new(0.9f, 0.9f); private bool HandleStuckInBlock() { - if (CurrentPipe || MegaStartTimer.IsActive(Runner) || (MegaEndTimer.IsActive(Runner) && IsStationaryMegaShrink)) + if (IsFrozen || CurrentPipe || MegaStartTimer.IsActive(Runner) || (MegaEndTimer.IsActive(Runner) && IsStationaryMegaShrink)) return false; Vector2 checkSize = WorldHitboxSize * StuckInBlockSizeCheck; @@ -2743,13 +2748,13 @@ private void HandleMovement(NetworkButtons heldButtons, NetworkButtons pressedBu }; if (IsSpinnerFlying) { if (IsDrilling) { - body.Velocity = new(body.Velocity.x, -drillVelocity); + body.Velocity = new(body.Velocity.x, Mathf.Max(body.Velocity.y, -drillVelocity)); } else { body.Velocity = new(body.Velocity.x, Mathf.Max(body.Velocity.y, -flyingTerminalVelocity)); } } else if (IsPropellerFlying) { if (IsDrilling) { - body.Velocity = new(Mathf.Clamp(body.Velocity.x, -WalkingMaxSpeed * (1/4f), WalkingMaxSpeed * (1/4f)), -drillVelocity); + body.Velocity = new(Mathf.Clamp(body.Velocity.x, -WalkingMaxSpeed * (1/4f), WalkingMaxSpeed * (1/4f)), Mathf.Max(body.Velocity.y, -drillVelocity)); } else { float remainingTime = PropellerLaunchTimer.RemainingTime(Runner) ?? 0f; float htv = WalkingMaxSpeed * 1.18f + (remainingTime * 2f); @@ -2790,7 +2795,11 @@ private void HandleGravity(bool jumpHeld) { // Slow-rise check if (IsSpinnerFlying || IsPropellerFlying) { - gravity = flyingGravity * Physics2D.gravity.y; + if (IsDrilling) { + gravity = GRAVITY_STAGE_ACC[^1]; + } else { + gravity = flyingGravity * Physics2D.gravity.y; + } } else { if (IsGroundpounding) { if (GroundpoundStartTimer.IsActive(Runner)) { diff --git a/Assets/Scripts/Entity/Powerups/Powerup.cs b/Assets/Scripts/Entity/Powerups/Powerup.cs index 352ca3e014..b67ac5e52e 100644 --- a/Assets/Scripts/Entity/Powerups/Powerup.cs +++ b/Assets/Scripts/Entity/Powerups/Powerup.cs @@ -141,15 +141,16 @@ public override void Render() { public override void FixedUpdateNetwork() { base.FixedUpdateNetwork(); + + if (!Object || Collector) + return; + if (GameManager.Instance && GameManager.Instance.GameEnded) { body.Velocity = Vector2.zero; body.Freeze = true; return; } - if (!Object || Collector) - return; - if (FollowPlayer) { // Attached to a player. Don't interact, and follow the player. body.Position = new(FollowPlayer.body.Position.x, FollowPlayer.cameraController.CurrentPosition.y + 1.68f); diff --git a/Assets/Scripts/Entity/World Elements/FrozenCube.cs b/Assets/Scripts/Entity/World Elements/FrozenCube.cs index 02579d7f2d..27daaddf4d 100644 --- a/Assets/Scripts/Entity/World Elements/FrozenCube.cs +++ b/Assets/Scripts/Entity/World Elements/FrozenCube.cs @@ -42,7 +42,8 @@ public override void Spawned() { sRenderer.size = CubeSize; hitbox.size = CubeSize - (Vector2.one * 0.05f); - hitbox.offset = CubeSize * Vector2.up * 0.5f; + fusionHitbox.BoxExtents = hitbox.size * 0.5f; + fusionHitbox.Offset = hitbox.offset = CubeSize * Vector2.up * 0.5f; AutoBreakTimer = TickTimer.CreateFromSeconds(Runner, autoBreak); flying = FrozenEntity.IsFlying; diff --git a/Assets/Scripts/Entity/World Elements/LooseCoin.cs b/Assets/Scripts/Entity/World Elements/LooseCoin.cs index 44bdf0b9bf..23b0870051 100644 --- a/Assets/Scripts/Entity/World Elements/LooseCoin.cs +++ b/Assets/Scripts/Entity/World Elements/LooseCoin.cs @@ -34,6 +34,7 @@ public override void Spawned() { DespawnTimer = TickTimer.CreateFromSeconds(Runner, despawn); body.Velocity = Vector2.up * GameManager.Instance.random.RangeInclusive(5.5f, 6f); + Runner.SetIsSimulated(Object, true); } public override void Render() { @@ -71,7 +72,6 @@ public override void FixedUpdateNetwork() { body.Velocity = new(body.Velocity.x, 0); // TODO: doesn't always trigger, even for host. Strange. - // IsForward is ok, the sound isnt top priority if (body.PreviousTickVelocity.y < -0.5f * (Mathf.Sin(data.FloorAngle) + 1f)) CoinBounceAnimCounter++; } diff --git a/Assets/Scripts/Entity/World Elements/SpinnerAnimator.cs b/Assets/Scripts/Entity/World Elements/SpinnerAnimator.cs index 9cafef7c85..accef60022 100644 --- a/Assets/Scripts/Entity/World Elements/SpinnerAnimator.cs +++ b/Assets/Scripts/Entity/World Elements/SpinnerAnimator.cs @@ -1,11 +1,9 @@ using UnityEngine; using Fusion; -using NSMB.Entities.Player; namespace NSMB.Entities.World { - //[OrderAfter(typeof(PlayerController))] public class SpinnerAnimator : NetworkBehaviour, IBeforeTick { //---Networked Variables @@ -25,6 +23,7 @@ public class SpinnerAnimator : NetworkBehaviour, IBeforeTick { public override void Spawned() { armPositionPropertyReader = GetPropertyReader(nameof(ArmPosition)); + Runner.SetIsSimulated(Object, true); } public void BeforeTick() { @@ -33,7 +32,6 @@ public void BeforeTick() { } public override void Render() { - float armRenderPosition; if (TryGetSnapshotsBuffers(out var from, out var to, out float alpha)) { (float fromPosition, float toPosition) = armPositionPropertyReader.Read(from, to); diff --git a/Assets/Scripts/Entity/World Elements/SpinnerAnimator.cs.meta b/Assets/Scripts/Entity/World Elements/SpinnerAnimator.cs.meta index 81604c3431..c144627a86 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: 0 + executionOrder: 2 icon: {instanceID: 0} userData: assetBundleName: diff --git a/Assets/Scripts/GameManager.cs b/Assets/Scripts/GameManager.cs index c51b068599..89e4cf7ace 100644 --- a/Assets/Scripts/GameManager.cs +++ b/Assets/Scripts/GameManager.cs @@ -215,7 +215,7 @@ public override void Spawned() { public override void Render() { base.Render(); - if (GameManager.Instance.GameState == Enums.GameState.Playing) + if (GameState == Enums.GameState.Playing) HandleMusic(); // Handle sound effects for the timer, if it's enabled @@ -245,7 +245,7 @@ public override void Render() { } public override void FixedUpdateNetwork() { - if (GameEnded) + if (!HasStateAuthority || GameEnded) return; switch (GameState) { @@ -495,9 +495,10 @@ public void CheckIfAllPlayersLoaded() { foreach (PlayerRef player in Runner.ActivePlayers) { PlayerData data = player.GetPlayerData(Runner); - if (data == null || data.IsCurrentlySpectating) + if (!data || data.IsCurrentlySpectating) continue; + // I'm still loading! if (!data.IsLoaded) return; } @@ -558,7 +559,7 @@ public void BumpBlock(short x, short y, TileBase oldTile, TileBase newTile, bool }); } - GameManager.Instance.tileManager.SetTile(loc, null); + tileManager.SetTile(loc, null); } //---Callbacks @@ -751,8 +752,11 @@ private void HandleMusic() { if (!player) continue; - mega |= player.State == Enums.PowerupState.MegaMushroom && player.MegaStartTimer.ExpiredOrNotRunning(Runner); - invincible |= player.IsStarmanInvincible; + if (Settings.Instance.audioSpecialPowerupMusicLocalOnly && !player.cameraController.IsControllingCamera) + return; + + mega |= Settings.Instance.audioSpecialPowerupMusic.HasFlag(Enums.SpecialPowerupMusic.MegaMushroom) && player.State == Enums.PowerupState.MegaMushroom && player.MegaStartTimer.ExpiredOrNotRunning(Runner); + invincible |= Settings.Instance.audioSpecialPowerupMusic.HasFlag(Enums.SpecialPowerupMusic.Starman) && player.IsStarmanInvincible; } speedup |= SessionData.Instance.Timer > 0 && ((GameEndTimer.RemainingTime(Runner) ?? 0f) < 60f); diff --git a/Assets/Scripts/Networking/Fusion/NetworkHandler.cs b/Assets/Scripts/Networking/Fusion/NetworkHandler.cs index 9f2b03ce86..0d61eb67ee 100644 --- a/Assets/Scripts/Networking/Fusion/NetworkHandler.cs +++ b/Assets/Scripts/Networking/Fusion/NetworkHandler.cs @@ -196,7 +196,7 @@ async void INetworkRunnerCallbacks.OnHostMigration(NetworkRunner runner, HostMig DisableNATPunchthrough = Settings.Instance.generalDisableNATPunchthrough, EnableClientSessionCreation = true, SceneManager = Runner.gameObject.AddComponent(), - Scene = SceneRef.FromIndex(0), + Scene = SceneRef.FromIndex(0) }); OnHostMigration?.Invoke(runner, hostMigrationToken); @@ -472,6 +472,7 @@ public static async Task CreateRoom(StartGameArgs args, GameMod args.SceneManager = Runner.gameObject.AddComponent(); args.SessionProperties = NetworkUtils.DefaultRoomProperties; args.OnGameStarted = RoomInitialized; + args.Scene = SceneRef.FromIndex(0); args.SessionProperties[Enums.NetRoomProperties.HostName] = Settings.Instance.generalNickname; args.SessionProperties[Enums.NetRoomProperties.MaxPlayers] = players; diff --git a/Assets/Scripts/Networking/Fusion/PlayerData.cs b/Assets/Scripts/Networking/Fusion/PlayerData.cs index 598a528d7e..21603bc0ea 100644 --- a/Assets/Scripts/Networking/Fusion/PlayerData.cs +++ b/Assets/Scripts/Networking/Fusion/PlayerData.cs @@ -17,6 +17,7 @@ public class PlayerData : NetworkBehaviour { //---Events public event Action OnInOptionsChangedEvent; + public event Action OnIsReadyChangedEvent; //---Networked Variables [Networked, Capacity(20)] public string RawNickname { get; set; } = "noname"; @@ -31,6 +32,7 @@ public class PlayerData : NetworkBehaviour { [Networked] public NetworkBool IsLoaded { get; set; } [Networked] public NetworkBool IsMuted { get; set; } [Networked] public NetworkBool IsInOptions { get; set; } + [Networked] public NetworkBool IsReady { get; set; } [Networked] public TickTimer MessageCooldownTimer { get; set; } [Networked] public byte CharacterIndex { get; set; } [Networked] public byte SkinIndex { get; set; } @@ -140,6 +142,7 @@ public override void Render() { case nameof(Ping): OnSettingChanged(); break; case nameof(IsLoaded): OnLoadStateChanged(); break; case nameof(IsInOptions): OnInOptionsChanged(); break; + case nameof(IsReady): OnIsReadyChanged(); break; case nameof(CharacterIndex): OnCharacterChanged(); break; case nameof(SkinIndex): OnSkinChanged(); break; } @@ -263,6 +266,11 @@ public void Rpc_SetOptionsOpen(bool open) { IsInOptions = open; } + [Rpc(RpcSources.InputAuthority, RpcTargets.StateAuthority)] + public void Rpc_SetIsReady(bool ready) { + IsReady = ready; + } + private void OnOptionsOpenToggled(bool isOpen) { Rpc_SetOptionsOpen(isOpen); } @@ -293,7 +301,7 @@ public void OnNameChanged() { } public void OnCharacterChanged() { - if (!MainMenuManager.Instance || !Object.HasInputAuthority) + if (!MainMenuManager.Instance || !HasInputAuthority) return; MainMenuManager.Instance.SwapCharacter(CharacterIndex, false); @@ -301,7 +309,7 @@ public void OnCharacterChanged() { } public void OnSkinChanged() { - if (!MainMenuManager.Instance || !Object.HasInputAuthority) + if (!MainMenuManager.Instance || !HasInputAuthority) return; MainMenuManager.Instance.SwapPlayerSkin(SkinIndex, false); @@ -310,4 +318,11 @@ public void OnSkinChanged() { public void OnInOptionsChanged() { OnInOptionsChangedEvent?.Invoke(IsInOptions); } + + public void OnIsReadyChanged() { + OnIsReadyChangedEvent?.Invoke(IsReady); + + if (MainMenuManager.Instance && HasInputAuthority) + MainMenuManager.Instance.UpdateStartGameButton(); + } } diff --git a/Assets/Scripts/Networking/Fusion/SessionData.cs b/Assets/Scripts/Networking/Fusion/SessionData.cs index 2cdd2948e5..0dbdb9e1a0 100644 --- a/Assets/Scripts/Networking/Fusion/SessionData.cs +++ b/Assets/Scripts/Networking/Fusion/SessionData.cs @@ -96,6 +96,9 @@ public override void Spawned() { changeDetector = GetChangeDetector(ChangeDetector.Source.SimulationState); levelPropertyReader = GetPropertyReader(nameof(Level)); gameObject.name = "SessionData (" + Runner.SessionInfo.Name + ")"; + + if (MainMenuManager.Instance) + MainMenuManager.Instance.roomSettingsCallbacks.UpdateAllSettings(Instance, false); } public override void Render() { @@ -286,6 +289,7 @@ public void Rpc_StartGame() { data.IsCurrentlySpectating = data.IsManualSpectator; data.IsLoaded = false; + data.IsReady = false; if (data.IsCurrentlySpectating) { data.PlayerId = -1; diff --git a/Assets/Scripts/Networking/Fusion/TilemapChunk.cs b/Assets/Scripts/Networking/Fusion/TilemapChunk.cs index 476e6a9567..daa674af88 100644 --- a/Assets/Scripts/Networking/Fusion/TilemapChunk.cs +++ b/Assets/Scripts/Networking/Fusion/TilemapChunk.cs @@ -11,13 +11,11 @@ public class TilemapChunk : NetworkBehaviour, IBeforeTick, IAfterTick { private static readonly TileBase[] TileBuffer = new TileBase[256]; //---Networked Variables + [Networked] public ushort ChunkX { get; set; } + [Networked] public ushort ChunkY { get; set; } [Networked] public byte DirtyCounter { get; set; } [Networked, Capacity(256)] public NetworkArray Tiles => default; - //---Public Variables - public int chunkX; - public int chunkY; - //---Private Variables private readonly ushort[] originalTiles = new ushort[256]; private BoundsInt bounds; @@ -50,6 +48,11 @@ public void AfterTick() { latestDirtyCounter = DirtyCounter; } + public void OnBeforeSpawned(ushort x, ushort y) { + ChunkX = x; + ChunkY = y; + } + public override void Spawned() { Runner.SetIsSimulated(Object, true); @@ -59,18 +62,18 @@ public override void Spawned() { transform.SetParent(GameManager.Instance.tileManager.transform, true); tilemapCollider = GameManager.Instance.tilemap.GetComponent(); LoadState(); - if (Runner.IsServer) Tiles.CopyFrom(originalTiles, 0, originalTiles.Length); UpdateTilemapState(); + GameManager.Instance.tileManager.AddChunk(this); initialized = true; } public void LoadState() { GameManager gm = GameManager.Instance; - int chunkOriginIndex = (chunkX * 16) + (chunkY * GameManager.Instance.tileManager.ChunksX * 256); + int chunkOriginIndex = (ChunkX * 16) + (ChunkY * GameManager.Instance.tileManager.ChunksX * 256); for (int i = 0; i < 256; i++) { int x = i % 16; @@ -82,7 +85,7 @@ public void LoadState() { } } - bounds = new(gm.levelMinTileX + (chunkX * 16), gm.levelMinTileY + (chunkY * 16), 0, 16, 16, 1); + bounds = new(gm.levelMinTileX + (ChunkX * 16), gm.levelMinTileY + (ChunkY * 16), 0, 16, 16, 1); } public void ResetMap() { @@ -151,7 +154,7 @@ public ushort GetTile(int x, int y) { public void OnDrawGizmosSelected() { Gizmos.color = SelectedColor; GameManager gm = GameManager.Instance; - Gizmos.DrawCube(new(gm.LevelMinX + 4 + (chunkX * 8), gm.LevelMinY + 4 + (chunkY * 8)), ChunkSize); + Gizmos.DrawCube(new(gm.LevelMinX + 4 + (ChunkX * 8), gm.LevelMinY + 4 + (ChunkY * 8)), ChunkSize); } #endif } diff --git a/Assets/Scripts/Scriptables/PrefabList.cs b/Assets/Scripts/Scriptables/PrefabList.cs index 7aa8d4ecba..54e7c957e0 100644 --- a/Assets/Scripts/Scriptables/PrefabList.cs +++ b/Assets/Scripts/Scriptables/PrefabList.cs @@ -8,7 +8,8 @@ public class PrefabList : ScriptableObject { public static PrefabList Instance => ScriptableManager.Instance.prefabs; //---Network Helpers - public NetworkPrefabRef PlayerDataHolder, SessionDataHolder, GameDataHolder; + public NetworkPrefabRef PlayerDataHolder, SessionDataHolder; + public NetworkPrefabRef TilemapChunk; //---World Elements public NetworkPrefabRef Obj_Fireball; diff --git a/Assets/Scripts/Settings.cs b/Assets/Scripts/Settings.cs index d5c729fd28..ac0c38c81b 100644 --- a/Assets/Scripts/Settings.cs +++ b/Assets/Scripts/Settings.cs @@ -152,7 +152,8 @@ public string ControlsBindings { public bool graphicsNdsEnabled, graphicsNdsForceAspect, graphicsNdsPixelPerfect, graphicsNametags; - public bool audioMuteMusicOnUnfocus, audioMuteSFXOnUnfocus, audioPanning; + public Enums.SpecialPowerupMusic audioSpecialPowerupMusic; + public bool audioMuteMusicOnUnfocus, audioMuteSFXOnUnfocus, audioPanning, audioSpecialPowerupMusicLocalOnly; public RumbleManager.RumbleSetting controlsRumble; public bool controlsFireballSprint, controlsAutoSprint, controlsPropellerJump; @@ -199,6 +200,8 @@ public void SaveSettings() { PlayerPrefs.SetInt("Audio_MuteMusicOnUnfocus", audioMuteMusicOnUnfocus ? 1 : 0); PlayerPrefs.SetInt("Audio_MuteSFXOnUnfocus", audioMuteSFXOnUnfocus ? 1 : 0); PlayerPrefs.SetInt("Audio_Panning", audioPanning ? 1 : 0); + PlayerPrefs.SetInt("Audio_SpecialPowerupMusic", (int) audioSpecialPowerupMusic); + PlayerPrefs.SetInt("Audio_SpecialPowerupMusicLocal", audioSpecialPowerupMusicLocalOnly ? 1 : 0); // Controls PlayerPrefs.SetInt("Controls_FireballFromSprint", controlsFireballSprint ? 1 : 0); @@ -265,6 +268,8 @@ private void LoadFromVersion0() { audioMuteMusicOnUnfocus = false; audioMuteSFXOnUnfocus = false; audioPanning = true; + audioSpecialPowerupMusic = Enums.SpecialPowerupMusic.Starman | Enums.SpecialPowerupMusic.MegaMushroom; + audioSpecialPowerupMusicLocalOnly = false; FileInfo bindingsFile = new(Application.persistentDataPath + "/controls.json"); if (bindingsFile.Exists) { @@ -304,12 +309,14 @@ private void LoadFromVersion1() { if (TryGetSetting("Graphics_Colorblind", out bool tempColorblind)) GraphicsColorblind = tempColorblind; //Audio - if (GetIfExists("Audio_MasterVolume", out float tempMasterVolume)) AudioMasterVolume = tempMasterVolume; - if (GetIfExists("Audio_MusicVolume", out float tempMusicVolume)) AudioMusicVolume = tempMusicVolume; - if (GetIfExists("Audio_SFXVolume", out float tempSFXVolume)) AudioSFXVolume = tempSFXVolume; + if (TryGetSetting("Audio_MasterVolume", out float tempMasterVolume)) AudioMasterVolume = tempMasterVolume; + if (TryGetSetting("Audio_MusicVolume", out float tempMusicVolume)) AudioMusicVolume = tempMusicVolume; + if (TryGetSetting("Audio_SFXVolume", out float tempSFXVolume)) AudioSFXVolume = tempSFXVolume; TryGetSetting("Audio_MuteMusicOnUnfocus", out audioMuteMusicOnUnfocus); TryGetSetting("Audio_MuteSFXOnUnfocus", out audioMuteSFXOnUnfocus); TryGetSetting("Audio_Panning", out audioPanning); + if (TryGetSetting("Audio_SpecialPowerupMusic", out int tempAudioSpecialPowerupMusic)) audioSpecialPowerupMusic = (Enums.SpecialPowerupMusic) tempAudioSpecialPowerupMusic; + TryGetSetting("Audio_SpecialPowerupMusicLocalOnly", out audioSpecialPowerupMusicLocalOnly); //Controls TryGetSetting("Controls_FireballFromSprint", out controlsFireballSprint); @@ -339,7 +346,7 @@ private bool TryGetSetting(string key, out int value) { return true; } - private bool GetIfExists(string key, out float value) { + private bool TryGetSetting(string key, out float value) { if (!PlayerPrefs.HasKey(key)) { value = default; return false; diff --git a/Assets/Scripts/TileManager.cs b/Assets/Scripts/TileManager.cs index 024e7f0609..e6d41413f1 100644 --- a/Assets/Scripts/TileManager.cs +++ b/Assets/Scripts/TileManager.cs @@ -19,17 +19,37 @@ public class TileManager : NetworkBehaviour { public int WorldOriginY { get; private set; } private GameManager GameManager => GameManager.Instance; - //---Public Variables - [SerializeField] public List chunks; - - //---Serialized Variables - [SerializeField] public TilemapChunk tilemapChunkPrefab; + //---Private Variables + private List chunks = new(); public override void Spawned() { ChunksX = Mathf.CeilToInt(GameManager.levelWidthTile / 16f); ChunksY = Mathf.CeilToInt(GameManager.levelHeightTile / 16f); WorldOriginX = GameManager.levelMinTileX; WorldOriginY = GameManager.levelMinTileY; + + if (Runner.IsServer) { + for (int y = 0; y < ChunksY; y++) { + for (int x = 0; x < ChunksX; x++) { + Runner.Spawn(PrefabList.Instance.TilemapChunk, onBeforeSpawned: (runner, obj) => { + obj.GetComponent().OnBeforeSpawned((ushort) x, (ushort) y); + }); + } + } + } + } + + public void AddChunk(TilemapChunk chunk) { + if (chunks.Contains(chunk)) + return; + + chunks.Add(chunk); + chunks.Sort((chunkA, chunkB) => { + if (chunkA.ChunkY == chunkB.ChunkY) + return chunkA.ChunkX - chunkB.ChunkX; + + return chunkA.ChunkY - chunkB.ChunkY; + }); } public void ResetMap() { diff --git a/Assets/Scripts/UI/Menu/MainMenuManager.cs b/Assets/Scripts/UI/Menu/MainMenuManager.cs index be1361fbbd..2893d7b350 100644 --- a/Assets/Scripts/UI/Menu/MainMenuManager.cs +++ b/Assets/Scripts/UI/Menu/MainMenuManager.cs @@ -15,6 +15,7 @@ using NSMB.Translation; using NSMB.UI.Prompts; using NSMB.Utils; +using UnityEngine.Rendering.UI; namespace NSMB.UI.MainMenu { public class MainMenuManager : Singleton { @@ -178,7 +179,8 @@ public void Update() { } public void OnDestroy() { - GlobalController.Instance.connecting.SetActive(false); + if (GlobalController.Instance) + GlobalController.Instance.connecting.SetActive(false); } public void UpdateRegionDropdown() { @@ -447,15 +449,18 @@ public async void QuitRoom() { public void StartCountdown() { - // We can't start the game if we're not the server. - if (!Runner.IsServer) + PlayerData data = Runner.GetLocalPlayerData(); + if (!data.IsRoomOwner) { + // Toggle ready up state instead + sfx.PlayOneShot(data.IsReady ? Enums.Sounds.UI_Back : Enums.Sounds.UI_Decide); + data.Rpc_SetIsReady(!data.IsReady); return; + } if (SessionData.Instance.GameStartTimer.IsRunning) { // Cancel early. SessionData.Instance.GameStartTimer = TickTimer.None; sfx.PlayOneShot(Enums.Sounds.UI_Back); - } else { // Make sure we can actually start the game if (!IsRoomConfigurationValid()) @@ -475,12 +480,18 @@ private IEnumerator FadeMusic() { public void UpdateStartGameButton() { PlayerData data = Runner.GetLocalPlayerData(); - if (!data || !data.IsRoomOwner) { - startGameBtn.interactable = false; - return; + TranslationManager tm = GlobalController.Instance.translationManager; + if (data && data.IsRoomOwner) { + startGameButtonText.text = tm.GetTranslation("ui.inroom.buttons.start"); + startGameBtn.interactable = IsRoomConfigurationValid(); + } else { + if (data && data.IsReady) { + startGameButtonText.text = tm.GetTranslation("ui.inroom.buttons.unready"); + } else { + startGameButtonText.text = tm.GetTranslation("ui.inroom.buttons.readyup"); + } + startGameBtn.interactable = true; } - - startGameBtn.interactable = IsRoomConfigurationValid(); } public bool IsRoomConfigurationValid() { @@ -724,16 +735,17 @@ private void OnLanguageChanged(TranslationManager tm) { } public void OnCountdownTick(int time) { + PlayerData data = Runner.GetLocalPlayerData(); TranslationManager tm = GlobalController.Instance.translationManager; if (time > 0) { + startGameBtn.interactable = data && data.IsRoomOwner; startGameButtonText.text = tm.GetTranslationWithReplacements("ui.inroom.buttons.starting", "countdown", time.ToString()); hostControlsGroup.interactable = false; if (time == 1 && fadeMusicCoroutine == null) fadeMusicCoroutine = StartCoroutine(FadeMusic()); } else { - startGameButtonText.text = tm.GetTranslation("ui.inroom.buttons.start"); - PlayerData data = Runner.GetLocalPlayerData(); - hostControlsGroup.interactable = data ? data.IsRoomOwner : true; + UpdateStartGameButton(); + hostControlsGroup.interactable = data && data.IsRoomOwner; if (fadeMusicCoroutine != null) { StopCoroutine(fadeMusicCoroutine); fadeMusicCoroutine = null; @@ -763,7 +775,8 @@ private void OnHostMigration(NetworkRunner runner, HostMigrationToken hostMigrat } private void OnSceneLoadStart() { - GlobalController.Instance.loadingCanvas.Initialize(); + if (!Runner.TryGetSceneInfo(out var sceneInfo) || sceneInfo.Scenes[0].AsIndex != 0) + GlobalController.Instance.loadingCanvas.Initialize(); } //---Debug diff --git a/Assets/Scripts/UI/Menu/Options/Loaders/SpecialPowerupMusicLoader.cs b/Assets/Scripts/UI/Menu/Options/Loaders/SpecialPowerupMusicLoader.cs new file mode 100644 index 0000000000..325ac195b0 --- /dev/null +++ b/Assets/Scripts/UI/Menu/Options/Loaders/SpecialPowerupMusicLoader.cs @@ -0,0 +1,47 @@ +using System.Linq; + +using NSMB.Translation; +using NSMB.UI.Pause.Options; + +namespace NSMB.UI.Pause.Loaders { + public class SpecialPowerupMusicLoader : PauseOptionLoader { + + private static readonly string[] MusicDisplayKeys = { + "ui.generic.none", + "ui.options.audio.specialpowerupmusic.starman", + "ui.options.audio.specialpowerupmusic.megamushroom", + "ui.options.audio.specialpowerupmusic.both" }; + + //---Private Variables + private PauseOption option; + + public void OnEnable() { + TranslationManager.OnLanguageChanged += OnLanguageChanged; + } + + public void OnDisable() { + TranslationManager.OnLanguageChanged -= OnLanguageChanged; + } + + public override void LoadOptions(PauseOption option) { + if (option is not ScrollablePauseOption spo) + return; + + this.option = option; + spo.options.Clear(); + spo.options.AddRange(MusicDisplayKeys.Select(GlobalController.Instance.translationManager.GetTranslation)); + + int index = (int) Settings.Instance.audioSpecialPowerupMusic; + spo.SetValue(index, false); + } + + public override void OnValueChanged(PauseOption option, object newValue) { + Settings.Instance.audioSpecialPowerupMusic = (Enums.SpecialPowerupMusic) newValue; + } + + private void OnLanguageChanged(TranslationManager tm) { + if (option) + LoadOptions(option); + } + } +} diff --git a/Assets/Scripts/UI/Menu/Options/Loaders/SpecialPowerupMusicLoader.cs.meta b/Assets/Scripts/UI/Menu/Options/Loaders/SpecialPowerupMusicLoader.cs.meta new file mode 100644 index 0000000000..5a33bbfb48 --- /dev/null +++ b/Assets/Scripts/UI/Menu/Options/Loaders/SpecialPowerupMusicLoader.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 0245a440c750abe47a2929d561020748 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/UI/Menu/PlayerListEntry.cs b/Assets/Scripts/UI/Menu/PlayerListEntry.cs index ca2a881d37..2ce654c380 100644 --- a/Assets/Scripts/UI/Menu/PlayerListEntry.cs +++ b/Assets/Scripts/UI/Menu/PlayerListEntry.cs @@ -17,7 +17,7 @@ public class PlayerListEntry : MonoBehaviour { [SerializeField] private TMP_Text nameText, pingText, winsText; [SerializeField] private Image colorStrip; [SerializeField] private RectTransform background, options; - [SerializeField] private GameObject blockerTemplate, firstButton, chattingIcon, settingsIcon; + [SerializeField] private GameObject blockerTemplate, firstButton, chattingIcon, settingsIcon, readyIcon; [SerializeField] private Canvas rootCanvas; [SerializeField] private LayoutElement layout; [SerializeField] private GameObject[] adminOnlyOptions; @@ -29,6 +29,7 @@ public class PlayerListEntry : MonoBehaviour { public void OnEnable() { Settings.OnColorblindModeChanged += OnColorblindModeChanged; player.OnInOptionsChangedEvent += OnInSettingsChanged; + player.OnIsReadyChangedEvent += OnIsReadyChanged; OnInSettingsChanged(player.IsInOptions); } @@ -36,6 +37,7 @@ public void OnEnable() { public void OnDisable() { Settings.OnColorblindModeChanged -= OnColorblindModeChanged; player.OnInOptionsChangedEvent -= OnInSettingsChanged; + player.OnIsReadyChangedEvent -= OnIsReadyChanged; } public void OnDestroy() { @@ -179,5 +181,9 @@ private void OnColorblindModeChanged() { private void OnInSettingsChanged(bool inSettings) { settingsIcon.SetActive(inSettings); } + + private void OnIsReadyChanged(bool isReady) { + readyIcon.SetActive(isReady); + } } } diff --git a/Assets/Scripts/UI/UserNametag.cs.meta b/Assets/Scripts/UI/UserNametag.cs.meta index aee8e80e63..f21f0b34f8 100644 --- a/Assets/Scripts/UI/UserNametag.cs.meta +++ b/Assets/Scripts/UI/UserNametag.cs.meta @@ -4,7 +4,7 @@ MonoImporter: externalObjects: {} serializedVersion: 2 defaultReferences: [] - executionOrder: 3 + executionOrder: 5 icon: {instanceID: 0} userData: assetBundleName: diff --git a/Assets/Scripts/Utils/Enums.cs b/Assets/Scripts/Utils/Enums.cs index 31a315eb7f..bfb53f5bd6 100644 --- a/Assets/Scripts/Utils/Enums.cs +++ b/Assets/Scripts/Utils/Enums.cs @@ -157,6 +157,12 @@ public enum Sounds : byte { [SoundData("world/water_splash")] World_Water_Splash = 77, } + [Flags] + public enum SpecialPowerupMusic { + Starman = 1 << 0, + MegaMushroom = 1 << 1, + } + public enum Particle : byte { None = 0, diff --git a/Assets/Scripts/Utils/Extensions/UnityExtensions.cs b/Assets/Scripts/Utils/Extensions/UnityExtensions.cs index aece76524d..3f3b898840 100644 --- a/Assets/Scripts/Utils/Extensions/UnityExtensions.cs +++ b/Assets/Scripts/Utils/Extensions/UnityExtensions.cs @@ -104,6 +104,9 @@ public static void SetLossyScale(this Transform transform, Vector3 lossyScale) { if (transform.parent) lossyScale = lossyScale.Divide(transform.parent.lossyScale); + if (lossyScale.z == 0 || !float.IsFinite(lossyScale.z)) + lossyScale.z = 1; + transform.localScale = lossyScale; } } diff --git a/README.md b/README.md index 0b025bbee9..4836776d55 100644 --- a/README.md +++ b/README.md @@ -85,12 +85,12 @@ Windows, Linux, and Mac Builds: https://github.com/ipodtouch0218/NSMB-MarioVsLui * Bilhal * Cecilia * Davo -* Dede * Filipianosol * Flandre Scarlet * Flichka * Freeze * HatsuneMiku +* haywireghost * HD Erick Games * Hyruyoshi * Iketarou