diff --git a/Assets/Prefabs/以撒鬼魂.prefab b/Assets/Prefabs/以撒鬼魂.prefab index e8cb1b1..ed98685 100644 --- a/Assets/Prefabs/以撒鬼魂.prefab +++ b/Assets/Prefabs/以撒鬼魂.prefab @@ -73,9 +73,9 @@ SpriteRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: -698741025 - m_SortingLayer: 5 - m_SortingOrder: 1 + m_SortingLayerID: 1083748285 + m_SortingLayer: 6 + m_SortingOrder: 35 m_Sprite: {fileID: 21300000, guid: d9ed30d94066cf34ca7cb7ec62d24d71, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -234,10 +234,18 @@ PrefabInstance: propertyPath: m_Name value: Particle System (1) objectReference: {fileID: 0} + - target: {fileID: 5431090150666507387, guid: e74f9657f12d29d46a05890e05252a46, type: 3} + propertyPath: m_SortingLayer + value: 6 + objectReference: {fileID: 0} - target: {fileID: 5431090150666507387, guid: e74f9657f12d29d46a05890e05252a46, type: 3} propertyPath: m_SortingOrder value: 1 objectReference: {fileID: 0} + - target: {fileID: 5431090150666507387, guid: e74f9657f12d29d46a05890e05252a46, type: 3} + propertyPath: m_SortingLayerID + value: 1083748285 + objectReference: {fileID: 0} - target: {fileID: 5431090150666507387, guid: e74f9657f12d29d46a05890e05252a46, type: 3} propertyPath: m_Materials.Array.data[0] value: diff --git a/Assets/Prefabs/伊斯兰.prefab b/Assets/Prefabs/伊斯兰.prefab index ff6be27..15f72ea 100644 --- a/Assets/Prefabs/伊斯兰.prefab +++ b/Assets/Prefabs/伊斯兰.prefab @@ -154,7 +154,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: HP: 1 - ATK: 1 + ATK: 2 speed: 3 coin: 5 canBeHit: 1 diff --git a/Assets/Scenes/DiZangStageTest.unity b/Assets/Scenes/DiZangStageTest.unity index f833b0c..49266e5 100644 --- a/Assets/Scenes/DiZangStageTest.unity +++ b/Assets/Scenes/DiZangStageTest.unity @@ -166,7 +166,7 @@ AudioSource: OutputAudioMixerGroup: {fileID: 0} m_audioClip: {fileID: 8300000, guid: 770fdb0236d813944958fbbbc6d18e1e, type: 3} m_PlayOnAwake: 0 - m_Volume: 0.492 + m_Volume: 1 m_Pitch: 1 Loop: 0 Mute: 0 @@ -6181,6 +6181,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: endEvent: {fileID: 0} + BGM: {fileID: 8300000, guid: aa8e7ce212840ab4e9b806d8b52a5fdc, type: 3} --- !u!1 &403283579 GameObject: m_ObjectHideFlags: 0 @@ -6422,7 +6423,7 @@ AudioSource: OutputAudioMixerGroup: {fileID: 0} m_audioClip: {fileID: 8300000, guid: 7c28c6023338cfb4f86cb1c96c52451c, type: 3} m_PlayOnAwake: 0 - m_Volume: 0.545 + m_Volume: 1 m_Pitch: 1 Loop: 0 Mute: 0 @@ -6919,8 +6920,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 8c493a8db27ca574e950823c5b628f65, type: 3} m_Name: m_EditorClassIdentifier: - HP: 2 - ATK: 3 + HP: 4 + ATK: 2 speed: 0 coin: 10 canBeHit: 1 @@ -7150,7 +7151,7 @@ AudioSource: OutputAudioMixerGroup: {fileID: 0} m_audioClip: {fileID: 8300000, guid: a67eb82a67969214baa2b4ba065bdac4, type: 3} m_PlayOnAwake: 0 - m_Volume: 0.545 + m_Volume: 1 m_Pitch: 1 Loop: 0 Mute: 0 @@ -7480,7 +7481,7 @@ AudioSource: OutputAudioMixerGroup: {fileID: 0} m_audioClip: {fileID: 8300000, guid: 9508f22f9935c174fbb5fe01fd4b1086, type: 3} m_PlayOnAwake: 0 - m_Volume: 0.545 + m_Volume: 1 m_Pitch: 1 Loop: 0 Mute: 0 @@ -8225,7 +8226,7 @@ MonoBehaviour: m_ActionName: Normal/Interactive1[/XInputControllerWindows/buttonNorth,/Keyboard/f] m_NeverAutoSwitchControlSchemes: 0 m_DefaultControlScheme: Play - m_DefaultActionMap: Normal + m_DefaultActionMap: 5167283d-f146-4538-9eb5-86f686e115be m_SplitScreenIndex: -1 m_Camera: {fileID: 0} --- !u!114 &761593105 @@ -9530,6 +9531,148 @@ Transform: m_CorrespondingSourceObject: {fileID: 6335753601452093235, guid: 52ba7b211c8870b4583cd08cee4e6d6d, type: 3} m_PrefabInstance: {fileID: 1418583855} m_PrefabAsset: {fileID: 0} +--- !u!1 &1159640990 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1159640993} + - component: {fileID: 1159640992} + - component: {fileID: 1159640991} + m_Layer: 0 + m_Name: BGMPlayer + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!82 &1159640991 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1159640990} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 0} + m_PlayOnAwake: 1 + m_Volume: 1 + m_Pitch: 1 + Loop: 1 + Mute: 0 + Spatialize: 0 + SpatializePostEffects: 0 + Priority: 128 + DopplerLevel: 1 + MinDistance: 1 + MaxDistance: 500 + Pan2D: 0 + rolloffMode: 0 + BypassEffects: 0 + BypassListenerEffects: 0 + BypassReverbZones: 0 + rolloffCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + panLevelCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + spreadCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 +--- !u!114 &1159640992 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1159640990} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6e74793365791d7449b53d066e2155a7, type: 3} + m_Name: + m_EditorClassIdentifier: + fadeSpeed: 100 + newBGM: {fileID: 0} +--- !u!4 &1159640993 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1159640990} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -18.089996, y: 0.32000732, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 30 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1170153510 GameObject: m_ObjectHideFlags: 0 @@ -9738,7 +9881,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1226109627} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0.034153223, y: -1.6231706, z: -10} + m_LocalPosition: {x: 0.03464675, y: -1.6231626, z: -10} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 2009770128} @@ -9997,7 +10140,7 @@ AudioSource: OutputAudioMixerGroup: {fileID: 0} m_audioClip: {fileID: 8300000, guid: 1f9f156b04fd5364a8a947cf3528a731, type: 3} m_PlayOnAwake: 0 - m_Volume: 0.545 + m_Volume: 1 m_Pitch: 1 Loop: 0 Mute: 0 @@ -10933,7 +11076,7 @@ AudioSource: OutputAudioMixerGroup: {fileID: 0} m_audioClip: {fileID: 8300000, guid: 1c69a17287b7bca429a55e27947cc825, type: 3} m_PlayOnAwake: 0 - m_Volume: 0.545 + m_Volume: 1 m_Pitch: 1 Loop: 0 Mute: 0 @@ -11181,7 +11324,7 @@ AudioSource: OutputAudioMixerGroup: {fileID: 0} m_audioClip: {fileID: 8300000, guid: f7eefe2f27593cf499bc5e850ef03a61, type: 3} m_PlayOnAwake: 0 - m_Volume: 0.545 + m_Volume: 1 m_Pitch: 1 Loop: 0 Mute: 0 @@ -12712,7 +12855,7 @@ AudioSource: OutputAudioMixerGroup: {fileID: 0} m_audioClip: {fileID: 8300000, guid: e55a83281c267844fac30885cf99bced, type: 3} m_PlayOnAwake: 0 - m_Volume: 0.545 + m_Volume: 1 m_Pitch: 1 Loop: 1 Mute: 0 @@ -17885,7 +18028,7 @@ AudioSource: OutputAudioMixerGroup: {fileID: 0} m_audioClip: {fileID: 8300000, guid: 022a055c4386bdd4db98be9490bec2a7, type: 3} m_PlayOnAwake: 0 - m_Volume: 0.545 + m_Volume: 1 m_Pitch: 1 Loop: 0 Mute: 0 diff --git a/Assets/Scenes/Fo.unity b/Assets/Scenes/Fo.unity index fd3c26e..aae8b9a 100644 --- a/Assets/Scenes/Fo.unity +++ b/Assets/Scenes/Fo.unity @@ -805,7 +805,7 @@ AudioSource: OutputAudioMixerGroup: {fileID: 0} m_audioClip: {fileID: 8300000, guid: 770fdb0236d813944958fbbbc6d18e1e, type: 3} m_PlayOnAwake: 0 - m_Volume: 0.492 + m_Volume: 1 m_Pitch: 1 Loop: 0 Mute: 0 @@ -2689,7 +2689,7 @@ AudioSource: OutputAudioMixerGroup: {fileID: 0} m_audioClip: {fileID: 8300000, guid: e55a83281c267844fac30885cf99bced, type: 3} m_PlayOnAwake: 0 - m_Volume: 0.545 + m_Volume: 1 m_Pitch: 1 Loop: 1 Mute: 0 @@ -2816,7 +2816,7 @@ AudioSource: OutputAudioMixerGroup: {fileID: 0} m_audioClip: {fileID: 8300000, guid: a67eb82a67969214baa2b4ba065bdac4, type: 3} m_PlayOnAwake: 0 - m_Volume: 0.545 + m_Volume: 1 m_Pitch: 1 Loop: 0 Mute: 0 @@ -3599,6 +3599,148 @@ MonoBehaviour: portraitsFace: 1 setSayDialog: {fileID: 1590318705} description: +--- !u!1 &634250309 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 634250312} + - component: {fileID: 634250311} + - component: {fileID: 634250310} + m_Layer: 0 + m_Name: BGMPlayer + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!82 &634250310 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 634250309} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 0} + m_PlayOnAwake: 1 + m_Volume: 1 + m_Pitch: 1 + Loop: 1 + Mute: 0 + Spatialize: 0 + SpatializePostEffects: 0 + Priority: 128 + DopplerLevel: 1 + MinDistance: 1 + MaxDistance: 500 + Pan2D: 0 + rolloffMode: 0 + BypassEffects: 0 + BypassListenerEffects: 0 + BypassReverbZones: 0 + rolloffCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + panLevelCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + spreadCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 +--- !u!114 &634250311 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 634250309} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6e74793365791d7449b53d066e2155a7, type: 3} + m_Name: + m_EditorClassIdentifier: + fadeSpeed: 100 + newBGM: {fileID: 0} +--- !u!4 &634250312 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 634250309} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -18.089996, y: 0.32000732, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 26 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &639642329 GameObject: m_ObjectHideFlags: 0 @@ -4531,6 +4673,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: endEvent: {fileID: 0} + BGM: {fileID: 8300000, guid: 42e76058ed53aa940aaa0c6b8bf1cfce, type: 3} --- !u!1 &825292355 GameObject: m_ObjectHideFlags: 0 @@ -5183,7 +5326,7 @@ AudioSource: OutputAudioMixerGroup: {fileID: 0} m_audioClip: {fileID: 8300000, guid: 1c69a17287b7bca429a55e27947cc825, type: 3} m_PlayOnAwake: 0 - m_Volume: 0.545 + m_Volume: 1 m_Pitch: 1 Loop: 0 Mute: 0 @@ -12186,7 +12329,7 @@ AudioSource: OutputAudioMixerGroup: {fileID: 0} m_audioClip: {fileID: 8300000, guid: 7c28c6023338cfb4f86cb1c96c52451c, type: 3} m_PlayOnAwake: 0 - m_Volume: 0.545 + m_Volume: 1 m_Pitch: 1 Loop: 0 Mute: 0 @@ -12446,7 +12589,7 @@ AudioSource: OutputAudioMixerGroup: {fileID: 0} m_audioClip: {fileID: 8300000, guid: 022a055c4386bdd4db98be9490bec2a7, type: 3} m_PlayOnAwake: 0 - m_Volume: 0.545 + m_Volume: 1 m_Pitch: 1 Loop: 0 Mute: 0 @@ -13944,8 +14087,8 @@ GameObject: m_Component: - component: {fileID: 1801512729} - component: {fileID: 1801512728} - - component: {fileID: 1801512727} - component: {fileID: 1801512726} + - component: {fileID: 1801512727} m_Layer: 0 m_Name: EventSystem m_TagString: Untagged @@ -13975,16 +14118,24 @@ MonoBehaviour: m_GameObject: {fileID: 1801512725} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3} + m_Script: {fileID: 11500000, guid: 01614664b831546d2ae94a42149d80ac, type: 3} m_Name: m_EditorClassIdentifier: - m_HorizontalAxis: Horizontal - m_VerticalAxis: Vertical - m_SubmitButton: Submit - m_CancelButton: Cancel - m_InputActionsPerSecond: 10 - m_RepeatDelay: 0.5 - m_ForceModuleActive: 0 + m_MoveRepeatDelay: 0.5 + m_MoveRepeatRate: 0.1 + m_ActionsAsset: {fileID: 0} + m_PointAction: {fileID: 1054132383583890850, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_MoveAction: {fileID: 3710738434707379630, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_SubmitAction: {fileID: 2064916234097673511, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_CancelAction: {fileID: 0} + m_LeftClickAction: {fileID: 8056856818456041789, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_MiddleClickAction: {fileID: 3279352641294131588, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_RightClickAction: {fileID: 3837173908680883260, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_ScrollWheelAction: {fileID: 4502412055082496612, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_TrackedDevicePositionAction: {fileID: 4754684134866288074, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_TrackedDeviceOrientationAction: {fileID: 1025543830046995696, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_DeselectOnBackgroundClick: 1 + m_PointerBehavior: 0 --- !u!114 &1801512728 MonoBehaviour: m_ObjectHideFlags: 0 @@ -14242,7 +14393,7 @@ MonoBehaviour: m_ActionName: Normal/Interactive1[/XInputControllerWindows/buttonNorth,/Keyboard/f] m_NeverAutoSwitchControlSchemes: 0 m_DefaultControlScheme: Play - m_DefaultActionMap: Normal + m_DefaultActionMap: NullMap m_SplitScreenIndex: -1 m_Camera: {fileID: 0} --- !u!114 &1831977490 @@ -14269,7 +14420,7 @@ MonoBehaviour: catching: {fileID: 0} specialMoneyCount: 0 isAnnoying: 0 - creatBoardUI: {fileID: 0} + creatBoardUI: {fileID: 1743699421} attackParticleSystem: {fileID: 935199052} jumpAudio: {fileID: 56950065} attackHammerAudio: {fileID: 903724192} @@ -14633,7 +14784,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1945543621} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -13.583952, y: -1.1842451, z: -10} + m_LocalPosition: {x: -13.58521, y: -1.1842628, z: -10} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1968056610} diff --git a/Assets/Scenes/Ji.unity b/Assets/Scenes/Ji.unity index 3e164a8..4c31e35 100644 --- a/Assets/Scenes/Ji.unity +++ b/Assets/Scenes/Ji.unity @@ -6011,7 +6011,7 @@ AudioSource: OutputAudioMixerGroup: {fileID: 0} m_audioClip: {fileID: 8300000, guid: 022a055c4386bdd4db98be9490bec2a7, type: 3} m_PlayOnAwake: 0 - m_Volume: 0.545 + m_Volume: 1 m_Pitch: 1 Loop: 0 Mute: 0 @@ -6220,6 +6220,148 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &399223082 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 399223085} + - component: {fileID: 399223084} + - component: {fileID: 399223083} + m_Layer: 0 + m_Name: BGMPlayer + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!82 &399223083 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 399223082} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 0} + m_PlayOnAwake: 1 + m_Volume: 1 + m_Pitch: 1 + Loop: 1 + Mute: 0 + Spatialize: 0 + SpatializePostEffects: 0 + Priority: 128 + DopplerLevel: 1 + MinDistance: 1 + MaxDistance: 500 + Pan2D: 0 + rolloffMode: 0 + BypassEffects: 0 + BypassListenerEffects: 0 + BypassReverbZones: 0 + rolloffCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + panLevelCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + spreadCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 +--- !u!114 &399223084 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 399223082} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6e74793365791d7449b53d066e2155a7, type: 3} + m_Name: + m_EditorClassIdentifier: + fadeSpeed: 1 + newBGM: {fileID: 0} +--- !u!4 &399223085 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 399223082} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -18.089996, y: 0.32000732, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 24 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &415245919 GameObject: m_ObjectHideFlags: 0 @@ -6263,7 +6405,7 @@ AudioSource: OutputAudioMixerGroup: {fileID: 0} m_audioClip: {fileID: 8300000, guid: a67eb82a67969214baa2b4ba065bdac4, type: 3} m_PlayOnAwake: 0 - m_Volume: 0.545 + m_Volume: 1 m_Pitch: 1 Loop: 0 Mute: 0 @@ -6401,6 +6543,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: endEvent: {fileID: 0} + BGM: {fileID: 8300000, guid: 2093d88d667ea954ba0c376c30c743aa, type: 3} --- !u!1 &443390969 GameObject: m_ObjectHideFlags: 0 @@ -6444,7 +6587,7 @@ AudioSource: OutputAudioMixerGroup: {fileID: 0} m_audioClip: {fileID: 8300000, guid: 770fdb0236d813944958fbbbc6d18e1e, type: 3} m_PlayOnAwake: 0 - m_Volume: 0.492 + m_Volume: 1 m_Pitch: 1 Loop: 0 Mute: 0 @@ -7992,7 +8135,7 @@ AudioSource: OutputAudioMixerGroup: {fileID: 0} m_audioClip: {fileID: 8300000, guid: 7c28c6023338cfb4f86cb1c96c52451c, type: 3} m_PlayOnAwake: 0 - m_Volume: 0.545 + m_Volume: 1 m_Pitch: 1 Loop: 0 Mute: 0 @@ -9496,7 +9639,7 @@ AudioSource: OutputAudioMixerGroup: {fileID: 0} m_audioClip: {fileID: 8300000, guid: e55a83281c267844fac30885cf99bced, type: 3} m_PlayOnAwake: 0 - m_Volume: 0.545 + m_Volume: 1 m_Pitch: 1 Loop: 1 Mute: 0 @@ -10390,9 +10533,9 @@ SpriteRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: -1 + m_SortingLayerID: 347362827 + m_SortingLayer: 3 + m_SortingOrder: 2 m_Sprite: {fileID: 21300000, guid: c7a11cbfecc8f9149845f2add9dcd85d, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -12315,7 +12458,7 @@ AudioSource: OutputAudioMixerGroup: {fileID: 0} m_audioClip: {fileID: 8300000, guid: 1c69a17287b7bca429a55e27947cc825, type: 3} m_PlayOnAwake: 0 - m_Volume: 0.545 + m_Volume: 1 m_Pitch: 1 Loop: 0 Mute: 0 @@ -13935,7 +14078,7 @@ MonoBehaviour: catching: {fileID: 0} specialMoneyCount: 0 isAnnoying: 0 - creatBoardUI: {fileID: 0} + creatBoardUI: {fileID: 146800596} attackParticleSystem: {fileID: 127489380} jumpAudio: {fileID: 443390971} attackHammerAudio: {fileID: 1658910332} @@ -14085,7 +14228,7 @@ MonoBehaviour: m_ActionName: Normal/Interactive1[/XInputControllerWindows/buttonNorth,/XInputControllerWindows/buttonNorth,/Keyboard/f] m_NeverAutoSwitchControlSchemes: 0 m_DefaultControlScheme: Play - m_DefaultActionMap: Normal + m_DefaultActionMap: NullMap m_SplitScreenIndex: -1 m_Camera: {fileID: 0} --- !u!50 &1880957044 @@ -14172,8 +14315,8 @@ SpriteRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 + m_SortingLayerID: -1433729465 + m_SortingLayer: 4 m_SortingOrder: 1 m_Sprite: {fileID: 21300000, guid: bcb018ee6b241104bb739e08529e965b, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} @@ -14747,7 +14890,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1956046895} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -0.4935856, y: -7.3103333, z: -10} + m_LocalPosition: {x: -0.4946699, y: -7.3103647, z: -10} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 417846922} diff --git a/Assets/Scenes/Opening.unity b/Assets/Scenes/Opening.unity index d49ec55..134f606 100644 --- a/Assets/Scenes/Opening.unity +++ b/Assets/Scenes/Opening.unity @@ -347,7 +347,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.5} + m_AnchoredPosition: {x: 0, y: -0.5000019} m_SizeDelta: {x: -20, y: -13} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &440164962 @@ -429,8 +429,8 @@ RectTransform: 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: 194.44, y: 72.9} + m_AnchoredPosition: {x: 25.7, y: -5} + m_SizeDelta: {x: 231.43, y: 35.8} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &620812719 MonoBehaviour: @@ -453,11 +453,11 @@ MonoBehaviour: m_SelectOnRight: {fileID: 0} m_Transition: 1 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_NormalColor: {r: 1, g: 1, b: 1, a: 0} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 0} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 0} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0} m_ColorMultiplier: 1 m_FadeDuration: 0.1 m_SpriteState: @@ -517,7 +517,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 10911, guid: 0000000000000000f000000000000000, type: 0} + m_Sprite: {fileID: 0} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -745,7 +745,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.5} + m_AnchoredPosition: {x: 0, y: -0.5000019} m_SizeDelta: {x: -20, y: -13} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &976145645 @@ -769,11 +769,11 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 14 + m_Font: {fileID: 12800000, guid: cc91cc9e78d459f4a8636a95fb21e279, type: 3} + m_FontSize: 16 m_FontStyle: 0 m_BestFit: 0 - m_MinSize: 10 + m_MinSize: 1 m_MaxSize: 40 m_Alignment: 0 m_AlignByGeometry: 0 @@ -880,6 +880,88 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1033401680} m_CullTransparentMesh: 1 +--- !u!1 &1272332540 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1272332542} + - component: {fileID: 1272332541} + m_Layer: 0 + m_Name: "\u5C01\u9762" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!212 &1272332541 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1272332540} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 21300000, guid: b66b5fd670173d748a5ea52108f3141e, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 12.44, y: 7.08} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!4 &1272332542 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1272332540} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1.4265, y: 1.4265, z: 1.4265} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 6 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1370133276 GameObject: m_ObjectHideFlags: 0 @@ -1113,3 +1195,75 @@ MonoBehaviour: m_RequiresDepthTexture: 0 m_RequiresColorTexture: 0 m_Version: 2 +--- !u!1 &2014781626 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2014781628} + - component: {fileID: 2014781627} + m_Layer: 0 + m_Name: Freeform Light 2D + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &2014781627 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2014781626} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 073797afb82c5a1438f328866b10b3f0, type: 3} + m_Name: + m_EditorClassIdentifier: + m_LightType: 1 + m_BlendStyleIndex: 0 + m_FalloffIntensity: 0 + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Intensity: 1 + m_LightVolumeOpacity: 0 + m_ApplyToSortingLayers: 00000000 + m_LightCookieSprite: {fileID: 0} + m_UseNormalMap: 0 + m_LightOrder: 0 + m_AlphaBlendOnOverlap: 0 + m_ShadowIntensity: 0 + m_ShadowVolumeIntensity: 0 + m_PointLightInnerAngle: 360 + m_PointLightOuterAngle: 360 + m_PointLightInnerRadius: 0 + m_PointLightOuterRadius: 1 + m_PointLightDistance: 3 + m_PointLightQuality: 1 + m_ShapeLightParametricSides: 5 + m_ShapeLightParametricAngleOffset: 0 + m_ShapeLightParametricRadius: 1 + m_ShapeLightFalloffSize: 150 + m_ShapeLightFalloffOffset: {x: 0, y: 0} + m_ShapePath: + - {x: -0.5, y: -0.5, z: 0} + - {x: 0.5, y: -0.5, z: 0} + - {x: 0.5, y: 0.5, z: 0} + - {x: -0.5, y: 0.5, z: 0} +--- !u!4 &2014781628 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2014781626} + 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_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 7 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/Scenes/TeLuoYiStageTest.unity b/Assets/Scenes/TeLuoYiStageTest.unity index cd55f52..5f465a4 100644 --- a/Assets/Scenes/TeLuoYiStageTest.unity +++ b/Assets/Scenes/TeLuoYiStageTest.unity @@ -6080,7 +6080,7 @@ MonoBehaviour: m_ActionName: Normal/Interactive1[/XInputControllerWindows/buttonNorth,/Keyboard/f] m_NeverAutoSwitchControlSchemes: 0 m_DefaultControlScheme: Play - m_DefaultActionMap: Normal + m_DefaultActionMap: 5167283d-f146-4538-9eb5-86f686e115be m_SplitScreenIndex: -1 m_Camera: {fileID: 0} --- !u!114 &482671854 @@ -6674,6 +6674,148 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &640742346 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 640742349} + - component: {fileID: 640742348} + - component: {fileID: 640742347} + m_Layer: 0 + m_Name: BGMPlayer + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!82 &640742347 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 640742346} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 0} + m_PlayOnAwake: 1 + m_Volume: 0.4 + m_Pitch: 1 + Loop: 1 + Mute: 0 + Spatialize: 0 + SpatializePostEffects: 0 + Priority: 128 + DopplerLevel: 1 + MinDistance: 1 + MaxDistance: 500 + Pan2D: 0 + rolloffMode: 0 + BypassEffects: 0 + BypassListenerEffects: 0 + BypassReverbZones: 0 + rolloffCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + panLevelCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + spreadCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 +--- !u!114 &640742348 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 640742346} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6e74793365791d7449b53d066e2155a7, type: 3} + m_Name: + m_EditorClassIdentifier: + fadeSpeed: 1 + newBGM: {fileID: 0} +--- !u!4 &640742349 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 640742346} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -18.089996, y: 0.32000732, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 16 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &680373051 GameObject: m_ObjectHideFlags: 0 @@ -7025,7 +7167,7 @@ AudioSource: OutputAudioMixerGroup: {fileID: 0} m_audioClip: {fileID: 8300000, guid: 770fdb0236d813944958fbbbc6d18e1e, type: 3} m_PlayOnAwake: 0 - m_Volume: 0.492 + m_Volume: 1 m_Pitch: 1 Loop: 0 Mute: 0 @@ -7809,7 +7951,7 @@ AudioSource: OutputAudioMixerGroup: {fileID: 0} m_audioClip: {fileID: 8300000, guid: ceba0abcabde9ad49876e888c20fa69b, type: 3} m_PlayOnAwake: 0 - m_Volume: 0.545 + m_Volume: 1 m_Pitch: 1 Loop: 0 Mute: 0 @@ -7974,7 +8116,7 @@ AudioSource: OutputAudioMixerGroup: {fileID: 0} m_audioClip: {fileID: 8300000, guid: a67eb82a67969214baa2b4ba065bdac4, type: 3} m_PlayOnAwake: 0 - m_Volume: 0.545 + m_Volume: 1 m_Pitch: 1 Loop: 0 Mute: 0 @@ -8791,8 +8933,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 50c1de28a0b680f4dbca93d73c07277f, type: 3} m_Name: m_EditorClassIdentifier: - HP: 5 - ATK: 1 + HP: 8 + ATK: 2 speed: 1 coin: 0 canBeHit: 1 @@ -8951,7 +9093,7 @@ AudioSource: OutputAudioMixerGroup: {fileID: 0} m_audioClip: {fileID: 8300000, guid: 9c4940f6753aea0429395352711792fa, type: 3} m_PlayOnAwake: 0 - m_Volume: 0.545 + m_Volume: 1 m_Pitch: 1 Loop: 1 Mute: 0 @@ -9078,7 +9220,7 @@ AudioSource: OutputAudioMixerGroup: {fileID: 0} m_audioClip: {fileID: 8300000, guid: 022a055c4386bdd4db98be9490bec2a7, type: 3} m_PlayOnAwake: 0 - m_Volume: 0.545 + m_Volume: 1 m_Pitch: 1 Loop: 0 Mute: 0 @@ -9761,7 +9903,7 @@ AudioSource: OutputAudioMixerGroup: {fileID: 0} m_audioClip: {fileID: 8300000, guid: 7c28c6023338cfb4f86cb1c96c52451c, type: 3} m_PlayOnAwake: 0 - m_Volume: 0.545 + m_Volume: 1 m_Pitch: 1 Loop: 0 Mute: 0 @@ -10553,7 +10695,7 @@ AudioSource: OutputAudioMixerGroup: {fileID: 0} m_audioClip: {fileID: 8300000, guid: 1c69a17287b7bca429a55e27947cc825, type: 3} m_PlayOnAwake: 0 - m_Volume: 0.545 + m_Volume: 1 m_Pitch: 1 Loop: 0 Mute: 0 @@ -12182,7 +12324,7 @@ AudioSource: OutputAudioMixerGroup: {fileID: 0} m_audioClip: {fileID: 8300000, guid: e55a83281c267844fac30885cf99bced, type: 3} m_PlayOnAwake: 0 - m_Volume: 0.545 + m_Volume: 1 m_Pitch: 1 Loop: 1 Mute: 0 @@ -12392,6 +12534,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: endEvent: {fileID: 0} + BGM: {fileID: 8300000, guid: 55f28a78e6fccbf419109890801aff71, type: 3} --- !u!1 &2100268714 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/Yi.unity b/Assets/Scenes/Yi.unity index 38f3e0b..d38fdee 100644 --- a/Assets/Scenes/Yi.unity +++ b/Assets/Scenes/Yi.unity @@ -587,7 +587,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 1fb3bca347ce4c343a33c273655ebbf5, type: 3} m_Name: m_EditorClassIdentifier: - count: 6 + count: 12 yiSiLan: {fileID: 4312721376048571783, guid: fbfdd225dbb0dfe4ca6246532e0ec9cb, type: 3} callRange: 5 yiSiLanMinTime: 1 @@ -1216,7 +1216,7 @@ AudioSource: OutputAudioMixerGroup: {fileID: 0} m_audioClip: {fileID: 8300000, guid: 022a055c4386bdd4db98be9490bec2a7, type: 3} m_PlayOnAwake: 0 - m_Volume: 0.545 + m_Volume: 1 m_Pitch: 1 Loop: 0 Mute: 0 @@ -2019,7 +2019,7 @@ AudioSource: OutputAudioMixerGroup: {fileID: 0} m_audioClip: {fileID: 8300000, guid: a67eb82a67969214baa2b4ba065bdac4, type: 3} m_PlayOnAwake: 0 - m_Volume: 0.545 + m_Volume: 1 m_Pitch: 1 Loop: 0 Mute: 0 @@ -8774,7 +8774,7 @@ AudioSource: OutputAudioMixerGroup: {fileID: 0} m_audioClip: {fileID: 8300000, guid: 7c28c6023338cfb4f86cb1c96c52451c, type: 3} m_PlayOnAwake: 0 - m_Volume: 0.545 + m_Volume: 1 m_Pitch: 1 Loop: 0 Mute: 0 @@ -9868,6 +9868,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: endEvent: {fileID: 0} + BGM: {fileID: 8300000, guid: 47bdffdbe9e1e194488c5016fd7d5eea, type: 3} --- !u!1 &1156390167 GameObject: m_ObjectHideFlags: 0 @@ -10014,7 +10015,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1156390167} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -13.583952, y: -1.1842451, z: -10} + m_LocalPosition: {x: -13.58521, y: -1.1842628, z: -10} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1178553515} @@ -10865,7 +10866,7 @@ MonoBehaviour: catching: {fileID: 0} specialMoneyCount: 0 isAnnoying: 0 - creatBoardUI: {fileID: 0} + creatBoardUI: {fileID: 484260808} attackParticleSystem: {fileID: 802489789} jumpAudio: {fileID: 1722459463} attackHammerAudio: {fileID: 1919797166} @@ -10990,7 +10991,19 @@ MonoBehaviour: m_ActionId: d92eaf00-7eaf-4292-ae80-6bfff20b5930 m_ActionName: Normal/Sickle[/Keyboard/u,/XInputControllerWindows/rightTrigger] - m_PersistentCalls: - m_Calls: [] + m_Calls: + - m_Target: {fileID: 1383361093} + m_TargetAssemblyTypeName: MyPlayer, Assembly-CSharp + m_MethodName: OnInteractive + m_Mode: 0 + 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_ActionId: 7cf0a787-dc2d-42b1-9ed9-c840ccfa3ce9 m_ActionName: Normal/Interactive[/Keyboard/f] - m_PersistentCalls: @@ -11003,7 +11016,7 @@ MonoBehaviour: m_ActionName: Normal/Interactive1[/XInputControllerWindows/buttonNorth,/XInputControllerWindows/buttonNorth,/Keyboard/f] m_NeverAutoSwitchControlSchemes: 0 m_DefaultControlScheme: Play - m_DefaultActionMap: Normal + m_DefaultActionMap: NullMap m_SplitScreenIndex: -1 m_Camera: {fileID: 0} --- !u!50 &1383361096 @@ -11743,6 +11756,148 @@ MonoBehaviour: portraitsFace: 1 setSayDialog: {fileID: 432083667} description: +--- !u!1 &1553178989 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1553178992} + - component: {fileID: 1553178991} + - component: {fileID: 1553178990} + m_Layer: 0 + m_Name: BGMPlayer + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!82 &1553178990 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1553178989} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 0} + m_PlayOnAwake: 1 + m_Volume: 1 + m_Pitch: 1 + Loop: 1 + Mute: 0 + Spatialize: 0 + SpatializePostEffects: 0 + Priority: 128 + DopplerLevel: 1 + MinDistance: 1 + MaxDistance: 500 + Pan2D: 0 + rolloffMode: 0 + BypassEffects: 0 + BypassListenerEffects: 0 + BypassReverbZones: 0 + rolloffCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + panLevelCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + spreadCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 +--- !u!114 &1553178991 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1553178989} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6e74793365791d7449b53d066e2155a7, type: 3} + m_Name: + m_EditorClassIdentifier: + fadeSpeed: 1 + newBGM: {fileID: 0} +--- !u!4 &1553178992 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1553178989} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -18.089996, y: 0.32000732, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 24 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1566788936 GameObject: m_ObjectHideFlags: 0 @@ -11888,7 +12043,7 @@ AudioSource: OutputAudioMixerGroup: {fileID: 0} m_audioClip: {fileID: 8300000, guid: e55a83281c267844fac30885cf99bced, type: 3} m_PlayOnAwake: 0 - m_Volume: 0.545 + m_Volume: 1 m_Pitch: 1 Loop: 1 Mute: 0 @@ -12210,7 +12365,7 @@ AudioSource: OutputAudioMixerGroup: {fileID: 0} m_audioClip: {fileID: 8300000, guid: 770fdb0236d813944958fbbbc6d18e1e, type: 3} m_PlayOnAwake: 0 - m_Volume: 0.492 + m_Volume: 1 m_Pitch: 1 Loop: 0 Mute: 0 @@ -13294,7 +13449,7 @@ AudioSource: OutputAudioMixerGroup: {fileID: 0} m_audioClip: {fileID: 8300000, guid: 1c69a17287b7bca429a55e27947cc825, type: 3} m_PlayOnAwake: 0 - m_Volume: 0.545 + m_Volume: 1 m_Pitch: 1 Loop: 0 Mute: 0 diff --git a/Assets/Scenes/YiSaStageTest.unity b/Assets/Scenes/YiSaStageTest.unity index 7b24c05..1c3c314 100644 --- a/Assets/Scenes/YiSaStageTest.unity +++ b/Assets/Scenes/YiSaStageTest.unity @@ -170,6 +170,7 @@ MonoBehaviour: goust: {fileID: 7242342954004886428, guid: b115139c858522e4284c9609bb70fd44, type: 3} rushaudio: {fileID: 1295458176} appearaudio: {fileID: 265727025} + BGM: {fileID: 8300000, guid: 1222e51d5c852db4496ee023dbac707c, type: 3} --- !u!1 &41235991 GameObject: m_ObjectHideFlags: 0 @@ -381,7 +382,7 @@ AudioSource: OutputAudioMixerGroup: {fileID: 0} m_audioClip: {fileID: 8300000, guid: 3bff0cbd7b572254c91f6f44fc7a5625, type: 3} m_PlayOnAwake: 0 - m_Volume: 0.545 + m_Volume: 1 m_Pitch: 1 Loop: 0 Mute: 0 @@ -583,7 +584,7 @@ AudioSource: OutputAudioMixerGroup: {fileID: 0} m_audioClip: {fileID: 8300000, guid: 497ec1bf2e20af64caf5a3df93b801f4, type: 3} m_PlayOnAwake: 0 - m_Volume: 0.545 + m_Volume: 1 m_Pitch: 1 Loop: 0 Mute: 0 @@ -710,7 +711,7 @@ AudioSource: OutputAudioMixerGroup: {fileID: 0} m_audioClip: {fileID: 8300000, guid: f7eefe2f27593cf499bc5e850ef03a61, type: 3} m_PlayOnAwake: 0 - m_Volume: 0.545 + m_Volume: 1 m_Pitch: 1 Loop: 0 Mute: 0 @@ -5925,7 +5926,7 @@ AudioSource: OutputAudioMixerGroup: {fileID: 0} m_audioClip: {fileID: 8300000, guid: 2fdc6ee36007da24e8e84935c5f79ee5, type: 3} m_PlayOnAwake: 0 - m_Volume: 0.545 + m_Volume: 1 m_Pitch: 1 Loop: 0 Mute: 0 @@ -6940,7 +6941,7 @@ AudioSource: OutputAudioMixerGroup: {fileID: 0} m_audioClip: {fileID: 8300000, guid: a67eb82a67969214baa2b4ba065bdac4, type: 3} m_PlayOnAwake: 0 - m_Volume: 0.545 + m_Volume: 1 m_Pitch: 1 Loop: 0 Mute: 0 @@ -7067,7 +7068,7 @@ AudioSource: OutputAudioMixerGroup: {fileID: 0} m_audioClip: {fileID: 8300000, guid: 19132984ef5d3c24c8648fbe84731490, type: 3} m_PlayOnAwake: 0 - m_Volume: 0.545 + m_Volume: 1 m_Pitch: 1 Loop: 0 Mute: 0 @@ -7999,9 +8000,9 @@ SpriteRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: -2 + m_SortingLayerID: 347362827 + m_SortingLayer: 3 + m_SortingOrder: 1 m_Sprite: {fileID: 21300000, guid: e8adba42a6cfb3e46820742b142996cc, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -8177,7 +8178,7 @@ AudioSource: OutputAudioMixerGroup: {fileID: 0} m_audioClip: {fileID: 8300000, guid: 022a055c4386bdd4db98be9490bec2a7, type: 3} m_PlayOnAwake: 0 - m_Volume: 0.545 + m_Volume: 1 m_Pitch: 1 Loop: 0 Mute: 0 @@ -8289,7 +8290,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1136588712} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0.9, y: 6.75, z: -1.9886683} + m_LocalPosition: {x: 17.79, y: 6.75, z: -1.9886683} m_LocalScale: {x: 0.8654462, y: 0.50537, z: 0.50537} m_Children: [] m_Father: {fileID: 653916553} @@ -8386,7 +8387,7 @@ BoxCollider2D: adaptiveTiling: 0 m_AutoTiling: 0 serializedVersion: 2 - m_Size: {x: 1, y: 1} + m_Size: {x: 1, y: 87.51} m_EdgeRadius: 0 --- !u!114 &1136588717 MonoBehaviour: @@ -8561,8 +8562,8 @@ SpriteRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 + m_SortingLayerID: 347362827 + m_SortingLayer: 3 m_SortingOrder: 0 m_Sprite: {fileID: 21300000, guid: c7a11cbfecc8f9149845f2add9dcd85d, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} @@ -8707,8 +8708,8 @@ SpriteRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 + m_SortingLayerID: 347362827 + m_SortingLayer: 3 m_SortingOrder: 0 m_Sprite: {fileID: 21300000, guid: c7a11cbfecc8f9149845f2add9dcd85d, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} @@ -9172,7 +9173,7 @@ AudioSource: OutputAudioMixerGroup: {fileID: 0} m_audioClip: {fileID: 8300000, guid: bc7e57ed16083f64da41d9bec53c40ef, type: 3} m_PlayOnAwake: 0 - m_Volume: 0.545 + m_Volume: 1 m_Pitch: 1 Loop: 0 Mute: 0 @@ -9579,9 +9580,9 @@ SpriteRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: -2 + m_SortingLayerID: 347362827 + m_SortingLayer: 3 + m_SortingOrder: 1 m_Sprite: {fileID: 21300000, guid: e8adba42a6cfb3e46820742b142996cc, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -9868,7 +9869,7 @@ AudioSource: OutputAudioMixerGroup: {fileID: 0} m_audioClip: {fileID: 8300000, guid: e55a83281c267844fac30885cf99bced, type: 3} m_PlayOnAwake: 0 - m_Volume: 0.545 + m_Volume: 1 m_Pitch: 1 Loop: 1 Mute: 0 @@ -10484,9 +10485,9 @@ SpriteRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: -1 + m_SortingLayerID: 347362827 + m_SortingLayer: 3 + m_SortingOrder: 5 m_Sprite: {fileID: 21300000, guid: 0c36abafe46027d4fb5b108dff86b9cf, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -11121,7 +11122,7 @@ AudioSource: OutputAudioMixerGroup: {fileID: 0} m_audioClip: {fileID: 8300000, guid: 7c28c6023338cfb4f86cb1c96c52451c, type: 3} m_PlayOnAwake: 0 - m_Volume: 0.545 + m_Volume: 1 m_Pitch: 1 Loop: 0 Mute: 0 @@ -11437,8 +11438,8 @@ SpriteRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 + m_SortingLayerID: 347362827 + m_SortingLayer: 3 m_SortingOrder: -1 m_Sprite: {fileID: 21300000, guid: c7a11cbfecc8f9149845f2add9dcd85d, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} @@ -11543,7 +11544,7 @@ AudioSource: OutputAudioMixerGroup: {fileID: 0} m_audioClip: {fileID: 8300000, guid: 19132984ef5d3c24c8648fbe84731490, type: 3} m_PlayOnAwake: 0 - m_Volume: 0.545 + m_Volume: 1 m_Pitch: 1 Loop: 0 Mute: 0 @@ -11783,7 +11784,7 @@ MonoBehaviour: m_ActionName: Normal/Interactive1[/XInputControllerWindows/buttonNorth,/XInputControllerWindows/buttonNorth,/Keyboard/f] m_NeverAutoSwitchControlSchemes: 0 m_DefaultControlScheme: Play - m_DefaultActionMap: Normal + m_DefaultActionMap: NullMap m_SplitScreenIndex: -1 m_Camera: {fileID: 0} --- !u!114 &1776031628 @@ -11910,8 +11911,8 @@ SpriteRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 + m_SortingLayerID: -1433729465 + m_SortingLayer: 4 m_SortingOrder: 0 m_Sprite: {fileID: 21300000, guid: bcb018ee6b241104bb739e08529e965b, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} @@ -12041,8 +12042,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: dc2fd53966d9d3e42991b3656f32ef6c, type: 3} m_Name: m_EditorClassIdentifier: - HP: 3 - ATK: 1 + HP: 4 + ATK: 2 speed: 0 coin: 0 canBeHit: 1 @@ -12060,8 +12061,8 @@ MonoBehaviour: angryAudio: {fileID: 1765625001} roarAudio: {fileID: 80373163} lightningAudio: {fileID: 131703257} - deadAudio: {fileID: 0} - goustdeadAudio: {fileID: 0} + deadAudio: {fileID: 143283007} + goustdeadAudio: {fileID: 724309664} --- !u!61 &1784345429 BoxCollider2D: m_ObjectHideFlags: 0 @@ -12171,7 +12172,7 @@ AudioSource: OutputAudioMixerGroup: {fileID: 0} m_audioClip: {fileID: 8300000, guid: 770fdb0236d813944958fbbbc6d18e1e, type: 3} m_PlayOnAwake: 0 - m_Volume: 0.492 + m_Volume: 1 m_Pitch: 1 Loop: 0 Mute: 0 @@ -12298,7 +12299,7 @@ AudioSource: OutputAudioMixerGroup: {fileID: 0} m_audioClip: {fileID: 8300000, guid: 1c69a17287b7bca429a55e27947cc825, type: 3} m_PlayOnAwake: 0 - m_Volume: 0.545 + m_Volume: 1 m_Pitch: 1 Loop: 0 Mute: 0 @@ -12497,9 +12498,9 @@ SpriteRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: -2 + m_SortingLayerID: 347362827 + m_SortingLayer: 3 + m_SortingOrder: 1 m_Sprite: {fileID: 21300000, guid: e8adba42a6cfb3e46820742b142996cc, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -12842,6 +12843,148 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1880531488} m_CullTransparentMesh: 1 +--- !u!1 &1949323770 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1949323773} + - component: {fileID: 1949323772} + - component: {fileID: 1949323771} + m_Layer: 0 + m_Name: BGMPlayer + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!82 &1949323771 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1949323770} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 0} + m_PlayOnAwake: 1 + m_Volume: 1 + m_Pitch: 1 + Loop: 1 + Mute: 0 + Spatialize: 0 + SpatializePostEffects: 0 + Priority: 128 + DopplerLevel: 1 + MinDistance: 1 + MaxDistance: 500 + Pan2D: 0 + rolloffMode: 0 + BypassEffects: 0 + BypassListenerEffects: 0 + BypassReverbZones: 0 + rolloffCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + panLevelCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + spreadCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 +--- !u!114 &1949323772 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1949323770} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6e74793365791d7449b53d066e2155a7, type: 3} + m_Name: + m_EditorClassIdentifier: + fadeSpeed: 1 + newBGM: {fileID: 0} +--- !u!4 &1949323773 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1949323770} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -18.089996, y: 0.32000732, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 26 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1953247313 GameObject: m_ObjectHideFlags: 0 @@ -13116,9 +13259,9 @@ SpriteRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: -2 + m_SortingLayerID: 347362827 + m_SortingLayer: 3 + m_SortingOrder: 1 m_Sprite: {fileID: 21300000, guid: e8adba42a6cfb3e46820742b142996cc, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -13504,8 +13647,8 @@ SpriteRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 + m_SortingLayerID: 347362827 + m_SortingLayer: 3 m_SortingOrder: 0 m_Sprite: {fileID: 21300000, guid: c7a11cbfecc8f9149845f2add9dcd85d, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} diff --git a/Assets/Scenes/cun.unity b/Assets/Scenes/cun.unity index f37c75f..496b662 100644 --- a/Assets/Scenes/cun.unity +++ b/Assets/Scenes/cun.unity @@ -1157,7 +1157,7 @@ MonoBehaviour: dataScriptableObject: {fileID: 11400000, guid: 2ec0091ebaee60d43bbb2432421fc39d, type: 2} uName: uid: 3 - rate: 3 + rate: 9 --- !u!4 &174036210 Transform: m_ObjectHideFlags: 0 @@ -1241,7 +1241,7 @@ AudioSource: OutputAudioMixerGroup: {fileID: 0} m_audioClip: {fileID: 8300000, guid: 1c69a17287b7bca429a55e27947cc825, type: 3} m_PlayOnAwake: 0 - m_Volume: 0.545 + m_Volume: 1 m_Pitch: 1 Loop: 0 Mute: 0 @@ -2054,7 +2054,7 @@ AudioSource: OutputAudioMixerGroup: {fileID: 0} m_audioClip: {fileID: 8300000, guid: a67eb82a67969214baa2b4ba065bdac4, type: 3} m_PlayOnAwake: 0 - m_Volume: 0.545 + m_Volume: 1 m_Pitch: 1 Loop: 0 Mute: 0 @@ -7894,7 +7894,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 648740582} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -11.669117, y: 0.5399251, z: -10} + m_LocalPosition: {x: -11.668531, y: 0.5399258, z: -10} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} @@ -9309,7 +9309,7 @@ AudioSource: OutputAudioMixerGroup: {fileID: 0} m_audioClip: {fileID: 8300000, guid: e55a83281c267844fac30885cf99bced, type: 3} m_PlayOnAwake: 0 - m_Volume: 0.545 + m_Volume: 1 m_Pitch: 1 Loop: 1 Mute: 0 @@ -9436,7 +9436,7 @@ AudioSource: OutputAudioMixerGroup: {fileID: 0} m_audioClip: {fileID: 8300000, guid: 022a055c4386bdd4db98be9490bec2a7, type: 3} m_PlayOnAwake: 0 - m_Volume: 0.545 + m_Volume: 1 m_Pitch: 1 Loop: 0 Mute: 0 @@ -10050,8 +10050,7 @@ MonoBehaviour: height: 859 selectedBlocks: - {fileID: 950839211} - selectedCommands: - - {fileID: 950839213} + selectedCommands: [] variables: [] description: stepPause: 0 @@ -10202,7 +10201,7 @@ MonoBehaviour: message: "\u8D35\u65CF\u5BF9\u8BDD" --- !u!114 &950839213 MonoBehaviour: - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -10432,7 +10431,7 @@ MonoBehaviour: m_ActionName: Normal/Interactive1[/XInputControllerWindows/buttonNorth,/Keyboard/f] m_NeverAutoSwitchControlSchemes: 0 m_DefaultControlScheme: - m_DefaultActionMap: Normal + m_DefaultActionMap: NullMap m_SplitScreenIndex: -1 m_Camera: {fileID: 0} --- !u!50 &979777887 @@ -10907,7 +10906,7 @@ BoxCollider2D: m_GameObject: {fileID: 1044813248} m_Enabled: 1 m_Density: 1 - m_Material: {fileID: 0} + m_Material: {fileID: 6200000, guid: e9fe73f08a54f52478fbf9f9b31e0da7, type: 2} m_IsTrigger: 0 m_UsedByEffector: 0 m_UsedByComposite: 0 @@ -11861,7 +11860,7 @@ AudioSource: OutputAudioMixerGroup: {fileID: 0} m_audioClip: {fileID: 8300000, guid: 770fdb0236d813944958fbbbc6d18e1e, type: 3} m_PlayOnAwake: 0 - m_Volume: 0.492 + m_Volume: 1 m_Pitch: 1 Loop: 0 Mute: 0 @@ -13495,7 +13494,7 @@ MonoBehaviour: m_EditorClassIdentifier: clickMode: 4 nextClickDelay: 0 - cancelEnabled: 1 + cancelEnabled: 0 ignoreMenuClicks: 1 --- !u!82 &1412208095 AudioSource: @@ -15729,7 +15728,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 61dddfdc5e0e44ca298d8f46f7f5a915, type: 3} m_Name: m_EditorClassIdentifier: - selectedFlowchart: {fileID: 1727640931} + selectedFlowchart: {fileID: 950839206} --- !u!4 &1823559023 Transform: m_ObjectHideFlags: 1 @@ -15863,7 +15862,7 @@ BoxCollider2D: m_GameObject: {fileID: 1845710916} m_Enabled: 1 m_Density: 1 - m_Material: {fileID: 0} + m_Material: {fileID: 6200000, guid: e9fe73f08a54f52478fbf9f9b31e0da7, type: 2} m_IsTrigger: 0 m_UsedByEffector: 0 m_UsedByComposite: 0 @@ -16697,7 +16696,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!114 &2019120193 MonoBehaviour: m_ObjectHideFlags: 0 @@ -16843,7 +16842,7 @@ BoxCollider2D: m_GameObject: {fileID: 2029924575} m_Enabled: 1 m_Density: 1 - m_Material: {fileID: 0} + m_Material: {fileID: 6200000, guid: e9fe73f08a54f52478fbf9f9b31e0da7, type: 2} m_IsTrigger: 0 m_UsedByEffector: 0 m_UsedByComposite: 0 @@ -17044,6 +17043,148 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!1 &2106898233 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2106898235} + - component: {fileID: 2106898234} + - component: {fileID: 2106898236} + m_Layer: 0 + m_Name: BGMPlayer + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &2106898234 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2106898233} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6e74793365791d7449b53d066e2155a7, type: 3} + m_Name: + m_EditorClassIdentifier: + fadeSpeed: 1 + newBGM: {fileID: 0} +--- !u!4 &2106898235 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2106898233} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -18.089996, y: 0.32000732, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 20 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!82 &2106898236 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2106898233} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 0} + m_PlayOnAwake: 1 + m_Volume: 1 + m_Pitch: 1 + Loop: 1 + Mute: 0 + Spatialize: 0 + SpatializePostEffects: 0 + Priority: 128 + DopplerLevel: 1 + MinDistance: 1 + MaxDistance: 500 + Pan2D: 0 + rolloffMode: 0 + BypassEffects: 0 + BypassListenerEffects: 0 + BypassReverbZones: 0 + rolloffCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + panLevelCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + spreadCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 --- !u!1 &2123063625 GameObject: m_ObjectHideFlags: 0 @@ -17087,7 +17228,7 @@ AudioSource: OutputAudioMixerGroup: {fileID: 0} m_audioClip: {fileID: 8300000, guid: 7c28c6023338cfb4f86cb1c96c52451c, type: 3} m_PlayOnAwake: 0 - m_Volume: 0.545 + m_Volume: 1 m_Pitch: 1 Loop: 0 Mute: 0 @@ -17225,6 +17366,7 @@ MonoBehaviour: - {fileID: 2146435910} stages3: - {fileID: 210229902} + BGM: {fileID: 8300000, guid: c10b9610dfee4784fa0ee4974dd4a5db, type: 3} --- !u!1 &2132913884 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/可交互/Board.cs b/Assets/Scripts/可交互/Board.cs index 417a192..bc5f5ff 100644 --- a/Assets/Scripts/可交互/Board.cs +++ b/Assets/Scripts/可交互/Board.cs @@ -37,8 +37,11 @@ public class Board : Interactive } void Update(){ if(CheckComfirm()){ - UI.SetActive(false); - player.GetComponent().SwitchCurrentActionMap("Normal"); + if(UI.activeSelf){ + UI.SetActive(false); + player.GetComponent().SwitchCurrentActionMap("Normal"); + } + } } @@ -57,6 +60,7 @@ public class Board : Interactive textUI.text = text; UIDUI.text = "UID:"+uid; player.GetComponent().SwitchCurrentActionMap("NullMap"); + player.inputDir = 0; } private bool CheckComfirm(){ diff --git a/Assets/Scripts/抽象/BGMPlayer.cs b/Assets/Scripts/抽象/BGMPlayer.cs new file mode 100644 index 0000000..78b63df --- /dev/null +++ b/Assets/Scripts/抽象/BGMPlayer.cs @@ -0,0 +1,50 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.InputSystem; + +public class BGMPlayer : MonoBehaviour +{ + // Start is called before the first frame update + private AudioSource audioPlayer; + private bool isSlowlyStopTheClip; + [Tooltip("请填入BGM切换时淡出原BGM的速度")] + public float fadeSpeed; + public AudioClip newBGM; + private float defulatVolume; + + + void Start() + { + DontDestroyOnLoad(gameObject); + audioPlayer = GetComponent(); + defulatVolume = audioPlayer.volume; + if(FindObjectsOfType().Length > 1) Destroy(gameObject); + } + + // Update is called once per frame + void Update() + { + if(isSlowlyStopTheClip) + { + audioPlayer.volume -= fadeSpeed*Time.deltaTime; + if(audioPlayer.volume.Equals(0f)) + { + isSlowlyStopTheClip = false; + audioPlayer.clip = newBGM; + audioPlayer.volume = defulatVolume; + audioPlayer.Play(); + } + } + + // + Debug.Log(FindObjectOfType().currentActionMap); + // + } + + public void ChangedTheBGM(AudioClip newBGM) + { + isSlowlyStopTheClip = true; + this.newBGM = newBGM; + } +} diff --git a/Assets/Scripts/抽象/BGMPlayer.cs.meta b/Assets/Scripts/抽象/BGMPlayer.cs.meta new file mode 100644 index 0000000..623e218 --- /dev/null +++ b/Assets/Scripts/抽象/BGMPlayer.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 6e74793365791d7449b53d066e2155a7 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/演出/以撒/YiSaOpeningStage.cs b/Assets/Scripts/演出/以撒/YiSaOpeningStage.cs index dfeac37..6c87cbf 100644 --- a/Assets/Scripts/演出/以撒/YiSaOpeningStage.cs +++ b/Assets/Scripts/演出/以撒/YiSaOpeningStage.cs @@ -16,6 +16,7 @@ public class YiSaOpeningStage : Stage public AudioSource rushaudio; public AudioSource appearaudio; + public AudioClip BGM; protected override void Init(){ //找到必要的游戏物体和组件 @@ -27,6 +28,12 @@ public class YiSaOpeningStage : Stage } protected override IEnumerator Main(){ + //替换BGM + if(FindObjectOfType().newBGM != BGM){ + FindObjectOfType().ChangedTheBGM(BGM); + yield return new WaitForEndOfFrame(); + FindObjectOfType().GetComponent().volume = 0.7f; + } //初始化玩家位置 player.transform.position = new Vector3(0.430000007f,-2.91000009f,0f); //更新玩家进度 diff --git a/Assets/Scripts/演出/伊斯兰前置关/YiOpeningStage.cs b/Assets/Scripts/演出/伊斯兰前置关/YiOpeningStage.cs index 7ee9ed9..ae72119 100644 --- a/Assets/Scripts/演出/伊斯兰前置关/YiOpeningStage.cs +++ b/Assets/Scripts/演出/伊斯兰前置关/YiOpeningStage.cs @@ -9,6 +9,7 @@ public class YiOpeningStage : Stage { private GameObject airWall; private PlayerInfo sql; + public AudioClip BGM; protected override void Init(){ //找到必要的游戏物体和组件 @@ -18,6 +19,12 @@ public class YiOpeningStage : Stage } protected override IEnumerator Main(){ + //替换BGM + if(FindObjectOfType().newBGM != BGM){ + FindObjectOfType().ChangedTheBGM(BGM); + yield return new WaitForEndOfFrame(); + FindObjectOfType().GetComponent().volume = 0.7f; + } //初始化玩家位置 player.transform.position = new Vector3(-21.9099998f,-3.67000008f,0f); //更新玩家进度 diff --git a/Assets/Scripts/演出/佛教前置关/FoOpeningStage.cs b/Assets/Scripts/演出/佛教前置关/FoOpeningStage.cs index 39d6b75..4f7eb98 100644 --- a/Assets/Scripts/演出/佛教前置关/FoOpeningStage.cs +++ b/Assets/Scripts/演出/佛教前置关/FoOpeningStage.cs @@ -14,6 +14,7 @@ public class FoOpeningStage : Stage private NormalEnemy right; private bool isConversationComplete = false; private PlayerInfo sql; + public AudioClip BGM; protected override void Init(){ //找到必要的游戏物体和组件 @@ -26,6 +27,12 @@ public class FoOpeningStage : Stage } protected override IEnumerator Main(){ + //替换BGM + if(FindObjectOfType().newBGM != BGM){ + FindObjectOfType().ChangedTheBGM(BGM); + yield return new WaitForEndOfFrame(); + FindObjectOfType().GetComponent().volume = 0.4f; + } //初始化玩家位置 player.transform.position = new Vector3( -22.0799999f,-1.89999998f,0 diff --git a/Assets/Scripts/演出/地藏/DiZangOpeningStage.cs b/Assets/Scripts/演出/地藏/DiZangOpeningStage.cs index 975a1b0..76c6223 100644 --- a/Assets/Scripts/演出/地藏/DiZangOpeningStage.cs +++ b/Assets/Scripts/演出/地藏/DiZangOpeningStage.cs @@ -15,6 +15,7 @@ public class DiZangOpeningStage : Stage private DiZang diZang; private CinemachineVirtualCamera m_Camera; private PlayerInfo sql; + public AudioClip BGM; protected override void Init(){ //找到必要的游戏物体和组件 @@ -26,6 +27,12 @@ public class DiZangOpeningStage : Stage } protected override IEnumerator Main(){ + //替换BGM + if(FindObjectOfType().newBGM != BGM){ + FindObjectOfType().ChangedTheBGM(BGM); + yield return new WaitForEndOfFrame(); + FindObjectOfType().GetComponent().volume = 0.7f; + } //初始化进度 MyPlayer.progress = MyPlayer.Progress.通Fo; //初始化玩家位置 diff --git a/Assets/Scripts/演出/基督前置关/JiOpeningStage.cs b/Assets/Scripts/演出/基督前置关/JiOpeningStage.cs index e950c14..9381934 100644 --- a/Assets/Scripts/演出/基督前置关/JiOpeningStage.cs +++ b/Assets/Scripts/演出/基督前置关/JiOpeningStage.cs @@ -6,6 +6,7 @@ public class JiOpeningStage : Stage { private GameObject airWall; private PlayerInfo sql; + public AudioClip BGM; protected override void Init(){ //找到必要的游戏物体和组件 @@ -15,6 +16,12 @@ public class JiOpeningStage : Stage } protected override IEnumerator Main(){ + //替换BGM + if(FindObjectOfType().newBGM != BGM){ + FindObjectOfType().ChangedTheBGM(BGM); + yield return new WaitForEndOfFrame(); + FindObjectOfType().GetComponent().volume = 0.7f; + } //拉取留言板 sql.GetComponent().Get(); //拉取死亡列表 diff --git a/Assets/Scripts/演出/村/CunOpeningStage.cs b/Assets/Scripts/演出/村/CunOpeningStage.cs index 2fdadf6..65318af 100644 --- a/Assets/Scripts/演出/村/CunOpeningStage.cs +++ b/Assets/Scripts/演出/村/CunOpeningStage.cs @@ -18,6 +18,7 @@ public class CunOpeningStage : Stage private GameObject airWall; private PlayerInfo sql; private GetDateBaseBoard getDateBaseBoard; + public AudioClip BGM; protected override void Init(){ //找到必要的游戏物体和组件 @@ -28,6 +29,12 @@ public class CunOpeningStage : Stage } protected override IEnumerator Main(){ + //替换BGM + if(FindObjectOfType().newBGM != BGM){ + FindObjectOfType().ChangedTheBGM(BGM); + yield return new WaitForEndOfFrame(); + FindObjectOfType().GetComponent().volume = 1f; + } //更新玩家进度 MyPlayer.progress = (MyPlayer.Progress)FindObjectOfType().rate; if(MyPlayer.progress == MyPlayer.Progress.通佛) MyPlayer.progress = MyPlayer.Progress.过佛; diff --git a/Assets/Scripts/演出/特洛伊/TrojanopeningStage.cs b/Assets/Scripts/演出/特洛伊/TrojanopeningStage.cs index e0e43ac..2b26217 100644 --- a/Assets/Scripts/演出/特洛伊/TrojanopeningStage.cs +++ b/Assets/Scripts/演出/特洛伊/TrojanopeningStage.cs @@ -13,8 +13,10 @@ public class TrojanopeningStage : Stage private GameObject airWall; private TrojanHorse horse; private PlayerInfo sql; + public AudioClip BGM; protected override void Init(){ + //找到必要的游戏物体和组件 base.Init(); airWall = GameObject.Find("空气墙"); @@ -24,6 +26,12 @@ public class TrojanopeningStage : Stage } protected override IEnumerator Main(){ + //替换BGM + if(FindObjectOfType().newBGM != BGM){ + FindObjectOfType().ChangedTheBGM(BGM); + yield return new WaitForEndOfFrame(); + FindObjectOfType().GetComponent().volume = 0.4f; + } //初始化玩家位置 player.transform.position = new Vector3(-9.04f,-3.48000002f,0f); //更新玩家进度 diff --git a/Assets/Sprites/封面.png b/Assets/Sprites/封面.png new file mode 100644 index 0000000..3ab8680 Binary files /dev/null and b/Assets/Sprites/封面.png differ diff --git a/Assets/Sprites/封面.png.meta b/Assets/Sprites/封面.png.meta new file mode 100644 index 0000000..6173e7f --- /dev/null +++ b/Assets/Sprites/封面.png.meta @@ -0,0 +1,96 @@ +fileFormatVersion: 2 +guid: b66b5fd670173d748a5ea52108f3141e +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/动画/AM/基督闪电.anim b/Assets/动画/AM/基督闪电.anim index 63e28b3..8b531b4 100644 --- a/Assets/动画/AM/基督闪电.anim +++ b/Assets/动画/AM/基督闪电.anim @@ -21,19 +21,19 @@ AnimationClip: - curve: - time: 0 value: {fileID: 21300000, guid: 6c592d1786dce4346bf056d4f8e5ad5d, type: 3} - - time: 0.05 + - time: 0.033333335 value: {fileID: 21300000, guid: d5421ddd8069d304dbb113ea25d4c817, type: 3} - - time: 0.1 + - time: 0.05 value: {fileID: 21300000, guid: b2038cb046e271e4fb1b0e6154dd6f76, type: 3} - - time: 0.15 + - time: 0.083333336 value: {fileID: 21300000, guid: 8819b46855ab99845beb23ece9245029, type: 3} - - time: 0.18333334 + - time: 0.1 value: {fileID: 21300000, guid: 9b110b4714e533048aaeeeb3c2ad8fbd, type: 3} - - time: 0.23333333 + - time: 0.11666667 value: {fileID: 21300000, guid: 56e124cfe2cc0394890618f04c29e1c1, type: 3} - - time: 0.28333333 + - time: 0.15 value: {fileID: 21300000, guid: 2e0c027aece85fd4c8f8ad99bc8d628f, type: 3} - - time: 0.33333334 + - time: 0.16666667 value: {fileID: 21300000, guid: 7cf67951e60099f499246ee69a9c17b9, type: 3} attribute: m_Sprite path: @@ -67,7 +67,7 @@ AnimationClip: m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 0.35000002 + m_StopTime: 0.18333334 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 diff --git a/Assets/音乐.meta b/Assets/音乐.meta new file mode 100644 index 0000000..75f2b03 --- /dev/null +++ b/Assets/音乐.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e2ec7d7f3c218814783ecb675ecc1896 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/音乐/Badass & Dandy - De$ert.mp3 b/Assets/音乐/Badass & Dandy - De$ert.mp3 new file mode 100644 index 0000000..66e5f2f Binary files /dev/null and b/Assets/音乐/Badass & Dandy - De$ert.mp3 differ diff --git a/Assets/音乐/Badass & Dandy - De$ert.mp3.meta b/Assets/音乐/Badass & Dandy - De$ert.mp3.meta new file mode 100644 index 0000000..8914c06 --- /dev/null +++ b/Assets/音乐/Badass & Dandy - De$ert.mp3.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 55f28a78e6fccbf419109890801aff71 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/音乐/崎元仁 - 聖アジョラのテーマ.mp3 b/Assets/音乐/崎元仁 - 聖アジョラのテーマ.mp3 new file mode 100644 index 0000000..d56ce8d Binary files /dev/null and b/Assets/音乐/崎元仁 - 聖アジョラのテーマ.mp3 differ diff --git a/Assets/音乐/崎元仁 - 聖アジョラのテーマ.mp3.meta b/Assets/音乐/崎元仁 - 聖アジョラのテーマ.mp3.meta new file mode 100644 index 0000000..bb63d8a --- /dev/null +++ b/Assets/音乐/崎元仁 - 聖アジョラのテーマ.mp3.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 2093d88d667ea954ba0c376c30c743aa +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/音乐/祖堅正慶 - 不穏の淵.mp3 b/Assets/音乐/祖堅正慶 - 不穏の淵.mp3 new file mode 100644 index 0000000..6efb3fa Binary files /dev/null and b/Assets/音乐/祖堅正慶 - 不穏の淵.mp3 differ diff --git a/Assets/音乐/祖堅正慶 - 不穏の淵.mp3.meta b/Assets/音乐/祖堅正慶 - 不穏の淵.mp3.meta new file mode 100644 index 0000000..ac96362 --- /dev/null +++ b/Assets/音乐/祖堅正慶 - 不穏の淵.mp3.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 47bdffdbe9e1e194488c5016fd7d5eea +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/音乐/祖堅正慶 - 千年の誰そ彼 ～朱雀征魂戦～.mp3 b/Assets/音乐/祖堅正慶 - 千年の誰そ彼 ～朱雀征魂戦～.mp3 new file mode 100644 index 0000000..4dda231 Binary files /dev/null and b/Assets/音乐/祖堅正慶 - 千年の誰そ彼 ～朱雀征魂戦～.mp3 differ diff --git a/Assets/音乐/祖堅正慶 - 千年の誰そ彼 ～朱雀征魂戦～.mp3.meta b/Assets/音乐/祖堅正慶 - 千年の誰そ彼 ～朱雀征魂戦～.mp3.meta new file mode 100644 index 0000000..d4ea0e1 --- /dev/null +++ b/Assets/音乐/祖堅正慶 - 千年の誰そ彼 ～朱雀征魂戦～.mp3.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 42e76058ed53aa940aaa0c6b8bf1cfce +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/音乐/祖堅正慶 - 泥中の蓮 ～草木汚染 聖モシャーヌ植物園～.mp3 b/Assets/音乐/祖堅正慶 - 泥中の蓮 ～草木汚染 聖モシャーヌ植物園～.mp3 new file mode 100644 index 0000000..73df30b Binary files /dev/null and b/Assets/音乐/祖堅正慶 - 泥中の蓮 ～草木汚染 聖モシャーヌ植物園～.mp3 differ diff --git a/Assets/音乐/祖堅正慶 - 泥中の蓮 ～草木汚染 聖モシャーヌ植物園～.mp3.meta b/Assets/音乐/祖堅正慶 - 泥中の蓮 ～草木汚染 聖モシャーヌ植物園～.mp3.meta new file mode 100644 index 0000000..62c9131 --- /dev/null +++ b/Assets/音乐/祖堅正慶 - 泥中の蓮 ～草木汚染 聖モシャーヌ植物園～.mp3.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: c10b9610dfee4784fa0ee4974dd4a5db +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/音乐/祖堅正慶,NAGI☆ - 貪欲.mp3 b/Assets/音乐/祖堅正慶,NAGI☆ - 貪欲.mp3 new file mode 100644 index 0000000..45c3b37 Binary files /dev/null and b/Assets/音乐/祖堅正慶,NAGI☆ - 貪欲.mp3 differ diff --git a/Assets/音乐/祖堅正慶,NAGI☆ - 貪欲.mp3.meta b/Assets/音乐/祖堅正慶,NAGI☆ - 貪欲.mp3.meta new file mode 100644 index 0000000..9276c3b --- /dev/null +++ b/Assets/音乐/祖堅正慶,NAGI☆ - 貪欲.mp3.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: aa8e7ce212840ab4e9b806d8b52a5fdc +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/音乐/祖堅正慶,高田有紀子 - 心を持たぬ者 ～次元の狭間オメガ：アルファ編～.mp3 b/Assets/音乐/祖堅正慶,高田有紀子 - 心を持たぬ者 ～次元の狭間オメガ：アルファ編～.mp3 new file mode 100644 index 0000000..a378a99 Binary files /dev/null and b/Assets/音乐/祖堅正慶,高田有紀子 - 心を持たぬ者 ～次元の狭間オメガ：アルファ編～.mp3 differ diff --git a/Assets/音乐/祖堅正慶,高田有紀子 - 心を持たぬ者 ～次元の狭間オメガ：アルファ編～.mp3.meta b/Assets/音乐/祖堅正慶,高田有紀子 - 心を持たぬ者 ～次元の狭間オメガ：アルファ編～.mp3.meta new file mode 100644 index 0000000..0573946 --- /dev/null +++ b/Assets/音乐/祖堅正慶,高田有紀子 - 心を持たぬ者 ～次元の狭間オメガ：アルファ編～.mp3.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 1222e51d5c852db4496ee023dbac707c +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index e7408da..de3e208 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -13,7 +13,7 @@ PlayerSettings: useOnDemandResources: 0 accelerometerFrequency: 60 companyName: DefaultCompany - productName: "\u5B97\u6559" + productName: "\u5723\u6218" defaultCursor: {fileID: 0} cursorHotspot: {x: 0, y: 0} m_SplashScreenBackgroundColor: {r: 0.13725491, g: 0.12156863, b: 0.1254902, a: 1} @@ -145,7 +145,7 @@ PlayerSettings: 16:10: 1 16:9: 1 Others: 1 - bundleVersion: 1.0 + bundleVersion: 1.1 preloadedAssets: - {fileID: -233813179328996068, guid: c904ac9773b374d419329ca1a0f380ac, type: 2} metroInputSource: 0 @@ -278,7 +278,14 @@ PlayerSettings: AndroidMinifyDebug: 0 AndroidValidateAppBundleSize: 1 AndroidAppBundleSizeToValidate: 150 - m_BuildTargetIcons: [] + m_BuildTargetIcons: + - m_BuildTarget: + m_Icons: + - serializedVersion: 2 + m_Icon: {fileID: 2800000, guid: 365a5c8d591827c43b32a46ae262b889, type: 3} + m_Width: 128 + m_Height: 128 + m_Kind: 0 m_BuildTargetPlatformIcons: [] m_BuildTargetBatching: [] m_BuildTargetSecurityBuild: [] diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset index 6001018..b276650 100644 --- a/UserSettings/EditorUserSettings.asset +++ b/UserSettings/EditorUserSettings.asset @@ -9,31 +9,31 @@ EditorUserSettings: value: 22424703114646680e0b0227036c6c111b07142f1f2b233e2867083debf42d flags: 0 RecentlyUsedScenePath-1: - value: 22424703114646680e0b0227036c5c0518590d24253c3f + value: 22424703114646680e0b0227036c4b150503563f22213229 flags: 0 RecentlyUsedScenePath-2: - value: 22424703114646680e0b0227036c791f580216233831 + value: 22424703114646680e0b0227036c7000131911242b66333e243d04 flags: 0 RecentlyUsedScenePath-3: - value: 22424703114646680e0b0227036c7000131911242b66333e243d04 + value: 22424703114646680e0b0227036c661925162b3e2d2f2304283a097df7ee3d2cfb flags: 0 RecentlyUsedScenePath-4: value: 22424703114646680e0b0227036c7b192c16162d1f3c2737281d1820f6ae2136ebf32f flags: 0 RecentlyUsedScenePath-5: - value: 22424703114646680e0b0227036c661925162b3e2d2f2304283a097df7ee3d2cfb + value: 22424703114646680e0b0227036c6b153a021713251b32312a2c2936f1f47a2decee22f0 flags: 0 RecentlyUsedScenePath-6: - value: 22424703114646680e0b0227036c6619580216233831 + value: 22424703114646680e0b0227036c5c0518590d24253c3f flags: 0 RecentlyUsedScenePath-7: - value: 22424703114646680e0b0227036c4b150503563f22213229 + value: 22424703114646680e0b0227036c791f580216233831 flags: 0 RecentlyUsedScenePath-8: value: 22424703114646680e0b0227036c7519580216233831 flags: 0 RecentlyUsedScenePath-9: - value: 22424703114646680e0b0227036c6b153a021713251b32312a2c2936f1f47a2decee22f0 + value: 22424703114646680e0b0227036c6619580216233831 flags: 0 UnityEditor.ShaderGraph.Blackboard: value: 18135939215a0a5004000b0e15254b524c030a3f2964643d120d1230e9e93a3fd6e826abbd2e2d293c4ead313b08042de6030a0afa240c0d020be94c4baf5e435d8715fa32c70d15d11612dacc11fee5d3c5d1fe9ab1b7968e93e2ffcbc3e7e2f0b3ffe0e8b0be9af8ffaeffff8e85dd8390e3949c8899daa7