From 37c4934ad381c1c748189d6b9e449eb0cea142e9 Mon Sep 17 00:00:00 2001 From: Ding Yuntian <1491671119@qq.com> Date: Mon, 30 Dec 2024 23:31:37 +0800 Subject: [PATCH] =?UTF-8?q?=E9=9F=B3=E9=A2=91=E6=8E=A5=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Resources/Characters/佩佩.prefab | 56 +- .../Basic Function/Audio Manager.prefab | 1057 +++++++++-------- .../Prefabs/Fix/Editor Mode Func.prefab | 38 +- Assets/Scenes/ExpressFixScene.unity | 36 - Assets/Scenes/PeipeiFixScene.unity | 188 ++- Assets/Scenes/Persistence.unity | 879 +------------- .../Scripts/Dialog System/DialogController.cs | 14 - .../Scripts/FixSystemNew/FixSystemCenter.cs | 1 + .../StateTransition/BodyModuleTransition.cs | 5 +- .../StateTransition/ClinicTransition.cs | 16 +- .../Framework/AudioKit/AudioManager.cs | 30 + .../Scripts/Framework/OtherKit/MonoCenter.cs | 1 - .../Scripts/MiniGame/Engine/EngineSystem.cs | 52 +- Assets/Scripts/MiniGame/Engine/OilGate.cs | 5 + 14 files changed, 847 insertions(+), 1531 deletions(-) diff --git a/Assets/Resources/Characters/佩佩.prefab b/Assets/Resources/Characters/佩佩.prefab index 3df0fe46c..d3b7536a2 100644 --- a/Assets/Resources/Characters/佩佩.prefab +++ b/Assets/Resources/Characters/佩佩.prefab @@ -70,9 +70,9 @@ SpriteRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 3 + m_SortingLayerID: 941243827 + m_SortingLayer: 13 + m_SortingOrder: 20 m_Sprite: {fileID: 283571021976017369, guid: 42e853dad9e30be4e9dc2afd08b0ee55, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -154,9 +154,9 @@ SpriteRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 2 + m_SortingLayerID: 941243827 + m_SortingLayer: 13 + m_SortingOrder: 20 m_Sprite: {fileID: -851493644761488242, guid: 42e853dad9e30be4e9dc2afd08b0ee55, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -238,9 +238,9 @@ SpriteRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 12 + m_SortingLayerID: 941243827 + m_SortingLayer: 13 + m_SortingOrder: 31 m_Sprite: {fileID: 1133637090705645615, guid: 42e853dad9e30be4e9dc2afd08b0ee55, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -263,7 +263,7 @@ GameObject: - component: {fileID: 6342453714096635376} - component: {fileID: 6436946282425048715} m_Layer: 0 - m_Name: "\u5782\u624B" + m_Name: "\u65E0\u52A8\u4F5C" m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -322,9 +322,9 @@ SpriteRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 1 + m_SortingLayerID: 941243827 + m_SortingLayer: 13 + m_SortingOrder: 20 m_Sprite: {fileID: 2463790466339844292, guid: 42e853dad9e30be4e9dc2afd08b0ee55, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -406,9 +406,9 @@ SpriteRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 8 + m_SortingLayerID: 941243827 + m_SortingLayer: 13 + m_SortingOrder: 21 m_Sprite: {fileID: 1415914705328684090, guid: 42e853dad9e30be4e9dc2afd08b0ee55, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -490,9 +490,9 @@ SpriteRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 6 + m_SortingLayerID: 941243827 + m_SortingLayer: 13 + m_SortingOrder: 21 m_Sprite: {fileID: 8410719398986170321, guid: 42e853dad9e30be4e9dc2afd08b0ee55, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -608,9 +608,9 @@ SpriteRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 11 + m_SortingLayerID: 941243827 + m_SortingLayer: 13 + m_SortingOrder: 30 m_Sprite: {fileID: 9123614911006884162, guid: 42e853dad9e30be4e9dc2afd08b0ee55, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -692,9 +692,9 @@ SpriteRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 5 + m_SortingLayerID: 941243827 + m_SortingLayer: 13 + m_SortingOrder: 21 m_Sprite: {fileID: -7862701917665933514, guid: 42e853dad9e30be4e9dc2afd08b0ee55, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -844,9 +844,9 @@ SpriteRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 7 + m_SortingLayerID: 941243827 + m_SortingLayer: 13 + m_SortingOrder: 22 m_Sprite: {fileID: -989070093990681363, guid: 42e853dad9e30be4e9dc2afd08b0ee55, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 diff --git a/Assets/Resources/Prefabs/Basic Function/Audio Manager.prefab b/Assets/Resources/Prefabs/Basic Function/Audio Manager.prefab index 671b5fcda..60477ebe1 100644 --- a/Assets/Resources/Prefabs/Basic Function/Audio Manager.prefab +++ b/Assets/Resources/Prefabs/Basic Function/Audio Manager.prefab @@ -1,6 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &1527569254408819154 +--- !u!1 &2036531279689704464 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -8,443 +8,8 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 2471109205967132558} - - component: {fileID: 8881519943291054062} - m_Layer: 0 - m_Name: Amb2 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &2471109205967132558 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1527569254408819154} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 336529723513575472} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!82 &8881519943291054062 -AudioSource: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1527569254408819154} - m_Enabled: 1 - serializedVersion: 4 - OutputAudioMixerGroup: {fileID: -4767431408014039957, guid: b14347481450a234a852407119bfecb4, type: 2} - m_audioClip: {fileID: 0} - m_PlayOnAwake: 0 - 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 &4263441732887063756 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4286586740530885281} - - component: {fileID: 951614760418124979} - m_Layer: 0 - m_Name: Voice - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &4286586740530885281 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4263441732887063756} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 336529723513575472} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!82 &951614760418124979 -AudioSource: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4263441732887063756} - m_Enabled: 1 - serializedVersion: 4 - OutputAudioMixerGroup: {fileID: -2297450186869358485, guid: b14347481450a234a852407119bfecb4, type: 2} - m_audioClip: {fileID: 0} - m_PlayOnAwake: 0 - m_Volume: 1 - m_Pitch: 1 - Loop: 0 - 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 &6247080755836924787 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 336529723513575472} - - component: {fileID: 7215266311881862311} - m_Layer: 0 - m_Name: Audio Manager - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &336529723513575472 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6247080755836924787} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 1142927291631534488} - - {fileID: 2613293443474806118} - - {fileID: 4286586740530885281} - - {fileID: 4912850787450048457} - - {fileID: 7940577869805702019} - - {fileID: 2471109205967132558} - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &7215266311881862311 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6247080755836924787} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d02d13e0ef27eb544b62d5a8d296f2ee, type: 3} - m_Name: - m_EditorClassIdentifier: - fadeTime: 1 ---- !u!1 &6862447680092929665 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1142927291631534488} - - component: {fileID: 5202610640273100065} - m_Layer: 0 - m_Name: Loop - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1142927291631534488 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6862447680092929665} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 336529723513575472} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!82 &5202610640273100065 -AudioSource: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6862447680092929665} - m_Enabled: 1 - serializedVersion: 4 - OutputAudioMixerGroup: {fileID: 8866379113506573767, guid: b14347481450a234a852407119bfecb4, type: 2} - m_audioClip: {fileID: 0} - m_PlayOnAwake: 0 - m_Volume: 0.659 - 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 &7126836783281766734 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2613293443474806118} - - component: {fileID: 6843084311142123149} + - component: {fileID: 4517563608897647978} + - component: {fileID: 5469316799991301934} m_Layer: 0 m_Name: Interaction m_TagString: Untagged @@ -452,28 +17,28 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &2613293443474806118 +--- !u!4 &4517563608897647978 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7126836783281766734} + m_GameObject: {fileID: 2036531279689704464} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 336529723513575472} + m_Father: {fileID: 8180040489590280703} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!82 &6843084311142123149 +--- !u!82 &5469316799991301934 AudioSource: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7126836783281766734} + m_GameObject: {fileID: 2036531279689704464} m_Enabled: 1 serializedVersion: 4 OutputAudioMixerGroup: {fileID: -1154322574682727772, guid: b14347481450a234a852407119bfecb4, type: 2} @@ -563,7 +128,7 @@ AudioSource: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 ---- !u!1 &7665279057604741938 +--- !u!1 &2833339172947688528 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -571,43 +136,43 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 7940577869805702019} - - component: {fileID: 523535875782967003} + - component: {fileID: 9053731432274197797} + - component: {fileID: 8020718999823674538} m_Layer: 0 - m_Name: Amb1 + m_Name: Loop2 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &7940577869805702019 +--- !u!4 &9053731432274197797 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7665279057604741938} + m_GameObject: {fileID: 2833339172947688528} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 336529723513575472} + m_Father: {fileID: 8180040489590280703} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!82 &523535875782967003 +--- !u!82 &8020718999823674538 AudioSource: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7665279057604741938} + m_GameObject: {fileID: 2833339172947688528} m_Enabled: 1 serializedVersion: 4 - OutputAudioMixerGroup: {fileID: 1773163451604355202, guid: b14347481450a234a852407119bfecb4, type: 2} - m_audioClip: {fileID: 8300000, guid: fc69ad6fefb757c43b4d68c6a82363b3, type: 3} - m_PlayOnAwake: 1 - m_Volume: 1 + OutputAudioMixerGroup: {fileID: 8866379113506573767, guid: b14347481450a234a852407119bfecb4, type: 2} + m_audioClip: {fileID: 0} + m_PlayOnAwake: 0 + m_Volume: 0.659 m_Pitch: 1 Loop: 1 Mute: 0 @@ -691,7 +256,7 @@ AudioSource: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 ---- !u!1 &9082819828820354776 +--- !u!1 &4146611325090910048 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -699,8 +264,264 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 4912850787450048457} - - component: {fileID: 2280720808147471031} + - component: {fileID: 978527555660104375} + - component: {fileID: 8803011080801853210} + m_Layer: 0 + m_Name: Loop + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &978527555660104375 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4146611325090910048} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 8180040489590280703} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!82 &8803011080801853210 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4146611325090910048} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 8866379113506573767, guid: b14347481450a234a852407119bfecb4, type: 2} + m_audioClip: {fileID: 0} + m_PlayOnAwake: 0 + m_Volume: 0.659 + 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 &5867143274518630619 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8704957973411935911} + - component: {fileID: 6813652859075682734} + m_Layer: 0 + m_Name: Voice + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8704957973411935911 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5867143274518630619} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 8180040489590280703} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!82 &6813652859075682734 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5867143274518630619} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: -2297450186869358485, guid: b14347481450a234a852407119bfecb4, type: 2} + m_audioClip: {fileID: 0} + m_PlayOnAwake: 0 + m_Volume: 1 + m_Pitch: 1 + Loop: 0 + 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 &6415937906163888384 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8958232513318718903} + - component: {fileID: 415694509488218877} m_Layer: 0 m_Name: Memery m_TagString: Untagged @@ -708,28 +529,28 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &4912850787450048457 +--- !u!4 &8958232513318718903 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9082819828820354776} + m_GameObject: {fileID: 6415937906163888384} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 336529723513575472} + m_Father: {fileID: 8180040489590280703} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!82 &2280720808147471031 +--- !u!82 &415694509488218877 AudioSource: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9082819828820354776} + m_GameObject: {fileID: 6415937906163888384} m_Enabled: 1 serializedVersion: 4 OutputAudioMixerGroup: {fileID: -6773993072664640036, guid: b14347481450a234a852407119bfecb4, type: 2} @@ -819,3 +640,311 @@ AudioSource: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 +--- !u!1 &6437375885923566570 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6195776254981449253} + - component: {fileID: 683545966647234361} + m_Layer: 0 + m_Name: Amb1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6195776254981449253 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6437375885923566570} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 8180040489590280703} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!82 &683545966647234361 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6437375885923566570} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 1773163451604355202, guid: b14347481450a234a852407119bfecb4, type: 2} + m_audioClip: {fileID: 8300000, guid: fc69ad6fefb757c43b4d68c6a82363b3, type: 3} + 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 &7660119422375597550 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8180040489590280703} + - component: {fileID: 6175183018528746625} + m_Layer: 0 + m_Name: Audio Manager + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8180040489590280703 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7660119422375597550} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 978527555660104375} + - {fileID: 9053731432274197797} + - {fileID: 4517563608897647978} + - {fileID: 8704957973411935911} + - {fileID: 8958232513318718903} + - {fileID: 6195776254981449253} + - {fileID: 2351197142428152690} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &6175183018528746625 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7660119422375597550} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d02d13e0ef27eb544b62d5a8d296f2ee, type: 3} + m_Name: + m_EditorClassIdentifier: + fadeTime: 1 +--- !u!1 &7662043639505016441 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2351197142428152690} + - component: {fileID: 4980992513314886543} + m_Layer: 0 + m_Name: Amb2 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2351197142428152690 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7662043639505016441} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 8180040489590280703} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!82 &4980992513314886543 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7662043639505016441} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: -4767431408014039957, guid: b14347481450a234a852407119bfecb4, type: 2} + m_audioClip: {fileID: 0} + m_PlayOnAwake: 0 + 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 diff --git a/Assets/Resources/Prefabs/Fix/Editor Mode Func.prefab b/Assets/Resources/Prefabs/Fix/Editor Mode Func.prefab index a87869d0a..41b89d9fc 100644 --- a/Assets/Resources/Prefabs/Fix/Editor Mode Func.prefab +++ b/Assets/Resources/Prefabs/Fix/Editor Mode Func.prefab @@ -97,9 +97,9 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 6120444917757515705} - {fileID: 3641060396765317556} - {fileID: 8556345213791081418} + - {fileID: 2440668723296362102} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &8168536426589423301 @@ -264,57 +264,57 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 7611243318142021168} m_Modifications: - - target: {fileID: 336529723513575472, guid: b8280919ceaa0a2489020c94c7376cd0, type: 3} + - target: {fileID: 7660119422375597550, guid: b8280919ceaa0a2489020c94c7376cd0, type: 3} + propertyPath: m_Name + value: Audio Manager + objectReference: {fileID: 0} + - target: {fileID: 8180040489590280703, guid: b8280919ceaa0a2489020c94c7376cd0, type: 3} propertyPath: m_LocalPosition.x - value: 8.62 + value: 0 objectReference: {fileID: 0} - - target: {fileID: 336529723513575472, guid: b8280919ceaa0a2489020c94c7376cd0, type: 3} + - target: {fileID: 8180040489590280703, guid: b8280919ceaa0a2489020c94c7376cd0, type: 3} propertyPath: m_LocalPosition.y - value: -4.72 + value: 0 objectReference: {fileID: 0} - - target: {fileID: 336529723513575472, guid: b8280919ceaa0a2489020c94c7376cd0, type: 3} + - target: {fileID: 8180040489590280703, guid: b8280919ceaa0a2489020c94c7376cd0, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 336529723513575472, guid: b8280919ceaa0a2489020c94c7376cd0, type: 3} + - target: {fileID: 8180040489590280703, guid: b8280919ceaa0a2489020c94c7376cd0, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 336529723513575472, guid: b8280919ceaa0a2489020c94c7376cd0, type: 3} + - target: {fileID: 8180040489590280703, guid: b8280919ceaa0a2489020c94c7376cd0, type: 3} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 336529723513575472, guid: b8280919ceaa0a2489020c94c7376cd0, type: 3} + - target: {fileID: 8180040489590280703, guid: b8280919ceaa0a2489020c94c7376cd0, type: 3} propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 336529723513575472, guid: b8280919ceaa0a2489020c94c7376cd0, type: 3} + - target: {fileID: 8180040489590280703, guid: b8280919ceaa0a2489020c94c7376cd0, type: 3} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 336529723513575472, guid: b8280919ceaa0a2489020c94c7376cd0, type: 3} + - target: {fileID: 8180040489590280703, guid: b8280919ceaa0a2489020c94c7376cd0, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 336529723513575472, guid: b8280919ceaa0a2489020c94c7376cd0, type: 3} + - target: {fileID: 8180040489590280703, guid: b8280919ceaa0a2489020c94c7376cd0, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 336529723513575472, guid: b8280919ceaa0a2489020c94c7376cd0, type: 3} + - target: {fileID: 8180040489590280703, guid: b8280919ceaa0a2489020c94c7376cd0, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 6247080755836924787, guid: b8280919ceaa0a2489020c94c7376cd0, type: 3} - propertyPath: m_Name - value: Audio Manager - objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: b8280919ceaa0a2489020c94c7376cd0, type: 3} ---- !u!4 &6120444917757515705 stripped +--- !u!4 &2440668723296362102 stripped Transform: - m_CorrespondingSourceObject: {fileID: 336529723513575472, guid: b8280919ceaa0a2489020c94c7376cd0, type: 3} + m_CorrespondingSourceObject: {fileID: 8180040489590280703, guid: b8280919ceaa0a2489020c94c7376cd0, type: 3} m_PrefabInstance: {fileID: 5790406710898921353} m_PrefabAsset: {fileID: 0} diff --git a/Assets/Scenes/ExpressFixScene.unity b/Assets/Scenes/ExpressFixScene.unity index 30c6798e9..9674b850e 100644 --- a/Assets/Scenes/ExpressFixScene.unity +++ b/Assets/Scenes/ExpressFixScene.unity @@ -10965,34 +10965,10 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 1299151124194456251, guid: 13f00ab6092291d49a9312e52873d80b, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - target: {fileID: 4214753503693131867, guid: 13f00ab6092291d49a9312e52873d80b, type: 3} propertyPath: m_Name value: Editor Mode Func objectReference: {fileID: 0} - - target: {fileID: 4214753503693131867, guid: 13f00ab6092291d49a9312e52873d80b, type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5795012028576405938, guid: 13f00ab6092291d49a9312e52873d80b, type: 3} - propertyPath: m_CameraType - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5795012028576405938, guid: 13f00ab6092291d49a9312e52873d80b, type: 3} - propertyPath: m_RendererIndex - value: -1 - objectReference: {fileID: 0} - - target: {fileID: 7037918505330246345, guid: 13f00ab6092291d49a9312e52873d80b, type: 3} - propertyPath: orthographic - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7037918505330246345, guid: 13f00ab6092291d49a9312e52873d80b, type: 3} - propertyPath: orthographic size - value: 5 - objectReference: {fileID: 0} - target: {fileID: 7611243318142021168, guid: 13f00ab6092291d49a9312e52873d80b, type: 3} propertyPath: m_LocalPosition.x value: 0 @@ -11033,18 +11009,6 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 8168536426589423301, guid: 13f00ab6092291d49a9312e52873d80b, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8556345213791081418, guid: 13f00ab6092291d49a9312e52873d80b, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8556345213791081418, guid: 13f00ab6092291d49a9312e52873d80b, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] diff --git a/Assets/Scenes/PeipeiFixScene.unity b/Assets/Scenes/PeipeiFixScene.unity index eadc8278c..41c9a1d23 100644 --- a/Assets/Scenes/PeipeiFixScene.unity +++ b/Assets/Scenes/PeipeiFixScene.unity @@ -4198,6 +4198,82 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: -8653719598885068355, guid: 33aa26d5c34c8c343af3a5f0d4e6a9c8, type: 3} + propertyPath: m_Name + value: "\u4F69\u4F69\u89C6\u89D2\u5C4B\u5B50\u5BFC\u51FA2" + objectReference: {fileID: 0} + - target: {fileID: -8653719598885068355, guid: 33aa26d5c34c8c343af3a5f0d4e6a9c8, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -7552582706839291426, guid: 33aa26d5c34c8c343af3a5f0d4e6a9c8, type: 3} + propertyPath: m_LocalPosition.x + value: 40.3 + objectReference: {fileID: 0} + - target: {fileID: -7552582706839291426, guid: 33aa26d5c34c8c343af3a5f0d4e6a9c8, type: 3} + propertyPath: m_LocalPosition.y + value: -6 + objectReference: {fileID: 0} + - target: {fileID: -7552582706839291426, guid: 33aa26d5c34c8c343af3a5f0d4e6a9c8, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -7552582706839291426, guid: 33aa26d5c34c8c343af3a5f0d4e6a9c8, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -7552582706839291426, guid: 33aa26d5c34c8c343af3a5f0d4e6a9c8, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -7552582706839291426, guid: 33aa26d5c34c8c343af3a5f0d4e6a9c8, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -7552582706839291426, guid: 33aa26d5c34c8c343af3a5f0d4e6a9c8, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -7552582706839291426, guid: 33aa26d5c34c8c343af3a5f0d4e6a9c8, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -7552582706839291426, guid: 33aa26d5c34c8c343af3a5f0d4e6a9c8, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -7552582706839291426, guid: 33aa26d5c34c8c343af3a5f0d4e6a9c8, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -6741419839080540014, guid: 33aa26d5c34c8c343af3a5f0d4e6a9c8, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -2961953986958284860, guid: 33aa26d5c34c8c343af3a5f0d4e6a9c8, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2013481229401087159, guid: 33aa26d5c34c8c343af3a5f0d4e6a9c8, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3282114320400904708, guid: 33aa26d5c34c8c343af3a5f0d4e6a9c8, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4196554969344580017, guid: 33aa26d5c34c8c343af3a5f0d4e6a9c8, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5043355878873426995, guid: 33aa26d5c34c8c343af3a5f0d4e6a9c8, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8386298161291806130, guid: 33aa26d5c34c8c343af3a5f0d4e6a9c8, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: -8526030764959399086, guid: 9ebe34c81f3945d40bc9206affcdcf73, type: 3} propertyPath: m_Name value: plant @@ -4278,82 +4354,6 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} - - target: {fileID: -8653719598885068355, guid: 33aa26d5c34c8c343af3a5f0d4e6a9c8, type: 3} - propertyPath: m_Name - value: "\u4F69\u4F69\u89C6\u89D2\u5C4B\u5B50\u5BFC\u51FA2" - objectReference: {fileID: 0} - - target: {fileID: -8653719598885068355, guid: 33aa26d5c34c8c343af3a5f0d4e6a9c8, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - - target: {fileID: -7552582706839291426, guid: 33aa26d5c34c8c343af3a5f0d4e6a9c8, type: 3} - propertyPath: m_LocalPosition.x - value: 40.3 - objectReference: {fileID: 0} - - target: {fileID: -7552582706839291426, guid: 33aa26d5c34c8c343af3a5f0d4e6a9c8, type: 3} - propertyPath: m_LocalPosition.y - value: -6 - objectReference: {fileID: 0} - - target: {fileID: -7552582706839291426, guid: 33aa26d5c34c8c343af3a5f0d4e6a9c8, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -7552582706839291426, guid: 33aa26d5c34c8c343af3a5f0d4e6a9c8, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: -7552582706839291426, guid: 33aa26d5c34c8c343af3a5f0d4e6a9c8, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -7552582706839291426, guid: 33aa26d5c34c8c343af3a5f0d4e6a9c8, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -7552582706839291426, guid: 33aa26d5c34c8c343af3a5f0d4e6a9c8, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -7552582706839291426, guid: 33aa26d5c34c8c343af3a5f0d4e6a9c8, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -7552582706839291426, guid: 33aa26d5c34c8c343af3a5f0d4e6a9c8, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -7552582706839291426, guid: 33aa26d5c34c8c343af3a5f0d4e6a9c8, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -6741419839080540014, guid: 33aa26d5c34c8c343af3a5f0d4e6a9c8, type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -2961953986958284860, guid: 33aa26d5c34c8c343af3a5f0d4e6a9c8, type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2013481229401087159, guid: 33aa26d5c34c8c343af3a5f0d4e6a9c8, type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3282114320400904708, guid: 33aa26d5c34c8c343af3a5f0d4e6a9c8, type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4196554969344580017, guid: 33aa26d5c34c8c343af3a5f0d4e6a9c8, type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5043355878873426995, guid: 33aa26d5c34c8c343af3a5f0d4e6a9c8, type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8386298161291806130, guid: 33aa26d5c34c8c343af3a5f0d4e6a9c8, type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: @@ -40175,18 +40175,6 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 498139106622946554, guid: 13f00ab6092291d49a9312e52873d80b, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1299151124194456251, guid: 13f00ab6092291d49a9312e52873d80b, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1411876041170289596, guid: 13f00ab6092291d49a9312e52873d80b, type: 3} - propertyPath: m_Enabled - value: 1 - objectReference: {fileID: 0} - target: {fileID: 4214753503693131867, guid: 13f00ab6092291d49a9312e52873d80b, type: 3} propertyPath: m_Name value: Editor Mode Func @@ -40195,22 +40183,6 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} - - target: {fileID: 5795012028576405938, guid: 13f00ab6092291d49a9312e52873d80b, type: 3} - propertyPath: m_CameraType - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5795012028576405938, guid: 13f00ab6092291d49a9312e52873d80b, type: 3} - propertyPath: m_RendererIndex - value: -1 - objectReference: {fileID: 0} - - target: {fileID: 7037918505330246345, guid: 13f00ab6092291d49a9312e52873d80b, type: 3} - propertyPath: orthographic - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7037918505330246345, guid: 13f00ab6092291d49a9312e52873d80b, type: 3} - propertyPath: orthographic size - value: 5 - objectReference: {fileID: 0} - target: {fileID: 7611243318142021168, guid: 13f00ab6092291d49a9312e52873d80b, type: 3} propertyPath: m_LocalPosition.x value: 0 @@ -40251,14 +40223,6 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 8168536426589423301, guid: 13f00ab6092291d49a9312e52873d80b, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8556345213791081418, guid: 13f00ab6092291d49a9312e52873d80b, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] diff --git a/Assets/Scenes/Persistence.unity b/Assets/Scenes/Persistence.unity index f82e6d0e4..ed12cf148 100644 --- a/Assets/Scenes/Persistence.unity +++ b/Assets/Scenes/Persistence.unity @@ -1070,57 +1070,11 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 38cb05a0012a4c99982acfcd8ebd2b10, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!1 &40915749 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 40915750} - - component: {fileID: 40915751} - m_Layer: 0 - m_Name: Audio Manager - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &40915750 +--- !u!4 &40915750 stripped Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 8180040489590280703, guid: b8280919ceaa0a2489020c94c7376cd0, type: 3} + m_PrefabInstance: {fileID: 4322113248724993478} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 40915749} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 1410207950} - - {fileID: 460780905} - - {fileID: 57390246} - - {fileID: 1403040025} - - {fileID: 868192523} - - {fileID: 262337781} - m_Father: {fileID: 1009826577} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &40915751 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 40915749} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d02d13e0ef27eb544b62d5a8d296f2ee, type: 3} - m_Name: - m_EditorClassIdentifier: - fadeTime: 1 --- !u!1 &45177614 GameObject: m_ObjectHideFlags: 0 @@ -1255,134 +1209,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 45177614} m_CullTransparentMesh: 1 ---- !u!1 &57390245 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 57390246} - - component: {fileID: 57390247} - m_Layer: 0 - m_Name: Voice - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &57390246 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 57390245} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 40915750} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!82 &57390247 -AudioSource: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 57390245} - m_Enabled: 1 - serializedVersion: 4 - OutputAudioMixerGroup: {fileID: -2297450186869358485, guid: b14347481450a234a852407119bfecb4, type: 2} - m_audioClip: {fileID: 0} - m_PlayOnAwake: 0 - m_Volume: 1 - m_Pitch: 1 - Loop: 0 - 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 &58199302 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 2692244456008212266, guid: 8447f1c934ed28243b9924fb4d106a57, type: 3} @@ -3868,134 +3694,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 261070807} m_CullTransparentMesh: 1 ---- !u!1 &262337780 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 262337781} - - component: {fileID: 262337782} - m_Layer: 0 - m_Name: Amb2 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &262337781 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 262337780} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 40915750} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!82 &262337782 -AudioSource: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 262337780} - m_Enabled: 1 - serializedVersion: 4 - OutputAudioMixerGroup: {fileID: -4767431408014039957, guid: b14347481450a234a852407119bfecb4, type: 2} - m_audioClip: {fileID: 0} - m_PlayOnAwake: 0 - 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 &280268696 GameObject: m_ObjectHideFlags: 0 @@ -5100,134 +4798,6 @@ MonoBehaviour: m_EffectColor: {r: 1, g: 0.58, b: 0.04, a: 1} m_EffectDistance: {x: 3, y: -3} m_UseGraphicAlpha: 1 ---- !u!1 &460780904 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 460780905} - - component: {fileID: 460780906} - m_Layer: 0 - m_Name: Interaction - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &460780905 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 460780904} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 40915750} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!82 &460780906 -AudioSource: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 460780904} - m_Enabled: 1 - serializedVersion: 4 - OutputAudioMixerGroup: {fileID: -1154322574682727772, guid: b14347481450a234a852407119bfecb4, type: 2} - m_audioClip: {fileID: 0} - m_PlayOnAwake: 0 - m_Volume: 1 - m_Pitch: 1 - Loop: 0 - 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 &461116827 GameObject: m_ObjectHideFlags: 0 @@ -10926,134 +10496,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 855263533} m_CullTransparentMesh: 1 ---- !u!1 &868192522 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 868192523} - - component: {fileID: 868192524} - m_Layer: 0 - m_Name: Amb1 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &868192523 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 868192522} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 40915750} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!82 &868192524 -AudioSource: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 868192522} - m_Enabled: 1 - serializedVersion: 4 - OutputAudioMixerGroup: {fileID: 1773163451604355202, guid: b14347481450a234a852407119bfecb4, type: 2} - m_audioClip: {fileID: 8300000, guid: fc69ad6fefb757c43b4d68c6a82363b3, type: 3} - 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 &886733270 GameObject: m_ObjectHideFlags: 0 @@ -15076,134 +14518,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 85815d386fde43dca8b4be1cfd26fe89, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!1 &1403040024 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1403040025} - - component: {fileID: 1403040026} - m_Layer: 0 - m_Name: Memery - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1403040025 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1403040024} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 40915750} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!82 &1403040026 -AudioSource: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1403040024} - m_Enabled: 1 - serializedVersion: 4 - OutputAudioMixerGroup: {fileID: -6773993072664640036, guid: b14347481450a234a852407119bfecb4, type: 2} - m_audioClip: {fileID: 0} - m_PlayOnAwake: 0 - m_Volume: 1 - m_Pitch: 1 - Loop: 0 - 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!1001 &1404026337 PrefabInstance: m_ObjectHideFlags: 0 @@ -15310,134 +14624,6 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 6036857918381590041, guid: 0b17c41ba2d401946a8eca60abbd974d, type: 3} m_PrefabInstance: {fileID: 1404026337} m_PrefabAsset: {fileID: 0} ---- !u!1 &1410207949 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1410207950} - - component: {fileID: 1410207951} - m_Layer: 0 - m_Name: Loop - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1410207950 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1410207949} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 40915750} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!82 &1410207951 -AudioSource: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1410207949} - m_Enabled: 1 - serializedVersion: 4 - OutputAudioMixerGroup: {fileID: 8866379113506573767, guid: b14347481450a234a852407119bfecb4, type: 2} - m_audioClip: {fileID: 0} - m_PlayOnAwake: 0 - m_Volume: 0.659 - 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!1001 &1437328103 PrefabInstance: m_ObjectHideFlags: 0 @@ -36116,7 +35302,7 @@ MonoBehaviour: iconOnDrag: {fileID: 8895775685280376203, guid: eb11ac9a06fb4792b393db9b83ab43b4, type: 3} exclusiveOnDragCanvas: {fileID: 0} useLegacyDragMethod: 0 - position: {x: 941.05255, y: 1173.4302, z: 0} + position: {x: 0, y: 0, z: 0} dragSelection: customRenderer: {fileID: 0} line: @@ -38353,6 +37539,63 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: _graphManager: {fileID: 0} +--- !u!1001 &4322113248724993478 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1009826577} + m_Modifications: + - target: {fileID: 7660119422375597550, guid: b8280919ceaa0a2489020c94c7376cd0, type: 3} + propertyPath: m_Name + value: Audio Manager + objectReference: {fileID: 0} + - target: {fileID: 8180040489590280703, guid: b8280919ceaa0a2489020c94c7376cd0, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8180040489590280703, guid: b8280919ceaa0a2489020c94c7376cd0, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8180040489590280703, guid: b8280919ceaa0a2489020c94c7376cd0, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8180040489590280703, guid: b8280919ceaa0a2489020c94c7376cd0, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8180040489590280703, guid: b8280919ceaa0a2489020c94c7376cd0, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8180040489590280703, guid: b8280919ceaa0a2489020c94c7376cd0, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8180040489590280703, guid: b8280919ceaa0a2489020c94c7376cd0, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8180040489590280703, guid: b8280919ceaa0a2489020c94c7376cd0, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8180040489590280703, guid: b8280919ceaa0a2489020c94c7376cd0, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8180040489590280703, guid: b8280919ceaa0a2489020c94c7376cd0, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: b8280919ceaa0a2489020c94c7376cd0, type: 3} --- !u!114 &4322795318065666112 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Dialog System/DialogController.cs b/Assets/Scripts/Dialog System/DialogController.cs index 5811750d5..b1980cb03 100644 --- a/Assets/Scripts/Dialog System/DialogController.cs +++ b/Assets/Scripts/Dialog System/DialogController.cs @@ -294,26 +294,12 @@ namespace AibisDream public static IEnumerator LoadScene(string sceneName, float duration = 1) { HideDialog(); - //yield return MainUIController.Instance.FadeInSync(duration); Camera.main.orthographicSize = 5; Camera.main.transform.position = new Vector3(0, 0, -10); yield return SceneLoader.Instance.LoadSceneAsync(sceneName); DialogCanvasManager.Instance.SwitchDialogView(sceneName == "ClinicScene" ? DialogViewType.Bubble : DialogViewType.OldBox); - if (sceneName == "ClinicScene") - { - AudioManager.PlayAmb1Audio("amb_room"); - } - // if(sceneName=="SubWay") - // { - // ClueBoardManager.Instance.CloseClueBoard(); - // // AudioManager.PlayAmb1Audio("subway"); - // } - else - { - AudioManager.PlayAmb1Audio("amb_main"); - } AudioManager.PlayAmb2Audio("amb_general"); } diff --git a/Assets/Scripts/FixSystemNew/FixSystemCenter.cs b/Assets/Scripts/FixSystemNew/FixSystemCenter.cs index 28cb70321..0921afe00 100644 --- a/Assets/Scripts/FixSystemNew/FixSystemCenter.cs +++ b/Assets/Scripts/FixSystemNew/FixSystemCenter.cs @@ -15,6 +15,7 @@ namespace AibisDream.FixSystem // TODO 这个回头要改 curState = FixState.Clinic; + AudioManager.PlayAmb1Audio("amb_room"); } #region 系统索引 diff --git a/Assets/Scripts/FixSystemNew/StateTransition/BodyModuleTransition.cs b/Assets/Scripts/FixSystemNew/StateTransition/BodyModuleTransition.cs index 6a4996570..f121fbf78 100644 --- a/Assets/Scripts/FixSystemNew/StateTransition/BodyModuleTransition.cs +++ b/Assets/Scripts/FixSystemNew/StateTransition/BodyModuleTransition.cs @@ -22,6 +22,7 @@ namespace AibisDream.FixSystem clinicSystem.gameObject.SetActive(true); // 关闭其他 ITransitionCommand.SetBodyModuleSystemActive(false); + AudioManager.PlayAmb1Audio("amb_room"); // 黑屏淡出 yield return MainUIController.Instance.FadeOutSync(FadeDuration); } @@ -42,13 +43,14 @@ namespace AibisDream.FixSystem var engineSystem = FixSystemCenter.SystemDic.Get(); // 盖上盖子 - yield return engineSystem.CloseCoverAsync(); + yield return engineSystem.CloseCover().WaitForCompletion(); // 黑屏 yield return MainUIController.Instance?.FadeInSync(FadeDuration); // 相机归位 CameraKit.Instance.ResetCamara(); // 打开诊所 clinicSystem.gameObject.SetActive(true); + AudioManager.PlayAmb1Audio("amb_room"); // 关闭其他 ITransitionCommand.SetBodyModuleSystemActive(false); // 黑屏淡出 @@ -132,6 +134,7 @@ namespace AibisDream.FixSystem clinicSystem.gameObject.SetActive(true); // 关闭其他 ITransitionCommand.SetBodyModuleSystemActive(false); + AudioManager.PlayAmb1Audio("amb_room"); // 黑屏淡出 yield return MainUIController.Instance.FadeOutSync(FadeDuration); } diff --git a/Assets/Scripts/FixSystemNew/StateTransition/ClinicTransition.cs b/Assets/Scripts/FixSystemNew/StateTransition/ClinicTransition.cs index 6fbe3a61d..02f60d636 100644 --- a/Assets/Scripts/FixSystemNew/StateTransition/ClinicTransition.cs +++ b/Assets/Scripts/FixSystemNew/StateTransition/ClinicTransition.cs @@ -1,5 +1,6 @@ using System.Collections; using AibisDream.Framework; +using DG.Tweening; using UnityEngine; namespace AibisDream.FixSystem @@ -29,7 +30,8 @@ namespace AibisDream.FixSystem // 隐藏诊所 clinicSystem.gameObject.SetActive(false); - + // 播下音频 + AudioManager.PlayAmb1Audio("amb_main"); // 黑屏淡出 yield return MainUIController.Instance.FadeOutSync(FadeDuration); @@ -64,14 +66,19 @@ namespace AibisDream.FixSystem ITransitionCommand.SetBodyModuleSystemActive(true); // 隐藏诊所 clinicSystem.gameObject.SetActive(false); + AudioManager.PlayAmb1Audio("amb_main"); // 黑屏淡出 yield return MainUIController.Instance?.FadeOutSync(FadeDuration); // 移动相机 yield return CameraKit.Instance.TransCameraAsync(CameraPos, OrthographicSize, Duration); // 开启引擎玩法 - engineSystem.CurDataKey = _configName; - engineSystem.Load(); - yield return engineSystem.OpenCoverAsync(); + if (!string.IsNullOrEmpty(_configName)) + { + engineSystem.CurDataKey = _configName; + engineSystem.Load(); + } + + yield return engineSystem.OpenCover().WaitForCompletion(); } public void SetArgs(string arg) @@ -142,6 +149,7 @@ namespace AibisDream.FixSystem ITransitionCommand.SetBodyModuleSystemActive(true); // 隐藏诊所 clinicSystem.gameObject.SetActive(false); + AudioManager.PlayAmb1Audio("amb_main"); // 移动相机 yield return CameraKit.Instance.TransCameraAsync(CameraPos, OrthographicSize, Duration); // 开启引擎玩法 diff --git a/Assets/Scripts/Framework/AudioKit/AudioManager.cs b/Assets/Scripts/Framework/AudioKit/AudioManager.cs index 99861b832..79c72e3eb 100644 --- a/Assets/Scripts/Framework/AudioKit/AudioManager.cs +++ b/Assets/Scripts/Framework/AudioKit/AudioManager.cs @@ -8,6 +8,7 @@ namespace AibisDream public class AudioManager : Singleton { private const string LoopSource = "Loop"; + private const string LoopSource2 = "Loop2"; private const string InteractionSource = "Interaction"; private const string VoiceSource = "Voice"; private const string MemorySource = "Memery"; @@ -15,6 +16,7 @@ namespace AibisDream private const string Amb2Source = "Amb2"; private AudioSource _loopSource; + private AudioSource _loopSource2; private AudioSource _interactionSource; private AudioSource _voiceSource; private AudioSource _memorySource; @@ -26,6 +28,7 @@ namespace AibisDream public override void OnSingletonInit() { _loopSource = transform.Find(LoopSource).GetComponent(); + _loopSource2 = transform.Find(LoopSource2).GetComponent(); _interactionSource = transform.Find(InteractionSource).GetComponent(); _voiceSource = transform.Find(VoiceSource).GetComponent(); _memorySource = transform.Find(MemorySource).GetComponent(); @@ -60,6 +63,14 @@ namespace AibisDream Instance._interactionSource.Play(); } + [YarnCommand("play_interaction")] + public static void PlayInteraction(string name) + { + var clip = Resources.Load($"Audio/{name}"); + Instance._interactionSource.clip = clip; + Instance._interactionSource.Play(); + } + public void StopVoice() { if (_voiceSource.isPlaying) @@ -108,6 +119,25 @@ namespace AibisDream Instance._loopSource.Pause(); } + [YarnCommand("play_loop2_audio")] + public static void PlayLoop2Audio(string audioName) + { + AudioClip clip = Resources.Load($"Audio/{audioName}"); + if (clip == null) + { + clip = Instance.RandomLoadAudioClip(3, $"Audio/{audioName}"); + } + + Instance._loopSource2.clip = clip; + Instance._loopSource2.Play(); + } + + [YarnCommand("pause_loop2_audio")] + public static void PauseLoop2Audio() + { + Instance._loopSource2.Pause(); + } + public void ContinueLoopAudio() { _loopSource.UnPause(); diff --git a/Assets/Scripts/Framework/OtherKit/MonoCenter.cs b/Assets/Scripts/Framework/OtherKit/MonoCenter.cs index 445594294..1eb7331af 100644 --- a/Assets/Scripts/Framework/OtherKit/MonoCenter.cs +++ b/Assets/Scripts/Framework/OtherKit/MonoCenter.cs @@ -49,7 +49,6 @@ namespace AibisDream.Framework { if (Input.GetKeyDown(KeyCode.K)) { - MonoCenter.Mono.StartCoroutine(FixSystemYarnCommand.SwitchFixSystemTo("Engine")); } } } diff --git a/Assets/Scripts/MiniGame/Engine/EngineSystem.cs b/Assets/Scripts/MiniGame/Engine/EngineSystem.cs index 8ed1b10cb..f4d40693c 100644 --- a/Assets/Scripts/MiniGame/Engine/EngineSystem.cs +++ b/Assets/Scripts/MiniGame/Engine/EngineSystem.cs @@ -1,5 +1,4 @@ using System; -using System.Collections; using System.Linq; using AibisDream.FixSystem; using AibisDream.Framework; @@ -23,11 +22,12 @@ namespace AibisDream [FormerlySerializedAs("盖板移动时间")] [SerializeField] private float coverMoveDuration = 5f; + [FormerlySerializedAs("盖板移动距离")] [SerializeField] private float coverMoveDistance = 2.8f; - + private bool IsValid => engineData.isValid.Value; - + public event Action UpdateDashboard; private void Awake() @@ -40,14 +40,14 @@ namespace AibisDream private void Start() { OnLoad(); - + gameObject.SetActive(false); } private void OnLoad() { engineData = new EngineData(config.invalidTime); - + // 初始档位置为2 _airGate.MoveToLevel(2); DialogController.Instance?.SetVariable("$curAirLevel", 2); @@ -105,26 +105,19 @@ namespace AibisDream /// 动画序列 public Tween OpenCover() { + AudioManager.PlayLoop2Audio("amb_shitou_engine"); + var sq = DOTween.Sequence(); // 盖板上移 var moveDis = new Vector3(0, coverMoveDistance, 0); sq.Join(_cover.transform.DOBlendableMoveBy(moveDis, coverMoveDuration)); // 盖板淡出 sq.Join(_cover.DOFade(0, coverMoveDuration)); - + // 为引擎系统解锁 sq.OnComplete(Unlock); - - return sq; - } - public IEnumerator OpenCoverAsync() - { - var sq = OpenCover(); - if (sq.active && !sq.IsComplete()) - { - yield return null; - } + return sq; } /// @@ -133,31 +126,22 @@ namespace AibisDream /// 动画序列 public Tween CloseCover() { + AudioManager.PauseLoop2Audio(); var sq = DOTween.Sequence(); sq.Join(_cover.DOFade(1, coverMoveDuration)); var moveDis = new Vector3(0, -coverMoveDistance, 0); sq.Join(_cover.transform.DOBlendableMoveBy(moveDis, coverMoveDuration)); - + // 锁定引擎系统 sq.OnComplete(Lock); - - return sq; - } - public IEnumerator CloseCoverAsync() - { - var sq = CloseCover(); - if (sq.active && !sq.IsComplete()) - { - yield return null; - } + return sq; } public void Lock() { // 禁止油门和气门 - } public void Unlock() @@ -235,7 +219,7 @@ namespace AibisDream public struct EngineData { private const float SuccessDuration = 1.5f; - + public float curSpeed; public float curOil; public float curAir; @@ -285,16 +269,16 @@ namespace AibisDream curAir = curOil; // 如果离开范围且当前在系统有效期，就进入一段失效期 var curInAirRange = curAir <= curAirMax && curAir >= curAirMin; - + if (inAirRange && !curInAirRange && !isSuccess) { // 出界的话 if (curAir > curAirMax) DialogController.Instance?.StartDialogNode("引擎过速"); if (curAir < curAirMin) DialogController.Instance?.StartDialogNode("引擎掉速"); - + isValid.Value = false; } - + inAirRange = curInAirRange; } @@ -316,7 +300,7 @@ namespace AibisDream { // 已经成功就不用校验了 if (isSuccess) return false; - + if (curSpeed >= targetSpeed) { reachTargetTime += Time.deltaTime; @@ -328,7 +312,7 @@ namespace AibisDream // 如果速度达标时间足够就判断成功 if (!(reachTargetTime >= SuccessDuration)) return false; - + isSuccess = true; return true; } diff --git a/Assets/Scripts/MiniGame/Engine/OilGate.cs b/Assets/Scripts/MiniGame/Engine/OilGate.cs index 8912c9f2c..b49552b94 100644 --- a/Assets/Scripts/MiniGame/Engine/OilGate.cs +++ b/Assets/Scripts/MiniGame/Engine/OilGate.cs @@ -35,10 +35,15 @@ namespace AibisDream { transform.DOPause(); transform.DORotate(new Vector3(0, 0, 45), 5f); + // 播引擎 + AudioManager.PlayLoopAudio("engine_on"); + AudioManager.StopInteraction(); } private void ButtonUp() { + AudioManager.PauseLoopAudio(); + AudioManager.PlayInteraction("engine_off"); transform.DOPause(); transform.DORotate(new Vector3(0, 0, 0), 0.2f); }