diff --git a/Assets/lua/app/ui/arena/cell/arena_grading_reward_cell.lua.bytes b/Assets/lua/app/ui/arena/cell/arena_grading_reward_cell.lua.bytes index 722331bd1..4e29c8ceb 100644 Binary files a/Assets/lua/app/ui/arena/cell/arena_grading_reward_cell.lua.bytes and b/Assets/lua/app/ui/arena/cell/arena_grading_reward_cell.lua.bytes differ diff --git a/Assets/lua/app/ui/collection/collection_ui.lua.bytes b/Assets/lua/app/ui/collection/collection_ui.lua.bytes index d06e49ef5..252b431b8 100644 Binary files a/Assets/lua/app/ui/collection/collection_ui.lua.bytes and b/Assets/lua/app/ui/collection/collection_ui.lua.bytes differ diff --git a/Assets/lua/app/userdata/arena/arena_data.lua.bytes b/Assets/lua/app/userdata/arena/arena_data.lua.bytes index f114f4616..560339fa1 100644 Binary files a/Assets/lua/app/userdata/arena/arena_data.lua.bytes and b/Assets/lua/app/userdata/arena/arena_data.lua.bytes differ diff --git a/Assets/lua/app/userdata/collection/collection_data.lua.bytes b/Assets/lua/app/userdata/collection/collection_data.lua.bytes index 1883e9a0a..9606662bc 100644 Binary files a/Assets/lua/app/userdata/collection/collection_data.lua.bytes and b/Assets/lua/app/userdata/collection/collection_data.lua.bytes differ diff --git a/Assets/prefabs/ui/arena/arena_grading_reward_ui.prefab b/Assets/prefabs/ui/arena/arena_grading_reward_ui.prefab index 5a023d1b5..86d42fbe0 100644 --- a/Assets/prefabs/ui/arena/arena_grading_reward_ui.prefab +++ b/Assets/prefabs/ui/arena/arena_grading_reward_ui.prefab @@ -87,7 +87,7 @@ GameObject: - component: {fileID: 3664342147811833443} - component: {fileID: 5645187498329543588} m_Layer: 5 - m_Name: title + m_Name: grading m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -100,17 +100,18 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 536075613204550696} - 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_Children: - {fileID: 5489250013667678455} - m_Father: {fileID: 1304151008326829289} - m_RootOrder: 1 + - {fileID: 5438904335248992865} + m_Father: {fileID: 3374828113702129116} + m_RootOrder: 0 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: -15} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: 55, y: 375} m_SizeDelta: {x: 460, y: 68} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3664342147811833443 @@ -182,7 +183,7 @@ RectTransform: m_Children: - {fileID: 8176147324261354668} m_Father: {fileID: 3374828113702129116} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -470,7 +471,7 @@ RectTransform: - {fileID: 4665632236937354937} - {fileID: 3298603911317668093} m_Father: {fileID: 3374828113702129116} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} @@ -540,6 +541,7 @@ GameObject: - component: {fileID: 3958126370285655031} - component: {fileID: 8882715418283961960} - component: {fileID: 9019749416908670519} + - component: {fileID: 7091337337293768180} m_Layer: 5 m_Name: item_hero_4 m_TagString: Untagged @@ -622,6 +624,19 @@ MonoBehaviour: hashName: 3599848182 objectType: 0 gameObject: {fileID: 254210701011705215} +--- !u!114 &7091337337293768180 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1423525942159180952} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1069f9c1eb6f9475b8f98a4cbb9dfe01, type: 3} + m_Name: + m_EditorClassIdentifier: + IsShowClickAnimation: 1 --- !u!1 &1643885180750891019 GameObject: m_ObjectHideFlags: 0 @@ -660,8 +675,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: 0, y: 57.999992} - m_SizeDelta: {x: 0, y: -116.00001} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: -0.0000076293945} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1600627296821006018 CanvasRenderer: @@ -686,7 +701,7 @@ MonoBehaviour: m_Content: {fileID: 4952285333621771988} m_Horizontal: 0 m_Vertical: 1 - m_MovementType: 1 + m_MovementType: 2 m_Elasticity: 0.1 m_Inertia: 1 m_DecelerationRate: 0.135 @@ -752,7 +767,7 @@ MonoBehaviour: bfCell: {fileID: 2465210624489816311} spacing: 0 topRecoveryOffset: 0 - downRecoveryOffset: 0 + downRecoveryOffset: 116 direction: 0 reverse: 1 --- !u!1 &1746993874378074912 @@ -767,6 +782,7 @@ GameObject: - component: {fileID: 4679043444038991252} - component: {fileID: 3908997145052557920} - component: {fileID: 6275011569159202769} + - component: {fileID: 7336396123718066460} m_Layer: 5 m_Name: item_hero_1 m_TagString: Untagged @@ -849,6 +865,19 @@ MonoBehaviour: hashName: 3599848182 objectType: 0 gameObject: {fileID: 7522053225799622603} +--- !u!114 &7336396123718066460 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1746993874378074912} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1069f9c1eb6f9475b8f98a4cbb9dfe01, type: 3} + m_Name: + m_EditorClassIdentifier: + IsShowClickAnimation: 1 --- !u!1 &3213725208684319335 GameObject: m_ObjectHideFlags: 0 @@ -1088,11 +1117,11 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1304151008326829289} - m_RootOrder: 2 + m_RootOrder: 0 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: -55} + m_AnchoredPosition: {x: 0, y: 48} m_SizeDelta: {x: 450, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4611401765385365098 @@ -1227,11 +1256,11 @@ RectTransform: - {fileID: 6588003085712510234} - {fileID: 4452936321515820920} m_Father: {fileID: 1304151008326829289} - m_RootOrder: 3 + m_RootOrder: 1 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: -125} + m_AnchoredPosition: {x: 0, y: -22} m_SizeDelta: {x: 600, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &3623428695366251553 @@ -1552,10 +1581,10 @@ RectTransform: m_Father: {fileID: 9208379845987096045} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0} - m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 40, y: 0} - m_SizeDelta: {x: 800, y: 750} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 750} m_Pivot: {x: 0.5, y: 0} --- !u!1 &4765733767644001524 GameObject: @@ -1853,18 +1882,16 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 5438904335248992865} - - {fileID: 6424392331780614127} - {fileID: 1136588644474103669} - {fileID: 6705605584822945559} m_Father: {fileID: 3374828113702129116} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 55, y: 390} - m_SizeDelta: {x: 552, y: 350} - m_Pivot: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 55, y: 215} + m_SizeDelta: {x: 552, y: 145} + m_Pivot: {x: 0.5, y: 0} --- !u!222 &6765594615365743415 CanvasRenderer: m_ObjectHideFlags: 0 @@ -1885,6 +1912,7 @@ GameObject: - component: {fileID: 9182108861352704717} - component: {fileID: 1511760204181816661} - component: {fileID: 8617525685680551769} + - component: {fileID: 7413386004639906246} m_Layer: 5 m_Name: item_hero_6 m_TagString: Untagged @@ -1967,6 +1995,19 @@ MonoBehaviour: hashName: 3599848182 objectType: 0 gameObject: {fileID: 6610422736672254139} +--- !u!114 &7413386004639906246 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5380331746494883153} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1069f9c1eb6f9475b8f98a4cbb9dfe01, type: 3} + m_Name: + m_EditorClassIdentifier: + IsShowClickAnimation: 1 --- !u!1 &5813060157945423176 GameObject: m_ObjectHideFlags: 0 @@ -2125,7 +2166,7 @@ RectTransform: - {fileID: 8557794218568745099} - {fileID: 7135395850416100696} m_Father: {fileID: 3374828113702129116} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1} @@ -2203,7 +2244,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 116} m_SizeDelta: {x: 720, y: 1164} m_Pivot: {x: 0.5, y: 0} --- !u!1 &6373785443510298725 @@ -2290,6 +2331,7 @@ GameObject: - component: {fileID: 5552340811892724779} - component: {fileID: 1159395939317068605} - component: {fileID: 8011247984763575834} + - component: {fileID: 5951463025401356057} m_Layer: 5 m_Name: item_hero_3 m_TagString: Untagged @@ -2372,6 +2414,19 @@ MonoBehaviour: hashName: 3599848182 objectType: 0 gameObject: {fileID: 7771280773859666733} +--- !u!114 &5951463025401356057 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6429013590612812923} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1069f9c1eb6f9475b8f98a4cbb9dfe01, type: 3} + m_Name: + m_EditorClassIdentifier: + IsShowClickAnimation: 1 --- !u!1 &6610422736672254139 GameObject: m_ObjectHideFlags: 0 @@ -2546,16 +2601,16 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6980365578222550171} - 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: 0.6, y: 0.6, z: 1} m_Children: [] - m_Father: {fileID: 1304151008326829289} - m_RootOrder: 0 + m_Father: {fileID: 6424392331780614127} + m_RootOrder: 1 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: 90} + m_AnchoredPosition: {x: 0, y: 105} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &7351841362606793318 @@ -2895,6 +2950,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: + - {fileID: 6424392331780614127} - {fileID: 6336919927944993533} - {fileID: 1304151008326829289} - {fileID: 3341019118615795874} @@ -2902,11 +2958,11 @@ RectTransform: m_Father: {fileID: 4952285333621771988} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0} - m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: -40, y: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 720, y: 570} - m_Pivot: {x: 0.5, y: 0} + m_Pivot: {x: 0, y: 0} --- !u!114 &6777110344541214605 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2976,8 +3032,8 @@ MonoBehaviour: hashName: 434756106 objectType: 0 gameObject: {fileID: 5122099856881843474} - - name: arena_grading_reward_cell.hero_unlock.title.tx_grading - hashName: 3718572243 + - name: arena_grading_reward_cell.grading.tx_grading + hashName: 317593970 objectType: 0 gameObject: {fileID: 3382557278436446521} - name: arena_grading_reward_cell.hero_unlock.tx_unlock @@ -3012,10 +3068,14 @@ MonoBehaviour: hashName: 719244110 objectType: 1 gameObject: {fileID: 5380331746494883153} - - name: arena_grading_reward_cell.hero_unlock.spine_root - hashName: 3260246434 + - name: arena_grading_reward_cell.grading.spine_root + hashName: 3881030807 objectType: 0 gameObject: {fileID: 6980365578222550171} + - name: arena_grading_reward_cell.grading + hashName: 2036250165 + objectType: 0 + gameObject: {fileID: 536075613204550696} --- !u!114 &2465210624489816311 MonoBehaviour: m_ObjectHideFlags: 0 @@ -3109,6 +3169,7 @@ GameObject: - component: {fileID: 4811543434184894091} - component: {fileID: 1073944592826014897} - component: {fileID: 4117997127051295040} + - component: {fileID: 8603891731664774035} m_Layer: 5 m_Name: item_hero_5 m_TagString: Untagged @@ -3191,6 +3252,19 @@ MonoBehaviour: hashName: 3599848182 objectType: 0 gameObject: {fileID: 1368293219985460373} +--- !u!114 &8603891731664774035 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8429673786970480761} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1069f9c1eb6f9475b8f98a4cbb9dfe01, type: 3} + m_Name: + m_EditorClassIdentifier: + IsShowClickAnimation: 1 --- !u!1 &9014581496819459590 GameObject: m_ObjectHideFlags: 0 @@ -3280,6 +3354,7 @@ GameObject: - component: {fileID: 4123845907285748849} - component: {fileID: 7025389917358720947} - component: {fileID: 1140019233247447132} + - component: {fileID: 315423790723612845} m_Layer: 5 m_Name: item_hero_2 m_TagString: Untagged @@ -3362,6 +3437,19 @@ MonoBehaviour: hashName: 3599848182 objectType: 0 gameObject: {fileID: 4765733767644001524} +--- !u!114 &315423790723612845 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9201640708346463101} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1069f9c1eb6f9475b8f98a4cbb9dfe01, type: 3} + m_Name: + m_EditorClassIdentifier: + IsShowClickAnimation: 1 --- !u!1001 &3461199779279195636 PrefabInstance: m_ObjectHideFlags: 0 @@ -3733,16 +3821,16 @@ PrefabInstance: objectReference: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} ---- !u!1 &4338833387980428415 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 6717709196054680970, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - m_PrefabInstance: {fileID: 6993167806499602933} - m_PrefabAsset: {fileID: 0} --- !u!224 &4803744310358520225 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} m_PrefabInstance: {fileID: 6993167806499602933} m_PrefabAsset: {fileID: 0} +--- !u!1 &4338833387980428415 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 6717709196054680970, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} + m_PrefabInstance: {fileID: 6993167806499602933} + m_PrefabAsset: {fileID: 0} --- !u!1001 &7228325008656674143 PrefabInstance: m_ObjectHideFlags: 0