nightly v1.8.0.0 (11/25)

ipodtouch0218 · Nov 26, 2023 · 83f1363 · 83f1363
1 parent c20a93f
commit 83f1363
Show file tree

Hide file tree

Showing 62 changed files with 2,589 additions and 4,768 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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": "<Hidden>",
   "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
@@ -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
@@ -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
@@ -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
@@ -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