Skip to content

Commit ddada2a

Browse files
jcs090218jcs090218
committed
fix: missing mixer
1 parent d79136c commit ddada2a

File tree

12 files changed

+1286
-699
lines changed

12 files changed

+1286
-699
lines changed

‎Assets/_BossFight/Scenes/BF_Game.unity‎

Lines changed: 224 additions & 84 deletions
Large diffs are not rendered by default.

‎Assets/_BossFight/Scenes/BF_Lobby.unity‎

Lines changed: 314 additions & 244 deletions
Large diffs are not rendered by default.

‎Assets/_BossFight/Scenes/BF_Logo.unity‎

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -152,9 +152,21 @@ MonoBehaviour:
152152
m_Script: {fileID: 11500000, guid: 2d3ead9775289064eaae6c9fb96c82b3, type: 3}
153153
m_Name:
154154
m_EditorClassIdentifier:
155+
mTest: 0
156+
mKeyShow: 97
157+
mKeyHide: 115
158+
mCanvas: {fileID: 0}
159+
mCanvasGroup: {fileID: 0}
160+
mFadeAlpa: 0
161+
mFading: 0
155162
mResizeUI: {fileID: 0}
156163
mDisplayOnAwake: 1
157164
mMainCanvas: 1
165+
mFade: 0
166+
mFadeFriction: 0.15
167+
mFadeInAmount: 1
168+
mFadeOutAmount: 0
169+
mTimeType: 7
158170
mActiveSound: {fileID: 0}
159171
mDeactiveSound: {fileID: 0}
160172
--- !u!114 &170838951
@@ -395,8 +407,9 @@ MonoBehaviour:
395407
m_Name:
396408
m_EditorClassIdentifier:
397409
mNextLevel: BF_Lobby
410+
mReloadScene: 0
398411
mDelayTime: 1.5
399-
mDeltaTimeType: 0
412+
mTimeType: 0
400413
--- !u!1001 &343079155
401414
PrefabInstance:
402415
m_ObjectHideFlags: 0
@@ -511,7 +524,6 @@ MonoBehaviour:
511524
m_Script: {fileID: 11500000, guid: 4999acd701f3e6743b7c5518ea7aaa17, type: 3}
512525
m_Name:
513526
m_EditorClassIdentifier:
514-
mSoundSettingType: 1
515527
--- !u!82 &502420052
516528
AudioSource:
517529
m_ObjectHideFlags: 0
@@ -521,7 +533,8 @@ AudioSource:
521533
m_GameObject: {fileID: 502420050}
522534
m_Enabled: 1
523535
serializedVersion: 4
524-
OutputAudioMixerGroup: {fileID: 0}
536+
OutputAudioMixerGroup: {fileID: -300667356125292915, guid: 7db419a1e5067c44fb6780b4f563b20b,
537+
type: 2}
525538
m_audioClip: {fileID: 0}
526539
m_Resource: {fileID: 0}
527540
m_PlayOnAwake: 1

‎Assets/_Project/Scenes/Sound/FT_Music.unity‎

Lines changed: 31 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -485,6 +485,7 @@ MonoBehaviour:
485485
mReloadScene: 1
486486
mScreenColor: {r: 0, g: 0, b: 0, a: 1}
487487
mKeppBGM: 1
488+
mMode: 0
488489
--- !u!114 &681896492
489490
MonoBehaviour:
490491
m_ObjectHideFlags: 0
@@ -1111,6 +1112,10 @@ MonoBehaviour:
11111112
m_Name:
11121113
m_EditorClassIdentifier:
11131114
SWITCHING_SCENE: 0
1115+
NEXT_SCENE_NAME:
1116+
PREVIOUS_SCENE:
1117+
m_Handle: 0
1118+
MODE: 0
11141119
SCENE_FADEOUT_TIME: 1.5
11151120
SCENE_FADEIN_TIME: 1.5
11161121
SCREEN_COLOR: {r: 0, g: 0, b: 0, a: 1}
@@ -1139,7 +1144,6 @@ MonoBehaviour:
11391144
ACTIVE_ONE_PLAYER: 1
11401145
PLAYER_IGNORE_EACH_OTHER: 1
11411146
TRIBE_DAMAGE_EACH_OTHER: 0
1142-
IGNORE_EACH_OTHER_CHARACTER_CONTROLLER: 1
11431147
STREAMING_BASE_URL: https://wwww.example.com/
11441148
STREAMING_CACHE_PATH: /Data_jcs/Cache_StreamingAssets/
11451149
SCREENSHOT_PATH: /Data_jcs/Screenshot/
@@ -1718,9 +1722,21 @@ MonoBehaviour:
17181722
m_Script: {fileID: 11500000, guid: 2d3ead9775289064eaae6c9fb96c82b3, type: 3}
17191723
m_Name:
17201724
m_EditorClassIdentifier:
1725+
mTest: 0
1726+
mKeyShow: 97
1727+
mKeyHide: 115
1728+
mCanvas: {fileID: 0}
1729+
mCanvasGroup: {fileID: 0}
1730+
mFadeAlpa: 0
1731+
mFading: 0
17211732
mResizeUI: {fileID: 0}
17221733
mDisplayOnAwake: 1
17231734
mMainCanvas: 1
1735+
mFade: 0
1736+
mFadeFriction: 0.15
1737+
mFadeInAmount: 1
1738+
mFadeOutAmount: 0
1739+
mTimeType: 7
17241740
mActiveSound: {fileID: 0}
17251741
mDeactiveSound: {fileID: 0}
17261742
--- !u!114 &1383243422
@@ -2073,9 +2089,21 @@ MonoBehaviour:
20732089
m_Script: {fileID: 11500000, guid: 2d3ead9775289064eaae6c9fb96c82b3, type: 3}
20742090
m_Name:
20752091
m_EditorClassIdentifier:
2092+
mTest: 0
2093+
mKeyShow: 97
2094+
mKeyHide: 115
2095+
mCanvas: {fileID: 0}
2096+
mCanvasGroup: {fileID: 0}
2097+
mFadeAlpa: 0
2098+
mFading: 0
20762099
mResizeUI: {fileID: 0}
20772100
mDisplayOnAwake: 1
20782101
mMainCanvas: 0
2102+
mFade: 0
2103+
mFadeFriction: 0.15
2104+
mFadeInAmount: 1
2105+
mFadeOutAmount: 0
2106+
mTimeType: 7
20792107
mActiveSound: {fileID: 0}
20802108
mDeactiveSound: {fileID: 0}
20812109
--- !u!1 &1798221721
@@ -2102,7 +2130,6 @@ GameObject:
21022130
- component: {fileID: 1798221726}
21032131
- component: {fileID: 1798221725}
21042132
- component: {fileID: 1798221724}
2105-
- component: {fileID: 1798221723}
21062133
- component: {fileID: 1798221722}
21072134
m_Layer: 0
21082135
m_Name: JCS_Managers
@@ -2124,7 +2151,7 @@ MonoBehaviour:
21242151
m_Name:
21252152
m_EditorClassIdentifier:
21262153
mTimeScale: 1
2127-
mTestWithKey: 0
2154+
mTest: 0
21282155
mToggleGamePause: 112
21292156
mIncTime: 110
21302157
mDecTime: 109
@@ -2137,18 +2164,6 @@ MonoBehaviour:
21372164
mOverrideSetting: 0
21382165
mAsymptotic: 0
21392166
mFriction: 0.2
2140-
--- !u!114 &1798221723
2141-
MonoBehaviour:
2142-
m_ObjectHideFlags: 0
2143-
m_CorrespondingSourceObject: {fileID: 0}
2144-
m_PrefabInstance: {fileID: 0}
2145-
m_PrefabAsset: {fileID: 0}
2146-
m_GameObject: {fileID: 1798221721}
2147-
m_Enabled: 1
2148-
m_EditorHideFlags: 0
2149-
m_Script: {fileID: 11500000, guid: 34d95829d00ae724e81ce51e880130fe, type: 3}
2150-
m_Name:
2151-
m_EditorClassIdentifier:
21522167
--- !u!114 &1798221724
21532168
MonoBehaviour:
21542169
m_ObjectHideFlags: 0
@@ -2368,7 +2383,6 @@ MonoBehaviour:
23682383
m_Script: {fileID: 11500000, guid: 06ceabc1c1c745c44a60262572a8c61b, type: 3}
23692384
m_Name:
23702385
m_EditorClassIdentifier:
2371-
mNextSceneName:
23722386
mBlackScreen: {fileID: 0}
23732387
mBlackSlideScreen: {fileID: 0}
23742388
mAlign: 0
@@ -2554,6 +2568,7 @@ MonoBehaviour:
25542568
mReloadScene: 1
25552569
mScreenColor: {r: 0, g: 0, b: 0, a: 1}
25562570
mKeppBGM: 0
2571+
mMode: 0
25572572
--- !u!114 &2110640544
25582573
MonoBehaviour:
25592574
m_ObjectHideFlags: 0

‎Assets/_RunningCrush/Scenes/RC_EndGame.unity‎

Lines changed: 43 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ OcclusionCullingSettings:
1313
--- !u!104 &2
1414
RenderSettings:
1515
m_ObjectHideFlags: 0
16-
serializedVersion: 9
16+
serializedVersion: 10
1717
m_Fog: 0
1818
m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
1919
m_FogMode: 3
@@ -38,13 +38,12 @@ RenderSettings:
3838
m_ReflectionIntensity: 1
3939
m_CustomReflection: {fileID: 0}
4040
m_Sun: {fileID: 0}
41-
m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1}
4241
m_UseRadianceAmbientProbe: 0
4342
--- !u!157 &3
4443
LightmapSettings:
4544
m_ObjectHideFlags: 0
46-
serializedVersion: 12
47-
m_GIWorkflowMode: 1
45+
serializedVersion: 13
46+
m_BakeOnSceneLoad: 0
4847
m_GISettings:
4948
serializedVersion: 2
5049
m_BounceScale: 1
@@ -152,7 +151,6 @@ MonoBehaviour:
152151
m_Script: {fileID: 11500000, guid: 4999acd701f3e6743b7c5518ea7aaa17, type: 3}
153152
m_Name:
154153
m_EditorClassIdentifier:
155-
mSoundSettingType: 1
156154
--- !u!82 &240725755
157155
AudioSource:
158156
m_ObjectHideFlags: 0
@@ -162,8 +160,10 @@ AudioSource:
162160
m_GameObject: {fileID: 240725753}
163161
m_Enabled: 1
164162
serializedVersion: 4
165-
OutputAudioMixerGroup: {fileID: 0}
163+
OutputAudioMixerGroup: {fileID: -300667356125292915, guid: 7db419a1e5067c44fb6780b4f563b20b,
164+
type: 2}
166165
m_audioClip: {fileID: 0}
166+
m_Resource: {fileID: 0}
167167
m_PlayOnAwake: 1
168168
m_Volume: 1
169169
m_Pitch: 1
@@ -268,13 +268,13 @@ Transform:
268268
m_PrefabInstance: {fileID: 0}
269269
m_PrefabAsset: {fileID: 0}
270270
m_GameObject: {fileID: 240725753}
271+
serializedVersion: 2
271272
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
272273
m_LocalPosition: {x: 0, y: 0, z: 0}
273274
m_LocalScale: {x: 1, y: 1, z: 1}
274275
m_ConstrainProportionsScale: 0
275276
m_Children: []
276277
m_Father: {fileID: 0}
277-
m_RootOrder: 9
278278
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
279279
--- !u!1001 &284713936
280280
PrefabInstance:
@@ -372,7 +372,6 @@ RectTransform:
372372
m_Children:
373373
- {fileID: 1464663859}
374374
m_Father: {fileID: 1064198703}
375-
m_RootOrder: 0
376375
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
377376
m_AnchorMin: {x: 0.5, y: 0.5}
378377
m_AnchorMax: {x: 0.5, y: 0.5}
@@ -474,7 +473,7 @@ MonoBehaviour:
474473
m_Name:
475474
m_EditorClassIdentifier:
476475
mDialogueSelection: -1
477-
mButtonText: {fileID: 0}
476+
mItText: {fileID: 0}
478477
mButtonSelection: {fileID: 0}
479478
mAutoListener: 1
480479
mDialogueIndex: -1
@@ -486,6 +485,7 @@ MonoBehaviour:
486485
mReloadScene: 0
487486
mScreenColor: {r: 0, g: 0, b: 0, a: 1}
488487
mKeppBGM: 0
488+
mMode: 0
489489
--- !u!114 &486325587
490490
MonoBehaviour:
491491
m_ObjectHideFlags: 0
@@ -499,6 +499,8 @@ MonoBehaviour:
499499
m_Name:
500500
m_EditorClassIdentifier:
501501
mObjectType: 1
502+
mMakeUnique: 0
503+
mColorProps: []
502504
mEffect: 0
503505
mPanelRoot: {fileID: 0}
504506
mEventTrigger: {fileID: 0}
@@ -507,7 +509,7 @@ MonoBehaviour:
507509
mScaleZ: 1
508510
mScaleValue: {x: 0.2, y: 0.2, z: 0.2}
509511
mScaleFriction: {x: 0.2, y: 0.2, z: 0.2}
510-
mDeltaTimeType: 0
512+
mTimeType: 0
511513
mAutoAddEvent: 1
512514
mActiveEventTriggerType: 0
513515
mDeactiveEventTriggerType: 1
@@ -591,7 +593,6 @@ MonoBehaviour:
591593
m_Script: {fileID: 11500000, guid: fbfbfab4c3b19c642ac2df0576c95e0f, type: 3}
592594
m_Name:
593595
m_EditorClassIdentifier:
594-
mSoundSettingType: 0
595596
--- !u!82 &486325591
596597
AudioSource:
597598
m_ObjectHideFlags: 0
@@ -603,6 +604,7 @@ AudioSource:
603604
serializedVersion: 4
604605
OutputAudioMixerGroup: {fileID: 0}
605606
m_audioClip: {fileID: 0}
607+
m_Resource: {fileID: 0}
606608
m_PlayOnAwake: 1
607609
m_Volume: 1
608610
m_Pitch: 1
@@ -771,7 +773,6 @@ RectTransform:
771773
m_Children:
772774
- {fileID: 1064198703}
773775
m_Father: {fileID: 0}
774-
m_RootOrder: 4
775776
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
776777
m_AnchorMin: {x: 0, y: 0}
777778
m_AnchorMax: {x: 0, y: 0}
@@ -854,7 +855,6 @@ RectTransform:
854855
m_Children:
855856
- {fileID: 486325582}
856857
m_Father: {fileID: 953878243}
857-
m_RootOrder: 0
858858
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
859859
m_AnchorMin: {x: 0.5, y: 0.5}
860860
m_AnchorMax: {x: 0.5, y: 0.5}
@@ -1003,7 +1003,6 @@ RectTransform:
10031003
m_ConstrainProportionsScale: 0
10041004
m_Children: []
10051005
m_Father: {fileID: 486325582}
1006-
m_RootOrder: 0
10071006
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
10081007
m_AnchorMin: {x: 0, y: 0}
10091008
m_AnchorMax: {x: 1, y: 1}
@@ -1131,6 +1130,9 @@ SpriteRenderer:
11311130
m_ReflectionProbeUsage: 0
11321131
m_RayTracingMode: 0
11331132
m_RayTraceProcedural: 0
1133+
m_RayTracingAccelStructBuildFlagsOverride: 0
1134+
m_RayTracingAccelStructBuildFlags: 1
1135+
m_SmallMeshCulling: 1
11341136
m_RenderingLayerMask: 4294967295
11351137
m_RendererPriority: 0
11361138
m_Materials:
@@ -1173,13 +1175,13 @@ Transform:
11731175
m_PrefabInstance: {fileID: 0}
11741176
m_PrefabAsset: {fileID: 0}
11751177
m_GameObject: {fileID: 1681174887}
1178+
serializedVersion: 2
11761179
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
11771180
m_LocalPosition: {x: 0, y: -2.6, z: 0}
11781181
m_LocalScale: {x: 1, y: 1, z: 1}
11791182
m_ConstrainProportionsScale: 0
11801183
m_Children: []
11811184
m_Father: {fileID: 0}
1182-
m_RootOrder: 6
11831185
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
11841186
--- !u!1001 &1771921099
11851187
PrefabInstance:
@@ -1258,9 +1260,21 @@ MonoBehaviour:
12581260
m_Script: {fileID: 11500000, guid: 2d3ead9775289064eaae6c9fb96c82b3, type: 3}
12591261
m_Name:
12601262
m_EditorClassIdentifier:
1263+
mTest: 0
1264+
mKeyShow: 97
1265+
mKeyHide: 115
1266+
mCanvas: {fileID: 0}
1267+
mCanvasGroup: {fileID: 0}
1268+
mFadeAlpa: 0
1269+
mFading: 0
12611270
mResizeUI: {fileID: 0}
12621271
mDisplayOnAwake: 1
12631272
mMainCanvas: 1
1273+
mFade: 0
1274+
mFadeFriction: 0.15
1275+
mFadeInAmount: 1
1276+
mFadeOutAmount: 0
1277+
mTimeType: 7
12641278
mActiveSound: {fileID: 0}
12651279
mDeactiveSound: {fileID: 0}
12661280
--- !u!114 &2098421392
@@ -1326,3 +1340,17 @@ Canvas:
13261340
m_SortingLayerID: 0
13271341
m_SortingOrder: 25
13281342
m_TargetDisplay: 0
1343+
--- !u!1660057539 &9223372036854775807
1344+
SceneRoots:
1345+
m_ObjectHideFlags: 0
1346+
m_Roots:
1347+
- {fileID: 284713936}
1348+
- {fileID: 1070657508}
1349+
- {fileID: 1771921099}
1350+
- {fileID: 964172948}
1351+
- {fileID: 953878243}
1352+
- {fileID: 903062035}
1353+
- {fileID: 1681174889}
1354+
- {fileID: 1521378240}
1355+
- {fileID: 1385090196}
1356+
- {fileID: 240725757}

0 commit comments

Comments
 (0)