From 845ac9cc2775a16956c6f6339b45427b424660f5 Mon Sep 17 00:00:00 2001
From: Ding Yuntian <1491671119@qq.com>
Date: Tue, 11 Nov 2025 21:07:02 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=B9=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../AssetGroups/Default Local Group.asset | 5 -
...ables-Chinese (Simplified) (zh-Hans).asset | 6 -
...alization-String-Tables-English (en).asset | 6 -
Assets/Language/Config.meta | 8 -
.../Language/Config/Config Shared Data.asset | 40 -
.../Config/Config Shared Data.asset.meta | 8 -
Assets/Language/Config/Config.asset | 23 -
Assets/Language/Config/Config.asset.meta | 8 -
Assets/Language/Config/Config_en.asset | 35 -
Assets/Language/Config/Config_en.asset.meta | 8 -
Assets/Language/Config/Config_zh-Hans.asset | 35 -
.../Language/Config/Config_zh-Hans.asset.meta | 8 -
.../Language/UIText/UIText Shared Data.asset | 4 +
Assets/Language/UIText/UIText_en.asset | 6 +-
Assets/Language/UIText/UIText_zh-Hans.asset | 6 +-
Assets/Scenes/Persistence.unity | 1434 +++++++++--------
Assets/ScriptableObjects/TextAnimaStyle.meta | 8 -
.../TextAnimaStyle/Bubble Text Style.asset | 24 -
.../Bubble Text Style.asset.meta | 8 -
.../TextAnimaStyle/Screen Text Style.asset | 24 -
.../Screen Text Style.asset.meta | 8 -
Assets/Scripts/Dialog System/LineRunner.cs | 35 +-
Assets/Scripts/Dialog System/LineSyncToken.cs | 62 +-
Assets/Scripts/Dialog System/LineView.cs | 75 -
Assets/Scripts/Dialog System/LineView.cs.meta | 11 -
.../Screen System/ScreenSystem.cs | 28 +-
.../FixSystemNew/Screen System/TaskScreen.cs | 4 +-
Assets/Scripts/Framework/Core/EventKit.cs | 13 +-
.../Framework/OtherKit/LocalizationKit.cs | 11 +-
Assets/Scripts/Game Loop/EventEnums.cs | 3 +-
Assets/Scripts/Game Loop/SettingLoader.cs | 17 +-
Assets/Scripts/Style/TextAnimaStyle.cs | 49 -
Assets/Scripts/Style/TextAnimaStyle.cs.meta | 11 -
Assets/Scripts/UI/DialogUI/Bubbles/Bubble.cs | 28 +-
.../UI/DialogUI/Bubbles/BubbleGroup.cs | 153 +-
Assets/Scripts/UI/DialogUI/CenterOption.cs | 80 -
.../Scripts/UI/DialogUI/CenterOption.cs.meta | 11 -
Assets/Scripts/UI/DialogUI/CenterText.cs | 96 --
Assets/Scripts/UI/DialogUI/CenterText.cs.meta | 11 -
Assets/Scripts/UI/DialogUI/DefaultOptions.cs | 4 +
.../UI/DialogUI/DialogCanvasManager.cs | 366 -----
.../UI/DialogUI/DialogCanvasManager.cs.meta | 11 -
.../{IDialogView.cs => DialogOption.cs} | 24 +-
...ialogView.cs.meta => DialogOption.cs.meta} | 0
Assets/Scripts/UI/DialogUI/DialogUIManager.cs | 53 +-
Assets/Scripts/UI/Panel/Record/RecordItem.cs | 4 +-
Assets/Scripts/UI/Panel/Record/RecordPanel.cs | 13 +-
Assets/StreamingAssets/Config/setting.json | 3 +-
48 files changed, 1059 insertions(+), 1829 deletions(-)
delete mode 100644 Assets/Language/Config.meta
delete mode 100644 Assets/Language/Config/Config Shared Data.asset
delete mode 100644 Assets/Language/Config/Config Shared Data.asset.meta
delete mode 100644 Assets/Language/Config/Config.asset
delete mode 100644 Assets/Language/Config/Config.asset.meta
delete mode 100644 Assets/Language/Config/Config_en.asset
delete mode 100644 Assets/Language/Config/Config_en.asset.meta
delete mode 100644 Assets/Language/Config/Config_zh-Hans.asset
delete mode 100644 Assets/Language/Config/Config_zh-Hans.asset.meta
delete mode 100644 Assets/ScriptableObjects/TextAnimaStyle.meta
delete mode 100644 Assets/ScriptableObjects/TextAnimaStyle/Bubble Text Style.asset
delete mode 100644 Assets/ScriptableObjects/TextAnimaStyle/Bubble Text Style.asset.meta
delete mode 100644 Assets/ScriptableObjects/TextAnimaStyle/Screen Text Style.asset
delete mode 100644 Assets/ScriptableObjects/TextAnimaStyle/Screen Text Style.asset.meta
delete mode 100644 Assets/Scripts/Dialog System/LineView.cs
delete mode 100644 Assets/Scripts/Dialog System/LineView.cs.meta
delete mode 100644 Assets/Scripts/Style/TextAnimaStyle.cs
delete mode 100644 Assets/Scripts/Style/TextAnimaStyle.cs.meta
delete mode 100644 Assets/Scripts/UI/DialogUI/CenterOption.cs
delete mode 100644 Assets/Scripts/UI/DialogUI/CenterOption.cs.meta
delete mode 100644 Assets/Scripts/UI/DialogUI/CenterText.cs
delete mode 100644 Assets/Scripts/UI/DialogUI/CenterText.cs.meta
delete mode 100644 Assets/Scripts/UI/DialogUI/DialogCanvasManager.cs
delete mode 100644 Assets/Scripts/UI/DialogUI/DialogCanvasManager.cs.meta
rename Assets/Scripts/UI/DialogUI/{IDialogView.cs => DialogOption.cs} (70%)
rename Assets/Scripts/UI/DialogUI/{IDialogView.cs.meta => DialogOption.cs.meta} (100%)
diff --git a/Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset b/Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset
index 60465ede9..f5964ead7 100644
--- a/Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset
+++ b/Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset
@@ -67,11 +67,6 @@ MonoBehaviour:
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- - m_GUID: c3bb987a03bd4284687e2e4bd17ef561
- m_Address: Assets/Language/Config/Config Shared Data.asset
- m_ReadOnly: 0
- m_SerializedLabels: []
- FlaggedDuringContentUpdateRestriction: 0
m_ReadOnly: 0
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 ffb480a4d..081e1fbd2 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
@@ -41,12 +41,6 @@ MonoBehaviour:
m_SerializedLabels:
- Locale-zh-Hans
FlaggedDuringContentUpdateRestriction: 0
- - m_GUID: 780b504d9b462a746b7d00d64022773a
- m_Address: Config_zh-Hans
- m_ReadOnly: 1
- m_SerializedLabels:
- - Locale-zh-Hans
- FlaggedDuringContentUpdateRestriction: 0
- m_GUID: d6149a0fedb6cc24ba2a318aedab1de0
m_Address: FP_Day1_mid_zh-Hans
m_ReadOnly: 1
diff --git a/Assets/AddressableAssetsData/AssetGroups/Localization-String-Tables-English (en).asset b/Assets/AddressableAssetsData/AssetGroups/Localization-String-Tables-English (en).asset
index c4815bc37..c5c3e3ff0 100644
--- a/Assets/AddressableAssetsData/AssetGroups/Localization-String-Tables-English (en).asset
+++ b/Assets/AddressableAssetsData/AssetGroups/Localization-String-Tables-English (en).asset
@@ -41,12 +41,6 @@ MonoBehaviour:
m_SerializedLabels:
- Locale-en
FlaggedDuringContentUpdateRestriction: 0
- - m_GUID: 02d98e7d7f864944d96d3b345224d9fa
- m_Address: Config_en
- m_ReadOnly: 1
- m_SerializedLabels:
- - Locale-en
- FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 30ab319b5e0bafe46aa622bb93381c7e
m_Address: FP_Day1_mid_en
m_ReadOnly: 1
diff --git a/Assets/Language/Config.meta b/Assets/Language/Config.meta
deleted file mode 100644
index ceb21f926..000000000
--- a/Assets/Language/Config.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: c061e4bd0b3a72d41870cbf36057b904
-folderAsset: yes
-DefaultImporter:
- externalObjects: {}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/Language/Config/Config Shared Data.asset b/Assets/Language/Config/Config Shared Data.asset
deleted file mode 100644
index 96086bd62..000000000
--- a/Assets/Language/Config/Config Shared Data.asset
+++ /dev/null
@@ -1,40 +0,0 @@
-%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: Config Shared Data
- m_EditorClassIdentifier:
- m_TableCollectionName: Config
- m_TableCollectionNameGuidString: c3bb987a03bd4284687e2e4bd17ef561
- m_Entries:
- - m_Id: 9020903424
- m_Key: dialogUI_bubble_aside
- m_Metadata:
- m_Items: []
- - m_Id: 4373118717952
- m_Key: dialogUI_bubble_bubble
- m_Metadata:
- m_Items: []
- - m_Id: 7902061260705792
- m_Key: dialogUI_param
- m_Metadata:
- m_Items: []
- m_Metadata:
- m_Items: []
- m_KeyGenerator:
- rid: 7917695935159992322
- references:
- version: 2
- RefIds:
- - rid: 7917695935159992322
- type: {class: DistributedUIDGenerator, ns: UnityEngine.Localization.Tables, asm: Unity.Localization}
- data:
- m_CustomEpoch: 1745499303839
diff --git a/Assets/Language/Config/Config Shared Data.asset.meta b/Assets/Language/Config/Config Shared Data.asset.meta
deleted file mode 100644
index 6371888c5..000000000
--- a/Assets/Language/Config/Config Shared Data.asset.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: c3bb987a03bd4284687e2e4bd17ef561
-NativeFormatImporter:
- externalObjects: {}
- mainObjectFileID: 11400000
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/Language/Config/Config.asset b/Assets/Language/Config/Config.asset
deleted file mode 100644
index adf28afcb..000000000
--- a/Assets/Language/Config/Config.asset
+++ /dev/null
@@ -1,23 +0,0 @@
-%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: Config
- m_EditorClassIdentifier:
- m_SharedTableData: {fileID: 11400000, guid: c3bb987a03bd4284687e2e4bd17ef561, type: 2}
- m_Tables:
- - {fileID: 11400000, guid: 02d98e7d7f864944d96d3b345224d9fa, type: 2}
- - {fileID: 11400000, guid: 780b504d9b462a746b7d00d64022773a, type: 2}
- m_Extensions: []
- m_Group: String Table
- references:
- version: 2
- RefIds: []
diff --git a/Assets/Language/Config/Config.asset.meta b/Assets/Language/Config/Config.asset.meta
deleted file mode 100644
index 37063d81a..000000000
--- a/Assets/Language/Config/Config.asset.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 44f370173ae4c0a40a871751e7cb716d
-NativeFormatImporter:
- externalObjects: {}
- mainObjectFileID: 11400000
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/Language/Config/Config_en.asset b/Assets/Language/Config/Config_en.asset
deleted file mode 100644
index 1f0b79546..000000000
--- a/Assets/Language/Config/Config_en.asset
+++ /dev/null
@@ -1,35 +0,0 @@
-%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: Config_en
- m_EditorClassIdentifier:
- m_LocaleId:
- m_Code: en
- m_SharedData: {fileID: 11400000, guid: c3bb987a03bd4284687e2e4bd17ef561, type: 2}
- m_Metadata:
- m_Items: []
- m_TableData:
- - m_Id: 9020903424
- m_Localized: '"charSpace": "0", "maxCharNum": "55"'
- m_Metadata:
- m_Items: []
- - m_Id: 4373118717952
- m_Localized: '"charSpace": "0", "maxCharNum": "22"'
- m_Metadata:
- m_Items: []
- - m_Id: 7902061260705792
- m_Localized: '"charSpace": "0"'
- m_Metadata:
- m_Items: []
- references:
- version: 2
- RefIds: []
diff --git a/Assets/Language/Config/Config_en.asset.meta b/Assets/Language/Config/Config_en.asset.meta
deleted file mode 100644
index 5b19a93a2..000000000
--- a/Assets/Language/Config/Config_en.asset.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 02d98e7d7f864944d96d3b345224d9fa
-NativeFormatImporter:
- externalObjects: {}
- mainObjectFileID: 11400000
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/Language/Config/Config_zh-Hans.asset b/Assets/Language/Config/Config_zh-Hans.asset
deleted file mode 100644
index a5566862c..000000000
--- a/Assets/Language/Config/Config_zh-Hans.asset
+++ /dev/null
@@ -1,35 +0,0 @@
-%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: Config_zh-Hans
- m_EditorClassIdentifier:
- m_LocaleId:
- m_Code: zh-Hans
- m_SharedData: {fileID: 11400000, guid: c3bb987a03bd4284687e2e4bd17ef561, type: 2}
- m_Metadata:
- m_Items: []
- m_TableData:
- - m_Id: 9020903424
- m_Localized: '"charSpace": "7", "maxCharNum": "27"'
- m_Metadata:
- m_Items: []
- - m_Id: 4373118717952
- m_Localized: '"charSpace": "7", "maxCharNum": "14"'
- m_Metadata:
- m_Items: []
- - m_Id: 7902061260705792
- m_Localized: '"charSpace": "7"'
- m_Metadata:
- m_Items: []
- references:
- version: 2
- RefIds: []
diff --git a/Assets/Language/Config/Config_zh-Hans.asset.meta b/Assets/Language/Config/Config_zh-Hans.asset.meta
deleted file mode 100644
index f04c4b55d..000000000
--- a/Assets/Language/Config/Config_zh-Hans.asset.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 780b504d9b462a746b7d00d64022773a
-NativeFormatImporter:
- externalObjects: {}
- mainObjectFileID: 11400000
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/Language/UIText/UIText Shared Data.asset b/Assets/Language/UIText/UIText Shared Data.asset
index c79ea1284..531bdd417 100644
--- a/Assets/Language/UIText/UIText Shared Data.asset
+++ b/Assets/Language/UIText/UIText Shared Data.asset
@@ -203,6 +203,10 @@ MonoBehaviour:
m_Key: chapter_continue
m_Metadata:
m_Items: []
+ - m_Id: 73229033469382656
+ m_Key: setting_textSpeed_slow
+ m_Metadata:
+ m_Items: []
m_Metadata:
m_Items: []
m_KeyGenerator:
diff --git a/Assets/Language/UIText/UIText_en.asset b/Assets/Language/UIText/UIText_en.asset
index 905294d45..327f78d90 100644
--- a/Assets/Language/UIText/UIText_en.asset
+++ b/Assets/Language/UIText/UIText_en.asset
@@ -85,7 +85,7 @@ MonoBehaviour:
m_Metadata:
m_Items: []
- m_Id: 22296675749900
- m_Localized: WINDOW MODE
+ m_Localized: SCREEN MODE
m_Metadata:
m_Items: []
- m_Id: 22296675749901
@@ -220,6 +220,10 @@ MonoBehaviour:
m_Localized: Continue
m_Metadata:
m_Items: []
+ - m_Id: 73229033469382656
+ m_Localized: SLOW
+ m_Metadata:
+ m_Items: []
references:
version: 2
RefIds:
diff --git a/Assets/Language/UIText/UIText_zh-Hans.asset b/Assets/Language/UIText/UIText_zh-Hans.asset
index 1f4ffad6b..df174b5f0 100644
--- a/Assets/Language/UIText/UIText_zh-Hans.asset
+++ b/Assets/Language/UIText/UIText_zh-Hans.asset
@@ -89,7 +89,7 @@ MonoBehaviour:
m_Metadata:
m_Items: []
- m_Id: 22296675749900
- m_Localized: "\u7A97\u53E3\u6A21\u5F0F"
+ m_Localized: "\u5C4F\u5E55\u6A21\u5F0F"
m_Metadata:
m_Items: []
- m_Id: 22296675749901
@@ -209,6 +209,10 @@ MonoBehaviour:
m_Metadata:
m_Items:
- rid: 7917695939544875419
+ - m_Id: 73229033469382656
+ m_Localized: "\u6162\u901F"
+ m_Metadata:
+ m_Items: []
references:
version: 2
RefIds:
diff --git a/Assets/Scenes/Persistence.unity b/Assets/Scenes/Persistence.unity
index a87f23da7..d05e4a9e6 100644
--- a/Assets/Scenes/Persistence.unity
+++ b/Assets/Scenes/Persistence.unity
@@ -603,30 +603,6 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 243936684424215245}
m_Modifications:
- - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: _sID
- value: 67e03198-f3fa-40e3-88ca-042210787447
- objectReference: {fileID: 0}
- - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: graphManager
- value:
- objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
- - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: _sID
- value: 39cf0bb1-4276-40ca-8336-c91048fb4ba1
- objectReference: {fileID: 0}
- - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: graphManager
- value:
- objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
- - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: _sID
- value: 27840e3a-f0c8-4ee8-a048-4e57774c3376
- objectReference: {fileID: 0}
- - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: graphManager
- value:
- objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
- target: {fileID: 23699057384935269, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3}
propertyPath: m_Pivot.x
value: 0.5
@@ -851,6 +827,30 @@ PrefabInstance:
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
+ - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: _sID
+ value: 67e03198-f3fa-40e3-88ca-042210787447
+ objectReference: {fileID: 0}
+ - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: graphManager
+ value:
+ objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
+ - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: _sID
+ value: 39cf0bb1-4276-40ca-8336-c91048fb4ba1
+ objectReference: {fileID: 0}
+ - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: graphManager
+ value:
+ objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
+ - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: _sID
+ value: 27840e3a-f0c8-4ee8-a048-4e57774c3376
+ objectReference: {fileID: 0}
+ - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: graphManager
+ value:
+ objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects:
@@ -899,30 +899,6 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 243936684424215245}
m_Modifications:
- - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: _sID
- value: 67e03198-f3fa-40e3-88ca-042210787447
- objectReference: {fileID: 0}
- - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: graphManager
- value:
- objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
- - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: _sID
- value: 39cf0bb1-4276-40ca-8336-c91048fb4ba1
- objectReference: {fileID: 0}
- - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: graphManager
- value:
- objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
- - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: _sID
- value: 27840e3a-f0c8-4ee8-a048-4e57774c3376
- objectReference: {fileID: 0}
- - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: graphManager
- value:
- objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
- target: {fileID: 23699057384935269, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3}
propertyPath: m_Pivot.x
value: 0.5
@@ -1147,6 +1123,30 @@ PrefabInstance:
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
+ - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: _sID
+ value: 67e03198-f3fa-40e3-88ca-042210787447
+ objectReference: {fileID: 0}
+ - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: graphManager
+ value:
+ objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
+ - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: _sID
+ value: 39cf0bb1-4276-40ca-8336-c91048fb4ba1
+ objectReference: {fileID: 0}
+ - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: graphManager
+ value:
+ objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
+ - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: _sID
+ value: 27840e3a-f0c8-4ee8-a048-4e57774c3376
+ objectReference: {fileID: 0}
+ - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: graphManager
+ value:
+ objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects:
@@ -2002,30 +2002,6 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 243936684424215245}
m_Modifications:
- - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: _sID
- value: 67e03198-f3fa-40e3-88ca-042210787447
- objectReference: {fileID: 0}
- - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: graphManager
- value:
- objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
- - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: _sID
- value: 39cf0bb1-4276-40ca-8336-c91048fb4ba1
- objectReference: {fileID: 0}
- - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: graphManager
- value:
- objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
- - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: _sID
- value: 27840e3a-f0c8-4ee8-a048-4e57774c3376
- objectReference: {fileID: 0}
- - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: graphManager
- value:
- objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
- target: {fileID: 23699057384935269, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3}
propertyPath: m_Pivot.x
value: 0.5
@@ -2250,6 +2226,30 @@ PrefabInstance:
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
+ - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: _sID
+ value: 67e03198-f3fa-40e3-88ca-042210787447
+ objectReference: {fileID: 0}
+ - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: graphManager
+ value:
+ objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
+ - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: _sID
+ value: 39cf0bb1-4276-40ca-8336-c91048fb4ba1
+ objectReference: {fileID: 0}
+ - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: graphManager
+ value:
+ objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
+ - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: _sID
+ value: 27840e3a-f0c8-4ee8-a048-4e57774c3376
+ objectReference: {fileID: 0}
+ - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: graphManager
+ value:
+ objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects:
@@ -3006,30 +3006,6 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 243936684424215245}
m_Modifications:
- - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: _sID
- value: 67e03198-f3fa-40e3-88ca-042210787447
- objectReference: {fileID: 0}
- - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: graphManager
- value:
- objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
- - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: _sID
- value: 39cf0bb1-4276-40ca-8336-c91048fb4ba1
- objectReference: {fileID: 0}
- - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: graphManager
- value:
- objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
- - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: _sID
- value: 27840e3a-f0c8-4ee8-a048-4e57774c3376
- objectReference: {fileID: 0}
- - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: graphManager
- value:
- objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
- target: {fileID: 23699057384935269, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3}
propertyPath: m_Pivot.x
value: 0.5
@@ -3250,6 +3226,30 @@ PrefabInstance:
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
+ - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: _sID
+ value: 67e03198-f3fa-40e3-88ca-042210787447
+ objectReference: {fileID: 0}
+ - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: graphManager
+ value:
+ objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
+ - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: _sID
+ value: 39cf0bb1-4276-40ca-8336-c91048fb4ba1
+ objectReference: {fileID: 0}
+ - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: graphManager
+ value:
+ objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
+ - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: _sID
+ value: 27840e3a-f0c8-4ee8-a048-4e57774c3376
+ objectReference: {fileID: 0}
+ - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: graphManager
+ value:
+ objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects:
@@ -3718,30 +3718,6 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 243936684424215245}
m_Modifications:
- - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: _sID
- value: 67e03198-f3fa-40e3-88ca-042210787447
- objectReference: {fileID: 0}
- - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: graphManager
- value:
- objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
- - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: _sID
- value: 39cf0bb1-4276-40ca-8336-c91048fb4ba1
- objectReference: {fileID: 0}
- - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: graphManager
- value:
- objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
- - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: _sID
- value: 27840e3a-f0c8-4ee8-a048-4e57774c3376
- objectReference: {fileID: 0}
- - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: graphManager
- value:
- objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
- target: {fileID: 23699057384935269, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3}
propertyPath: m_Pivot.x
value: 0.5
@@ -3970,6 +3946,30 @@ PrefabInstance:
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
+ - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: _sID
+ value: 67e03198-f3fa-40e3-88ca-042210787447
+ objectReference: {fileID: 0}
+ - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: graphManager
+ value:
+ objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
+ - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: _sID
+ value: 39cf0bb1-4276-40ca-8336-c91048fb4ba1
+ objectReference: {fileID: 0}
+ - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: graphManager
+ value:
+ objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
+ - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: _sID
+ value: 27840e3a-f0c8-4ee8-a048-4e57774c3376
+ objectReference: {fileID: 0}
+ - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: graphManager
+ value:
+ objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects:
@@ -4085,30 +4085,6 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 243936684424215245}
m_Modifications:
- - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: _sID
- value: 65545b51-845c-4df4-8f5c-90c1f04cbe23
- objectReference: {fileID: 0}
- - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: graphManager
- value:
- objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
- - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: _sID
- value: 3336344b-f73d-481c-bd5a-548f8a4bead4
- objectReference: {fileID: 0}
- - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: graphManager
- value:
- objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
- - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: _sID
- value: ddd9082f-516c-4e2f-bd55-78c29857f972
- objectReference: {fileID: 0}
- - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: graphManager
- value:
- objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
- target: {fileID: 23699057384935269, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3}
propertyPath: m_Pivot.x
value: 0.5
@@ -4325,6 +4301,30 @@ PrefabInstance:
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
+ - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: _sID
+ value: 65545b51-845c-4df4-8f5c-90c1f04cbe23
+ objectReference: {fileID: 0}
+ - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: graphManager
+ value:
+ objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
+ - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: _sID
+ value: 3336344b-f73d-481c-bd5a-548f8a4bead4
+ objectReference: {fileID: 0}
+ - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: graphManager
+ value:
+ objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
+ - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: _sID
+ value: ddd9082f-516c-4e2f-bd55-78c29857f972
+ objectReference: {fileID: 0}
+ - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: graphManager
+ value:
+ objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
m_RemovedComponents: []
m_RemovedGameObjects:
- {fileID: 7940112695066571942, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3}
@@ -5549,6 +5549,160 @@ MonoBehaviour:
m_EditorClassIdentifier:
objWidth: 700
objHeight: 550
+--- !u!1001 &309628996
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ serializedVersion: 3
+ m_TransformParent: {fileID: 430924359}
+ m_Modifications:
+ - target: {fileID: 27177156846382951, guid: e45f5fd66e7512444a9a27161cf51b7f, type: 3}
+ propertyPath: m_SizeDelta.x
+ value: 180
+ objectReference: {fileID: 0}
+ - target: {fileID: 1032211294988139403, guid: e45f5fd66e7512444a9a27161cf51b7f, type: 3}
+ propertyPath: m_StringReference.m_TableEntryReference.m_KeyId
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 1032211294988139403, guid: e45f5fd66e7512444a9a27161cf51b7f, type: 3}
+ propertyPath: m_StringReference.m_TableReference.m_TableCollectionName
+ value: GUID:994c69bf4b2403043bc9562f2d24ee56
+ objectReference: {fileID: 0}
+ - target: {fileID: 4099831927643554877, guid: e45f5fd66e7512444a9a27161cf51b7f, type: 3}
+ propertyPath: prop
+ value: TextSpeed
+ objectReference: {fileID: 0}
+ - target: {fileID: 4099831927643554877, guid: e45f5fd66e7512444a9a27161cf51b7f, type: 3}
+ propertyPath: label
+ value: setting_textSpeed
+ objectReference: {fileID: 0}
+ - target: {fileID: 4099831927643554877, guid: e45f5fd66e7512444a9a27161cf51b7f, type: 3}
+ propertyPath: options.Array.size
+ value: 3
+ objectReference: {fileID: 0}
+ - target: {fileID: 4099831927643554877, guid: e45f5fd66e7512444a9a27161cf51b7f, type: 3}
+ propertyPath: options.Array.data[0].prop
+ value: 0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 4099831927643554877, guid: e45f5fd66e7512444a9a27161cf51b7f, type: 3}
+ propertyPath: options.Array.data[1].prop
+ value: 1.0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4099831927643554877, guid: e45f5fd66e7512444a9a27161cf51b7f, type: 3}
+ propertyPath: options.Array.data[2].prop
+ value: 3.0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4099831927643554877, guid: e45f5fd66e7512444a9a27161cf51b7f, type: 3}
+ propertyPath: options.Array.data[0].label
+ value: setting_textSpeed_slow
+ objectReference: {fileID: 0}
+ - target: {fileID: 4099831927643554877, guid: e45f5fd66e7512444a9a27161cf51b7f, type: 3}
+ propertyPath: options.Array.data[1].label
+ value: setting_textSpeed_default
+ objectReference: {fileID: 0}
+ - target: {fileID: 4099831927643554877, guid: e45f5fd66e7512444a9a27161cf51b7f, type: 3}
+ propertyPath: options.Array.data[2].label
+ value: setting_textSpeed_fast
+ objectReference: {fileID: 0}
+ - target: {fileID: 5006247552854995519, guid: e45f5fd66e7512444a9a27161cf51b7f, type: 3}
+ propertyPath: m_text
+ value: "\u6587\u5B57\u901F\u5EA6"
+ objectReference: {fileID: 0}
+ - target: {fileID: 5654956763089875896, guid: e45f5fd66e7512444a9a27161cf51b7f, type: 3}
+ propertyPath: m_Name
+ value: Text Speed
+ objectReference: {fileID: 0}
+ - target: {fileID: 5824597425683931436, guid: e45f5fd66e7512444a9a27161cf51b7f, type: 3}
+ propertyPath: m_Pivot.x
+ value: 0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 5824597425683931436, guid: e45f5fd66e7512444a9a27161cf51b7f, type: 3}
+ propertyPath: m_Pivot.y
+ value: 0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 5824597425683931436, guid: e45f5fd66e7512444a9a27161cf51b7f, type: 3}
+ propertyPath: m_AnchorMax.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 5824597425683931436, guid: e45f5fd66e7512444a9a27161cf51b7f, type: 3}
+ propertyPath: m_AnchorMax.y
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 5824597425683931436, guid: e45f5fd66e7512444a9a27161cf51b7f, type: 3}
+ propertyPath: m_AnchorMin.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 5824597425683931436, guid: e45f5fd66e7512444a9a27161cf51b7f, type: 3}
+ propertyPath: m_AnchorMin.y
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 5824597425683931436, guid: e45f5fd66e7512444a9a27161cf51b7f, type: 3}
+ propertyPath: m_SizeDelta.x
+ value: 200
+ objectReference: {fileID: 0}
+ - target: {fileID: 5824597425683931436, guid: e45f5fd66e7512444a9a27161cf51b7f, type: 3}
+ propertyPath: m_SizeDelta.y
+ value: 50
+ objectReference: {fileID: 0}
+ - target: {fileID: 5824597425683931436, guid: e45f5fd66e7512444a9a27161cf51b7f, type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 5824597425683931436, guid: e45f5fd66e7512444a9a27161cf51b7f, type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 5824597425683931436, guid: e45f5fd66e7512444a9a27161cf51b7f, type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 5824597425683931436, guid: e45f5fd66e7512444a9a27161cf51b7f, type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 5824597425683931436, guid: e45f5fd66e7512444a9a27161cf51b7f, type: 3}
+ propertyPath: m_LocalRotation.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 5824597425683931436, guid: e45f5fd66e7512444a9a27161cf51b7f, type: 3}
+ propertyPath: m_LocalRotation.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 5824597425683931436, guid: e45f5fd66e7512444a9a27161cf51b7f, type: 3}
+ propertyPath: m_LocalRotation.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 5824597425683931436, guid: e45f5fd66e7512444a9a27161cf51b7f, type: 3}
+ propertyPath: m_AnchoredPosition.x
+ value: 100
+ objectReference: {fileID: 0}
+ - target: {fileID: 5824597425683931436, guid: e45f5fd66e7512444a9a27161cf51b7f, type: 3}
+ propertyPath: m_AnchoredPosition.y
+ value: -230
+ objectReference: {fileID: 0}
+ - target: {fileID: 5824597425683931436, guid: e45f5fd66e7512444a9a27161cf51b7f, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 5824597425683931436, guid: e45f5fd66e7512444a9a27161cf51b7f, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 5824597425683931436, guid: e45f5fd66e7512444a9a27161cf51b7f, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_RemovedGameObjects: []
+ m_AddedGameObjects: []
+ m_AddedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: e45f5fd66e7512444a9a27161cf51b7f, type: 3}
+--- !u!224 &309628997 stripped
+RectTransform:
+ m_CorrespondingSourceObject: {fileID: 5824597425683931436, guid: e45f5fd66e7512444a9a27161cf51b7f, type: 3}
+ m_PrefabInstance: {fileID: 309628996}
+ m_PrefabAsset: {fileID: 0}
--- !u!1 &314243161
GameObject:
m_ObjectHideFlags: 0
@@ -6905,6 +7059,7 @@ RectTransform:
- {fileID: 1865858738}
- {fileID: 2395518499295578437}
- {fileID: 1518372517}
+ - {fileID: 309628997}
m_Father: {fileID: 1937938010}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
@@ -7796,30 +7951,6 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 243936684424215245}
m_Modifications:
- - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: _sID
- value: 121bb6da-9055-40a5-ae33-05be2ec09f54
- objectReference: {fileID: 0}
- - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: graphManager
- value:
- objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
- - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: _sID
- value: 3c0ead6f-afd4-41bf-968d-0d36f758e232
- objectReference: {fileID: 0}
- - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: graphManager
- value:
- objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
- - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: _sID
- value: 6b671834-73b4-403d-94d3-0726554589ee
- objectReference: {fileID: 0}
- - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: graphManager
- value:
- objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
- target: {fileID: 23699057384935269, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3}
propertyPath: m_Pivot.x
value: 0.5
@@ -8004,6 +8135,30 @@ PrefabInstance:
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
+ - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: _sID
+ value: 121bb6da-9055-40a5-ae33-05be2ec09f54
+ objectReference: {fileID: 0}
+ - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: graphManager
+ value:
+ objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
+ - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: _sID
+ value: 3c0ead6f-afd4-41bf-968d-0d36f758e232
+ objectReference: {fileID: 0}
+ - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: graphManager
+ value:
+ objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
+ - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: _sID
+ value: 6b671834-73b4-403d-94d3-0726554589ee
+ objectReference: {fileID: 0}
+ - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: graphManager
+ value:
+ objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
@@ -8120,30 +8275,6 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 243936684424215245}
m_Modifications:
- - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: _sID
- value: 67e03198-f3fa-40e3-88ca-042210787447
- objectReference: {fileID: 0}
- - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: graphManager
- value:
- objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
- - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: _sID
- value: 39cf0bb1-4276-40ca-8336-c91048fb4ba1
- objectReference: {fileID: 0}
- - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: graphManager
- value:
- objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
- - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: _sID
- value: 27840e3a-f0c8-4ee8-a048-4e57774c3376
- objectReference: {fileID: 0}
- - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: graphManager
- value:
- objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
- target: {fileID: 23699057384935269, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3}
propertyPath: m_Pivot.x
value: 0.5
@@ -8368,6 +8499,30 @@ PrefabInstance:
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
+ - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: _sID
+ value: 67e03198-f3fa-40e3-88ca-042210787447
+ objectReference: {fileID: 0}
+ - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: graphManager
+ value:
+ objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
+ - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: _sID
+ value: 39cf0bb1-4276-40ca-8336-c91048fb4ba1
+ objectReference: {fileID: 0}
+ - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: graphManager
+ value:
+ objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
+ - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: _sID
+ value: 27840e3a-f0c8-4ee8-a048-4e57774c3376
+ objectReference: {fileID: 0}
+ - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: graphManager
+ value:
+ objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects:
@@ -8494,30 +8649,6 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 243936684424215245}
m_Modifications:
- - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: _sID
- value: 67e03198-f3fa-40e3-88ca-042210787447
- objectReference: {fileID: 0}
- - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: graphManager
- value:
- objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
- - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: _sID
- value: 39cf0bb1-4276-40ca-8336-c91048fb4ba1
- objectReference: {fileID: 0}
- - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: graphManager
- value:
- objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
- - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: _sID
- value: 27840e3a-f0c8-4ee8-a048-4e57774c3376
- objectReference: {fileID: 0}
- - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: graphManager
- value:
- objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
- target: {fileID: 23699057384935269, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3}
propertyPath: m_Pivot.x
value: 0.5
@@ -8742,6 +8873,30 @@ PrefabInstance:
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
+ - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: _sID
+ value: 67e03198-f3fa-40e3-88ca-042210787447
+ objectReference: {fileID: 0}
+ - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: graphManager
+ value:
+ objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
+ - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: _sID
+ value: 39cf0bb1-4276-40ca-8336-c91048fb4ba1
+ objectReference: {fileID: 0}
+ - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: graphManager
+ value:
+ objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
+ - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: _sID
+ value: 27840e3a-f0c8-4ee8-a048-4e57774c3376
+ objectReference: {fileID: 0}
+ - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: graphManager
+ value:
+ objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects:
@@ -9506,30 +9661,6 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 243936684424215245}
m_Modifications:
- - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: _sID
- value: 67e03198-f3fa-40e3-88ca-042210787447
- objectReference: {fileID: 0}
- - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: graphManager
- value:
- objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
- - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: _sID
- value: 39cf0bb1-4276-40ca-8336-c91048fb4ba1
- objectReference: {fileID: 0}
- - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: graphManager
- value:
- objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
- - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: _sID
- value: 27840e3a-f0c8-4ee8-a048-4e57774c3376
- objectReference: {fileID: 0}
- - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: graphManager
- value:
- objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
- target: {fileID: 23699057384935269, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3}
propertyPath: m_Pivot.x
value: 0.5
@@ -9754,6 +9885,30 @@ PrefabInstance:
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
+ - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: _sID
+ value: 67e03198-f3fa-40e3-88ca-042210787447
+ objectReference: {fileID: 0}
+ - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: graphManager
+ value:
+ objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
+ - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: _sID
+ value: 39cf0bb1-4276-40ca-8336-c91048fb4ba1
+ objectReference: {fileID: 0}
+ - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: graphManager
+ value:
+ objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
+ - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: _sID
+ value: 27840e3a-f0c8-4ee8-a048-4e57774c3376
+ objectReference: {fileID: 0}
+ - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: graphManager
+ value:
+ objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects:
@@ -10115,30 +10270,6 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 243936684424215245}
m_Modifications:
- - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: _sID
- value: 67e03198-f3fa-40e3-88ca-042210787447
- objectReference: {fileID: 0}
- - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: graphManager
- value:
- objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
- - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: _sID
- value: 39cf0bb1-4276-40ca-8336-c91048fb4ba1
- objectReference: {fileID: 0}
- - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: graphManager
- value:
- objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
- - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: _sID
- value: 27840e3a-f0c8-4ee8-a048-4e57774c3376
- objectReference: {fileID: 0}
- - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: graphManager
- value:
- objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
- target: {fileID: 23699057384935269, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3}
propertyPath: m_Pivot.x
value: 0.5
@@ -10363,6 +10494,30 @@ PrefabInstance:
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
+ - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: _sID
+ value: 67e03198-f3fa-40e3-88ca-042210787447
+ objectReference: {fileID: 0}
+ - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: graphManager
+ value:
+ objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
+ - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: _sID
+ value: 39cf0bb1-4276-40ca-8336-c91048fb4ba1
+ objectReference: {fileID: 0}
+ - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: graphManager
+ value:
+ objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
+ - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: _sID
+ value: 27840e3a-f0c8-4ee8-a048-4e57774c3376
+ objectReference: {fileID: 0}
+ - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: graphManager
+ value:
+ objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects:
@@ -10653,30 +10808,6 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 243936684424215245}
m_Modifications:
- - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: _sID
- value: 65545b51-845c-4df4-8f5c-90c1f04cbe23
- objectReference: {fileID: 0}
- - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: graphManager
- value:
- objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
- - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: _sID
- value: 3336344b-f73d-481c-bd5a-548f8a4bead4
- objectReference: {fileID: 0}
- - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: graphManager
- value:
- objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
- - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: _sID
- value: ddd9082f-516c-4e2f-bd55-78c29857f972
- objectReference: {fileID: 0}
- - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: graphManager
- value:
- objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
- target: {fileID: 23699057384935269, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3}
propertyPath: m_Pivot.x
value: 0.5
@@ -10893,6 +11024,30 @@ PrefabInstance:
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
+ - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: _sID
+ value: 65545b51-845c-4df4-8f5c-90c1f04cbe23
+ objectReference: {fileID: 0}
+ - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: graphManager
+ value:
+ objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
+ - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: _sID
+ value: 3336344b-f73d-481c-bd5a-548f8a4bead4
+ objectReference: {fileID: 0}
+ - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: graphManager
+ value:
+ objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
+ - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: _sID
+ value: ddd9082f-516c-4e2f-bd55-78c29857f972
+ objectReference: {fileID: 0}
+ - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: graphManager
+ value:
+ objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
m_RemovedComponents: []
m_RemovedGameObjects:
- {fileID: 7940112695066571942, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3}
@@ -11743,30 +11898,6 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 243936684424215245}
m_Modifications:
- - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: _sID
- value: 65545b51-845c-4df4-8f5c-90c1f04cbe23
- objectReference: {fileID: 0}
- - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: graphManager
- value:
- objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
- - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: _sID
- value: 3336344b-f73d-481c-bd5a-548f8a4bead4
- objectReference: {fileID: 0}
- - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: graphManager
- value:
- objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
- - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: _sID
- value: ddd9082f-516c-4e2f-bd55-78c29857f972
- objectReference: {fileID: 0}
- - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: graphManager
- value:
- objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
- target: {fileID: 23699057384935269, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3}
propertyPath: m_Pivot.x
value: 0.5
@@ -11983,6 +12114,30 @@ PrefabInstance:
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
+ - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: _sID
+ value: 65545b51-845c-4df4-8f5c-90c1f04cbe23
+ objectReference: {fileID: 0}
+ - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: graphManager
+ value:
+ objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
+ - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: _sID
+ value: 3336344b-f73d-481c-bd5a-548f8a4bead4
+ objectReference: {fileID: 0}
+ - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: graphManager
+ value:
+ objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
+ - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: _sID
+ value: ddd9082f-516c-4e2f-bd55-78c29857f972
+ objectReference: {fileID: 0}
+ - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: graphManager
+ value:
+ objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
m_RemovedComponents: []
m_RemovedGameObjects:
- {fileID: 7940112695066571942, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3}
@@ -12189,30 +12344,6 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 243936684424215245}
m_Modifications:
- - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: _sID
- value: 67e03198-f3fa-40e3-88ca-042210787447
- objectReference: {fileID: 0}
- - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: graphManager
- value:
- objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
- - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: _sID
- value: 39cf0bb1-4276-40ca-8336-c91048fb4ba1
- objectReference: {fileID: 0}
- - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: graphManager
- value:
- objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
- - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: _sID
- value: 27840e3a-f0c8-4ee8-a048-4e57774c3376
- objectReference: {fileID: 0}
- - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: graphManager
- value:
- objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
- target: {fileID: 23699057384935269, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3}
propertyPath: m_Pivot.x
value: 0.5
@@ -12437,6 +12568,30 @@ PrefabInstance:
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
+ - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: _sID
+ value: 67e03198-f3fa-40e3-88ca-042210787447
+ objectReference: {fileID: 0}
+ - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: graphManager
+ value:
+ objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
+ - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: _sID
+ value: 39cf0bb1-4276-40ca-8336-c91048fb4ba1
+ objectReference: {fileID: 0}
+ - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: graphManager
+ value:
+ objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
+ - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: _sID
+ value: 27840e3a-f0c8-4ee8-a048-4e57774c3376
+ objectReference: {fileID: 0}
+ - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: graphManager
+ value:
+ objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects:
@@ -13173,30 +13328,6 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 243936684424215245}
m_Modifications:
- - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: _sID
- value: 67e03198-f3fa-40e3-88ca-042210787447
- objectReference: {fileID: 0}
- - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: graphManager
- value:
- objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
- - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: _sID
- value: 39cf0bb1-4276-40ca-8336-c91048fb4ba1
- objectReference: {fileID: 0}
- - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: graphManager
- value:
- objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
- - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: _sID
- value: 27840e3a-f0c8-4ee8-a048-4e57774c3376
- objectReference: {fileID: 0}
- - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: graphManager
- value:
- objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
- target: {fileID: 23699057384935269, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3}
propertyPath: m_Pivot.x
value: 0.5
@@ -13421,6 +13552,30 @@ PrefabInstance:
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
+ - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: _sID
+ value: 67e03198-f3fa-40e3-88ca-042210787447
+ objectReference: {fileID: 0}
+ - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: graphManager
+ value:
+ objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
+ - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: _sID
+ value: 39cf0bb1-4276-40ca-8336-c91048fb4ba1
+ objectReference: {fileID: 0}
+ - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: graphManager
+ value:
+ objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
+ - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: _sID
+ value: 27840e3a-f0c8-4ee8-a048-4e57774c3376
+ objectReference: {fileID: 0}
+ - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: graphManager
+ value:
+ objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects:
@@ -17231,30 +17386,6 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 243936684424215245}
m_Modifications:
- - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: _sID
- value: 67e03198-f3fa-40e3-88ca-042210787447
- objectReference: {fileID: 0}
- - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: graphManager
- value:
- objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
- - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: _sID
- value: 39cf0bb1-4276-40ca-8336-c91048fb4ba1
- objectReference: {fileID: 0}
- - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: graphManager
- value:
- objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
- - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: _sID
- value: 27840e3a-f0c8-4ee8-a048-4e57774c3376
- objectReference: {fileID: 0}
- - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: graphManager
- value:
- objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
- target: {fileID: 23699057384935269, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3}
propertyPath: m_Pivot.x
value: 0.5
@@ -17479,6 +17610,30 @@ PrefabInstance:
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
+ - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: _sID
+ value: 67e03198-f3fa-40e3-88ca-042210787447
+ objectReference: {fileID: 0}
+ - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: graphManager
+ value:
+ objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
+ - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: _sID
+ value: 39cf0bb1-4276-40ca-8336-c91048fb4ba1
+ objectReference: {fileID: 0}
+ - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: graphManager
+ value:
+ objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
+ - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: _sID
+ value: 27840e3a-f0c8-4ee8-a048-4e57774c3376
+ objectReference: {fileID: 0}
+ - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: graphManager
+ value:
+ objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects:
@@ -17850,6 +18005,58 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 243936684424215245}
m_Modifications:
+ - target: {fileID: 301155002500816269, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3}
+ propertyPath: m_AnchorMax.x
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 301155002500816269, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3}
+ propertyPath: m_AnchorMin.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 301155002500816269, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3}
+ propertyPath: m_SizeDelta.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 301155002500816269, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3}
+ propertyPath: m_AnchoredPosition.y
+ value: 25.629997
+ objectReference: {fileID: 0}
+ - target: {fileID: 442829669951131826, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3}
+ propertyPath: _sID
+ value: 6f5c7914-f97e-4f47-806a-9794e5f5f769
+ objectReference: {fileID: 0}
+ - target: {fileID: 442829669951131826, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3}
+ propertyPath: graphManager
+ value:
+ objectReference: {fileID: 3728315362672514892}
+ - target: {fileID: 720753418213842348, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3}
+ propertyPath: _sID
+ value: e2613f65-319b-4f62-ba39-a479e7b46ba2
+ objectReference: {fileID: 0}
+ - target: {fileID: 720753418213842348, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3}
+ propertyPath: graphManager
+ value:
+ objectReference: {fileID: 3728315362672514892}
+ - target: {fileID: 2651560808168083272, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3}
+ propertyPath: m_text
+ value: "\u4EC0\u4E48\u5BFC\u81F4\u4E86\u8BB0\u5FC6\u7684Glitch\uFF1F"
+ objectReference: {fileID: 0}
+ - target: {fileID: 4396600131353777755, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3}
+ propertyPath: m_AnchoredPosition.x
+ value: -334
+ objectReference: {fileID: 0}
+ - target: {fileID: 7368283137120249392, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3}
+ propertyPath: _sID
+ value: ac121996-37d7-4305-8828-b90a712ad53e
+ objectReference: {fileID: 0}
+ - target: {fileID: 7368283137120249392, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3}
+ propertyPath: graphManager
+ value:
+ objectReference: {fileID: 3728315362672514892}
+ - target: {fileID: 7940112695066571942, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3}
+ propertyPath: m_IsActive
+ value: 1
+ objectReference: {fileID: 0}
- target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
propertyPath: _sID
value: b6eb921a-5d8b-4e9e-8ff0-21670096721c
@@ -18050,58 +18257,6 @@ PrefabInstance:
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- - target: {fileID: 301155002500816269, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3}
- propertyPath: m_AnchorMax.x
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 301155002500816269, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3}
- propertyPath: m_AnchorMin.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 301155002500816269, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3}
- propertyPath: m_SizeDelta.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 301155002500816269, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3}
- propertyPath: m_AnchoredPosition.y
- value: 25.629997
- objectReference: {fileID: 0}
- - target: {fileID: 442829669951131826, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3}
- propertyPath: _sID
- value: 6f5c7914-f97e-4f47-806a-9794e5f5f769
- objectReference: {fileID: 0}
- - target: {fileID: 442829669951131826, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3}
- propertyPath: graphManager
- value:
- objectReference: {fileID: 3728315362672514892}
- - target: {fileID: 720753418213842348, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3}
- propertyPath: _sID
- value: e2613f65-319b-4f62-ba39-a479e7b46ba2
- objectReference: {fileID: 0}
- - target: {fileID: 720753418213842348, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3}
- propertyPath: graphManager
- value:
- objectReference: {fileID: 3728315362672514892}
- - target: {fileID: 2651560808168083272, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3}
- propertyPath: m_text
- value: "\u4EC0\u4E48\u5BFC\u81F4\u4E86\u8BB0\u5FC6\u7684Glitch\uFF1F"
- objectReference: {fileID: 0}
- - target: {fileID: 4396600131353777755, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3}
- propertyPath: m_AnchoredPosition.x
- value: -334
- objectReference: {fileID: 0}
- - target: {fileID: 7368283137120249392, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3}
- propertyPath: _sID
- value: ac121996-37d7-4305-8828-b90a712ad53e
- objectReference: {fileID: 0}
- - target: {fileID: 7368283137120249392, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3}
- propertyPath: graphManager
- value:
- objectReference: {fileID: 3728315362672514892}
- - target: {fileID: 7940112695066571942, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3}
- propertyPath: m_IsActive
- value: 1
- objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects:
@@ -18536,30 +18691,6 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 243936684424215245}
m_Modifications:
- - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: _sID
- value: 65545b51-845c-4df4-8f5c-90c1f04cbe23
- objectReference: {fileID: 0}
- - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: graphManager
- value:
- objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
- - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: _sID
- value: 3336344b-f73d-481c-bd5a-548f8a4bead4
- objectReference: {fileID: 0}
- - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: graphManager
- value:
- objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
- - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: _sID
- value: ddd9082f-516c-4e2f-bd55-78c29857f972
- objectReference: {fileID: 0}
- - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: graphManager
- value:
- objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
- target: {fileID: 23699057384935269, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3}
propertyPath: m_Pivot.x
value: 0.5
@@ -18780,6 +18911,30 @@ PrefabInstance:
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
+ - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: _sID
+ value: 65545b51-845c-4df4-8f5c-90c1f04cbe23
+ objectReference: {fileID: 0}
+ - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: graphManager
+ value:
+ objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
+ - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: _sID
+ value: 3336344b-f73d-481c-bd5a-548f8a4bead4
+ objectReference: {fileID: 0}
+ - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: graphManager
+ value:
+ objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
+ - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: _sID
+ value: ddd9082f-516c-4e2f-bd55-78c29857f972
+ objectReference: {fileID: 0}
+ - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: graphManager
+ value:
+ objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
m_RemovedComponents: []
m_RemovedGameObjects:
- {fileID: 7940112695066571942, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3}
@@ -19380,30 +19535,6 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 243936684424215245}
m_Modifications:
- - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: _sID
- value: 67e03198-f3fa-40e3-88ca-042210787447
- objectReference: {fileID: 0}
- - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: graphManager
- value:
- objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
- - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: _sID
- value: 39cf0bb1-4276-40ca-8336-c91048fb4ba1
- objectReference: {fileID: 0}
- - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: graphManager
- value:
- objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
- - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: _sID
- value: 27840e3a-f0c8-4ee8-a048-4e57774c3376
- objectReference: {fileID: 0}
- - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: graphManager
- value:
- objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
- target: {fileID: 23699057384935269, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3}
propertyPath: m_Pivot.x
value: 0.5
@@ -19628,6 +19759,30 @@ PrefabInstance:
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
+ - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: _sID
+ value: 67e03198-f3fa-40e3-88ca-042210787447
+ objectReference: {fileID: 0}
+ - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: graphManager
+ value:
+ objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
+ - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: _sID
+ value: 39cf0bb1-4276-40ca-8336-c91048fb4ba1
+ objectReference: {fileID: 0}
+ - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: graphManager
+ value:
+ objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
+ - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: _sID
+ value: 27840e3a-f0c8-4ee8-a048-4e57774c3376
+ objectReference: {fileID: 0}
+ - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: graphManager
+ value:
+ objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects:
@@ -20128,30 +20283,6 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 243936684424215245}
m_Modifications:
- - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: _sID
- value: 67e03198-f3fa-40e3-88ca-042210787447
- objectReference: {fileID: 0}
- - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: graphManager
- value:
- objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
- - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: _sID
- value: 39cf0bb1-4276-40ca-8336-c91048fb4ba1
- objectReference: {fileID: 0}
- - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: graphManager
- value:
- objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
- - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: _sID
- value: 27840e3a-f0c8-4ee8-a048-4e57774c3376
- objectReference: {fileID: 0}
- - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: graphManager
- value:
- objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
- target: {fileID: 23699057384935269, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3}
propertyPath: m_Pivot.x
value: 0.5
@@ -20360,6 +20491,30 @@ PrefabInstance:
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
+ - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: _sID
+ value: 67e03198-f3fa-40e3-88ca-042210787447
+ objectReference: {fileID: 0}
+ - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: graphManager
+ value:
+ objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
+ - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: _sID
+ value: 39cf0bb1-4276-40ca-8336-c91048fb4ba1
+ objectReference: {fileID: 0}
+ - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: graphManager
+ value:
+ objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
+ - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: _sID
+ value: 27840e3a-f0c8-4ee8-a048-4e57774c3376
+ objectReference: {fileID: 0}
+ - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: graphManager
+ value:
+ objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects:
@@ -21009,6 +21164,14 @@ PrefabInstance:
propertyPath: m_SizeDelta.x
value: 180
objectReference: {fileID: 0}
+ - target: {fileID: 1032211294988139403, guid: e45f5fd66e7512444a9a27161cf51b7f, type: 3}
+ propertyPath: m_StringReference.m_TableEntryReference.m_KeyId
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 1032211294988139403, guid: e45f5fd66e7512444a9a27161cf51b7f, type: 3}
+ propertyPath: m_StringReference.m_TableReference.m_TableCollectionName
+ value: GUID:994c69bf4b2403043bc9562f2d24ee56
+ objectReference: {fileID: 0}
- target: {fileID: 4099831927643554877, guid: e45f5fd66e7512444a9a27161cf51b7f, type: 3}
propertyPath: options.Array.size
value: 2
@@ -21099,7 +21262,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 5824597425683931436, guid: e45f5fd66e7512444a9a27161cf51b7f, type: 3}
propertyPath: m_AnchoredPosition.y
- value: -190
+ value: -150
objectReference: {fileID: 0}
- target: {fileID: 5824597425683931436, guid: e45f5fd66e7512444a9a27161cf51b7f, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
@@ -21257,30 +21420,6 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 243936684424215245}
m_Modifications:
- - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: _sID
- value: 67e03198-f3fa-40e3-88ca-042210787447
- objectReference: {fileID: 0}
- - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: graphManager
- value:
- objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
- - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: _sID
- value: 39cf0bb1-4276-40ca-8336-c91048fb4ba1
- objectReference: {fileID: 0}
- - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: graphManager
- value:
- objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
- - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: _sID
- value: 27840e3a-f0c8-4ee8-a048-4e57774c3376
- objectReference: {fileID: 0}
- - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: graphManager
- value:
- objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
- target: {fileID: 23699057384935269, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3}
propertyPath: m_Pivot.x
value: 0.5
@@ -21505,6 +21644,30 @@ PrefabInstance:
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
+ - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: _sID
+ value: 67e03198-f3fa-40e3-88ca-042210787447
+ objectReference: {fileID: 0}
+ - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: graphManager
+ value:
+ objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
+ - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: _sID
+ value: 39cf0bb1-4276-40ca-8336-c91048fb4ba1
+ objectReference: {fileID: 0}
+ - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: graphManager
+ value:
+ objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
+ - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: _sID
+ value: 27840e3a-f0c8-4ee8-a048-4e57774c3376
+ objectReference: {fileID: 0}
+ - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: graphManager
+ value:
+ objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects:
@@ -21811,30 +21974,6 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 243936684424215245}
m_Modifications:
- - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: _sID
- value: 67e03198-f3fa-40e3-88ca-042210787447
- objectReference: {fileID: 0}
- - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: graphManager
- value:
- objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
- - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: _sID
- value: 39cf0bb1-4276-40ca-8336-c91048fb4ba1
- objectReference: {fileID: 0}
- - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: graphManager
- value:
- objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
- - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: _sID
- value: 27840e3a-f0c8-4ee8-a048-4e57774c3376
- objectReference: {fileID: 0}
- - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: graphManager
- value:
- objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
- target: {fileID: 23699057384935269, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3}
propertyPath: m_Pivot.x
value: 0.5
@@ -22059,6 +22198,30 @@ PrefabInstance:
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
+ - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: _sID
+ value: 67e03198-f3fa-40e3-88ca-042210787447
+ objectReference: {fileID: 0}
+ - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: graphManager
+ value:
+ objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
+ - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: _sID
+ value: 39cf0bb1-4276-40ca-8336-c91048fb4ba1
+ objectReference: {fileID: 0}
+ - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: graphManager
+ value:
+ objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
+ - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: _sID
+ value: 27840e3a-f0c8-4ee8-a048-4e57774c3376
+ objectReference: {fileID: 0}
+ - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: graphManager
+ value:
+ objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects:
@@ -25314,9 +25477,8 @@ MonoBehaviour:
yarnProject: {fileID: 0}
_variableStorage: {fileID: 314243163}
dialogueViews:
- - {fileID: 381795663}
- {fileID: 1829169897}
- - {fileID: 0}
+ - {fileID: 381795663}
startNode: Start
startAutomatically: 0
runSelectedOptionAsLine: 0
@@ -26244,30 +26406,6 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 243936684424215245}
m_Modifications:
- - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: _sID
- value: 67e03198-f3fa-40e3-88ca-042210787447
- objectReference: {fileID: 0}
- - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: graphManager
- value:
- objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
- - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: _sID
- value: 39cf0bb1-4276-40ca-8336-c91048fb4ba1
- objectReference: {fileID: 0}
- - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: graphManager
- value:
- objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
- - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: _sID
- value: 27840e3a-f0c8-4ee8-a048-4e57774c3376
- objectReference: {fileID: 0}
- - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: graphManager
- value:
- objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
- target: {fileID: 23699057384935269, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3}
propertyPath: m_Pivot.x
value: 0.5
@@ -26492,6 +26630,30 @@ PrefabInstance:
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
+ - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: _sID
+ value: 67e03198-f3fa-40e3-88ca-042210787447
+ objectReference: {fileID: 0}
+ - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: graphManager
+ value:
+ objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
+ - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: _sID
+ value: 39cf0bb1-4276-40ca-8336-c91048fb4ba1
+ objectReference: {fileID: 0}
+ - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: graphManager
+ value:
+ objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
+ - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: _sID
+ value: 27840e3a-f0c8-4ee8-a048-4e57774c3376
+ objectReference: {fileID: 0}
+ - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: graphManager
+ value:
+ objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects:
@@ -26596,30 +26758,6 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 243936684424215245}
m_Modifications:
- - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: _sID
- value: 67e03198-f3fa-40e3-88ca-042210787447
- objectReference: {fileID: 0}
- - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: graphManager
- value:
- objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
- - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: _sID
- value: 39cf0bb1-4276-40ca-8336-c91048fb4ba1
- objectReference: {fileID: 0}
- - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: graphManager
- value:
- objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
- - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: _sID
- value: 27840e3a-f0c8-4ee8-a048-4e57774c3376
- objectReference: {fileID: 0}
- - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: graphManager
- value:
- objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
- target: {fileID: 23699057384935269, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3}
propertyPath: m_Pivot.x
value: 0.5
@@ -26844,6 +26982,30 @@ PrefabInstance:
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
+ - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: _sID
+ value: 67e03198-f3fa-40e3-88ca-042210787447
+ objectReference: {fileID: 0}
+ - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: graphManager
+ value:
+ objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
+ - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: _sID
+ value: 39cf0bb1-4276-40ca-8336-c91048fb4ba1
+ objectReference: {fileID: 0}
+ - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: graphManager
+ value:
+ objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
+ - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: _sID
+ value: 27840e3a-f0c8-4ee8-a048-4e57774c3376
+ objectReference: {fileID: 0}
+ - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: graphManager
+ value:
+ objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects:
@@ -27332,30 +27494,6 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 243936684424215245}
m_Modifications:
- - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: _sID
- value: 65545b51-845c-4df4-8f5c-90c1f04cbe23
- objectReference: {fileID: 0}
- - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: graphManager
- value:
- objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
- - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: _sID
- value: 3336344b-f73d-481c-bd5a-548f8a4bead4
- objectReference: {fileID: 0}
- - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: graphManager
- value:
- objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
- - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: _sID
- value: ddd9082f-516c-4e2f-bd55-78c29857f972
- objectReference: {fileID: 0}
- - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: graphManager
- value:
- objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
- target: {fileID: 23699057384935269, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3}
propertyPath: m_Pivot.x
value: 0.5
@@ -27576,6 +27714,30 @@ PrefabInstance:
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
+ - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: _sID
+ value: 65545b51-845c-4df4-8f5c-90c1f04cbe23
+ objectReference: {fileID: 0}
+ - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: graphManager
+ value:
+ objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
+ - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: _sID
+ value: 3336344b-f73d-481c-bd5a-548f8a4bead4
+ objectReference: {fileID: 0}
+ - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: graphManager
+ value:
+ objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
+ - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: _sID
+ value: ddd9082f-516c-4e2f-bd55-78c29857f972
+ objectReference: {fileID: 0}
+ - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: graphManager
+ value:
+ objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
m_RemovedComponents: []
m_RemovedGameObjects:
- {fileID: 7940112695066571942, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3}
@@ -44465,7 +44627,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 305064715333190683, guid: 2c1bcc3613815c74fb44cc1db21f524e, type: 3}
propertyPath: m_AnchoredPosition.y
- value: -110
+ value: -70
objectReference: {fileID: 0}
- target: {fileID: 305064715333190683, guid: 2c1bcc3613815c74fb44cc1db21f524e, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
@@ -44499,6 +44661,14 @@ PrefabInstance:
propertyPath: m_SizeDelta.x
value: 18.68
objectReference: {fileID: 0}
+ - target: {fileID: 6550843177228825060, guid: 2c1bcc3613815c74fb44cc1db21f524e, type: 3}
+ propertyPath: m_StringReference.m_TableEntryReference.m_KeyId
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6550843177228825060, guid: 2c1bcc3613815c74fb44cc1db21f524e, type: 3}
+ propertyPath: m_StringReference.m_TableReference.m_TableCollectionName
+ value: GUID:994c69bf4b2403043bc9562f2d24ee56
+ objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
diff --git a/Assets/ScriptableObjects/TextAnimaStyle.meta b/Assets/ScriptableObjects/TextAnimaStyle.meta
deleted file mode 100644
index 2199192b0..000000000
--- a/Assets/ScriptableObjects/TextAnimaStyle.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 9e9d31a584a97f447b431fb1cebb3e85
-folderAsset: yes
-DefaultImporter:
- externalObjects: {}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/ScriptableObjects/TextAnimaStyle/Bubble Text Style.asset b/Assets/ScriptableObjects/TextAnimaStyle/Bubble Text Style.asset
deleted file mode 100644
index 6d392d54b..000000000
--- a/Assets/ScriptableObjects/TextAnimaStyle/Bubble Text Style.asset
+++ /dev/null
@@ -1,24 +0,0 @@
-%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: 6508e9e28418d5e429ba26325d369d2a, type: 3}
- m_Name: Bubble Text Style
- m_EditorClassIdentifier:
- enSpeed:
- normalCharSpeed: 0
- longCharSpeed: 0
- middleCharSpeed: 0
- cnSpeed:
- normalCharSpeed: 0
- longCharSpeed: 0
- middleCharSpeed: 0
- enCharSpace: 0
- cnCharSpace: 0
diff --git a/Assets/ScriptableObjects/TextAnimaStyle/Bubble Text Style.asset.meta b/Assets/ScriptableObjects/TextAnimaStyle/Bubble Text Style.asset.meta
deleted file mode 100644
index 559ae5b16..000000000
--- a/Assets/ScriptableObjects/TextAnimaStyle/Bubble Text Style.asset.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: c5db4e4014d7407479058bb76a3c306d
-NativeFormatImporter:
- externalObjects: {}
- mainObjectFileID: 11400000
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/ScriptableObjects/TextAnimaStyle/Screen Text Style.asset b/Assets/ScriptableObjects/TextAnimaStyle/Screen Text Style.asset
deleted file mode 100644
index c66e50961..000000000
--- a/Assets/ScriptableObjects/TextAnimaStyle/Screen Text Style.asset
+++ /dev/null
@@ -1,24 +0,0 @@
-%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: 6508e9e28418d5e429ba26325d369d2a, type: 3}
- m_Name: Screen Text Style
- m_EditorClassIdentifier:
- enSpeed:
- normalCharSpeed: 0
- longCharSpeed: 0
- middleCharSpeed: 0
- cnSpeed:
- normalCharSpeed: 0
- longCharSpeed: 0
- middleCharSpeed: 0
- enCharSpace: 0
- cnCharSpace: 0
diff --git a/Assets/ScriptableObjects/TextAnimaStyle/Screen Text Style.asset.meta b/Assets/ScriptableObjects/TextAnimaStyle/Screen Text Style.asset.meta
deleted file mode 100644
index 2410339cf..000000000
--- a/Assets/ScriptableObjects/TextAnimaStyle/Screen Text Style.asset.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 9d6434b6274f58f4e9911355e9e2bb79
-NativeFormatImporter:
- externalObjects: {}
- mainObjectFileID: 11400000
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/Scripts/Dialog System/LineRunner.cs b/Assets/Scripts/Dialog System/LineRunner.cs
index 3398de364..1a104e171 100644
--- a/Assets/Scripts/Dialog System/LineRunner.cs
+++ b/Assets/Scripts/Dialog System/LineRunner.cs
@@ -1,6 +1,7 @@
using System;
using System.Collections.Generic;
using System.Linq;
+using AibisDream.Framework;
using AibisDream.Utility;
using UnityEngine;
using Yarn.Unity;
@@ -18,17 +19,11 @@ namespace AibisDream
public override void RunLine(LocalizedLine dialogueLine, Action onDialogueLineFinished)
{
LineSyncToken lineSyncEvent;
- if (lineViewTypes.Contains(dialogueLine.GetCharacterVo().dialogViewType))
- {
- // 手动推进视图
- lineSyncEvent = new LineSyncToken(dialogueLine, onDialogueLineFinished);
- bubbleGroup.RunLine(lineSyncEvent);
- }
- else
+ if (dialogueLine.GetCharacterVo().dialogViewType == DialogViewType.Screen)
{
// 自动推进视图
- lineSyncEvent = new LineSyncToken(dialogueLine, onDialogueLineFinished, true);
- if (_screenViewDict.TryGetValue(dialogueLine.GetCharacterVo().dialogViewType, out var view))
+ lineSyncEvent = LineSyncToken.CreateAuto(dialogueLine, onDialogueLineFinished);
+ if (_screenViewDict.TryGetValue(DialogViewType.Screen, out var view))
{
view.RunLine(lineSyncEvent);
}
@@ -37,8 +32,26 @@ namespace AibisDream
Debug.LogWarning($"未注册的视图类型: {dialogueLine.GetCharacterVo().dialogViewType}");
}
}
-
- // 最后交给推进处理
+ else if (dialogueLine.GetCharacterVo().dialogViewType == DialogViewType.Task)
+ {
+ lineSyncEvent = LineSyncToken.CreateImmediate(dialogueLine, onDialogueLineFinished);
+ if (_screenViewDict.TryGetValue(DialogViewType.Task, out var view))
+ {
+ view.RunLine(lineSyncEvent);
+ }
+ else
+ {
+ Debug.LogWarning($"未注册的视图类型: {dialogueLine.GetCharacterVo().dialogViewType}");
+ }
+ }
+ else
+ {
+ // 手动推进视图
+ lineSyncEvent = LineSyncToken.CreateDefault(dialogueLine, onDialogueLineFinished);
+ bubbleGroup.RunLine(lineSyncEvent);
+ }
+
+ // 最后交给推进处理
advanceInput.RunLine(lineSyncEvent);
}
diff --git a/Assets/Scripts/Dialog System/LineSyncToken.cs b/Assets/Scripts/Dialog System/LineSyncToken.cs
index fb526e97f..64808223d 100644
--- a/Assets/Scripts/Dialog System/LineSyncToken.cs
+++ b/Assets/Scripts/Dialog System/LineSyncToken.cs
@@ -1,6 +1,8 @@
using System;
+using System.Text.RegularExpressions;
using System.Threading;
using System.Threading.Tasks;
+using AibisDream.Framework;
using AibisDream.Kit;
using AibisDream.Utility;
using UnityEngine;
@@ -20,19 +22,27 @@ namespace AibisDream
public event Action SkipTextAnima;
public event Action OnAdvance;
- public LineSyncToken(LocalizedLine lineInfo, Action nextStep, bool isAutoSkip = false)
+ public static LineSyncToken CreateAuto(LocalizedLine lineInfo, Action nextStep)
+ {
+ return new LineSyncToken(lineInfo, nextStep, new AutoNextTextShown());
+ }
+
+ public static LineSyncToken CreateImmediate(LocalizedLine lineInfo, Action nextStep)
+ {
+ return new LineSyncToken(lineInfo, nextStep, new ImmediateTextShown());
+ }
+
+ public static LineSyncToken CreateDefault(LocalizedLine lineInfo, Action nextStep)
+ {
+ return new LineSyncToken(lineInfo, nextStep, new DefaultTextShown());
+ }
+
+ public LineSyncToken(LocalizedLine lineInfo, Action nextStep, ITextShown textShown)
{
this.lineInfo = LineInfo.Generate(lineInfo);
_nextStep = nextStep;
state = LineSyncState.PlayText;
- if (this.lineInfo.isAutoSkip || isAutoSkip)
- {
- _textShown = new AutoNextTextShown();
- }
- else
- {
- _textShown = new DefaultTextShown();
- }
+ _textShown = textShown;
}
public void TrySkip()
@@ -75,6 +85,7 @@ namespace AibisDream
private void Advance()
{
+ EnumEventSystem.Global.Send(DialogEventEnum.LineEnd);
OnAdvance?.Invoke();
OnAdvance = null;
_nextStep?.Invoke();
@@ -86,12 +97,24 @@ namespace AibisDream
_nextStep = null;
SkipTextAnima = null;
}
-
+
public async void TextShown()
{
AdvanceDelayToken = new CancellationTokenSource();
+ EnumEventSystem.Global.Send(DialogEventEnum.LineShown);
await _textShown.OnTextShown(this);
}
+
+ public void TextStart()
+ {
+ if (state != LineSyncState.Default)
+ {
+ Debug.LogWarning($"line{lineInfo.lineId} 状态为{state}, 不能开始文本");
+ return;
+ }
+ state = LineSyncState.PlayText;
+ EnumEventSystem.Global.Send(DialogEventEnum.LineStart, lineInfo);
+ }
}
public struct LineInfo
@@ -100,6 +123,7 @@ namespace AibisDream
public string lineText;
public CharacterVo character;
public bool isAutoSkip;
+ public bool isOption;
public static LineInfo Generate(LocalizedLine dialogueLine)
{
@@ -108,10 +132,18 @@ namespace AibisDream
lineId = dialogueLine.TextID,
lineText = dialogueLine.TextWithoutCharacterName.Text,
character = dialogueLine.GetCharacterVo(),
- isAutoSkip = dialogueLine.IsAutoSkipLine()
+ isAutoSkip = dialogueLine.IsAutoSkipLine(),
+ isOption = false
};
}
+ public string GetRecordLine()
+ {
+ const string allowedTagsPattern = @"(<|{)(?!\/?(b|i|color)(?=>|\s|=))[^(>|})]+(>|})";
+ var res = Regex.Replace(lineText, allowedTagsPattern, "");
+ return res;
+ }
+
public int CalcAutoDelayTime()
{
var delayTime = lineText.RemoveRichTextTags().Length * ConstRef.CharacterDelayTime;
@@ -152,6 +184,14 @@ namespace AibisDream
}
}
+ public class ImmediateTextShown : ITextShown
+ {
+ public async Task OnTextShown(LineSyncToken token)
+ {
+ token.state = LineSyncState.WaitForAdvance;
+ }
+ }
+
public enum LineSyncState
{
Default,
diff --git a/Assets/Scripts/Dialog System/LineView.cs b/Assets/Scripts/Dialog System/LineView.cs
deleted file mode 100644
index a4696f57c..000000000
--- a/Assets/Scripts/Dialog System/LineView.cs
+++ /dev/null
@@ -1,75 +0,0 @@
-using System;
-using AibisDream.Framework;
-using AibisDream.Utility;
-using UnityEngine;
-using Yarn.Unity;
-
-namespace AibisDream
-{
- ///
- /// 对话View，仅用于处理对话文本
- ///
- public class LineView : DialogueViewBase
- {
- // public override void RunLine(LocalizedLine dialogueLine, Action onDialogueLineFinished)
- // {
- // string lineId = dialogueLine.TextID;
- // string shortText = dialogueLine.TextWithoutCharacterName.Text.Length > 30
- // ? dialogueLine.TextWithoutCharacterName.Text.Substring(0, 30) + "..."
- // : dialogueLine.TextWithoutCharacterName.Text;
- //
- // Debug.Log($"[对话流程] [{lineId}] ===== 开始处理 =====");
- // Debug.Log($"[对话流程] [{lineId}] 文本内容: {shortText}");
- //
- // EnumEventSystem.Global.Send(DialogEventEnum.LineStart, DialogText.GetLine(dialogueLine));
- //
- // HandleLineOutput(dialogueLine, NextStep);
- //
- // if (DialogController.Instance.quickRunMode)
- // {
- // Debug.Log($"[快速模式] [{lineId}] ===== 快速处理开始 =====");
- //
- // // 快速模式：直接跳过文本显示并继续
- // bool skipResult = DialogCanvasManager.Instance.TrySkipLine(true);
- // Debug.Log($"[快速模式] [{lineId}] TrySkipLine结果: {skipResult}");
- //
- // EnumEventSystem.Global.Send(DialogEventEnum.LineShown);
- // Debug.Log($"[快速模式] [{lineId}] LineShown事件已发送");
- //
- // DialogCanvasManager.Instance.NextStep();
- // Debug.Log($"[快速模式] [{lineId}] NextStep已调用");
- // Debug.Log($"[快速模式] [{lineId}] ===== 快速处理完成 =====");
- // }
- // else
- // {
- // Debug.Log($"[正常模式] [{lineId}] 等待用户交互");
- // }
- //
- // Debug.Log($"[对话流程] [{lineId}] ===== 处理完成 =====");
- // return;
- //
- // void NextStep()
- // {
- // EnumEventSystem.Global.Send(DialogEventEnum.LineEnd);
- // onDialogueLineFinished();
- // }
- // }
- //
- // private void HandleLineOutput(LocalizedLine dialogueLine, Action onDialogueLineFinished)
- // {
- // string lineId = dialogueLine.TextID;
- // Debug.Log($"[文本显示] [{lineId}] 开始显示文本");
- // DialogCanvasManager.Instance.ShowLine(dialogueLine.TextWithoutCharacterName.Text,
- // dialogueLine.GetCharacterVo(), onDialogueLineFinished, dialogueLine.TextID,
- // dialogueLine.IsAutoSkipLine());
- // }
- //
- // public override void RunOptions(DialogueOption[] dialogueOptions, Action onOptionSelected)
- // {
- // Debug.Log($"[选项显示] ===== 显示 {dialogueOptions.Length} 个选项 =====");
- // EnumEventSystem.Global.Send(DialogEventEnum.OptionShow);
- // var options = DialogOption.GeneOptions(dialogueOptions, onOptionSelected);
- // DialogCanvasManager.Instance.ShowOptions(options);
- // }
- }
-}
\ No newline at end of file
diff --git a/Assets/Scripts/Dialog System/LineView.cs.meta b/Assets/Scripts/Dialog System/LineView.cs.meta
deleted file mode 100644
index 3d53b008a..000000000
--- a/Assets/Scripts/Dialog System/LineView.cs.meta
+++ /dev/null
@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 465bacc132ec6ce4e85f8e68354f60ad
-MonoImporter:
- externalObjects: {}
- serializedVersion: 2
- defaultReferences: []
- executionOrder: 0
- icon: {instanceID: 0}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/Scripts/FixSystemNew/Screen System/ScreenSystem.cs b/Assets/Scripts/FixSystemNew/Screen System/ScreenSystem.cs
index 642a0f139..7ed117149 100644
--- a/Assets/Scripts/FixSystemNew/Screen System/ScreenSystem.cs
+++ b/Assets/Scripts/FixSystemNew/Screen System/ScreenSystem.cs
@@ -1,4 +1,5 @@
using System.Collections.Generic;
+using System.Globalization;
using System.Linq;
using AibisDream.Framework;
using AibisDream.Utility;
@@ -18,6 +19,8 @@ namespace AibisDream.FixSystem
[SerializeField] private TMP_Text title;
[SerializeField] private RectTransform textRoot;
[SerializeField] private TMP_Text textForEstimation;
+ [SerializeField] private int maxLineNum = 10;
+
private GameObject _textItemPrefab;
private Queue _lineQueue;
@@ -25,8 +28,6 @@ namespace AibisDream.FixSystem
public TaskScreen TaskScreen { get; private set; }
- public int maxLineNum = 10;
-
#endregion
private void Awake()
@@ -63,7 +64,7 @@ namespace AibisDream.FixSystem
{
title.text = targetTitle;
}
-
+
public void ClearTextScreen()
{
while (_lineQueue.Count > 0)
@@ -71,7 +72,7 @@ namespace AibisDream.FixSystem
var text = _lineQueue.Dequeue();
Destroy(text.gameObject);
}
-
+
ShowTitle(string.Empty);
}
@@ -81,7 +82,7 @@ namespace AibisDream.FixSystem
}
#endregion
-
+
public void RunLine(LineSyncToken token)
{
// 空格延长一点避免报错
@@ -89,23 +90,30 @@ namespace AibisDream.FixSystem
{
token.lineInfo.lineText = " ";
}
-
+
// 显示标题
ShowTitle(token.lineInfo.character.GetActorName());
// 显示文本
TypewriterCore textItemTypewriter = AddText(token.lineInfo.lineText);
+ textItemTypewriter.SetTypewriterSpeed(GetTextSpeedValue());
textItemTypewriter.onTextShowed.AddListener(() => OnTextShown(token, textItemTypewriter));
- token.state = LineSyncState.PlayText;
+ token.TextStart();
// 强制更新布局
LayoutRebuilder.ForceRebuildLayoutImmediate(textRoot);
}
+ private float GetTextSpeedValue()
+ {
+ var textSpeedStr = SettingLoader.Instance.TryRead("TextSpeed", out string textSpeed) ? textSpeed : "1";
+ return float.TryParse(textSpeedStr, NumberStyles.Float, CultureInfo.InvariantCulture, out float result) ? result : 1f;
+ }
+
private void OnTextShown(LineSyncToken syncToken, TypewriterCore typewriter)
{
typewriter.onTextShowed.RemoveAllListeners();
syncToken.TextShown();
}
-
+
private TypewriterByCharacter AddText(string newLine)
{
// 生成新文本组件
@@ -119,13 +127,13 @@ namespace AibisDream.FixSystem
Destroy(_lineQueue.Dequeue().gameObject);
}
_lineQueue.Enqueue(textItemTypewriter);
-
+
// 播放文本
textItemTypewriter.ShowText(newLine);
return textItemTypewriter;
}
-
+
private int EstimateLineNum(string text)
{
textForEstimation.text = text;
diff --git a/Assets/Scripts/FixSystemNew/Screen System/TaskScreen.cs b/Assets/Scripts/FixSystemNew/Screen System/TaskScreen.cs
index 375847214..f01476be1 100644
--- a/Assets/Scripts/FixSystemNew/Screen System/TaskScreen.cs
+++ b/Assets/Scripts/FixSystemNew/Screen System/TaskScreen.cs
@@ -52,8 +52,10 @@ namespace AibisDream
var taskItem = Instantiate(_taskItemPrefab, _taskListParent);
var task = taskItem.GetComponent();
task.text = $"\u25cf {token.lineInfo.lineText}";
-
+ token.TextStart();
+
_taskDict[token.lineInfo.lineId] = taskItem;
+ token.TextShown();
token.ForceAdvance();
LayoutRebuilder.ForceRebuildLayoutImmediate(_taskListParent.GetComponent());
}
diff --git a/Assets/Scripts/Framework/Core/EventKit.cs b/Assets/Scripts/Framework/Core/EventKit.cs
index b4b4c2638..2bc2aff94 100644
--- a/Assets/Scripts/Framework/Core/EventKit.cs
+++ b/Assets/Scripts/Framework/Core/EventKit.cs
@@ -88,12 +88,23 @@ namespace AibisDream.Framework
if (!_eventDict.TryGetValue(typeof(T), out var e)) return;
if (e.Length <= kv || e[kv] == null) return;
-
+
if (e[kv] is EasyEvent tempEvent)
{
tempEvent.UnRegister(onEvent);
}
}
+
+ public void UnRegister(T key, Action onEvent) where T : IConvertible
+ {
+ var kv = key.ToInt32(null);
+ if (!_eventDict.TryGetValue(typeof(T), out var e)) return;
+ if (e.Length <= kv || e[kv] == null) return;
+ if (e[kv] is EasyEvent tempEvent)
+ {
+ tempEvent.UnRegister(onEvent);
+ }
+ }
public void UnRegister(T key) where T : IConvertible
{
diff --git a/Assets/Scripts/Framework/OtherKit/LocalizationKit.cs b/Assets/Scripts/Framework/OtherKit/LocalizationKit.cs
index a2eb8ed22..e57ebf2ba 100644
--- a/Assets/Scripts/Framework/OtherKit/LocalizationKit.cs
+++ b/Assets/Scripts/Framework/OtherKit/LocalizationKit.cs
@@ -3,7 +3,6 @@ using UnityEngine;
using UnityEngine.Localization;
using UnityEngine.Localization.Settings;
using UnityEngine.Localization.Tables;
-using UnityEngine.SocialPlatforms;
namespace AibisDream.Framework
{
@@ -17,6 +16,8 @@ namespace AibisDream.Framework
public static LocalizationTable ActorTable { get; private set; }
+ public static Locale CurrentLocale => LocalizationSettings.SelectedLocale;
+
static LocalizationKit()
{
#if UNITY_EDITOR
@@ -24,9 +25,15 @@ namespace AibisDream.Framework
#else
_paramTable = new LocalizationTable(ParamTableName);
ActorTable = new LocalizationTable(ActorTableName);
+ LocalizationSettings.SelectedLocaleChanged += OnLocaleChanged;
#endif
}
+ private static void OnLocaleChanged(Locale locale)
+ {
+ EnumEventSystem.Global.Send(SettingChangeEvent.LocaleChanged, locale);
+ }
+
#if UNITY_EDITOR
private static void OnPlayModeChanged(PlayModeStateChange playMode)
{
@@ -37,6 +44,7 @@ namespace AibisDream.Framework
ActorTable?.Dispose();
_paramTable = new LocalizationTable(ParamTableName);
ActorTable = new LocalizationTable(ActorTableName);
+ LocalizationSettings.SelectedLocaleChanged += OnLocaleChanged;
}
else if (playMode == PlayModeStateChange.ExitingPlayMode)
{
@@ -44,6 +52,7 @@ namespace AibisDream.Framework
ActorTable?.Dispose();
_paramTable = null;
ActorTable = null;
+ LocalizationSettings.SelectedLocaleChanged -= OnLocaleChanged;
}
}
#endif
diff --git a/Assets/Scripts/Game Loop/EventEnums.cs b/Assets/Scripts/Game Loop/EventEnums.cs
index 765815618..89c1f68e8 100644
--- a/Assets/Scripts/Game Loop/EventEnums.cs
+++ b/Assets/Scripts/Game Loop/EventEnums.cs
@@ -72,6 +72,7 @@ namespace AibisDream
public enum SettingChangeEvent
{
- TextSpeed
+ TextSpeed,
+ LocaleChanged
}
}
\ No newline at end of file
diff --git a/Assets/Scripts/Game Loop/SettingLoader.cs b/Assets/Scripts/Game Loop/SettingLoader.cs
index bc8a93fc8..238451a0f 100644
--- a/Assets/Scripts/Game Loop/SettingLoader.cs
+++ b/Assets/Scripts/Game Loop/SettingLoader.cs
@@ -3,7 +3,6 @@ using System.Globalization;
using AibisDream.Framework;
using AibisDream.Kit;
using UnityEngine;
-using UnityEngine.Localization.Settings;
namespace AibisDream
{
@@ -13,7 +12,7 @@ namespace AibisDream
public class SettingLoader
{
private static readonly string SettingPath = Application.streamingAssetsPath + "/Config/setting.json";
-
+
private readonly ConfigContainer _container;
private SettingLoader()
@@ -25,6 +24,11 @@ namespace AibisDream
_container.OnWrite += OnSettingChanged;
}
+ private void Dispose()
+ {
+ _container.OnWrite -= OnSettingChanged;
+ }
+
private void LoadAllSetting()
{
var settingConfig = _container.ReadAll();
@@ -34,7 +38,7 @@ namespace AibisDream
}
}
- private async void OnSettingChanged(string propName, string value)
+ private void OnSettingChanged(string propName, string value)
{
// 配置项同步
switch (propName)
@@ -76,13 +80,18 @@ namespace AibisDream
{
return _container.ReadAll();
}
-
+
#region 单例部分
public static SettingLoader Instance { get; private set; }
public static void Init()
{
+ if (Instance != null)
+ {
+ Instance.Dispose();
+ Instance = null;
+ }
Instance = new SettingLoader();
}
diff --git a/Assets/Scripts/Style/TextAnimaStyle.cs b/Assets/Scripts/Style/TextAnimaStyle.cs
deleted file mode 100644
index 6a335b90b..000000000
--- a/Assets/Scripts/Style/TextAnimaStyle.cs
+++ /dev/null
@@ -1,49 +0,0 @@
-using System;
-using UnityEngine;
-using UnityEngine.Localization;
-using UnityEngine.UI;
-
-namespace AibisDream
-{
- [CreateAssetMenu(menuName = "Style/Text Anima Style")]
- public class TextAnimaStyle : ScriptableObject
- {
- public TextSpeed enSpeed;
- public TextSpeed cnSpeed;
-
- public float enCharSpace;
- public float cnCharSpace;
-
- [Serializable]
- public struct TextSpeed
- {
- public float slowCharSpeed;
- public float normalCharSpeed;
- public float fastCharSpeed;
- }
-
- public float GetTextSpeed(TextSpeedEnum speedEnum, Locale locale)
- {
- var textSpeed = locale.Identifier.Code switch
- {
- "en" => enSpeed,
- "zh-Hans" => cnSpeed,
- _ => cnSpeed,
- };
- return speedEnum switch
- {
- TextSpeedEnum.Slow => textSpeed.slowCharSpeed,
- TextSpeedEnum.Normal => textSpeed.normalCharSpeed,
- TextSpeedEnum.Fast => textSpeed.fastCharSpeed,
- _ => textSpeed.normalCharSpeed,
- };
- }
- }
-
- public enum TextSpeedEnum
- {
- Slow,
- Normal,
- Fast
- }
-}
diff --git a/Assets/Scripts/Style/TextAnimaStyle.cs.meta b/Assets/Scripts/Style/TextAnimaStyle.cs.meta
deleted file mode 100644
index 65cd30664..000000000
--- a/Assets/Scripts/Style/TextAnimaStyle.cs.meta
+++ /dev/null
@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 6508e9e28418d5e429ba26325d369d2a
-MonoImporter:
- externalObjects: {}
- serializedVersion: 2
- defaultReferences: []
- executionOrder: 0
- icon: {instanceID: 0}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/Scripts/UI/DialogUI/Bubbles/Bubble.cs b/Assets/Scripts/UI/DialogUI/Bubbles/Bubble.cs
index d6b67662b..016ec2237 100644
--- a/Assets/Scripts/UI/DialogUI/Bubbles/Bubble.cs
+++ b/Assets/Scripts/UI/DialogUI/Bubbles/Bubble.cs
@@ -1,11 +1,11 @@
using System;
+using System.Globalization;
using AibisDream.Framework;
using AibisDream.Kit;
using AibisDream.Utility;
using Febucci.UI.Core;
using TMPro;
using UnityEngine;
-using UnityEngine.Localization;
using UnityEngine.UI;
namespace AibisDream
@@ -29,8 +29,7 @@ namespace AibisDream
[SerializeField] private int idx;
[SerializeField] private int maxWidth;
[SerializeField] private int minWidth;
- [SerializeField] private TextAnimaStyle textAnimaStyle;
-
+
public ActorRole Role => role;
public int Idx => idx;
@@ -53,8 +52,7 @@ namespace AibisDream
SetStyle(data.bubbleStyle, data.pivotType);
// 注册事件
_typewriter.onTextShowed.AddListener(InvokeLineShown);
- LocalizationKit.LocaleChanged += OnLocaleChanged;
- EnumEventSystem.Global.Send(SettingChangeEvent.TextSpeed, value);
+ EnumEventSystem.Global.Register(SettingChangeEvent.TextSpeed, OnTextSpeedChanged);
}
private void InvokeLineShown()
@@ -79,11 +77,19 @@ namespace AibisDream
_rect.pivot = CommonUtil.GetPivotByType(pivotType);
var spritePath = bubbleStyle.bubbleSpriteAddress.EndsWith("]")
? $"{bubbleStyle.bubbleSpriteAddress}"
- : $"{bubbleStyle.bubbleSpriteAddress}[{pivotType.ToString()}]";
+ : $"{bubbleStyle.bubbleSpriteAddress}[{pivotType}]";
_bubbleImage.sprite = ResourceKit.LoadAssetSync(spritePath);
-
+ // 初始化文字速度
+ var speedStr = SettingLoader.Instance.TryRead("TextSpeed", out string textSpeed) ? textSpeed : "1";
+ OnTextSpeedChanged(speedStr);
+ }
+
+ private void OnTextSpeedChanged(string value)
+ {
+ float speed = float.TryParse(value, NumberStyles.Float, CultureInfo.InvariantCulture, out float result) ? result : 1f;
+ _typewriter.SetTypewriterSpeed(speed);
}
private void InitRefs()
@@ -109,7 +115,7 @@ namespace AibisDream
? string.Empty
: characterVo.GetActorName();
}
-
+
public void ShowLine(string line)
{
_typewriter.TextAnimator.SetText("");
@@ -131,12 +137,6 @@ namespace AibisDream
}
}
- public void OnLocaleChanged(Locale locale)
- {
- // _typewriter.TypingSpeed = textAnimaStyle.GetTextSpeed(TextSpeedEnum.Normal, locale);
- _typewriter.SetTypewriterSpeed(textAnimaStyle.GetTextSpeed(TextSpeedEnum.Normal, locale));
- }
-
public void Hide()
{
gameObject.SetActive(false);
diff --git a/Assets/Scripts/UI/DialogUI/Bubbles/BubbleGroup.cs b/Assets/Scripts/UI/DialogUI/Bubbles/BubbleGroup.cs
index 89984325b..d78ef51fc 100644
--- a/Assets/Scripts/UI/DialogUI/Bubbles/BubbleGroup.cs
+++ b/Assets/Scripts/UI/DialogUI/Bubbles/BubbleGroup.cs
@@ -11,7 +11,7 @@ using UnityEngine;
namespace AibisDream
{
- public class BubbleGroup : Singleton, IDialogView, ILineView
+ public class BubbleGroup : Singleton, ILineView
{
[SerializeField] private TMP_Text widthEstimation;
[SerializeField] private CenterBubble centerBubble;
@@ -35,13 +35,6 @@ namespace AibisDream
{
// 工厂
_bubbleFactory = new BubbleFactory(transform);
- // 加载选项
- InitOptions();
- }
-
- private void Start()
- {
- HideDialog();
}
public override void OnSingletonDestroy()
@@ -64,41 +57,58 @@ namespace AibisDream
.ToDictionary(group => group.Key, group => group.ToArray());
}
- private void InitOptions()
- {
- _bubbleDict = new Dictionary();
- }
-
#endregion
- #region 旧对话框功能实现
+ #region 新对话框功能实现
- public void ShowLine(string dialogLine, CharacterVo character, Action nextStep, string lineId,
- bool isAutoSkip = false)
+ public void RunLine(LineSyncToken syncToken)
{
- Debug.Log($"[BubbleGroup] ShowLine - 开始显示对话: {lineId}");
- Debug.Log($"[BubbleGroup] ShowLine - nextStep是否为null: {nextStep == null}");
+ // 先中断原来的事件
+ _autoHideToken?.Cancel();
+ _autoHideToken = null;
- gameObject.SetActive(true);
+ var character = syncToken.lineInfo.character;
if (TryGetBubble(character.role, character.bubbleIdx, out var bubble))
{
+ // 注册事件
+ bubble.OnLineShown += syncToken.TextShown;
+ syncToken.SkipTextAnima += () => bubble.SkipLine();
+ syncToken.OnAdvance += AfterAdvance;
+ // 播放文字
bubble.ShowActorName(character);
- bubble.ShowLine(dialogLine);
+ bubble.ShowLine(syncToken.lineInfo.lineText);
+ syncToken.TextStart();
// 将非选定的Bubble隐藏
HideDialog(bubble);
}
else
{
- Debug.LogWarning($"{character.GetActorName()}的Role没有对应Bubble");
- return;
+ Debug.LogWarning($"{character.GetActorName()}的Role {character.role}没有对应Bubble");
+ HideDialog();
}
+ }
+
+ public float EstimateTextWidth(string text, float fontSize)
+ {
+ widthEstimation.fontSize = fontSize;
+ widthEstimation.text = text;
+ widthEstimation.ForceMeshUpdate();
+ return widthEstimation.preferredWidth;
+ }
- // 保留信息
- _nextStep = nextStep;
- _curBubble = bubble;
-
- Debug.Log($"[BubbleGroup] ShowLine - 设置完成，_nextStep是否为null: {_nextStep == null}");
+ private async void AfterAdvance()
+ {
+ _autoHideToken = new CancellationTokenSource();
+ try
+ {
+ await Task.Delay(ConstRef.AutoHideDelay, _autoHideToken.Token);
+ HideDialog();
+ }
+ catch (TaskCanceledException)
+ {
+ // 忽略取消
+ }
}
public void HideDialog()
@@ -107,43 +117,10 @@ namespace AibisDream
{
textBubble.Hide();
}
-
+
centerBubble.Hide();
}
- public bool TrySkipLine(bool isForceSkip = false)
- {
- if (_curBubble == null)
- {
- return true;
- }
-
- return _curBubble.SkipLine();
- }
-
- public void NextStep()
- {
- Debug.Log($"[BubbleGroup] NextStep - _nextStep是否为null: {_nextStep == null}");
-
- if (_nextStep == null)
- {
- Debug.Log("[BubbleGroup] NextStep - _nextStep为null，提前返回");
- return;
- }
-
- var next = _nextStep;
- _nextStep = null;
-
- _curBubble?.Hide();
- _curBubble = null;
-
- next?.Invoke();
- }
-
- public void OnLocalizationChanged(string value)
- {
- }
-
private void HideDialog(IBubble activeBubble)
{
foreach (var textBubble in _bubbleDict.Values.SelectMany(inner => inner))
@@ -179,59 +156,5 @@ namespace AibisDream
}
#endregion
-
- #region 新对话框功能实现
-
- public void RunLine(LineSyncToken syncToken)
- {
- // 先中断原来的事件
- _autoHideToken?.Cancel();
- _autoHideToken = null;
-
- var character = syncToken.lineInfo.character;
-
- if (TryGetBubble(character.role, character.bubbleIdx, out var bubble))
- {
- // 注册事件
- bubble.OnLineShown += syncToken.TextShown;
- syncToken.SkipTextAnima += () => bubble.SkipLine();
- syncToken.OnAdvance += AfterAdvance;
- // 播放文字
- bubble.ShowActorName(character);
- bubble.ShowLine(syncToken.lineInfo.lineText);
- syncToken.state = LineSyncState.PlayText;
- // 将非选定的Bubble隐藏
- HideDialog(bubble);
- }
- else
- {
- Debug.LogWarning($"{character.GetActorName()}的Role {character.role}没有对应Bubble");
- HideDialog();
- }
- }
-
- public float EstimateTextWidth(string text, float fontSize)
- {
- widthEstimation.fontSize = fontSize;
- widthEstimation.text = text;
- widthEstimation.ForceMeshUpdate();
- return widthEstimation.preferredWidth;
- }
-
- private async void AfterAdvance()
- {
- _autoHideToken = new CancellationTokenSource();
- try
- {
- await Task.Delay(ConstRef.AutoHideDelay, _autoHideToken.Token);
- HideDialog();
- }
- catch (TaskCanceledException)
- {
- // 忽略取消
- }
- }
-
- #endregion
}
}
\ No newline at end of file
diff --git a/Assets/Scripts/UI/DialogUI/CenterOption.cs b/Assets/Scripts/UI/DialogUI/CenterOption.cs
deleted file mode 100644
index 423bd0366..000000000
--- a/Assets/Scripts/UI/DialogUI/CenterOption.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-using System;
-using AibisDream.Framework;
-using AibisDream.Kit;
-using AibisDream.Utility;
-using TMPro;
-using UnityEngine;
-using UnityEngine.UI;
-
-namespace AibisDream
-{
- public class CenterOption : MonoBehaviour, IDialogView
- {
- #region 索引
-
- public GameObject choiceButtonPrefab;
-
- #endregion
-
- private TextParam _textParam;
-
- private void Awake()
- {
- EnumEventSystem.Global.Register(DialogEventEnum.OptionSelected,
- _ => HideDialog());
- }
-
- public void ShowLine(string dialogLine, CharacterVo character, Action nextStep, string lineId, bool isAutoSkip = false)
- {
- Debug.Log("CenterOption只显示选项");
- }
-
- public void ShowOptions(DialogOption[] dialogueOptions)
- {
- gameObject.SetActive(true);
-
- // 销毁原来的按钮
- foreach (Transform child in transform)
- {
- Destroy(child.gameObject);
- }
-
- // 生成新按钮
- foreach (var option in dialogueOptions)
- {
- if (!option.IsAvailable) continue;
-
- var choiceInstance = Instantiate(choiceButtonPrefab, transform);
- var optionText = choiceInstance.GetComponentInChildren();
- optionText.text = option.Line;
- optionText.characterSpacing = _textParam.charSpace;
- choiceInstance.GetComponent