diff --git a/Assets/ManagedResources/Prefabs/UI/Gem/GemPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Gem/GemPanel.prefab index effa444299..404bf13a1b 100644 --- a/Assets/ManagedResources/Prefabs/UI/Gem/GemPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Gem/GemPanel.prefab @@ -6344,7 +6344,7 @@ RectTransform: m_Children: - {fileID: 3881849841207732616} m_Father: {fileID: 1535527825289263518} - m_RootOrder: 3 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 0} @@ -12891,7 +12891,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1947537634081651205} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: @@ -19113,7 +19113,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1535527825289263518} - m_RootOrder: 1 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} @@ -20171,12 +20171,12 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1535527825289263518} - m_RootOrder: 4 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0.4, y: -1589} - m_SizeDelta: {x: 636.7, y: 186.59998} + m_AnchoredPosition: {x: 0, y: -336} + m_SizeDelta: {x: 1080, y: 186.59998} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4888981566057762621 CanvasRenderer: @@ -28276,6 +28276,8 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 7625347215105360505} + - {fileID: 887193308606512149} + - {fileID: 4751474121987070259} - {fileID: 9066177219582852668} - {fileID: 5265433810236450692} - {fileID: 6705891538726564943} @@ -28285,8 +28287,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -1.25, y: 626.1} - m_SizeDelta: {x: 4.5, y: 1252.2} + m_AnchoredPosition: {x: -1.25, y: -0.000061035156} + m_SizeDelta: {x: 4.5, y: -0.00024414} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3448137756574877481 CanvasRenderer: @@ -28316,7 +28318,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 213d5f916c2c039439d298e37e8649a6, type: 3} + m_Sprite: {fileID: 21300000, guid: 0b440e62d8aa792488b709f6753a3018, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -34542,11 +34544,11 @@ RectTransform: m_Children: - {fileID: 1267358351442010726} m_Father: {fileID: 1535527825289263518} - m_RootOrder: 2 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: -1302} + m_AnchoredPosition: {x: 0, y: -50} m_SizeDelta: {x: 1080, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2053317189896082113 @@ -40939,6 +40941,136 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1001 &144107364412910843 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1535527825289263518} + m_Modifications: + - target: {fileID: 2438741236791955017, guid: f05c79faac26aa54f904f215816d8d12, + type: 3} + propertyPath: m_Name + value: live2d_titan_boss_1 + objectReference: {fileID: 0} + - target: {fileID: 986298761603010798, guid: f05c79faac26aa54f904f215816d8d12, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 986298761603010798, guid: f05c79faac26aa54f904f215816d8d12, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 986298761603010798, guid: f05c79faac26aa54f904f215816d8d12, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 986298761603010798, guid: f05c79faac26aa54f904f215816d8d12, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 986298761603010798, guid: f05c79faac26aa54f904f215816d8d12, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 986298761603010798, guid: f05c79faac26aa54f904f215816d8d12, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 986298761603010798, guid: f05c79faac26aa54f904f215816d8d12, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 986298761603010798, guid: f05c79faac26aa54f904f215816d8d12, + type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 986298761603010798, guid: f05c79faac26aa54f904f215816d8d12, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 986298761603010798, guid: f05c79faac26aa54f904f215816d8d12, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 986298761603010798, guid: f05c79faac26aa54f904f215816d8d12, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 986298761603010798, guid: f05c79faac26aa54f904f215816d8d12, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 986298761603010798, guid: f05c79faac26aa54f904f215816d8d12, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 94 + objectReference: {fileID: 0} + - target: {fileID: 986298761603010798, guid: f05c79faac26aa54f904f215816d8d12, + type: 3} + propertyPath: m_SizeDelta.x + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 986298761603010798, guid: f05c79faac26aa54f904f215816d8d12, + type: 3} + propertyPath: m_SizeDelta.y + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 986298761603010798, guid: f05c79faac26aa54f904f215816d8d12, + type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 986298761603010798, guid: f05c79faac26aa54f904f215816d8d12, + type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 986298761603010798, guid: f05c79faac26aa54f904f215816d8d12, + type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 986298761603010798, guid: f05c79faac26aa54f904f215816d8d12, + type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 986298761603010798, guid: f05c79faac26aa54f904f215816d8d12, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 986298761603010798, guid: f05c79faac26aa54f904f215816d8d12, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7647303008225842715, guid: f05c79faac26aa54f904f215816d8d12, + type: 3} + propertyPath: startingAnimation + value: idle1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: f05c79faac26aa54f904f215816d8d12, type: 3} +--- !u!224 &887193308606512149 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 986298761603010798, guid: f05c79faac26aa54f904f215816d8d12, + type: 3} + m_PrefabInstance: {fileID: 144107364412910843} + m_PrefabAsset: {fileID: 0} --- !u!1001 &7152141474715674215 PrefabInstance: m_ObjectHideFlags: 0 @@ -40959,7 +41091,7 @@ PrefabInstance: - target: {fileID: 762003490395038750, guid: afce5759e0e3c6947ad015f6f43ebfa9, type: 3} propertyPath: m_LocalPosition.y - value: -846 + value: 41 objectReference: {fileID: 0} - target: {fileID: 762003490395038750, guid: afce5759e0e3c6947ad015f6f43ebfa9, type: 3} @@ -41014,3 +41146,133 @@ Transform: type: 3} m_PrefabInstance: {fileID: 7152141474715674215} m_PrefabAsset: {fileID: 0} +--- !u!1001 &7513546499628770105 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1535527825289263518} + m_Modifications: + - target: {fileID: 3500131015529711788, guid: 50952f50e80104e40be334f93145d211, + type: 3} + propertyPath: m_Name + value: live2d_shengdan_shu + objectReference: {fileID: 0} + - target: {fileID: 3500131015529711788, guid: 50952f50e80104e40be334f93145d211, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3005548232496429578, guid: 50952f50e80104e40be334f93145d211, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3005548232496429578, guid: 50952f50e80104e40be334f93145d211, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3005548232496429578, guid: 50952f50e80104e40be334f93145d211, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3005548232496429578, guid: 50952f50e80104e40be334f93145d211, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3005548232496429578, guid: 50952f50e80104e40be334f93145d211, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3005548232496429578, guid: 50952f50e80104e40be334f93145d211, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3005548232496429578, guid: 50952f50e80104e40be334f93145d211, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3005548232496429578, guid: 50952f50e80104e40be334f93145d211, + type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3005548232496429578, guid: 50952f50e80104e40be334f93145d211, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3005548232496429578, guid: 50952f50e80104e40be334f93145d211, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3005548232496429578, guid: 50952f50e80104e40be334f93145d211, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3005548232496429578, guid: 50952f50e80104e40be334f93145d211, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3005548232496429578, guid: 50952f50e80104e40be334f93145d211, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3005548232496429578, guid: 50952f50e80104e40be334f93145d211, + type: 3} + propertyPath: m_SizeDelta.x + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 3005548232496429578, guid: 50952f50e80104e40be334f93145d211, + type: 3} + propertyPath: m_SizeDelta.y + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 3005548232496429578, guid: 50952f50e80104e40be334f93145d211, + type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3005548232496429578, guid: 50952f50e80104e40be334f93145d211, + type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3005548232496429578, guid: 50952f50e80104e40be334f93145d211, + type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3005548232496429578, guid: 50952f50e80104e40be334f93145d211, + type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3005548232496429578, guid: 50952f50e80104e40be334f93145d211, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3005548232496429578, guid: 50952f50e80104e40be334f93145d211, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 50952f50e80104e40be334f93145d211, type: 3} +--- !u!224 &4751474121987070259 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 3005548232496429578, guid: 50952f50e80104e40be334f93145d211, + type: 3} + m_PrefabInstance: {fileID: 7513546499628770105} + m_PrefabAsset: {fileID: 0}