diff --git a/Assets/MyPostProcess/Effects/Wave/Attack_Wave/AWM0.mat b/Assets/MyPostProcess/Effects/Wave/Attack_Wave/AWM0.mat index 80e1957..c9a6062 100644 --- a/Assets/MyPostProcess/Effects/Wave/Attack_Wave/AWM0.mat +++ b/Assets/MyPostProcess/Effects/Wave/Attack_Wave/AWM0.mat @@ -44,6 +44,6 @@ Material: - WaveIntensity_2: 1 - WaveSpread_Value: 0 m_Colors: - - Center: {r: 0.48349547, g: 0.41133165, b: 0, a: 0} + - Center: {r: 0.49963665, g: 0.4179999, b: 0, a: 0} - Vector2_d2d098295fc146f08b921b231b2e5199: {r: 1.6, g: 0.9, b: 0, a: 0} m_BuildTextureStacks: [] diff --git a/Assets/Scenes/序章-家中.unity b/Assets/Scenes/序章-家中.unity index cc95e94..171e22b 100644 --- a/Assets/Scenes/序章-家中.unity +++ b/Assets/Scenes/序章-家中.unity @@ -247,6 +247,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_interface: {fileID: 0} blackUI: {fileID: 778585118} + clip: {fileID: 8300000, guid: b88895df6483af843a716e3d4913e6b0, type: 3} --- !u!1 &21934455 GameObject: m_ObjectHideFlags: 0 @@ -499,7 +500,7 @@ GameObject: m_Component: - component: {fileID: 71136650} m_Layer: 0 - m_Name: "\u4E8B\u4EF6\u7684\u63A7\u5236\u5668\u4EEC" + m_Name: "\u4E8B\u4EF6" m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -649,7 +650,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.13324745, y: 0.172} m_AnchorMax: {x: 0.565, y: 0.41035822} - m_AnchoredPosition: {x: 0.80000305, y: -1.9000015} + m_AnchoredPosition: {x: 0.80000305, y: -1.8999939} m_SizeDelta: {x: -8, y: -12} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &144076822 @@ -922,7 +923,7 @@ MonoBehaviour: nodeRect: serializedVersion: 2 x: 67 - y: 70 + y: 69 width: 112.4 height: 40 tint: {r: 1, g: 1, b: 1, a: 1} @@ -962,7 +963,8 @@ MonoBehaviour: height: 859 selectedBlocks: - {fileID: 222237388} - selectedCommands: [] + selectedCommands: + - {fileID: 222237392} variables: [] description: stepPause: 0 @@ -1042,7 +1044,7 @@ MonoBehaviour: waitForClick: 1 stopVoiceover: 1 waitForVO: 0 - setSayDialog: {fileID: 0} + setSayDialog: {fileID: 582064879} --- !u!114 &222237393 MonoBehaviour: m_ObjectHideFlags: 2 @@ -1213,6 +1215,147 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 298482187} m_CullTransparentMesh: 1 +--- !u!1 &303144027 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 303144028} + - component: {fileID: 303144029} + - component: {fileID: 303144030} + m_Layer: 0 + m_Name: BGMPlayer + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &303144028 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 303144027} + 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: 9 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!82 &303144029 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 303144027} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 8300000, guid: 7c272ac1b16fce34db9cef8ecf2407f8, type: 3} + m_PlayOnAwake: 1 + m_Volume: 0.6 + 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 &303144030 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 303144027} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5abcc5e22bfdfe946a436b653015ecc8, type: 3} + m_Name: + m_EditorClassIdentifier: + fadeSpeed: 0.4 --- !u!1 &305985606 GameObject: m_ObjectHideFlags: 0 @@ -1302,7 +1445,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!4 &310835680 Transform: m_ObjectHideFlags: 0 @@ -1388,10 +1531,8 @@ MonoBehaviour: y: -340 width: 1114 height: 859 - selectedBlocks: - - {fileID: 359691899} - selectedCommands: - - {fileID: 359691907} + selectedBlocks: [] + selectedCommands: [] variables: [] description: stepPause: 0 @@ -2043,7 +2184,7 @@ AudioSource: m_Enabled: 1 serializedVersion: 4 OutputAudioMixerGroup: {fileID: 0} - m_audioClip: {fileID: 0} + m_audioClip: {fileID: 8300000, guid: 70e9196dbc23a684ca9fb14ae6c3adf2, type: 3} m_PlayOnAwake: 0 m_Volume: 1 m_Pitch: 1 @@ -2687,7 +2828,7 @@ VideoPlayer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 744467541} m_Enabled: 1 - m_VideoClip: {fileID: 32900000, guid: 6aafcdd8dde24a64c82cdfd3b6fbef54, type: 3} + m_VideoClip: {fileID: 32900000, guid: 4c39142a4822aea4fad7555b49f8681f, type: 3} m_TargetCameraAlpha: 1 m_TargetCamera3DLayout: 0 m_TargetCamera: {fileID: 0} @@ -6523,6 +6664,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: blackUI: {fileID: 778585118} + clip: {fileID: 8300000, guid: 7f2888e01f36fda4db0112982c205369, type: 3} --- !u!1 &1366529687 GameObject: m_ObjectHideFlags: 0 @@ -6963,7 +7105,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 61dddfdc5e0e44ca298d8f46f7f5a915, type: 3} m_Name: m_EditorClassIdentifier: - selectedFlowchart: {fileID: 359691898} + selectedFlowchart: {fileID: 222237389} --- !u!4 &1463945086 Transform: m_ObjectHideFlags: 1 @@ -8491,7 +8633,7 @@ AudioSource: OutputAudioMixerGroup: {fileID: 0} m_audioClip: {fileID: 8300000, guid: e76cf4bc92b5253449001bf42192e756, type: 3} m_PlayOnAwake: 0 - m_Volume: 1 + m_Volume: 0.6 m_Pitch: 1 Loop: 0 Mute: 0 diff --git a/Assets/Scenes/序章-战场.unity b/Assets/Scenes/序章-战场.unity index dfd5d69..601ad57 100644 --- a/Assets/Scenes/序章-战场.unity +++ b/Assets/Scenes/序章-战场.unity @@ -275,7 +275,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 56435766} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -6.4979916, y: 1.6167927, z: -10} + m_LocalPosition: {x: -6.498164, y: 1.6167873, z: -10} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1049093360} @@ -11183,7 +11183,7 @@ AudioSource: m_Enabled: 1 serializedVersion: 4 OutputAudioMixerGroup: {fileID: 0} - m_audioClip: {fileID: 0} + m_audioClip: {fileID: 8300000, guid: 70e9196dbc23a684ca9fb14ae6c3adf2, type: 3} m_PlayOnAwake: 0 m_Volume: 1 m_Pitch: 1 @@ -12147,6 +12147,7 @@ MonoBehaviour: m_interface: {fileID: 0} onAudio: {fileID: 1501518558} blackUI: {fileID: 739096053} + clip: {fileID: 8300000, guid: 7c272ac1b16fce34db9cef8ecf2407f8, type: 3} --- !u!1 &921243556 GameObject: m_ObjectHideFlags: 1 @@ -12176,7 +12177,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 61dddfdc5e0e44ca298d8f46f7f5a915, type: 3} m_Name: m_EditorClassIdentifier: - selectedFlowchart: {fileID: 786455512} + selectedFlowchart: {fileID: 1430262043} --- !u!4 &921243558 Transform: m_ObjectHideFlags: 1 @@ -18401,6 +18402,308 @@ Transform: m_Father: {fileID: 1803085805} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1415293453 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1415293456} + - component: {fileID: 1415293455} + - component: {fileID: 1415293454} + m_Layer: 0 + m_Name: "BGMPlayer(\u6D4B\u8BD5\u7528\uFF0C\u6700\u540E\u8BF7\u5220\u9664)" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!114 &1415293454 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1415293453} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5abcc5e22bfdfe946a436b653015ecc8, type: 3} + m_Name: + m_EditorClassIdentifier: + fadeSpeed: 0.5 +--- !u!82 &1415293455 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1415293453} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 8300000, guid: 7f2888e01f36fda4db0112982c205369, type: 3} + m_PlayOnAwake: 1 + m_Volume: 0.6 + 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!4 &1415293456 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1415293453} + 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: 14 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1430262038 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1430262044} + - component: {fileID: 1430262043} + - component: {fileID: 1430262042} + - component: {fileID: 1430262041} + - component: {fileID: 1430262040} + - component: {fileID: 1430262039} + m_Layer: 0 + m_Name: "\u6CA1\u4FEE\u5B8C\u5462" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1430262039 +MonoBehaviour: + m_ObjectHideFlags: 2 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1430262038} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 17a200dbd67304446a3019434503338a, type: 3} + m_Name: + m_EditorClassIdentifier: + itemId: 2 + indentLevel: 0 + targetObject: {fileID: 117377210} + methodName: OnCall + delay: 0 +--- !u!114 &1430262040 +MonoBehaviour: + m_ObjectHideFlags: 2 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1430262038} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ec422cd568a9c4a31ad7c36d0572b9da, type: 3} + m_Name: + m_EditorClassIdentifier: + itemId: 1 + indentLevel: 0 + storyText: "\u7535\u62A5\u673A\u6CA1\u6709\u53CD\u5E94\u2026\u2026\u4E00\u5B9A\u8FD8\u6709\u54EA\u91CC\u7684\u7535\u8BDD\u7EBF\u6CA1\u6709\u4FEE\u597D" + description: + character: {fileID: 586823870} + portrait: {fileID: 21300000, guid: 8bb7d99df9dd41b4c867ac425157c287, type: 3} + voiceOverClip: {fileID: 0} + showAlways: 1 + showCount: 1 + extendPrevious: 0 + fadeWhenDone: 1 + waitForClick: 1 + stopVoiceover: 1 + waitForVO: 0 + setSayDialog: {fileID: 507995313} +--- !u!114 &1430262041 +MonoBehaviour: + m_ObjectHideFlags: 2 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1430262038} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2d7d417659cd54a6787f70f763950c34, type: 3} + m_Name: + m_EditorClassIdentifier: + parentBlock: {fileID: 1430262042} + suppressBlockAutoSelect: 0 + message: "\u6CA1\u4FEE\u5B8C\u5462" +--- !u!114 &1430262042 +MonoBehaviour: + m_ObjectHideFlags: 2 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1430262038} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3d3d73aef2cfc4f51abf34ac00241f60, type: 3} + m_Name: + m_EditorClassIdentifier: + nodeRect: + serializedVersion: 2 + x: 65 + y: 71 + width: 112.4 + height: 40 + tint: {r: 1, g: 1, b: 1, a: 1} + useCustomTint: 0 + itemId: 0 + blockName: New Block + description: + eventHandler: {fileID: 1430262041} + commandList: + - {fileID: 1430262040} + - {fileID: 1430262039} + suppressAllAutoSelections: 0 +--- !u!114 &1430262043 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1430262038} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7a334fe2ffb574b3583ff3b18b4792d3, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 1 + scrollPos: {x: 0, y: 0} + variablesScrollPos: {x: 0, y: 0} + variablesExpanded: 1 + blockViewHeight: 306.25 + zoom: 1 + scrollViewRect: + serializedVersion: 2 + x: -343 + y: -340 + width: 1114 + height: 859 + selectedBlocks: + - {fileID: 1430262042} + selectedCommands: + - {fileID: 1430262039} + variables: [] + description: + stepPause: 0 + colorCommands: 1 + hideComponents: 1 + saveSelection: 1 + localizationId: + showLineNumbers: 0 + hideCommands: [] + luaEnvironment: {fileID: 0} + luaBindingName: flowchart +--- !u!4 &1430262044 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1430262038} + 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: 15 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1432270066 GameObject: m_ObjectHideFlags: 0 @@ -23330,7 +23633,7 @@ AudioSource: OutputAudioMixerGroup: {fileID: 0} m_audioClip: {fileID: 8300000, guid: e76cf4bc92b5253449001bf42192e756, type: 3} m_PlayOnAwake: 0 - m_Volume: 1 + m_Volume: 0.6 m_Pitch: 1 Loop: 0 Mute: 0 diff --git a/Assets/Scenes/第一关.unity b/Assets/Scenes/第一关.unity index 871ff4b..624120c 100644 --- a/Assets/Scenes/第一关.unity +++ b/Assets/Scenes/第一关.unity @@ -7346,7 +7346,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 367679635} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 77.7, y: -8.2, z: 0} + m_LocalPosition: {x: 205.3, y: -4.3, z: 0} m_LocalScale: {x: 0.39999998, y: 0.39999998, z: 0.39999998} m_Children: - {fileID: 1737112887496214201} @@ -18125,7 +18125,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!4 &635525186 Transform: m_ObjectHideFlags: 0 @@ -18155,6 +18155,7 @@ MonoBehaviour: shell: {fileID: 6293088924721911990, guid: bdd288e4cdf08da45b1a42ced9473872, type: 3} bombingArea: {fileID: 1842116604} BlackUI: {fileID: 342594116} + clip: {fileID: 8300000, guid: cabb95da73b9ce1489c8a3f20ab66215, type: 3} --- !u!1 &643242559 GameObject: m_ObjectHideFlags: 1 @@ -18184,7 +18185,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 61dddfdc5e0e44ca298d8f46f7f5a915, type: 3} m_Name: m_EditorClassIdentifier: - selectedFlowchart: {fileID: 1656856812} + selectedFlowchart: {fileID: 2005238328} --- !u!4 &643242561 Transform: m_ObjectHideFlags: 1 @@ -18846,7 +18847,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 2120912934} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &689982160 MonoBehaviour: @@ -19238,7 +19239,7 @@ RectTransform: m_Children: - {fileID: 1506236634} m_Father: {fileID: 2120912934} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -19271,7 +19272,7 @@ AudioSource: m_Enabled: 1 serializedVersion: 4 OutputAudioMixerGroup: {fileID: 0} - m_audioClip: {fileID: 0} + m_audioClip: {fileID: 8300000, guid: 70e9196dbc23a684ca9fb14ae6c3adf2, type: 3} m_PlayOnAwake: 0 m_Volume: 1 m_Pitch: 1 @@ -20079,7 +20080,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 2120912934} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &877218078 MonoBehaviour: @@ -20776,7 +20777,7 @@ AudioSource: OutputAudioMixerGroup: {fileID: 0} m_audioClip: {fileID: 8300000, guid: e76cf4bc92b5253449001bf42192e756, type: 3} m_PlayOnAwake: 0 - m_Volume: 1 + m_Volume: 0.6 m_Pitch: 1 Loop: 0 Mute: 0 @@ -22263,7 +22264,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1062651718} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 56.7, y: 6.8, z: 0} + m_LocalPosition: {x: -67.9, y: 0.7, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 367679636} @@ -22321,6 +22322,11 @@ MonoBehaviour: parallaxScaleX: 0.15 parallaxScaleY: 0.1 canParallax: 1 +--- !u!61 &1099035901 stripped +BoxCollider2D: + m_CorrespondingSourceObject: {fileID: 3118168874406839347, guid: a33f3ee35358b11469af30e9a746a630, type: 3} + m_PrefabInstance: {fileID: 1408330068} + m_PrefabAsset: {fileID: 0} --- !u!1 &1102619304 GameObject: m_ObjectHideFlags: 0 @@ -22426,7 +22432,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1142437218} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -29.00893, y: -3.1676853, z: -10} + m_LocalPosition: {x: -29.007486, y: -3.2993822, z: -10} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1608038909} @@ -23301,7 +23307,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 2120912934} - m_RootOrder: 5 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1253175841 MonoBehaviour: @@ -23900,6 +23906,10 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 105534304} m_Modifications: + - target: {fileID: 8082445130133277896, guid: fab0acc13c79e5248a20877602bd9007, type: 3} + propertyPath: heap + value: + objectReference: {fileID: 1099035901} - target: {fileID: 8082445130133277896, guid: fab0acc13c79e5248a20877602bd9007, type: 3} propertyPath: stone value: @@ -24520,7 +24530,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1477400527} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -34.960003, y: -3.2499988, z: -10} + m_LocalPosition: {x: -31.960001, y: -5.45, z: -10} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 32565896} @@ -24559,6 +24569,147 @@ MonoBehaviour: m_ChannelMask: -1 m_Gain: 1 m_Use2DDistance: 1 +--- !u!1 &1488677326 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1488677329} + - component: {fileID: 1488677328} + - component: {fileID: 1488677327} + m_Layer: 0 + m_Name: "BGMPlayer(\u6D4B\u8BD5\u7528\uFF0C\u6700\u540E\u8BF7\u5220\u9664)" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!114 &1488677327 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1488677326} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5abcc5e22bfdfe946a436b653015ecc8, type: 3} + m_Name: + m_EditorClassIdentifier: + fadeSpeed: 0.5 +--- !u!82 &1488677328 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1488677326} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 8300000, guid: 7f2888e01f36fda4db0112982c205369, type: 3} + m_PlayOnAwake: 1 + m_Volume: 0.6 + 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!4 &1488677329 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1488677326} + 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: 11 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1505565869 PrefabInstance: m_ObjectHideFlags: 0 @@ -30636,7 +30787,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 2120912934} - m_RootOrder: 4 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1656856814 MonoBehaviour: @@ -31250,6 +31401,254 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!1 &1836610251 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1836610255} + - component: {fileID: 1836610254} + - component: {fileID: 1836610253} + - component: {fileID: 1836610252} + - component: {fileID: 1836610256} + - component: {fileID: 1836610257} + - component: {fileID: 1836610258} + - component: {fileID: 1836610259} + - component: {fileID: 1836610260} + m_Layer: 0 + m_Name: "\u540C\u5FD7\u5B89\u606F" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1836610252 +MonoBehaviour: + m_ObjectHideFlags: 2 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1836610251} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2d7d417659cd54a6787f70f763950c34, type: 3} + m_Name: + m_EditorClassIdentifier: + parentBlock: {fileID: 1836610253} + suppressBlockAutoSelect: 0 + message: "\u540C\u5FD7\u5B89\u606F" +--- !u!114 &1836610253 +MonoBehaviour: + m_ObjectHideFlags: 2 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1836610251} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3d3d73aef2cfc4f51abf34ac00241f60, type: 3} + m_Name: + m_EditorClassIdentifier: + nodeRect: + serializedVersion: 2 + x: 67 + y: 70 + width: 112.4 + height: 40 + tint: {r: 1, g: 1, b: 1, a: 1} + useCustomTint: 0 + itemId: 0 + blockName: New Block + description: + eventHandler: {fileID: 1836610252} + commandList: + - {fileID: 1836610256} + - {fileID: 1836610257} + - {fileID: 1836610258} + - {fileID: 1836610259} + - {fileID: 1836610260} + suppressAllAutoSelections: 0 +--- !u!114 &1836610254 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1836610251} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7a334fe2ffb574b3583ff3b18b4792d3, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 1 + scrollPos: {x: 0, y: 0} + variablesScrollPos: {x: 0, y: 0} + variablesExpanded: 1 + blockViewHeight: 400 + zoom: 1 + scrollViewRect: + serializedVersion: 2 + x: -343 + y: -340 + width: 1114 + height: 859 + selectedBlocks: + - {fileID: 1836610253} + selectedCommands: + - {fileID: 1836610260} + variables: [] + description: + stepPause: 0 + colorCommands: 1 + hideComponents: 1 + saveSelection: 1 + localizationId: + showLineNumbers: 0 + hideCommands: [] + luaEnvironment: {fileID: 0} + luaBindingName: flowchart +--- !u!4 &1836610255 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1836610251} + 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: 2120912934} + m_RootOrder: 7 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1836610256 +MonoBehaviour: + m_ObjectHideFlags: 2 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1836610251} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ec422cd568a9c4a31ad7c36d0572b9da, type: 3} + m_Name: + m_EditorClassIdentifier: + itemId: 1 + indentLevel: 0 + storyText: "\u2026\u2026" + description: + character: {fileID: 0} + portrait: {fileID: 0} + voiceOverClip: {fileID: 0} + showAlways: 1 + showCount: 1 + extendPrevious: 0 + fadeWhenDone: 1 + waitForClick: 1 + stopVoiceover: 1 + waitForVO: 0 + setSayDialog: {fileID: 0} +--- !u!114 &1836610257 +MonoBehaviour: + m_ObjectHideFlags: 2 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1836610251} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ec422cd568a9c4a31ad7c36d0572b9da, type: 3} + m_Name: + m_EditorClassIdentifier: + itemId: 2 + indentLevel: 0 + storyText: "\uFF08\u81C2\u7AE0\u4E0A\u5199\u7740\u201C\u516B\u8DEF\u519B \u4E2D\u534E\u6C11\u56FD28\u5E74\u5EA6\u914D\u7528\u201D\uFF09" + description: + character: {fileID: 0} + portrait: {fileID: 0} + voiceOverClip: {fileID: 0} + showAlways: 1 + showCount: 1 + extendPrevious: 0 + fadeWhenDone: 1 + waitForClick: 1 + stopVoiceover: 1 + waitForVO: 0 + setSayDialog: {fileID: 0} +--- !u!114 &1836610258 +MonoBehaviour: + m_ObjectHideFlags: 2 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1836610251} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ec422cd568a9c4a31ad7c36d0572b9da, type: 3} + m_Name: + m_EditorClassIdentifier: + itemId: 3 + indentLevel: 0 + storyText: "\u53EF\u4EE5\u4F11\u606F\u4E86\uFF0C\u540C\u5FD7\u2026\u2026" + description: + character: {fileID: 1253175841} + portrait: {fileID: 21300000, guid: 28cf61809bd5319449892f6310525fd5, type: 3} + voiceOverClip: {fileID: 0} + showAlways: 1 + showCount: 1 + extendPrevious: 0 + fadeWhenDone: 1 + waitForClick: 1 + stopVoiceover: 1 + waitForVO: 0 + setSayDialog: {fileID: 0} +--- !u!114 &1836610259 +MonoBehaviour: + m_ObjectHideFlags: 2 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1836610251} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ec422cd568a9c4a31ad7c36d0572b9da, type: 3} + m_Name: + m_EditorClassIdentifier: + itemId: 4 + indentLevel: 0 + storyText: "\u4EFB\u52A1\u5F88\u7D27\u6025\uFF0C\u5982\u679C\u4E0D\u7EE7\u7EED\u524D\u8FDB\u7684\u8BDD\u2026\u2026" + description: + character: {fileID: 1253175841} + portrait: {fileID: 21300000, guid: 28cf61809bd5319449892f6310525fd5, type: 3} + voiceOverClip: {fileID: 0} + showAlways: 1 + showCount: 1 + extendPrevious: 0 + fadeWhenDone: 1 + waitForClick: 1 + stopVoiceover: 1 + waitForVO: 0 + setSayDialog: {fileID: 0} +--- !u!114 &1836610260 +MonoBehaviour: + m_ObjectHideFlags: 2 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1836610251} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 17a200dbd67304446a3019434503338a, type: 3} + m_Name: + m_EditorClassIdentifier: + itemId: 5 + indentLevel: 0 + targetObject: {fileID: 1964981347} + methodName: OnCall + delay: 0 --- !u!1 &1837969015 GameObject: m_ObjectHideFlags: 0 @@ -41074,7 +41473,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 2120912934} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1921015477 GameObject: @@ -41602,6 +42001,167 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1966298235} m_CullTransparentMesh: 1 +--- !u!1 &2005238324 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2005238329} + - component: {fileID: 2005238328} + - component: {fileID: 2005238327} + - component: {fileID: 2005238326} + - component: {fileID: 2005238325} + - component: {fileID: 2005238330} + m_Layer: 0 + m_Name: "\u6CA1\u4FEE\u5B8C\u5462" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &2005238325 +MonoBehaviour: + m_ObjectHideFlags: 2 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2005238324} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ec422cd568a9c4a31ad7c36d0572b9da, type: 3} + m_Name: + m_EditorClassIdentifier: + itemId: 1 + indentLevel: 0 + storyText: "\u7535\u62A5\u673A\u6CA1\u6709\u53CD\u5E94\u2026\u2026\u4E00\u5B9A\u8FD8\u6709\u54EA\u91CC\u7684\u7535\u8BDD\u7EBF\u6CA1\u6709\u4FEE\u597D" + description: + character: {fileID: 1253175841} + portrait: {fileID: 21300000, guid: 28cf61809bd5319449892f6310525fd5, type: 3} + voiceOverClip: {fileID: 0} + showAlways: 1 + showCount: 1 + extendPrevious: 0 + fadeWhenDone: 1 + waitForClick: 1 + stopVoiceover: 1 + waitForVO: 0 + setSayDialog: {fileID: 0} +--- !u!114 &2005238326 +MonoBehaviour: + m_ObjectHideFlags: 2 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2005238324} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2d7d417659cd54a6787f70f763950c34, type: 3} + m_Name: + m_EditorClassIdentifier: + parentBlock: {fileID: 2005238327} + suppressBlockAutoSelect: 0 + message: "\u6CA1\u4FEE\u5B8C\u5462" +--- !u!114 &2005238327 +MonoBehaviour: + m_ObjectHideFlags: 2 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2005238324} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3d3d73aef2cfc4f51abf34ac00241f60, type: 3} + m_Name: + m_EditorClassIdentifier: + nodeRect: + serializedVersion: 2 + x: 66 + y: 71 + width: 112.4 + height: 40 + tint: {r: 1, g: 1, b: 1, a: 1} + useCustomTint: 0 + itemId: 0 + blockName: New Block + description: + eventHandler: {fileID: 2005238326} + commandList: + - {fileID: 2005238325} + - {fileID: 2005238330} + suppressAllAutoSelections: 0 +--- !u!114 &2005238328 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2005238324} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7a334fe2ffb574b3583ff3b18b4792d3, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 1 + scrollPos: {x: 0, y: 0} + variablesScrollPos: {x: 0, y: 0} + variablesExpanded: 1 + blockViewHeight: 306.25 + zoom: 1 + scrollViewRect: + serializedVersion: 2 + x: -343 + y: -340 + width: 1114 + height: 859 + selectedBlocks: + - {fileID: 2005238327} + selectedCommands: + - {fileID: 2005238330} + variables: [] + description: + stepPause: 0 + colorCommands: 1 + hideComponents: 1 + saveSelection: 1 + localizationId: + showLineNumbers: 0 + hideCommands: [] + luaEnvironment: {fileID: 0} + luaBindingName: flowchart +--- !u!4 &2005238329 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2005238324} + 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: 2120912934} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &2005238330 +MonoBehaviour: + m_ObjectHideFlags: 2 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2005238324} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 17a200dbd67304446a3019434503338a, type: 3} + m_Name: + m_EditorClassIdentifier: + itemId: 2 + indentLevel: 0 + targetObject: {fileID: 1964981347} + methodName: OnCall + delay: 0 --- !u!1 &2020193185 GameObject: m_ObjectHideFlags: 0 @@ -42349,12 +42909,14 @@ Transform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: + - {fileID: 2005238329} - {fileID: 736402862} - {fileID: 689982159} - {fileID: 877218077} - {fileID: 1906947535} - {fileID: 1656856813} - {fileID: 1253175840} + - {fileID: 1836610255} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -42545,6 +43107,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_interface: {fileID: 0} + isDead: 0 --- !u!50 &2128914780 Rigidbody2D: serializedVersion: 4 @@ -43182,7 +43745,7 @@ MonoBehaviour: m_BoneTransforms: - {fileID: 4936508675712544306} m_Bounds: - m_Center: {x: 0.0034318566, y: -0.0018951595, z: 0} + m_Center: {x: 0.0034242272, y: -0.0018970668, z: 0} m_Extent: {x: 0.68153024, y: 0.4230354, z: 0} m_UseBatching: 1 m_AlwaysUpdate: 1 @@ -43350,7 +43913,7 @@ MonoBehaviour: m_BoneTransforms: - {fileID: 2934879650646324577} m_Bounds: - m_Center: {x: 0.0007892251, y: -0.002234161, z: 0} + m_Center: {x: 0.0007815957, y: -0.0022351146, z: 0} m_Extent: {x: 0.6941651, y: 0.8818251, z: 0} m_UseBatching: 1 m_AlwaysUpdate: 1 @@ -43535,7 +44098,7 @@ MonoBehaviour: m_BoneTransforms: - {fileID: 7089406931308197820} m_Bounds: - m_Center: {x: -0.008472621, y: 0.000013709068, z: 0} + m_Center: {x: -0.008472621, y: 0.000012755394, z: 0} m_Extent: {x: 0.55653495, y: 0.69665515, z: 0} m_UseBatching: 1 m_AlwaysUpdate: 1 @@ -43606,7 +44169,7 @@ MonoBehaviour: m_BoneTransforms: - {fileID: 2360827735431813924} m_Bounds: - m_Center: {x: -0.0004273653, y: 0.0043129325, z: 0} + m_Center: {x: -0.0004349947, y: 0.0043129325, z: 0} m_Extent: {x: 0.689565, y: 0.9506854, z: 0} m_UseBatching: 1 m_AlwaysUpdate: 1 @@ -44339,7 +44902,7 @@ MonoBehaviour: m_BoneTransforms: - {fileID: 4718247844144699107} m_Bounds: - m_Center: {x: 0.0019620657, y: 0, z: 0} + m_Center: {x: 0.0019620657, y: -0.0000019073486, z: 0} m_Extent: {x: 0.57801485, y: 0.9349998, z: 0} m_UseBatching: 1 m_AlwaysUpdate: 1 @@ -44377,7 +44940,7 @@ MonoBehaviour: m_BoneTransforms: - {fileID: 5215891186772959842} m_Bounds: - m_Center: {x: -0.000030636787, y: 0.0016979575, z: 0} + m_Center: {x: -0.000038266182, y: 0.0016960502, z: 0} m_Extent: {x: 1.1549999, y: 0.77910495, z: 0} m_UseBatching: 1 m_AlwaysUpdate: 1 @@ -45457,7 +46020,7 @@ MonoBehaviour: m_BoneTransforms: - {fileID: 6675447233366868755} m_Bounds: - m_Center: {x: -0.0000731349, y: 0.00060486794, z: 0} + m_Center: {x: -0.000080764294, y: 0.00060486794, z: 0} m_Extent: {x: 0.705515, y: 1.2171149, z: 0} m_UseBatching: 1 m_AlwaysUpdate: 1 @@ -45548,7 +46111,7 @@ MonoBehaviour: m_BoneTransforms: - {fileID: 7263140363742385229} m_Bounds: - m_Center: {x: -0.004293084, y: 0.0007251501, z: 0} + m_Center: {x: -0.0043007135, y: 0.0007251501, z: 0} m_Extent: {x: 0.8907454, y: 1.2819755, z: 0} m_UseBatching: 1 m_AlwaysUpdate: 1 @@ -45674,7 +46237,7 @@ MonoBehaviour: - {fileID: 8355431490900499643} - {fileID: 4936508675712544306} m_Bounds: - m_Center: {x: 0.0023074746, y: -0.0016773343, z: 0} + m_Center: {x: 0.0022998452, y: -0.0016773343, z: 0} m_Extent: {x: 0.68268514, y: 0.4232551, z: 0} m_UseBatching: 1 m_AlwaysUpdate: 1 @@ -45804,7 +46367,7 @@ MonoBehaviour: m_BoneTransforms: - {fileID: 3397380986102525386} m_Bounds: - m_Center: {x: 0.0013067722, y: 0.0000019073486, z: 0} + m_Center: {x: 0.0012991428, y: 0.0000019073486, z: 0} m_Extent: {x: 0.7836551, y: 1.035, z: 0} m_UseBatching: 1 m_AlwaysUpdate: 1 @@ -45875,7 +46438,7 @@ MonoBehaviour: m_BoneTransforms: - {fileID: 5215891186772959842} m_Bounds: - m_Center: {x: 0.0029941797, y: -0.002632141, z: 0} + m_Center: {x: 0.0029865503, y: -0.0026350021, z: 0} m_Extent: {x: 0.9919598, y: 1.2031548, z: 0} m_UseBatching: 1 m_AlwaysUpdate: 1 @@ -45911,7 +46474,7 @@ MonoBehaviour: m_BoneTransforms: - {fileID: 8339351226288312874} m_Bounds: - m_Center: {x: 0.0016745329, y: -0.00012481213, z: 0} + m_Center: {x: 0.0016669035, y: -0.00012481213, z: 0} m_Extent: {x: 1.0732954, y: 1.2652456, z: 0} m_UseBatching: 1 m_AlwaysUpdate: 1 diff --git a/Assets/Scenes/第二关.unity b/Assets/Scenes/第二关.unity index 26389f8..da10bcb 100644 --- a/Assets/Scenes/第二关.unity +++ b/Assets/Scenes/第二关.unity @@ -611,7 +611,7 @@ MonoBehaviour: - {fileID: 1960939660} - {fileID: 27089236} m_Bounds: - m_Center: {x: -56.530003, y: -23.92, z: 0} + m_Center: {x: -56.53, y: -23.920002, z: 0} m_Extent: {x: 1.3650017, y: 1.6399994, z: 0} m_UseBatching: 1 m_AlwaysUpdate: 1 @@ -705,7 +705,7 @@ Transform: - {fileID: 1949207779} - {fileID: 1094831319} m_Father: {fileID: 0} - m_RootOrder: 7 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &92299425 stripped GameObject: @@ -1028,7 +1028,7 @@ MonoBehaviour: m_BoneTransforms: - {fileID: 1648463582} m_Bounds: - m_Center: {x: 0.003466189, y: -0.0018946826, z: 0} + m_Center: {x: 0.003477633, y: -0.0018932521, z: 0} m_Extent: {x: 0.68153024, y: 0.4230354, z: 0} m_UseBatching: 1 m_AlwaysUpdate: 1 @@ -1450,7 +1450,7 @@ MonoBehaviour: m_BoneTransforms: - {fileID: 498685356} m_Bounds: - m_Center: {x: 0.0017040968, y: -0.00012552738, z: 0} + m_Center: {x: 0.0017050505, y: -0.00012671947, z: 0} m_Extent: {x: 1.0732954, y: 1.2652456, z: 0} m_UseBatching: 1 m_AlwaysUpdate: 1 @@ -1584,7 +1584,7 @@ MonoBehaviour: m_BoneTransforms: - {fileID: 382896906} m_Bounds: - m_Center: {x: -0.0042568445, y: 0.00072443485, z: 0} + m_Center: {x: -0.004254937, y: 0.0007251501, z: 0} m_Extent: {x: 0.8907454, y: 1.2819755, z: 0} m_UseBatching: 1 m_AlwaysUpdate: 1 @@ -1858,7 +1858,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 9 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &254342788 stripped GameObject: @@ -3121,7 +3121,7 @@ MonoBehaviour: m_BoneTransforms: - {fileID: 1495285309} m_Bounds: - m_Center: {x: -0.00044548512, y: 0.0043134093, z: 0} + m_Center: {x: -0.0004426241, y: 0.0043186545, z: 0} m_Extent: {x: 0.689565, y: 0.9506854, z: 0} m_UseBatching: 1 m_AlwaysUpdate: 1 @@ -3574,7 +3574,7 @@ Transform: - {fileID: 99983236} - {fileID: 830736975} m_Father: {fileID: 0} - m_RootOrder: 5 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &406015047 GameObject: @@ -4075,7 +4075,7 @@ MonoBehaviour: m_BoneTransforms: - {fileID: 1756251741} m_Bounds: - m_Center: {x: -0.000007748604, y: 0.0016953349, z: 0} + m_Center: {x: -0.000007748604, y: 0.0016970038, z: 0} m_Extent: {x: 1.1549999, y: 0.77910495, z: 0} m_UseBatching: 1 m_AlwaysUpdate: 1 @@ -4346,7 +4346,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 509834882} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 39.9, y: -0.2, z: 0} + m_LocalPosition: {x: -4.01, y: -6.33, z: 0} m_LocalScale: {x: 0.39999998, y: 0.39999998, z: 0.39999998} m_Children: - {fileID: 1720952666} @@ -4651,7 +4651,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 10 + m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &619059046 GameObject: @@ -4731,7 +4731,7 @@ MonoBehaviour: m_BoneTransforms: - {fileID: 1756251741} m_Bounds: - m_Center: {x: 0.0030323267, y: -0.0026345253, z: 0} + m_Center: {x: 0.0030323267, y: -0.0026340485, z: 0} m_Extent: {x: 0.9919598, y: 1.2031548, z: 0} m_UseBatching: 1 m_AlwaysUpdate: 1 @@ -4834,7 +4834,7 @@ MonoBehaviour: m_BoneTransforms: - {fileID: 1960939660} m_Bounds: - m_Center: {x: -0.000002861023, y: 2.6999998, z: 0} + m_Center: {x: -0.0000076293945, y: 2.6999989, z: 0} m_Extent: {x: 1.4950001, y: 1.3900001, z: 0} m_UseBatching: 1 m_AlwaysUpdate: 1 @@ -5201,7 +5201,7 @@ MonoBehaviour: m_BoneTransforms: - {fileID: 1960683337} m_Bounds: - m_Center: {x: 0.0013391972, y: 0, z: 0} + m_Center: {x: 0.0013449192, y: 0, z: 0} m_Extent: {x: 0.7836551, y: 1.035, z: 0} m_UseBatching: 1 m_AlwaysUpdate: 1 @@ -6180,7 +6180,7 @@ MonoBehaviour: m_BoneTransforms: - {fileID: 1227561594} m_Bounds: - m_Center: {x: -0.000033080578, y: 0.00060498714, z: 0} + m_Center: {x: -0.00004261732, y: 0.00060486794, z: 0} m_Extent: {x: 0.705515, y: 1.2171149, z: 0} m_UseBatching: 1 m_AlwaysUpdate: 1 @@ -6786,7 +6786,7 @@ MonoBehaviour: - {fileID: 1684178002} - {fileID: 1648463582} m_Bounds: - m_Center: {x: 0.0023160577, y: -0.0016759038, z: 0} + m_Center: {x: 0.002315104, y: -0.0016735196, z: 0} m_Extent: {x: 0.68268514, y: 0.4232551, z: 0} m_UseBatching: 1 m_AlwaysUpdate: 1 @@ -7783,7 +7783,7 @@ Transform: - {fileID: 163258404} - {fileID: 1482928228} m_Father: {fileID: 0} - m_RootOrder: 2 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1073782638 GameObject: @@ -7912,6 +7912,147 @@ AudioSource: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 +--- !u!1 &1080112955 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1080112958} + - component: {fileID: 1080112957} + - component: {fileID: 1080112956} + m_Layer: 0 + m_Name: "BGMPlayer(\u6D4B\u8BD5\u7528\uFF0C\u6700\u540E\u8BF7\u5220\u9664)" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!114 &1080112956 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1080112955} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5abcc5e22bfdfe946a436b653015ecc8, type: 3} + m_Name: + m_EditorClassIdentifier: + fadeSpeed: 0.5 +--- !u!82 &1080112957 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1080112955} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 8300000, guid: cabb95da73b9ce1489c8a3f20ab66215, type: 3} + m_PlayOnAwake: 1 + m_Volume: 0.6 + 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!4 &1080112958 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1080112955} + 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: 10 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1082183649 GameObject: m_ObjectHideFlags: 0 @@ -7960,7 +8101,7 @@ MonoBehaviour: m_BoneTransforms: - {fileID: 384365923} m_Bounds: - m_Center: {x: 0.00082451105, y: -0.0022351146, z: 0} + m_Center: {x: 0.00083500147, y: -0.0022332072, z: 0} m_Extent: {x: 0.6941651, y: 0.8818251, z: 0} m_UseBatching: 1 m_AlwaysUpdate: 1 @@ -8063,7 +8204,7 @@ MonoBehaviour: m_BoneTransforms: - {fileID: 1104417632} m_Bounds: - m_Center: {x: 0.002166748, y: 0, z: 0} + m_Center: {x: 0.00217247, y: 0, z: 0} m_Extent: {x: 0.60282004, y: 0.69500005, z: 0} m_UseBatching: 1 m_AlwaysUpdate: 1 @@ -9130,12 +9271,12 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1204472792} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + 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: 1 + m_Father: {fileID: 1575830742} + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1206256610 GameObject: @@ -9890,7 +10031,7 @@ MonoBehaviour: m_BoneTransforms: - {fileID: 1100102619} m_Bounds: - m_Center: {x: -0.008468807, y: 0.000014901161, z: 0} + m_Center: {x: -0.008464992, y: 0.000014662743, z: 0} m_Extent: {x: 0.55653495, y: 0.69665515, z: 0} m_UseBatching: 1 m_AlwaysUpdate: 1 @@ -10557,7 +10698,7 @@ Transform: - {fileID: 437352066} - {fileID: 950897365} m_Father: {fileID: 0} - m_RootOrder: 3 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1490503265 GameObject: @@ -10958,7 +11099,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 8 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1557400951 GameObject: @@ -11018,7 +11159,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1575635868} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 9.3043995, y: 1.0642443, z: -10} + m_LocalPosition: {x: -34.605602, y: -5.065755, z: -10} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1663511912} @@ -11109,8 +11250,9 @@ Transform: - {fileID: 112137354} - {fileID: 1557400952} - {fileID: 1242176654} + - {fileID: 1204472795} m_Father: {fileID: 0} - m_RootOrder: 6 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!95 &1580265791 Animator: @@ -11160,7 +11302,7 @@ Transform: m_Children: - {fileID: 509834883} m_Father: {fileID: 0} - m_RootOrder: 4 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1606528818 GameObject: @@ -12057,7 +12199,7 @@ MonoBehaviour: m_BoneTransforms: - {fileID: 143988934} m_Bounds: - m_Center: {x: 0.0019830465, y: -0.0000009536743, z: 0} + m_Center: {x: 0.0019773245, y: -0.0000019073486, z: 0} m_Extent: {x: 0.57801485, y: 0.9349998, z: 0} m_UseBatching: 1 m_AlwaysUpdate: 1 @@ -13487,8 +13629,8 @@ MonoBehaviour: - {fileID: 27089236} - {fileID: 1960939660} m_Bounds: - m_Center: {x: 0.002198577, y: -0.0058805943, z: 0} - m_Extent: {x: 1.54779, y: 2.3711, z: 0} + m_Center: {x: 0.002210021, y: -0.005881071, z: 0} + m_Extent: {x: 1.54779, y: 2.371099, z: 0} m_UseBatching: 1 m_AlwaysUpdate: 1 --- !u!212 &1767946773 @@ -13785,7 +13927,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1791259307} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 9.3043995, y: 1.0642443, z: -10} + m_LocalPosition: {x: -28.859463, y: -3.1726923, z: -10} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1031032740} @@ -14530,7 +14672,7 @@ AudioSource: m_Enabled: 1 serializedVersion: 4 OutputAudioMixerGroup: {fileID: 0} - m_audioClip: {fileID: 0} + m_audioClip: {fileID: 8300000, guid: 70e9196dbc23a684ca9fb14ae6c3adf2, type: 3} m_PlayOnAwake: 0 m_Volume: 1 m_Pitch: 1 @@ -15822,7 +15964,7 @@ MonoBehaviour: m_BoneTransforms: - {fileID: 816793905} m_Bounds: - m_Center: {x: 6.369994, y: -0.0021147728, z: 0} + m_Center: {x: 6.369995, y: -0.0021139383, z: 0} m_Extent: {x: 0.855, y: 1.1198149, z: 0} m_UseBatching: 1 m_AlwaysUpdate: 1 diff --git a/Assets/Scripts/M_Player.cs b/Assets/Scripts/M_Player.cs index 2914fc4..66026fb 100644 --- a/Assets/Scripts/M_Player.cs +++ b/Assets/Scripts/M_Player.cs @@ -381,7 +381,7 @@ public class M_Player : MonoBehaviour M_Animator.SetBool("throwingState",false); M_Animator.SetBool("ReadyToThrow",false); //为了解决问题需要到下一帧关闭丢出动画指令 - yield return new WaitForEndOfFrame(); + yield return new WaitForSeconds(1f); M_Animator.SetBool("NowThrow",false); } diff --git a/Assets/Scripts/事件/AfterCoding.cs b/Assets/Scripts/事件/AfterCoding.cs index 1460baf..770f67d 100644 --- a/Assets/Scripts/事件/AfterCoding.cs +++ b/Assets/Scripts/事件/AfterCoding.cs @@ -13,9 +13,11 @@ public class AfterCoding : Event public BombingArea bombingArea; [Tooltip("请拖入黑幕")] public GameObject BlackUI; + [Tooltip("请拖第二关BGM")] + public AudioClip clip; void Start() { - OnCall(); + //OnCall(); } public override void OnCall() { @@ -48,6 +50,7 @@ public class AfterCoding : Event yield return new WaitForSeconds(1.1f + 3f);//炸死动画1.1秒 + 3秒留给玩家反应 //黑屏(一张铺满的黑色UI显示) BlackUI.SetActive(true); + FindObjectOfType().ChangedTheBGM(clip); yield return new WaitForSeconds(2f);//两秒后,转移场景 SceneManager.LoadScene("第二关"); } diff --git a/Assets/Scripts/事件/VeteranSacrifice.cs b/Assets/Scripts/事件/VeteranSacrifice.cs index 3d4e903..6067fa2 100644 --- a/Assets/Scripts/事件/VeteranSacrifice.cs +++ b/Assets/Scripts/事件/VeteranSacrifice.cs @@ -78,8 +78,9 @@ public class VeteranSacrifice : Event target = origin; //7.恢复玩家操作地图 FindObjectOfType().SwitchCurrentActionMap("PlayerNormal"); - //8.关闭老兵碰撞体方便玩家回头查看 + //8.打开老兵触发器方便玩家回头查看 FindObjectOfType().GetComponent().isTrigger = true; + FindObjectOfType().isDead = true; //9.标记自己已经被触发过 hasBeenOnCall = true; parallax.canParallax = true; diff --git a/Assets/Scripts/事件/WhenTheCodeAndConversationAreCompleted.cs b/Assets/Scripts/事件/WhenTheCodeAndConversationAreCompleted.cs index 6b4f8ae..8831339 100644 --- a/Assets/Scripts/事件/WhenTheCodeAndConversationAreCompleted.cs +++ b/Assets/Scripts/事件/WhenTheCodeAndConversationAreCompleted.cs @@ -10,6 +10,8 @@ public class WhenTheCodeAndConversationAreCompleted : Event [Tooltip("请拖入黑幕游戏物体")] public GameObject blackUI; private IndexRecoder indexRecoder; + [Tooltip("请拖入序章-战场的BGM")] + public AudioClip clip; void Start() { indexRecoder = FindObjectOfType(); @@ -24,6 +26,7 @@ public class WhenTheCodeAndConversationAreCompleted : Event public override void OnCall() { blackUI.SetActive(true); + FindObjectOfType().ChangedTheBGM(clip); Invoke("LoadScene",indexRecoder.blackUITime); } diff --git a/Assets/Scripts/信息相关/IndexRecoder.cs b/Assets/Scripts/信息相关/IndexRecoder.cs index 714c414..61c5630 100644 --- a/Assets/Scripts/信息相关/IndexRecoder.cs +++ b/Assets/Scripts/信息相关/IndexRecoder.cs @@ -65,7 +65,7 @@ public class IndexRecoder : MonoBehaviour codeBook.Add("----.","9"); codeBook.Add("-----","0"); - stageName = ""; + stageName = "准备出发"; } // Update is called once per frame diff --git a/Assets/Scripts/具象物体/AFakeMachine.cs b/Assets/Scripts/具象物体/AFakeMachine.cs index 9437047..66da3a8 100644 --- a/Assets/Scripts/具象物体/AFakeMachine.cs +++ b/Assets/Scripts/具象物体/AFakeMachine.cs @@ -2,6 +2,8 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; using UnityEngine.SceneManagement; +using Fungus; +using UnityEngine.InputSystem; public class AFakeMachine : Interactive { @@ -11,6 +13,8 @@ public class AFakeMachine : Interactive public AudioSource onAudio; [Tooltip("拖入黑幕游戏物体")] public GameObject blackUI; + [Tooltip("请拖入序章家中前两幕的背景音乐")] + public AudioClip clip; void Start() { @@ -35,12 +39,16 @@ public class AFakeMachine : Interactive indexRecoder.ChangeStageName("序章-家中-已打码"); onAudio.Play(); blackUI.SetActive(true); + FindObjectOfType().ChangedTheBGM(clip); Invoke("loadSceneHome",indexRecoder.blackUITime); } else { //若还没OK,之后等策划编写新的内容 Debug.Log("还有线路没有联通"); + FindObjectOfType().SwitchCurrentActionMap("NullMap"); + Flowchart.BroadcastFungusMessage("没修完呢"); + } } diff --git a/Assets/Scripts/具象物体/Door.cs b/Assets/Scripts/具象物体/Door.cs index 07d4e6c..ec3ba78 100644 --- a/Assets/Scripts/具象物体/Door.cs +++ b/Assets/Scripts/具象物体/Door.cs @@ -10,6 +10,8 @@ public class Door : Interactive //可交互对象:门的控制类 [Tooltip("拖入黑幕")] public GameObject blackUI; + [Tooltip("拖入第一关的BGM")] + public AudioClip clip; public override void OnCall() { //在开门演出的多态,当门被唤醒,显示CG @@ -27,6 +29,7 @@ public class Door : Interactive // //加载第一关场景 // SceneManager.LoadScene("第一关"); blackUI.SetActive(true); + FindObjectOfType().ChangedTheBGM(clip); Invoke("LoadScenen",FindObjectOfType().blackUITime); } else diff --git a/Assets/Scripts/具象物体/Machine.cs b/Assets/Scripts/具象物体/Machine.cs index 67c57f9..b69e1d8 100644 --- a/Assets/Scripts/具象物体/Machine.cs +++ b/Assets/Scripts/具象物体/Machine.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using UnityEngine; using UnityEngine.UI; using UnityEngine.InputSystem; +using Fungus; public class Machine : Interactive { @@ -62,7 +63,9 @@ public class Machine : Interactive } else { - Debug.Log("还有线路没通"); + //如果还有线路没通,弹出对话【没修完呢】 + FindObjectOfType().SwitchCurrentActionMap("NullMap"); + Flowchart.BroadcastFungusMessage("没修完呢"); } } @@ -169,6 +172,10 @@ public class Machine : Interactive } Debug.Log("翻译的结果是:"+result); tempTranslateResult = result; + + //开发者捷径,如果翻译结果为"..--.","864246511",直接判定为打完所有句子 + if(result == "864246511") OnAllSentenceClear(); + // } //清除检查者函数。从自身Codeing函数调用,每次有新字符输入的时候就调用。 diff --git a/Assets/Scripts/具象物体/MachineGunner.cs b/Assets/Scripts/具象物体/MachineGunner.cs index d617b8a..294377a 100644 --- a/Assets/Scripts/具象物体/MachineGunner.cs +++ b/Assets/Scripts/具象物体/MachineGunner.cs @@ -20,6 +20,8 @@ public class MachineGunner : MonoBehaviour public PolygonCollider2D stone;// public GunLight gunLight;//枪口的光闪烁控制脚本 + [Tooltip("拖入老兵旁边的投掷物堆")] + public BoxCollider2D heap; void Start() @@ -91,6 +93,9 @@ public class MachineGunner : MonoBehaviour } //关闭挡枪石头的碰撞体 stone.enabled = false; + //关闭投掷物堆的触发器 + heap.enabled = false; + } } diff --git a/Assets/Scripts/具象物体/Veteran.cs b/Assets/Scripts/具象物体/Veteran.cs index f0eeea6..dc4676c 100644 --- a/Assets/Scripts/具象物体/Veteran.cs +++ b/Assets/Scripts/具象物体/Veteran.cs @@ -9,6 +9,7 @@ public class Veteran : Interactive //控制老兵的类 private MachineGunner gunner; private bool hasCalledChat1 = false;//记录自己是否已经呼叫过对话1,即【你想送命?】 + public bool isDead = false;//记录自己是否已经牺牲 void Start() { gunner = FindObjectOfType(); @@ -51,9 +52,18 @@ public class Veteran : Interactive public override void OnCall() { - //如果能运行到这里,说明敌人已经被击晕了,直接触发对话【你还挺有能耐】 - FindObjectOfType().SwitchCurrentActionMap("NullMap"); - Flowchart.BroadcastFungusMessage("你还挺有能耐"); + if(!isDead)//如果还没牺牲,触发对话【你还挺有能耐】 + { + //如果能运行到这里,说明敌人已经被击晕了,直接触发对话【你还挺有能耐】 + FindObjectOfType().SwitchCurrentActionMap("NullMap"); + Flowchart.BroadcastFungusMessage("你还挺有能耐"); + } + else//若已经牺牲 + { + FindObjectOfType().SwitchCurrentActionMap("NullMap"); + Flowchart.BroadcastFungusMessage("同志安息"); + } + } } diff --git a/Assets/Scripts/抽象的东西/BGMPlayer.cs b/Assets/Scripts/抽象的东西/BGMPlayer.cs new file mode 100644 index 0000000..c95ba80 --- /dev/null +++ b/Assets/Scripts/抽象的东西/BGMPlayer.cs @@ -0,0 +1,45 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class BGMPlayer : MonoBehaviour +{ + // Start is called before the first frame update + private AudioSource audioPlayer; + private bool isSlowlyStopTheClip; + [Tooltip("请填入BGM切换时淡出原BGM的速度")] + public float fadeSpeed; + private 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(); + } + } + } + + 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..1d9a96b --- /dev/null +++ b/Assets/Scripts/抽象的东西/BGMPlayer.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 5abcc5e22bfdfe946a436b653015ecc8 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/CG动画/开门CG-带淡出.mp4 b/Assets/Sprites/CG动画/开门CG-带淡出.mp4 new file mode 100644 index 0000000..f97c913 Binary files /dev/null and b/Assets/Sprites/CG动画/开门CG-带淡出.mp4 differ diff --git a/Assets/Sprites/CG动画/开门CG-带淡出.mp4.meta b/Assets/Sprites/CG动画/开门CG-带淡出.mp4.meta new file mode 100644 index 0000000..4618d38 --- /dev/null +++ b/Assets/Sprites/CG动画/开门CG-带淡出.mp4.meta @@ -0,0 +1,18 @@ +fileFormatVersion: 2 +guid: 4c39142a4822aea4fad7555b49f8681f +VideoClipImporter: + externalObjects: {} + serializedVersion: 2 + frameRange: 0 + startFrame: -1 + endFrame: -1 + colorSpace: 0 + deinterlace: 0 + encodeAlpha: 0 + flipVertical: 0 + flipHorizontal: 0 + importAudio: 1 + targetSettings: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/音乐.meta b/Assets/音乐.meta new file mode 100644 index 0000000..181a576 --- /dev/null +++ b/Assets/音乐.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ce5d400b76e7321438ec39e5b56bd9e8 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/音乐/高铭 - 人家休假我加班.flac b/Assets/音乐/高铭 - 人家休假我加班.flac new file mode 100644 index 0000000..51ce40a Binary files /dev/null and b/Assets/音乐/高铭 - 人家休假我加班.flac differ diff --git a/Assets/音乐/高铭 - 人家休假我加班.flac.meta b/Assets/音乐/高铭 - 人家休假我加班.flac.meta new file mode 100644 index 0000000..c471908 --- /dev/null +++ b/Assets/音乐/高铭 - 人家休假我加班.flac.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: cabb95da73b9ce1489c8a3f20ab66215 +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..526940d 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..fb60d4e --- /dev/null +++ b/Assets/音乐/高铭 - 命运.mp3.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 7f2888e01f36fda4db0112982c205369 +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..8d10208 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..971977b --- /dev/null +++ b/Assets/音乐/高铭 - 无助.mp3.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 7c272ac1b16fce34db9cef8ecf2407f8 +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..ac03325 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..fc82d16 --- /dev/null +++ b/Assets/音乐/高铭 - 无法挣脱.mp3.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: b88895df6483af843a716e3d4913e6b0 +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/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset index 0235313..dbf4623 100644 --- a/UserSettings/EditorUserSettings.asset +++ b/UserSettings/EditorUserSettings.asset @@ -9,17 +9,17 @@ EditorUserSettings: value: 22424703114646680e0b0227036c6c111b07142f1f2b233e2867083debf42d flags: 0 RecentlyUsedScenePath-1: - value: 22424703114646680e0b0227036cdacaf990d3ea61ade8e6a9f1d07df7ee3d2cfb - flags: 0 - RecentlyUsedScenePath-2: - value: 22424703114646680e0b0227036cdacaf990d3ea61aecec8a8d5c77df7ee3d2cfb - flags: 0 - RecentlyUsedScenePath-3: value: 22424703114646680e0b0227036cd8dcda93c2c6a9cdf57e38271427fb flags: 0 - RecentlyUsedScenePath-4: + RecentlyUsedScenePath-2: value: 22424703114646680e0b0227036cd8dcda93c0caa9cdf57e38271427fb flags: 0 + RecentlyUsedScenePath-3: + value: 22424703114646680e0b0227036cdacaf990d3ea61ade8e6a9f1d07df7ee3d2cfb + flags: 0 + RecentlyUsedScenePath-4: + value: 22424703114646680e0b0227036cdacaf990d3ea61aecec8a8d5c77df7ee3d2cfb + flags: 0 UnityEditor.ShaderGraph.Blackboard: value: 18135939215a0a5004000b0e15254b524c030a3f2964643d120d1230e9e93a3fd6e826abbd2e2d293c4ead313b08042de6030a0afa240c0d020be94c4bae495d41895ac825e0100ec20313c0d91cddccd3d0c7efcca9bd898d91f0beb6fdd1cbfceba0b9f0b3bed8e8f5ace1ff8c978883d3f59e98969989eacfcc flags: 0