From 6dc1abc9587cdc1a86269d99bf020d7311fac223 Mon Sep 17 00:00:00 2001 From: bottlefish <781230111@qq.com> Date: Wed, 14 May 2025 15:35:28 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E5=85=A5=E7=81=AB=E5=B1=B1=E6=83=85?= =?UTF-8?q?=E7=BB=AA=E6=A8=A1=E5=9D=97=E6=B7=B1=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/CameraData/Main Camera Blends.asset | 13 +- .../Test_Huoshan Shared Data.asset | 110 ++- .../Test_Huoshan/Test_Huoshan_zh-Hans.asset | 36 + .../Resources/Yarn/Test_Huoshan/Center.yarn | 2 + .../Yarn/Test_Huoshan/EventNode.yarn | 29 + .../Yarn/Test_Huoshan/情绪模块相关.yarn | 25 + .../Yarn/Test_Huoshan/情绪模块相关.yarn.meta | 10 + Assets/Scenes/HuoShanFixScene.unity | 640 ++++++++++++++---- .../Scripts/FixSystem/Memory/MemoryProcess.cs | 7 + .../Scripts/FixSystemNew/FixStateMachine.cs | 52 +- .../Scripts/Framework/OtherKit/CameraKit.cs | 53 +- .../MiniGame/HuoShan/Emo/EmoManager.cs | 32 + .../MiniGame/HuoShan/Emo/EmoManager.cs.meta | 11 + .../MiniGame/HuoShan/Emo/LakeLineDrawer.cs | 41 +- .../MiniGame/HuoShan/ExpressionCableSystem.cs | 2 +- 15 files changed, 904 insertions(+), 159 deletions(-) create mode 100644 Assets/Resources/Yarn/Test_Huoshan/情绪模块相关.yarn create mode 100644 Assets/Resources/Yarn/Test_Huoshan/情绪模块相关.yarn.meta create mode 100644 Assets/Scripts/MiniGame/HuoShan/Emo/EmoManager.cs create mode 100644 Assets/Scripts/MiniGame/HuoShan/Emo/EmoManager.cs.meta diff --git a/Assets/CameraData/Main Camera Blends.asset b/Assets/CameraData/Main Camera Blends.asset index 7b326ff83..5a87552be 100644 --- a/Assets/CameraData/Main Camera Blends.asset +++ b/Assets/CameraData/Main Camera Blends.asset @@ -68,7 +68,7 @@ MonoBehaviour: m_PreInfinity: 0 m_PostInfinity: 0 m_RotationOrder: 0 - - m_From: Eye DeepCamera + - m_From: Emo Deep Camera m_To: '**ANY CAMERA**' m_Blend: m_Style: 0 @@ -79,3 +79,14 @@ MonoBehaviour: m_PreInfinity: 0 m_PostInfinity: 0 m_RotationOrder: 0 + - m_From: '**ANY CAMERA**' + m_To: Emo Deep Camera + m_Blend: + m_Style: 0 + m_Time: 2 + m_CustomCurve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 0 + m_PostInfinity: 0 + m_RotationOrder: 0 diff --git a/Assets/Language/Dialog/Test_Huoshan/Test_Huoshan Shared Data.asset b/Assets/Language/Dialog/Test_Huoshan/Test_Huoshan Shared Data.asset index b34ec9289..709c9a066 100644 --- a/Assets/Language/Dialog/Test_Huoshan/Test_Huoshan Shared Data.asset +++ b/Assets/Language/Dialog/Test_Huoshan/Test_Huoshan Shared Data.asset @@ -19,27 +19,72 @@ MonoBehaviour: m_Key: line:0ef7bff m_Metadata: m_Items: - - rid: 7848877248308838403 + - rid: 7848877270717431810 - m_Id: 180190609408 m_Key: line:088b598 m_Metadata: m_Items: - - rid: 7848877248308838404 + - rid: 7848877270717431811 - m_Id: 180190609409 m_Key: line:0dac12c m_Metadata: m_Items: - - rid: 7848877248308838405 + - rid: 7848877270717431812 - m_Id: 180190609410 m_Key: line:0ad2190 m_Metadata: m_Items: - - rid: 7848877248308838406 + - rid: 7848877270717431813 - m_Id: 180194803712 m_Key: line:0466fea m_Metadata: m_Items: - - rid: 7848877248308838407 + - rid: 7848877270717431814 + - m_Id: 385815380393984 + m_Key: line:3adc1a6b + m_Metadata: + m_Items: + - rid: 7848877270717431815 + - m_Id: 385815418142720 + m_Key: line:88de144d + m_Metadata: + m_Items: + - rid: 7848877270717431816 + - m_Id: 385815418142721 + m_Key: line:6e39d94c + m_Metadata: + m_Items: + - rid: 7848877270717431817 + - m_Id: 385815422337024 + m_Key: line:10a52b00 + m_Metadata: + m_Items: + - rid: 7848877270717431818 + - m_Id: 385815422337025 + m_Key: line:bbda6a4d + m_Metadata: + m_Items: + - rid: 7848877270717431819 + - m_Id: 385815422337026 + m_Key: line:18803fd4 + m_Metadata: + m_Items: + - rid: 7848877270717431820 + - m_Id: 385815422337027 + m_Key: line:29e5d4fb + m_Metadata: + m_Items: + - rid: 7848877270717431821 + - m_Id: 385815422337028 + m_Key: line:819f5fc5 + m_Metadata: + m_Items: + - rid: 7848877270717431822 + - m_Id: 385815422337029 + m_Key: line:c51438fd + m_Metadata: + m_Items: + - rid: 7848877270717431823 m_Metadata: m_Items: [] m_KeyGenerator: @@ -51,28 +96,73 @@ MonoBehaviour: type: {class: DistributedUIDGenerator, ns: UnityEngine.Localization.Tables, asm: Unity.Localization} data: m_CustomEpoch: 1747115029650 - - rid: 7848877248308838403 + - rid: 7848877270717431810 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: Start tags: [] - - rid: 7848877248308838404 + - rid: 7848877270717431811 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: Center tags: [] - - rid: 7848877248308838405 + - rid: 7848877270717431812 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: "UserA_\u5708\u5C42\u8C61\u5F81\u8005" tags: [] - - rid: 7848877248308838406 + - rid: 7848877270717431813 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: "UserA_\u5708\u5C42\u8C61\u5F81\u8005" tags: [] - - rid: 7848877248308838407 + - rid: 7848877270717431814 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: "UserA_\u5708\u5C42\u8C61\u5F81\u8005" tags: [] + - rid: 7848877270717431815 + type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} + data: + nodeName: Start + tags: [] + - rid: 7848877270717431816 + type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} + data: + nodeName: "\u60C5\u7EEA\u63A2\u7D22\u5B8C\u6210" + tags: [] + - rid: 7848877270717431817 + type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} + data: + nodeName: "\u81EA\u5351\u627E\u5230\u4E86" + tags: [] + - rid: 7848877270717431818 + type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} + data: + nodeName: "\u7F9E\u803B\u627E\u5230\u4E86" + tags: [] + - rid: 7848877270717431819 + type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} + data: + nodeName: "\u6050\u60E7\u627E\u5230\u4E86" + tags: [] + - rid: 7848877270717431820 + type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} + data: + nodeName: "\u7ED3\u675F\u60C5\u7EEA\u6A21\u5757\u63A2\u7D22" + tags: [] + - rid: 7848877270717431821 + type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} + data: + nodeName: "\u627E\u5230\u7F9E\u803B\u5BF9\u8BDD" + tags: [] + - rid: 7848877270717431822 + type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} + data: + nodeName: "\u627E\u5230\u6050\u60E7\u5BF9\u8BDD" + tags: [] + - rid: 7848877270717431823 + type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} + data: + nodeName: "\u627E\u5230\u81EA\u5351\u5BF9\u8BDD" + tags: [] diff --git a/Assets/Language/Dialog/Test_Huoshan/Test_Huoshan_zh-Hans.asset b/Assets/Language/Dialog/Test_Huoshan/Test_Huoshan_zh-Hans.asset index c2ac2d570..f2f3ef9c5 100644 --- a/Assets/Language/Dialog/Test_Huoshan/Test_Huoshan_zh-Hans.asset +++ b/Assets/Language/Dialog/Test_Huoshan/Test_Huoshan_zh-Hans.asset @@ -38,6 +38,42 @@ MonoBehaviour: m_Localized: "me:\u770B\u8D77\u6765\u5B8C\u5168\u4E0D\u884C\u5462\uFF0C\u8BD5\u8BD5\u522B\u7684\u5427" m_Metadata: m_Items: [] + - m_Id: 385815380393984 + m_Localized: "\u6DF1\u5165\u60C5\u7EEA\u6A21\u5757" + m_Metadata: + m_Items: [] + - m_Id: 385815418142720 + m_Localized: "\u60C5\u7EEA\u63A2\u7D22\u5B8C\u6210\u4E86" + m_Metadata: + m_Items: [] + - m_Id: 385815418142721 + m_Localized: "\u81EA\u5351\u627E\u5230\u4E86" + m_Metadata: + m_Items: [] + - m_Id: 385815422337024 + m_Localized: "\u7F9E\u803B\u627E\u5230\u4E86" + m_Metadata: + m_Items: [] + - m_Id: 385815422337025 + m_Localized: "\u6050\u60E7\u627E\u5230\u4E86" + m_Metadata: + m_Items: [] + - m_Id: 385815422337026 + m_Localized: "\u5360\u4F4D" + m_Metadata: + m_Items: [] + - m_Id: 385815422337027 + m_Localized: "\u7F9E\u803B" + m_Metadata: + m_Items: [] + - m_Id: 385815422337028 + m_Localized: "\u6050\u60E7" + m_Metadata: + m_Items: [] + - m_Id: 385815422337029 + m_Localized: "\u81EA\u5351" + m_Metadata: + m_Items: [] references: version: 2 RefIds: [] diff --git a/Assets/Resources/Yarn/Test_Huoshan/Center.yarn b/Assets/Resources/Yarn/Test_Huoshan/Center.yarn index f355c0eb6..acc644fc3 100644 --- a/Assets/Resources/Yarn/Test_Huoshan/Center.yarn +++ b/Assets/Resources/Yarn/Test_Huoshan/Center.yarn @@ -6,6 +6,8 @@ position: 205,-53 <> ->深入表达模块 #line:0ef7bff <> +->深入情绪模块 + <> // <> // <> === diff --git a/Assets/Resources/Yarn/Test_Huoshan/EventNode.yarn b/Assets/Resources/Yarn/Test_Huoshan/EventNode.yarn index 1780f0112..f56846b00 100644 --- a/Assets/Resources/Yarn/Test_Huoshan/EventNode.yarn +++ b/Assets/Resources/Yarn/Test_Huoshan/EventNode.yarn @@ -49,3 +49,32 @@ position: 480,-2840 --- <> === + +title: 情绪探索完成 +tags: 待编辑 +colorID: 8 +position: 480,-2840 +--- +情绪探索完成了 +=== +title: 自卑找到了 +tags: 待编辑 +colorID: 8 +position: 480,-2840 +--- +自卑找到了 +=== +title: 羞耻找到了 +tags: 待编辑 +colorID: 8 +position: 480,-2840 +--- +羞耻找到了 +=== +title: 恐惧找到了 +tags: 待编辑 +colorID: 8 +position: 480,-2840 +--- +恐惧找到了 +=== \ No newline at end of file diff --git a/Assets/Resources/Yarn/Test_Huoshan/情绪模块相关.yarn b/Assets/Resources/Yarn/Test_Huoshan/情绪模块相关.yarn new file mode 100644 index 000000000..471047dd1 --- /dev/null +++ b/Assets/Resources/Yarn/Test_Huoshan/情绪模块相关.yarn @@ -0,0 +1,25 @@ +title: 结束情绪模块探索 +tags: +colorID: 8 +position: 272,-1156 +--- + + +占位 +=== + +title: 找到羞耻对话 +position: 275,-222 +--- +羞耻 +=== +title: 找到恐惧对话 +position: 275,-222 +--- +恐惧 +=== +title: 找到自卑对话 +position: 275,-222 +--- +自卑 +=== \ No newline at end of file diff --git a/Assets/Resources/Yarn/Test_Huoshan/情绪模块相关.yarn.meta b/Assets/Resources/Yarn/Test_Huoshan/情绪模块相关.yarn.meta new file mode 100644 index 000000000..ae3e24973 --- /dev/null +++ b/Assets/Resources/Yarn/Test_Huoshan/情绪模块相关.yarn.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: bb3b7274d4bc5264eb62c0f71e81029a +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 94073015eacc34c1d8fc6786e43d60ca, type: 3} diff --git a/Assets/Scenes/HuoShanFixScene.unity b/Assets/Scenes/HuoShanFixScene.unity index 66a97a9f3..fe2f11ed8 100644 --- a/Assets/Scenes/HuoShanFixScene.unity +++ b/Assets/Scenes/HuoShanFixScene.unity @@ -131,58 +131,58 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 577612223} m_Modifications: - - target: {fileID: 7035731615624774062, guid: 8215a14f930072e46bc8756e84ced2ca, type: 3} + - target: {fileID: 7035731615624774062, guid: 8e4b17cc8fd30b1498ed9d3d8fa5a308, type: 3} propertyPath: m_LocalPosition.x value: 4.52 objectReference: {fileID: 0} - - target: {fileID: 7035731615624774062, guid: 8215a14f930072e46bc8756e84ced2ca, type: 3} + - target: {fileID: 7035731615624774062, guid: 8e4b17cc8fd30b1498ed9d3d8fa5a308, type: 3} propertyPath: m_LocalPosition.y value: 0.19000053 objectReference: {fileID: 0} - - target: {fileID: 7035731615624774062, guid: 8215a14f930072e46bc8756e84ced2ca, type: 3} + - target: {fileID: 7035731615624774062, guid: 8e4b17cc8fd30b1498ed9d3d8fa5a308, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 7035731615624774062, guid: 8215a14f930072e46bc8756e84ced2ca, type: 3} + - target: {fileID: 7035731615624774062, guid: 8e4b17cc8fd30b1498ed9d3d8fa5a308, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 7035731615624774062, guid: 8215a14f930072e46bc8756e84ced2ca, type: 3} + - target: {fileID: 7035731615624774062, guid: 8e4b17cc8fd30b1498ed9d3d8fa5a308, type: 3} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 7035731615624774062, guid: 8215a14f930072e46bc8756e84ced2ca, type: 3} + - target: {fileID: 7035731615624774062, guid: 8e4b17cc8fd30b1498ed9d3d8fa5a308, type: 3} propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 7035731615624774062, guid: 8215a14f930072e46bc8756e84ced2ca, type: 3} + - target: {fileID: 7035731615624774062, guid: 8e4b17cc8fd30b1498ed9d3d8fa5a308, type: 3} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 7035731615624774062, guid: 8215a14f930072e46bc8756e84ced2ca, type: 3} + - target: {fileID: 7035731615624774062, guid: 8e4b17cc8fd30b1498ed9d3d8fa5a308, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 7035731615624774062, guid: 8215a14f930072e46bc8756e84ced2ca, type: 3} + - target: {fileID: 7035731615624774062, guid: 8e4b17cc8fd30b1498ed9d3d8fa5a308, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 7035731615624774062, guid: 8215a14f930072e46bc8756e84ced2ca, type: 3} + - target: {fileID: 7035731615624774062, guid: 8e4b17cc8fd30b1498ed9d3d8fa5a308, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 7653142955462933678, guid: 8215a14f930072e46bc8756e84ced2ca, type: 3} + - target: {fileID: 7653142955462933678, guid: 8e4b17cc8fd30b1498ed9d3d8fa5a308, type: 3} propertyPath: m_Name - value: PlugCableGroup (3) + value: PlugCableGroup (7) objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 8215a14f930072e46bc8756e84ced2ca, type: 3} + m_SourcePrefab: {fileID: 100100000, guid: 8e4b17cc8fd30b1498ed9d3d8fa5a308, type: 3} --- !u!4 &8893232 stripped Transform: - m_CorrespondingSourceObject: {fileID: 7035731615624774062, guid: 8215a14f930072e46bc8756e84ced2ca, type: 3} + m_CorrespondingSourceObject: {fileID: 7035731615624774062, guid: 8e4b17cc8fd30b1498ed9d3d8fa5a308, type: 3} m_PrefabInstance: {fileID: 8893231} m_PrefabAsset: {fileID: 0} --- !u!1 &13903365 @@ -4246,6 +4246,96 @@ MonoBehaviour: - 0.15 - 0.05 - 0.07 +--- !u!1001 &499093175 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1774281545} + m_Modifications: + - target: {fileID: 1064932125706210448, guid: 67658af7714634d45a2aa8f958ea21fd, type: 3} + propertyPath: followTarget + value: + objectReference: {fileID: 499093176} + - target: {fileID: 3464828912861393548, guid: 67658af7714634d45a2aa8f958ea21fd, type: 3} + propertyPath: m_LocalPosition.x + value: 1.0322266 + objectReference: {fileID: 0} + - target: {fileID: 3464828912861393548, guid: 67658af7714634d45a2aa8f958ea21fd, type: 3} + propertyPath: m_LocalPosition.y + value: -8.656498 + objectReference: {fileID: 0} + - target: {fileID: 3464828912861393548, guid: 67658af7714634d45a2aa8f958ea21fd, type: 3} + propertyPath: m_LocalPosition.z + value: -7.0221577 + objectReference: {fileID: 0} + - target: {fileID: 3464828912861393548, guid: 67658af7714634d45a2aa8f958ea21fd, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3464828912861393548, guid: 67658af7714634d45a2aa8f958ea21fd, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3464828912861393548, guid: 67658af7714634d45a2aa8f958ea21fd, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3464828912861393548, guid: 67658af7714634d45a2aa8f958ea21fd, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3464828912861393548, guid: 67658af7714634d45a2aa8f958ea21fd, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3464828912861393548, guid: 67658af7714634d45a2aa8f958ea21fd, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3464828912861393548, guid: 67658af7714634d45a2aa8f958ea21fd, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3707600716635553228, guid: 67658af7714634d45a2aa8f958ea21fd, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3707600716635553228, guid: 67658af7714634d45a2aa8f958ea21fd, type: 3} + propertyPath: m_AnchoredPosition.y + value: 4.6 + objectReference: {fileID: 0} + - target: {fileID: 4923765435343198473, guid: 67658af7714634d45a2aa8f958ea21fd, type: 3} + propertyPath: m_AnchoredPosition.x + value: -9.2 + objectReference: {fileID: 0} + - target: {fileID: 5160144299344876289, guid: 67658af7714634d45a2aa8f958ea21fd, type: 3} + propertyPath: m_LocalPosition.z + value: 0.4 + objectReference: {fileID: 0} + - target: {fileID: 5160144299344876289, guid: 67658af7714634d45a2aa8f958ea21fd, type: 3} + propertyPath: m_AnchoredPosition.y + value: -10.7 + objectReference: {fileID: 0} + - target: {fileID: 8940115791731250026, guid: 67658af7714634d45a2aa8f958ea21fd, type: 3} + propertyPath: m_AnchoredPosition.x + value: 7.9 + objectReference: {fileID: 0} + - target: {fileID: 9153305584215853973, guid: 67658af7714634d45a2aa8f958ea21fd, type: 3} + propertyPath: m_Name + value: Emo View + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 67658af7714634d45a2aa8f958ea21fd, type: 3} +--- !u!4 &499093176 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3464828912861393548, guid: 67658af7714634d45a2aa8f958ea21fd, type: 3} + m_PrefabInstance: {fileID: 499093175} + m_PrefabAsset: {fileID: 0} --- !u!1 &503672346 GameObject: m_ObjectHideFlags: 0 @@ -5698,7 +5788,7 @@ Transform: - {fileID: 1543994082} - {fileID: 2029061333} - {fileID: 1417389773} - m_Father: {fileID: 2138889539} + m_Father: {fileID: 1131749961} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &549427947 MonoBehaviour: @@ -7108,7 +7198,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1479235760} - m_Father: {fileID: 2138889539} + m_Father: {fileID: 1131749961} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -9419,7 +9509,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 2138889539} + m_Father: {fileID: 1131749961} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &969359384 SpriteRenderer: @@ -9799,7 +9889,7 @@ SpriteRenderer: m_SpriteSortPoint: 0 --- !u!4 &1010466507 stripped Transform: - m_CorrespondingSourceObject: {fileID: 7035731615624774062, guid: 8215a14f930072e46bc8756e84ced2ca, type: 3} + m_CorrespondingSourceObject: {fileID: 7035731615624774062, guid: 8e4b17cc8fd30b1498ed9d3d8fa5a308, type: 3} m_PrefabInstance: {fileID: 6160900171297423149} m_PrefabAsset: {fileID: 0} --- !u!1 &1019648048 @@ -9921,6 +10011,50 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ac0b09e7857660247b1477e93731de29, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &1043612502 +GameObject: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1043612503} + - component: {fileID: 1043612504} + m_Layer: 0 + m_Name: cm + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1043612503 +Transform: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1043612502} + 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: 1830922715} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1043612504 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1043612502} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ac0b09e7857660247b1477e93731de29, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1052128152 GameObject: m_ObjectHideFlags: 0 @@ -10768,6 +10902,40 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1130794394} m_CullTransparentMesh: 1 +--- !u!1 &1131749960 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1131749961} + m_Layer: 0 + m_Name: ExpressView + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &1131749961 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1131749960} + 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: 549427946} + - {fileID: 727870748} + - {fileID: 969359383} + m_Father: {fileID: 2138889539} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1138014218 GameObject: m_ObjectHideFlags: 0 @@ -10985,6 +11153,50 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 400d314e97bc045419d11ac25d78f61d, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &1152811716 +GameObject: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1152811717} + - component: {fileID: 1152811718} + m_Layer: 0 + m_Name: cm + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1152811717 +Transform: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1152811716} + 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: 2091013945} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1152811718 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1152811716} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ac0b09e7857660247b1477e93731de29, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &1156742826 PrefabInstance: m_ObjectHideFlags: 0 @@ -10993,58 +11205,58 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 577612223} m_Modifications: - - target: {fileID: 7035731615624774062, guid: 8215a14f930072e46bc8756e84ced2ca, type: 3} + - target: {fileID: 7035731615624774062, guid: 8e4b17cc8fd30b1498ed9d3d8fa5a308, type: 3} propertyPath: m_LocalPosition.x value: 8.52 objectReference: {fileID: 0} - - target: {fileID: 7035731615624774062, guid: 8215a14f930072e46bc8756e84ced2ca, type: 3} + - target: {fileID: 7035731615624774062, guid: 8e4b17cc8fd30b1498ed9d3d8fa5a308, type: 3} propertyPath: m_LocalPosition.y value: 0.19000053 objectReference: {fileID: 0} - - target: {fileID: 7035731615624774062, guid: 8215a14f930072e46bc8756e84ced2ca, type: 3} + - target: {fileID: 7035731615624774062, guid: 8e4b17cc8fd30b1498ed9d3d8fa5a308, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 7035731615624774062, guid: 8215a14f930072e46bc8756e84ced2ca, type: 3} + - target: {fileID: 7035731615624774062, guid: 8e4b17cc8fd30b1498ed9d3d8fa5a308, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 7035731615624774062, guid: 8215a14f930072e46bc8756e84ced2ca, type: 3} + - target: {fileID: 7035731615624774062, guid: 8e4b17cc8fd30b1498ed9d3d8fa5a308, type: 3} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 7035731615624774062, guid: 8215a14f930072e46bc8756e84ced2ca, type: 3} + - target: {fileID: 7035731615624774062, guid: 8e4b17cc8fd30b1498ed9d3d8fa5a308, type: 3} propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 7035731615624774062, guid: 8215a14f930072e46bc8756e84ced2ca, type: 3} + - target: {fileID: 7035731615624774062, guid: 8e4b17cc8fd30b1498ed9d3d8fa5a308, type: 3} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 7035731615624774062, guid: 8215a14f930072e46bc8756e84ced2ca, type: 3} + - target: {fileID: 7035731615624774062, guid: 8e4b17cc8fd30b1498ed9d3d8fa5a308, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 7035731615624774062, guid: 8215a14f930072e46bc8756e84ced2ca, type: 3} + - target: {fileID: 7035731615624774062, guid: 8e4b17cc8fd30b1498ed9d3d8fa5a308, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 7035731615624774062, guid: 8215a14f930072e46bc8756e84ced2ca, type: 3} + - target: {fileID: 7035731615624774062, guid: 8e4b17cc8fd30b1498ed9d3d8fa5a308, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 7653142955462933678, guid: 8215a14f930072e46bc8756e84ced2ca, type: 3} + - target: {fileID: 7653142955462933678, guid: 8e4b17cc8fd30b1498ed9d3d8fa5a308, type: 3} propertyPath: m_Name - value: PlugCableGroup (7) + value: PlugCableGroup (4) objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 8215a14f930072e46bc8756e84ced2ca, type: 3} + m_SourcePrefab: {fileID: 100100000, guid: 8e4b17cc8fd30b1498ed9d3d8fa5a308, type: 3} --- !u!4 &1156742827 stripped Transform: - m_CorrespondingSourceObject: {fileID: 7035731615624774062, guid: 8215a14f930072e46bc8756e84ced2ca, type: 3} + m_CorrespondingSourceObject: {fileID: 7035731615624774062, guid: 8e4b17cc8fd30b1498ed9d3d8fa5a308, type: 3} m_PrefabInstance: {fileID: 1156742826} m_PrefabAsset: {fileID: 0} --- !u!1 &1157582229 @@ -12035,58 +12247,58 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 577612223} m_Modifications: - - target: {fileID: 7035731615624774062, guid: 8215a14f930072e46bc8756e84ced2ca, type: 3} + - target: {fileID: 7035731615624774062, guid: 8e4b17cc8fd30b1498ed9d3d8fa5a308, type: 3} propertyPath: m_LocalPosition.x value: 5.52 objectReference: {fileID: 0} - - target: {fileID: 7035731615624774062, guid: 8215a14f930072e46bc8756e84ced2ca, type: 3} + - target: {fileID: 7035731615624774062, guid: 8e4b17cc8fd30b1498ed9d3d8fa5a308, type: 3} propertyPath: m_LocalPosition.y value: 0.19000053 objectReference: {fileID: 0} - - target: {fileID: 7035731615624774062, guid: 8215a14f930072e46bc8756e84ced2ca, type: 3} + - target: {fileID: 7035731615624774062, guid: 8e4b17cc8fd30b1498ed9d3d8fa5a308, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 7035731615624774062, guid: 8215a14f930072e46bc8756e84ced2ca, type: 3} + - target: {fileID: 7035731615624774062, guid: 8e4b17cc8fd30b1498ed9d3d8fa5a308, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 7035731615624774062, guid: 8215a14f930072e46bc8756e84ced2ca, type: 3} + - target: {fileID: 7035731615624774062, guid: 8e4b17cc8fd30b1498ed9d3d8fa5a308, type: 3} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 7035731615624774062, guid: 8215a14f930072e46bc8756e84ced2ca, type: 3} + - target: {fileID: 7035731615624774062, guid: 8e4b17cc8fd30b1498ed9d3d8fa5a308, type: 3} propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 7035731615624774062, guid: 8215a14f930072e46bc8756e84ced2ca, type: 3} + - target: {fileID: 7035731615624774062, guid: 8e4b17cc8fd30b1498ed9d3d8fa5a308, type: 3} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 7035731615624774062, guid: 8215a14f930072e46bc8756e84ced2ca, type: 3} + - target: {fileID: 7035731615624774062, guid: 8e4b17cc8fd30b1498ed9d3d8fa5a308, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 7035731615624774062, guid: 8215a14f930072e46bc8756e84ced2ca, type: 3} + - target: {fileID: 7035731615624774062, guid: 8e4b17cc8fd30b1498ed9d3d8fa5a308, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 7035731615624774062, guid: 8215a14f930072e46bc8756e84ced2ca, type: 3} + - target: {fileID: 7035731615624774062, guid: 8e4b17cc8fd30b1498ed9d3d8fa5a308, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 7653142955462933678, guid: 8215a14f930072e46bc8756e84ced2ca, type: 3} + - target: {fileID: 7653142955462933678, guid: 8e4b17cc8fd30b1498ed9d3d8fa5a308, type: 3} propertyPath: m_Name - value: PlugCableGroup (4) + value: PlugCableGroup (8) objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 8215a14f930072e46bc8756e84ced2ca, type: 3} + m_SourcePrefab: {fileID: 100100000, guid: 8e4b17cc8fd30b1498ed9d3d8fa5a308, type: 3} --- !u!4 &1262599245 stripped Transform: - m_CorrespondingSourceObject: {fileID: 7035731615624774062, guid: 8215a14f930072e46bc8756e84ced2ca, type: 3} + m_CorrespondingSourceObject: {fileID: 7035731615624774062, guid: 8e4b17cc8fd30b1498ed9d3d8fa5a308, type: 3} m_PrefabInstance: {fileID: 1262599244} m_PrefabAsset: {fileID: 0} --- !u!1 &1273433142 @@ -12663,58 +12875,58 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 577612223} m_Modifications: - - target: {fileID: 7035731615624774062, guid: 8215a14f930072e46bc8756e84ced2ca, type: 3} + - target: {fileID: 7035731615624774062, guid: 8e4b17cc8fd30b1498ed9d3d8fa5a308, type: 3} propertyPath: m_LocalPosition.x value: 2.52 objectReference: {fileID: 0} - - target: {fileID: 7035731615624774062, guid: 8215a14f930072e46bc8756e84ced2ca, type: 3} + - target: {fileID: 7035731615624774062, guid: 8e4b17cc8fd30b1498ed9d3d8fa5a308, type: 3} propertyPath: m_LocalPosition.y value: 0.19000053 objectReference: {fileID: 0} - - target: {fileID: 7035731615624774062, guid: 8215a14f930072e46bc8756e84ced2ca, type: 3} + - target: {fileID: 7035731615624774062, guid: 8e4b17cc8fd30b1498ed9d3d8fa5a308, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 7035731615624774062, guid: 8215a14f930072e46bc8756e84ced2ca, type: 3} + - target: {fileID: 7035731615624774062, guid: 8e4b17cc8fd30b1498ed9d3d8fa5a308, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 7035731615624774062, guid: 8215a14f930072e46bc8756e84ced2ca, type: 3} + - target: {fileID: 7035731615624774062, guid: 8e4b17cc8fd30b1498ed9d3d8fa5a308, type: 3} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 7035731615624774062, guid: 8215a14f930072e46bc8756e84ced2ca, type: 3} + - target: {fileID: 7035731615624774062, guid: 8e4b17cc8fd30b1498ed9d3d8fa5a308, type: 3} propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 7035731615624774062, guid: 8215a14f930072e46bc8756e84ced2ca, type: 3} + - target: {fileID: 7035731615624774062, guid: 8e4b17cc8fd30b1498ed9d3d8fa5a308, type: 3} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 7035731615624774062, guid: 8215a14f930072e46bc8756e84ced2ca, type: 3} + - target: {fileID: 7035731615624774062, guid: 8e4b17cc8fd30b1498ed9d3d8fa5a308, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 7035731615624774062, guid: 8215a14f930072e46bc8756e84ced2ca, type: 3} + - target: {fileID: 7035731615624774062, guid: 8e4b17cc8fd30b1498ed9d3d8fa5a308, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 7035731615624774062, guid: 8215a14f930072e46bc8756e84ced2ca, type: 3} + - target: {fileID: 7035731615624774062, guid: 8e4b17cc8fd30b1498ed9d3d8fa5a308, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 7653142955462933678, guid: 8215a14f930072e46bc8756e84ced2ca, type: 3} + - target: {fileID: 7653142955462933678, guid: 8e4b17cc8fd30b1498ed9d3d8fa5a308, type: 3} propertyPath: m_Name - value: PlugCableGroup (1) + value: PlugCableGroup (6) objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 8215a14f930072e46bc8756e84ced2ca, type: 3} + m_SourcePrefab: {fileID: 100100000, guid: 8e4b17cc8fd30b1498ed9d3d8fa5a308, type: 3} --- !u!4 &1335885315 stripped Transform: - m_CorrespondingSourceObject: {fileID: 7035731615624774062, guid: 8215a14f930072e46bc8756e84ced2ca, type: 3} + m_CorrespondingSourceObject: {fileID: 7035731615624774062, guid: 8e4b17cc8fd30b1498ed9d3d8fa5a308, type: 3} m_PrefabInstance: {fileID: 1335885314} m_PrefabAsset: {fileID: 0} --- !u!1 &1361125756 @@ -17423,7 +17635,7 @@ GameObject: m_Component: - component: {fileID: 1766300704} m_Layer: 0 - m_Name: MemoryGroup + m_Name: Memory Group m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -17450,6 +17662,53 @@ Transform: - {fileID: 103457764} m_Father: {fileID: 1211738976} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1774281544 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1774281545} + - component: {fileID: 1774281546} + m_Layer: 0 + m_Name: EmoManager + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1774281545 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1774281544} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -17.292227, y: 10.674498, z: -19.877842} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 2091013945} + - {fileID: 1830922715} + - {fileID: 499093176} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1774281546 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1774281544} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e519c3520e8cfc546a9b52372bd21274, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1778428343 GameObject: m_ObjectHideFlags: 0 @@ -17763,6 +18022,78 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &1830922714 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1830922715} + - component: {fileID: 1830922716} + m_Layer: 0 + m_Name: Emo Deep Camera + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1830922715 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1830922714} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: -0.8966411, z: 0.44275823, w: 0} + m_LocalPosition: {x: 1.02, y: 2.55, z: 2.03} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1043612503} + m_Father: {fileID: 1774281545} + m_LocalEulerAnglesHint: {x: 52.56, y: -180, z: 0} +--- !u!114 &1830922716 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1830922714} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 45e653bab7fb20e499bda25e1b646fea, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ExcludedPropertiesInInspector: + - m_Script + m_LockStageInInspector: + m_StreamingVersion: 20170927 + m_Priority: 9 + m_StandbyUpdate: 2 + m_LookAt: {fileID: 0} + m_Follow: {fileID: 0} + m_Lens: + FieldOfView: 34 + OrthographicSize: 3.44 + NearClipPlane: 0.29 + FarClipPlane: 1000 + Dutch: 0 + ModeOverride: 0 + LensShift: {x: 0, y: 0} + GateFit: 2 + FocusDistance: 10 + m_SensorSize: {x: 1, y: 1} + m_Transitions: + m_BlendHint: 0 + m_InheritPosition: 0 + m_OnCameraLive: + m_PersistentCalls: + m_Calls: [] + m_LegacyBlendHint: 0 + m_ComponentOwner: {fileID: 1043612503} --- !u!1001 &1843495524 PrefabInstance: m_ObjectHideFlags: 0 @@ -18616,58 +18947,58 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 577612223} m_Modifications: - - target: {fileID: 7035731615624774062, guid: 8215a14f930072e46bc8756e84ced2ca, type: 3} + - target: {fileID: 7035731615624774062, guid: 8e4b17cc8fd30b1498ed9d3d8fa5a308, type: 3} propertyPath: m_LocalPosition.x value: 3.52 objectReference: {fileID: 0} - - target: {fileID: 7035731615624774062, guid: 8215a14f930072e46bc8756e84ced2ca, type: 3} + - target: {fileID: 7035731615624774062, guid: 8e4b17cc8fd30b1498ed9d3d8fa5a308, type: 3} propertyPath: m_LocalPosition.y value: 0.19000053 objectReference: {fileID: 0} - - target: {fileID: 7035731615624774062, guid: 8215a14f930072e46bc8756e84ced2ca, type: 3} + - target: {fileID: 7035731615624774062, guid: 8e4b17cc8fd30b1498ed9d3d8fa5a308, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 7035731615624774062, guid: 8215a14f930072e46bc8756e84ced2ca, type: 3} + - target: {fileID: 7035731615624774062, guid: 8e4b17cc8fd30b1498ed9d3d8fa5a308, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 7035731615624774062, guid: 8215a14f930072e46bc8756e84ced2ca, type: 3} + - target: {fileID: 7035731615624774062, guid: 8e4b17cc8fd30b1498ed9d3d8fa5a308, type: 3} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 7035731615624774062, guid: 8215a14f930072e46bc8756e84ced2ca, type: 3} + - target: {fileID: 7035731615624774062, guid: 8e4b17cc8fd30b1498ed9d3d8fa5a308, type: 3} propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 7035731615624774062, guid: 8215a14f930072e46bc8756e84ced2ca, type: 3} + - target: {fileID: 7035731615624774062, guid: 8e4b17cc8fd30b1498ed9d3d8fa5a308, type: 3} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 7035731615624774062, guid: 8215a14f930072e46bc8756e84ced2ca, type: 3} + - target: {fileID: 7035731615624774062, guid: 8e4b17cc8fd30b1498ed9d3d8fa5a308, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 7035731615624774062, guid: 8215a14f930072e46bc8756e84ced2ca, type: 3} + - target: {fileID: 7035731615624774062, guid: 8e4b17cc8fd30b1498ed9d3d8fa5a308, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 7035731615624774062, guid: 8215a14f930072e46bc8756e84ced2ca, type: 3} + - target: {fileID: 7035731615624774062, guid: 8e4b17cc8fd30b1498ed9d3d8fa5a308, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 7653142955462933678, guid: 8215a14f930072e46bc8756e84ced2ca, type: 3} + - target: {fileID: 7653142955462933678, guid: 8e4b17cc8fd30b1498ed9d3d8fa5a308, type: 3} propertyPath: m_Name - value: PlugCableGroup (2) + value: PlugCableGroup (3) objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 8215a14f930072e46bc8756e84ced2ca, type: 3} + m_SourcePrefab: {fileID: 100100000, guid: 8e4b17cc8fd30b1498ed9d3d8fa5a308, type: 3} --- !u!4 &1864215054 stripped Transform: - m_CorrespondingSourceObject: {fileID: 7035731615624774062, guid: 8215a14f930072e46bc8756e84ced2ca, type: 3} + m_CorrespondingSourceObject: {fileID: 7035731615624774062, guid: 8e4b17cc8fd30b1498ed9d3d8fa5a308, type: 3} m_PrefabInstance: {fileID: 1864215053} m_PrefabAsset: {fileID: 0} --- !u!1 &1867932495 @@ -20157,58 +20488,58 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 577612223} m_Modifications: - - target: {fileID: 7035731615624774062, guid: 8215a14f930072e46bc8756e84ced2ca, type: 3} + - target: {fileID: 7035731615624774062, guid: 8e4b17cc8fd30b1498ed9d3d8fa5a308, type: 3} propertyPath: m_LocalPosition.x value: 7.52 objectReference: {fileID: 0} - - target: {fileID: 7035731615624774062, guid: 8215a14f930072e46bc8756e84ced2ca, type: 3} + - target: {fileID: 7035731615624774062, guid: 8e4b17cc8fd30b1498ed9d3d8fa5a308, type: 3} propertyPath: m_LocalPosition.y value: 0.19000053 objectReference: {fileID: 0} - - target: {fileID: 7035731615624774062, guid: 8215a14f930072e46bc8756e84ced2ca, type: 3} + - target: {fileID: 7035731615624774062, guid: 8e4b17cc8fd30b1498ed9d3d8fa5a308, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 7035731615624774062, guid: 8215a14f930072e46bc8756e84ced2ca, type: 3} + - target: {fileID: 7035731615624774062, guid: 8e4b17cc8fd30b1498ed9d3d8fa5a308, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 7035731615624774062, guid: 8215a14f930072e46bc8756e84ced2ca, type: 3} + - target: {fileID: 7035731615624774062, guid: 8e4b17cc8fd30b1498ed9d3d8fa5a308, type: 3} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 7035731615624774062, guid: 8215a14f930072e46bc8756e84ced2ca, type: 3} + - target: {fileID: 7035731615624774062, guid: 8e4b17cc8fd30b1498ed9d3d8fa5a308, type: 3} propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 7035731615624774062, guid: 8215a14f930072e46bc8756e84ced2ca, type: 3} + - target: {fileID: 7035731615624774062, guid: 8e4b17cc8fd30b1498ed9d3d8fa5a308, type: 3} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 7035731615624774062, guid: 8215a14f930072e46bc8756e84ced2ca, type: 3} + - target: {fileID: 7035731615624774062, guid: 8e4b17cc8fd30b1498ed9d3d8fa5a308, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 7035731615624774062, guid: 8215a14f930072e46bc8756e84ced2ca, type: 3} + - target: {fileID: 7035731615624774062, guid: 8e4b17cc8fd30b1498ed9d3d8fa5a308, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 7035731615624774062, guid: 8215a14f930072e46bc8756e84ced2ca, type: 3} + - target: {fileID: 7035731615624774062, guid: 8e4b17cc8fd30b1498ed9d3d8fa5a308, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 7653142955462933678, guid: 8215a14f930072e46bc8756e84ced2ca, type: 3} + - target: {fileID: 7653142955462933678, guid: 8e4b17cc8fd30b1498ed9d3d8fa5a308, type: 3} propertyPath: m_Name - value: PlugCableGroup (6) + value: PlugCableGroup (2) objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 8215a14f930072e46bc8756e84ced2ca, type: 3} + m_SourcePrefab: {fileID: 100100000, guid: 8e4b17cc8fd30b1498ed9d3d8fa5a308, type: 3} --- !u!4 &2043782261 stripped Transform: - m_CorrespondingSourceObject: {fileID: 7035731615624774062, guid: 8215a14f930072e46bc8756e84ced2ca, type: 3} + m_CorrespondingSourceObject: {fileID: 7035731615624774062, guid: 8e4b17cc8fd30b1498ed9d3d8fa5a308, type: 3} m_PrefabInstance: {fileID: 2043782260} m_PrefabAsset: {fileID: 0} --- !u!1 &2062591471 @@ -20471,47 +20802,47 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 577612223} m_Modifications: - - target: {fileID: 7035731615624774062, guid: 8215a14f930072e46bc8756e84ced2ca, type: 3} + - target: {fileID: 7035731615624774062, guid: 8e4b17cc8fd30b1498ed9d3d8fa5a308, type: 3} propertyPath: m_LocalPosition.x value: 6.52 objectReference: {fileID: 0} - - target: {fileID: 7035731615624774062, guid: 8215a14f930072e46bc8756e84ced2ca, type: 3} + - target: {fileID: 7035731615624774062, guid: 8e4b17cc8fd30b1498ed9d3d8fa5a308, type: 3} propertyPath: m_LocalPosition.y value: 0.19000053 objectReference: {fileID: 0} - - target: {fileID: 7035731615624774062, guid: 8215a14f930072e46bc8756e84ced2ca, type: 3} + - target: {fileID: 7035731615624774062, guid: 8e4b17cc8fd30b1498ed9d3d8fa5a308, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 7035731615624774062, guid: 8215a14f930072e46bc8756e84ced2ca, type: 3} + - target: {fileID: 7035731615624774062, guid: 8e4b17cc8fd30b1498ed9d3d8fa5a308, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 7035731615624774062, guid: 8215a14f930072e46bc8756e84ced2ca, type: 3} + - target: {fileID: 7035731615624774062, guid: 8e4b17cc8fd30b1498ed9d3d8fa5a308, type: 3} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 7035731615624774062, guid: 8215a14f930072e46bc8756e84ced2ca, type: 3} + - target: {fileID: 7035731615624774062, guid: 8e4b17cc8fd30b1498ed9d3d8fa5a308, type: 3} propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 7035731615624774062, guid: 8215a14f930072e46bc8756e84ced2ca, type: 3} + - target: {fileID: 7035731615624774062, guid: 8e4b17cc8fd30b1498ed9d3d8fa5a308, type: 3} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 7035731615624774062, guid: 8215a14f930072e46bc8756e84ced2ca, type: 3} + - target: {fileID: 7035731615624774062, guid: 8e4b17cc8fd30b1498ed9d3d8fa5a308, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 7035731615624774062, guid: 8215a14f930072e46bc8756e84ced2ca, type: 3} + - target: {fileID: 7035731615624774062, guid: 8e4b17cc8fd30b1498ed9d3d8fa5a308, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 7035731615624774062, guid: 8215a14f930072e46bc8756e84ced2ca, type: 3} + - target: {fileID: 7035731615624774062, guid: 8e4b17cc8fd30b1498ed9d3d8fa5a308, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 7653142955462933678, guid: 8215a14f930072e46bc8756e84ced2ca, type: 3} + - target: {fileID: 7653142955462933678, guid: 8e4b17cc8fd30b1498ed9d3d8fa5a308, type: 3} propertyPath: m_Name value: PlugCableGroup (5) objectReference: {fileID: 0} @@ -20519,10 +20850,10 @@ PrefabInstance: m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 8215a14f930072e46bc8756e84ced2ca, type: 3} + m_SourcePrefab: {fileID: 100100000, guid: 8e4b17cc8fd30b1498ed9d3d8fa5a308, type: 3} --- !u!4 &2073961673 stripped Transform: - m_CorrespondingSourceObject: {fileID: 7035731615624774062, guid: 8215a14f930072e46bc8756e84ced2ca, type: 3} + m_CorrespondingSourceObject: {fileID: 7035731615624774062, guid: 8e4b17cc8fd30b1498ed9d3d8fa5a308, type: 3} m_PrefabInstance: {fileID: 2073961672} m_PrefabAsset: {fileID: 0} --- !u!1 &2086302717 @@ -20609,6 +20940,78 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 1 +--- !u!1 &2091013944 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2091013945} + - component: {fileID: 2091013946} + m_Layer: 0 + m_Name: Emo Camera + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2091013945 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2091013944} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -18.21, y: -8.62, z: 9.100535} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1152811717} + m_Father: {fileID: 1774281545} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &2091013946 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2091013944} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 45e653bab7fb20e499bda25e1b646fea, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ExcludedPropertiesInInspector: + - m_Script + m_LockStageInInspector: + m_StreamingVersion: 20170927 + m_Priority: 9 + m_StandbyUpdate: 2 + m_LookAt: {fileID: 0} + m_Follow: {fileID: 0} + m_Lens: + FieldOfView: 34 + OrthographicSize: 2 + NearClipPlane: 0.3 + FarClipPlane: 1000 + Dutch: 0 + ModeOverride: 0 + LensShift: {x: 0, y: 0} + GateFit: 2 + FocusDistance: 10 + m_SensorSize: {x: 1, y: 1} + m_Transitions: + m_BlendHint: 0 + m_InheritPosition: 0 + m_OnCameraLive: + m_PersistentCalls: + m_Calls: [] + m_LegacyBlendHint: 0 + m_ComponentOwner: {fileID: 1152811717} --- !u!21 &2091261678 Material: serializedVersion: 8 @@ -21816,11 +22219,9 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 727870748} - {fileID: 1393009640} - {fileID: 118320537} - - {fileID: 969359383} - - {fileID: 549427946} + - {fileID: 1131749961} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &2138889540 @@ -21835,7 +22236,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7245d320411db7c449fe8dec4ef86edf, type: 3} m_Name: m_EditorClassIdentifier: - expressView: {fileID: 1479235759} + expressView: {fileID: 1131749960} totalPointsText: {fileID: 1939639599} totalPoints: 10 driverSlotText: {fileID: 940756018} @@ -23102,55 +23503,55 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 577612223} m_Modifications: - - target: {fileID: 7035731615624774062, guid: 8215a14f930072e46bc8756e84ced2ca, type: 3} + - target: {fileID: 7035731615624774062, guid: 8e4b17cc8fd30b1498ed9d3d8fa5a308, type: 3} propertyPath: m_LocalPosition.x value: 1.5200005 objectReference: {fileID: 0} - - target: {fileID: 7035731615624774062, guid: 8215a14f930072e46bc8756e84ced2ca, type: 3} + - target: {fileID: 7035731615624774062, guid: 8e4b17cc8fd30b1498ed9d3d8fa5a308, type: 3} propertyPath: m_LocalPosition.y value: 0.19000053 objectReference: {fileID: 0} - - target: {fileID: 7035731615624774062, guid: 8215a14f930072e46bc8756e84ced2ca, type: 3} + - target: {fileID: 7035731615624774062, guid: 8e4b17cc8fd30b1498ed9d3d8fa5a308, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 7035731615624774062, guid: 8215a14f930072e46bc8756e84ced2ca, type: 3} + - target: {fileID: 7035731615624774062, guid: 8e4b17cc8fd30b1498ed9d3d8fa5a308, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 7035731615624774062, guid: 8215a14f930072e46bc8756e84ced2ca, type: 3} + - target: {fileID: 7035731615624774062, guid: 8e4b17cc8fd30b1498ed9d3d8fa5a308, type: 3} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 7035731615624774062, guid: 8215a14f930072e46bc8756e84ced2ca, type: 3} + - target: {fileID: 7035731615624774062, guid: 8e4b17cc8fd30b1498ed9d3d8fa5a308, type: 3} propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 7035731615624774062, guid: 8215a14f930072e46bc8756e84ced2ca, type: 3} + - target: {fileID: 7035731615624774062, guid: 8e4b17cc8fd30b1498ed9d3d8fa5a308, type: 3} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 7035731615624774062, guid: 8215a14f930072e46bc8756e84ced2ca, type: 3} + - target: {fileID: 7035731615624774062, guid: 8e4b17cc8fd30b1498ed9d3d8fa5a308, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 7035731615624774062, guid: 8215a14f930072e46bc8756e84ced2ca, type: 3} + - target: {fileID: 7035731615624774062, guid: 8e4b17cc8fd30b1498ed9d3d8fa5a308, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 7035731615624774062, guid: 8215a14f930072e46bc8756e84ced2ca, type: 3} + - target: {fileID: 7035731615624774062, guid: 8e4b17cc8fd30b1498ed9d3d8fa5a308, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 7653142955462933678, guid: 8215a14f930072e46bc8756e84ced2ca, type: 3} + - target: {fileID: 7653142955462933678, guid: 8e4b17cc8fd30b1498ed9d3d8fa5a308, type: 3} propertyPath: m_Name - value: PlugCableGroup + value: PlugCableGroup (1) objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 8215a14f930072e46bc8756e84ced2ca, type: 3} + m_SourcePrefab: {fileID: 100100000, guid: 8e4b17cc8fd30b1498ed9d3d8fa5a308, type: 3} --- !u!4 &6248761609012951487 Transform: m_ObjectHideFlags: 0 @@ -23755,3 +24156,4 @@ SceneRoots: - {fileID: 1211738976} - {fileID: 2020307036959479555} - {fileID: 2138889539} + - {fileID: 1774281545} diff --git a/Assets/Scripts/FixSystem/Memory/MemoryProcess.cs b/Assets/Scripts/FixSystem/Memory/MemoryProcess.cs index 6c82ddc50..18335430d 100644 --- a/Assets/Scripts/FixSystem/Memory/MemoryProcess.cs +++ b/Assets/Scripts/FixSystem/Memory/MemoryProcess.cs @@ -30,6 +30,8 @@ public class MemoryProcess : MonoBehaviour public float targetFrequency = 1.25f; // 目标频率 public float targetClarity = 5.7f; // 目标频率 + + private GameObject memoryGroup; private float lockThreshold = 0.06f; // 锁定阈值 private bool isProcessing = false; // 新增变量来追踪是否正在处理记忆 @@ -51,6 +53,7 @@ public class MemoryProcess : MonoBehaviour public void OpenMemoryView() { memoryView.gameObject.SetActive(true); + memoryGroup.SetActive(true); } public IEnumerator DropMemoryProjector() @@ -70,6 +73,7 @@ public class MemoryProcess : MonoBehaviour public void CloseMemoryView() { memoryView.gameObject.SetActive(false); + memoryGroup.SetActive(false); } public void OnEnter() { @@ -92,6 +96,7 @@ public class MemoryProcess : MonoBehaviour public void OnExit() { FavoritesManager.Instance.CloseFavorites(); + CloseMemoryView(); // 离开视图时的逻辑 Debug.Log("MemoryView exited."); } @@ -104,6 +109,8 @@ public class MemoryProcess : MonoBehaviour private void InitSystem() { FixSystemCenter.SystemDic.Register(this); + memoryGroup = transform.Find("Memory Group").gameObject; + memoryGroup.SetActive(false); var virtualCam = transform.Find("Memory Camera").GetComponent(); CameraKit.Instance.RegisterCamera(CameraEnum.Memory, virtualCam); } diff --git a/Assets/Scripts/FixSystemNew/FixStateMachine.cs b/Assets/Scripts/FixSystemNew/FixStateMachine.cs index 2020101c9..606fcc576 100644 --- a/Assets/Scripts/FixSystemNew/FixStateMachine.cs +++ b/Assets/Scripts/FixSystemNew/FixStateMachine.cs @@ -61,6 +61,7 @@ namespace AibisDream.FixSystem FixState.UF => new UfState(), FixState.Gear => new GearState(), FixState.Expression => new ExpressionState(), + FixState.Emo => new EmoState(), _ => new ClinicState() }; @@ -79,7 +80,8 @@ namespace AibisDream.FixSystem UF, Expression, Engine, - Gear + Gear, + Emo } public interface IState @@ -116,7 +118,7 @@ namespace AibisDream.FixSystem public struct BodyModuleState : IState { private string _args; - + public FixState GetState => FixState.BodyModule; public void SetArgs(string args) @@ -136,7 +138,7 @@ namespace AibisDream.FixSystem { bodyModuleSystem.SwitchModuleGroup(moduleState); } - + // 切换相机 yield return CameraKit.Instance.SwitchCamera(CameraEnum.BodyModule); // 开启交互 @@ -174,7 +176,7 @@ namespace AibisDream.FixSystem // 先切BodyModule var bodyModule = FixSystemCenter.SystemDic.Get(); bodyModule.SwitchModuleGroup(ModuleState.Body); - + yield return UIManager.Instance.GetPanel().FadeInAsync(0.5f); yield return CameraKit.Instance.SwitchCamera(CameraEnum.BodyModule); yield return UIManager.Instance.GetPanel().FadeOutAsync(0.5f); @@ -213,7 +215,7 @@ namespace AibisDream.FixSystem { var bodyModule = FixSystemCenter.SystemDic.Get(); bodyModule.SwitchModuleGroup(ModuleState.Body); - + yield return CameraKit.Instance.SwitchCamera(CameraEnum.BodyModule); } @@ -368,7 +370,7 @@ namespace AibisDream.FixSystem memorySystem.PullMemoryProjector(); } } - public struct ExpressionState : IState + public struct ExpressionState : IState { public FixState GetState => FixState.Expression; @@ -386,8 +388,9 @@ namespace AibisDream.FixSystem var bodyModule = FixSystemCenter.SystemDic.Get(); bodyModule.SwitchModuleGroup(ModuleState.Head); yield return CameraKit.Instance.SwitchCamera(CameraEnum.BodyModule); - } + } // 切换相机 + expressionManager.OpenView(); yield return CameraKit.Instance.SwitchCamera(CameraEnum.Expression); yield return UIManager.Instance.GetPanel().FadeInAsync(0.5f); //expressionManager.OpenView(); @@ -405,4 +408,39 @@ namespace AibisDream.FixSystem yield break; } } + public struct EmoState : IState + { + public FixState GetState => FixState.Emo; + + public void SetArgs(string args) + { + } + + public IEnumerator Enter() + { + var emoManager = FixSystemCenter.SystemDic.Get(); + if (!CameraKit.Instance.EqualToCameraState(CameraEnum.BodyModule)) + { + var bodyModule = FixSystemCenter.SystemDic.Get(); + bodyModule.SwitchModuleGroup(ModuleState.Head); + yield return CameraKit.Instance.SwitchCamera(CameraEnum.BodyModule); + } + + yield return CameraKit.Instance.SwitchCamera(CameraEnum.Emo); + emoManager.OpenView(); + yield return UIManager.Instance.GetPanel().FadeInAsync(0.5f); + yield return CameraKit.Instance.SwitchCamera(CameraEnum.EmoDeep); + yield return UIManager.Instance.GetPanel().FadeOutAsync(0.5f); + } + + public IEnumerator Exit() + { + var emoManager = FixSystemCenter.SystemDic.Get(); + var bodyModuleSystem = FixSystemCenter.SystemDic.Get(); + bodyModuleSystem.ResetPlug(); + emoManager.CloseView(); + yield break; + } + } + } \ No newline at end of file diff --git a/Assets/Scripts/Framework/OtherKit/CameraKit.cs b/Assets/Scripts/Framework/OtherKit/CameraKit.cs index 470bdc6da..4bfcf0afc 100644 --- a/Assets/Scripts/Framework/OtherKit/CameraKit.cs +++ b/Assets/Scripts/Framework/OtherKit/CameraKit.cs @@ -19,18 +19,22 @@ namespace AibisDream.Framework #region 相机组件 - private CinemachineBrain _cameraBrain; + private CinemachineBrain _orthoCameraBrain; + private CinemachineBrain _perspectiveCameraBrain; private readonly Dictionary _virtualCameraDict = new(); private readonly Dictionary _camInitStateDict = new(); private CameraEnum _curCameraEnum; private CamState _curInitState; public Camera uiCamera; + private Camera _orthoMainCamera; + private Camera _perspectiveMainCamera; private struct CamState { public Vector3 pos; public float initOrthoSize; + public bool isPerspective; } #endregion @@ -41,11 +45,18 @@ namespace AibisDream.Framework public override void OnSingletonInit() { - _cameraBrain = Camera.main?.GetComponent(); + // 获取正交相机 + _orthoMainCamera = Camera.main; + _orthoCameraBrain = _orthoMainCamera?.GetComponent(); + + // 获取透视相机 + _perspectiveMainCamera = GameObject.Find("PerspectiveMainCamera")?.GetComponent(); + _perspectiveCameraBrain = _perspectiveMainCamera?.GetComponent(); + _curCameraEnum = CameraEnum.Default; // 获取UICamera - if (Camera.main && Camera.main.TryGetComponent(out var cameraData)) + if (_orthoMainCamera && _orthoMainCamera.TryGetComponent(out var cameraData)) { // 获取Stack Cameras var stackCameras = cameraData.cameraStack; @@ -76,7 +87,7 @@ namespace AibisDream.Framework } } - public void RegisterCamera(CameraEnum camType, ICinemachineCamera virtualCamera) + public void RegisterCamera(CameraEnum camType, ICinemachineCamera virtualCamera, bool isPerspective = false) { _virtualCameraDict[camType] = virtualCamera; @@ -84,7 +95,8 @@ namespace AibisDream.Framework { pos = virtualCamera.VirtualCameraGameObject.transform.localPosition, initOrthoSize = virtualCamera.VirtualCameraGameObject.gameObject - .GetComponent().m_Lens.OrthographicSize + .GetComponent().m_Lens.OrthographicSize, + isPerspective = isPerspective }; _camInitStateDict[camType] = initState; } @@ -142,6 +154,12 @@ namespace AibisDream.Framework yield break; } + // 切换主相机 + bool isPerspective = _camInitStateDict[camType].isPerspective; + _orthoMainCamera.gameObject.SetActive(!isPerspective); + _perspectiveMainCamera.gameObject.SetActive(isPerspective); + + // 设置虚拟相机优先级 foreach (var camPair in _virtualCameraDict) { if (camPair.Key == camType) camPair.Value.Priority = HighPriority; @@ -149,13 +167,17 @@ namespace AibisDream.Framework } _curInitState = _camInitStateDict[camType]; - yield return new WaitForSeconds(_cameraBrain.m_DefaultBlend.BlendTime); + _curCameraEnum = camType; + + // 等待相机切换完成 + var activeBrain = isPerspective ? _perspectiveCameraBrain : _orthoCameraBrain; + yield return new WaitForSeconds(activeBrain.m_DefaultBlend.BlendTime); } public Tween TransCamera(Vector3 targetPos, float targetOrthographicSize, float duration) { // 寻找现在正在激活的相机 - var curCamera = _cameraBrain.ActiveVirtualCamera; + var curCamera = _orthoCameraBrain.ActiveVirtualCamera; var sq = DOTween.Sequence(); // 移动 @@ -173,7 +195,7 @@ namespace AibisDream.Framework public IEnumerator TransCameraAsync(Vector3 targetPos, float duration) { - var curCamera = _cameraBrain.ActiveVirtualCamera; + var curCamera = _orthoCameraBrain.ActiveVirtualCamera; yield return curCamera.DOLocalMove(targetPos, duration).WaitForCompletion(); } @@ -191,11 +213,22 @@ namespace AibisDream.Framework [Obsolete] public IEnumerator ShakeCamera(float duration, float strength, int vibrate) { - var curCamera = _cameraBrain.ActiveVirtualCamera; + var curCamera = _orthoCameraBrain.ActiveVirtualCamera; yield return curCamera.VirtualCameraGameObject.transform .DOShakePosition(duration, strength, vibrate, 90, false, false) .WaitForCompletion(); } + + /// + /// 获取当前激活的相机 + /// + public Camera GetCurrentCamera() + { + return _camInitStateDict.TryGetValue(_curCameraEnum, out var state) && state.isPerspective ? + _perspectiveMainCamera : + _orthoMainCamera; + } + } public static class CinemachineExtension @@ -273,5 +306,7 @@ namespace AibisDream.Framework Gear, EyeDeep, ExpressionDeep, + Emo, + EmoDeep } } \ No newline at end of file diff --git a/Assets/Scripts/MiniGame/HuoShan/Emo/EmoManager.cs b/Assets/Scripts/MiniGame/HuoShan/Emo/EmoManager.cs new file mode 100644 index 000000000..5ea189e62 --- /dev/null +++ b/Assets/Scripts/MiniGame/HuoShan/Emo/EmoManager.cs @@ -0,0 +1,32 @@ +using UnityEngine; +using AibisDream.FixSystem; +using Cinemachine; +using AibisDream.Framework; + +namespace AibisDream +{ + public class EmoManager : MonoBehaviour + { + private GameObject emoView; + + void Start() + { + FixSystemCenter.SystemDic.Register(this); + emoView = transform.Find("Emo View").gameObject; + var virtualCam = transform.Find("Emo Camera").GetComponent(); + var virtualCam2 = transform.Find("Emo Deep Camera").GetComponent(); + CameraKit.Instance.RegisterCamera(CameraEnum.Emo, virtualCam); + CameraKit.Instance.RegisterCamera(CameraEnum.EmoDeep, virtualCam2,true); + } + + public void OpenView() + { + gameObject.SetActive(true); + } + + public void CloseView() + { + gameObject.SetActive(false); + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/MiniGame/HuoShan/Emo/EmoManager.cs.meta b/Assets/Scripts/MiniGame/HuoShan/Emo/EmoManager.cs.meta new file mode 100644 index 000000000..83b7eb6cd --- /dev/null +++ b/Assets/Scripts/MiniGame/HuoShan/Emo/EmoManager.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: e519c3520e8cfc546a9b52372bd21274 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/MiniGame/HuoShan/Emo/LakeLineDrawer.cs b/Assets/Scripts/MiniGame/HuoShan/Emo/LakeLineDrawer.cs index 1c691a129..a9d4856fa 100644 --- a/Assets/Scripts/MiniGame/HuoShan/Emo/LakeLineDrawer.cs +++ b/Assets/Scripts/MiniGame/HuoShan/Emo/LakeLineDrawer.cs @@ -5,6 +5,7 @@ using UnityEngine.UI; using TMPro; using Yarn.Unity; using AibisDream; +using AibisDream.Framework; [ExecuteAlways] public class LakeLineDrawer : ImmediateModeShapeDrawer @@ -218,6 +219,7 @@ public class LakeLineDrawer : ImmediateModeShapeDrawer private void Start() { + // 添加按钮点击事件监听 if (upButton != null) upButton.onClick.AddListener(MoveUp); if (downButton != null) downButton.onClick.AddListener(MoveDown); @@ -783,6 +785,9 @@ public class LakeLineDrawer : ImmediateModeShapeDrawer // 计算每个点的位置和涟漪效果 private void CalculatePointPositions(float step, float halfField, float halfVisible) { + // 获取当前物体的位置作为偏移 + Vector3 followOffset = transform.position; + // 遍历每个点，计算其位置和涟漪影响 for (int i = 0; i < pointCount; i++) { @@ -806,8 +811,8 @@ public class LakeLineDrawer : ImmediateModeShapeDrawer float finalY = baseHeight + ripple.heightOffset; - // 创建点的坐标 - Vector3 pos = new Vector3(x, finalY, z); + // 创建点的坐标，添加跟随偏移 + Vector3 pos = new Vector3(x, finalY, z) + followOffset; points[index] = pos; // 存储计算得到的点 // 计算亮度：基于高度，越高越亮 @@ -875,6 +880,9 @@ public class LakeLineDrawer : ImmediateModeShapeDrawer private void DrawEdgeLines(float halfField, float halfVisible) { + // 获取当前物体的位置作为偏移 + Vector3 followOffset = transform.position; + // 绘制湖面边缘的向下线条（无扰动） float step = fieldSize / (pointCount - 1); float halfEdgeLineLength = edgeLineLength * 0.5f; // 设置边缘线长度 @@ -884,9 +892,9 @@ public class LakeLineDrawer : ImmediateModeShapeDrawer { float worldZ = z + fieldOffset.y; float x = halfField + fieldOffset.x; // 右边 - DrawEdgeLine(x, worldZ, halfVisible); + DrawEdgeLine(x, worldZ, halfVisible, followOffset); x = -halfField + fieldOffset.x; // 左边 - DrawEdgeLine(x, worldZ, halfVisible); + DrawEdgeLine(x, worldZ, halfVisible, followOffset); } // 2. 绘制 Z 轴的边缘线（上边和下边） @@ -894,13 +902,13 @@ public class LakeLineDrawer : ImmediateModeShapeDrawer { float worldX = x + fieldOffset.x; float z = halfField + fieldOffset.y; // 上边 - DrawEdgeLine(worldX, z, halfVisible); + DrawEdgeLine(worldX, z, halfVisible, followOffset); z = -halfField + fieldOffset.y; // 下边 - DrawEdgeLine(worldX, z, halfVisible); + DrawEdgeLine(worldX, z, halfVisible, followOffset); } } - private void DrawEdgeLine(float x, float z, float halfVisible) + private void DrawEdgeLine(float x, float z, float halfVisible, Vector3 followOffset) { // 检查点是否在可视区域内 if (Mathf.Abs(x) > halfVisible || Mathf.Abs(z) > halfVisible) @@ -912,10 +920,10 @@ public class LakeLineDrawer : ImmediateModeShapeDrawer float startY = GetHeight(x - fieldOffset.x, z - fieldOffset.y, time); // 获取湖面高度 // 设置边缘线的起始点 - Vector3 start = new Vector3(x, startY, z); + Vector3 start = new Vector3(x, startY, z) + followOffset; // 设置边缘线的终止点，向下延伸一定的长度 - Vector3 end = new Vector3(x, startY - edgeLineLength, z); // 向下延伸的线条 + Vector3 end = new Vector3(x, startY - edgeLineLength, z) + followOffset; // 向下延伸的线条 // 设置颜色，基于高度 float heightT = Mathf.InverseLerp(-waveHeight, waveHeight, startY); @@ -929,6 +937,9 @@ public class LakeLineDrawer : ImmediateModeShapeDrawer // 绘制目标点 private void DrawTargetPoints() { + // 获取当前物体的位置作为偏移 + Vector3 followOffset = transform.position; + float step = fieldSize / (pointCount - 1); float halfField = fieldSize * 0.5f; float halfVisible = visibleAreaSize * 0.5f; @@ -950,7 +961,7 @@ public class LakeLineDrawer : ImmediateModeShapeDrawer // 添加额外的起伏效果和高度偏移 float floatOffset = Mathf.Sin(time * floatFrequency) * floatAmplitude; - Vector3 position = new Vector3(x, height + floatOffset + targetHeightOffset, z); + Vector3 position = new Vector3(x, height + floatOffset + targetHeightOffset, z) + followOffset; // 计算旋转 float rotation = time * rotationSpeed; @@ -1015,6 +1026,9 @@ public class LakeLineDrawer : ImmediateModeShapeDrawer private void DrawObstacles() { + // 获取当前物体的位置作为偏移 + Vector3 followOffset = transform.position; + float step = fieldSize / (pointCount - 1); float halfField = fieldSize * 0.5f; float halfVisible = visibleAreaSize * 0.5f; @@ -1045,7 +1059,7 @@ public class LakeLineDrawer : ImmediateModeShapeDrawer float riseHeight = obstacleHeight * (Application.isPlaying ? obstacle.riseProgress : 1f); // 绘制障碍物 - Vector3 basePos = new Vector3(x, height, z); + Vector3 basePos = new Vector3(x, height, z) + followOffset; float halfWidth = obstacleWidth * 0.5f; // 绘制底部 @@ -1071,6 +1085,9 @@ public class LakeLineDrawer : ImmediateModeShapeDrawer private void DrawCollisionEffects() { + // 获取当前物体的位置作为偏移 + Vector3 followOffset = transform.position; + foreach (var effect in collisionEffects) { float elapsed = Time.time - effect.startTime; @@ -1086,7 +1103,7 @@ public class LakeLineDrawer : ImmediateModeShapeDrawer // 计算效果位置 Vector3 effectPos = new Vector3(effect.position.x, GetHeight(effect.position.x - fieldOffset.x, effect.position.y - fieldOffset.y, time), - effect.position.y); + effect.position.y) + followOffset; // 绘制同心圆涟漪 for (int i = 0; i < collisionEffectRingCount; i++) diff --git a/Assets/Scripts/MiniGame/HuoShan/ExpressionCableSystem.cs b/Assets/Scripts/MiniGame/HuoShan/ExpressionCableSystem.cs index be3de119e..5b96e2bf0 100644 --- a/Assets/Scripts/MiniGame/HuoShan/ExpressionCableSystem.cs +++ b/Assets/Scripts/MiniGame/HuoShan/ExpressionCableSystem.cs @@ -21,7 +21,7 @@ namespace AibisDream private void Start() { - _expressionManager = transform.parent.GetComponent(); + _expressionManager = transform.parent.transform.parent.GetComponent(); InitializeSystem(); }