puxuan/c1_unity
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev_hero' into dev_act

Browse Source
This commit is contained in:
puxuan 2025-09-28 20:36:36 +08:00
commit c3ce4f0615
14 changed files with 190 additions and 137 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Assets/arts/spines/characters/m10015/m10015.skel.bytes
View File

Binary file not shown.

BIN
Assets/arts/spines/characters/p23001/p23001.skel.bytes
View File

Binary file not shown.

BIN
Assets/lua/app/ui/battle/battle_result_ui.lua.bytes
View File

Binary file not shown.

BIN
Assets/lua/app/ui/hero/cell/hero_cell.lua.bytes
View File

Binary file not shown.

BIN
Assets/lua/app/ui/hero/hero_detail_ui.lua.bytes
View File

Binary file not shown.

BIN
Assets/lua/app/ui/summon/summon_main_ui.lua.bytes
View File

Binary file not shown.

BIN
Assets/lua/app/ui/summon/summon_wish_ui.lua.bytes
View File

Binary file not shown.

BIN
Assets/lua/app/ui/talent/cell/talent_cell.lua.bytes
View File

Binary file not shown.

2
Assets/prefabs/effects/battle/sfx_c1_m10014_02.prefab
View File

@ -4873,7 +4873,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
GroupOrder: 0
RootParticle: {fileID: 5463814383210688134}
EffectDuration: 1
EffectDuration: 1.24
AnimatorCount: 0
TrailRendererCount: 0
EulerAnglesFlip: 1

2
Assets/prefabs/effects/battle/sfx_c1_m10014_03.prefab
View File

@ -24616,7 +24616,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
GroupOrder: 0
RootParticle: {fileID: 8254629717865616313}
EffectDuration: 1
EffectDuration: 1.24
AnimatorCount: 0
TrailRendererCount: 0
EulerAnglesFlip: 1

18
Assets/prefabs/effects/battle/sfx_c1_m20003_04.prefab
View File

@ -19985,7 +19985,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: -15}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -1.5799999, y: 0.41800013}
m_AnchoredPosition: {x: -2.69, y: 0.41800013}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!198 &576097060
@ -24905,7 +24905,7 @@ RectTransform:
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: -1.58, y: 0.418}
m_AnchoredPosition: {x: -2.69, y: 0.418}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!198 &1072431055
@ -50036,7 +50036,7 @@ RectTransform:
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: -1.08, y: 0.48}
m_AnchoredPosition: {x: -2.19, y: 0.48}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!198 &1306604978
@ -54992,7 +54992,7 @@ RectTransform:
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: -1.5799999, y: 0.41800013}
m_AnchoredPosition: {x: -2.69, y: 0.41800013}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!198 &1602842374
@ -59912,7 +59912,7 @@ RectTransform:
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: -1.5799999, y: 0.41800013}
m_AnchoredPosition: {x: -2.69, y: 0.41800013}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!198 &1608100105
@ -74879,7 +74879,7 @@ RectTransform:
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: -1.49, y: 0.73}
m_AnchoredPosition: {x: -2.6, y: 0.73}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!198 &6876468939226080768
@ -79909,7 +79909,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -140, y: 0}
m_AnchoredPosition: {x: -40.1, y: 17.6}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!198 &4000408418747309325
@ -84726,7 +84726,7 @@ RectTransform:
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: -1.49, y: 0.73}
m_AnchoredPosition: {x: -2.6, y: 0.73}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!198 &4701130283882041066
@ -89655,7 +89655,7 @@ RectTransform:
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.83, y: 0.44}
m_AnchoredPosition: {x: -1.94, y: 0.44}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!198 &7764853580515370813

8
Assets/prefabs/ui/battle/battle_result_ui.prefab
View File

@ -2491,14 +2491,14 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_Color: {r: 0, g: 0, b: 0, a: 0.9411765}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Texture: {fileID: 2800000, guid: 2e20a9c179d4bc14e888f80bd408c56b, type: 3}
m_Texture: {fileID: 0}
m_UVRect:
serializedVersion: 2
x: 0
@ -4292,14 +4292,14 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_Color: {r: 0, g: 0, b: 0, a: 0.9411765}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Texture: {fileID: 2800000, guid: 6fdb003cb9ba1e14bb77b744b5bb6c7c, type: 3}
m_Texture: {fileID: 0}
m_UVRect:
serializedVersion: 2
x: 0

12
Assets/prefabs/ui/hero/hero_detail_ui.prefab
View File

@ -8459,6 +8459,18 @@ MonoBehaviour:
hashName: 3295961737
objectType: 0
gameObject: {fileID: 8239297190618542949}
- name: hero_detail_ui.red_node.red_img_1.red_img
hashName: 3001357697
objectType: 0
gameObject: {fileID: 4156663065910893430}
- name: hero_detail_ui.red_node.red_img_2.red_img
hashName: 1193903234
objectType: 0
gameObject: {fileID: 2348674475130942949}
- name: hero_detail_ui.red_node.red_img_3.red_img
hashName: 3681416067
objectType: 0
gameObject: {fileID: 1919838440902195793}
--- !u!114 &8990903588057615877
MonoBehaviour:
m_ObjectHideFlags: 0

285
Assets/prefabs/ui/summon/summon_main_ui.prefab
View File

@ -694,7 +694,7 @@ RectTransform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1860592413001014335}
m_RootOrder: 9
m_RootOrder: 8
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0}
@ -1531,7 +1531,7 @@ RectTransform:
- {fileID: 7719113567621192212}
- {fileID: 7588559019755838383}
m_Father: {fileID: 4165930251451731960}
m_RootOrder: 2
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 0}
@ -1668,6 +1668,56 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
IsShowClickAnimation: 1
--- !u!1 &2192492273805268439
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2704381458509292019}
m_Layer: 5
m_Name: summon_node
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &2704381458509292019
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2192492273805268439}
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: 7762099662444755621}
- {fileID: 2607376348365396458}
- {fileID: 51346201750493764}
- {fileID: 3144514320436245052}
- {fileID: 4826127434984331413}
- {fileID: 8446309304668853290}
- {fileID: 2844504546019990886}
- {fileID: 7486214079522696721}
- {fileID: 1857440977342701522}
- {fileID: 342043225826352294}
- {fileID: 9115764089574011562}
- {fileID: 942534551724310191}
- {fileID: 2406885035781408130}
- {fileID: 2243736067453855986}
m_Father: {fileID: 4165930251451731960}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &2394859924313532439
GameObject:
m_ObjectHideFlags: 0
@ -1925,8 +1975,8 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1860592413001014335}
m_RootOrder: 8
m_Father: {fileID: 4165930251451731960}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
@ -2097,7 +2147,7 @@ RectTransform:
m_Children:
- {fileID: 935156093379100506}
m_Father: {fileID: 1860592413001014335}
m_RootOrder: 10
m_RootOrder: 9
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0}
@ -2316,23 +2366,8 @@ RectTransform:
- {fileID: 283037638447555161}
- {fileID: 3019922216597009671}
- {fileID: 6466735246749440629}
- {fileID: 764523135023095686}
- {fileID: 6768177343684144756}
- {fileID: 548820023637979738}
- {fileID: 7762099662444755621}
- {fileID: 2607376348365396458}
- {fileID: 51346201750493764}
- {fileID: 3144514320436245052}
- {fileID: 4826127434984331413}
- {fileID: 8446309304668853290}
- {fileID: 2844504546019990886}
- {fileID: 7486214079522696721}
- {fileID: 1857440977342701522}
- {fileID: 342043225826352294}
- {fileID: 9115764089574011562}
- {fileID: 942534551724310191}
- {fileID: 2406885035781408130}
- {fileID: 2243736067453855986}
m_Father: {fileID: 4165930251451731960}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -4689,13 +4724,13 @@ RectTransform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8071708214262237015}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1860592413001014335}
m_RootOrder: 20
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}
@ -5223,7 +5258,9 @@ RectTransform:
m_Children:
- {fileID: 7859892835487863648}
- {fileID: 1860592413001014335}
- {fileID: 2704381458509292019}
- {fileID: 1384287316099047761}
- {fileID: 764523135023095686}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -5299,12 +5336,12 @@ MonoBehaviour:
hashName: 1825978916
objectType: 0
gameObject: {fileID: 710392160389177726}
- name: summon_main_ui.node.btn_wish.unlock.img_wish_icon
hashName: 3187016693
- name: summon_main_ui.node.btn_wish.img_wish_icon
hashName: 3628037451
objectType: 0
gameObject: {fileID: 4635546525235332008}
- name: summon_main_ui.node.btn_wish.unlock.tx_guarantee
hashName: 3830510125
- name: summon_main_ui.node.btn_wish.tx_guarantee
hashName: 1627979287
objectType: 0
gameObject: {fileID: 2854164949415665262}
- name: summon_main_ui.node.btn_info
@ -5315,8 +5352,8 @@ MonoBehaviour:
hashName: 3150070319
objectType: 0
gameObject: {fileID: 161003691293851348}
- name: summon_main_ui.node.touch_node
hashName: 1755149820
- name: summon_main_ui.touch_node
hashName: 2098557620
objectType: 0
gameObject: {fileID: 2537329990297115782}
- name: summon_main_ui.node.jump_tween
@ -5431,62 +5468,66 @@ MonoBehaviour:
hashName: 4154518875
objectType: 0
gameObject: {fileID: 7569108295269207117}
- name: summon_main_ui.node.vfx_c1_chouka_01
hashName: 3820386079
- name: summon_main_ui.summon_node.vfx_c1_chouka_01
hashName: 1370438757
objectType: 2
gameObject: {fileID: 8446309304668853291}
- name: summon_main_ui.node.vfx_c1_chouka_01_1
hashName: 3488954129
- name: summon_main_ui.summon_node.vfx_c1_chouka_01_1
hashName: 2731655895
objectType: 2
gameObject: {fileID: 2607376348365396459}
- name: summon_main_ui.node.vfx_c1_chouka_02
hashName: 3820386080
- name: summon_main_ui.summon_node.vfx_c1_chouka_02
hashName: 1370438758
objectType: 2
gameObject: {fileID: 2844504546019990887}
- name: summon_main_ui.node.vfx_c1_chouka_02_1
hashName: 3488955090
- name: summon_main_ui.summon_node.vfx_c1_chouka_02_1
hashName: 2731656856
objectType: 2
gameObject: {fileID: 51346201750493765}
- name: summon_main_ui.node.vfx_c1_chouka_03
hashName: 3820386081
- name: summon_main_ui.summon_node.vfx_c1_chouka_03
hashName: 1370438759
objectType: 2
gameObject: {fileID: 7486214079522696720}
- name: summon_main_ui.node.vfx_c1_chouka_03_1
hashName: 3488956051
- name: summon_main_ui.summon_node.vfx_c1_chouka_03_1
hashName: 2731657817
objectType: 2
gameObject: {fileID: 3144514320436245053}
- name: summon_main_ui.node.vfx_c1_chouka_04
hashName: 3820386082
- name: summon_main_ui.summon_node.vfx_c1_chouka_04
hashName: 1370438760
objectType: 2
gameObject: {fileID: 1857440977342701523}
- name: summon_main_ui.node.vfx_c1_chouka_04_1
hashName: 3488957012
- name: summon_main_ui.summon_node.vfx_c1_chouka_04_1
hashName: 2731658778
objectType: 2
gameObject: {fileID: 4826127434984331412}
- name: summon_main_ui.node.hero_node
hashName: 2129689837
- name: summon_main_ui.summon_node.hero_node
hashName: 3300948583
objectType: 0
gameObject: {fileID: 8071708214262237015}
- name: summon_main_ui.node.vfx_c1_chouka_bg_01
hashName: 831180381
- name: summon_main_ui.summon_node.vfx_c1_chouka_bg_01
hashName: 3124738903
objectType: 2
gameObject: {fileID: 7762099662444755620}
- name: summon_main_ui.node.vfx_c1_chouka_01_2
hashName: 3488954130
- name: summon_main_ui.summon_node.vfx_c1_chouka_01_2
hashName: 2731655896
objectType: 2
gameObject: {fileID: 9115764089574011563}
- name: summon_main_ui.node.vfx_c1_chouka_02_2
hashName: 3488955091
- name: summon_main_ui.summon_node.vfx_c1_chouka_02_2
hashName: 2731656857
objectType: 2
gameObject: {fileID: 942534551724310190}
- name: summon_main_ui.node.vfx_c1_chouka_03_2
hashName: 3488956052
- name: summon_main_ui.summon_node.vfx_c1_chouka_03_2
hashName: 2731657818
objectType: 2
gameObject: {fileID: 2406885035781408131}
- name: summon_main_ui.node.vfx_c1_chouka_04_2
hashName: 3488957013
- name: summon_main_ui.summon_node.vfx_c1_chouka_04_2
hashName: 2731658779
objectType: 2
gameObject: {fileID: 2243736067453855987}
- name: summon_main_ui.node
hashName: 741873460
objectType: 0
gameObject: {fileID: 2959871574588318847}
--- !u!114 &8897035057496476863
MonoBehaviour:
m_ObjectHideFlags: 0
@ -5523,7 +5564,7 @@ PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 1860592413001014335}
m_TransformParent: {fileID: 2704381458509292019}
m_Modifications:
- target: {fileID: 774197916279997491, guid: 2007670c06330c243a8ec68eb12dacf8, type: 3}
propertyPath: GroupOrder
@ -5539,7 +5580,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 3046541579344530956, guid: 2007670c06330c243a8ec68eb12dacf8, type: 3}
propertyPath: m_RootOrder
value: 14
value: 3
objectReference: {fileID: 0}
- target: {fileID: 3046541579344530956, guid: 2007670c06330c243a8ec68eb12dacf8, type: 3}
propertyPath: m_AnchorMax.x
@ -5583,15 +5624,15 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 3046541579344530956, guid: 2007670c06330c243a8ec68eb12dacf8, type: 3}
propertyPath: m_LocalRotation.x
value: 0
value: -0
objectReference: {fileID: 0}
- target: {fileID: 3046541579344530956, guid: 2007670c06330c243a8ec68eb12dacf8, type: 3}
propertyPath: m_LocalRotation.y
value: 0
value: -0
objectReference: {fileID: 0}
- target: {fileID: 3046541579344530956, guid: 2007670c06330c243a8ec68eb12dacf8, type: 3}
propertyPath: m_LocalRotation.z
value: 0
value: -0
objectReference: {fileID: 0}
- target: {fileID: 3046541579344530956, guid: 2007670c06330c243a8ec68eb12dacf8, type: 3}
propertyPath: m_AnchoredPosition.x
@ -5649,7 +5690,7 @@ PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 1860592413001014335}
m_TransformParent: {fileID: 2704381458509292019}
m_Modifications:
- target: {fileID: 5401215128552085899, guid: 852486559026a424099082e43c98cc05, type: 3}
propertyPath: GroupOrder
@ -5665,7 +5706,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 8234700346181588800, guid: 852486559026a424099082e43c98cc05, type: 3}
propertyPath: m_RootOrder
value: 16
value: 5
objectReference: {fileID: 0}
- target: {fileID: 8234700346181588800, guid: 852486559026a424099082e43c98cc05, type: 3}
propertyPath: m_AnchorMax.x
@ -5709,15 +5750,15 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 8234700346181588800, guid: 852486559026a424099082e43c98cc05, type: 3}
propertyPath: m_LocalRotation.x
value: 0
value: -0
objectReference: {fileID: 0}
- target: {fileID: 8234700346181588800, guid: 852486559026a424099082e43c98cc05, type: 3}
propertyPath: m_LocalRotation.y
value: 0
value: -0
objectReference: {fileID: 0}
- target: {fileID: 8234700346181588800, guid: 852486559026a424099082e43c98cc05, type: 3}
propertyPath: m_LocalRotation.z
value: 0
value: -0
objectReference: {fileID: 0}
- target: {fileID: 8234700346181588800, guid: 852486559026a424099082e43c98cc05, type: 3}
propertyPath: m_AnchoredPosition.x
@ -5771,7 +5812,7 @@ PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 1860592413001014335}
m_TransformParent: {fileID: 2704381458509292019}
m_Modifications:
- target: {fileID: 654114801442259282, guid: 4f4dd4e60c621ab429f355dc75aef41c, type: 3}
propertyPath: m_Pivot.x
@ -5783,7 +5824,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 654114801442259282, guid: 4f4dd4e60c621ab429f355dc75aef41c, type: 3}
propertyPath: m_RootOrder
value: 13
value: 2
objectReference: {fileID: 0}
- target: {fileID: 654114801442259282, guid: 4f4dd4e60c621ab429f355dc75aef41c, type: 3}
propertyPath: m_AnchorMax.x
@ -5827,15 +5868,15 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 654114801442259282, guid: 4f4dd4e60c621ab429f355dc75aef41c, type: 3}
propertyPath: m_LocalRotation.x
value: 0
value: -0
objectReference: {fileID: 0}
- target: {fileID: 654114801442259282, guid: 4f4dd4e60c621ab429f355dc75aef41c, type: 3}
propertyPath: m_LocalRotation.y
value: 0
value: -0
objectReference: {fileID: 0}
- target: {fileID: 654114801442259282, guid: 4f4dd4e60c621ab429f355dc75aef41c, type: 3}
propertyPath: m_LocalRotation.z
value: 0
value: -0
objectReference: {fileID: 0}
- target: {fileID: 654114801442259282, guid: 4f4dd4e60c621ab429f355dc75aef41c, type: 3}
propertyPath: m_AnchoredPosition.x
@ -5897,7 +5938,7 @@ PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 1860592413001014335}
m_TransformParent: {fileID: 2704381458509292019}
m_Modifications:
- target: {fileID: 290597992932676153, guid: 8505e6fd9d6e91849a222e69b3c697c5, type: 3}
propertyPath: GroupOrder
@ -5913,7 +5954,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 342179693184048208, guid: 8505e6fd9d6e91849a222e69b3c697c5, type: 3}
propertyPath: m_RootOrder
value: 22
value: 11
objectReference: {fileID: 0}
- target: {fileID: 342179693184048208, guid: 8505e6fd9d6e91849a222e69b3c697c5, type: 3}
propertyPath: m_AnchorMax.x
@ -5957,15 +5998,15 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 342179693184048208, guid: 8505e6fd9d6e91849a222e69b3c697c5, type: 3}
propertyPath: m_LocalRotation.x
value: 0
value: -0
objectReference: {fileID: 0}
- target: {fileID: 342179693184048208, guid: 8505e6fd9d6e91849a222e69b3c697c5, type: 3}
propertyPath: m_LocalRotation.y
value: 0
value: -0
objectReference: {fileID: 0}
- target: {fileID: 342179693184048208, guid: 8505e6fd9d6e91849a222e69b3c697c5, type: 3}
propertyPath: m_LocalRotation.z
value: 0
value: -0
objectReference: {fileID: 0}
- target: {fileID: 342179693184048208, guid: 8505e6fd9d6e91849a222e69b3c697c5, type: 3}
propertyPath: m_AnchoredPosition.x
@ -6019,7 +6060,7 @@ PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 1860592413001014335}
m_TransformParent: {fileID: 2704381458509292019}
m_Modifications:
- target: {fileID: 2997133582572564368, guid: 1854a3b4fd310cf48b8fce987d94bf6c, type: 3}
propertyPath: GroupOrder
@ -6039,7 +6080,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 3872967748751816817, guid: 1854a3b4fd310cf48b8fce987d94bf6c, type: 3}
propertyPath: m_RootOrder
value: 24
value: 13
objectReference: {fileID: 0}
- target: {fileID: 3872967748751816817, guid: 1854a3b4fd310cf48b8fce987d94bf6c, type: 3}
propertyPath: m_AnchorMax.x
@ -6083,15 +6124,15 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 3872967748751816817, guid: 1854a3b4fd310cf48b8fce987d94bf6c, type: 3}
propertyPath: m_LocalRotation.x
value: 0
value: -0
objectReference: {fileID: 0}
- target: {fileID: 3872967748751816817, guid: 1854a3b4fd310cf48b8fce987d94bf6c, type: 3}
propertyPath: m_LocalRotation.y
value: 0
value: -0
objectReference: {fileID: 0}
- target: {fileID: 3872967748751816817, guid: 1854a3b4fd310cf48b8fce987d94bf6c, type: 3}
propertyPath: m_LocalRotation.z
value: 0
value: -0
objectReference: {fileID: 0}
- target: {fileID: 3872967748751816817, guid: 1854a3b4fd310cf48b8fce987d94bf6c, type: 3}
propertyPath: m_AnchoredPosition.x
@ -6141,7 +6182,7 @@ PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 1860592413001014335}
m_TransformParent: {fileID: 2704381458509292019}
m_Modifications:
- target: {fileID: 5556881123115209109, guid: 78943a431027ae1409e1362042c7508f, type: 3}
propertyPath: GroupOrder
@ -6161,7 +6202,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 5864946416378104243, guid: 78943a431027ae1409e1362042c7508f, type: 3}
propertyPath: m_RootOrder
value: 11
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5864946416378104243, guid: 78943a431027ae1409e1362042c7508f, type: 3}
propertyPath: m_AnchorMax.x
@ -6205,15 +6246,15 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 5864946416378104243, guid: 78943a431027ae1409e1362042c7508f, type: 3}
propertyPath: m_LocalRotation.x
value: 0
value: -0
objectReference: {fileID: 0}
- target: {fileID: 5864946416378104243, guid: 78943a431027ae1409e1362042c7508f, type: 3}
propertyPath: m_LocalRotation.y
value: 0
value: -0
objectReference: {fileID: 0}
- target: {fileID: 5864946416378104243, guid: 78943a431027ae1409e1362042c7508f, type: 3}
propertyPath: m_LocalRotation.z
value: 0
value: -0
objectReference: {fileID: 0}
- target: {fileID: 5864946416378104243, guid: 78943a431027ae1409e1362042c7508f, type: 3}
propertyPath: m_AnchoredPosition.x
@ -6263,7 +6304,7 @@ PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 1860592413001014335}
m_TransformParent: {fileID: 2704381458509292019}
m_Modifications:
- target: {fileID: 3511156362688393964, guid: a29f71b84ff428c4ab19d55b276e5352, type: 3}
propertyPath: GroupOrder
@ -6279,7 +6320,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 7309059498324196270, guid: a29f71b84ff428c4ab19d55b276e5352, type: 3}
propertyPath: m_RootOrder
value: 17
value: 6
objectReference: {fileID: 0}
- target: {fileID: 7309059498324196270, guid: a29f71b84ff428c4ab19d55b276e5352, type: 3}
propertyPath: m_AnchorMax.x
@ -6323,15 +6364,15 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 7309059498324196270, guid: a29f71b84ff428c4ab19d55b276e5352, type: 3}
propertyPath: m_LocalRotation.x
value: 0
value: -0
objectReference: {fileID: 0}
- target: {fileID: 7309059498324196270, guid: a29f71b84ff428c4ab19d55b276e5352, type: 3}
propertyPath: m_LocalRotation.y
value: 0
value: -0
objectReference: {fileID: 0}
- target: {fileID: 7309059498324196270, guid: a29f71b84ff428c4ab19d55b276e5352, type: 3}
propertyPath: m_LocalRotation.z
value: 0
value: -0
objectReference: {fileID: 0}
- target: {fileID: 7309059498324196270, guid: a29f71b84ff428c4ab19d55b276e5352, type: 3}
propertyPath: m_AnchoredPosition.x
@ -6385,7 +6426,7 @@ PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 1860592413001014335}
m_TransformParent: {fileID: 2704381458509292019}
m_Modifications:
- target: {fileID: 7913603777779461502, guid: c3dc1e9404c96be4294d778af8c755c0, type: 3}
propertyPath: m_Name
@ -6405,7 +6446,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 7913603777779461503, guid: c3dc1e9404c96be4294d778af8c755c0, type: 3}
propertyPath: m_RootOrder
value: 12
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7913603777779461503, guid: c3dc1e9404c96be4294d778af8c755c0, type: 3}
propertyPath: m_AnchorMax.x
@ -6449,15 +6490,15 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 7913603777779461503, guid: c3dc1e9404c96be4294d778af8c755c0, type: 3}
propertyPath: m_LocalRotation.x
value: 0
value: -0
objectReference: {fileID: 0}
- target: {fileID: 7913603777779461503, guid: c3dc1e9404c96be4294d778af8c755c0, type: 3}
propertyPath: m_LocalRotation.y
value: 0
value: -0
objectReference: {fileID: 0}
- target: {fileID: 7913603777779461503, guid: c3dc1e9404c96be4294d778af8c755c0, type: 3}
propertyPath: m_LocalRotation.z
value: 0
value: -0
objectReference: {fileID: 0}
- target: {fileID: 7913603777779461503, guid: c3dc1e9404c96be4294d778af8c755c0, type: 3}
propertyPath: m_AnchoredPosition.x
@ -6511,7 +6552,7 @@ PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 1860592413001014335}
m_TransformParent: {fileID: 2704381458509292019}
m_Modifications:
- target: {fileID: 3272391289621073328, guid: 57209e122ae81c447ab1e5eaf44b12c4, type: 3}
propertyPath: GroupOrder
@ -6531,7 +6572,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 6069280858182200167, guid: 57209e122ae81c447ab1e5eaf44b12c4, type: 3}
propertyPath: m_RootOrder
value: 19
value: 8
objectReference: {fileID: 0}
- target: {fileID: 6069280858182200167, guid: 57209e122ae81c447ab1e5eaf44b12c4, type: 3}
propertyPath: m_AnchorMax.x
@ -6575,15 +6616,15 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 6069280858182200167, guid: 57209e122ae81c447ab1e5eaf44b12c4, type: 3}
propertyPath: m_LocalRotation.x
value: 0
value: -0
objectReference: {fileID: 0}
- target: {fileID: 6069280858182200167, guid: 57209e122ae81c447ab1e5eaf44b12c4, type: 3}
propertyPath: m_LocalRotation.y
value: 0
value: -0
objectReference: {fileID: 0}
- target: {fileID: 6069280858182200167, guid: 57209e122ae81c447ab1e5eaf44b12c4, type: 3}
propertyPath: m_LocalRotation.z
value: 0
value: -0
objectReference: {fileID: 0}
- target: {fileID: 6069280858182200167, guid: 57209e122ae81c447ab1e5eaf44b12c4, type: 3}
propertyPath: m_AnchoredPosition.x
@ -6633,7 +6674,7 @@ PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 1860592413001014335}
m_TransformParent: {fileID: 2704381458509292019}
m_Modifications:
- target: {fileID: 1135893006179798364, guid: 1c656ced561732043a61d1b31d47bf25, type: 3}
propertyPath: GroupOrder
@ -6657,7 +6698,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1435520264601754301, guid: 1c656ced561732043a61d1b31d47bf25, type: 3}
propertyPath: m_RootOrder
value: 15
value: 4
objectReference: {fileID: 0}
- target: {fileID: 1435520264601754301, guid: 1c656ced561732043a61d1b31d47bf25, type: 3}
propertyPath: m_AnchorMax.x
@ -6701,15 +6742,15 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1435520264601754301, guid: 1c656ced561732043a61d1b31d47bf25, type: 3}
propertyPath: m_LocalRotation.x
value: 0
value: -0
objectReference: {fileID: 0}
- target: {fileID: 1435520264601754301, guid: 1c656ced561732043a61d1b31d47bf25, type: 3}
propertyPath: m_LocalRotation.y
value: 0
value: -0
objectReference: {fileID: 0}
- target: {fileID: 1435520264601754301, guid: 1c656ced561732043a61d1b31d47bf25, type: 3}
propertyPath: m_LocalRotation.z
value: 0
value: -0
objectReference: {fileID: 0}
- target: {fileID: 1435520264601754301, guid: 1c656ced561732043a61d1b31d47bf25, type: 3}
propertyPath: m_AnchoredPosition.x
@ -6759,7 +6800,7 @@ PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 1860592413001014335}
m_TransformParent: {fileID: 2704381458509292019}
m_Modifications:
- target: {fileID: 6852241038946925380, guid: 965b8405c4210b14ca20e3f2eab2beb3, type: 3}
propertyPath: GroupOrder
@ -6779,7 +6820,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 9214911709044978043, guid: 965b8405c4210b14ca20e3f2eab2beb3, type: 3}
propertyPath: m_RootOrder
value: 23
value: 12
objectReference: {fileID: 0}
- target: {fileID: 9214911709044978043, guid: 965b8405c4210b14ca20e3f2eab2beb3, type: 3}
propertyPath: m_AnchorMax.x
@ -6823,15 +6864,15 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 9214911709044978043, guid: 965b8405c4210b14ca20e3f2eab2beb3, type: 3}
propertyPath: m_LocalRotation.x
value: 0
value: -0
objectReference: {fileID: 0}
- target: {fileID: 9214911709044978043, guid: 965b8405c4210b14ca20e3f2eab2beb3, type: 3}
propertyPath: m_LocalRotation.y
value: 0
value: -0
objectReference: {fileID: 0}
- target: {fileID: 9214911709044978043, guid: 965b8405c4210b14ca20e3f2eab2beb3, type: 3}
propertyPath: m_LocalRotation.z
value: 0
value: -0
objectReference: {fileID: 0}
- target: {fileID: 9214911709044978043, guid: 965b8405c4210b14ca20e3f2eab2beb3, type: 3}
propertyPath: m_AnchoredPosition.x
@ -6881,7 +6922,7 @@ PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 1860592413001014335}
m_TransformParent: {fileID: 2704381458509292019}
m_Modifications:
- target: {fileID: 756800123663619315, guid: 2a02a5e004c1dab49945b0c7df97d919, type: 3}
propertyPath: GroupOrder
@ -6901,7 +6942,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1655857856047533269, guid: 2a02a5e004c1dab49945b0c7df97d919, type: 3}
propertyPath: m_RootOrder
value: 21
value: 10
objectReference: {fileID: 0}
- target: {fileID: 1655857856047533269, guid: 2a02a5e004c1dab49945b0c7df97d919, type: 3}
propertyPath: m_AnchorMax.x
@ -6945,15 +6986,15 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1655857856047533269, guid: 2a02a5e004c1dab49945b0c7df97d919, type: 3}
propertyPath: m_LocalRotation.x
value: 0
value: -0
objectReference: {fileID: 0}
- target: {fileID: 1655857856047533269, guid: 2a02a5e004c1dab49945b0c7df97d919, type: 3}
propertyPath: m_LocalRotation.y
value: 0
value: -0
objectReference: {fileID: 0}
- target: {fileID: 1655857856047533269, guid: 2a02a5e004c1dab49945b0c7df97d919, type: 3}
propertyPath: m_LocalRotation.z
value: 0
value: -0
objectReference: {fileID: 0}
- target: {fileID: 1655857856047533269, guid: 2a02a5e004c1dab49945b0c7df97d919, type: 3}
propertyPath: m_AnchoredPosition.x
@ -7003,7 +7044,7 @@ PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 1860592413001014335}
m_TransformParent: {fileID: 2704381458509292019}
m_Modifications:
- target: {fileID: 1368856006469724382, guid: c3aaa5aad8f7aa444ab83f6b7b80ddad, type: 3}
propertyPath: m_Name
@ -7019,7 +7060,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1368856006469724383, guid: c3aaa5aad8f7aa444ab83f6b7b80ddad, type: 3}
propertyPath: m_RootOrder
value: 18
value: 7
objectReference: {fileID: 0}
- target: {fileID: 1368856006469724383, guid: c3aaa5aad8f7aa444ab83f6b7b80ddad, type: 3}
propertyPath: m_AnchorMax.x
@ -7063,15 +7104,15 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1368856006469724383, guid: c3aaa5aad8f7aa444ab83f6b7b80ddad, type: 3}
propertyPath: m_LocalRotation.x
value: 0
value: -0
objectReference: {fileID: 0}
- target: {fileID: 1368856006469724383, guid: c3aaa5aad8f7aa444ab83f6b7b80ddad, type: 3}
propertyPath: m_LocalRotation.y
value: 0
value: -0
objectReference: {fileID: 0}
- target: {fileID: 1368856006469724383, guid: c3aaa5aad8f7aa444ab83f6b7b80ddad, type: 3}
propertyPath: m_LocalRotation.z
value: 0
value: -0
objectReference: {fileID: 0}
- target: {fileID: 1368856006469724383, guid: c3aaa5aad8f7aa444ab83f6b7b80ddad, type: 3}
propertyPath: m_AnchoredPosition.x