diff --git a/Assets/lua/app/ui/summon/summon_main_ui.lua.bytes b/Assets/lua/app/ui/summon/summon_main_ui.lua.bytes index 198826d3f..1fb6e9793 100644 Binary files a/Assets/lua/app/ui/summon/summon_main_ui.lua.bytes and b/Assets/lua/app/ui/summon/summon_main_ui.lua.bytes differ diff --git a/Assets/prefabs/ui/summon/summon_main_ui.prefab b/Assets/prefabs/ui/summon/summon_main_ui.prefab index d14f1dceb..6b12d6e0e 100644 --- a/Assets/prefabs/ui/summon/summon_main_ui.prefab +++ b/Assets/prefabs/ui/summon/summon_main_ui.prefab @@ -360,6 +360,43 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &197489684863970535 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5073203540578423780} + m_Layer: 5 + m_Name: node_1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5073203540578423780 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 197489684863970535} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 8446309304668853290} + m_Father: {fileID: 2704381458509292019} + m_RootOrder: 6 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 200} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &226345862650239170 GameObject: m_ObjectHideFlags: 0 @@ -1026,6 +1063,43 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &965820547178176145 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 134336090572455739} + m_Layer: 5 + m_Name: node_4 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &134336090572455739 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 965820547178176145} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1857440977342701522} + m_Father: {fileID: 2704381458509292019} + m_RootOrder: 9 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 200} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &967691383973116042 GameObject: m_ObjectHideFlags: 0 @@ -1696,15 +1770,16 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 2833483140874461561} - {fileID: 7762099662444755621} - {fileID: 2607376348365396458} - {fileID: 51346201750493764} - {fileID: 3144514320436245052} - {fileID: 4826127434984331413} - - {fileID: 8446309304668853290} - - {fileID: 2844504546019990886} - - {fileID: 7486214079522696721} - - {fileID: 1857440977342701522} + - {fileID: 5073203540578423780} + - {fileID: 4550381594115237038} + - {fileID: 4054891019347234694} + - {fileID: 134336090572455739} - {fileID: 342043225826352294} - {fileID: 9115764089574011562} - {fileID: 942534551724310191} @@ -1718,6 +1793,43 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &2323759657646242247 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4054891019347234694} + m_Layer: 5 + m_Name: node_3 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4054891019347234694 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2323759657646242247} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 7486214079522696721} + m_Father: {fileID: 2704381458509292019} + m_RootOrder: 8 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 200} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &2394859924313532439 GameObject: m_ObjectHideFlags: 0 @@ -4730,7 +4842,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2704381458509292019} - m_RootOrder: 9 + m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -5468,32 +5580,32 @@ MonoBehaviour: hashName: 4154518875 objectType: 0 gameObject: {fileID: 7569108295269207117} - - name: summon_main_ui.summon_node.vfx_c1_chouka_01 - hashName: 1370438757 + - name: summon_main_ui.summon_node.node_1.vfx_c1_chouka_01 + hashName: 493081695 objectType: 2 gameObject: {fileID: 8446309304668853291} - name: summon_main_ui.summon_node.vfx_c1_chouka_01_1 hashName: 2731655895 objectType: 2 gameObject: {fileID: 2607376348365396459} - - name: summon_main_ui.summon_node.vfx_c1_chouka_02 - hashName: 1370438758 + - name: summon_main_ui.summon_node.node_2.vfx_c1_chouka_02 + hashName: 3790976639 objectType: 2 gameObject: {fileID: 2844504546019990887} - name: summon_main_ui.summon_node.vfx_c1_chouka_02_1 hashName: 2731656856 objectType: 2 gameObject: {fileID: 51346201750493765} - - name: summon_main_ui.summon_node.vfx_c1_chouka_03 - hashName: 1370438759 + - name: summon_main_ui.summon_node.node_3.vfx_c1_chouka_03 + hashName: 2793904287 objectType: 2 gameObject: {fileID: 7486214079522696720} - name: summon_main_ui.summon_node.vfx_c1_chouka_03_1 hashName: 2731657817 objectType: 2 gameObject: {fileID: 3144514320436245053} - - name: summon_main_ui.summon_node.vfx_c1_chouka_04 - hashName: 1370438760 + - name: summon_main_ui.summon_node.node_4.vfx_c1_chouka_04 + hashName: 1796831935 objectType: 2 gameObject: {fileID: 1857440977342701523} - name: summon_main_ui.summon_node.vfx_c1_chouka_04_1 @@ -5528,6 +5640,10 @@ MonoBehaviour: hashName: 741873460 objectType: 0 gameObject: {fileID: 2959871574588318847} + - name: summon_main_ui.summon_node.ui_spine_obj + hashName: 4259816432 + objectType: 6 + gameObject: {fileID: 1441562385269778335} --- !u!114 &8897035057496476863 MonoBehaviour: m_ObjectHideFlags: 0 @@ -5558,7 +5674,45 @@ MonoBehaviour: - {fileID: 116817320483622845} - {fileID: 219309311519981331} - {fileID: 5963814871877536495} + - {fileID: 5283945529600879399} NotchScreenNodeList: [] +--- !u!1 &9079355714085473956 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4550381594115237038} + m_Layer: 5 + m_Name: node_2 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4550381594115237038 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9079355714085473956} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 2844504546019990886} + m_Father: {fileID: 2704381458509292019} + m_RootOrder: 7 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 200} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1001 &136500459680758832 PrefabInstance: m_ObjectHideFlags: 0 @@ -5580,7 +5734,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3046541579344530956, guid: 2007670c06330c243a8ec68eb12dacf8, type: 3} propertyPath: m_RootOrder - value: 3 + value: 4 objectReference: {fileID: 0} - target: {fileID: 3046541579344530956, guid: 2007670c06330c243a8ec68eb12dacf8, type: 3} propertyPath: m_AnchorMax.x @@ -5690,7 +5844,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 2704381458509292019} + m_TransformParent: {fileID: 5073203540578423780} m_Modifications: - target: {fileID: 5401215128552085899, guid: 852486559026a424099082e43c98cc05, type: 3} propertyPath: GroupOrder @@ -5706,7 +5860,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8234700346181588800, guid: 852486559026a424099082e43c98cc05, type: 3} propertyPath: m_RootOrder - value: 5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8234700346181588800, guid: 852486559026a424099082e43c98cc05, type: 3} propertyPath: m_AnchorMax.x @@ -5824,7 +5978,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 654114801442259282, guid: 4f4dd4e60c621ab429f355dc75aef41c, type: 3} propertyPath: m_RootOrder - value: 2 + value: 3 objectReference: {fileID: 0} - target: {fileID: 654114801442259282, guid: 4f4dd4e60c621ab429f355dc75aef41c, type: 3} propertyPath: m_AnchorMax.x @@ -5954,7 +6108,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 342179693184048208, guid: 8505e6fd9d6e91849a222e69b3c697c5, type: 3} propertyPath: m_RootOrder - value: 11 + value: 12 objectReference: {fileID: 0} - target: {fileID: 342179693184048208, guid: 8505e6fd9d6e91849a222e69b3c697c5, type: 3} propertyPath: m_AnchorMax.x @@ -6032,6 +6186,26 @@ PrefabInstance: propertyPath: m_Name value: vfx_c1_chouka_02_2 objectReference: {fileID: 0} + - target: {fileID: 342179693592217023, guid: 8505e6fd9d6e91849a222e69b3c697c5, type: 3} + propertyPath: m_SortingLayer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3270054078021788929, guid: 8505e6fd9d6e91849a222e69b3c697c5, type: 3} + propertyPath: m_SortingLayer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7288795119086191361, guid: 8505e6fd9d6e91849a222e69b3c697c5, type: 3} + propertyPath: m_SortingLayer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8440507719700537932, guid: 8505e6fd9d6e91849a222e69b3c697c5, type: 3} + propertyPath: m_SortingLayer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8632086712218985481, guid: 8505e6fd9d6e91849a222e69b3c697c5, type: 3} + propertyPath: m_SortingLayer + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 8505e6fd9d6e91849a222e69b3c697c5, type: 3} --- !u!1 &942534551724310190 stripped @@ -6055,6 +6229,175 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 19f68781e20cf4a5e9d966c7126699ce, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1001 &1127468021385104103 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 2704381458509292019} + m_Modifications: + - target: {fileID: 1991971382385470840, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_Name + value: ui_spine_obj + objectReference: {fileID: 0} + - target: {fileID: 2505651998029909099, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: referenceSize.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2505651998029909099, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: referenceSize.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2505651998029909099, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: skeletonDataAsset + value: + objectReference: {fileID: 11400000, guid: 6d79cb672a48e2948ab58e6d497db47a, type: 2} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_LocalScale.x + value: 0.8 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_LocalScale.y + value: 0.8 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_LocalScale.z + value: 0.8 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_AnchoredPosition.y + value: 200 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_ConstrainProportionsScale + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 4f7cf840d6e73e14781807788b817568, type: 3} +--- !u!1 &1441562385269778335 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1991971382385470840, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + m_PrefabInstance: {fileID: 1127468021385104103} + m_PrefabAsset: {fileID: 0} +--- !u!223 &1484256781599938731 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1441562385269778335} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 2 + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 1 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_AdditionalShaderChannelsFlag: 0 + m_SortingLayerID: 0 + m_SortingOrder: 0 + m_TargetDisplay: 0 +--- !u!114 &5283945529600879399 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1441562385269778335} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9fff095fb5ba641dca2ce92e4551cd53, type: 3} + m_Name: + m_EditorClassIdentifier: + GroupOrder: 11 +--- !u!224 &2833483140874461561 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + m_PrefabInstance: {fileID: 1127468021385104103} + m_PrefabAsset: {fileID: 0} --- !u!1001 &3070559621492297859 PrefabInstance: m_ObjectHideFlags: 0 @@ -6066,6 +6409,14 @@ PrefabInstance: propertyPath: GroupOrder value: 10 objectReference: {fileID: 0} + - target: {fileID: 3382174202195864674, guid: 1854a3b4fd310cf48b8fce987d94bf6c, type: 3} + propertyPath: m_SortingLayer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3872967748344193438, guid: 1854a3b4fd310cf48b8fce987d94bf6c, type: 3} + propertyPath: m_SortingLayer + value: 0 + objectReference: {fileID: 0} - target: {fileID: 3872967748751816816, guid: 1854a3b4fd310cf48b8fce987d94bf6c, type: 3} propertyPath: m_Name value: vfx_c1_chouka_04_2 @@ -6080,7 +6431,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3872967748751816817, guid: 1854a3b4fd310cf48b8fce987d94bf6c, type: 3} propertyPath: m_RootOrder - value: 13 + value: 14 objectReference: {fileID: 0} - target: {fileID: 3872967748751816817, guid: 1854a3b4fd310cf48b8fce987d94bf6c, type: 3} propertyPath: m_AnchorMax.x @@ -6154,6 +6505,18 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 4909649507123349101, guid: 1854a3b4fd310cf48b8fce987d94bf6c, type: 3} + propertyPath: m_SortingLayer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6063852467215984416, guid: 1854a3b4fd310cf48b8fce987d94bf6c, type: 3} + propertyPath: m_SortingLayer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6975035019143520868, guid: 1854a3b4fd310cf48b8fce987d94bf6c, type: 3} + propertyPath: m_SortingLayer + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1854a3b4fd310cf48b8fce987d94bf6c, type: 3} --- !u!114 &219309311519981331 stripped @@ -6202,7 +6565,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5864946416378104243, guid: 78943a431027ae1409e1362042c7508f, type: 3} propertyPath: m_RootOrder - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5864946416378104243, guid: 78943a431027ae1409e1362042c7508f, type: 3} propertyPath: m_AnchorMax.x @@ -6304,7 +6667,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 2704381458509292019} + m_TransformParent: {fileID: 4550381594115237038} m_Modifications: - target: {fileID: 3511156362688393964, guid: a29f71b84ff428c4ab19d55b276e5352, type: 3} propertyPath: GroupOrder @@ -6320,7 +6683,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7309059498324196270, guid: a29f71b84ff428c4ab19d55b276e5352, type: 3} propertyPath: m_RootOrder - value: 6 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7309059498324196270, guid: a29f71b84ff428c4ab19d55b276e5352, type: 3} propertyPath: m_AnchorMax.x @@ -6446,7 +6809,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7913603777779461503, guid: c3dc1e9404c96be4294d778af8c755c0, type: 3} propertyPath: m_RootOrder - value: 1 + value: 2 objectReference: {fileID: 0} - target: {fileID: 7913603777779461503, guid: c3dc1e9404c96be4294d778af8c755c0, type: 3} propertyPath: m_AnchorMax.x @@ -6552,7 +6915,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 2704381458509292019} + m_TransformParent: {fileID: 134336090572455739} m_Modifications: - target: {fileID: 3272391289621073328, guid: 57209e122ae81c447ab1e5eaf44b12c4, type: 3} propertyPath: GroupOrder @@ -6572,7 +6935,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6069280858182200167, guid: 57209e122ae81c447ab1e5eaf44b12c4, type: 3} propertyPath: m_RootOrder - value: 8 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6069280858182200167, guid: 57209e122ae81c447ab1e5eaf44b12c4, type: 3} propertyPath: m_AnchorMax.x @@ -6698,7 +7061,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1435520264601754301, guid: 1c656ced561732043a61d1b31d47bf25, type: 3} propertyPath: m_RootOrder - value: 4 + value: 5 objectReference: {fileID: 0} - target: {fileID: 1435520264601754301, guid: 1c656ced561732043a61d1b31d47bf25, type: 3} propertyPath: m_AnchorMax.x @@ -6802,10 +7165,34 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 2704381458509292019} m_Modifications: + - target: {fileID: 1043971943219433319, guid: 965b8405c4210b14ca20e3f2eab2beb3, type: 3} + propertyPath: m_SortingLayer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2173397342461911781, guid: 965b8405c4210b14ca20e3f2eab2beb3, type: 3} + propertyPath: m_SortingLayer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2195886852766641706, guid: 965b8405c4210b14ca20e3f2eab2beb3, type: 3} + propertyPath: m_SortingLayer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4883627185489285277, guid: 965b8405c4210b14ca20e3f2eab2beb3, type: 3} + propertyPath: m_SortingLayer + value: 0 + objectReference: {fileID: 0} - target: {fileID: 6852241038946925380, guid: 965b8405c4210b14ca20e3f2eab2beb3, type: 3} propertyPath: GroupOrder value: 10 objectReference: {fileID: 0} + - target: {fileID: 8236180101090865656, guid: 965b8405c4210b14ca20e3f2eab2beb3, type: 3} + propertyPath: m_SortingLayer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9214911707569875092, guid: 965b8405c4210b14ca20e3f2eab2beb3, type: 3} + propertyPath: m_SortingLayer + value: 0 + objectReference: {fileID: 0} - target: {fileID: 9214911709044978042, guid: 965b8405c4210b14ca20e3f2eab2beb3, type: 3} propertyPath: m_Name value: vfx_c1_chouka_03_2 @@ -6820,7 +7207,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 9214911709044978043, guid: 965b8405c4210b14ca20e3f2eab2beb3, type: 3} propertyPath: m_RootOrder - value: 12 + value: 13 objectReference: {fileID: 0} - target: {fileID: 9214911709044978043, guid: 965b8405c4210b14ca20e3f2eab2beb3, type: 3} propertyPath: m_AnchorMax.x @@ -6928,6 +7315,10 @@ PrefabInstance: propertyPath: GroupOrder value: 10 objectReference: {fileID: 0} + - target: {fileID: 1655857854570829114, guid: 2a02a5e004c1dab49945b0c7df97d919, type: 3} + propertyPath: m_SortingLayer + value: 0 + objectReference: {fileID: 0} - target: {fileID: 1655857856047533268, guid: 2a02a5e004c1dab49945b0c7df97d919, type: 3} propertyPath: m_Name value: vfx_c1_chouka_01_2 @@ -6942,7 +7333,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1655857856047533269, guid: 2a02a5e004c1dab49945b0c7df97d919, type: 3} propertyPath: m_RootOrder - value: 10 + value: 11 objectReference: {fileID: 0} - target: {fileID: 1655857856047533269, guid: 2a02a5e004c1dab49945b0c7df97d919, type: 3} propertyPath: m_AnchorMax.x @@ -7016,6 +7407,22 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 5668828466873614804, guid: 2a02a5e004c1dab49945b0c7df97d919, type: 3} + propertyPath: m_SortingLayer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7132325645830031017, guid: 2a02a5e004c1dab49945b0c7df97d919, type: 3} + propertyPath: m_SortingLayer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7451159822711911113, guid: 2a02a5e004c1dab49945b0c7df97d919, type: 3} + propertyPath: m_SortingLayer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8602548083369005956, guid: 2a02a5e004c1dab49945b0c7df97d919, type: 3} + propertyPath: m_SortingLayer + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 2a02a5e004c1dab49945b0c7df97d919, type: 3} --- !u!114 &7132518073212594828 stripped @@ -7044,7 +7451,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 2704381458509292019} + m_TransformParent: {fileID: 4054891019347234694} m_Modifications: - target: {fileID: 1368856006469724382, guid: c3aaa5aad8f7aa444ab83f6b7b80ddad, type: 3} propertyPath: m_Name @@ -7060,7 +7467,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1368856006469724383, guid: c3aaa5aad8f7aa444ab83f6b7b80ddad, type: 3} propertyPath: m_RootOrder - value: 7 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1368856006469724383, guid: c3aaa5aad8f7aa444ab83f6b7b80ddad, type: 3} propertyPath: m_AnchorMax.x