From f14cdf90f6c4149820314faaa6bc60a21c8fc668 Mon Sep 17 00:00:00 2001
From: Ding Yuntian <1491671119@qq.com>
Date: Wed, 4 Jun 2025 21:45:50 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E8=AF=9D=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Assets/Render/Renderer2Dtest.asset | 6 +-
.../Basic Function/Clinic System.prefab | 122 --
Assets/Scenes/ExpressFixScene.unity | 2 +-
Assets/Scenes/Persistence.unity | 1361 +++++++++--------
.../Scripts/FixSystemNew/BodyModule/Plug.cs | 2 +-
Assets/Scripts/FixSystemNew/Open/MinHand.cs | 2 +-
.../Scripts/Framework/OtherKit/CameraKit.cs | 24 +-
Assets/Scripts/Game Loop/EventEnums.cs | 2 -
Assets/Scripts/MiniGame/Engine/CordPull.cs | 2 +-
Assets/Scripts/MiniGame/Gear/Gear.cs | 4 +-
.../MiniGame/HuoShan/ExpressionPlug.cs | 2 +-
Assets/Scripts/Playable.meta | 3 -
Assets/Scripts/Playable/DeepIn.meta | 3 -
.../Playable/DeepIn/DeepInPlayableAsset.cs | 23 -
.../DeepIn/DeepInPlayableAsset.cs.meta | 3 -
.../DeepIn/DeepInPlayableBehaviour.cs | 43 -
.../DeepIn/DeepInPlayableBehaviour.cs.meta | 3 -
Assets/Scripts/Playable/SpriteLoop.meta | 3 -
.../SpriteLoop/SpriteLoopPlayableAsset.cs | 16 -
.../SpriteLoopPlayableAsset.cs.meta | 3 -
Assets/Scripts/UI/DialogUI/Bubbles.meta | 3 +
Assets/Scripts/UI/DialogUI/Bubbles/Bubble.cs | 72 +
.../UI/DialogUI/Bubbles/Bubble.cs.meta | 3 +
.../UI/DialogUI/Bubbles/BubbleGroup.cs | 155 ++
.../UI/DialogUI/Bubbles/BubbleGroup.cs.meta | 3 +
.../UI/DialogUI/Bubbles/BubbleOption.cs | 37 +
.../UI/DialogUI/Bubbles/BubbleOption.cs.meta | 3 +
.../UI/DialogUI/Bubbles/BubbleOptionSlot.cs | 24 +
.../DialogUI/Bubbles/BubbleOptionSlot.cs.meta | 11 +
.../Scripts/UI/DialogUI/Bubbles/BubbleSlot.cs | 31 +
.../UI/DialogUI/Bubbles/BubbleSlot.cs.meta | 11 +
.../UI/DialogUI/Bubbles/BubbleSlotGroup.cs | 27 +
.../DialogUI/Bubbles/BubbleSlotGroup.cs.meta | 3 +
Assets/Scripts/UI/DialogUI/CenterText.cs | 21 -
.../UI/DialogUI/DialogCanvasManager.cs | 22 +-
Assets/Scripts/UI/DialogUI/TextBubbleGroup.cs | 13 -
Assets/Scripts/Utility/CommonUtil.cs | 27 -
37 files changed, 1129 insertions(+), 966 deletions(-)
delete mode 100644 Assets/Scripts/Playable.meta
delete mode 100644 Assets/Scripts/Playable/DeepIn.meta
delete mode 100644 Assets/Scripts/Playable/DeepIn/DeepInPlayableAsset.cs
delete mode 100644 Assets/Scripts/Playable/DeepIn/DeepInPlayableAsset.cs.meta
delete mode 100644 Assets/Scripts/Playable/DeepIn/DeepInPlayableBehaviour.cs
delete mode 100644 Assets/Scripts/Playable/DeepIn/DeepInPlayableBehaviour.cs.meta
delete mode 100644 Assets/Scripts/Playable/SpriteLoop.meta
delete mode 100644 Assets/Scripts/Playable/SpriteLoop/SpriteLoopPlayableAsset.cs
delete mode 100644 Assets/Scripts/Playable/SpriteLoop/SpriteLoopPlayableAsset.cs.meta
create mode 100644 Assets/Scripts/UI/DialogUI/Bubbles.meta
create mode 100644 Assets/Scripts/UI/DialogUI/Bubbles/Bubble.cs
create mode 100644 Assets/Scripts/UI/DialogUI/Bubbles/Bubble.cs.meta
create mode 100644 Assets/Scripts/UI/DialogUI/Bubbles/BubbleGroup.cs
create mode 100644 Assets/Scripts/UI/DialogUI/Bubbles/BubbleGroup.cs.meta
create mode 100644 Assets/Scripts/UI/DialogUI/Bubbles/BubbleOption.cs
create mode 100644 Assets/Scripts/UI/DialogUI/Bubbles/BubbleOption.cs.meta
create mode 100644 Assets/Scripts/UI/DialogUI/Bubbles/BubbleOptionSlot.cs
create mode 100644 Assets/Scripts/UI/DialogUI/Bubbles/BubbleOptionSlot.cs.meta
create mode 100644 Assets/Scripts/UI/DialogUI/Bubbles/BubbleSlot.cs
create mode 100644 Assets/Scripts/UI/DialogUI/Bubbles/BubbleSlot.cs.meta
create mode 100644 Assets/Scripts/UI/DialogUI/Bubbles/BubbleSlotGroup.cs
create mode 100644 Assets/Scripts/UI/DialogUI/Bubbles/BubbleSlotGroup.cs.meta
diff --git a/Assets/Render/Renderer2Dtest.asset b/Assets/Render/Renderer2Dtest.asset
index ca0f21b2e..097c92967 100644
--- a/Assets/Render/Renderer2Dtest.asset
+++ b/Assets/Render/Renderer2Dtest.asset
@@ -1346,7 +1346,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 729a2e952309e2547a3747b2cdd9a36f, type: 3}
m_Name: ShapesRenderFeature
m_EditorClassIdentifier:
- m_Active: 1
+ m_Active: 0
--- !u!114 &5440560837828023301
MonoBehaviour:
m_ObjectHideFlags: 3
@@ -1444,7 +1444,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 9c53165b379c3d94ca34b12cb8eb10f1, type: 3}
m_Name: VolFx
m_EditorClassIdentifier:
- m_Active: 0
+ m_Active: 1
_event: 550
_format:
enabled: 1
@@ -1593,7 +1593,7 @@ MonoBehaviour:
enabled: 1
value:
serializedVersion: 2
- m_Bits: 2080
+ m_Bits: 2048
_source:
_source: 1
_globalTex: _inputTex
diff --git a/Assets/Resources/Prefabs/Basic Function/Clinic System.prefab b/Assets/Resources/Prefabs/Basic Function/Clinic System.prefab
index ced3d8fbb..d61542f48 100644
--- a/Assets/Resources/Prefabs/Basic Function/Clinic System.prefab
+++ b/Assets/Resources/Prefabs/Basic Function/Clinic System.prefab
@@ -673,68 +673,6 @@ MonoBehaviour:
configKey:
curState:
shown: 0
---- !u!1 &1639833600533724552
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 8231646934124754229}
- m_Layer: 0
- m_Name: point1
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!4 &8231646934124754229
-Transform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1639833600533724552}
- serializedVersion: 2
- m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: -18.69, y: -0.8780389, z: 0.17592919}
- m_LocalScale: {x: 1, y: 1, z: 1}
- m_ConstrainProportionsScale: 0
- m_Children: []
- m_Father: {fileID: 5133231342155857510}
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &1798749109056220643
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 4758456051447362104}
- m_Layer: 0
- m_Name: point2
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!4 &4758456051447362104
-Transform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1798749109056220643}
- serializedVersion: 2
- m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: 8.91642, y: -0.8780389, z: 0.17592919}
- m_LocalScale: {x: 1, y: 1, z: 1}
- m_ConstrainProportionsScale: 0
- m_Children: []
- m_Father: {fileID: 5133231342155857510}
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &2098514882770315859
GameObject:
m_ObjectHideFlags: 0
@@ -898,65 +836,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: ac0b09e7857660247b1477e93731de29, type: 3}
m_Name:
m_EditorClassIdentifier:
---- !u!1 &4969470428602197235
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 5133231342155857510}
- - component: {fileID: 1678425565379988174}
- m_Layer: 0
- m_Name: CharacterSpawner
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 0
---- !u!4 &5133231342155857510
-Transform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 4969470428602197235}
- serializedVersion: 2
- m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: 1.5335798, y: -5.9219613, z: -0.17592919}
- m_LocalScale: {x: 1, y: 1, z: 1}
- m_ConstrainProportionsScale: 0
- m_Children:
- - {fileID: 8231646934124754229}
- - {fileID: 4758456051447362104}
- m_Father: {fileID: 7333995943917754426}
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &1678425565379988174
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 4969470428602197235}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 3ff36d886d83ad44fb2a731efee3b46e, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- characterPrefabs:
- - {fileID: 7830587467202021117, guid: e374290142145aa49aca3d0f2f925268, type: 3}
- - {fileID: 6853557543518115512, guid: 877a0bd4086d355479b6f6737177c32a, type: 3}
- - {fileID: 753276960053003704, guid: 08806bc91bf9b8642bbe827cb6b48fe1, type: 3}
- - {fileID: 7821253403148704578, guid: 52af00ac86616dd4da00f41e40611ae6, type: 3}
- - {fileID: 4522040687628375693, guid: f68b21d02a533714cbc72e4ba4975496, type: 3}
- spawnPoints:
- - {fileID: 8231646934124754229}
- - {fileID: 4758456051447362104}
- IntervalBetweenWave: {x: 2, y: 4}
- minSpawnCount: 2
- maxSpawnCount: 4
- IntervalBetweenCharacter: {x: 4, y: 6}
--- !u!1 &5505251028286205928
GameObject:
m_ObjectHideFlags: 0
@@ -1159,7 +1038,6 @@ Transform:
- {fileID: 997395576468173360}
- {fileID: 8988582123737961170}
- {fileID: 1289813725535206033}
- - {fileID: 5133231342155857510}
- {fileID: 8348444316318293934}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
diff --git a/Assets/Scenes/ExpressFixScene.unity b/Assets/Scenes/ExpressFixScene.unity
index c8af13646..e6ebee528 100644
--- a/Assets/Scenes/ExpressFixScene.unity
+++ b/Assets/Scenes/ExpressFixScene.unity
@@ -14016,7 +14016,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 1
+ m_IsActive: 0
--- !u!114 &2035067109
MonoBehaviour:
m_ObjectHideFlags: 0
diff --git a/Assets/Scenes/Persistence.unity b/Assets/Scenes/Persistence.unity
index 170d1865d..022bb91e9 100644
--- a/Assets/Scenes/Persistence.unity
+++ b/Assets/Scenes/Persistence.unity
@@ -603,30 +603,6 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 243936684424215245}
m_Modifications:
- - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: _sID
- value: 67e03198-f3fa-40e3-88ca-042210787447
- objectReference: {fileID: 0}
- - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: graphManager
- value:
- objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
- - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: _sID
- value: 39cf0bb1-4276-40ca-8336-c91048fb4ba1
- objectReference: {fileID: 0}
- - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: graphManager
- value:
- objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
- - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: _sID
- value: 27840e3a-f0c8-4ee8-a048-4e57774c3376
- objectReference: {fileID: 0}
- - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: graphManager
- value:
- objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
- target: {fileID: 23699057384935269, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3}
propertyPath: m_Pivot.x
value: 0.5
@@ -851,6 +827,30 @@ PrefabInstance:
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
+ - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: _sID
+ value: 67e03198-f3fa-40e3-88ca-042210787447
+ objectReference: {fileID: 0}
+ - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: graphManager
+ value:
+ objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
+ - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: _sID
+ value: 39cf0bb1-4276-40ca-8336-c91048fb4ba1
+ objectReference: {fileID: 0}
+ - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: graphManager
+ value:
+ objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
+ - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: _sID
+ value: 27840e3a-f0c8-4ee8-a048-4e57774c3376
+ objectReference: {fileID: 0}
+ - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: graphManager
+ value:
+ objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects:
@@ -899,30 +899,6 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 243936684424215245}
m_Modifications:
- - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: _sID
- value: 67e03198-f3fa-40e3-88ca-042210787447
- objectReference: {fileID: 0}
- - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: graphManager
- value:
- objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
- - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: _sID
- value: 39cf0bb1-4276-40ca-8336-c91048fb4ba1
- objectReference: {fileID: 0}
- - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: graphManager
- value:
- objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
- - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: _sID
- value: 27840e3a-f0c8-4ee8-a048-4e57774c3376
- objectReference: {fileID: 0}
- - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: graphManager
- value:
- objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
- target: {fileID: 23699057384935269, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3}
propertyPath: m_Pivot.x
value: 0.5
@@ -1147,6 +1123,30 @@ PrefabInstance:
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
+ - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: _sID
+ value: 67e03198-f3fa-40e3-88ca-042210787447
+ objectReference: {fileID: 0}
+ - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: graphManager
+ value:
+ objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
+ - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: _sID
+ value: 39cf0bb1-4276-40ca-8336-c91048fb4ba1
+ objectReference: {fileID: 0}
+ - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: graphManager
+ value:
+ objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
+ - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: _sID
+ value: 27840e3a-f0c8-4ee8-a048-4e57774c3376
+ objectReference: {fileID: 0}
+ - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: graphManager
+ value:
+ objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects:
@@ -1637,30 +1637,6 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 243936684424215245}
m_Modifications:
- - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: _sID
- value: 67e03198-f3fa-40e3-88ca-042210787447
- objectReference: {fileID: 0}
- - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: graphManager
- value:
- objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
- - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: _sID
- value: 39cf0bb1-4276-40ca-8336-c91048fb4ba1
- objectReference: {fileID: 0}
- - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: graphManager
- value:
- objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
- - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: _sID
- value: 27840e3a-f0c8-4ee8-a048-4e57774c3376
- objectReference: {fileID: 0}
- - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: graphManager
- value:
- objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
- target: {fileID: 23699057384935269, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3}
propertyPath: m_Pivot.x
value: 0.5
@@ -1885,6 +1861,30 @@ PrefabInstance:
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
+ - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: _sID
+ value: 67e03198-f3fa-40e3-88ca-042210787447
+ objectReference: {fileID: 0}
+ - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: graphManager
+ value:
+ objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
+ - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: _sID
+ value: 39cf0bb1-4276-40ca-8336-c91048fb4ba1
+ objectReference: {fileID: 0}
+ - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: graphManager
+ value:
+ objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
+ - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: _sID
+ value: 27840e3a-f0c8-4ee8-a048-4e57774c3376
+ objectReference: {fileID: 0}
+ - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: graphManager
+ value:
+ objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects:
@@ -2420,30 +2420,6 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 243936684424215245}
m_Modifications:
- - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: _sID
- value: 67e03198-f3fa-40e3-88ca-042210787447
- objectReference: {fileID: 0}
- - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: graphManager
- value:
- objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
- - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: _sID
- value: 39cf0bb1-4276-40ca-8336-c91048fb4ba1
- objectReference: {fileID: 0}
- - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: graphManager
- value:
- objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
- - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: _sID
- value: 27840e3a-f0c8-4ee8-a048-4e57774c3376
- objectReference: {fileID: 0}
- - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: graphManager
- value:
- objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
- target: {fileID: 23699057384935269, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3}
propertyPath: m_Pivot.x
value: 0.5
@@ -2664,6 +2640,30 @@ PrefabInstance:
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
+ - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: _sID
+ value: 67e03198-f3fa-40e3-88ca-042210787447
+ objectReference: {fileID: 0}
+ - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: graphManager
+ value:
+ objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
+ - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: _sID
+ value: 39cf0bb1-4276-40ca-8336-c91048fb4ba1
+ objectReference: {fileID: 0}
+ - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: graphManager
+ value:
+ objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
+ - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: _sID
+ value: 27840e3a-f0c8-4ee8-a048-4e57774c3376
+ objectReference: {fileID: 0}
+ - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: graphManager
+ value:
+ objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects:
@@ -2733,10 +2733,10 @@ RectTransform:
m_Children: []
m_Father: {fileID: 1696845842}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 0}
- m_AnchorMax: {x: 0, y: 0}
- m_AnchoredPosition: {x: 200, y: 0}
- m_SizeDelta: {x: 0, y: 80}
+ m_AnchorMin: {x: 0, y: 1}
+ m_AnchorMax: {x: 0, y: 1}
+ m_AnchoredPosition: {x: 200, y: -250}
+ m_SizeDelta: {x: 119.47, y: 80}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &190932926
MonoBehaviour:
@@ -3132,30 +3132,6 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 243936684424215245}
m_Modifications:
- - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: _sID
- value: 67e03198-f3fa-40e3-88ca-042210787447
- objectReference: {fileID: 0}
- - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: graphManager
- value:
- objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
- - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: _sID
- value: 39cf0bb1-4276-40ca-8336-c91048fb4ba1
- objectReference: {fileID: 0}
- - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: graphManager
- value:
- objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
- - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: _sID
- value: 27840e3a-f0c8-4ee8-a048-4e57774c3376
- objectReference: {fileID: 0}
- - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: graphManager
- value:
- objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
- target: {fileID: 23699057384935269, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3}
propertyPath: m_Pivot.x
value: 0.5
@@ -3384,6 +3360,30 @@ PrefabInstance:
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
+ - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: _sID
+ value: 67e03198-f3fa-40e3-88ca-042210787447
+ objectReference: {fileID: 0}
+ - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: graphManager
+ value:
+ objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
+ - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: _sID
+ value: 39cf0bb1-4276-40ca-8336-c91048fb4ba1
+ objectReference: {fileID: 0}
+ - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: graphManager
+ value:
+ objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
+ - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: _sID
+ value: 27840e3a-f0c8-4ee8-a048-4e57774c3376
+ objectReference: {fileID: 0}
+ - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: graphManager
+ value:
+ objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects:
@@ -3424,30 +3424,6 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 243936684424215245}
m_Modifications:
- - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: _sID
- value: 65545b51-845c-4df4-8f5c-90c1f04cbe23
- objectReference: {fileID: 0}
- - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: graphManager
- value:
- objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
- - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: _sID
- value: 3336344b-f73d-481c-bd5a-548f8a4bead4
- objectReference: {fileID: 0}
- - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: graphManager
- value:
- objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
- - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: _sID
- value: ddd9082f-516c-4e2f-bd55-78c29857f972
- objectReference: {fileID: 0}
- - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: graphManager
- value:
- objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
- target: {fileID: 23699057384935269, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3}
propertyPath: m_Pivot.x
value: 0.5
@@ -3664,6 +3640,30 @@ PrefabInstance:
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
+ - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: _sID
+ value: 65545b51-845c-4df4-8f5c-90c1f04cbe23
+ objectReference: {fileID: 0}
+ - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: graphManager
+ value:
+ objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
+ - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: _sID
+ value: 3336344b-f73d-481c-bd5a-548f8a4bead4
+ objectReference: {fileID: 0}
+ - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: graphManager
+ value:
+ objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
+ - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: _sID
+ value: ddd9082f-516c-4e2f-bd55-78c29857f972
+ objectReference: {fileID: 0}
+ - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: graphManager
+ value:
+ objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
m_RemovedComponents: []
m_RemovedGameObjects:
- {fileID: 7940112695066571942, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3}
@@ -3810,10 +3810,10 @@ RectTransform:
m_Children: []
m_Father: {fileID: 1696845842}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 0}
- m_AnchorMax: {x: 0, y: 0}
- m_AnchoredPosition: {x: 200, y: 0}
- m_SizeDelta: {x: 0, y: 80}
+ m_AnchorMin: {x: 0, y: 1}
+ m_AnchorMax: {x: 0, y: 1}
+ m_AnchoredPosition: {x: 200, y: -50}
+ m_SizeDelta: {x: 238.93, y: 80}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &237392156
MonoBehaviour:
@@ -4010,6 +4010,54 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_HorizontalFit: 2
m_VerticalFit: 0
+--- !u!1 &238296902
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 238296903}
+ - component: {fileID: 238296904}
+ m_Layer: 5
+ m_Name: Bubble Group
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &238296903
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 238296902}
+ 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 &238296904
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 238296902}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: a76234ef7ee34400b306a4823081ba62, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
--- !u!1 &246580517
GameObject:
m_ObjectHideFlags: 0
@@ -6345,30 +6393,6 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 243936684424215245}
m_Modifications:
- - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: _sID
- value: 121bb6da-9055-40a5-ae33-05be2ec09f54
- objectReference: {fileID: 0}
- - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: graphManager
- value:
- objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
- - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: _sID
- value: 3c0ead6f-afd4-41bf-968d-0d36f758e232
- objectReference: {fileID: 0}
- - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: graphManager
- value:
- objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
- - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: _sID
- value: 6b671834-73b4-403d-94d3-0726554589ee
- objectReference: {fileID: 0}
- - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: graphManager
- value:
- objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
- target: {fileID: 23699057384935269, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3}
propertyPath: m_Pivot.x
value: 0.5
@@ -6553,6 +6577,30 @@ PrefabInstance:
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
+ - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: _sID
+ value: 121bb6da-9055-40a5-ae33-05be2ec09f54
+ objectReference: {fileID: 0}
+ - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: graphManager
+ value:
+ objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
+ - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: _sID
+ value: 3c0ead6f-afd4-41bf-968d-0d36f758e232
+ objectReference: {fileID: 0}
+ - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: graphManager
+ value:
+ objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
+ - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: _sID
+ value: 6b671834-73b4-403d-94d3-0726554589ee
+ objectReference: {fileID: 0}
+ - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: graphManager
+ value:
+ objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
@@ -6669,30 +6717,6 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 243936684424215245}
m_Modifications:
- - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: _sID
- value: 67e03198-f3fa-40e3-88ca-042210787447
- objectReference: {fileID: 0}
- - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: graphManager
- value:
- objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
- - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: _sID
- value: 39cf0bb1-4276-40ca-8336-c91048fb4ba1
- objectReference: {fileID: 0}
- - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: graphManager
- value:
- objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
- - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: _sID
- value: 27840e3a-f0c8-4ee8-a048-4e57774c3376
- objectReference: {fileID: 0}
- - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: graphManager
- value:
- objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
- target: {fileID: 23699057384935269, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3}
propertyPath: m_Pivot.x
value: 0.5
@@ -6917,6 +6941,30 @@ PrefabInstance:
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
+ - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: _sID
+ value: 67e03198-f3fa-40e3-88ca-042210787447
+ objectReference: {fileID: 0}
+ - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: graphManager
+ value:
+ objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
+ - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: _sID
+ value: 39cf0bb1-4276-40ca-8336-c91048fb4ba1
+ objectReference: {fileID: 0}
+ - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: graphManager
+ value:
+ objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
+ - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: _sID
+ value: 27840e3a-f0c8-4ee8-a048-4e57774c3376
+ objectReference: {fileID: 0}
+ - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: graphManager
+ value:
+ objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects:
@@ -7043,30 +7091,6 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 243936684424215245}
m_Modifications:
- - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: _sID
- value: 67e03198-f3fa-40e3-88ca-042210787447
- objectReference: {fileID: 0}
- - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: graphManager
- value:
- objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
- - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: _sID
- value: 39cf0bb1-4276-40ca-8336-c91048fb4ba1
- objectReference: {fileID: 0}
- - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: graphManager
- value:
- objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
- - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: _sID
- value: 27840e3a-f0c8-4ee8-a048-4e57774c3376
- objectReference: {fileID: 0}
- - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: graphManager
- value:
- objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
- target: {fileID: 23699057384935269, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3}
propertyPath: m_Pivot.x
value: 0.5
@@ -7291,6 +7315,30 @@ PrefabInstance:
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
+ - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: _sID
+ value: 67e03198-f3fa-40e3-88ca-042210787447
+ objectReference: {fileID: 0}
+ - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: graphManager
+ value:
+ objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
+ - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: _sID
+ value: 39cf0bb1-4276-40ca-8336-c91048fb4ba1
+ objectReference: {fileID: 0}
+ - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: graphManager
+ value:
+ objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
+ - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: _sID
+ value: 27840e3a-f0c8-4ee8-a048-4e57774c3376
+ objectReference: {fileID: 0}
+ - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: graphManager
+ value:
+ objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects:
@@ -7771,30 +7819,6 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 243936684424215245}
m_Modifications:
- - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: _sID
- value: 67e03198-f3fa-40e3-88ca-042210787447
- objectReference: {fileID: 0}
- - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: graphManager
- value:
- objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
- - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: _sID
- value: 39cf0bb1-4276-40ca-8336-c91048fb4ba1
- objectReference: {fileID: 0}
- - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: graphManager
- value:
- objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
- - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: _sID
- value: 27840e3a-f0c8-4ee8-a048-4e57774c3376
- objectReference: {fileID: 0}
- - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: graphManager
- value:
- objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
- target: {fileID: 23699057384935269, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3}
propertyPath: m_Pivot.x
value: 0.5
@@ -8019,6 +8043,30 @@ PrefabInstance:
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
+ - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: _sID
+ value: 67e03198-f3fa-40e3-88ca-042210787447
+ objectReference: {fileID: 0}
+ - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: graphManager
+ value:
+ objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
+ - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: _sID
+ value: 39cf0bb1-4276-40ca-8336-c91048fb4ba1
+ objectReference: {fileID: 0}
+ - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: graphManager
+ value:
+ objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
+ - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: _sID
+ value: 27840e3a-f0c8-4ee8-a048-4e57774c3376
+ objectReference: {fileID: 0}
+ - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: graphManager
+ value:
+ objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects:
@@ -8380,30 +8428,6 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 243936684424215245}
m_Modifications:
- - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: _sID
- value: 67e03198-f3fa-40e3-88ca-042210787447
- objectReference: {fileID: 0}
- - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: graphManager
- value:
- objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
- - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: _sID
- value: 39cf0bb1-4276-40ca-8336-c91048fb4ba1
- objectReference: {fileID: 0}
- - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: graphManager
- value:
- objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
- - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: _sID
- value: 27840e3a-f0c8-4ee8-a048-4e57774c3376
- objectReference: {fileID: 0}
- - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: graphManager
- value:
- objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
- target: {fileID: 23699057384935269, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3}
propertyPath: m_Pivot.x
value: 0.5
@@ -8628,6 +8652,30 @@ PrefabInstance:
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
+ - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: _sID
+ value: 67e03198-f3fa-40e3-88ca-042210787447
+ objectReference: {fileID: 0}
+ - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: graphManager
+ value:
+ objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
+ - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: _sID
+ value: 39cf0bb1-4276-40ca-8336-c91048fb4ba1
+ objectReference: {fileID: 0}
+ - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: graphManager
+ value:
+ objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
+ - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: _sID
+ value: 27840e3a-f0c8-4ee8-a048-4e57774c3376
+ objectReference: {fileID: 0}
+ - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: graphManager
+ value:
+ objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects:
@@ -8694,9 +8742,9 @@ RectTransform:
- {fileID: 576009914}
m_Father: {fileID: 367483172}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 0}
- m_AnchorMax: {x: 0, y: 0}
- m_AnchoredPosition: {x: 0, y: 0}
+ m_AnchorMin: {x: 0, y: 1}
+ m_AnchorMax: {x: 0, y: 1}
+ m_AnchoredPosition: {x: 1795.9999, y: 0}
m_SizeDelta: {x: 64, y: 120}
m_Pivot: {x: 1, y: 1}
--- !u!222 &640896811
@@ -9121,30 +9169,6 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 243936684424215245}
m_Modifications:
- - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: _sID
- value: 65545b51-845c-4df4-8f5c-90c1f04cbe23
- objectReference: {fileID: 0}
- - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: graphManager
- value:
- objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
- - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: _sID
- value: 3336344b-f73d-481c-bd5a-548f8a4bead4
- objectReference: {fileID: 0}
- - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: graphManager
- value:
- objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
- - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: _sID
- value: ddd9082f-516c-4e2f-bd55-78c29857f972
- objectReference: {fileID: 0}
- - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: graphManager
- value:
- objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
- target: {fileID: 23699057384935269, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3}
propertyPath: m_Pivot.x
value: 0.5
@@ -9361,6 +9385,30 @@ PrefabInstance:
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
+ - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: _sID
+ value: 65545b51-845c-4df4-8f5c-90c1f04cbe23
+ objectReference: {fileID: 0}
+ - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: graphManager
+ value:
+ objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
+ - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: _sID
+ value: 3336344b-f73d-481c-bd5a-548f8a4bead4
+ objectReference: {fileID: 0}
+ - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: graphManager
+ value:
+ objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
+ - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: _sID
+ value: ddd9082f-516c-4e2f-bd55-78c29857f972
+ objectReference: {fileID: 0}
+ - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: graphManager
+ value:
+ objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
m_RemovedComponents: []
m_RemovedGameObjects:
- {fileID: 7940112695066571942, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3}
@@ -9982,30 +10030,6 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 243936684424215245}
m_Modifications:
- - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: _sID
- value: 65545b51-845c-4df4-8f5c-90c1f04cbe23
- objectReference: {fileID: 0}
- - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: graphManager
- value:
- objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
- - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: _sID
- value: 3336344b-f73d-481c-bd5a-548f8a4bead4
- objectReference: {fileID: 0}
- - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: graphManager
- value:
- objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
- - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: _sID
- value: ddd9082f-516c-4e2f-bd55-78c29857f972
- objectReference: {fileID: 0}
- - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: graphManager
- value:
- objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
- target: {fileID: 23699057384935269, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3}
propertyPath: m_Pivot.x
value: 0.5
@@ -10222,6 +10246,30 @@ PrefabInstance:
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
+ - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: _sID
+ value: 65545b51-845c-4df4-8f5c-90c1f04cbe23
+ objectReference: {fileID: 0}
+ - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: graphManager
+ value:
+ objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
+ - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: _sID
+ value: 3336344b-f73d-481c-bd5a-548f8a4bead4
+ objectReference: {fileID: 0}
+ - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: graphManager
+ value:
+ objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
+ - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: _sID
+ value: ddd9082f-516c-4e2f-bd55-78c29857f972
+ objectReference: {fileID: 0}
+ - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: graphManager
+ value:
+ objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
m_RemovedComponents: []
m_RemovedGameObjects:
- {fileID: 7940112695066571942, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3}
@@ -10603,30 +10651,6 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 243936684424215245}
m_Modifications:
- - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: _sID
- value: 67e03198-f3fa-40e3-88ca-042210787447
- objectReference: {fileID: 0}
- - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: graphManager
- value:
- objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
- - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: _sID
- value: 39cf0bb1-4276-40ca-8336-c91048fb4ba1
- objectReference: {fileID: 0}
- - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: graphManager
- value:
- objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
- - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: _sID
- value: 27840e3a-f0c8-4ee8-a048-4e57774c3376
- objectReference: {fileID: 0}
- - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: graphManager
- value:
- objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
- target: {fileID: 23699057384935269, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3}
propertyPath: m_Pivot.x
value: 0.5
@@ -10851,6 +10875,30 @@ PrefabInstance:
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
+ - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: _sID
+ value: 67e03198-f3fa-40e3-88ca-042210787447
+ objectReference: {fileID: 0}
+ - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: graphManager
+ value:
+ objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
+ - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: _sID
+ value: 39cf0bb1-4276-40ca-8336-c91048fb4ba1
+ objectReference: {fileID: 0}
+ - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: graphManager
+ value:
+ objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
+ - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: _sID
+ value: 27840e3a-f0c8-4ee8-a048-4e57774c3376
+ objectReference: {fileID: 0}
+ - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: graphManager
+ value:
+ objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects:
@@ -11587,30 +11635,6 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 243936684424215245}
m_Modifications:
- - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: _sID
- value: 67e03198-f3fa-40e3-88ca-042210787447
- objectReference: {fileID: 0}
- - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: graphManager
- value:
- objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
- - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: _sID
- value: 39cf0bb1-4276-40ca-8336-c91048fb4ba1
- objectReference: {fileID: 0}
- - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: graphManager
- value:
- objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
- - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: _sID
- value: 27840e3a-f0c8-4ee8-a048-4e57774c3376
- objectReference: {fileID: 0}
- - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: graphManager
- value:
- objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
- target: {fileID: 23699057384935269, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3}
propertyPath: m_Pivot.x
value: 0.5
@@ -11835,6 +11859,30 @@ PrefabInstance:
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
+ - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: _sID
+ value: 67e03198-f3fa-40e3-88ca-042210787447
+ objectReference: {fileID: 0}
+ - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: graphManager
+ value:
+ objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
+ - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: _sID
+ value: 39cf0bb1-4276-40ca-8336-c91048fb4ba1
+ objectReference: {fileID: 0}
+ - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: graphManager
+ value:
+ objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
+ - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: _sID
+ value: 27840e3a-f0c8-4ee8-a048-4e57774c3376
+ objectReference: {fileID: 0}
+ - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: graphManager
+ value:
+ objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects:
@@ -14436,9 +14484,9 @@ RectTransform:
- {fileID: 527148464}
m_Father: {fileID: 367483172}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 0}
- m_AnchorMax: {x: 0, y: 0}
- m_AnchoredPosition: {x: 0, y: 0}
+ m_AnchorMin: {x: 0, y: 1}
+ m_AnchorMax: {x: 0, y: 1}
+ m_AnchoredPosition: {x: 1701.9999, y: 0}
m_SizeDelta: {x: 64, y: 120}
m_Pivot: {x: 1, y: 1}
--- !u!222 &1164645868
@@ -14912,7 +14960,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 1
+ m_IsActive: 0
--- !u!224 &1216017968
RectTransform:
m_ObjectHideFlags: 0
@@ -15098,30 +15146,6 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 243936684424215245}
m_Modifications:
- - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: _sID
- value: 67e03198-f3fa-40e3-88ca-042210787447
- objectReference: {fileID: 0}
- - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: graphManager
- value:
- objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
- - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: _sID
- value: 39cf0bb1-4276-40ca-8336-c91048fb4ba1
- objectReference: {fileID: 0}
- - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: graphManager
- value:
- objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
- - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: _sID
- value: 27840e3a-f0c8-4ee8-a048-4e57774c3376
- objectReference: {fileID: 0}
- - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: graphManager
- value:
- objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
- target: {fileID: 23699057384935269, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3}
propertyPath: m_Pivot.x
value: 0.5
@@ -15346,6 +15370,30 @@ PrefabInstance:
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
+ - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: _sID
+ value: 67e03198-f3fa-40e3-88ca-042210787447
+ objectReference: {fileID: 0}
+ - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: graphManager
+ value:
+ objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
+ - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: _sID
+ value: 39cf0bb1-4276-40ca-8336-c91048fb4ba1
+ objectReference: {fileID: 0}
+ - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: graphManager
+ value:
+ objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
+ - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: _sID
+ value: 27840e3a-f0c8-4ee8-a048-4e57774c3376
+ objectReference: {fileID: 0}
+ - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: graphManager
+ value:
+ objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects:
@@ -15717,6 +15765,58 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 243936684424215245}
m_Modifications:
+ - target: {fileID: 301155002500816269, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3}
+ propertyPath: m_AnchorMax.x
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 301155002500816269, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3}
+ propertyPath: m_AnchorMin.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 301155002500816269, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3}
+ propertyPath: m_SizeDelta.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 301155002500816269, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3}
+ propertyPath: m_AnchoredPosition.y
+ value: 25.629997
+ objectReference: {fileID: 0}
+ - target: {fileID: 442829669951131826, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3}
+ propertyPath: _sID
+ value: 6f5c7914-f97e-4f47-806a-9794e5f5f769
+ objectReference: {fileID: 0}
+ - target: {fileID: 442829669951131826, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3}
+ propertyPath: graphManager
+ value:
+ objectReference: {fileID: 3728315362672514892}
+ - target: {fileID: 720753418213842348, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3}
+ propertyPath: _sID
+ value: e2613f65-319b-4f62-ba39-a479e7b46ba2
+ objectReference: {fileID: 0}
+ - target: {fileID: 720753418213842348, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3}
+ propertyPath: graphManager
+ value:
+ objectReference: {fileID: 3728315362672514892}
+ - target: {fileID: 2651560808168083272, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3}
+ propertyPath: m_text
+ value: "\u4EC0\u4E48\u5BFC\u81F4\u4E86\u8BB0\u5FC6\u7684Glitch\uFF1F"
+ objectReference: {fileID: 0}
+ - target: {fileID: 4396600131353777755, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3}
+ propertyPath: m_AnchoredPosition.x
+ value: -334
+ objectReference: {fileID: 0}
+ - target: {fileID: 7368283137120249392, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3}
+ propertyPath: _sID
+ value: ac121996-37d7-4305-8828-b90a712ad53e
+ objectReference: {fileID: 0}
+ - target: {fileID: 7368283137120249392, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3}
+ propertyPath: graphManager
+ value:
+ objectReference: {fileID: 3728315362672514892}
+ - target: {fileID: 7940112695066571942, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3}
+ propertyPath: m_IsActive
+ value: 1
+ objectReference: {fileID: 0}
- target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
propertyPath: _sID
value: b6eb921a-5d8b-4e9e-8ff0-21670096721c
@@ -15917,58 +16017,6 @@ PrefabInstance:
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- - target: {fileID: 301155002500816269, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3}
- propertyPath: m_AnchorMax.x
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 301155002500816269, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3}
- propertyPath: m_AnchorMin.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 301155002500816269, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3}
- propertyPath: m_SizeDelta.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 301155002500816269, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3}
- propertyPath: m_AnchoredPosition.y
- value: 25.629997
- objectReference: {fileID: 0}
- - target: {fileID: 442829669951131826, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3}
- propertyPath: _sID
- value: 6f5c7914-f97e-4f47-806a-9794e5f5f769
- objectReference: {fileID: 0}
- - target: {fileID: 442829669951131826, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3}
- propertyPath: graphManager
- value:
- objectReference: {fileID: 3728315362672514892}
- - target: {fileID: 720753418213842348, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3}
- propertyPath: _sID
- value: e2613f65-319b-4f62-ba39-a479e7b46ba2
- objectReference: {fileID: 0}
- - target: {fileID: 720753418213842348, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3}
- propertyPath: graphManager
- value:
- objectReference: {fileID: 3728315362672514892}
- - target: {fileID: 2651560808168083272, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3}
- propertyPath: m_text
- value: "\u4EC0\u4E48\u5BFC\u81F4\u4E86\u8BB0\u5FC6\u7684Glitch\uFF1F"
- objectReference: {fileID: 0}
- - target: {fileID: 4396600131353777755, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3}
- propertyPath: m_AnchoredPosition.x
- value: -334
- objectReference: {fileID: 0}
- - target: {fileID: 7368283137120249392, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3}
- propertyPath: _sID
- value: ac121996-37d7-4305-8828-b90a712ad53e
- objectReference: {fileID: 0}
- - target: {fileID: 7368283137120249392, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3}
- propertyPath: graphManager
- value:
- objectReference: {fileID: 3728315362672514892}
- - target: {fileID: 7940112695066571942, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3}
- propertyPath: m_IsActive
- value: 1
- objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects:
@@ -16356,30 +16404,6 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 243936684424215245}
m_Modifications:
- - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: _sID
- value: 65545b51-845c-4df4-8f5c-90c1f04cbe23
- objectReference: {fileID: 0}
- - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: graphManager
- value:
- objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
- - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: _sID
- value: 3336344b-f73d-481c-bd5a-548f8a4bead4
- objectReference: {fileID: 0}
- - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: graphManager
- value:
- objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
- - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: _sID
- value: ddd9082f-516c-4e2f-bd55-78c29857f972
- objectReference: {fileID: 0}
- - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: graphManager
- value:
- objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
- target: {fileID: 23699057384935269, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3}
propertyPath: m_Pivot.x
value: 0.5
@@ -16600,6 +16624,30 @@ PrefabInstance:
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
+ - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: _sID
+ value: 65545b51-845c-4df4-8f5c-90c1f04cbe23
+ objectReference: {fileID: 0}
+ - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: graphManager
+ value:
+ objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
+ - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: _sID
+ value: 3336344b-f73d-481c-bd5a-548f8a4bead4
+ objectReference: {fileID: 0}
+ - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: graphManager
+ value:
+ objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
+ - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: _sID
+ value: ddd9082f-516c-4e2f-bd55-78c29857f972
+ objectReference: {fileID: 0}
+ - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: graphManager
+ value:
+ objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
m_RemovedComponents: []
m_RemovedGameObjects:
- {fileID: 7940112695066571942, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3}
@@ -17032,30 +17080,6 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 243936684424215245}
m_Modifications:
- - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: _sID
- value: 67e03198-f3fa-40e3-88ca-042210787447
- objectReference: {fileID: 0}
- - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: graphManager
- value:
- objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
- - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: _sID
- value: 39cf0bb1-4276-40ca-8336-c91048fb4ba1
- objectReference: {fileID: 0}
- - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: graphManager
- value:
- objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
- - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: _sID
- value: 27840e3a-f0c8-4ee8-a048-4e57774c3376
- objectReference: {fileID: 0}
- - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: graphManager
- value:
- objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
- target: {fileID: 23699057384935269, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3}
propertyPath: m_Pivot.x
value: 0.5
@@ -17280,6 +17304,30 @@ PrefabInstance:
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
+ - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: _sID
+ value: 67e03198-f3fa-40e3-88ca-042210787447
+ objectReference: {fileID: 0}
+ - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: graphManager
+ value:
+ objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
+ - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: _sID
+ value: 39cf0bb1-4276-40ca-8336-c91048fb4ba1
+ objectReference: {fileID: 0}
+ - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: graphManager
+ value:
+ objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
+ - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: _sID
+ value: 27840e3a-f0c8-4ee8-a048-4e57774c3376
+ objectReference: {fileID: 0}
+ - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: graphManager
+ value:
+ objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects:
@@ -17618,7 +17666,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: d6722100b986b0f42994441d3c0aa9e7, type: 3}
m_Name:
m_EditorClassIdentifier:
- delayTime: 300
--- !u!1001 &1437328103
PrefabInstance:
m_ObjectHideFlags: 0
@@ -17627,30 +17674,6 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 243936684424215245}
m_Modifications:
- - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: _sID
- value: 67e03198-f3fa-40e3-88ca-042210787447
- objectReference: {fileID: 0}
- - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: graphManager
- value:
- objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
- - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: _sID
- value: 39cf0bb1-4276-40ca-8336-c91048fb4ba1
- objectReference: {fileID: 0}
- - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: graphManager
- value:
- objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
- - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: _sID
- value: 27840e3a-f0c8-4ee8-a048-4e57774c3376
- objectReference: {fileID: 0}
- - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: graphManager
- value:
- objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
- target: {fileID: 23699057384935269, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3}
propertyPath: m_Pivot.x
value: 0.5
@@ -17859,6 +17882,30 @@ PrefabInstance:
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
+ - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: _sID
+ value: 67e03198-f3fa-40e3-88ca-042210787447
+ objectReference: {fileID: 0}
+ - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: graphManager
+ value:
+ objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
+ - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: _sID
+ value: 39cf0bb1-4276-40ca-8336-c91048fb4ba1
+ objectReference: {fileID: 0}
+ - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: graphManager
+ value:
+ objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
+ - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: _sID
+ value: 27840e3a-f0c8-4ee8-a048-4e57774c3376
+ objectReference: {fileID: 0}
+ - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: graphManager
+ value:
+ objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects:
@@ -18772,30 +18819,6 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 243936684424215245}
m_Modifications:
- - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: _sID
- value: 67e03198-f3fa-40e3-88ca-042210787447
- objectReference: {fileID: 0}
- - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: graphManager
- value:
- objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
- - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: _sID
- value: 39cf0bb1-4276-40ca-8336-c91048fb4ba1
- objectReference: {fileID: 0}
- - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: graphManager
- value:
- objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
- - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: _sID
- value: 27840e3a-f0c8-4ee8-a048-4e57774c3376
- objectReference: {fileID: 0}
- - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: graphManager
- value:
- objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
- target: {fileID: 23699057384935269, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3}
propertyPath: m_Pivot.x
value: 0.5
@@ -19020,6 +19043,30 @@ PrefabInstance:
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
+ - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: _sID
+ value: 67e03198-f3fa-40e3-88ca-042210787447
+ objectReference: {fileID: 0}
+ - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: graphManager
+ value:
+ objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
+ - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: _sID
+ value: 39cf0bb1-4276-40ca-8336-c91048fb4ba1
+ objectReference: {fileID: 0}
+ - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: graphManager
+ value:
+ objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
+ - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: _sID
+ value: 27840e3a-f0c8-4ee8-a048-4e57774c3376
+ objectReference: {fileID: 0}
+ - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: graphManager
+ value:
+ objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects:
@@ -19491,30 +19538,6 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 243936684424215245}
m_Modifications:
- - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: _sID
- value: 67e03198-f3fa-40e3-88ca-042210787447
- objectReference: {fileID: 0}
- - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: graphManager
- value:
- objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
- - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: _sID
- value: 39cf0bb1-4276-40ca-8336-c91048fb4ba1
- objectReference: {fileID: 0}
- - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: graphManager
- value:
- objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
- - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: _sID
- value: 27840e3a-f0c8-4ee8-a048-4e57774c3376
- objectReference: {fileID: 0}
- - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: graphManager
- value:
- objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
- target: {fileID: 23699057384935269, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3}
propertyPath: m_Pivot.x
value: 0.5
@@ -19739,6 +19762,30 @@ PrefabInstance:
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
+ - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: _sID
+ value: 67e03198-f3fa-40e3-88ca-042210787447
+ objectReference: {fileID: 0}
+ - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: graphManager
+ value:
+ objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
+ - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: _sID
+ value: 39cf0bb1-4276-40ca-8336-c91048fb4ba1
+ objectReference: {fileID: 0}
+ - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: graphManager
+ value:
+ objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
+ - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: _sID
+ value: 27840e3a-f0c8-4ee8-a048-4e57774c3376
+ objectReference: {fileID: 0}
+ - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: graphManager
+ value:
+ objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects:
@@ -20172,6 +20219,7 @@ RectTransform:
- {fileID: 1586904153}
- {fileID: 1403558893}
- {fileID: 725556430}
+ - {fileID: 238296903}
m_Father: {fileID: 1343879457}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
@@ -20191,7 +20239,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: c14c52217dac70244b02fe48d9462bae, type: 3}
m_Name:
m_EditorClassIdentifier:
- tempText: {fileID: 725556433}
blockDuration: 0.5
autoSkipDelay: 1
autoHideDuration: 0.2
@@ -20397,10 +20444,10 @@ RectTransform:
m_Children: []
m_Father: {fileID: 1696845842}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 0}
- m_AnchorMax: {x: 0, y: 0}
- m_AnchoredPosition: {x: 200, y: 0}
- m_SizeDelta: {x: 0, y: 80}
+ m_AnchorMin: {x: 0, y: 1}
+ m_AnchorMax: {x: 0, y: 1}
+ m_AnchoredPosition: {x: 200, y: -350}
+ m_SizeDelta: {x: 119.47, y: 80}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1611684201
MonoBehaviour:
@@ -22676,9 +22723,9 @@ RectTransform:
- {fileID: 1970860741}
m_Father: {fileID: 367483172}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 0}
- m_AnchorMax: {x: 0, y: 0}
- m_AnchoredPosition: {x: 0, y: 0}
+ m_AnchorMin: {x: 0, y: 1}
+ m_AnchorMax: {x: 0, y: 1}
+ m_AnchoredPosition: {x: 1889.9999, y: 0}
m_SizeDelta: {x: 64, y: 120}
m_Pivot: {x: 1, y: 1}
--- !u!222 &1928871882
@@ -23144,10 +23191,10 @@ RectTransform:
m_Children: []
m_Father: {fileID: 1696845842}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 0}
- m_AnchorMax: {x: 0, y: 0}
- m_AnchoredPosition: {x: 200, y: 0}
- m_SizeDelta: {x: 0, y: 80}
+ m_AnchorMin: {x: 0, y: 1}
+ m_AnchorMax: {x: 0, y: 1}
+ m_AnchoredPosition: {x: 200, y: -150}
+ m_SizeDelta: {x: 238.93, y: 80}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1960600463
MonoBehaviour:
@@ -23589,30 +23636,6 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 243936684424215245}
m_Modifications:
- - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: _sID
- value: 67e03198-f3fa-40e3-88ca-042210787447
- objectReference: {fileID: 0}
- - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: graphManager
- value:
- objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
- - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: _sID
- value: 39cf0bb1-4276-40ca-8336-c91048fb4ba1
- objectReference: {fileID: 0}
- - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: graphManager
- value:
- objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
- - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: _sID
- value: 27840e3a-f0c8-4ee8-a048-4e57774c3376
- objectReference: {fileID: 0}
- - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: graphManager
- value:
- objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
- target: {fileID: 23699057384935269, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3}
propertyPath: m_Pivot.x
value: 0.5
@@ -23837,6 +23860,30 @@ PrefabInstance:
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
+ - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: _sID
+ value: 67e03198-f3fa-40e3-88ca-042210787447
+ objectReference: {fileID: 0}
+ - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: graphManager
+ value:
+ objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
+ - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: _sID
+ value: 39cf0bb1-4276-40ca-8336-c91048fb4ba1
+ objectReference: {fileID: 0}
+ - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: graphManager
+ value:
+ objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
+ - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: _sID
+ value: 27840e3a-f0c8-4ee8-a048-4e57774c3376
+ objectReference: {fileID: 0}
+ - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: graphManager
+ value:
+ objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects:
@@ -23877,30 +23924,6 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 243936684424215245}
m_Modifications:
- - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: _sID
- value: 67e03198-f3fa-40e3-88ca-042210787447
- objectReference: {fileID: 0}
- - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: graphManager
- value:
- objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
- - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: _sID
- value: 39cf0bb1-4276-40ca-8336-c91048fb4ba1
- objectReference: {fileID: 0}
- - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: graphManager
- value:
- objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
- - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: _sID
- value: 27840e3a-f0c8-4ee8-a048-4e57774c3376
- objectReference: {fileID: 0}
- - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: graphManager
- value:
- objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
- target: {fileID: 23699057384935269, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3}
propertyPath: m_Pivot.x
value: 0.5
@@ -24125,6 +24148,30 @@ PrefabInstance:
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
+ - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: _sID
+ value: 67e03198-f3fa-40e3-88ca-042210787447
+ objectReference: {fileID: 0}
+ - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: graphManager
+ value:
+ objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
+ - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: _sID
+ value: 39cf0bb1-4276-40ca-8336-c91048fb4ba1
+ objectReference: {fileID: 0}
+ - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: graphManager
+ value:
+ objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
+ - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: _sID
+ value: 27840e3a-f0c8-4ee8-a048-4e57774c3376
+ objectReference: {fileID: 0}
+ - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: graphManager
+ value:
+ objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects:
@@ -24479,30 +24526,6 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 243936684424215245}
m_Modifications:
- - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: _sID
- value: 65545b51-845c-4df4-8f5c-90c1f04cbe23
- objectReference: {fileID: 0}
- - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: graphManager
- value:
- objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
- - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: _sID
- value: 3336344b-f73d-481c-bd5a-548f8a4bead4
- objectReference: {fileID: 0}
- - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: graphManager
- value:
- objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
- - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: _sID
- value: ddd9082f-516c-4e2f-bd55-78c29857f972
- objectReference: {fileID: 0}
- - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
- propertyPath: graphManager
- value:
- objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
- target: {fileID: 23699057384935269, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3}
propertyPath: m_Pivot.x
value: 0.5
@@ -24723,6 +24746,30 @@ PrefabInstance:
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
+ - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: _sID
+ value: 65545b51-845c-4df4-8f5c-90c1f04cbe23
+ objectReference: {fileID: 0}
+ - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: graphManager
+ value:
+ objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
+ - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: _sID
+ value: 3336344b-f73d-481c-bd5a-548f8a4bead4
+ objectReference: {fileID: 0}
+ - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: graphManager
+ value:
+ objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
+ - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: _sID
+ value: ddd9082f-516c-4e2f-bd55-78c29857f972
+ objectReference: {fileID: 0}
+ - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
+ propertyPath: graphManager
+ value:
+ objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
m_RemovedComponents: []
m_RemovedGameObjects:
- {fileID: 7940112695066571942, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3}
@@ -25893,7 +25940,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 1
+ m_IsActive: 0
--- !u!224 &2135943277
RectTransform:
m_ObjectHideFlags: 0
diff --git a/Assets/Scripts/FixSystemNew/BodyModule/Plug.cs b/Assets/Scripts/FixSystemNew/BodyModule/Plug.cs
index 97346996d..22e5d3339 100644
--- a/Assets/Scripts/FixSystemNew/BodyModule/Plug.cs
+++ b/Assets/Scripts/FixSystemNew/BodyModule/Plug.cs
@@ -121,7 +121,7 @@ namespace AibisDream.FixSystem
if (eventData is PointerEventData pointerData)
{
- transform.position = CommonUtil.GetMouseWorldPos(pointerData.position, transform);
+ transform.position = CameraKit.GetMouseWorldPos(pointerData.position);
}
}
diff --git a/Assets/Scripts/FixSystemNew/Open/MinHand.cs b/Assets/Scripts/FixSystemNew/Open/MinHand.cs
index 8b8f8d436..75ed10006 100644
--- a/Assets/Scripts/FixSystemNew/Open/MinHand.cs
+++ b/Assets/Scripts/FixSystemNew/Open/MinHand.cs
@@ -40,7 +40,7 @@ namespace AibisDream
if (data is not PointerEventData pointerData) return;
// 计算鼠标位置与分针中心点的向量
- Vector2 worldPoint = CommonUtil.GetMouseWorldPos(pointerData.position);
+ Vector2 worldPoint = CameraKit.GetMouseWorldPos(pointerData.position);
Vector2 direction = worldPoint - new Vector2(transform.position.x, transform.position.y);
// 计算当前角度
float mouseAngle = Mathf.Atan2(direction.y, direction.x) * Mathf.Rad2Deg;
diff --git a/Assets/Scripts/Framework/OtherKit/CameraKit.cs b/Assets/Scripts/Framework/OtherKit/CameraKit.cs
index d496d00f1..018f4024b 100644
--- a/Assets/Scripts/Framework/OtherKit/CameraKit.cs
+++ b/Assets/Scripts/Framework/OtherKit/CameraKit.cs
@@ -7,7 +7,6 @@ using DG.Tweening;
using DG.Tweening.Core;
using DG.Tweening.Plugins.Options;
using UnityEngine;
-using UnityEngine.Rendering.Universal;
using Yarn.Unity;
namespace AibisDream.Framework
@@ -18,6 +17,8 @@ namespace AibisDream.Framework
private const int HighPriority = 10;
#region 相机组件
+
+ private static Camera _mainCam;
private CinemachineBrain _orthoCameraBrain;
private CinemachineBrain _perspectiveCameraBrain;
@@ -222,6 +223,27 @@ namespace AibisDream.Framework
_perspectiveMainCamera :
_orthoMainCamera;
}
+
+ ///
+ /// 获取鼠标在世界中的位置
+ ///
+ /// 鼠标界面位置
+ /// 世界位置
+ public static Vector3 GetMouseWorldPos(Vector3 mousePoint)
+ {
+ if (!_mainCam) _mainCam = Camera.main;
+
+ mousePoint.z = 0;
+ return _mainCam.ScreenToWorldPoint(mousePoint);
+ }
+
+ public static Vector3 GetScreenPos(Vector3 worldPos)
+ {
+ if (!_mainCam) _mainCam = Camera.main;
+
+ worldPos.z = 0;
+ return _mainCam.WorldToScreenPoint(worldPos);
+ }
}
public static class CinemachineExtension
diff --git a/Assets/Scripts/Game Loop/EventEnums.cs b/Assets/Scripts/Game Loop/EventEnums.cs
index 2ab6b2b71..830d4cae7 100644
--- a/Assets/Scripts/Game Loop/EventEnums.cs
+++ b/Assets/Scripts/Game Loop/EventEnums.cs
@@ -9,8 +9,6 @@ namespace AibisDream
NextYarn,
PlugIn,
PlugOut,
- OpenScreen,
- CloseScreen,
SceneLoad,
FixStateSwitch,
CutStart,
diff --git a/Assets/Scripts/MiniGame/Engine/CordPull.cs b/Assets/Scripts/MiniGame/Engine/CordPull.cs
index e4643edf3..dbea78e65 100644
--- a/Assets/Scripts/MiniGame/Engine/CordPull.cs
+++ b/Assets/Scripts/MiniGame/Engine/CordPull.cs
@@ -110,7 +110,7 @@ namespace AibisDream
private void SetDragTarget(Vector3 mousePos)
{
- var worldPos = CommonUtil.GetMouseWorldPos(mousePos, transform);
+ var worldPos = CameraKit.GetMouseWorldPos(mousePos);
var dragY = CommonUtil.Limit(worldPos.y, _initPos.y, _initPos.y - maxDistance);
diff --git a/Assets/Scripts/MiniGame/Gear/Gear.cs b/Assets/Scripts/MiniGame/Gear/Gear.cs
index 356b21203..540331255 100644
--- a/Assets/Scripts/MiniGame/Gear/Gear.cs
+++ b/Assets/Scripts/MiniGame/Gear/Gear.cs
@@ -102,7 +102,7 @@ namespace AibisDream
if (!IsActive) return;
// 正常情况下不会出错
if (eventData is not PointerEventData pointerData) return;
- transform.position = CommonUtil.GetMouseWorldPos(pointerData.position, transform);
+ transform.position = CameraKit.GetMouseWorldPos(pointerData.position);
targetShaft?.PlugOutGear();
transform.DOPause();
@@ -127,7 +127,7 @@ namespace AibisDream
// 正常情况下不会出错
if (eventData is not PointerEventData pointerData) return;
- transform.position = CommonUtil.GetMouseWorldPos(pointerData.position, transform);
+ transform.position = CameraKit.GetMouseWorldPos(pointerData.position);
var tempShaft = _gearSystem.CheckClosestShaft(transform.position, radius);
if (!tempShaft) return;
diff --git a/Assets/Scripts/MiniGame/HuoShan/ExpressionPlug.cs b/Assets/Scripts/MiniGame/HuoShan/ExpressionPlug.cs
index 1e62c8a1d..37c22f6af 100644
--- a/Assets/Scripts/MiniGame/HuoShan/ExpressionPlug.cs
+++ b/Assets/Scripts/MiniGame/HuoShan/ExpressionPlug.cs
@@ -61,7 +61,7 @@ namespace AibisDream
if (eventData is PointerEventData pointerData)
{
- transform.position = CommonUtil.GetMouseWorldPos(pointerData.position, transform);
+ transform.position = CameraKit.GetMouseWorldPos(pointerData.position);
UpdateCable();
}
}
diff --git a/Assets/Scripts/Playable.meta b/Assets/Scripts/Playable.meta
deleted file mode 100644
index eddbc6ed0..000000000
--- a/Assets/Scripts/Playable.meta
+++ /dev/null
@@ -1,3 +0,0 @@
-fileFormatVersion: 2
-guid: dcc1856a44ab49a588dbd9deec04c196
-timeCreated: 1747214459
\ No newline at end of file
diff --git a/Assets/Scripts/Playable/DeepIn.meta b/Assets/Scripts/Playable/DeepIn.meta
deleted file mode 100644
index aef21ba61..000000000
--- a/Assets/Scripts/Playable/DeepIn.meta
+++ /dev/null
@@ -1,3 +0,0 @@
-fileFormatVersion: 2
-guid: 28d8f35a42df4a9a961767b891ad14f9
-timeCreated: 1747214498
\ No newline at end of file
diff --git a/Assets/Scripts/Playable/DeepIn/DeepInPlayableAsset.cs b/Assets/Scripts/Playable/DeepIn/DeepInPlayableAsset.cs
deleted file mode 100644
index 82aae0b9f..000000000
--- a/Assets/Scripts/Playable/DeepIn/DeepInPlayableAsset.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-using UnityEngine;
-using UnityEngine.Playables;
-
-namespace AibisDream
-{
- [System.Serializable]
- public class DeepInPlayableAsset : PlayableAsset
- {
- public ExposedReference targetObject;
- public Sprite[] sprites;
-
- public override Playable CreatePlayable(PlayableGraph graph, GameObject owner)
- {
- var playable = ScriptPlayable.Create(graph, 0);
- var behaviour = playable.GetBehaviour();
-
- behaviour.targetObject = targetObject.Resolve(graph.GetResolver());
- behaviour.sprites = sprites;
-
- return playable;
- }
- }
-}
\ No newline at end of file
diff --git a/Assets/Scripts/Playable/DeepIn/DeepInPlayableAsset.cs.meta b/Assets/Scripts/Playable/DeepIn/DeepInPlayableAsset.cs.meta
deleted file mode 100644
index f46fac5dc..000000000
--- a/Assets/Scripts/Playable/DeepIn/DeepInPlayableAsset.cs.meta
+++ /dev/null
@@ -1,3 +0,0 @@
-fileFormatVersion: 2
-guid: 605cbd24495e41f49b99eaeca6146819
-timeCreated: 1747215251
\ No newline at end of file
diff --git a/Assets/Scripts/Playable/DeepIn/DeepInPlayableBehaviour.cs b/Assets/Scripts/Playable/DeepIn/DeepInPlayableBehaviour.cs
deleted file mode 100644
index b2ea0360b..000000000
--- a/Assets/Scripts/Playable/DeepIn/DeepInPlayableBehaviour.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-using UnityEngine;
-using UnityEngine.Playables;
-
-namespace AibisDream
-{
- public class DeepInPlayableBehaviour : PlayableBehaviour
- {
- public GameObject targetObject;
- public Sprite[] sprites;
-
- #region 一些索引
-
- private SpriteRenderer _renderer1;
- private SpriteRenderer _renderer2;
- private int _index;
- private float _progress;
-
- #endregion
-
- ///
- /// 循环开始
- ///
- ///
- ///
- public override void OnBehaviourPlay(Playable playable, FrameData info)
- {
- _renderer2 = targetObject.transform.Find("Renderer1").GetComponent();
- }
-
- public override void ProcessFrame(Playable playable, FrameData info, object playerData)
- {
- if (targetObject != null)
- {
-
- }
- }
-
- public override void OnBehaviourPause(Playable playable, FrameData info)
- {
-
- }
- }
-}
\ No newline at end of file
diff --git a/Assets/Scripts/Playable/DeepIn/DeepInPlayableBehaviour.cs.meta b/Assets/Scripts/Playable/DeepIn/DeepInPlayableBehaviour.cs.meta
deleted file mode 100644
index 085f99615..000000000
--- a/Assets/Scripts/Playable/DeepIn/DeepInPlayableBehaviour.cs.meta
+++ /dev/null
@@ -1,3 +0,0 @@
-fileFormatVersion: 2
-guid: d3430f811c8b4e67b317237a954adead
-timeCreated: 1747216004
\ No newline at end of file
diff --git a/Assets/Scripts/Playable/SpriteLoop.meta b/Assets/Scripts/Playable/SpriteLoop.meta
deleted file mode 100644
index 97b607e20..000000000
--- a/Assets/Scripts/Playable/SpriteLoop.meta
+++ /dev/null
@@ -1,3 +0,0 @@
-fileFormatVersion: 2
-guid: d8036b5d104f4f6ea6c2ffdc93451946
-timeCreated: 1747288555
\ No newline at end of file
diff --git a/Assets/Scripts/Playable/SpriteLoop/SpriteLoopPlayableAsset.cs b/Assets/Scripts/Playable/SpriteLoop/SpriteLoopPlayableAsset.cs
deleted file mode 100644
index d62fa4daf..000000000
--- a/Assets/Scripts/Playable/SpriteLoop/SpriteLoopPlayableAsset.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using UnityEngine;
-using UnityEngine.Playables;
-
-namespace AibisDream
-{
- public class SpriteLoopPlayableAsset : PlayableAsset
- {
- public ExposedReference targetObject;
- public Sprite[] sprites;
-
- public override Playable CreatePlayable(PlayableGraph graph, GameObject owner)
- {
- throw new System.NotImplementedException();
- }
- }
-}
\ No newline at end of file
diff --git a/Assets/Scripts/Playable/SpriteLoop/SpriteLoopPlayableAsset.cs.meta b/Assets/Scripts/Playable/SpriteLoop/SpriteLoopPlayableAsset.cs.meta
deleted file mode 100644
index fb0424e00..000000000
--- a/Assets/Scripts/Playable/SpriteLoop/SpriteLoopPlayableAsset.cs.meta
+++ /dev/null
@@ -1,3 +0,0 @@
-fileFormatVersion: 2
-guid: 8b97eda884604ff5bd906f2a7a4859f1
-timeCreated: 1747288570
\ No newline at end of file
diff --git a/Assets/Scripts/UI/DialogUI/Bubbles.meta b/Assets/Scripts/UI/DialogUI/Bubbles.meta
new file mode 100644
index 000000000..f84db68ca
--- /dev/null
+++ b/Assets/Scripts/UI/DialogUI/Bubbles.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: d9cb39e4c7764dcf8f99fe429a8edc19
+timeCreated: 1749038925
\ No newline at end of file
diff --git a/Assets/Scripts/UI/DialogUI/Bubbles/Bubble.cs b/Assets/Scripts/UI/DialogUI/Bubbles/Bubble.cs
new file mode 100644
index 000000000..ba470591c
--- /dev/null
+++ b/Assets/Scripts/UI/DialogUI/Bubbles/Bubble.cs
@@ -0,0 +1,72 @@
+using AibisDream.Framework;
+using AibisDream.Kit;
+using AibisDream.Utility;
+using Febucci.UI.Core;
+using TMPro;
+using UnityEngine;
+
+namespace AibisDream
+{
+ public class Bubble : MonoBehaviour
+ {
+ private TypewriterCore _typewriter;
+ private TMP_Text _actorName;
+
+ #region 参数
+
+ [SerializeField] public ActorRole role;
+ [SerializeField] public int idx;
+ [SerializeField] private int maxCharNum;
+
+ #endregion
+
+ public bool IsShowingText => _typewriter.isShowingText;
+
+ private void Awake()
+ {
+ _typewriter = GetComponentInChildren();
+ _actorName = transform.Find("Actor")?.GetComponent();
+ _typewriter.onTextShowed.AddListener(() => EnumEventSystem.Global.Send(DialogEventEnum.LineShown));
+ }
+
+ public void ShowActorName(CharacterVo characterVo)
+ {
+ if (!_actorName) return;
+
+ _actorName.text = string.IsNullOrEmpty(characterVo.GetActorName())
+ ? string.Empty
+ : characterVo.GetActorName();
+ }
+
+ public void ShowLine(string line)
+ {
+ _typewriter.TextAnimator.SetText("");
+ gameObject.SetActive(true);
+ var formattedLine = CommonUtil.SplitString(line, maxCharNum);
+ _typewriter.ShowText(formattedLine);
+ }
+
+ public void SkipLine()
+ {
+ if (_typewriter.isShowingText)
+ {
+ _typewriter.SkipTypewriter();
+ }
+ }
+
+ public void Hide()
+ {
+ gameObject.SetActive(false);
+ }
+
+ public void OnLocalizationChanged(string value)
+ {
+ var textParam = JsonUtil.ReadBeanByText(value);
+ var tmp = GetComponentInChildren();
+
+ tmp.characterSpacing = textParam.charSpace;
+ _actorName.characterSpacing = textParam.charSpace;
+ maxCharNum = textParam.maxCharNum;
+ }
+ }
+}
\ No newline at end of file
diff --git a/Assets/Scripts/UI/DialogUI/Bubbles/Bubble.cs.meta b/Assets/Scripts/UI/DialogUI/Bubbles/Bubble.cs.meta
new file mode 100644
index 000000000..5b327fd23
--- /dev/null
+++ b/Assets/Scripts/UI/DialogUI/Bubbles/Bubble.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 6adb9d7cc075457a8fece1b14ca4c429
+timeCreated: 1749022700
\ No newline at end of file
diff --git a/Assets/Scripts/UI/DialogUI/Bubbles/BubbleGroup.cs b/Assets/Scripts/UI/DialogUI/Bubbles/BubbleGroup.cs
new file mode 100644
index 000000000..6574e7ca7
--- /dev/null
+++ b/Assets/Scripts/UI/DialogUI/Bubbles/BubbleGroup.cs
@@ -0,0 +1,155 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using AibisDream.Framework;
+using AibisDream.Kit;
+using UnityEngine;
+
+namespace AibisDream
+{
+ public class BubbleGroup : MonoBehaviour, IDialogView
+ {
+ private BubbleOption[] _options;
+ private Dictionary _bubbleDict;
+
+ #region 一些索引
+
+ private Action _nextStep;
+ private Bubble _curBubble;
+
+ #endregion
+
+ #region 生命周期
+
+ private void Awake()
+ {
+ // 注册泡泡
+ EnumEventSystem.Global.Register(DialogEventEnum.OptionSelected, HideOptions);
+ }
+
+ private void Start()
+ {
+ HideDialog();
+ }
+
+ private void OnDestroy()
+ {
+ EnumEventSystem.Global.UnRegister(DialogEventEnum.OptionSelected, HideOptions);
+ }
+
+ public void Init()
+ {
+
+ }
+
+ #endregion
+
+ #region 对话框功能实现
+
+ public void ShowLine(string dialogLine, CharacterVo character, Action nextStep, string lineId,
+ bool isAutoSkip = false)
+ {
+ gameObject.SetActive(true);
+
+ if (TryGetBubble(character.role, character.bubbleIdx, out var bubble))
+ {
+ bubble.ShowActorName(character);
+ bubble.ShowLine(dialogLine);
+ // 将非选定的Bubble隐藏
+ HideDialog(bubble);
+ }
+ else
+ {
+ Debug.LogWarning($"{character.GetActorName()}的Role没有对应Bubble");
+ return;
+ }
+
+ // 保留信息
+ _nextStep = nextStep;
+ _curBubble = bubble;
+ }
+
+ public void ShowOptions(DialogOption[] dialogueOptions)
+ {
+ HideDialog();
+ // 要求最多三个选项
+ for (var i = 0; i < dialogueOptions.Length; i++)
+ {
+ _options[i].ShowOption(dialogueOptions[i]);
+ }
+ }
+
+ public void HideDialog()
+ {
+ foreach (var textBubble in _bubbleDict.Values.SelectMany(inner => inner))
+ {
+ textBubble.Hide();
+ }
+
+ HideOptions();
+ }
+
+ public bool TrySkipLine(bool isForceSkip = false)
+ {
+ if (_curBubble.IsShowingText)
+ {
+ _curBubble.SkipLine();
+ return true;
+ }
+
+ return false;
+ }
+
+ public void NextStep()
+ {
+ if (_nextStep == null) return;
+
+ EnumEventSystem.Global.Send(DialogEventEnum.LineEnd);
+ var next = _nextStep;
+ _nextStep = null;
+
+ _curBubble?.Hide();
+
+ next?.Invoke();
+ }
+
+ public void OnLocalizationChanged(string value)
+ {
+ }
+
+ #endregion
+
+ private void HideDialog(Bubble activeBubble)
+ {
+ foreach (var textBubble in _bubbleDict.Values.SelectMany(inner => inner))
+ {
+ if (activeBubble != textBubble)
+ {
+ textBubble.Hide();
+ }
+ }
+
+ HideOptions();
+ }
+
+ private bool TryGetBubble(ActorRole role, int idx, out Bubble bubble)
+ {
+ if (_bubbleDict.TryGetValue(role, out var bubbles))
+ {
+ bubble = bubbles.FirstOrDefault(item => item.idx == idx);
+ return bubble != null;
+ }
+
+ bubble = null;
+ return false;
+ }
+
+ private void HideOptions()
+ {
+ foreach (var option in _options)
+ {
+ option.Hide();
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/Assets/Scripts/UI/DialogUI/Bubbles/BubbleGroup.cs.meta b/Assets/Scripts/UI/DialogUI/Bubbles/BubbleGroup.cs.meta
new file mode 100644
index 000000000..09646e199
--- /dev/null
+++ b/Assets/Scripts/UI/DialogUI/Bubbles/BubbleGroup.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: a76234ef7ee34400b306a4823081ba62
+timeCreated: 1749022020
\ No newline at end of file
diff --git a/Assets/Scripts/UI/DialogUI/Bubbles/BubbleOption.cs b/Assets/Scripts/UI/DialogUI/Bubbles/BubbleOption.cs
new file mode 100644
index 000000000..bfd21b739
--- /dev/null
+++ b/Assets/Scripts/UI/DialogUI/Bubbles/BubbleOption.cs
@@ -0,0 +1,37 @@
+using TMPro;
+using UnityEngine;
+using UnityEngine.UI;
+
+namespace AibisDream
+{
+ public class BubbleOption : MonoBehaviour
+ {
+ public int optionIdx;
+ private TMP_Text _text;
+ private DialogOption _option;
+ private Button _button;
+
+ public void Awake()
+ {
+ _text = GetComponent();
+ }
+
+ public void ShowOption(DialogOption dialogOption)
+ {
+ _button.onClick.RemoveAllListeners();
+ _text.text = "";
+ // 清理旧数据
+ gameObject.SetActive(true);
+ _text.text = dialogOption.Line;
+ _button.onClick.AddListener(() =>
+ {
+ dialogOption.Select();
+ });
+ }
+
+ public void Hide()
+ {
+ gameObject.SetActive(false);
+ }
+ }
+}
\ No newline at end of file
diff --git a/Assets/Scripts/UI/DialogUI/Bubbles/BubbleOption.cs.meta b/Assets/Scripts/UI/DialogUI/Bubbles/BubbleOption.cs.meta
new file mode 100644
index 000000000..1c537d15b
--- /dev/null
+++ b/Assets/Scripts/UI/DialogUI/Bubbles/BubbleOption.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 468ec4615ee64b2cb5ef8b1a66339dac
+timeCreated: 1749024963
\ No newline at end of file
diff --git a/Assets/Scripts/UI/DialogUI/Bubbles/BubbleOptionSlot.cs b/Assets/Scripts/UI/DialogUI/Bubbles/BubbleOptionSlot.cs
new file mode 100644
index 000000000..455040a3b
--- /dev/null
+++ b/Assets/Scripts/UI/DialogUI/Bubbles/BubbleOptionSlot.cs
@@ -0,0 +1,24 @@
+using UnityEngine;
+
+namespace AibisDream
+{
+ public class BubbleOptionSlot : MonoBehaviour
+ {
+ private BubbleOptionSlotData _data;
+
+ public BubbleOptionSlotData Data
+ {
+ get
+ {
+ _data.slotPosition = transform.position;
+ return _data;
+ }
+ }
+ }
+
+ public struct BubbleOptionSlotData
+ {
+ [HideInInspector] public Vector3 slotPosition;
+ public int optionIdx;
+ }
+}
diff --git a/Assets/Scripts/UI/DialogUI/Bubbles/BubbleOptionSlot.cs.meta b/Assets/Scripts/UI/DialogUI/Bubbles/BubbleOptionSlot.cs.meta
new file mode 100644
index 000000000..bb1e1bc1e
--- /dev/null
+++ b/Assets/Scripts/UI/DialogUI/Bubbles/BubbleOptionSlot.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: c1a72c4bf33546244b7030c41b1b2b05
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Scripts/UI/DialogUI/Bubbles/BubbleSlot.cs b/Assets/Scripts/UI/DialogUI/Bubbles/BubbleSlot.cs
new file mode 100644
index 000000000..5ca9102ee
--- /dev/null
+++ b/Assets/Scripts/UI/DialogUI/Bubbles/BubbleSlot.cs
@@ -0,0 +1,31 @@
+using System;
+using AibisDream.Framework;
+using AibisDream.Kit;
+using UnityEngine;
+
+namespace AibisDream
+{
+ public class BubbleSlot : MonoBehaviour
+ {
+ [SerializeField] private BubbleSlotData data;
+
+ public BubbleSlotData Data
+ {
+ get
+ {
+ data.slotPosition = CameraKit.GetScreenPos(transform.position);
+ return data;
+ }
+ }
+ }
+
+ [Serializable]
+ public struct BubbleSlotData
+ {
+ [HideInInspector] public Vector3 slotPosition;
+ public ActorRole actorRole;
+ public int idx;
+ public bool hasActorName;
+ public int maxCharNum;
+ }
+}
diff --git a/Assets/Scripts/UI/DialogUI/Bubbles/BubbleSlot.cs.meta b/Assets/Scripts/UI/DialogUI/Bubbles/BubbleSlot.cs.meta
new file mode 100644
index 000000000..e9630615c
--- /dev/null
+++ b/Assets/Scripts/UI/DialogUI/Bubbles/BubbleSlot.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: bbc0dde0e8b8a9c498545e1b5b508241
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Scripts/UI/DialogUI/Bubbles/BubbleSlotGroup.cs b/Assets/Scripts/UI/DialogUI/Bubbles/BubbleSlotGroup.cs
new file mode 100644
index 000000000..119535ee1
--- /dev/null
+++ b/Assets/Scripts/UI/DialogUI/Bubbles/BubbleSlotGroup.cs
@@ -0,0 +1,27 @@
+using System;
+using UnityEngine;
+
+namespace AibisDream
+{
+ public class BubbleSlotGroup
+ {
+ public BubbleSlotGroupData data;
+
+ }
+
+ [Serializable]
+ public struct BubbleSlotGroupData
+ {
+ public DialogViewType dialogViewType;
+ [HideInInspector] public BubbleSlotData[] bubbleSlots;
+ [HideInInspector] public BubbleOptionSlotData[] bubbleOptionSlots;
+ }
+
+ public enum PivotType {
+ Center,
+ CenterLeft,
+ CenterRight,
+ Top,
+ Bottom
+ }
+}
\ No newline at end of file
diff --git a/Assets/Scripts/UI/DialogUI/Bubbles/BubbleSlotGroup.cs.meta b/Assets/Scripts/UI/DialogUI/Bubbles/BubbleSlotGroup.cs.meta
new file mode 100644
index 000000000..e99b79245
--- /dev/null
+++ b/Assets/Scripts/UI/DialogUI/Bubbles/BubbleSlotGroup.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 8225446392f64688813d628ffb56cc7c
+timeCreated: 1749042853
\ No newline at end of file
diff --git a/Assets/Scripts/UI/DialogUI/CenterText.cs b/Assets/Scripts/UI/DialogUI/CenterText.cs
index 09ec912ee..49bf70a2e 100644
--- a/Assets/Scripts/UI/DialogUI/CenterText.cs
+++ b/Assets/Scripts/UI/DialogUI/CenterText.cs
@@ -18,18 +18,12 @@ namespace AibisDream
private Action _nextStep;
#endregion
-
- private bool _skipLineDelay;
private TextParam _textParam;
- [Header("跳过阻塞延迟时间/ms")] [SerializeField]
- private int delayTime = 300;
-
private void Awake()
{
InitComponents();
- AddSomeListener();
}
private void InitComponents()
@@ -37,16 +31,6 @@ namespace AibisDream
_dialogText = transform.Find("Dialog Text")?.gameObject.GetComponent();
}
- private void AddSomeListener()
- {
- // 对话显示后有一段延时不可跳过
- _dialogText.onTypewriterStart.AddListener(() =>
- {
- _skipLineDelay = true;
- _ = CommonUtil.Delay(delayTime, () => { _skipLineDelay = false; });
- });
- }
-
public void ShowLine(string dialogLine, CharacterVo character, Action nextStep, string lineId, bool isAutoSkip = false)
{
// 把原有对话清掉
@@ -75,11 +59,6 @@ namespace AibisDream
public bool TrySkipLine(bool isForceSkip)
{
- if (_skipLineDelay && !isForceSkip)
- {
- return true;
- }
-
if (_dialogText.isShowingText)
{
_dialogText.SkipTypewriter();
diff --git a/Assets/Scripts/UI/DialogUI/DialogCanvasManager.cs b/Assets/Scripts/UI/DialogUI/DialogCanvasManager.cs
index 6f03e29b6..763f639ce 100644
--- a/Assets/Scripts/UI/DialogUI/DialogCanvasManager.cs
+++ b/Assets/Scripts/UI/DialogUI/DialogCanvasManager.cs
@@ -15,8 +15,6 @@ namespace AibisDream
private IDialogView _defaultView;
private IDialogView _showingView;
- public TempTextBox tempText;
-
private IActionController _autoNext;
private IActionController _block;
private IActionController _hideDialog;
@@ -50,10 +48,6 @@ namespace AibisDream
RegisterDialogView(DialogViewType.CenterText, centerText);
var centerOption = transform.Find("Center Option").GetComponent();
RegisterDialogView(DialogViewType.CenterOption, centerOption);
- if (tempText != null)
- {
- RegisterDialogView(DialogViewType.Temp, tempText);
- }
_defaultView = _dialogViewDict[DialogViewType.OldBox];
}
@@ -205,7 +199,7 @@ namespace AibisDream
// 根据状况选择不同的选择框
if (viewType == DialogViewType.Default)
{
- if (_showingView != _dialogViewDict[DialogViewType.OldBox])
+ if (_showingView != _defaultView)
{
_showingView?.HideDialog();
}
@@ -214,12 +208,13 @@ namespace AibisDream
_hideDialog?.Deinit();
_hideDialog = null;
}
+ _showingView = _defaultView;
- _dialogViewDict[DialogViewType.OldBox].ShowOptions(dialogueOptions);
+ _showingView.ShowOptions(dialogueOptions);
}
- else
+ else if(_dialogViewDict.TryGetValue(viewType, out var view))
{
- if (_showingView != _dialogViewDict[viewType])
+ if (_showingView != view)
{
_showingView?.HideDialog();
}
@@ -228,8 +223,8 @@ namespace AibisDream
_hideDialog?.Deinit();
_hideDialog = null;
}
-
- _dialogViewDict[viewType].ShowOptions(dialogueOptions);
+ _showingView = view;
+ _showingView.ShowOptions(dialogueOptions);
}
}
@@ -319,6 +314,7 @@ namespace AibisDream
CenterText,
CenterOption,
Task,
- Temp
+ ClinicBubble,
+ ModuleBubble
}
}
\ No newline at end of file
diff --git a/Assets/Scripts/UI/DialogUI/TextBubbleGroup.cs b/Assets/Scripts/UI/DialogUI/TextBubbleGroup.cs
index 05fbd8e77..e1596510f 100644
--- a/Assets/Scripts/UI/DialogUI/TextBubbleGroup.cs
+++ b/Assets/Scripts/UI/DialogUI/TextBubbleGroup.cs
@@ -3,7 +3,6 @@ using System.Collections.Generic;
using System.Linq;
using AibisDream.Framework;
using AibisDream.Kit;
-using AibisDream.Utility;
using UnityEngine;
namespace AibisDream
@@ -14,14 +13,10 @@ namespace AibisDream
#region 一些索引
- private bool _skipLineDelay;
private Action _nextStep;
private TextBubble _curBubble;
- [Header("跳过阻塞延迟时间/ms")] [SerializeField]
- private int delayTime = 300;
-
#endregion
#region 初始化
@@ -60,9 +55,6 @@ namespace AibisDream
if (TryGetBubble(character.role, character.bubbleIdx ,out var bubble))
{
bubble.ShowLine(dialogLine, OnTextShowed);
- // 设置延时
- _skipLineDelay = true;
- _ = CommonUtil.Delay(delayTime, () => { _skipLineDelay = false; });
// 将非选定的Bubble隐藏
HideDialog(bubble);
}
@@ -103,11 +95,6 @@ namespace AibisDream
public bool TrySkipLine(bool isForceSkip)
{
- if (_skipLineDelay && !isForceSkip)
- {
- return true;
- }
-
if (_curBubble.IsShowingText)
{
_curBubble.SkipLine();
diff --git a/Assets/Scripts/Utility/CommonUtil.cs b/Assets/Scripts/Utility/CommonUtil.cs
index 1610e4c03..bf58b5f5f 100644
--- a/Assets/Scripts/Utility/CommonUtil.cs
+++ b/Assets/Scripts/Utility/CommonUtil.cs
@@ -102,33 +102,6 @@ namespace AibisDream.Utility
return newTarget;
}
- ///
- /// 获取鼠标在世界中的位置
- ///
- /// 鼠标界面位置
- /// 物体形状
- /// 世界位置
- public static Vector3 GetMouseWorldPos(Vector3 mousePoint, Transform transform)
- {
- if (!_mainCam) _mainCam = Camera.main;
-
- mousePoint.z = _mainCam.WorldToScreenPoint(transform.position).z;
- return _mainCam.ScreenToWorldPoint(mousePoint);
- }
-
- ///
- /// 获取鼠标在世界中的位置
- ///
- /// 鼠标界面位置
- /// 世界位置
- public static Vector3 GetMouseWorldPos(Vector3 mousePoint)
- {
- if (!_mainCam) _mainCam = Camera.main;
-
- mousePoint.z = 0;
- return _mainCam.ScreenToWorldPoint(mousePoint);
- }
-
///
/// 属性复制
///