diff --git a/Assets/AddressableAssetsData/AssetGroups/Localization-Assets-Shared.asset b/Assets/AddressableAssetsData/AssetGroups/Localization-Assets-Shared.asset index 4b37716df..f63e7d8d9 100644 --- a/Assets/AddressableAssetsData/AssetGroups/Localization-Assets-Shared.asset +++ b/Assets/AddressableAssetsData/AssetGroups/Localization-Assets-Shared.asset @@ -77,6 +77,11 @@ MonoBehaviour: m_ReadOnly: 1 m_SerializedLabels: [] FlaggedDuringContentUpdateRestriction: 0 + - m_GUID: ea388b59e37ddc14da4d8e3e9ead4133 + m_Address: Assets/Language/Dialog/Test_Huoshan/Test_Huoshan Shared Data.asset + m_ReadOnly: 1 + m_SerializedLabels: [] + FlaggedDuringContentUpdateRestriction: 0 m_ReadOnly: 1 m_Settings: {fileID: 11400000, guid: 77169ce22e430f64fb36c771815a4a7b, type: 2} m_SchemaSet: diff --git a/Assets/AddressableAssetsData/AssetGroups/Localization-String-Tables-Chinese (Simplified) (zh-Hans).asset b/Assets/AddressableAssetsData/AssetGroups/Localization-String-Tables-Chinese (Simplified) (zh-Hans).asset index 3f1fd7b42..15ed1b850 100644 --- a/Assets/AddressableAssetsData/AssetGroups/Localization-String-Tables-Chinese (Simplified) (zh-Hans).asset +++ b/Assets/AddressableAssetsData/AssetGroups/Localization-String-Tables-Chinese (Simplified) (zh-Hans).asset @@ -89,6 +89,12 @@ MonoBehaviour: m_SerializedLabels: - Locale-zh-Hans FlaggedDuringContentUpdateRestriction: 0 + - m_GUID: 523b3962bff363849a36683b375adc06 + m_Address: Test_Huoshan_zh-Hans + m_ReadOnly: 1 + m_SerializedLabels: + - Locale-zh-Hans + FlaggedDuringContentUpdateRestriction: 0 m_ReadOnly: 1 m_Settings: {fileID: 11400000, guid: 77169ce22e430f64fb36c771815a4a7b, type: 2} m_SchemaSet: diff --git a/Assets/AddressableAssetsData/AssetGroups/Localization-String-Tables-English (en).asset b/Assets/AddressableAssetsData/AssetGroups/Localization-String-Tables-English (en).asset index 9743b3635..c19288cae 100644 --- a/Assets/AddressableAssetsData/AssetGroups/Localization-String-Tables-English (en).asset +++ b/Assets/AddressableAssetsData/AssetGroups/Localization-String-Tables-English (en).asset @@ -89,6 +89,12 @@ MonoBehaviour: m_SerializedLabels: - Locale-en FlaggedDuringContentUpdateRestriction: 0 + - m_GUID: fb0b8f197b5a607468eeb9326737d547 + m_Address: Test_Huoshan_en + m_ReadOnly: 1 + m_SerializedLabels: + - Locale-en + FlaggedDuringContentUpdateRestriction: 0 m_ReadOnly: 1 m_Settings: {fileID: 11400000, guid: 77169ce22e430f64fb36c771815a4a7b, type: 2} m_SchemaSet: diff --git a/Assets/Language/Dialog/Test_Huoshan.meta b/Assets/Language/Dialog/Test_Huoshan.meta new file mode 100644 index 000000000..9e9ee038f --- /dev/null +++ b/Assets/Language/Dialog/Test_Huoshan.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 63e7e6f08be2984488f3ea4a6f585bd5 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Language/Dialog/Test_Huoshan/Test_Huoshan Shared Data.asset b/Assets/Language/Dialog/Test_Huoshan/Test_Huoshan Shared Data.asset new file mode 100644 index 000000000..b34ec9289 --- /dev/null +++ b/Assets/Language/Dialog/Test_Huoshan/Test_Huoshan Shared Data.asset @@ -0,0 +1,78 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5b11a58205ec3474ca216360e9fa74a8, type: 3} + m_Name: Test_Huoshan Shared Data + m_EditorClassIdentifier: + m_TableCollectionName: Test_Huoshan + m_TableCollectionNameGuidString: ea388b59e37ddc14da4d8e3e9ead4133 + m_Entries: + - m_Id: 180148666368 + m_Key: line:0ef7bff + m_Metadata: + m_Items: + - rid: 7848877248308838403 + - m_Id: 180190609408 + m_Key: line:088b598 + m_Metadata: + m_Items: + - rid: 7848877248308838404 + - m_Id: 180190609409 + m_Key: line:0dac12c + m_Metadata: + m_Items: + - rid: 7848877248308838405 + - m_Id: 180190609410 + m_Key: line:0ad2190 + m_Metadata: + m_Items: + - rid: 7848877248308838406 + - m_Id: 180194803712 + m_Key: line:0466fea + m_Metadata: + m_Items: + - rid: 7848877248308838407 + m_Metadata: + m_Items: [] + m_KeyGenerator: + rid: 7848877248308838402 + references: + version: 2 + RefIds: + - rid: 7848877248308838402 + type: {class: DistributedUIDGenerator, ns: UnityEngine.Localization.Tables, asm: Unity.Localization} + data: + m_CustomEpoch: 1747115029650 + - rid: 7848877248308838403 + type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} + data: + nodeName: Start + tags: [] + - rid: 7848877248308838404 + type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} + data: + nodeName: Center + tags: [] + - rid: 7848877248308838405 + type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} + data: + nodeName: "UserA_\u5708\u5C42\u8C61\u5F81\u8005" + tags: [] + - rid: 7848877248308838406 + type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} + data: + nodeName: "UserA_\u5708\u5C42\u8C61\u5F81\u8005" + tags: [] + - rid: 7848877248308838407 + type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} + data: + nodeName: "UserA_\u5708\u5C42\u8C61\u5F81\u8005" + tags: [] diff --git a/Assets/Language/Dialog/Test_Huoshan/Test_Huoshan Shared Data.asset.meta b/Assets/Language/Dialog/Test_Huoshan/Test_Huoshan Shared Data.asset.meta new file mode 100644 index 000000000..30f0d10a0 --- /dev/null +++ b/Assets/Language/Dialog/Test_Huoshan/Test_Huoshan Shared Data.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ea388b59e37ddc14da4d8e3e9ead4133 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Language/Dialog/Test_Huoshan/Test_Huoshan.asset b/Assets/Language/Dialog/Test_Huoshan/Test_Huoshan.asset new file mode 100644 index 000000000..3745ccdc5 --- /dev/null +++ b/Assets/Language/Dialog/Test_Huoshan/Test_Huoshan.asset @@ -0,0 +1,23 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5be51871efa6c3e4eae1703925c8f5ac, type: 3} + m_Name: Test_Huoshan + m_EditorClassIdentifier: + m_SharedTableData: {fileID: 11400000, guid: ea388b59e37ddc14da4d8e3e9ead4133, type: 2} + m_Tables: + - {fileID: 11400000, guid: fb0b8f197b5a607468eeb9326737d547, type: 2} + - {fileID: 11400000, guid: 523b3962bff363849a36683b375adc06, type: 2} + m_Extensions: [] + m_Group: String Table + references: + version: 2 + RefIds: [] diff --git a/Assets/Language/Dialog/Test_Huoshan/Test_Huoshan.asset.meta b/Assets/Language/Dialog/Test_Huoshan/Test_Huoshan.asset.meta new file mode 100644 index 000000000..5e59873d5 --- /dev/null +++ b/Assets/Language/Dialog/Test_Huoshan/Test_Huoshan.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 75b0210f4efef8340a46b41f88f33589 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Language/Dialog/Test_Huoshan/Test_Huoshan_en.asset b/Assets/Language/Dialog/Test_Huoshan/Test_Huoshan_en.asset new file mode 100644 index 000000000..7226b2b4b --- /dev/null +++ b/Assets/Language/Dialog/Test_Huoshan/Test_Huoshan_en.asset @@ -0,0 +1,23 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e9620f8c34305754d8cc9a7e49e852d9, type: 3} + m_Name: Test_Huoshan_en + m_EditorClassIdentifier: + m_LocaleId: + m_Code: en + m_SharedData: {fileID: 11400000, guid: ea388b59e37ddc14da4d8e3e9ead4133, type: 2} + m_Metadata: + m_Items: [] + m_TableData: [] + references: + version: 2 + RefIds: [] diff --git a/Assets/Language/Dialog/Test_Huoshan/Test_Huoshan_en.asset.meta b/Assets/Language/Dialog/Test_Huoshan/Test_Huoshan_en.asset.meta new file mode 100644 index 000000000..065139e79 --- /dev/null +++ b/Assets/Language/Dialog/Test_Huoshan/Test_Huoshan_en.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: fb0b8f197b5a607468eeb9326737d547 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Language/Dialog/Test_Huoshan/Test_Huoshan_zh-Hans.asset b/Assets/Language/Dialog/Test_Huoshan/Test_Huoshan_zh-Hans.asset new file mode 100644 index 000000000..c2ac2d570 --- /dev/null +++ b/Assets/Language/Dialog/Test_Huoshan/Test_Huoshan_zh-Hans.asset @@ -0,0 +1,43 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e9620f8c34305754d8cc9a7e49e852d9, type: 3} + m_Name: Test_Huoshan_zh-Hans + m_EditorClassIdentifier: + m_LocaleId: + m_Code: zh-Hans + m_SharedData: {fileID: 11400000, guid: ea388b59e37ddc14da4d8e3e9ead4133, type: 2} + m_Metadata: + m_Items: [] + m_TableData: + - m_Id: 180148666368 + m_Localized: "\u6DF1\u5165\u8868\u8FBE\u6A21\u5757" + m_Metadata: + m_Items: [] + - m_Id: 180190609408 + m_Localized: "\u5360\u4F4D:\u6D41\u7A0B\u7ED3\u675F" + m_Metadata: + m_Items: [] + - m_Id: 180190609409 + m_Localized: huoshan:11111 + m_Metadata: + m_Items: [] + - m_Id: 180190609410 + m_Localized: "\u5BA2\u6237:2222" + m_Metadata: + m_Items: [] + - m_Id: 180194803712 + m_Localized: "me:\u770B\u8D77\u6765\u5B8C\u5168\u4E0D\u884C\u5462\uFF0C\u8BD5\u8BD5\u522B\u7684\u5427" + m_Metadata: + m_Items: [] + references: + version: 2 + RefIds: [] diff --git a/Assets/Language/Dialog/Test_Huoshan/Test_Huoshan_zh-Hans.asset.meta b/Assets/Language/Dialog/Test_Huoshan/Test_Huoshan_zh-Hans.asset.meta new file mode 100644 index 000000000..ef130cc25 --- /dev/null +++ b/Assets/Language/Dialog/Test_Huoshan/Test_Huoshan_zh-Hans.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 523b3962bff363849a36683b375adc06 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Huoshan/Module.prefab b/Assets/Prefabs/Huoshan/Module.prefab new file mode 100644 index 000000000..93350f9f0 --- /dev/null +++ b/Assets/Prefabs/Huoshan/Module.prefab @@ -0,0 +1,86 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &9102123134523878284 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5378661334496999066} + - component: {fileID: 8508088564425813373} + m_Layer: 0 + m_Name: Module + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5378661334496999066 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9102123134523878284} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -40.45, y: -19.22, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &8508088564425813373 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9102123134523878284} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 2 + m_Sprite: {fileID: 7482667652216324306, guid: 311925a002f4447b3a28927169b83ea6, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1, y: 1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 diff --git a/Assets/Prefabs/Huoshan/Module.prefab.meta b/Assets/Prefabs/Huoshan/Module.prefab.meta new file mode 100644 index 000000000..f34d2d3d1 --- /dev/null +++ b/Assets/Prefabs/Huoshan/Module.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 33f03eb611b67034abbbbd3799f027d5 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Huoshan/PowerSource.prefab b/Assets/Prefabs/Huoshan/PowerSource.prefab new file mode 100644 index 000000000..e67a03fa1 --- /dev/null +++ b/Assets/Prefabs/Huoshan/PowerSource.prefab @@ -0,0 +1,47 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &2752650124831634186 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8309032219885958278} + - component: {fileID: 6383885735126530106} + m_Layer: 0 + m_Name: PowerSource + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8309032219885958278 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2752650124831634186} + 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: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &6383885735126530106 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2752650124831634186} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fa77942f51204854997fd03218d91ec0, type: 3} + m_Name: + m_EditorClassIdentifier: + plugPrefab: {fileID: 9041179116354226513, guid: 40340462a5a0d7c498653bd35f739eb5, type: 3} diff --git a/Assets/Prefabs/Huoshan/PowerSource.prefab.meta b/Assets/Prefabs/Huoshan/PowerSource.prefab.meta new file mode 100644 index 000000000..7a0907dbc --- /dev/null +++ b/Assets/Prefabs/Huoshan/PowerSource.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 836175d9f55b4d549a4f087ee8d5e490 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Huoshan/插头（正常尺寸）.prefab b/Assets/Prefabs/Huoshan/插头（正常尺寸）.prefab new file mode 100644 index 000000000..0b0f49e12 --- /dev/null +++ b/Assets/Prefabs/Huoshan/插头（正常尺寸）.prefab @@ -0,0 +1,86 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &9041179116354226513 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3066782355541244074} + - component: {fileID: 8177602015074570507} + m_Layer: 0 + m_Name: "\u63D2\u5934\uFF08\u6B63\u5E38\u5C3A\u5BF8\uFF09" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3066782355541244074 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9041179116354226513} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -47.052345, y: -26.236996, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &8177602015074570507 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9041179116354226513} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 21300000, guid: 6f1e19b22a956634b86a43a0ee4ae6f6, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 0.29, y: 1.75} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 diff --git a/Assets/Prefabs/Huoshan/插头（正常尺寸）.prefab.meta b/Assets/Prefabs/Huoshan/插头（正常尺寸）.prefab.meta new file mode 100644 index 000000000..b24aa8292 --- /dev/null +++ b/Assets/Prefabs/Huoshan/插头（正常尺寸）.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 40340462a5a0d7c498653bd35f739eb5 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Render/Renderer2Dtest.asset b/Assets/Render/Renderer2Dtest.asset index 20b6152ad..bd16daaa1 100644 --- a/Assets/Render/Renderer2Dtest.asset +++ b/Assets/Render/Renderer2Dtest.asset @@ -513,15 +513,19 @@ MonoBehaviour: m_PostInfinity: 2 m_RotationOrder: 4 _filter: - - 0.007228916 - - 0.043749984 - - 0.12409639 - - 0.20444278 - - 0.24096388 - - 0.20444278 - - 0.12409639 - - 0.043749984 - - 0.007228916 + - 0.0048309183 + - 0.016401261 + - 0.04532712 + - 0.08293076 + - 0.12053438 + - 0.14946026 + - 0.1610306 + - 0.14946026 + - 0.12053438 + - 0.08293076 + - 0.04532712 + - 0.016401261 + - 0.0048309183 --- !u!114 &-6086986437317696584 MonoBehaviour: m_ObjectHideFlags: 3 diff --git a/Assets/Resources/Yarn/Test_Huoshan/Center.yarn b/Assets/Resources/Yarn/Test_Huoshan/Center.yarn index c43015ccc..f355c0eb6 100644 --- a/Assets/Resources/Yarn/Test_Huoshan/Center.yarn +++ b/Assets/Resources/Yarn/Test_Huoshan/Center.yarn @@ -4,7 +4,7 @@ colorID: 8 position: 205,-53 --- <> -->深入表达模块 +->深入表达模块 #line:0ef7bff <> // <> // <> @@ -55,6 +55,6 @@ colorID: 1 <> <> <> - 占位:流程结束 + 占位:流程结束 #line:088b598 <> === \ No newline at end of file diff --git a/Assets/Resources/Yarn/Test_Huoshan/Test_Huoshan.yarnproject b/Assets/Resources/Yarn/Test_Huoshan/Test_Huoshan.yarnproject index 016b7ab29..617a484a3 100644 --- a/Assets/Resources/Yarn/Test_Huoshan/Test_Huoshan.yarnproject +++ b/Assets/Resources/Yarn/Test_Huoshan/Test_Huoshan.yarnproject @@ -6,7 +6,9 @@ "excludeFiles": [ "**/*~/*" ], - "localisation": {}, - "baseLanguage": "zh-CHS", + "localisation": { + "zh-CHS": {} + }, + "baseLanguage": "zh-Hans", "compilerOptions": {} } \ No newline at end of file diff --git a/Assets/Resources/Yarn/Test_Huoshan/Test_Huoshan.yarnproject.meta b/Assets/Resources/Yarn/Test_Huoshan/Test_Huoshan.yarnproject.meta index 95a6c3193..35b3fece2 100644 --- a/Assets/Resources/Yarn/Test_Huoshan/Test_Huoshan.yarnproject.meta +++ b/Assets/Resources/Yarn/Test_Huoshan/Test_Huoshan.yarnproject.meta @@ -9,5 +9,5 @@ ScriptedImporter: assetBundleVariant: script: {fileID: 11500000, guid: 053561912b1654d80a424bb0696a74ae, type: 3} useAddressableAssets: 0 - UseUnityLocalisationSystem: 0 - unityLocalisationStringTableCollection: {instanceID: 0} + UseUnityLocalisationSystem: 1 + unityLocalisationStringTableCollection: {fileID: 11400000, guid: 75b0210f4efef8340a46b41f88f33589, type: 2} diff --git a/Assets/Resources/Yarn/Test_Huoshan/售卖商品对话.yarn b/Assets/Resources/Yarn/Test_Huoshan/售卖商品对话.yarn index 6a9e8e768..b06f90d60 100644 --- a/Assets/Resources/Yarn/Test_Huoshan/售卖商品对话.yarn +++ b/Assets/Resources/Yarn/Test_Huoshan/售卖商品对话.yarn @@ -4,9 +4,9 @@ tags: colorID: 8 position: 272,-1156 --- -huoshan:11111 -客户:2222 -me:看起来完全不行呢，试试别的吧 +huoshan:11111 #line:0dac12c +客户:2222 #line:0ad2190 +me:看起来完全不行呢，试试别的吧 #line:0466fea === diff --git a/Assets/Scenes/HuoShanFixScene.unity b/Assets/Scenes/HuoShanFixScene.unity index 15c3fda87..6ccc94934 100644 --- a/Assets/Scenes/HuoShanFixScene.unity +++ b/Assets/Scenes/HuoShanFixScene.unity @@ -544,6 +544,78 @@ Material: - _Flip: {r: 1, g: 1, b: 1, a: 1} - _RendererColor: {r: 1, g: 1, b: 1, a: 1} m_BuildTextureStacks: [] +--- !u!1 &118320536 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 118320537} + - component: {fileID: 118320538} + m_Layer: 0 + m_Name: Expression Camera + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &118320537 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 118320536} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -2.5599976, y: 13.970001, z: -10.777307} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1985394077} + m_Father: {fileID: 2138889539} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &118320538 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 118320536} + 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: 1985394077} --- !u!1 &124853503 GameObject: m_ObjectHideFlags: 0 @@ -1725,6 +1797,50 @@ Transform: - {fileID: 1003515191} m_Father: {fileID: 719924201} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &279133011 +GameObject: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 279133012} + - component: {fileID: 279133013} + m_Layer: 0 + m_Name: cm + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &279133012 +Transform: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 279133011} + 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: 1393009640} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &279133013 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 279133011} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ac0b09e7857660247b1477e93731de29, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &280122043 GameObject: m_ObjectHideFlags: 0 @@ -5037,6 +5153,55 @@ MonoBehaviour: socketPos: {fileID: 1099217312} data: moduleName: Lung +--- !u!1 &577612221 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 577612223} + - component: {fileID: 577612222} + m_Layer: 0 + m_Name: PowerSource + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &577612222 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 577612221} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fa77942f51204854997fd03218d91ec0, type: 3} + m_Name: + m_EditorClassIdentifier: + plugs: + - {fileID: 948056964} +--- !u!4 &577612223 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 577612221} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -6.1899986, y: -1.8999996, z: -0.77730685} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 948056962} + - {fileID: 1376266114} + - {fileID: 2123486777} + m_Father: {fileID: 2138889539} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &604681209 GameObject: m_ObjectHideFlags: 0 @@ -7605,6 +7770,90 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &927585264 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 927585265} + - component: {fileID: 927585266} + m_Layer: 0 + m_Name: socket + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &927585265 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 927585264} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 1.75, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1221726913} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &927585266 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 927585264} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 3 + m_Sprite: {fileID: -8905666527859310550, guid: ba9dbce935749324ebe260dd696a3590, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 0.525, y: 0.52} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!114 &940756018 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 6808037505560407106, guid: 39a9cd95509412a4c981c0df7a8d6652, type: 3} @@ -7616,6 +7865,174 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &948056961 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 948056962} + - component: {fileID: 948056966} + - component: {fileID: 948056965} + - component: {fileID: 948056964} + - component: {fileID: 948056963} + m_Layer: 0 + m_Name: Plug (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &948056962 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 948056961} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: 0.7041673, w: -0.71003413} + m_LocalPosition: {x: 1.2, y: 2.35, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 2003655825} + m_Father: {fileID: 577612223} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 270.475} +--- !u!114 &948056963 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 948056961} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0c4fbab01ad40c2449c849cd2a8c620f, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Delegates: + - eventID: 5 + callback: + m_PersistentCalls: + m_Calls: [] + - eventID: 0 + callback: + m_PersistentCalls: + m_Calls: [] + - eventID: 1 + callback: + m_PersistentCalls: + m_Calls: [] + - eventID: 2 + callback: + m_PersistentCalls: + m_Calls: [] + - eventID: 3 + callback: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &948056964 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 948056961} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: eceaf3bcec07439d8391175331323e3c, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!58 &948056965 +CircleCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 948056961} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + serializedVersion: 2 + m_Radius: 0.5 +--- !u!212 &948056966 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 948056961} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 274476fa0129dfb4cac8839ebdaa060d, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 1134468525 + m_SortingLayer: 10 + m_SortingOrder: 47 + m_Sprite: {fileID: 21300000, guid: 6f1e19b22a956634b86a43a0ee4ae6f6, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 0.29, y: 1.75} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!114 &964747120 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 5612942296642593149, guid: 39a9cd95509412a4c981c0df7a8d6652, type: 3} @@ -7627,6 +8044,90 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 67db9e8f0e2ae9c40bc1e2b64352a6b4, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &969359382 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 969359383} + - component: {fileID: 969359384} + m_Layer: 0 + m_Name: background + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &969359383 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 969359382} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0.7099991, y: -3.5, z: -0.77730685} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2138889539} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &969359384 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 969359382} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 1 + m_Sprite: {fileID: 8789638399658599085, guid: 2338fddc038248b4b934bef72357cd13, type: 3} + m_Color: {r: 0, g: 0, b: 0, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 17.860466, y: 10.046512} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &983979845 GameObject: m_ObjectHideFlags: 3 @@ -8856,6 +9357,90 @@ Material: - _Flip: {r: 1, g: 1, b: 1, a: 1} - _RendererColor: {r: 1, g: 1, b: 1, a: 1} m_BuildTextureStacks: [] +--- !u!1 &1146058842 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1146058843} + - component: {fileID: 1146058844} + m_Layer: 0 + m_Name: socket + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1146058843 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1146058842} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 2.3500004, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1221726913} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &1146058844 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1146058842} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 3 + m_Sprite: {fileID: -8905666527859310550, guid: ba9dbce935749324ebe260dd696a3590, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 0.525, y: 0.52} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &1157582229 GameObject: m_ObjectHideFlags: 0 @@ -9267,6 +9852,90 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1179148500} m_CullTransparentMesh: 1 +--- !u!1 &1189170729 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1189170730} + - component: {fileID: 1189170731} + m_Layer: 0 + m_Name: socket + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1189170730 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1189170729} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0.5600014, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1221726913} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &1189170731 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1189170729} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 3 + m_Sprite: {fileID: -8905666527859310550, guid: ba9dbce935749324ebe260dd696a3590, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 0.525, y: 0.52} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &1195838871 GameObject: m_ObjectHideFlags: 0 @@ -9388,12 +10057,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1195838871} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -61.44, y: 6.72, z: -10} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -31.424324, y: 7.3416452, z: -10.067388} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 0} + m_Father: {fileID: 1211738976} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1211738974 GameObject: @@ -9454,8 +10123,66 @@ Transform: - {fileID: 1138014219} - {fileID: 1766300704} - {fileID: 708980491} + - {fileID: 1195838874} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1221726911 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1221726913} + - component: {fileID: 1221726912} + m_Layer: 0 + m_Name: EmoModule + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1221726912 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1221726911} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e952aa027dd8f4f48b960b7307ee0121, type: 3} + m_Name: + m_EditorClassIdentifier: + socketPositions: + - {fileID: 1146058843} + - {fileID: 927585265} + - {fileID: 1867932496} + - {fileID: 1189170730} + - {fileID: 1534398476} +--- !u!4 &1221726913 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1221726911} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 7.6900005, y: -1.8999996, z: -0.77730685} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 3225038397584595901} + - {fileID: 9071575356894343541} + - {fileID: 1146058843} + - {fileID: 927585265} + - {fileID: 1867932496} + - {fileID: 1189170730} + - {fileID: 1534398476} + m_Father: {fileID: 2138889539} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1234954469 GameObject: m_ObjectHideFlags: 0 @@ -10401,6 +11128,162 @@ MonoBehaviour: socketPos: {fileID: 2086302718} data: moduleName: Eye +--- !u!1 &1376266113 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1376266114} + - component: {fileID: 1376266115} + m_Layer: 0 + m_Name: panel + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1376266114 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1376266113} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0.040000916, y: 1.1800003, z: 0} + m_LocalScale: {x: 1.1426562, y: 2.9025002, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 577612223} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &1376266115 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1376266113} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 2 + m_Sprite: {fileID: 7482667652216324306, guid: 311925a002f4447b3a28927169b83ea6, type: 3} + m_Color: {r: 0.3962264, g: 0.3962264, b: 0.3962264, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1, y: 1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!1 &1393009639 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1393009640} + - component: {fileID: 1393009641} + m_Layer: 0 + m_Name: Express Deep Camera + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1393009640 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1393009639} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0.7099991, y: -3.5, z: -10.777307} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 279133012} + m_Father: {fileID: 2138889539} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1393009641 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1393009639} + 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: 5 + 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: 279133012} --- !u!114 &1395901511 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 425089431722077559, guid: 39a9cd95509412a4c981c0df7a8d6652, type: 3} @@ -11141,6 +12024,90 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1504585057} m_CullTransparentMesh: 1 +--- !u!1 &1534398475 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1534398476} + - component: {fileID: 1534398477} + m_Layer: 0 + m_Name: socket + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1534398476 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1534398475} + 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: 1221726913} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &1534398477 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1534398475} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 3 + m_Sprite: {fileID: -8905666527859310550, guid: ba9dbce935749324ebe260dd696a3590, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 0.525, y: 0.52} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!21 &1537067506 Material: serializedVersion: 8 @@ -14153,6 +15120,90 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1851406574} m_CullTransparentMesh: 1 +--- !u!1 &1867932495 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1867932496} + - component: {fileID: 1867932497} + m_Layer: 0 + m_Name: socket + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1867932496 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1867932495} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 1.1500015, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1221726913} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &1867932497 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1867932495} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 3 + m_Sprite: {fileID: -8905666527859310550, guid: ba9dbce935749324ebe260dd696a3590, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 0.525, y: 0.52} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &1914324002 GameObject: m_ObjectHideFlags: 0 @@ -14420,6 +15471,50 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 67db9e8f0e2ae9c40bc1e2b64352a6b4, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &1985394076 +GameObject: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1985394077} + - component: {fileID: 1985394078} + m_Layer: 0 + m_Name: cm + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1985394077 +Transform: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1985394076} + 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: 118320537} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1985394078 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1985394076} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ac0b09e7857660247b1477e93731de29, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!21 &1996077297 Material: serializedVersion: 8 @@ -14703,6 +15798,37 @@ Material: - _ShadowColor: {r: 0, g: 0, b: 0, a: 1} - _ShineColor: {r: 1, g: 1, b: 1, a: 1} m_BuildTextureStacks: [] +--- !u!1 &2003655824 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2003655825} + m_Layer: 0 + m_Name: Plug Root Pos + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2003655825 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2003655824} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: -0.822, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 948056962} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2025201382 GameObject: m_ObjectHideFlags: 0 @@ -16623,6 +17749,90 @@ Material: - _WorldTilingOffset: {r: 0, g: 0, b: 0, a: 0} - _WorldTilingScale: {r: 1, g: 1, b: 0, a: 0} m_BuildTextureStacks: [] +--- !u!1 &2123486776 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2123486777} + - component: {fileID: 2123486778} + m_Layer: 0 + m_Name: panel2 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2123486777 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2123486776} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0.040000916, y: 1.1800003, z: 0} + m_LocalScale: {x: 1.2718394, y: 3.0052488, z: 1.0354} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 577612223} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &2123486778 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2123486776} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 1 + m_Sprite: {fileID: 7482667652216324306, guid: 311925a002f4447b3a28927169b83ea6, type: 3} + m_Color: {r: 0, g: 0, b: 0, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1, y: 1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &2123738759 GameObject: m_ObjectHideFlags: 0 @@ -16674,6 +17884,74 @@ MonoBehaviour: isInDialog: 0 isActive: 1 curBodyModule: {fileID: 0} +--- !u!1 &2138889538 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2138889539} + - component: {fileID: 2138889540} + m_Layer: 0 + m_Name: ExpressSystem + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &2138889539 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2138889538} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -31, y: -16.5, z: 0.77730685} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1393009640} + - {fileID: 118320537} + - {fileID: 1221726913} + - {fileID: 577612223} + - {fileID: 969359383} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &2138889540 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2138889538} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7245d320411db7c449fe8dec4ef86edf, type: 3} + m_Name: + m_EditorClassIdentifier: + expressView: {fileID: 1479235759} + sliders: + - {fileID: 161892290} + - {fileID: 964747120} + - {fileID: 214302938} + - {fileID: 1976520771} + - {fileID: 1238628084} + totalPointsText: {fileID: 1939639599} + totalPoints: 10 + driverSlotText: {fileID: 940756018} + logOutput: {fileID: 1784130261} + matchButton: {fileID: 1395901511} + applyAndTestButton: {fileID: 606814938} + matchResultsPanel: {fileID: 774493235} + driverButtonPrefab: {fileID: 4310732234424748951, guid: f156ac1ece77fe345a95416797701dc1, type: 3} + currentUser: UserA + powerSource: {fileID: 577612222} + emotionModules: + - {fileID: 1221726912} --- !u!4 &163606811913208328 Transform: m_ObjectHideFlags: 0 @@ -16704,6 +17982,58 @@ Transform: m_Children: [] m_Father: {fileID: 1112213369} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &1186621337674563674 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1744098590533158571} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 2 + m_Sprite: {fileID: 7482667652216324306, guid: 311925a002f4447b3a28927169b83ea6, type: 3} + m_Color: {r: 0.3962264, g: 0.3962264, b: 0.3962264, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1, y: 1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!212 &1236773793422698414 SpriteRenderer: m_ObjectHideFlags: 0 @@ -16771,6 +18101,23 @@ Transform: m_Children: [] m_Father: {fileID: 1695830471} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1744098590533158571 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3225038397584595901} + - component: {fileID: 1186621337674563674} + m_Layer: 0 + m_Name: panel + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 --- !u!1 &1827673123026115610 GameObject: m_ObjectHideFlags: 0 @@ -16800,6 +18147,10 @@ PrefabInstance: propertyPath: m_Name value: ExpressManager objectReference: {fileID: 0} + - target: {fileID: 79166284512045475, guid: f70c72a84de39a34d8a274d273f1d065, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 2510824233476674207, guid: f70c72a84de39a34d8a274d273f1d065, type: 3} propertyPath: logOutput value: @@ -17174,6 +18525,21 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 1 m_SpriteSortPoint: 0 +--- !u!4 &3225038397584595901 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1744098590533158571} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0.040000916, y: 1.1800003, z: 0} + m_LocalScale: {x: 1.1426562, y: 2.9025002, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1221726913} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &3269384175722937873 GameObject: m_ObjectHideFlags: 0 @@ -17251,6 +18617,10 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 2035067112} m_Modifications: + - target: {fileID: 261582323790094728, guid: 39a9cd95509412a4c981c0df7a8d6652, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} - target: {fileID: 1821120933835971019, guid: 39a9cd95509412a4c981c0df7a8d6652, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -17333,32 +18703,52 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1888882004640149801, guid: 39a9cd95509412a4c981c0df7a8d6652, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2445199316937849508, guid: 39a9cd95509412a4c981c0df7a8d6652, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3243924112892186772, guid: 39a9cd95509412a4c981c0df7a8d6652, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3390224368825925642, guid: 39a9cd95509412a4c981c0df7a8d6652, type: 3} propertyPath: m_AnchoredPosition.y value: 248 objectReference: {fileID: 0} + - target: {fileID: 4104636584418993360, guid: 39a9cd95509412a4c981c0df7a8d6652, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} - target: {fileID: 6381741402625234432, guid: 39a9cd95509412a4c981c0df7a8d6652, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6989783374134298152, guid: 39a9cd95509412a4c981c0df7a8d6652, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7963872786159882491, guid: 39a9cd95509412a4c981c0df7a8d6652, type: 3} + propertyPath: m_AnchorMax.y + value: 1 objectReference: {fileID: 0} - target: {fileID: 7966919765743327268, guid: 39a9cd95509412a4c981c0df7a8d6652, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8400352004660890968, guid: 39a9cd95509412a4c981c0df7a8d6652, type: 3} + propertyPath: m_AnchorMax.y + value: 1 objectReference: {fileID: 0} - target: {fileID: 8872470739059541346, guid: 39a9cd95509412a4c981c0df7a8d6652, type: 3} propertyPath: m_Name value: ExpressView objectReference: {fileID: 0} + - target: {fileID: 8872470739059541346, guid: 39a9cd95509412a4c981c0df7a8d6652, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: @@ -17453,6 +18843,58 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 1 m_SpriteSortPoint: 0 +--- !u!212 &4707017239048776338 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5265093350908013667} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 1 + m_Sprite: {fileID: 7482667652216324306, guid: 311925a002f4447b3a28927169b83ea6, type: 3} + m_Color: {r: 0, g: 0, b: 0, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1, y: 1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!4 &4735435065093575842 Transform: m_ObjectHideFlags: 0 @@ -17468,6 +18910,23 @@ Transform: m_Children: [] m_Father: {fileID: 1695830471} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &5265093350908013667 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 9071575356894343541} + - component: {fileID: 4707017239048776338} + m_Layer: 0 + m_Name: panel2 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 --- !u!4 &5427647268324916120 Transform: m_ObjectHideFlags: 0 @@ -18098,6 +19557,21 @@ Transform: m_Children: [] m_Father: {fileID: 8114817313209189977} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!4 &9071575356894343541 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5265093350908013667} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0.040000916, y: 1.1800003, z: 0} + m_LocalScale: {x: 1.2718394, y: 3.0052488, z: 1.0354} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1221726913} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &9210352354887959608 PrefabInstance: m_ObjectHideFlags: 0 @@ -18110,6 +19584,10 @@ PrefabInstance: 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: 7611243318142021168, guid: 13f00ab6092291d49a9312e52873d80b, type: 3} propertyPath: m_LocalPosition.x value: 0 @@ -18218,5 +19696,5 @@ SceneRoots: - {fileID: 2035067112} - {fileID: 462594834} - {fileID: 1211738976} - - {fileID: 1195838874} - {fileID: 2020307036959479555} + - {fileID: 2138889539} diff --git a/Assets/Scenes/Persistence.unity b/Assets/Scenes/Persistence.unity index e8e65f2c8..308913d0e 100644 --- a/Assets/Scenes/Persistence.unity +++ b/Assets/Scenes/Persistence.unity @@ -7692,7 +7692,7 @@ Transform: m_GameObject: {fileID: 519420028} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -10} + m_LocalPosition: {x: -0.009999275, y: 0, z: -10} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -9882,9 +9882,9 @@ MonoBehaviour: - {fileID: 11400000, guid: ff82a99e791be3e41acf40232f908eb3, type: 2} - {fileID: 11400000, guid: 6d49b124127007b48b6881ce33350263, type: 2} - {fileID: 11400000, guid: fe71f935f1f9a52458c994362567a211, type: 2} - runMode: 0 + runMode: 1 firstTalkSo: {fileID: 11400000, guid: ac5ca9a66ff22ab4b9cd5adbdade6b8c, type: 2} - testTalkSo: {fileID: 11400000, guid: 6d49b124127007b48b6881ce33350263, type: 2} + testTalkSo: {fileID: 11400000, guid: 8ce86974047bb404c9096e70a606355a, type: 2} saveFileName: --- !u!1 &719273460 GameObject: diff --git a/Assets/Scripts/FixSystem/Cable/PhysicCable.cs b/Assets/Scripts/FixSystem/Cable/PhysicCable.cs index dec76a5cc..a22ed3501 100644 --- a/Assets/Scripts/FixSystem/Cable/PhysicCable.cs +++ b/Assets/Scripts/FixSystem/Cable/PhysicCable.cs @@ -10,7 +10,7 @@ public class PhysicCable : MonoBehaviour // Start is called before the first frame update void Start() { - physicLine = transform.GetChild(0).GetComponent(); + physicLine = transform.GetComponent(); } public void Init(Vector3 endPos) diff --git a/Assets/Scripts/FixSystemNew/FixStateMachine.cs b/Assets/Scripts/FixSystemNew/FixStateMachine.cs index 4ac397f28..2020101c9 100644 --- a/Assets/Scripts/FixSystemNew/FixStateMachine.cs +++ b/Assets/Scripts/FixSystemNew/FixStateMachine.cs @@ -389,7 +389,10 @@ namespace AibisDream.FixSystem } // 切换相机 yield return CameraKit.Instance.SwitchCamera(CameraEnum.Expression); - expressionManager.OpenView(); + yield return UIManager.Instance.GetPanel().FadeInAsync(0.5f); + //expressionManager.OpenView(); + yield return CameraKit.Instance.SwitchCamera(CameraEnum.ExpressionDeep); + yield return UIManager.Instance.GetPanel().FadeOutAsync(0.5f); } diff --git a/Assets/Scripts/Framework/OtherKit/CameraKit.cs b/Assets/Scripts/Framework/OtherKit/CameraKit.cs index 6b88fb495..470bdc6da 100644 --- a/Assets/Scripts/Framework/OtherKit/CameraKit.cs +++ b/Assets/Scripts/Framework/OtherKit/CameraKit.cs @@ -272,5 +272,6 @@ namespace AibisDream.Framework Engine, Gear, EyeDeep, + ExpressionDeep, } } \ No newline at end of file diff --git a/Assets/Scripts/MiniGame/HuoShan/EmotionModule.cs b/Assets/Scripts/MiniGame/HuoShan/EmotionModule.cs new file mode 100644 index 000000000..d8f92c940 --- /dev/null +++ b/Assets/Scripts/MiniGame/HuoShan/EmotionModule.cs @@ -0,0 +1,73 @@ +using UnityEngine; +using AibisDream.FixSystem; +using System.Collections.Generic; + +namespace AibisDream +{ + public class EmotionModule : MonoBehaviour, ISocket + { + public Transform[] socketPositions; // 插槽位置，在Inspector中手动设置 + private bool[] socketOccupied; // 插槽占用状态 + private ExpressionManager expressionManager; + + private void Awake() + { + // 初始化插槽占用状态数组 + socketOccupied = new bool[socketPositions.Length]; + expressionManager = GetComponentInParent(); + } + + public void PlugIn() + { + // 找到最近的空插槽 + int socketIndex = FindNearestEmptySocket(); + if (socketIndex != -1) + { + socketOccupied[socketIndex] = true; + expressionManager?.OnPlugInserted(null, this, socketIndex); + } + } + + public void PlugOut() + { + // 找到最近的有插头的插槽 + int socketIndex = FindNearestOccupiedSocket(); + if (socketIndex != -1) + { + socketOccupied[socketIndex] = false; + expressionManager?.OnPlugRemoved(null, this, socketIndex); + } + } + + public Vector3 GetSocketPos() + { + int socketIndex = FindNearestEmptySocket(); + return socketIndex != -1 ? socketPositions[socketIndex].position : transform.position; + } + + public bool IsAvailable() + { + return FindNearestEmptySocket() != -1; + } + + private int FindNearestEmptySocket() + { + for (int i = 0; i < socketOccupied.Length; i++) + { + if (!socketOccupied[i]) + return i; + } + return -1; + } + + private int FindNearestOccupiedSocket() + { + for (int i = 0; i < socketOccupied.Length; i++) + { + if (socketOccupied[i]) + return i; + } + return -1; + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/MiniGame/HuoShan/EmotionModule.cs.meta b/Assets/Scripts/MiniGame/HuoShan/EmotionModule.cs.meta new file mode 100644 index 000000000..bae187aa4 --- /dev/null +++ b/Assets/Scripts/MiniGame/HuoShan/EmotionModule.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: e952aa027dd8f4f48b960b7307ee0121 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/MiniGame/HuoShan/ExpressionManager.cs b/Assets/Scripts/MiniGame/HuoShan/ExpressionManager.cs index 825ac63c6..619d75832 100644 --- a/Assets/Scripts/MiniGame/HuoShan/ExpressionManager.cs +++ b/Assets/Scripts/MiniGame/HuoShan/ExpressionManager.cs @@ -31,6 +31,10 @@ namespace AibisDream private DriverDatabase db = new DriverDatabase(); private List currentResultButtons = new List(); + // 插线系统相关 + public PowerSource powerSource; // 电源 + public EmotionModule[] emotionModules; // 情绪模块数组 + private CableSystem cableSystem; void Start() { @@ -38,19 +42,16 @@ namespace AibisDream FixSystemCenter.SystemDic.Register(this); var virtualCam = transform.Find("Expression Camera").GetComponent(); + var virtualCam2 = transform.Find("Express Deep Camera").GetComponent(); CameraKit.Instance.RegisterCamera(CameraEnum.Expression, virtualCam); - + CameraKit.Instance.RegisterCamera(CameraEnum.ExpressionDeep, virtualCam2); db.LoadFromCSV(Path.Combine(Application.streamingAssetsPath, "drivers.csv")); - for (int i = 0; i < sliders.Length; i++) + // 初始化线缆系统 + cableSystem = GetComponent(); + if (cableSystem == null) { - int index = i; - Transform plus = sliders[i].transform.Find("Plus"); - if (plus != null && plus.TryGetComponent(out Button plusBtn)) - plusBtn.onClick.AddListener(() => AdjustValue(index, 1)); - Transform minus = sliders[i].transform.Find("Minus"); - if (minus != null && minus.TryGetComponent(out Button minusBtn)) - minusBtn.onClick.AddListener(() => AdjustValue(index, -1)); + cableSystem = gameObject.AddComponent(); } matchButton.onClick.AddListener(MatchDriver); @@ -59,6 +60,33 @@ namespace AibisDream UpdateUI(); } + // 当插头插入插槽时调用 + public void OnPlugInserted(Plug plug, EmotionModule module, int socketIndex) + { + // 更新对应模块的值 + int moduleIndex = System.Array.IndexOf(emotionModules, module); + if (moduleIndex >= 0 && moduleIndex < valuesCurrent.Length) + { + valuesCurrent[moduleIndex]++; + totalPoints--; + CheckDriverStillValid(); + UpdateUI(); + } + } + + // 当插头拔出时调用 + public void OnPlugRemoved(Plug plug, EmotionModule module, int socketIndex) + { + // 更新对应模块的值 + int moduleIndex = System.Array.IndexOf(emotionModules, module); + if (moduleIndex >= 0 && moduleIndex < valuesCurrent.Length) + { + valuesCurrent[moduleIndex]--; + totalPoints++; + CheckDriverStillValid(); + UpdateUI(); + } + } public void OpenView() { diff --git a/Assets/Scripts/MiniGame/HuoShan/PowerSource.cs b/Assets/Scripts/MiniGame/HuoShan/PowerSource.cs new file mode 100644 index 000000000..3a15ccfbb --- /dev/null +++ b/Assets/Scripts/MiniGame/HuoShan/PowerSource.cs @@ -0,0 +1,37 @@ +using UnityEngine; +using AibisDream.FixSystem; +using System.Collections.Generic; + +namespace AibisDream +{ + public class PowerSource : MonoBehaviour + { + public Plug[] plugs; // 插头数组，在Inspector中手动设置 + private CableSystem cableSystem; + + private void Awake() + { + cableSystem = GetComponentInParent(); + } + + public bool HasAvailablePlug() + { + foreach (var plug in plugs) + { + if (plug.IsAvailable) + return true; + } + return false; + } + + public Plug GetAvailablePlug() + { + foreach (var plug in plugs) + { + if (plug.IsAvailable) + return plug; + } + return null; + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/MiniGame/HuoShan/PowerSource.cs.meta b/Assets/Scripts/MiniGame/HuoShan/PowerSource.cs.meta new file mode 100644 index 000000000..9ac4d423b --- /dev/null +++ b/Assets/Scripts/MiniGame/HuoShan/PowerSource.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: fa77942f51204854997fd03218d91ec0 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: