diff --git a/Assets/Render/Renderer2Dtest.asset b/Assets/Render/Renderer2Dtest.asset index 29988c156..fdae0d5da 100644 --- a/Assets/Render/Renderer2Dtest.asset +++ b/Assets/Render/Renderer2Dtest.asset @@ -463,18 +463,15 @@ MonoBehaviour: m_PostInfinity: 2 m_RotationOrder: 4 _filter: - - 0.004854369 - - 0.021177985 - - 0.06010355 - - 0.106563106 - - 0.14548868 - - 0.1618123 - - 0.1618123 - - 0.14548868 - - 0.106563106 - - 0.06010355 - - 0.021177985 - - 0.004854369 + - 0.007228916 + - 0.043749984 + - 0.12409639 + - 0.20444278 + - 0.24096388 + - 0.20444278 + - 0.12409639 + - 0.043749984 + - 0.007228916 --- !u!114 &-6086986437317696584 MonoBehaviour: m_ObjectHideFlags: 3 diff --git a/Assets/Scenes/Persistence.unity b/Assets/Scenes/Persistence.unity index b9c074c50..c3997f7ac 100644 --- a/Assets/Scenes/Persistence.unity +++ b/Assets/Scenes/Persistence.unity @@ -603,6 +603,30 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 243936684424215245} m_Modifications: + - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: _sID + value: 67e03198-f3fa-40e3-88ca-042210787447 + objectReference: {fileID: 0} + - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: graphManager + value: + objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} + - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: _sID + value: 39cf0bb1-4276-40ca-8336-c91048fb4ba1 + objectReference: {fileID: 0} + - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: graphManager + value: + objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} + - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: _sID + value: 27840e3a-f0c8-4ee8-a048-4e57774c3376 + objectReference: {fileID: 0} + - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: graphManager + value: + objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} - target: {fileID: 23699057384935269, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -827,30 +851,6 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} - - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: _sID - value: 67e03198-f3fa-40e3-88ca-042210787447 - objectReference: {fileID: 0} - - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: graphManager - value: - objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} - - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: _sID - value: 39cf0bb1-4276-40ca-8336-c91048fb4ba1 - objectReference: {fileID: 0} - - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: graphManager - value: - objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} - - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: _sID - value: 27840e3a-f0c8-4ee8-a048-4e57774c3376 - objectReference: {fileID: 0} - - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: graphManager - value: - objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: @@ -899,6 +899,30 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 243936684424215245} m_Modifications: + - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: _sID + value: 67e03198-f3fa-40e3-88ca-042210787447 + objectReference: {fileID: 0} + - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: graphManager + value: + objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} + - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: _sID + value: 39cf0bb1-4276-40ca-8336-c91048fb4ba1 + objectReference: {fileID: 0} + - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: graphManager + value: + objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} + - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: _sID + value: 27840e3a-f0c8-4ee8-a048-4e57774c3376 + objectReference: {fileID: 0} + - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: graphManager + value: + objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} - target: {fileID: 23699057384935269, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -1123,30 +1147,6 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} - - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: _sID - value: 67e03198-f3fa-40e3-88ca-042210787447 - objectReference: {fileID: 0} - - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: graphManager - value: - objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} - - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: _sID - value: 39cf0bb1-4276-40ca-8336-c91048fb4ba1 - objectReference: {fileID: 0} - - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: graphManager - value: - objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} - - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: _sID - value: 27840e3a-f0c8-4ee8-a048-4e57774c3376 - objectReference: {fileID: 0} - - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: graphManager - value: - objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: @@ -1605,6 +1605,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: lineAdvanceInput: {fileID: 1977401368} + isInOption: 0 --- !u!1 &77816930 GameObject: m_ObjectHideFlags: 0 @@ -2002,6 +2003,30 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 243936684424215245} m_Modifications: + - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: _sID + value: 67e03198-f3fa-40e3-88ca-042210787447 + objectReference: {fileID: 0} + - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: graphManager + value: + objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} + - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: _sID + value: 39cf0bb1-4276-40ca-8336-c91048fb4ba1 + objectReference: {fileID: 0} + - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: graphManager + value: + objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} + - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: _sID + value: 27840e3a-f0c8-4ee8-a048-4e57774c3376 + objectReference: {fileID: 0} + - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: graphManager + value: + objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} - target: {fileID: 23699057384935269, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -2226,30 +2251,6 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} - - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: _sID - value: 67e03198-f3fa-40e3-88ca-042210787447 - objectReference: {fileID: 0} - - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: graphManager - value: - objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} - - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: _sID - value: 39cf0bb1-4276-40ca-8336-c91048fb4ba1 - objectReference: {fileID: 0} - - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: graphManager - value: - objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} - - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: _sID - value: 27840e3a-f0c8-4ee8-a048-4e57774c3376 - objectReference: {fileID: 0} - - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: graphManager - value: - objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: @@ -3006,6 +3007,30 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 243936684424215245} m_Modifications: + - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: _sID + value: 67e03198-f3fa-40e3-88ca-042210787447 + objectReference: {fileID: 0} + - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: graphManager + value: + objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} + - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: _sID + value: 39cf0bb1-4276-40ca-8336-c91048fb4ba1 + objectReference: {fileID: 0} + - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: graphManager + value: + objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} + - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: _sID + value: 27840e3a-f0c8-4ee8-a048-4e57774c3376 + objectReference: {fileID: 0} + - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: graphManager + value: + objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} - target: {fileID: 23699057384935269, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -3226,30 +3251,6 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} - - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: _sID - value: 67e03198-f3fa-40e3-88ca-042210787447 - objectReference: {fileID: 0} - - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: graphManager - value: - objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} - - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: _sID - value: 39cf0bb1-4276-40ca-8336-c91048fb4ba1 - objectReference: {fileID: 0} - - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: graphManager - value: - objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} - - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: _sID - value: 27840e3a-f0c8-4ee8-a048-4e57774c3376 - objectReference: {fileID: 0} - - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: graphManager - value: - objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: @@ -3718,6 +3719,30 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 243936684424215245} m_Modifications: + - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: _sID + value: 67e03198-f3fa-40e3-88ca-042210787447 + objectReference: {fileID: 0} + - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: graphManager + value: + objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} + - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: _sID + value: 39cf0bb1-4276-40ca-8336-c91048fb4ba1 + objectReference: {fileID: 0} + - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: graphManager + value: + objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} + - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: _sID + value: 27840e3a-f0c8-4ee8-a048-4e57774c3376 + objectReference: {fileID: 0} + - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: graphManager + value: + objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} - target: {fileID: 23699057384935269, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -3946,30 +3971,6 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} - - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: _sID - value: 67e03198-f3fa-40e3-88ca-042210787447 - objectReference: {fileID: 0} - - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: graphManager - value: - objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} - - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: _sID - value: 39cf0bb1-4276-40ca-8336-c91048fb4ba1 - objectReference: {fileID: 0} - - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: graphManager - value: - objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} - - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: _sID - value: 27840e3a-f0c8-4ee8-a048-4e57774c3376 - objectReference: {fileID: 0} - - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: graphManager - value: - objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: @@ -4085,6 +4086,30 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 243936684424215245} m_Modifications: + - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: _sID + value: 65545b51-845c-4df4-8f5c-90c1f04cbe23 + objectReference: {fileID: 0} + - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: graphManager + value: + objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} + - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: _sID + value: 3336344b-f73d-481c-bd5a-548f8a4bead4 + objectReference: {fileID: 0} + - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: graphManager + value: + objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} + - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: _sID + value: ddd9082f-516c-4e2f-bd55-78c29857f972 + objectReference: {fileID: 0} + - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: graphManager + value: + objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} - target: {fileID: 23699057384935269, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -4301,30 +4326,6 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} - - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: _sID - value: 65545b51-845c-4df4-8f5c-90c1f04cbe23 - objectReference: {fileID: 0} - - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: graphManager - value: - objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} - - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: _sID - value: 3336344b-f73d-481c-bd5a-548f8a4bead4 - objectReference: {fileID: 0} - - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: graphManager - value: - objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} - - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: _sID - value: ddd9082f-516c-4e2f-bd55-78c29857f972 - objectReference: {fileID: 0} - - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: graphManager - value: - objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} m_RemovedComponents: [] m_RemovedGameObjects: - {fileID: 7940112695066571942, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} @@ -7951,6 +7952,30 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 243936684424215245} m_Modifications: + - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: _sID + value: 121bb6da-9055-40a5-ae33-05be2ec09f54 + objectReference: {fileID: 0} + - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: graphManager + value: + objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} + - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: _sID + value: 3c0ead6f-afd4-41bf-968d-0d36f758e232 + objectReference: {fileID: 0} + - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: graphManager + value: + objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} + - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: _sID + value: 6b671834-73b4-403d-94d3-0726554589ee + objectReference: {fileID: 0} + - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: graphManager + value: + objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} - target: {fileID: 23699057384935269, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -8135,30 +8160,6 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} - - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: _sID - value: 121bb6da-9055-40a5-ae33-05be2ec09f54 - objectReference: {fileID: 0} - - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: graphManager - value: - objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} - - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: _sID - value: 3c0ead6f-afd4-41bf-968d-0d36f758e232 - objectReference: {fileID: 0} - - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: graphManager - value: - objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} - - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: _sID - value: 6b671834-73b4-403d-94d3-0726554589ee - objectReference: {fileID: 0} - - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: graphManager - value: - objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -8275,6 +8276,30 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 243936684424215245} m_Modifications: + - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: _sID + value: 67e03198-f3fa-40e3-88ca-042210787447 + objectReference: {fileID: 0} + - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: graphManager + value: + objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} + - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: _sID + value: 39cf0bb1-4276-40ca-8336-c91048fb4ba1 + objectReference: {fileID: 0} + - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: graphManager + value: + objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} + - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: _sID + value: 27840e3a-f0c8-4ee8-a048-4e57774c3376 + objectReference: {fileID: 0} + - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: graphManager + value: + objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} - target: {fileID: 23699057384935269, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -8499,30 +8524,6 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} - - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: _sID - value: 67e03198-f3fa-40e3-88ca-042210787447 - objectReference: {fileID: 0} - - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: graphManager - value: - objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} - - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: _sID - value: 39cf0bb1-4276-40ca-8336-c91048fb4ba1 - objectReference: {fileID: 0} - - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: graphManager - value: - objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} - - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: _sID - value: 27840e3a-f0c8-4ee8-a048-4e57774c3376 - objectReference: {fileID: 0} - - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: graphManager - value: - objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: @@ -8649,6 +8650,30 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 243936684424215245} m_Modifications: + - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: _sID + value: 67e03198-f3fa-40e3-88ca-042210787447 + objectReference: {fileID: 0} + - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: graphManager + value: + objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} + - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: _sID + value: 39cf0bb1-4276-40ca-8336-c91048fb4ba1 + objectReference: {fileID: 0} + - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: graphManager + value: + objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} + - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: _sID + value: 27840e3a-f0c8-4ee8-a048-4e57774c3376 + objectReference: {fileID: 0} + - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: graphManager + value: + objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} - target: {fileID: 23699057384935269, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -8873,30 +8898,6 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} - - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: _sID - value: 67e03198-f3fa-40e3-88ca-042210787447 - objectReference: {fileID: 0} - - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: graphManager - value: - objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} - - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: _sID - value: 39cf0bb1-4276-40ca-8336-c91048fb4ba1 - objectReference: {fileID: 0} - - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: graphManager - value: - objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} - - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: _sID - value: 27840e3a-f0c8-4ee8-a048-4e57774c3376 - objectReference: {fileID: 0} - - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: graphManager - value: - objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: @@ -9284,7 +9285,7 @@ Transform: m_GameObject: {fileID: 519420028} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -0.009999275, y: 0, z: -10} + m_LocalPosition: {x: 0, y: 0, z: -10} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -9661,6 +9662,30 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 243936684424215245} m_Modifications: + - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: _sID + value: 67e03198-f3fa-40e3-88ca-042210787447 + objectReference: {fileID: 0} + - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: graphManager + value: + objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} + - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: _sID + value: 39cf0bb1-4276-40ca-8336-c91048fb4ba1 + objectReference: {fileID: 0} + - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: graphManager + value: + objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} + - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: _sID + value: 27840e3a-f0c8-4ee8-a048-4e57774c3376 + objectReference: {fileID: 0} + - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: graphManager + value: + objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} - target: {fileID: 23699057384935269, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -9885,30 +9910,6 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} - - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: _sID - value: 67e03198-f3fa-40e3-88ca-042210787447 - objectReference: {fileID: 0} - - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: graphManager - value: - objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} - - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: _sID - value: 39cf0bb1-4276-40ca-8336-c91048fb4ba1 - objectReference: {fileID: 0} - - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: graphManager - value: - objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} - - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: _sID - value: 27840e3a-f0c8-4ee8-a048-4e57774c3376 - objectReference: {fileID: 0} - - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: graphManager - value: - objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: @@ -10270,6 +10271,30 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 243936684424215245} m_Modifications: + - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: _sID + value: 67e03198-f3fa-40e3-88ca-042210787447 + objectReference: {fileID: 0} + - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: graphManager + value: + objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} + - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: _sID + value: 39cf0bb1-4276-40ca-8336-c91048fb4ba1 + objectReference: {fileID: 0} + - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: graphManager + value: + objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} + - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: _sID + value: 27840e3a-f0c8-4ee8-a048-4e57774c3376 + objectReference: {fileID: 0} + - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: graphManager + value: + objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} - target: {fileID: 23699057384935269, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -10494,30 +10519,6 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} - - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: _sID - value: 67e03198-f3fa-40e3-88ca-042210787447 - objectReference: {fileID: 0} - - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: graphManager - value: - objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} - - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: _sID - value: 39cf0bb1-4276-40ca-8336-c91048fb4ba1 - objectReference: {fileID: 0} - - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: graphManager - value: - objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} - - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: _sID - value: 27840e3a-f0c8-4ee8-a048-4e57774c3376 - objectReference: {fileID: 0} - - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: graphManager - value: - objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: @@ -10808,6 +10809,30 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 243936684424215245} m_Modifications: + - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: _sID + value: 65545b51-845c-4df4-8f5c-90c1f04cbe23 + objectReference: {fileID: 0} + - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: graphManager + value: + objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} + - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: _sID + value: 3336344b-f73d-481c-bd5a-548f8a4bead4 + objectReference: {fileID: 0} + - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: graphManager + value: + objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} + - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: _sID + value: ddd9082f-516c-4e2f-bd55-78c29857f972 + objectReference: {fileID: 0} + - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: graphManager + value: + objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} - target: {fileID: 23699057384935269, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -11024,30 +11049,6 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} - - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: _sID - value: 65545b51-845c-4df4-8f5c-90c1f04cbe23 - objectReference: {fileID: 0} - - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: graphManager - value: - objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} - - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: _sID - value: 3336344b-f73d-481c-bd5a-548f8a4bead4 - objectReference: {fileID: 0} - - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: graphManager - value: - objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} - - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: _sID - value: ddd9082f-516c-4e2f-bd55-78c29857f972 - objectReference: {fileID: 0} - - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: graphManager - value: - objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} m_RemovedComponents: [] m_RemovedGameObjects: - {fileID: 7940112695066571942, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} @@ -11898,6 +11899,30 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 243936684424215245} m_Modifications: + - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: _sID + value: 65545b51-845c-4df4-8f5c-90c1f04cbe23 + objectReference: {fileID: 0} + - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: graphManager + value: + objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} + - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: _sID + value: 3336344b-f73d-481c-bd5a-548f8a4bead4 + objectReference: {fileID: 0} + - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: graphManager + value: + objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} + - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: _sID + value: ddd9082f-516c-4e2f-bd55-78c29857f972 + objectReference: {fileID: 0} + - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: graphManager + value: + objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} - target: {fileID: 23699057384935269, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -12114,30 +12139,6 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} - - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: _sID - value: 65545b51-845c-4df4-8f5c-90c1f04cbe23 - objectReference: {fileID: 0} - - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: graphManager - value: - objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} - - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: _sID - value: 3336344b-f73d-481c-bd5a-548f8a4bead4 - objectReference: {fileID: 0} - - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: graphManager - value: - objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} - - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: _sID - value: ddd9082f-516c-4e2f-bd55-78c29857f972 - objectReference: {fileID: 0} - - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: graphManager - value: - objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} m_RemovedComponents: [] m_RemovedGameObjects: - {fileID: 7940112695066571942, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} @@ -12344,6 +12345,30 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 243936684424215245} m_Modifications: + - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: _sID + value: 67e03198-f3fa-40e3-88ca-042210787447 + objectReference: {fileID: 0} + - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: graphManager + value: + objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} + - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: _sID + value: 39cf0bb1-4276-40ca-8336-c91048fb4ba1 + objectReference: {fileID: 0} + - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: graphManager + value: + objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} + - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: _sID + value: 27840e3a-f0c8-4ee8-a048-4e57774c3376 + objectReference: {fileID: 0} + - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: graphManager + value: + objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} - target: {fileID: 23699057384935269, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -12568,30 +12593,6 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} - - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: _sID - value: 67e03198-f3fa-40e3-88ca-042210787447 - objectReference: {fileID: 0} - - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: graphManager - value: - objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} - - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: _sID - value: 39cf0bb1-4276-40ca-8336-c91048fb4ba1 - objectReference: {fileID: 0} - - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: graphManager - value: - objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} - - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: _sID - value: 27840e3a-f0c8-4ee8-a048-4e57774c3376 - objectReference: {fileID: 0} - - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: graphManager - value: - objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: @@ -13328,6 +13329,30 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 243936684424215245} m_Modifications: + - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: _sID + value: 67e03198-f3fa-40e3-88ca-042210787447 + objectReference: {fileID: 0} + - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: graphManager + value: + objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} + - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: _sID + value: 39cf0bb1-4276-40ca-8336-c91048fb4ba1 + objectReference: {fileID: 0} + - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: graphManager + value: + objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} + - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: _sID + value: 27840e3a-f0c8-4ee8-a048-4e57774c3376 + objectReference: {fileID: 0} + - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: graphManager + value: + objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} - target: {fileID: 23699057384935269, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -13552,30 +13577,6 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} - - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: _sID - value: 67e03198-f3fa-40e3-88ca-042210787447 - objectReference: {fileID: 0} - - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: graphManager - value: - objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} - - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: _sID - value: 39cf0bb1-4276-40ca-8336-c91048fb4ba1 - objectReference: {fileID: 0} - - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: graphManager - value: - objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} - - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: _sID - value: 27840e3a-f0c8-4ee8-a048-4e57774c3376 - objectReference: {fileID: 0} - - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: graphManager - value: - objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: @@ -17386,6 +17387,30 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 243936684424215245} m_Modifications: + - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: _sID + value: 67e03198-f3fa-40e3-88ca-042210787447 + objectReference: {fileID: 0} + - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: graphManager + value: + objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} + - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: _sID + value: 39cf0bb1-4276-40ca-8336-c91048fb4ba1 + objectReference: {fileID: 0} + - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: graphManager + value: + objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} + - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: _sID + value: 27840e3a-f0c8-4ee8-a048-4e57774c3376 + objectReference: {fileID: 0} + - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: graphManager + value: + objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} - target: {fileID: 23699057384935269, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -17610,30 +17635,6 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} - - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: _sID - value: 67e03198-f3fa-40e3-88ca-042210787447 - objectReference: {fileID: 0} - - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: graphManager - value: - objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} - - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: _sID - value: 39cf0bb1-4276-40ca-8336-c91048fb4ba1 - objectReference: {fileID: 0} - - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: graphManager - value: - objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} - - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: _sID - value: 27840e3a-f0c8-4ee8-a048-4e57774c3376 - objectReference: {fileID: 0} - - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: graphManager - value: - objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: @@ -18005,58 +18006,6 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 243936684424215245} m_Modifications: - - target: {fileID: 301155002500816269, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} - propertyPath: m_AnchorMax.x - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 301155002500816269, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 301155002500816269, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 301155002500816269, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} - propertyPath: m_AnchoredPosition.y - value: 25.629997 - objectReference: {fileID: 0} - - target: {fileID: 442829669951131826, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} - propertyPath: _sID - value: 6f5c7914-f97e-4f47-806a-9794e5f5f769 - objectReference: {fileID: 0} - - target: {fileID: 442829669951131826, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} - propertyPath: graphManager - value: - objectReference: {fileID: 3728315362672514892} - - target: {fileID: 720753418213842348, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} - propertyPath: _sID - value: e2613f65-319b-4f62-ba39-a479e7b46ba2 - objectReference: {fileID: 0} - - target: {fileID: 720753418213842348, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} - propertyPath: graphManager - value: - objectReference: {fileID: 3728315362672514892} - - target: {fileID: 2651560808168083272, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} - propertyPath: m_text - value: "\u4EC0\u4E48\u5BFC\u81F4\u4E86\u8BB0\u5FC6\u7684Glitch\uFF1F" - objectReference: {fileID: 0} - - target: {fileID: 4396600131353777755, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} - propertyPath: m_AnchoredPosition.x - value: -334 - objectReference: {fileID: 0} - - target: {fileID: 7368283137120249392, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} - propertyPath: _sID - value: ac121996-37d7-4305-8828-b90a712ad53e - objectReference: {fileID: 0} - - target: {fileID: 7368283137120249392, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} - propertyPath: graphManager - value: - objectReference: {fileID: 3728315362672514892} - - target: {fileID: 7940112695066571942, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} propertyPath: _sID value: b6eb921a-5d8b-4e9e-8ff0-21670096721c @@ -18257,6 +18206,58 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: 301155002500816269, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 301155002500816269, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 301155002500816269, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 301155002500816269, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} + propertyPath: m_AnchoredPosition.y + value: 25.629997 + objectReference: {fileID: 0} + - target: {fileID: 442829669951131826, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} + propertyPath: _sID + value: 6f5c7914-f97e-4f47-806a-9794e5f5f769 + objectReference: {fileID: 0} + - target: {fileID: 442829669951131826, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} + propertyPath: graphManager + value: + objectReference: {fileID: 3728315362672514892} + - target: {fileID: 720753418213842348, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} + propertyPath: _sID + value: e2613f65-319b-4f62-ba39-a479e7b46ba2 + objectReference: {fileID: 0} + - target: {fileID: 720753418213842348, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} + propertyPath: graphManager + value: + objectReference: {fileID: 3728315362672514892} + - target: {fileID: 2651560808168083272, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} + propertyPath: m_text + value: "\u4EC0\u4E48\u5BFC\u81F4\u4E86\u8BB0\u5FC6\u7684Glitch\uFF1F" + objectReference: {fileID: 0} + - target: {fileID: 4396600131353777755, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} + propertyPath: m_AnchoredPosition.x + value: -334 + objectReference: {fileID: 0} + - target: {fileID: 7368283137120249392, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} + propertyPath: _sID + value: ac121996-37d7-4305-8828-b90a712ad53e + objectReference: {fileID: 0} + - target: {fileID: 7368283137120249392, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} + propertyPath: graphManager + value: + objectReference: {fileID: 3728315362672514892} + - target: {fileID: 7940112695066571942, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: @@ -18691,6 +18692,30 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 243936684424215245} m_Modifications: + - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: _sID + value: 65545b51-845c-4df4-8f5c-90c1f04cbe23 + objectReference: {fileID: 0} + - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: graphManager + value: + objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} + - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: _sID + value: 3336344b-f73d-481c-bd5a-548f8a4bead4 + objectReference: {fileID: 0} + - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: graphManager + value: + objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} + - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: _sID + value: ddd9082f-516c-4e2f-bd55-78c29857f972 + objectReference: {fileID: 0} + - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: graphManager + value: + objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} - target: {fileID: 23699057384935269, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -18911,30 +18936,6 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} - - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: _sID - value: 65545b51-845c-4df4-8f5c-90c1f04cbe23 - objectReference: {fileID: 0} - - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: graphManager - value: - objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} - - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: _sID - value: 3336344b-f73d-481c-bd5a-548f8a4bead4 - objectReference: {fileID: 0} - - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: graphManager - value: - objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} - - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: _sID - value: ddd9082f-516c-4e2f-bd55-78c29857f972 - objectReference: {fileID: 0} - - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: graphManager - value: - objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} m_RemovedComponents: [] m_RemovedGameObjects: - {fileID: 7940112695066571942, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} @@ -19535,6 +19536,30 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 243936684424215245} m_Modifications: + - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: _sID + value: 67e03198-f3fa-40e3-88ca-042210787447 + objectReference: {fileID: 0} + - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: graphManager + value: + objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} + - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: _sID + value: 39cf0bb1-4276-40ca-8336-c91048fb4ba1 + objectReference: {fileID: 0} + - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: graphManager + value: + objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} + - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: _sID + value: 27840e3a-f0c8-4ee8-a048-4e57774c3376 + objectReference: {fileID: 0} + - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: graphManager + value: + objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} - target: {fileID: 23699057384935269, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -19759,30 +19784,6 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} - - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: _sID - value: 67e03198-f3fa-40e3-88ca-042210787447 - objectReference: {fileID: 0} - - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: graphManager - value: - objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} - - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: _sID - value: 39cf0bb1-4276-40ca-8336-c91048fb4ba1 - objectReference: {fileID: 0} - - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: graphManager - value: - objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} - - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: _sID - value: 27840e3a-f0c8-4ee8-a048-4e57774c3376 - objectReference: {fileID: 0} - - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: graphManager - value: - objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: @@ -20283,6 +20284,30 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 243936684424215245} m_Modifications: + - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: _sID + value: 67e03198-f3fa-40e3-88ca-042210787447 + objectReference: {fileID: 0} + - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: graphManager + value: + objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} + - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: _sID + value: 39cf0bb1-4276-40ca-8336-c91048fb4ba1 + objectReference: {fileID: 0} + - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: graphManager + value: + objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} + - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: _sID + value: 27840e3a-f0c8-4ee8-a048-4e57774c3376 + objectReference: {fileID: 0} + - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: graphManager + value: + objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} - target: {fileID: 23699057384935269, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -20491,30 +20516,6 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} - - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: _sID - value: 67e03198-f3fa-40e3-88ca-042210787447 - objectReference: {fileID: 0} - - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: graphManager - value: - objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} - - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: _sID - value: 39cf0bb1-4276-40ca-8336-c91048fb4ba1 - objectReference: {fileID: 0} - - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: graphManager - value: - objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} - - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: _sID - value: 27840e3a-f0c8-4ee8-a048-4e57774c3376 - objectReference: {fileID: 0} - - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: graphManager - value: - objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: @@ -21420,6 +21421,30 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 243936684424215245} m_Modifications: + - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: _sID + value: 67e03198-f3fa-40e3-88ca-042210787447 + objectReference: {fileID: 0} + - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: graphManager + value: + objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} + - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: _sID + value: 39cf0bb1-4276-40ca-8336-c91048fb4ba1 + objectReference: {fileID: 0} + - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: graphManager + value: + objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} + - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: _sID + value: 27840e3a-f0c8-4ee8-a048-4e57774c3376 + objectReference: {fileID: 0} + - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: graphManager + value: + objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} - target: {fileID: 23699057384935269, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -21644,30 +21669,6 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} - - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: _sID - value: 67e03198-f3fa-40e3-88ca-042210787447 - objectReference: {fileID: 0} - - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: graphManager - value: - objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} - - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: _sID - value: 39cf0bb1-4276-40ca-8336-c91048fb4ba1 - objectReference: {fileID: 0} - - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: graphManager - value: - objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} - - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: _sID - value: 27840e3a-f0c8-4ee8-a048-4e57774c3376 - objectReference: {fileID: 0} - - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: graphManager - value: - objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: @@ -21974,6 +21975,30 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 243936684424215245} m_Modifications: + - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: _sID + value: 67e03198-f3fa-40e3-88ca-042210787447 + objectReference: {fileID: 0} + - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: graphManager + value: + objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} + - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: _sID + value: 39cf0bb1-4276-40ca-8336-c91048fb4ba1 + objectReference: {fileID: 0} + - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: graphManager + value: + objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} + - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: _sID + value: 27840e3a-f0c8-4ee8-a048-4e57774c3376 + objectReference: {fileID: 0} + - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: graphManager + value: + objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} - target: {fileID: 23699057384935269, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -22198,30 +22223,6 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} - - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: _sID - value: 67e03198-f3fa-40e3-88ca-042210787447 - objectReference: {fileID: 0} - - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: graphManager - value: - objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} - - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: _sID - value: 39cf0bb1-4276-40ca-8336-c91048fb4ba1 - objectReference: {fileID: 0} - - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: graphManager - value: - objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} - - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: _sID - value: 27840e3a-f0c8-4ee8-a048-4e57774c3376 - objectReference: {fileID: 0} - - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: graphManager - value: - objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: @@ -23365,6 +23366,7 @@ GameObject: - component: {fileID: 1655147933} - component: {fileID: 1655147932} - component: {fileID: 1655147931} + - component: {fileID: 1655147934} m_Layer: 0 m_Name: EventSystem m_TagString: Untagged @@ -23422,6 +23424,19 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1655147934 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1655147930} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f55689aa6dac4461bba273d8987762dd, type: 3} + m_Name: + m_EditorClassIdentifier: + isLocked: 0 --- !u!1 &1689237971 GameObject: m_ObjectHideFlags: 0 @@ -26406,6 +26421,30 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 243936684424215245} m_Modifications: + - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: _sID + value: 67e03198-f3fa-40e3-88ca-042210787447 + objectReference: {fileID: 0} + - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: graphManager + value: + objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} + - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: _sID + value: 39cf0bb1-4276-40ca-8336-c91048fb4ba1 + objectReference: {fileID: 0} + - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: graphManager + value: + objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} + - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: _sID + value: 27840e3a-f0c8-4ee8-a048-4e57774c3376 + objectReference: {fileID: 0} + - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: graphManager + value: + objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} - target: {fileID: 23699057384935269, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -26630,30 +26669,6 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} - - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: _sID - value: 67e03198-f3fa-40e3-88ca-042210787447 - objectReference: {fileID: 0} - - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: graphManager - value: - objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} - - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: _sID - value: 39cf0bb1-4276-40ca-8336-c91048fb4ba1 - objectReference: {fileID: 0} - - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: graphManager - value: - objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} - - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: _sID - value: 27840e3a-f0c8-4ee8-a048-4e57774c3376 - objectReference: {fileID: 0} - - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: graphManager - value: - objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: @@ -26758,6 +26773,30 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 243936684424215245} m_Modifications: + - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: _sID + value: 67e03198-f3fa-40e3-88ca-042210787447 + objectReference: {fileID: 0} + - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: graphManager + value: + objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} + - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: _sID + value: 39cf0bb1-4276-40ca-8336-c91048fb4ba1 + objectReference: {fileID: 0} + - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: graphManager + value: + objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} + - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: _sID + value: 27840e3a-f0c8-4ee8-a048-4e57774c3376 + objectReference: {fileID: 0} + - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: graphManager + value: + objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} - target: {fileID: 23699057384935269, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -26982,30 +27021,6 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} - - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: _sID - value: 67e03198-f3fa-40e3-88ca-042210787447 - objectReference: {fileID: 0} - - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: graphManager - value: - objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} - - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: _sID - value: 39cf0bb1-4276-40ca-8336-c91048fb4ba1 - objectReference: {fileID: 0} - - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: graphManager - value: - objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} - - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: _sID - value: 27840e3a-f0c8-4ee8-a048-4e57774c3376 - objectReference: {fileID: 0} - - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: graphManager - value: - objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: @@ -27494,6 +27509,30 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 243936684424215245} m_Modifications: + - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: _sID + value: 65545b51-845c-4df4-8f5c-90c1f04cbe23 + objectReference: {fileID: 0} + - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: graphManager + value: + objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} + - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: _sID + value: 3336344b-f73d-481c-bd5a-548f8a4bead4 + objectReference: {fileID: 0} + - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: graphManager + value: + objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} + - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: _sID + value: ddd9082f-516c-4e2f-bd55-78c29857f972 + objectReference: {fileID: 0} + - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: graphManager + value: + objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} - target: {fileID: 23699057384935269, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -27714,30 +27753,6 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} - - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: _sID - value: 65545b51-845c-4df4-8f5c-90c1f04cbe23 - objectReference: {fileID: 0} - - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: graphManager - value: - objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} - - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: _sID - value: 3336344b-f73d-481c-bd5a-548f8a4bead4 - objectReference: {fileID: 0} - - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: graphManager - value: - objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} - - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: _sID - value: ddd9082f-516c-4e2f-bd55-78c29857f972 - objectReference: {fileID: 0} - - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: graphManager - value: - objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} m_RemovedComponents: [] m_RemovedGameObjects: - {fileID: 7940112695066571942, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} diff --git a/Assets/Scripts/Dialog System/DialogController.cs b/Assets/Scripts/Dialog System/DialogController.cs index 25e1ec033..f8d0ba875 100644 --- a/Assets/Scripts/Dialog System/DialogController.cs +++ b/Assets/Scripts/Dialog System/DialogController.cs @@ -20,11 +20,11 @@ namespace AibisDream _dialogueRunner.onDialogueStart.AddListener(() => { - EnumEventSystem.Global.Send(InteractionEventEnum.DialogEnd); + EnumEventSystem.Global.Send(InteractionEventEnum.DialogStart); }); _dialogueRunner.onDialogueComplete.AddListener(() => { - EnumEventSystem.Global.Send(InteractionEventEnum.DialogStart); + EnumEventSystem.Global.Send(InteractionEventEnum.DialogEnd); }); } diff --git a/Assets/Scripts/Dialog System/LineAdvanceInput.cs b/Assets/Scripts/Dialog System/LineAdvanceInput.cs index 4739d2cff..f139b7abf 100644 --- a/Assets/Scripts/Dialog System/LineAdvanceInput.cs +++ b/Assets/Scripts/Dialog System/LineAdvanceInput.cs @@ -30,6 +30,7 @@ namespace AibisDream private void Update() { + _handler.Handle(_curSyncToken, IsInputAvailable); } diff --git a/Assets/Scripts/FixSystem/Effect/MouseFollowEffect.cs b/Assets/Scripts/FixSystem/Effect/MouseFollowEffect.cs index a13fc8a33..3f9280817 100644 --- a/Assets/Scripts/FixSystem/Effect/MouseFollowEffect.cs +++ b/Assets/Scripts/FixSystem/Effect/MouseFollowEffect.cs @@ -220,7 +220,7 @@ namespace AibisDream private void RegisterDialogEvents() { // 监听对话结束事件 - EnumEventSystem.Global.Register(InteractionEventEnum.DialogStart, OnDialogueComplete); + EnumEventSystem.Global.Register(InteractionEventEnum.DialogEnd, OnDialogueComplete); } /// @@ -250,7 +250,7 @@ namespace AibisDream /// private void OnDestroy() { - EnumEventSystem.Global.UnRegister(InteractionEventEnum.DialogStart, OnDialogueComplete); + EnumEventSystem.Global.UnRegister(InteractionEventEnum.DialogEnd, OnDialogueComplete); } #endregion diff --git a/Assets/Scripts/FixSystemNew/BodyModule/CableSystem.cs b/Assets/Scripts/FixSystemNew/BodyModule/CableSystem.cs index f4d0c12a0..95b333ce4 100644 --- a/Assets/Scripts/FixSystemNew/BodyModule/CableSystem.cs +++ b/Assets/Scripts/FixSystemNew/BodyModule/CableSystem.cs @@ -51,14 +51,14 @@ namespace AibisDream.FixSystem private void OnEnable() { - EnumEventSystem.Global.Register(InteractionEventEnum.DialogEnd, HandleDialogueStart); - EnumEventSystem.Global.Register(InteractionEventEnum.DialogStart, HandleDialogueComplete); + EnumEventSystem.Global.Register(InteractionEventEnum.DialogEnd, HandleDialogueComplete); + EnumEventSystem.Global.Register(InteractionEventEnum.DialogStart, HandleDialogueStart); } private void OnDisable() { - EnumEventSystem.Global.UnRegister(InteractionEventEnum.DialogEnd, HandleDialogueStart); - EnumEventSystem.Global.UnRegister(InteractionEventEnum.DialogStart, HandleDialogueComplete); + EnumEventSystem.Global.UnRegister(InteractionEventEnum.DialogEnd, HandleDialogueComplete); + EnumEventSystem.Global.UnRegister(InteractionEventEnum.DialogStart, HandleDialogueStart); } private void InitComponentRefs() diff --git a/Assets/Scripts/Framework/EventSystemKit/EventSystemEx.cs b/Assets/Scripts/Framework/EventSystemKit/EventSystemEx.cs index d7eefe598..4a4a5a94d 100644 --- a/Assets/Scripts/Framework/EventSystemKit/EventSystemEx.cs +++ b/Assets/Scripts/Framework/EventSystemKit/EventSystemEx.cs @@ -69,13 +69,10 @@ namespace AibisDream.Framework { if (holdingObjList.Count > 0 || draggingObjList.Count > 0) { - Debug.Log($"Dragging: {draggingObjList.Count}"); - Debug.Log($"Holding: {holdingObjList.Count}"); return TriggerEnum.Dragging; } else if (pointerOverObjList.Count > 0) { - Debug.Log($"PointerOver: {pointerOverObjList.Count}"); return TriggerEnum.PointerOver; } else diff --git a/Assets/Scripts/Framework/EventSystemKit/EventTriggerEx.cs b/Assets/Scripts/Framework/EventSystemKit/EventTriggerEx.cs index c8e9dd7a8..c50daa9e1 100644 --- a/Assets/Scripts/Framework/EventSystemKit/EventTriggerEx.cs +++ b/Assets/Scripts/Framework/EventSystemKit/EventTriggerEx.cs @@ -117,6 +117,7 @@ namespace AibisDream.Framework public override void OnBeginDrag(PointerEventData eventData) { + EventSystemEx.Instance.OnEndDrag(_interaction); base.OnBeginDrag(eventData); } } diff --git a/Assets/Scripts/Game Loop/GameManager.cs b/Assets/Scripts/Game Loop/GameManager.cs index c5d4821a3..dad61e091 100644 --- a/Assets/Scripts/Game Loop/GameManager.cs +++ b/Assets/Scripts/Game Loop/GameManager.cs @@ -268,7 +268,7 @@ namespace AibisDream _unRegisters[3] = EnumEventSystem.Global.Register(GameLoopEnum.UnPauseGame, () => state.OnPause(false)); _unRegisters[4] = EnumEventSystem.Global.Register(InteractionEventEnum.DialogStart, () => state.OnDialog(true)); - _unRegisters[5] = EnumEventSystem.Global.Register(InteractionEventEnum.DialogEnd, () => state.OnDialog(true)); + _unRegisters[5] = EnumEventSystem.Global.Register(InteractionEventEnum.DialogEnd, () => state.OnDialog(false)); } private void UnRegisterEvents() diff --git a/Assets/Scripts/MiniGame/Gear/GearSystem.cs b/Assets/Scripts/MiniGame/Gear/GearSystem.cs index fe9c0796e..81e78a96e 100644 --- a/Assets/Scripts/MiniGame/Gear/GearSystem.cs +++ b/Assets/Scripts/MiniGame/Gear/GearSystem.cs @@ -68,8 +68,8 @@ namespace AibisDream private void OnEnable() { - var unRegister1 = EnumEventSystem.Global.Register(InteractionEventEnum.DialogStart, () => _isInteractive = true); - var unRegister2 = EnumEventSystem.Global.Register(InteractionEventEnum.DialogEnd, () => _isInteractive = false); + var unRegister1 = EnumEventSystem.Global.Register(InteractionEventEnum.DialogEnd, () => _isInteractive = true); + var unRegister2 = EnumEventSystem.Global.Register(InteractionEventEnum.DialogStart, () => _isInteractive = false); _evtUnRegisters = new[] { unRegister1, unRegister2 }; }