From 80b26ade3bc998349cbadcc283b9fa2f73c128e1 Mon Sep 17 00:00:00 2001
From: Ding Yuntian <1491671119@qq.com>
Date: Thu, 23 Oct 2025 21:30:31 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E8=AF=9D=E7=B3=BB=E7=BB=9F=E7=AC=AC?=
=?UTF-8?q?=E4=B8=80=E6=AC=A1=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Assets/Render/Renderer2Dtest.asset | 22 +-
Assets/Scenes/Persistence.unity | 1704 ++++++++---------
.../Scripts/Dialog System/DialogController.cs | 22 +-
.../Scripts/Dialog System/LineAdvanceInput.cs | 92 +
.../Dialog System/LineAdvanceInput.cs.meta | 3 +
Assets/Scripts/Dialog System/LineView.cs | 3 +
Assets/Scripts/Dialog System/LineViewNew.cs | 116 ++
.../Scripts/Dialog System/LineViewNew.cs.meta | 3 +
Assets/Scripts/Dialog System/OptionView.cs | 33 +
.../Scripts/Dialog System/OptionView.cs.meta | 3 +
.../FixSystem/Effect/MouseFollowEffect.cs | 7 +-
.../FixSystemNew/BodyModule/CableSystem.cs | 11 +-
Assets/Scripts/Framework/Config/Character.cs | 3 +-
Assets/Scripts/Game Loop/EventEnums.cs | 4 +-
Assets/Scripts/MiniGame/Gear/GearSystem.cs | 4 +-
Assets/Scripts/UI/Cursor/CursorManager.cs | 4 +-
Assets/Scripts/UI/DialogUI/Bubbles/Bubble.cs | 46 +-
.../UI/DialogUI/Bubbles/BubbleGroup.cs | 125 +-
.../UI/DialogUI/Bubbles/BubbleOption.cs | 11 +-
.../UI/DialogUI/Bubbles/CenterBubble.cs | 62 +
.../UI/DialogUI/Bubbles/CenterBubble.cs.meta | 3 +
Assets/Scripts/UI/DialogUI/CenterOptions.cs | 42 +
.../Scripts/UI/DialogUI/CenterOptions.cs.meta | 3 +
Assets/Scripts/UI/DialogUI/CenterText.cs | 1 -
Assets/Scripts/UI/DialogUI/DefaultOptions.cs | 44 +
.../UI/DialogUI/DefaultOptions.cs.meta | 3 +
.../UI/DialogUI/DialogCanvasManager.cs | 8 +-
Assets/Scripts/UI/DialogUI/IDialogView.cs | 2 +-
Assets/Scripts/Utility/CommonUtil.cs | 5 +
29 files changed, 1361 insertions(+), 1028 deletions(-)
create mode 100644 Assets/Scripts/Dialog System/LineAdvanceInput.cs
create mode 100644 Assets/Scripts/Dialog System/LineAdvanceInput.cs.meta
create mode 100644 Assets/Scripts/Dialog System/LineViewNew.cs
create mode 100644 Assets/Scripts/Dialog System/LineViewNew.cs.meta
create mode 100644 Assets/Scripts/Dialog System/OptionView.cs
create mode 100644 Assets/Scripts/Dialog System/OptionView.cs.meta
create mode 100644 Assets/Scripts/UI/DialogUI/Bubbles/CenterBubble.cs
create mode 100644 Assets/Scripts/UI/DialogUI/Bubbles/CenterBubble.cs.meta
create mode 100644 Assets/Scripts/UI/DialogUI/CenterOptions.cs
create mode 100644 Assets/Scripts/UI/DialogUI/CenterOptions.cs.meta
create mode 100644 Assets/Scripts/UI/DialogUI/DefaultOptions.cs
create mode 100644 Assets/Scripts/UI/DialogUI/DefaultOptions.cs.meta
diff --git a/Assets/Render/Renderer2Dtest.asset b/Assets/Render/Renderer2Dtest.asset
index 197d64d62..fdae0d5da 100644
--- a/Assets/Render/Renderer2Dtest.asset
+++ b/Assets/Render/Renderer2Dtest.asset
@@ -463,19 +463,15 @@ MonoBehaviour:
m_PostInfinity: 2
m_RotationOrder: 4
_filter:
- - 0.0048309183
- - 0.016401261
- - 0.04532712
- - 0.08293076
- - 0.12053438
- - 0.14946026
- - 0.1610306
- - 0.14946026
- - 0.12053438
- - 0.08293076
- - 0.04532712
- - 0.016401261
- - 0.0048309183
+ - 0.007228916
+ - 0.043749984
+ - 0.12409639
+ - 0.20444278
+ - 0.24096388
+ - 0.20444278
+ - 0.12409639
+ - 0.043749984
+ - 0.007228916
--- !u!114 &-6086986437317696584
MonoBehaviour:
m_ObjectHideFlags: 3
diff --git a/Assets/Scenes/Persistence.unity b/Assets/Scenes/Persistence.unity
index 34ec8e6cb..75447296f 100644
--- a/Assets/Scenes/Persistence.unity
+++ b/Assets/Scenes/Persistence.unity
@@ -521,7 +521,7 @@ MonoBehaviour:
m_text: "\u5BF9\u8BDD\u5185\u5BB9\u663E\u793A\u5728\u8FD9\u91CC\u652F\u6301\u5BCC\u6587\u672C"
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: c7fc4cbba4b38a04c8985d4dbce12a73, type: 2}
- m_sharedMaterial: {fileID: -6659093157667844055, guid: f242fb3dde1933640859f1c54591c9c8, type: 2}
+ m_sharedMaterial: {fileID: -5947736473428621296, guid: c7fc4cbba4b38a04c8985d4dbce12a73, type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []
@@ -584,7 +584,7 @@ MonoBehaviour:
m_margin: {x: 0, y: 0, z: 0, w: 0}
m_isUsingLegacyAnimationComponent: 0
m_isVolumetricText: 0
- m_hasFontAssetChanged: 1
+ m_hasFontAssetChanged: 0
m_baseMaterial: {fileID: 0}
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
--- !u!222 &27659202
@@ -603,6 +603,30 @@ 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
@@ -827,30 +851,6 @@ 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,6 +899,30 @@ 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
@@ -1123,30 +1147,6 @@ 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:
@@ -1559,195 +1559,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 85815d386fde43dca8b4be1cfd26fe89, type: 3}
m_Name:
m_EditorClassIdentifier:
---- !u!1001 &71838975
-PrefabInstance:
- m_ObjectHideFlags: 0
- serializedVersion: 2
- m_Modification:
- serializedVersion: 3
- m_TransformParent: {fileID: 781740447}
- m_Modifications:
- - target: {fileID: 215275187407609090, guid: 1f392e4cea7cf3943a25361ff1d1ff85, type: 3}
- propertyPath: m_Sprite
- value:
- objectReference: {fileID: 704217432, guid: 3fb22d1d71379f54f8dec756b08e3307, type: 3}
- - target: {fileID: 1284103664181101717, guid: 1f392e4cea7cf3943a25361ff1d1ff85, type: 3}
- propertyPath: m_Pivot.x
- value: 0.5
- objectReference: {fileID: 0}
- - target: {fileID: 1284103664181101717, guid: 1f392e4cea7cf3943a25361ff1d1ff85, type: 3}
- propertyPath: m_Pivot.y
- value: 0.5
- objectReference: {fileID: 0}
- - target: {fileID: 1284103664181101717, guid: 1f392e4cea7cf3943a25361ff1d1ff85, type: 3}
- propertyPath: m_AnchorMax.x
- value: 0.5
- objectReference: {fileID: 0}
- - target: {fileID: 1284103664181101717, guid: 1f392e4cea7cf3943a25361ff1d1ff85, type: 3}
- propertyPath: m_AnchorMax.y
- value: 0.5
- objectReference: {fileID: 0}
- - target: {fileID: 1284103664181101717, guid: 1f392e4cea7cf3943a25361ff1d1ff85, type: 3}
- propertyPath: m_AnchorMin.x
- value: 0.5
- objectReference: {fileID: 0}
- - target: {fileID: 1284103664181101717, guid: 1f392e4cea7cf3943a25361ff1d1ff85, type: 3}
- propertyPath: m_AnchorMin.y
- value: 0.5
- objectReference: {fileID: 0}
- - target: {fileID: 1284103664181101717, guid: 1f392e4cea7cf3943a25361ff1d1ff85, type: 3}
- propertyPath: m_SizeDelta.x
- value: 453.11
- objectReference: {fileID: 0}
- - target: {fileID: 1284103664181101717, guid: 1f392e4cea7cf3943a25361ff1d1ff85, type: 3}
- propertyPath: m_SizeDelta.y
- value: 70.009995
- objectReference: {fileID: 0}
- - target: {fileID: 1284103664181101717, guid: 1f392e4cea7cf3943a25361ff1d1ff85, type: 3}
- propertyPath: m_LocalPosition.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 1284103664181101717, guid: 1f392e4cea7cf3943a25361ff1d1ff85, type: 3}
- propertyPath: m_LocalPosition.y
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 1284103664181101717, guid: 1f392e4cea7cf3943a25361ff1d1ff85, type: 3}
- propertyPath: m_LocalPosition.z
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 1284103664181101717, guid: 1f392e4cea7cf3943a25361ff1d1ff85, type: 3}
- propertyPath: m_LocalRotation.w
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 1284103664181101717, guid: 1f392e4cea7cf3943a25361ff1d1ff85, type: 3}
- propertyPath: m_LocalRotation.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 1284103664181101717, guid: 1f392e4cea7cf3943a25361ff1d1ff85, type: 3}
- propertyPath: m_LocalRotation.y
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 1284103664181101717, guid: 1f392e4cea7cf3943a25361ff1d1ff85, type: 3}
- propertyPath: m_LocalRotation.z
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 1284103664181101717, guid: 1f392e4cea7cf3943a25361ff1d1ff85, type: 3}
- propertyPath: m_AnchoredPosition.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 1284103664181101717, guid: 1f392e4cea7cf3943a25361ff1d1ff85, type: 3}
- propertyPath: m_AnchoredPosition.y
- value: -300
- objectReference: {fileID: 0}
- - target: {fileID: 1284103664181101717, guid: 1f392e4cea7cf3943a25361ff1d1ff85, type: 3}
- propertyPath: m_LocalEulerAnglesHint.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 1284103664181101717, guid: 1f392e4cea7cf3943a25361ff1d1ff85, type: 3}
- propertyPath: m_LocalEulerAnglesHint.y
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 1284103664181101717, guid: 1f392e4cea7cf3943a25361ff1d1ff85, type: 3}
- propertyPath: m_LocalEulerAnglesHint.z
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 3741179239662950829, guid: 1f392e4cea7cf3943a25361ff1d1ff85, type: 3}
- propertyPath: m_IsActive
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 4083462688583332915, guid: 1f392e4cea7cf3943a25361ff1d1ff85, type: 3}
- propertyPath: m_Padding.m_Top
- value: 10
- objectReference: {fileID: 0}
- - target: {fileID: 4083462688583332915, guid: 1f392e4cea7cf3943a25361ff1d1ff85, type: 3}
- propertyPath: m_Padding.m_Left
- value: 5
- objectReference: {fileID: 0}
- - target: {fileID: 4083462688583332915, guid: 1f392e4cea7cf3943a25361ff1d1ff85, type: 3}
- propertyPath: m_Padding.m_Right
- value: 15
- objectReference: {fileID: 0}
- - target: {fileID: 4083462688583332915, guid: 1f392e4cea7cf3943a25361ff1d1ff85, type: 3}
- propertyPath: m_Padding.m_Bottom
- value: 10
- objectReference: {fileID: 0}
- - target: {fileID: 4698362591619572577, guid: 1f392e4cea7cf3943a25361ff1d1ff85, type: 3}
- propertyPath: m_MinWidth
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 5463321828217487701, guid: 1f392e4cea7cf3943a25361ff1d1ff85, type: 3}
- propertyPath: m_AnchorMax.y
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 5463321828217487701, guid: 1f392e4cea7cf3943a25361ff1d1ff85, type: 3}
- propertyPath: m_AnchorMin.y
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 5463321828217487701, guid: 1f392e4cea7cf3943a25361ff1d1ff85, type: 3}
- propertyPath: m_SizeDelta.x
- value: 433.11
- objectReference: {fileID: 0}
- - target: {fileID: 5463321828217487701, guid: 1f392e4cea7cf3943a25361ff1d1ff85, type: 3}
- propertyPath: m_SizeDelta.y
- value: 50.01
- objectReference: {fileID: 0}
- - target: {fileID: 5463321828217487701, guid: 1f392e4cea7cf3943a25361ff1d1ff85, type: 3}
- propertyPath: m_AnchoredPosition.x
- value: 221.555
- objectReference: {fileID: 0}
- - target: {fileID: 5463321828217487701, guid: 1f392e4cea7cf3943a25361ff1d1ff85, type: 3}
- propertyPath: m_AnchoredPosition.y
- value: -60.01
- objectReference: {fileID: 0}
- - target: {fileID: 8272198623999747867, guid: 1f392e4cea7cf3943a25361ff1d1ff85, type: 3}
- propertyPath: m_AnchorMax.y
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 8272198623999747867, guid: 1f392e4cea7cf3943a25361ff1d1ff85, type: 3}
- propertyPath: m_AnchorMin.y
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 8272198623999747867, guid: 1f392e4cea7cf3943a25361ff1d1ff85, type: 3}
- propertyPath: m_SizeDelta.x
- value: 64.01
- objectReference: {fileID: 0}
- - target: {fileID: 8272198623999747867, guid: 1f392e4cea7cf3943a25361ff1d1ff85, type: 3}
- propertyPath: m_SizeDelta.y
- value: 32.01
- objectReference: {fileID: 0}
- - target: {fileID: 8272198623999747867, guid: 1f392e4cea7cf3943a25361ff1d1ff85, type: 3}
- propertyPath: m_AnchoredPosition.x
- value: 52.005005
- objectReference: {fileID: 0}
- - target: {fileID: 8272198623999747867, guid: 1f392e4cea7cf3943a25361ff1d1ff85, type: 3}
- propertyPath: m_AnchoredPosition.y
- value: -36.004997
- objectReference: {fileID: 0}
- - target: {fileID: 8352794458094198668, guid: 1f392e4cea7cf3943a25361ff1d1ff85, type: 3}
- propertyPath: m_Name
- value: Bubble
- objectReference: {fileID: 0}
- - target: {fileID: 8352794458094198668, guid: 1f392e4cea7cf3943a25361ff1d1ff85, type: 3}
- propertyPath: m_IsActive
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 8947926204029201251, guid: 1f392e4cea7cf3943a25361ff1d1ff85, type: 3}
- propertyPath: testMaxWidth
- value: -1
- objectReference: {fileID: 0}
- - target: {fileID: 8947926204029201251, guid: 1f392e4cea7cf3943a25361ff1d1ff85, type: 3}
- propertyPath: testPivotType
- value: 8
- objectReference: {fileID: 0}
- - target: {fileID: 8947926204029201251, guid: 1f392e4cea7cf3943a25361ff1d1ff85, type: 3}
- propertyPath: testBubbleStyle
- value:
- objectReference: {fileID: 11400000, guid: e5e5761693b62ef4891f7f08ec8bcbd8, type: 2}
- m_RemovedComponents: []
- m_RemovedGameObjects: []
- m_AddedGameObjects: []
- m_AddedComponents: []
- m_SourcePrefab: {fileID: 100100000, guid: 1f392e4cea7cf3943a25361ff1d1ff85, type: 3}
--- !u!1 &72512885
GameObject:
m_ObjectHideFlags: 0
@@ -2193,6 +2004,30 @@ 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
@@ -2417,30 +2252,6 @@ 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:
@@ -3197,6 +3008,30 @@ 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
@@ -3417,30 +3252,6 @@ 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:
@@ -3909,6 +3720,30 @@ 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
@@ -4137,30 +3972,6 @@ 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:
@@ -4276,6 +4087,30 @@ 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
@@ -4492,30 +4327,6 @@ 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}
@@ -4886,19 +4697,17 @@ RectTransform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 238296902}
- m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
- m_Children:
- - {fileID: 781740447}
- - {fileID: 1612148020}
- m_Father: {fileID: 1604842429}
+ m_Children: []
+ m_Father: {fileID: 1829169896}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
- m_SizeDelta: {x: 0, y: 0}
+ m_SizeDelta: {x: 1820.0001, y: 980.2295}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &238296904
MonoBehaviour:
@@ -4912,6 +4721,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: a76234ef7ee34400b306a4823081ba62, type: 3}
m_Name:
m_EditorClassIdentifier:
+ centerBubble: {fileID: 1403558896}
--- !u!1 &246580517
GameObject:
m_ObjectHideFlags: 0
@@ -6726,11 +6536,58 @@ MonoBehaviour:
Data3: 1610383794
Data4: -1468709119
Path: event:/Amb/amb
---- !u!224 &375324529 stripped
-RectTransform:
- m_CorrespondingSourceObject: {fileID: 1284103664181101717, guid: 1f392e4cea7cf3943a25361ff1d1ff85, type: 3}
- m_PrefabInstance: {fileID: 71838975}
+--- !u!1 &381795661
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 381795662}
+ - component: {fileID: 381795663}
+ m_Layer: 5
+ m_Name: Option View
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &381795662
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 381795661}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_ConstrainProportionsScale: 0
+ m_Children:
+ - {fileID: 1612148020}
+ - {fileID: 1586904153}
+ m_Father: {fileID: 1604842429}
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 1, y: 1}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 0, y: 0}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &381795663
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 381795661}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 56ee480f25a146839afa8ff058ddfc7a, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ defaultOptions: {fileID: 1612148021}
+ centerOptions: {fileID: 1586904157}
--- !u!1 &387773934
GameObject:
m_ObjectHideFlags: 0
@@ -7940,6 +7797,30 @@ 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
@@ -8124,30 +8005,6 @@ 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: []
@@ -8264,6 +8121,30 @@ 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
@@ -8488,30 +8369,6 @@ 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:
@@ -8638,6 +8495,30 @@ 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
@@ -8862,30 +8743,6 @@ 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:
@@ -9650,6 +9507,30 @@ 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
@@ -9874,30 +9755,6 @@ 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:
@@ -10259,6 +10116,30 @@ 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
@@ -10483,30 +10364,6 @@ 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:
@@ -10797,6 +10654,30 @@ 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
@@ -11013,30 +10894,6 @@ 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}
@@ -11887,6 +11744,30 @@ 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
@@ -12103,30 +11984,6 @@ 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}
@@ -12314,42 +12171,6 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 773911909}
m_CullTransparentMesh: 1
---- !u!1 &781740446
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 781740447}
- m_Layer: 5
- m_Name: Bubbles
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &781740447
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 781740446}
- m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: 0, y: 0, z: 0}
- m_LocalScale: {x: 1, y: 1, z: 1}
- m_ConstrainProportionsScale: 0
- m_Children:
- - {fileID: 375324529}
- m_Father: {fileID: 238296903}
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 0}
- m_AnchorMax: {x: 1, y: 1}
- m_AnchoredPosition: {x: 0, y: 0}
- m_SizeDelta: {x: 0, y: 0}
- m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &788983287 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 2261302370767925378, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3}
@@ -12369,6 +12190,30 @@ 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
@@ -12593,30 +12438,6 @@ 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:
@@ -13353,6 +13174,30 @@ 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
@@ -13577,30 +13422,6 @@ 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:
@@ -17411,6 +17232,30 @@ 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
@@ -17635,30 +17480,6 @@ 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:
@@ -18030,58 +17851,6 @@ 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
@@ -18282,6 +18051,58 @@ 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:
@@ -18590,7 +18411,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
- m_Father: {fileID: 1604842429}
+ m_Father: {fileID: 1829169896}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@@ -18716,6 +18537,30 @@ 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
@@ -18936,30 +18781,6 @@ 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}
@@ -19560,6 +19381,30 @@ 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
@@ -19784,30 +19629,6 @@ 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:
@@ -20191,18 +20012,18 @@ RectTransform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1403558892}
- m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 27659198}
- m_Father: {fileID: 1604842429}
+ m_Father: {fileID: 1829169896}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
- m_SizeDelta: {x: 0, y: 0}
+ m_SizeDelta: {x: 1820.0001, y: 980.2295}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1403558895
CanvasRenderer:
@@ -20221,9 +20042,10 @@ MonoBehaviour:
m_GameObject: {fileID: 1403558892}
m_Enabled: 1
m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: d6722100b986b0f42994441d3c0aa9e7, type: 3}
+ m_Script: {fileID: 11500000, guid: 67e53e476f874efd9d847b50dc16d6c8, type: 3}
m_Name:
m_EditorClassIdentifier:
+ dialogText: {fileID: 27659199}
--- !u!1 &1411435708
GameObject:
m_ObjectHideFlags: 0
@@ -20307,6 +20129,30 @@ 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
@@ -20515,30 +20361,6 @@ 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:
@@ -21436,6 +21258,30 @@ 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
@@ -21660,30 +21506,6 @@ 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:
@@ -21924,7 +21746,7 @@ GameObject:
- component: {fileID: 1586904156}
- component: {fileID: 1586904157}
m_Layer: 5
- m_Name: Center Option
+ m_Name: Center Options
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@@ -21937,12 +21759,12 @@ RectTransform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1586904152}
- m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
- m_Father: {fileID: 1604842429}
+ m_Father: {fileID: 381795662}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
@@ -22022,10 +21844,10 @@ MonoBehaviour:
m_GameObject: {fileID: 1586904152}
m_Enabled: 1
m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 144fae82f06c3c248b4fb76f6823baba, type: 3}
+ m_Script: {fileID: 11500000, guid: 8b56b42b68f74c719dd5f36a4696d61b, type: 3}
m_Name:
m_EditorClassIdentifier:
- choiceButtonPrefab: {fileID: 2831695685783823246, guid: 7b38c32597bbad84e92958938ef655dd, type: 3}
+ choiceButtonPrefab: {fileID: 659956759807646603, guid: 4973083c3562511409a2ff2639fbe31b, type: 3}
--- !u!1001 &1592246586
PrefabInstance:
m_ObjectHideFlags: 0
@@ -22034,6 +21856,30 @@ 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
@@ -22258,30 +22104,6 @@ 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:
@@ -22476,10 +22298,9 @@ RectTransform:
m_LocalScale: {x: 0, y: 0, z: 0}
m_ConstrainProportionsScale: 0
m_Children:
- - {fileID: 1318260398}
- - {fileID: 1586904153}
- - {fileID: 1403558893}
- - {fileID: 238296903}
+ - {fileID: 381795662}
+ - {fileID: 1829169896}
+ - {fileID: 1977401367}
m_Father: {fileID: 1110722291}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
@@ -22989,13 +22810,14 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 1612148020}
+ - component: {fileID: 1612148021}
m_Layer: 5
- m_Name: Options
+ m_Name: Default Options
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 1
+ m_IsActive: 0
--- !u!224 &1612148020
RectTransform:
m_ObjectHideFlags: 0
@@ -23003,7 +22825,7 @@ RectTransform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1612148019}
- m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
@@ -23012,13 +22834,25 @@ RectTransform:
- {fileID: 515401844}
- {fileID: 2033425616}
- {fileID: 432383798}
- m_Father: {fileID: 238296903}
+ m_Father: {fileID: 381795662}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &1612148021
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1612148019}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 14d86fd6c1664941a0c693acb51c6b4b, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
--- !u!1 &1620453319
GameObject:
m_ObjectHideFlags: 0
@@ -24811,6 +24645,58 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1804770167}
m_CullTransparentMesh: 1
+--- !u!1 &1829169895
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1829169896}
+ - component: {fileID: 1829169897}
+ m_Layer: 5
+ m_Name: Line View
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &1829169896
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1829169895}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_ConstrainProportionsScale: 0
+ m_Children:
+ - {fileID: 1318260398}
+ - {fileID: 1403558893}
+ - {fileID: 238296903}
+ m_Father: {fileID: 1604842429}
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0.5, y: 0.5}
+ m_AnchorMax: {x: 0.5, y: 0.5}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 100, y: 100}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &1829169897
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1829169895}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: f0d1630fcebe4fb38afd0a2bc7b3112b, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ advanceInput: {fileID: 1977401368}
--- !u!1 &1846916304
GameObject:
m_ObjectHideFlags: 0
@@ -25460,7 +25346,8 @@ MonoBehaviour:
yarnProject: {fileID: 0}
_variableStorage: {fileID: 314243163}
dialogueViews:
- - {fileID: 1584263515}
+ - {fileID: 381795663}
+ - {fileID: 1829169897}
startNode: Start
startAutomatically: 0
runSelectedOptionAsLine: 0
@@ -26182,6 +26069,55 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1970860740}
m_CullTransparentMesh: 1
+--- !u!1 &1977401366
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1977401367}
+ - component: {fileID: 1977401368}
+ m_Layer: 5
+ m_Name: Line Advance Input
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &1977401367
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1977401366}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_ConstrainProportionsScale: 0
+ m_Children: []
+ m_Father: {fileID: 1604842429}
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0.5, y: 0.5}
+ m_AnchorMax: {x: 0.5, y: 0.5}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 100, y: 100}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &1977401368
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1977401366}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 4269da1f8c364e319da84b5fee61bafe, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ advanceKey: 8
--- !u!1 &1982630668
GameObject:
m_ObjectHideFlags: 0
@@ -26340,6 +26276,30 @@ 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
@@ -26564,30 +26524,6 @@ 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:
@@ -26692,6 +26628,30 @@ 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
@@ -26916,30 +26876,6 @@ 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:
@@ -27428,6 +27364,30 @@ 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
@@ -27648,30 +27608,6 @@ 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}
diff --git a/Assets/Scripts/Dialog System/DialogController.cs b/Assets/Scripts/Dialog System/DialogController.cs
index 3f231c50b..df1d43c72 100644
--- a/Assets/Scripts/Dialog System/DialogController.cs
+++ b/Assets/Scripts/Dialog System/DialogController.cs
@@ -19,9 +19,6 @@ namespace AibisDream
# endregion
- public static UnityAction OnDialogueStart;
- public static UnityAction OnDialogueComplete;
-
private void Start()
{
_dialogueRunner = GetComponentInChildren();
@@ -29,16 +26,16 @@ namespace AibisDream
_dialogueRunner.onDialogueStart.AddListener(() =>
{
- EnumEventSystem.Global.Send(InteractionEventEnum.End);
- OnDialogueStart?.Invoke();
+ EnumEventSystem.Global.Send(InteractionEventEnum.DialogEnd);
});
_dialogueRunner.onDialogueComplete.AddListener(() =>
{
- EnumEventSystem.Global.Send(InteractionEventEnum.Start);
- OnDialogueComplete?.Invoke();
+ EnumEventSystem.Global.Send(InteractionEventEnum.DialogStart);
});
}
+ #region Yarn控制
+
///
/// 开启对话
///
@@ -49,12 +46,7 @@ namespace AibisDream
_lineProvider.InitStringTable(yarnProject.name);
_dialogueRunner.StartDialogue("Start");
}
-
- public string GetCurLocalizedTableName()
- {
- return _lineProvider.GetStringTableName();
- }
-
+
public void StopDialog()
{
_dialogueRunner.Stop();
@@ -84,7 +76,7 @@ namespace AibisDream
_dialogueRunner.StartDialogue(nodeName);
}
}
-
+
private bool CheckIfNodeExistInCurrentYarnProject(string nodeName)
{
YarnProject currentProject = _dialogueRunner.yarnProject;
@@ -100,6 +92,8 @@ namespace AibisDream
}
}
+ #endregion
+
///
/// 跳到下一句
///
diff --git a/Assets/Scripts/Dialog System/LineAdvanceInput.cs b/Assets/Scripts/Dialog System/LineAdvanceInput.cs
new file mode 100644
index 000000000..bfaf6ab49
--- /dev/null
+++ b/Assets/Scripts/Dialog System/LineAdvanceInput.cs
@@ -0,0 +1,92 @@
+using AibisDream.Framework;
+using UnityEngine;
+
+namespace AibisDream
+{
+ public class LineAdvanceInput : MonoBehaviour
+ {
+ #region 状态
+
+ private bool _inGame;
+ private bool _isDialog;
+ private LineSyncToken _curSyncToken;
+
+ #endregion
+
+ [SerializeField] private KeyCode advanceKey;
+
+ private void OnEnable()
+ {
+ RegisterEvents();
+ }
+
+ private void OnDisable()
+ {
+ UnRegisterEvents();
+ }
+
+ public void RunLine(LineSyncToken lineSyncEvent)
+ {
+ _curSyncToken = lineSyncEvent;
+ }
+
+ private bool IsInputAvailable()
+ {
+ return _inGame && _isDialog && _curSyncToken != null && _curSyncToken.state != LineSyncState.Advanced;
+ }
+
+ private void OnAdvanceInput()
+ {
+ if (!IsInputAvailable())
+ {
+ return;
+ }
+
+ switch (_curSyncToken.state)
+ {
+ case LineSyncState.PlayText:
+ _curSyncToken.TrySkip();
+ break;
+ case LineSyncState.WaitForAdvance:
+ _curSyncToken.TryAdvance();
+ break;
+ }
+ }
+
+ private void Update()
+ {
+ if (Input.GetMouseButtonDown(0) || Input.GetKeyDown(KeyCode.Space))
+ {
+ OnAdvanceInput();
+ }
+ }
+
+ #region 事件处理
+
+ private IUnRegister[] _unRegisters;
+
+ private void RegisterEvents()
+ {
+ _unRegisters = new IUnRegister[6];
+
+ _unRegisters[0] = EnumEventSystem.Global.Register(GameLoopEnum.GameStart, () => _inGame = true);
+ _unRegisters[1] = EnumEventSystem.Global.Register(GameLoopEnum.UnPauseGame, () => _inGame = true);
+
+ _unRegisters[2] = EnumEventSystem.Global.Register(GameLoopEnum.GameQuit, () => _inGame = false);
+ _unRegisters[3] = EnumEventSystem.Global.Register(GameLoopEnum.PauseGame, () => _inGame = false);
+
+ _unRegisters[4] = EnumEventSystem.Global.Register(InteractionEventEnum.DialogStart, () => _isDialog = true);
+ _unRegisters[5] = EnumEventSystem.Global.Register(InteractionEventEnum.DialogEnd, () => _isDialog = true);
+ }
+
+ private void UnRegisterEvents()
+ {
+ foreach (var unRegister in _unRegisters)
+ {
+ unRegister.UnRegister();
+ }
+ }
+
+ #endregion
+ }
+}
\ No newline at end of file
diff --git a/Assets/Scripts/Dialog System/LineAdvanceInput.cs.meta b/Assets/Scripts/Dialog System/LineAdvanceInput.cs.meta
new file mode 100644
index 000000000..74616b9c8
--- /dev/null
+++ b/Assets/Scripts/Dialog System/LineAdvanceInput.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 4269da1f8c364e319da84b5fee61bafe
+timeCreated: 1761032421
\ No newline at end of file
diff --git a/Assets/Scripts/Dialog System/LineView.cs b/Assets/Scripts/Dialog System/LineView.cs
index 417a521db..a54033a50 100644
--- a/Assets/Scripts/Dialog System/LineView.cs
+++ b/Assets/Scripts/Dialog System/LineView.cs
@@ -6,6 +6,9 @@ using Yarn.Unity;
namespace AibisDream
{
+ ///
+ /// 对话View，仅用于处理对话文本
+ ///
public class LineView : DialogueViewBase
{
public override void RunLine(LocalizedLine dialogueLine, Action onDialogueLineFinished)
diff --git a/Assets/Scripts/Dialog System/LineViewNew.cs b/Assets/Scripts/Dialog System/LineViewNew.cs
new file mode 100644
index 000000000..1a5eed595
--- /dev/null
+++ b/Assets/Scripts/Dialog System/LineViewNew.cs
@@ -0,0 +1,116 @@
+using System;
+using System.Threading.Tasks;
+using AibisDream.Kit;
+using AibisDream.Utility;
+using UnityEngine;
+using Yarn.Unity;
+
+namespace AibisDream
+{
+ public class LineViewNew : DialogueViewBase
+ {
+ [SerializeField] private LineAdvanceInput advanceInput;
+ // [SerializeField] private BubbleCenter bubbleCenter;
+
+ public override void RunLine(LocalizedLine dialogueLine, Action onDialogueLineFinished)
+ {
+ // 预处理Line和Event
+ var lineSyncEvent = new LineSyncToken(dialogueLine, onDialogueLineFinished);
+ // bubbleCenter.RunLine(lineSyncEvent);
+ advanceInput.RunLine(lineSyncEvent);
+ }
+ }
+
+ public class LineSyncToken
+ {
+ public LineInfo lineInfo;
+ public LineSyncState state;
+
+ public Action nextStep;
+ public event Action SkipTextAnima;
+
+ public LineSyncToken(LocalizedLine lineInfo, Action nextStep)
+ {
+ this.lineInfo = LineInfo.Generate(lineInfo);
+ this.nextStep = nextStep;
+ state = LineSyncState.PlayText;
+ }
+
+ public bool TrySkip()
+ {
+ if (state == LineSyncState.PlayText)
+ {
+ SkipTextAnima?.Invoke();
+ SkipTextAnima = null;
+ return true;
+ }
+ else
+ {
+ Debug.Log($"line{lineInfo.lineId} 状态为{state.ToString()}, 不能跳过文本");
+ return false;
+ }
+ }
+
+ public bool TryAdvance()
+ {
+ if (state == LineSyncState.WaitForAdvance)
+ {
+ nextStep?.Invoke();
+ state = LineSyncState.Advanced;
+ Dispose();
+ return true;
+ }
+ else
+ {
+ Debug.Log($"line{lineInfo.lineId} 状态为{state.ToString()}, 不能向前推进");
+ return false;
+ }
+ }
+
+ private void Dispose()
+ {
+ nextStep = null;
+ SkipTextAnima = null;
+ }
+
+ public void TextStart()
+ {
+ state = LineSyncState.PlayText;
+ }
+
+ public void TextShown()
+ {
+ state = LineSyncState.AdvanceDelay;
+ // 延时
+
+ state = LineSyncState.WaitForAdvance;
+ }
+ }
+
+ public struct LineInfo
+ {
+ public string lineId;
+ public string lineText;
+ public CharacterVo character;
+ public bool isAutoSkip;
+
+ public static LineInfo Generate(LocalizedLine dialogueLine)
+ {
+ return new LineInfo
+ {
+ lineId = dialogueLine.TextID,
+ lineText = dialogueLine.TextWithoutCharacterName.Text,
+ character = dialogueLine.GetCharacterVo(),
+ isAutoSkip = dialogueLine.IsAutoSkipLine()
+ };
+ }
+ }
+
+ public enum LineSyncState
+ {
+ PlayText,
+ AdvanceDelay,
+ WaitForAdvance,
+ Advanced
+ }
+}
\ No newline at end of file
diff --git a/Assets/Scripts/Dialog System/LineViewNew.cs.meta b/Assets/Scripts/Dialog System/LineViewNew.cs.meta
new file mode 100644
index 000000000..454f67899
--- /dev/null
+++ b/Assets/Scripts/Dialog System/LineViewNew.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: f0d1630fcebe4fb38afd0a2bc7b3112b
+timeCreated: 1761032402
\ No newline at end of file
diff --git a/Assets/Scripts/Dialog System/OptionView.cs b/Assets/Scripts/Dialog System/OptionView.cs
new file mode 100644
index 000000000..5e3ac0fad
--- /dev/null
+++ b/Assets/Scripts/Dialog System/OptionView.cs
@@ -0,0 +1,33 @@
+using System;
+using AibisDream.Framework;
+using UnityEngine;
+using Yarn.Unity;
+
+namespace AibisDream
+{
+ public class OptionView : DialogueViewBase
+ {
+ [SerializeField] private DefaultOptions defaultOptions;
+ [SerializeField] private CenterOptions centerOptions;
+
+ public override void RunOptions(DialogueOption[] dialogueOptions, Action onOptionSelected)
+ {
+ EnumEventSystem.Global.Send(DialogEventEnum.OptionShow);
+ var options = DialogOption.GeneOptions(dialogueOptions, onOptionSelected);
+ var viewType = options[0].Character.dialogViewType;
+
+ switch (viewType)
+ {
+ case DialogViewType.Default:
+ defaultOptions.ShowOptions(options);
+ break;
+ case DialogViewType.CenterOption:
+ centerOptions.ShowOptions(options);
+ break;
+ default:
+ Debug.Log($"选项{options[0].Character.key}没有找到选项框");
+ break;
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/Assets/Scripts/Dialog System/OptionView.cs.meta b/Assets/Scripts/Dialog System/OptionView.cs.meta
new file mode 100644
index 000000000..84a27d79d
--- /dev/null
+++ b/Assets/Scripts/Dialog System/OptionView.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 56ee480f25a146839afa8ff058ddfc7a
+timeCreated: 1761032377
\ No newline at end of file
diff --git a/Assets/Scripts/FixSystem/Effect/MouseFollowEffect.cs b/Assets/Scripts/FixSystem/Effect/MouseFollowEffect.cs
index f58b1490a..3508a4c6a 100644
--- a/Assets/Scripts/FixSystem/Effect/MouseFollowEffect.cs
+++ b/Assets/Scripts/FixSystem/Effect/MouseFollowEffect.cs
@@ -221,7 +221,7 @@ namespace AibisDream
private void RegisterDialogEvents()
{
// 监听对话结束事件
- DialogController.OnDialogueComplete += OnDialogueComplete;
+ EnumEventSystem.Global.Register(InteractionEventEnum.DialogStart, OnDialogueComplete);
}
///
@@ -251,10 +251,7 @@ namespace AibisDream
///
private void OnDestroy()
{
- if (DialogController.Instance != null)
- {
- DialogController.OnDialogueComplete -= OnDialogueComplete;
- }
+ EnumEventSystem.Global.UnRegister(InteractionEventEnum.DialogStart, OnDialogueComplete);
}
#endregion
diff --git a/Assets/Scripts/FixSystemNew/BodyModule/CableSystem.cs b/Assets/Scripts/FixSystemNew/BodyModule/CableSystem.cs
index ab9bf978e..f4d0c12a0 100644
--- a/Assets/Scripts/FixSystemNew/BodyModule/CableSystem.cs
+++ b/Assets/Scripts/FixSystemNew/BodyModule/CableSystem.cs
@@ -1,4 +1,5 @@
-using UnityEngine;
+using AibisDream.Framework;
+using UnityEngine;
using DG.Tweening;
using AibisDream.Kit;
@@ -50,14 +51,14 @@ namespace AibisDream.FixSystem
private void OnEnable()
{
- DialogController.OnDialogueStart += HandleDialogueStart;
- DialogController.OnDialogueComplete += HandleDialogueComplete;
+ EnumEventSystem.Global.Register(InteractionEventEnum.DialogEnd, HandleDialogueStart);
+ EnumEventSystem.Global.Register(InteractionEventEnum.DialogStart, HandleDialogueComplete);
}
private void OnDisable()
{
- DialogController.OnDialogueStart -= HandleDialogueStart;
- DialogController.OnDialogueComplete -= HandleDialogueComplete;
+ EnumEventSystem.Global.UnRegister(InteractionEventEnum.DialogEnd, HandleDialogueStart);
+ EnumEventSystem.Global.UnRegister(InteractionEventEnum.DialogStart, HandleDialogueComplete);
}
private void InitComponentRefs()
diff --git a/Assets/Scripts/Framework/Config/Character.cs b/Assets/Scripts/Framework/Config/Character.cs
index a4dca311d..ff69cdd07 100644
--- a/Assets/Scripts/Framework/Config/Character.cs
+++ b/Assets/Scripts/Framework/Config/Character.cs
@@ -84,6 +84,7 @@ namespace AibisDream.Kit
{
Aside,
Player,
- MainActor
+ MainActor,
+ Center
}
}
\ No newline at end of file
diff --git a/Assets/Scripts/Game Loop/EventEnums.cs b/Assets/Scripts/Game Loop/EventEnums.cs
index 4f2a8d83c..108c445f1 100644
--- a/Assets/Scripts/Game Loop/EventEnums.cs
+++ b/Assets/Scripts/Game Loop/EventEnums.cs
@@ -35,8 +35,8 @@ namespace AibisDream
public enum InteractionEventEnum
{
- Start,
- End
+ DialogStart,
+ DialogEnd
}
public struct DialogText
diff --git a/Assets/Scripts/MiniGame/Gear/GearSystem.cs b/Assets/Scripts/MiniGame/Gear/GearSystem.cs
index 89b24378b..fe9c0796e 100644
--- a/Assets/Scripts/MiniGame/Gear/GearSystem.cs
+++ b/Assets/Scripts/MiniGame/Gear/GearSystem.cs
@@ -68,8 +68,8 @@ namespace AibisDream
private void OnEnable()
{
- var unRegister1 = EnumEventSystem.Global.Register(InteractionEventEnum.Start, () => _isInteractive = true);
- var unRegister2 = EnumEventSystem.Global.Register(InteractionEventEnum.End, () => _isInteractive = false);
+ var unRegister1 = EnumEventSystem.Global.Register(InteractionEventEnum.DialogStart, () => _isInteractive = true);
+ var unRegister2 = EnumEventSystem.Global.Register(InteractionEventEnum.DialogEnd, () => _isInteractive = false);
_evtUnRegisters = new[] { unRegister1, unRegister2 };
}
diff --git a/Assets/Scripts/UI/Cursor/CursorManager.cs b/Assets/Scripts/UI/Cursor/CursorManager.cs
index b87bbe059..3cde09319 100644
--- a/Assets/Scripts/UI/Cursor/CursorManager.cs
+++ b/Assets/Scripts/UI/Cursor/CursorManager.cs
@@ -135,8 +135,8 @@ namespace AibisDream
private void RegisterTriggerEvent()
{
// 交互相关
- _unRegisters.Add(EnumEventSystem.Global.Register(InteractionEventEnum.Start, OnInteractiveStart));
- _unRegisters.Add(EnumEventSystem.Global.Register(InteractionEventEnum.End, OnInteractiveEnd));
+ _unRegisters.Add(EnumEventSystem.Global.Register(InteractionEventEnum.DialogStart, OnInteractiveStart));
+ _unRegisters.Add(EnumEventSystem.Global.Register(InteractionEventEnum.DialogEnd, OnInteractiveEnd));
_unRegisters.Add(
EnumEventSystem.Global.Register(TriggerEnum.PointerEnter, OnPointerEnter));
diff --git a/Assets/Scripts/UI/DialogUI/Bubbles/Bubble.cs b/Assets/Scripts/UI/DialogUI/Bubbles/Bubble.cs
index 633704c3c..b4985cfcf 100644
--- a/Assets/Scripts/UI/DialogUI/Bubbles/Bubble.cs
+++ b/Assets/Scripts/UI/DialogUI/Bubbles/Bubble.cs
@@ -1,5 +1,4 @@
using System;
-using System.Text.RegularExpressions;
using AibisDream.Framework;
using AibisDream.Kit;
using AibisDream.Utility;
@@ -10,7 +9,7 @@ using UnityEngine.UI;
namespace AibisDream
{
- public class Bubble : MonoBehaviour
+ public class Bubble : MonoBehaviour, IBubble
{
private TypewriterCore _typewriter;
private TMP_Text _actorName;
@@ -24,16 +23,18 @@ namespace AibisDream
#region 参数
- [SerializeField] public ActorRole role;
- [SerializeField] public int idx;
+ [SerializeField] private ActorRole role;
+ [SerializeField] private int idx;
[SerializeField] private int maxWidth;
[SerializeField] private int minWidth;
+
+ public ActorRole Role => role;
+ public int Idx => idx;
#endregion
public event Action OnDisposed;
-
- public bool IsShowingText => _typewriter.isShowingText;
+ public event Action OnLineShown;
public void LoadConfig(BubbleSlotData data)
{
@@ -47,6 +48,14 @@ namespace AibisDream
rect.localPosition = UIManager.GetDialogUIPos(data.slotPosition);
// 设置style
SetStyle(data.bubbleStyle, data.pivotType);
+ // 注册事件
+ _typewriter.onTextShowed.AddListener(InvokeLineShown);
+ }
+
+ private void InvokeLineShown()
+ {
+ OnLineShown?.Invoke();
+ OnLineShown = null;
}
private void SetStyle(BubbleStyle bubbleStyle, PivotType pivotType)
@@ -93,7 +102,7 @@ namespace AibisDream
? string.Empty
: characterVo.GetActorName();
}
-
+
public void ShowLine(string line)
{
_typewriter.TextAnimator.SetText("");
@@ -102,11 +111,16 @@ namespace AibisDream
_typewriter.ShowText(line);
}
- public void SkipLine()
+ public bool SkipLine()
{
if (_typewriter.isShowingText)
{
_typewriter.SkipTypewriter();
+ return true;
+ }
+ else
+ {
+ return false;
}
}
@@ -118,6 +132,7 @@ namespace AibisDream
public void Dispose()
{
Hide();
+ _typewriter.onTextShowed.RemoveAllListeners();
OnDisposed?.Invoke(this);
OnDisposed = null;
}
@@ -125,8 +140,7 @@ namespace AibisDream
private void HandleLayout(string line)
{
// 先去除富文本标签
- line = Regex.Replace(line.Replace("
", "\n"), "[<|{].*?[>|}]", string.Empty);
- var width = DialogCanvasManager.Instance.EstimateTextWidth(line, _lineText.fontSize);
+ var width = DialogCanvasManager.Instance.EstimateTextWidth(line.RemoveRichTextTags(), _lineText.fontSize);
if (width > maxWidth)
{
_layoutElement.preferredWidth = maxWidth;
@@ -172,4 +186,16 @@ namespace AibisDream
}
#endif
}
+
+ public interface IBubble
+ {
+ public ActorRole Role { get; }
+ public int Idx { get; }
+
+ public event Action OnLineShown;
+ public void ShowActorName(CharacterVo characterVo);
+ public void ShowLine(string line);
+ public bool SkipLine();
+ public void Hide();
+ }
}
\ No newline at end of file
diff --git a/Assets/Scripts/UI/DialogUI/Bubbles/BubbleGroup.cs b/Assets/Scripts/UI/DialogUI/Bubbles/BubbleGroup.cs
index 66c1badb8..e729476f2 100644
--- a/Assets/Scripts/UI/DialogUI/Bubbles/BubbleGroup.cs
+++ b/Assets/Scripts/UI/DialogUI/Bubbles/BubbleGroup.cs
@@ -9,19 +9,15 @@ namespace AibisDream
{
public class BubbleGroup : Singleton, IDialogView
{
- private BubbleOption[] _options;
+ [SerializeField] private CenterBubble centerBubble;
+
private Dictionary _bubbleDict;
- public DialogViewType CurDialogType { get; private set; }
-
private BubbleFactory _bubbleFactory;
- private SimpleObjectPool _bubblePool;
- private SimpleObjectPool _optionPool;
-
#region 一些索引
-
+
private Action _nextStep;
- private Bubble _curBubble;
+ private IBubble _curBubble;
private IUnRegister _unRegister;
@@ -31,12 +27,8 @@ namespace AibisDream
public override void OnSingletonInit()
{
- // 注册泡泡
- _unRegister =
- EnumEventSystem.Global.Register(DialogEventEnum.OptionSelected,
- _ => HideOptions());
// 工厂
- _bubbleFactory = new BubbleFactory(transform.Find("Bubbles"));
+ _bubbleFactory = new BubbleFactory(transform);
// 加载选项
InitOptions();
}
@@ -53,7 +45,6 @@ namespace AibisDream
public void LoadBubbles(BubbleSlotGroupData groupData)
{
- CurDialogType = groupData.dialogViewType;
// 回收旧泡泡
foreach (var oldBubble in _bubbleDict.Values.SelectMany(item => item))
{
@@ -63,35 +54,18 @@ namespace AibisDream
// 加载新泡泡
_bubbleDict = groupData.bubbleSlots
.Select(item => _bubbleFactory.Create(item))
- .GroupBy(item => item.role)
+ .GroupBy(item => item.Role)
.ToDictionary(group => group.Key, group => group.ToArray());
-
- // 更新选项的位置
- if (groupData.bubbleOptionSlots is { Length: 0 })
- {
- return;
- }
-
- foreach (var optionSlotData in groupData.bubbleOptionSlots)
- {
- if (optionSlotData.optionIdx >= _options.Length) continue;
- _options[optionSlotData.optionIdx].LoadData(optionSlotData);
- }
}
private void InitOptions()
{
- _options = transform.Find("Options")
- .GetComponentsInChildren(true)
- .OrderBy(item => item.optionIdx)
- .ToArray();
-
_bubbleDict = new Dictionary();
}
#endregion
- #region 对话框功能实现
+ #region 旧对话框功能实现
public void ShowLine(string dialogLine, CharacterVo character, Action nextStep, string lineId,
bool isAutoSkip = false)
@@ -121,48 +95,24 @@ namespace AibisDream
Debug.Log($"[BubbleGroup] ShowLine - 设置完成，_nextStep是否为null: {_nextStep == null}");
}
- public void ShowOptions(DialogOption[] dialogueOptions)
- {
- HideDialog();
- var availableOptions = dialogueOptions.Where(item => item.IsAvailable).ToArray();
- // 如果仅由一个选项
- if (availableOptions.Length == 1)
- {
- _options[0].ShowOption(availableOptions[0]);
- }
- else
- {
- for (var i = 0; i < availableOptions.Length; i++)
- {
- _options[i + 1].ShowOption(availableOptions[i]);
- }
- }
- }
-
public void HideDialog()
{
foreach (var textBubble in _bubbleDict.Values.SelectMany(inner => inner))
{
textBubble.Hide();
}
-
- HideOptions();
+
+ centerBubble.Hide();
}
public bool TrySkipLine(bool isForceSkip = false)
{
- if (!_curBubble)
+ if (_curBubble == null)
{
return true;
}
- if (_curBubble && _curBubble.IsShowingText)
- {
- _curBubble.SkipLine();
- return true;
- }
-
- return false;
+ return _curBubble.SkipLine();
}
public void NextStep()
@@ -174,8 +124,6 @@ namespace AibisDream
Debug.Log("[BubbleGroup] NextStep - _nextStep为null，提前返回");
return;
}
-
- Debug.Log("[BubbleGroup] NextStep - 发送LineEnd事件");
var next = _nextStep;
_nextStep = null;
@@ -183,35 +131,40 @@ namespace AibisDream
_curBubble?.Hide();
_curBubble = null;
- Debug.Log("[BubbleGroup] NextStep - 调用回调");
next?.Invoke();
- Debug.Log("[BubbleGroup] NextStep - 回调调用完成");
}
public void OnLocalizationChanged(string value)
{
}
-
- #endregion
-
- private void HideDialog(Bubble activeBubble)
+
+ private void HideDialog(IBubble activeBubble)
{
foreach (var textBubble in _bubbleDict.Values.SelectMany(inner => inner))
{
- if (activeBubble != textBubble)
+ if (activeBubble != (IBubble)textBubble)
{
textBubble.Hide();
}
}
- HideOptions();
+ if (activeBubble != (IBubble)centerBubble)
+ {
+ centerBubble.Hide();
+ }
}
- private bool TryGetBubble(ActorRole role, int idx, out Bubble bubble)
+ private bool TryGetBubble(ActorRole role, int idx, out IBubble bubble)
{
+ if (role == ActorRole.Center)
+ {
+ bubble = centerBubble;
+ return true;
+ }
+
if (_bubbleDict.TryGetValue(role, out var bubbles))
{
- bubble = bubbles.FirstOrDefault(item => item.idx == idx);
+ bubble = bubbles.FirstOrDefault(item => item.Idx == idx);
return bubble != null;
}
@@ -219,12 +172,32 @@ namespace AibisDream
return false;
}
- private void HideOptions()
+ #endregion
+
+ #region 新对话框功能实现
+
+ public void RunLine(LineSyncToken syncToken)
{
- foreach (var option in _options)
+ var character = syncToken.lineInfo.character;
+
+ if (TryGetBubble(character.role, character.bubbleIdx, out var bubble))
{
- option.Hide();
+ // 注册事件
+ bubble.OnLineShown += syncToken.TextShown;
+ syncToken.SkipTextAnima += () => bubble.SkipLine();
+ // 播放文字
+ bubble.ShowActorName(character);
+ bubble.ShowLine(syncToken.lineInfo.lineText);
+ // 将非选定的Bubble隐藏
+ HideDialog(bubble);
+ }
+ else
+ {
+ Debug.LogWarning($"{character.GetActorName()}的Role {character.role}没有对应Bubble");
+ HideDialog();
}
}
+
+ #endregion
}
}
\ No newline at end of file
diff --git a/Assets/Scripts/UI/DialogUI/Bubbles/BubbleOption.cs b/Assets/Scripts/UI/DialogUI/Bubbles/BubbleOption.cs
index b731d5080..54ded6bb4 100644
--- a/Assets/Scripts/UI/DialogUI/Bubbles/BubbleOption.cs
+++ b/Assets/Scripts/UI/DialogUI/Bubbles/BubbleOption.cs
@@ -1,4 +1,5 @@
-using TMPro;
+using System;
+using TMPro;
using UnityEngine;
using UnityEngine.UI;
@@ -17,12 +18,7 @@ namespace AibisDream
_button = GetComponent