diff --git a/Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset b/Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset
index 4c47f993..07ff5f4f 100644
--- a/Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset
+++ b/Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset
@@ -16,7 +16,95 @@ MonoBehaviour:
m_Data:
m_SerializedData: []
m_GUID: 53e8578e4d4799646bc1fd138dd55214
- m_SerializeEntries: []
+ m_SerializeEntries:
+ - m_GUID: 48e6b981b450a5a4981a816717c1cbec
+ m_Address: Assets/Scenes/New Lighting Settings.lighting
+ m_ReadOnly: 0
+ m_SerializedLabels: []
+ - m_GUID: c4b9aac0432a9514b8fb0894a9e28a5d
+ m_Address: Assets/UnityTest/ZXL/Scene/Main/LightingData.asset
+ m_ReadOnly: 0
+ m_SerializedLabels: []
+ - m_GUID: c02c692bde7c7454fbe4eab1fd87e150
+ m_Address: Assets/UnityTest/ZXL/Scene/Main/Lightmap-2_comp_light.exr
+ m_ReadOnly: 0
+ m_SerializedLabels: []
+ - m_GUID: 8171313bcca330c4d8aa4fc07f3924b4
+ m_Address: Assets/UnityTest/ZXL/Scene/Main/Lightmap-5_comp_dir.png
+ m_ReadOnly: 0
+ m_SerializedLabels: []
+ - m_GUID: e3443c71a91336442a610335fbffc0ae
+ m_Address: Assets/UnityTest/ZXL/Scene/Main/Lightmap-8_comp_light.exr
+ m_ReadOnly: 0
+ m_SerializedLabels: []
+ - m_GUID: 945ed26eb9d49cb4981ad4aacbf39cc1
+ m_Address: Assets/UnityTest/ZXL/Scene/Main/Lightmap-6_comp_dir.png
+ m_ReadOnly: 0
+ m_SerializedLabels: []
+ - m_GUID: 25a2a6dcfd3341f4aa3edf6e3885d3a4
+ m_Address: Assets/UnityTest/ZXL/Scene/Main/Lightmap-2_comp_dir.png
+ m_ReadOnly: 0
+ m_SerializedLabels: []
+ - m_GUID: 45036fe47ea35d242b8edf212214c15c
+ m_Address: Assets/UnityTest/ZXL/Scene/Main/Lightmap-0_comp_dir.png
+ m_ReadOnly: 0
+ m_SerializedLabels: []
+ - m_GUID: 360f5f48ad172654191f5c4ea0941d90
+ m_Address: Assets/UnityTest/ZXL/Scene/Main/Lightmap-3_comp_dir.png
+ m_ReadOnly: 0
+ m_SerializedLabels: []
+ - m_GUID: 383993221366d7d49b5ef5430a7894fb
+ m_Address: Assets/UnityTest/ZXL/Scene/Main/Lightmap-1_comp_light.exr
+ m_ReadOnly: 0
+ m_SerializedLabels: []
+ - m_GUID: 196946af32e7fe844aaf542ac3fba984
+ m_Address: Assets/UnityTest/ZXL/Scene/Main/Lightmap-6_comp_light.exr
+ m_ReadOnly: 0
+ m_SerializedLabels: []
+ - m_GUID: ba743947bbedc1b4d88203bd49abe162
+ m_Address: Assets/UnityTest/ZXL/Scene/Main/Lightmap-1_comp_dir.png
+ m_ReadOnly: 0
+ m_SerializedLabels: []
+ - m_GUID: 2b2e3202eff088a4c89d3260ee9580aa
+ m_Address: Assets/UnityTest/ZXL/Scene/Main/Lightmap-0_comp_light.exr
+ m_ReadOnly: 0
+ m_SerializedLabels: []
+ - m_GUID: 3bde44dcd275de34686128e59f4b3300
+ m_Address: Assets/UnityTest/ZXL/Scene/Main/Lightmap-7_comp_dir.png
+ m_ReadOnly: 0
+ m_SerializedLabels: []
+ - m_GUID: 4bcedf0958dd61a409c255ba6a957282
+ m_Address: Assets/UnityTest/ZXL/Scene/Main/Lightmap-8_comp_dir.png
+ m_ReadOnly: 0
+ m_SerializedLabels: []
+ - m_GUID: 9b7c866d9580779448b51df4f5806f84
+ m_Address: Assets/UnityTest/ZXL/Scene/Main/Lightmap-4_comp_light.exr
+ m_ReadOnly: 0
+ m_SerializedLabels: []
+ - m_GUID: bd4417f6486079947bc95c68616cbad7
+ m_Address: Assets/UnityTest/ZXL/Scene/Main/Lightmap-4_comp_dir.png
+ m_ReadOnly: 0
+ m_SerializedLabels: []
+ - m_GUID: bd5c2df68be1786459d9aa059b6bdc8d
+ m_Address: Assets/UnityTest/ZXL/Scene/Main/Lightmap-5_comp_light.exr
+ m_ReadOnly: 0
+ m_SerializedLabels: []
+ - m_GUID: 1e9d2f34f26c1914396662b35eb9a32a
+ m_Address: Assets/UnityTest/ZXL/Scene/Main/Lightmap-7_comp_light.exr
+ m_ReadOnly: 0
+ m_SerializedLabels: []
+ - m_GUID: afa4599a79723474cbff8904c0b33f4d
+ m_Address: Assets/UnityTest/ZXL/Scene/Main/Lightmap-3_comp_light.exr
+ m_ReadOnly: 0
+ m_SerializedLabels: []
+ - m_GUID: 3f2948830e392a64e9f16f9bcc2b3963
+ m_Address: Assets/UnityTest/ZXL/Scene/Main/ReflectionProbe-0.exr
+ m_ReadOnly: 0
+ m_SerializedLabels: []
+ - m_GUID: fb7eb66dc2db1ff4abeac9c638c5d613
+ m_Address: Assets/UnityTest/ZXL/Scene/Main_Profiles/GameObject Profile.asset
+ m_ReadOnly: 0
+ m_SerializedLabels: []
m_ReadOnly: 0
m_Settings: {fileID: 11400000, guid: ed913c58494404948976a29465fa0b05, type: 2}
m_SchemaSet:
diff --git a/Assets/AddressableAssetsData/AssetGroups/ZXLAsset.asset b/Assets/AddressableAssetsData/AssetGroups/ZXLAsset.asset
index 56eaba47..166669a2 100644
--- a/Assets/AddressableAssetsData/AssetGroups/ZXLAsset.asset
+++ b/Assets/AddressableAssetsData/AssetGroups/ZXLAsset.asset
@@ -22,6 +22,24 @@ MonoBehaviour:
m_ReadOnly: 0
m_SerializedLabels:
- default
+ - m_GUID: ad0e516621e60fc4db2d3e37c8ace414
+ m_Address: Assets/UnityTest/ZXL/Timeline
+ m_ReadOnly: 0
+ m_SerializedLabels:
+ - default
+ - m_GUID: 8972113a4587f4b46822fd420104bdba
+ m_Address: Assets/Scenes
+ m_ReadOnly: 0
+ m_SerializedLabels:
+ - default
+ - m_GUID: 52cede3b30d162746bd4520ee496399d
+ m_Address: Assets/UnityTest/ZXL/Scene/Main_Profiles
+ m_ReadOnly: 0
+ m_SerializedLabels: []
+ - m_GUID: 471dabeaf92644b428df78bbee742cb3
+ m_Address: Assets/UnityTest/ZXL/Scene/Main
+ m_ReadOnly: 0
+ m_SerializedLabels: []
m_ReadOnly: 0
m_Settings: {fileID: 11400000, guid: ed913c58494404948976a29465fa0b05, type: 2}
m_SchemaSet:
diff --git a/Assets/AddressableAssetsData/AssetGroups/ZXLScene.asset b/Assets/AddressableAssetsData/AssetGroups/ZXLScene.asset
index fca571eb..fc79653c 100644
--- a/Assets/AddressableAssetsData/AssetGroups/ZXLScene.asset
+++ b/Assets/AddressableAssetsData/AssetGroups/ZXLScene.asset
@@ -16,7 +16,12 @@ MonoBehaviour:
m_Data:
m_SerializedData: []
m_GUID: f9bf57291b1f1e44fb644fb20ee1d242
- m_SerializeEntries: []
+ m_SerializeEntries:
+ - m_GUID: e57a377bbd0310c408cfe216203d5913
+ m_Address: Assets/UnityTest/ZXL/Scene/Main.unity
+ m_ReadOnly: 0
+ m_SerializedLabels:
+ - default
m_ReadOnly: 0
m_Settings: {fileID: 11400000, guid: ed913c58494404948976a29465fa0b05, type: 2}
m_SchemaSet:
diff --git a/Assets/Plugins/Sirenix/Assemblies/AOT.meta b/Assets/Plugins/Sirenix/Assemblies/AOT.meta
new file mode 100644
index 00000000..e80aa390
--- /dev/null
+++ b/Assets/Plugins/Sirenix/Assemblies/AOT.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: c5f21771b821cd1488425408c3dd634e
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Plugins/Sirenix/Assemblies/AOT/Sirenix.Serialization.AOTGenerated.dll b/Assets/Plugins/Sirenix/Assemblies/AOT/Sirenix.Serialization.AOTGenerated.dll
new file mode 100644
index 00000000..111414e2
Binary files /dev/null and b/Assets/Plugins/Sirenix/Assemblies/AOT/Sirenix.Serialization.AOTGenerated.dll differ
diff --git a/Assets/Plugins/Sirenix/Assemblies/AOT/Sirenix.Serialization.AOTGenerated.dll.meta b/Assets/Plugins/Sirenix/Assemblies/AOT/Sirenix.Serialization.AOTGenerated.dll.meta
new file mode 100644
index 00000000..fa257a97
--- /dev/null
+++ b/Assets/Plugins/Sirenix/Assemblies/AOT/Sirenix.Serialization.AOTGenerated.dll.meta
@@ -0,0 +1,33 @@
+fileFormatVersion: 2
+guid: dbc76371245052247a6a00a94327cde2
+PluginImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ iconMap: {}
+ executionOrder: {}
+ defineConstraints: []
+ isPreloaded: 0
+ isOverridable: 0
+ isExplicitlyReferenced: 0
+ validateReferences: 1
+ platformData:
+ - first:
+ Any:
+ second:
+ enabled: 1
+ settings: {}
+ - first:
+ Editor: Editor
+ second:
+ enabled: 0
+ settings:
+ DefaultValueInitialized: true
+ - first:
+ Windows Store Apps: WindowsStoreApps
+ second:
+ enabled: 0
+ settings:
+ CPU: AnyCPU
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Plugins/Sirenix/Assemblies/AOT/link.xml b/Assets/Plugins/Sirenix/Assemblies/AOT/link.xml
new file mode 100644
index 00000000..efdda3af
--- /dev/null
+++ b/Assets/Plugins/Sirenix/Assemblies/AOT/link.xml
@@ -0,0 +1,3 @@
+
+
+
\ No newline at end of file
diff --git a/Assets/Plugins/Sirenix/Assemblies/AOT/link.xml.meta b/Assets/Plugins/Sirenix/Assemblies/AOT/link.xml.meta
new file mode 100644
index 00000000..85632645
--- /dev/null
+++ b/Assets/Plugins/Sirenix/Assemblies/AOT/link.xml.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 56aed5b6e01306d4e97b7b9ac9f7baf0
+TextScriptImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Resources/Sounds/6-4/2-2-1.mp3 b/Assets/Resources/Sounds/6-4/2-2-1.mp3
index a6cf0b93..4307b552 100644
Binary files a/Assets/Resources/Sounds/6-4/2-2-1.mp3 and b/Assets/Resources/Sounds/6-4/2-2-1.mp3 differ
diff --git a/Assets/UnityTest/Common/Scenes/02_Main_Example_Copy.unity b/Assets/UnityTest/Common/Scenes/02_Main_Example_Copy.unity
index de80037c..5aa68f8a 100644
--- a/Assets/UnityTest/Common/Scenes/02_Main_Example_Copy.unity
+++ b/Assets/UnityTest/Common/Scenes/02_Main_Example_Copy.unity
@@ -38,7 +38,7 @@ RenderSettings:
m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 0}
- m_IndirectSpecularColor: {r: 0.5052687, g: 0.5270108, b: 0.52580625, a: 1}
+ m_IndirectSpecularColor: {r: 0.6336611, g: 0.63196677, b: 0.61535054, a: 1}
m_UseRadianceAmbientProbe: 0
--- !u!157 &3
LightmapSettings:
@@ -30145,6 +30145,10 @@ MonoBehaviour:
m_SubObjectName:
m_SubObjectType:
m_EditorAssetChanged: 0
+ - m_AssetGUID: e57a377bbd0310c408cfe216203d5913
+ m_SubObjectName:
+ m_SubObjectType:
+ m_EditorAssetChanged: 0
last: -1
--- !u!4 &386864257
Transform:
diff --git a/Assets/UnityTest/ZXL/Scene/Main.unity b/Assets/UnityTest/ZXL/Scene/Main.unity
index 1e69ba94..74c8d08a 100644
--- a/Assets/UnityTest/ZXL/Scene/Main.unity
+++ b/Assets/UnityTest/ZXL/Scene/Main.unity
@@ -7313,6 +7313,7 @@ GameObject:
- component: {fileID: 107367959}
- component: {fileID: 107367958}
- component: {fileID: 107367957}
+ - component: {fileID: 107367960}
m_Layer: 0
m_Name: "1-3-\u540C\u5B66D-1"
m_TagString: Untagged
@@ -7379,6 +7380,20 @@ RectTransform:
m_AnchoredPosition: {x: 471, y: 41}
m_SizeDelta: {x: 523.4822, y: 230.6128}
m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &107367960
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 107367956}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 0ac82dd6a2b84c2dbcf3339857774da0, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ _audioType: 1
+ _audioClipType: 3
--- !u!4 &108013223 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 8679789284822151876, guid: 0b1dc91ee9f4d1b419abe73ec98d1896,
@@ -11004,7 +11019,7 @@ MonoBehaviour:
Entry: 8
Data:
hhh: '**************************************'
- startProcessType: 3
+ startProcessType: 0
--- !u!1 &150321891
GameObject:
m_ObjectHideFlags: 0
@@ -41307,6 +41322,83 @@ Transform:
m_Father: {fileID: 1251739865}
m_RootOrder: 14
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &490594805
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 490594806}
+ - component: {fileID: 490594808}
+ - component: {fileID: 490594807}
+ m_Layer: 5
+ m_Name: Image
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &490594806
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 490594805}
+ 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: 1411684146}
+ m_Father: {fileID: 1315222915}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0.5, y: 0.5}
+ m_AnchorMax: {x: 0.5, y: 0.5}
+ m_AnchoredPosition: {x: -147, y: 0}
+ m_SizeDelta: {x: 65, y: 75}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &490594807
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 490594805}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 1, g: 1, b: 1, a: 1}
+ m_RaycastTarget: 1
+ m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+ m_Maskable: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_Sprite: {fileID: 21300000, guid: 097011417d876654fa7722cc261abed1, type: 3}
+ m_Type: 0
+ m_PreserveAspect: 0
+ m_FillCenter: 1
+ m_FillMethod: 4
+ m_FillAmount: 1
+ m_FillClockwise: 1
+ m_FillOrigin: 0
+ m_UseSpriteMesh: 0
+ m_PixelsPerUnitMultiplier: 1
+--- !u!222 &490594808
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 490594805}
+ m_CullTransparentMesh: 1
--- !u!1 &493756645
GameObject:
m_ObjectHideFlags: 0
@@ -42211,7 +42303,7 @@ PlayableDirector:
- key: {fileID: 6662574301632688902, guid: fde41bc45e9f84b4099fa29762823535, type: 2}
value: {fileID: 288661143}
- key: {fileID: 5034913627974943823, guid: fde41bc45e9f84b4099fa29762823535, type: 2}
- value: {fileID: 961165582}
+ value: {fileID: 1785920613}
- key: {fileID: 2874833236098046474, guid: fde41bc45e9f84b4099fa29762823535, type: 2}
value: {fileID: 424166791}
- key: {fileID: 5794705313006098291, guid: fde41bc45e9f84b4099fa29762823535, type: 2}
@@ -60309,6 +60401,59 @@ Transform:
type: 3}
m_PrefabInstance: {fileID: 1171587111}
m_PrefabAsset: {fileID: 0}
+--- !u!1 &700543859
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 700543861}
+ - component: {fileID: 700543860}
+ m_Layer: 0
+ m_Name: SceneLoadMark
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!114 &700543860
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 700543859}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 1fdd26d8377198a4c96c523ccea12dd7, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ serializationData:
+ SerializedFormat: 2
+ SerializedBytes:
+ ReferencedUnityObjects: []
+ SerializedBytesString:
+ Prefab: {fileID: 0}
+ PrefabModificationsReferencedUnityObjects: []
+ PrefabModifications: []
+ SerializationNodes: []
+--- !u!4 &700543861
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 700543859}
+ 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_RootOrder: 9
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &703230073
PrefabInstance:
m_ObjectHideFlags: 0
@@ -95326,6 +95471,142 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1099484303}
m_CullTransparentMesh: 0
+--- !u!1 &1100743587
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1100743588}
+ - component: {fileID: 1100743590}
+ - component: {fileID: 1100743589}
+ m_Layer: 0
+ m_Name: Text (TMP)
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &1100743588
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1100743587}
+ 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: 1785920616}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 1, y: 1}
+ m_AnchoredPosition: {x: 16.918518, y: 13.520599}
+ m_SizeDelta: {x: -112.674, y: -27.0412}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &1100743589
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1100743587}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 1, g: 1, b: 1, a: 1}
+ m_RaycastTarget: 1
+ m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+ m_Maskable: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_text: "\u65E0\u6CD5\u5173\u95ED\u4E8B\u6545\u74F6\u51FA\u6C14\u53E3\u9600\u95E8\uFF0C\u706B\u7130\u4F9D\u7136\u71C3\u70E7\uFF0C\u5468\u56F4\u672A\u6709\u65B0\u7684\u5F15\u71C3\u7269\u3002"
+ m_isRightToLeft: 0
+ m_fontAsset: {fileID: 11400000, guid: 058a47f4447d10d46a478459368e10f8, type: 2}
+ m_sharedMaterial: {fileID: 8257085838769213874, guid: 058a47f4447d10d46a478459368e10f8,
+ type: 2}
+ m_fontSharedMaterials: []
+ m_fontMaterial: {fileID: 0}
+ m_fontMaterials: []
+ m_fontColor32:
+ serializedVersion: 2
+ rgba: 4294967295
+ m_fontColor: {r: 1, g: 1, b: 1, a: 1}
+ m_enableVertexGradient: 0
+ m_colorMode: 3
+ m_fontColorGradient:
+ topLeft: {r: 1, g: 1, b: 1, a: 1}
+ topRight: {r: 1, g: 1, b: 1, a: 1}
+ bottomLeft: {r: 1, g: 1, b: 1, a: 1}
+ bottomRight: {r: 1, g: 1, b: 1, a: 1}
+ m_fontColorGradientPreset: {fileID: 0}
+ m_spriteAsset: {fileID: 0}
+ m_tintAllSprites: 0
+ m_StyleSheet: {fileID: 0}
+ m_TextStyleHashCode: -1183493901
+ m_overrideHtmlColors: 0
+ m_faceColor:
+ serializedVersion: 2
+ rgba: 4294967295
+ m_fontSize: 35
+ m_fontSizeBase: 35
+ m_fontWeight: 400
+ m_enableAutoSizing: 0
+ m_fontSizeMin: 18
+ m_fontSizeMax: 72
+ m_fontStyle: 0
+ m_HorizontalAlignment: 1
+ m_VerticalAlignment: 512
+ m_textAlignment: 65535
+ m_characterSpacing: 0
+ m_wordSpacing: 0
+ m_lineSpacing: 0
+ m_lineSpacingMax: 0
+ m_paragraphSpacing: 0
+ m_charWidthMaxAdj: 0
+ m_enableWordWrapping: 1
+ m_wordWrappingRatios: 0.4
+ m_overflowMode: 0
+ m_linkedTextComponent: {fileID: 0}
+ parentLinkedComponent: {fileID: 0}
+ m_enableKerning: 1
+ m_enableExtraPadding: 0
+ checkPaddingRequired: 0
+ m_isRichText: 1
+ m_parseCtrlCharacters: 1
+ m_isOrthographic: 1
+ m_isCullingEnabled: 0
+ m_horizontalMapping: 0
+ m_verticalMapping: 0
+ m_uvLineOffset: 0
+ m_geometrySortingOrder: 0
+ m_IsTextObjectScaleStatic: 0
+ m_VertexBufferAutoSizeReduction: 0
+ m_useMaxVisibleDescender: 1
+ m_pageToDisplay: 1
+ m_margin: {x: 0, y: 0, z: 0, w: 0}
+ m_isUsingLegacyAnimationComponent: 0
+ m_isVolumetricText: 0
+ m_hasFontAssetChanged: 0
+ m_baseMaterial: {fileID: 0}
+ m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
+--- !u!222 &1100743590
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1100743587}
+ m_CullTransparentMesh: 1
--- !u!1 &1101489596
GameObject:
m_ObjectHideFlags: 0
@@ -97276,6 +97557,7 @@ GameObject:
- component: {fileID: 1130053523}
- component: {fileID: 1130053525}
- component: {fileID: 1130053524}
+ - component: {fileID: 1130053526}
m_Layer: 0
m_Name: "1-2-\u540C\u5B66D-1"
m_TagString: Untagged
@@ -97342,6 +97624,20 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1130053522}
m_CullTransparentMesh: 1
+--- !u!114 &1130053526
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1130053522}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 0ac82dd6a2b84c2dbcf3339857774da0, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ _audioType: 1
+ _audioClipType: 0
--- !u!1 &1130093490
GameObject:
m_ObjectHideFlags: 0
@@ -112495,6 +112791,83 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1314924593}
m_CullTransparentMesh: 0
+--- !u!1 &1315222914
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1315222915}
+ - component: {fileID: 1315222917}
+ - component: {fileID: 1315222916}
+ m_Layer: 5
+ m_Name: up
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &1315222915
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1315222914}
+ 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: 490594806}
+ m_Father: {fileID: 1455443026}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0.5, y: 0.5}
+ m_AnchorMax: {x: 0.5, y: 0.5}
+ m_AnchoredPosition: {x: 0, y: 323}
+ m_SizeDelta: {x: 378, y: 75}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &1315222916
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1315222914}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 1, g: 1, b: 1, a: 1}
+ m_RaycastTarget: 1
+ m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+ m_Maskable: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_Sprite: {fileID: 21300000, guid: 5e450f66a2cafcf44885d83fbaed1fba, type: 3}
+ m_Type: 0
+ m_PreserveAspect: 0
+ m_FillCenter: 1
+ m_FillMethod: 4
+ m_FillAmount: 1
+ m_FillClockwise: 1
+ m_FillOrigin: 0
+ m_UseSpriteMesh: 0
+ m_PixelsPerUnitMultiplier: 1
+--- !u!222 &1315222917
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1315222914}
+ m_CullTransparentMesh: 1
--- !u!1 &1316390455
GameObject:
m_ObjectHideFlags: 0
@@ -120013,6 +120386,142 @@ Transform:
m_Father: {fileID: 1057320120}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &1411684145
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1411684146}
+ - component: {fileID: 1411684148}
+ - component: {fileID: 1411684147}
+ m_Layer: 5
+ m_Name: Text (TMP)
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &1411684146
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1411684145}
+ 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: 490594806}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0.5, y: 0.5}
+ m_AnchorMax: {x: 0.5, y: 0.5}
+ m_AnchoredPosition: {x: 184.8, y: 0}
+ m_SizeDelta: {x: 295.02, y: 50}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &1411684147
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1411684145}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 1, g: 1, b: 1, a: 1}
+ m_RaycastTarget: 1
+ m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+ m_Maskable: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_text: "\u6309\u4F4F\u9F20\u6807\u5DE6\u952E\uFF0C\u5C06\u9632\u62A4\u7528\u54C1\u7A7F\u5230\u8EAB\u4E0A\u3002"
+ m_isRightToLeft: 0
+ m_fontAsset: {fileID: 11400000, guid: 014e502fc4660764d976404e57d9f903, type: 2}
+ m_sharedMaterial: {fileID: 2929829565043403201, guid: 014e502fc4660764d976404e57d9f903,
+ type: 2}
+ m_fontSharedMaterials: []
+ m_fontMaterial: {fileID: 0}
+ m_fontMaterials: []
+ m_fontColor32:
+ serializedVersion: 2
+ rgba: 4294967295
+ m_fontColor: {r: 1, g: 1, b: 1, a: 1}
+ m_enableVertexGradient: 0
+ m_colorMode: 3
+ m_fontColorGradient:
+ topLeft: {r: 1, g: 1, b: 1, a: 1}
+ topRight: {r: 1, g: 1, b: 1, a: 1}
+ bottomLeft: {r: 1, g: 1, b: 1, a: 1}
+ bottomRight: {r: 1, g: 1, b: 1, a: 1}
+ m_fontColorGradientPreset: {fileID: 0}
+ m_spriteAsset: {fileID: 0}
+ m_tintAllSprites: 0
+ m_StyleSheet: {fileID: 0}
+ m_TextStyleHashCode: -1183493901
+ m_overrideHtmlColors: 0
+ m_faceColor:
+ serializedVersion: 2
+ rgba: 4294967295
+ m_fontSize: 16.67
+ m_fontSizeBase: 16.67
+ m_fontWeight: 400
+ m_enableAutoSizing: 0
+ m_fontSizeMin: 18
+ m_fontSizeMax: 72
+ m_fontStyle: 0
+ m_HorizontalAlignment: 1
+ m_VerticalAlignment: 512
+ m_textAlignment: 65535
+ m_characterSpacing: 0
+ m_wordSpacing: 0
+ m_lineSpacing: 0
+ m_lineSpacingMax: 0
+ m_paragraphSpacing: 0
+ m_charWidthMaxAdj: 0
+ m_enableWordWrapping: 1
+ m_wordWrappingRatios: 0.4
+ m_overflowMode: 0
+ m_linkedTextComponent: {fileID: 0}
+ parentLinkedComponent: {fileID: 0}
+ m_enableKerning: 1
+ m_enableExtraPadding: 0
+ checkPaddingRequired: 0
+ m_isRichText: 1
+ m_parseCtrlCharacters: 1
+ m_isOrthographic: 1
+ m_isCullingEnabled: 0
+ m_horizontalMapping: 0
+ m_verticalMapping: 0
+ m_uvLineOffset: 0
+ m_geometrySortingOrder: 0
+ m_IsTextObjectScaleStatic: 0
+ m_VertexBufferAutoSizeReduction: 0
+ m_useMaxVisibleDescender: 1
+ m_pageToDisplay: 1
+ m_margin: {x: 0, y: 0, z: 0, w: 0}
+ m_isUsingLegacyAnimationComponent: 0
+ m_isVolumetricText: 0
+ m_hasFontAssetChanged: 0
+ m_baseMaterial: {fileID: 0}
+ m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
+--- !u!222 &1411684148
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1411684145}
+ m_CullTransparentMesh: 1
--- !u!4 &1411884637 stripped
Transform:
m_CorrespondingSourceObject: {fileID: -110869682401024937, guid: cafe673185adae642bfc375757b78511,
@@ -120114,6 +120623,7 @@ RectTransform:
- {fileID: 1130053523}
- {fileID: 1718323520}
- {fileID: 107367959}
+ - {fileID: 1785920616}
m_Father: {fileID: 0}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -124133,7 +124643,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- - {fileID: 1850955263}
+ - {fileID: 1315222915}
- {fileID: 1014743277}
m_Father: {fileID: 1610560036}
m_RootOrder: 0
@@ -144535,6 +145045,7 @@ GameObject:
- component: {fileID: 1718323520}
- component: {fileID: 1718323522}
- component: {fileID: 1718323521}
+ - component: {fileID: 1718323523}
m_Layer: 0
m_Name: "1-2-\u540C\u5B66D-2"
m_TagString: Untagged
@@ -144601,6 +145112,20 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1718323519}
m_CullTransparentMesh: 1
+--- !u!114 &1718323523
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1718323519}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 0ac82dd6a2b84c2dbcf3339857774da0, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ _audioType: 1
+ _audioClipType: 1
--- !u!1 &1719119445
GameObject:
m_ObjectHideFlags: 0
@@ -152264,6 +152789,98 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1785751384}
m_CullTransparentMesh: 0
+--- !u!1 &1785920613
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1785920616}
+ - component: {fileID: 1785920615}
+ - component: {fileID: 1785920614}
+ - component: {fileID: 1785920617}
+ m_Layer: 0
+ m_Name: "1-5-\u540C\u5B66D-1"
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 0
+--- !u!114 &1785920614
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1785920613}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 1, g: 1, b: 1, a: 1}
+ m_RaycastTarget: 1
+ m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+ m_Maskable: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_Sprite: {fileID: 21300000, guid: 5a510693c824d774e9ea3a07abd28c45, type: 3}
+ m_Type: 0
+ m_PreserveAspect: 0
+ m_FillCenter: 1
+ m_FillMethod: 4
+ m_FillAmount: 1
+ m_FillClockwise: 1
+ m_FillOrigin: 0
+ m_UseSpriteMesh: 0
+ m_PixelsPerUnitMultiplier: 1
+--- !u!222 &1785920615
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1785920613}
+ m_CullTransparentMesh: 1
+--- !u!224 &1785920616
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1785920613}
+ 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: 1100743588}
+ m_Father: {fileID: 1412149796}
+ m_RootOrder: 3
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0.5, y: 0.5}
+ m_AnchorMax: {x: 0.5, y: 0.5}
+ m_AnchoredPosition: {x: 471, y: 41}
+ m_SizeDelta: {x: 523.4822, y: 230.6128}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &1785920617
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1785920613}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 0ac82dd6a2b84c2dbcf3339857774da0, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ _audioType: 1
+ _audioClipType: 2
--- !u!1 &1787347029
GameObject:
m_ObjectHideFlags: 0
@@ -155423,142 +156040,6 @@ Transform:
m_Father: {fileID: 1366348571}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &1850955262
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 1850955263}
- - component: {fileID: 1850955265}
- - component: {fileID: 1850955264}
- m_Layer: 5
- m_Name: Text (TMP)
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &1850955263
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1850955262}
- 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: 1455443026}
- m_RootOrder: 0
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0.5, y: 1}
- m_AnchorMax: {x: 0.5, y: 1}
- m_AnchoredPosition: {x: 0, y: -217}
- m_SizeDelta: {x: 497.8385, y: 50}
- m_Pivot: {x: 0.5, y: 0.5}
---- !u!114 &1850955264
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1850955262}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_Material: {fileID: 0}
- m_Color: {r: 1, g: 1, b: 1, a: 1}
- m_RaycastTarget: 1
- m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
- m_Maskable: 1
- m_OnCullStateChanged:
- m_PersistentCalls:
- m_Calls: []
- m_text: "\u6309\u4F4F\u9F20\u6807\u5DE6\u952E\uFF0C\u5C06\u9632\u62A4\u7528\u54C1\u7A7F\u5230\u8EAB\u4E0A\u3002"
- m_isRightToLeft: 0
- m_fontAsset: {fileID: 11400000, guid: 014e502fc4660764d976404e57d9f903, type: 2}
- m_sharedMaterial: {fileID: 2929829565043403201, guid: 014e502fc4660764d976404e57d9f903,
- type: 2}
- m_fontSharedMaterials: []
- m_fontMaterial: {fileID: 0}
- m_fontMaterials: []
- m_fontColor32:
- serializedVersion: 2
- rgba: 4294967295
- m_fontColor: {r: 1, g: 1, b: 1, a: 1}
- m_enableVertexGradient: 0
- m_colorMode: 3
- m_fontColorGradient:
- topLeft: {r: 1, g: 1, b: 1, a: 1}
- topRight: {r: 1, g: 1, b: 1, a: 1}
- bottomLeft: {r: 1, g: 1, b: 1, a: 1}
- bottomRight: {r: 1, g: 1, b: 1, a: 1}
- m_fontColorGradientPreset: {fileID: 0}
- m_spriteAsset: {fileID: 0}
- m_tintAllSprites: 0
- m_StyleSheet: {fileID: 0}
- m_TextStyleHashCode: -1183493901
- m_overrideHtmlColors: 0
- m_faceColor:
- serializedVersion: 2
- rgba: 4294967295
- m_fontSize: 26
- m_fontSizeBase: 26
- m_fontWeight: 400
- m_enableAutoSizing: 0
- m_fontSizeMin: 18
- m_fontSizeMax: 72
- m_fontStyle: 0
- m_HorizontalAlignment: 2
- m_VerticalAlignment: 512
- m_textAlignment: 65535
- m_characterSpacing: 0
- m_wordSpacing: 0
- m_lineSpacing: 0
- m_lineSpacingMax: 0
- m_paragraphSpacing: 0
- m_charWidthMaxAdj: 0
- m_enableWordWrapping: 1
- m_wordWrappingRatios: 0.4
- m_overflowMode: 0
- m_linkedTextComponent: {fileID: 0}
- parentLinkedComponent: {fileID: 0}
- m_enableKerning: 1
- m_enableExtraPadding: 0
- checkPaddingRequired: 0
- m_isRichText: 1
- m_parseCtrlCharacters: 1
- m_isOrthographic: 1
- m_isCullingEnabled: 0
- m_horizontalMapping: 0
- m_verticalMapping: 0
- m_uvLineOffset: 0
- m_geometrySortingOrder: 0
- m_IsTextObjectScaleStatic: 0
- m_VertexBufferAutoSizeReduction: 0
- m_useMaxVisibleDescender: 1
- m_pageToDisplay: 1
- m_margin: {x: 0, y: 0, z: 0, w: 0}
- m_isUsingLegacyAnimationComponent: 0
- m_isVolumetricText: 0
- m_hasFontAssetChanged: 0
- m_baseMaterial: {fileID: 0}
- m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
---- !u!222 &1850955265
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1850955262}
- m_CullTransparentMesh: 1
--- !u!1 &1852464701
GameObject:
m_ObjectHideFlags: 0
diff --git a/Assets/UnityTest/ZXL/Scripts/AudioLogicManager.cs b/Assets/UnityTest/ZXL/Scripts/AudioLogicManager.cs
index 63eec24b..5a9bbc4b 100644
--- a/Assets/UnityTest/ZXL/Scripts/AudioLogicManager.cs
+++ b/Assets/UnityTest/ZXL/Scripts/AudioLogicManager.cs
@@ -24,7 +24,7 @@ namespace UnityTest.ZXL
private void AudioEvent(object sender, GameEventArgs e)
{
var args = e as AudioEventArgs;
- var str = $"{args.audioName}";
+ var str = $"6-4/{args.audioName}";
AudioManager.Instance.PlayMainSounds(str);
}
}
diff --git a/Assets/UnityTest/ZXL/Scripts/Effect/EffectManager.cs b/Assets/UnityTest/ZXL/Scripts/Effect/EffectManager.cs
index c5a44dbb..be45badf 100644
--- a/Assets/UnityTest/ZXL/Scripts/Effect/EffectManager.cs
+++ b/Assets/UnityTest/ZXL/Scripts/Effect/EffectManager.cs
@@ -52,7 +52,7 @@ namespace UnityTest.ZXL
}
}
- private void HideAllEffect()
+ public void HideAllEffect()
{
foreach (var effectData in effectDatas)
{
diff --git a/Assets/UnityTest/ZXL/Scripts/Process/SecondProcess.cs b/Assets/UnityTest/ZXL/Scripts/Process/SecondProcess.cs
index 88344fb5..e4254b3e 100644
--- a/Assets/UnityTest/ZXL/Scripts/Process/SecondProcess.cs
+++ b/Assets/UnityTest/ZXL/Scripts/Process/SecondProcess.cs
@@ -19,6 +19,10 @@ namespace UnityTest.ZXL
protected override void OnInit()
{
base.OnInit();
+
+ // 关闭特效声音
+ EffectManager.Instance().HideAllEffect();
+
StartAsync().Coroutine();
}
diff --git a/Assets/UnityTest/ZXL/Scripts/UI/Help.meta b/Assets/UnityTest/ZXL/Scripts/UI/Help.meta
new file mode 100644
index 00000000..069af1fa
--- /dev/null
+++ b/Assets/UnityTest/ZXL/Scripts/UI/Help.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: c0e9c5cb69ca4cfeb928f57bf097efe4
+timeCreated: 1696559082
\ No newline at end of file
diff --git a/Assets/UnityTest/ZXL/Scripts/UI/Help/AutoPlayAudio.cs b/Assets/UnityTest/ZXL/Scripts/UI/Help/AutoPlayAudio.cs
new file mode 100644
index 00000000..8407ebc5
--- /dev/null
+++ b/Assets/UnityTest/ZXL/Scripts/UI/Help/AutoPlayAudio.cs
@@ -0,0 +1,93 @@
+using System;
+using System.Collections;
+using Script;
+using Sirenix.OdinInspector;
+using UnityEngine;
+
+namespace UnityTest.ZXL.Help
+{
+ public class AutoPlayAudio : MonoBehaviour
+ {
+ [SerializeField] private AudioType _audioType = AudioType.Main;
+ [SerializeField] private AudioClipType _audioClipType;
+
+ private string str = "6_4/";
+ private bool isFinish;
+
+ private void OnEnable()
+ {
+ isFinish = false;
+ StartCoroutine(StartPlayAudio());
+ }
+
+ private void OnDisable()
+ {
+ if (isFinish)
+ {
+ return;
+ }
+
+ StopCoroutine(StartPlayAudio());
+ }
+
+ IEnumerator StartPlayAudio()
+ {
+ var s = _audioClipType.ToString();
+ var substring = s.Substring(1, s.Length - 1);
+ var replace = substring.Replace("_", "-");
+ var path = str + replace;
+ float time = 0;
+ switch (_audioType)
+ {
+ case AudioType.Bgm:
+ time = AudioManager.Instance.PlayBgmSound(true, path);
+ break;
+ case AudioType.Main:
+ time = AudioManager.Instance.PlayMainSounds(path);
+ break;
+ case AudioType.Other:
+ time = AudioManager.Instance.PlayOtherSound(true, path);
+ break;
+ default:
+ throw new ArgumentOutOfRangeException();
+ }
+
+ yield return new WaitForSeconds(time);
+ isFinish = true;
+ }
+ }
+
+ public enum AudioType
+ {
+ Bgm,
+ Main,
+ Other,
+ }
+
+ public enum AudioClipType
+ {
+ _1_2_1,
+ _1_2_2,
+ _1_3_1,
+ _1_3_2,
+ _1_3_3,
+ _2_1_1,
+ _2_1_2,
+ _2_1_3,
+ _2_1_4,
+ _2_2_1,
+ _2_2_2,
+ _2_2_3,
+ _2_2_4,
+ _2_3_1,
+ _2_3_2,
+ _2_3_3,
+ _2_3_4,
+ _2_4_1,
+ _2_4_2,
+ _2_4_3,
+ _2_4_4,
+ _3_3,
+ _119报警声,
+ }
+}
\ No newline at end of file
diff --git a/Assets/UnityTest/ZXL/Scripts/UI/Help/AutoPlayAudio.cs.meta b/Assets/UnityTest/ZXL/Scripts/UI/Help/AutoPlayAudio.cs.meta
new file mode 100644
index 00000000..6bcd0820
--- /dev/null
+++ b/Assets/UnityTest/ZXL/Scripts/UI/Help/AutoPlayAudio.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 0ac82dd6a2b84c2dbcf3339857774da0
+timeCreated: 1696559140
\ No newline at end of file
diff --git a/Assets/UnityTest/ZXL/Timeline/first/5/1-5.playable b/Assets/UnityTest/ZXL/Timeline/first/5/1-5.playable
index 9c827fc2..1e0205ea 100644
--- a/Assets/UnityTest/ZXL/Timeline/first/5/1-5.playable
+++ b/Assets/UnityTest/ZXL/Timeline/first/5/1-5.playable
@@ -712,7 +712,7 @@ MonoBehaviour:
m_Start: 12.170000000000009
m_ClipIn: 0
m_Asset: {fileID: -4476463884387782317}
- m_Duration: 3.8500000000000085
+ m_Duration: 3.0500000000000096
m_TimeScale: 1
m_ParentTrack: {fileID: 5034913627974943823}
m_EaseInDuration: 0
@@ -1878,25 +1878,7 @@ MonoBehaviour:
m_RotationOrder: 4
m_MixOutCurve:
serializedVersion: 2
- m_Curve:
- - serializedVersion: 3
- time: 0
- value: 1
- inSlope: 0
- outSlope: 0
- tangentMode: 0
- weightedMode: 0
- inWeight: 0
- outWeight: 0
- - serializedVersion: 3
- time: 1
- value: 0
- inSlope: 0
- outSlope: 0
- tangentMode: 0
- weightedMode: 0
- inWeight: 0
- outWeight: 0
+ m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
diff --git a/Assets/UnityTest/_2实验室的防护与应急/Scripts/MainLogic.cs b/Assets/UnityTest/_2实验室的防护与应急/Scripts/MainLogic.cs
index 973f20cb..68212c76 100644
--- a/Assets/UnityTest/_2实验室的防护与应急/Scripts/MainLogic.cs
+++ b/Assets/UnityTest/_2实验室的防护与应急/Scripts/MainLogic.cs
@@ -207,14 +207,17 @@ namespace _2
// 2.4.气瓶泄漏应急处置-待补充
async UniTask _2_4(CancellationToken token)
{
- await GlobalPage.ShowTip_2Async("待补充",
- cancellationToken: token,
- onSelect: new Func[]
- {
- async token => { await UniTask.Yield(); },
- async token => { await UniTask.Yield(); },
- });
- //await ReturnMoudleSelect();
+ await IoC.GetSingleton().LoadScene(2);
+
+ IoC.GetSingleton().Hide();
+ var moudleSelect = Page.GetUI("02现场事故应急处置模块/模块选择");
+ moudleSelect.gameObject.SetActive(false);
+ bool isTrue = false;
+ while (!isTrue)
+ {
+ await UniTask.Yield();
+ }
+ // await ReturnMoudleSelectSub();
}
#endregion
diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset
index 0635568c..d5ee0246 100644
--- a/ProjectSettings/EditorBuildSettings.asset
+++ b/ProjectSettings/EditorBuildSettings.asset
@@ -5,7 +5,7 @@ EditorBuildSettings:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Scenes:
- - enabled: 0
+ - enabled: 1
path: Assets/UnityTest/_0Loading/Scenes/00_Loading_Example.unity
guid: e776010bfa8da4e41b8c9fa3b5eed144
- enabled: 0
@@ -14,10 +14,10 @@ EditorBuildSettings:
- enabled: 0
path: "Assets/UnityTest/_2\u5B9E\u9A8C\u5BA4\u7684\u9632\u62A4\u4E0E\u5E94\u6025/Scenes/02_Main_Example.unity"
guid: 1f69a0a917cf9694d8223009986d69bb
- - enabled: 0
+ - enabled: 1
path: Assets/UnityTest/Common/Scenes/02_Main_Example_Copy.unity
guid: 9b5c446b08e0a53408159ed3b43fbf0c
- - enabled: 1
+ - enabled: 0
path: Assets/UnityTest/ZXL/Scene/Main.unity
guid: e57a377bbd0310c408cfe216203d5913
m_configObjects:
diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset
index af134e4b..56594362 100644
--- a/ProjectSettings/ProjectSettings.asset
+++ b/ProjectSettings/ProjectSettings.asset
@@ -149,6 +149,7 @@ PlayerSettings:
preloadedAssets:
- {fileID: 0}
- {fileID: 0}
+ - {fileID: 11400000, guid: 377fab9146e60364fa298d388667a056, type: 2}
metroInputSource: 0
wsaTransparentSwapchain: 0
m_HolographicPauseOnTrackingLoss: 1
diff --git a/ProjectSettings/TimeManager.asset b/ProjectSettings/TimeManager.asset
index 2395f72c..558a017e 100644
--- a/ProjectSettings/TimeManager.asset
+++ b/ProjectSettings/TimeManager.asset
@@ -5,5 +5,5 @@ TimeManager:
m_ObjectHideFlags: 0
Fixed Timestep: 0.02
Maximum Allowed Timestep: 0.33333334
- m_TimeScale: 2
+ m_TimeScale: 1
Maximum Particle Timestep: 0.03