diff --git a/Assets/lua/app/config/item.lua.bytes b/Assets/lua/app/config/item.lua.bytes index f6e6b1191..e4bc6a63f 100644 Binary files a/Assets/lua/app/config/item.lua.bytes and b/Assets/lua/app/config/item.lua.bytes differ diff --git a/Assets/lua/app/config/skill.lua.bytes b/Assets/lua/app/config/skill.lua.bytes index 06693b62e..28bd8dfd3 100644 Binary files a/Assets/lua/app/config/skill.lua.bytes and b/Assets/lua/app/config/skill.lua.bytes differ diff --git a/Assets/lua/app/ui/common/cell/reward_cell.lua.bytes b/Assets/lua/app/ui/common/cell/reward_cell.lua.bytes index 092e9a719..4aae27780 100644 Binary files a/Assets/lua/app/ui/common/cell/reward_cell.lua.bytes and b/Assets/lua/app/ui/common/cell/reward_cell.lua.bytes differ diff --git a/Assets/lua/app/userdata/bag/item_data.lua.bytes b/Assets/lua/app/userdata/bag/item_data.lua.bytes index 8b6e17e37..d99b78178 100644 Binary files a/Assets/lua/app/userdata/bag/item_data.lua.bytes and b/Assets/lua/app/userdata/bag/item_data.lua.bytes differ diff --git a/Assets/lua/app/userdata/bag/item_entity.lua.bytes b/Assets/lua/app/userdata/bag/item_entity.lua.bytes index 193734942..f0ac85066 100644 Binary files a/Assets/lua/app/userdata/bag/item_entity.lua.bytes and b/Assets/lua/app/userdata/bag/item_entity.lua.bytes differ diff --git a/Assets/prefabs/ui/common/reward_cell.prefab b/Assets/prefabs/ui/common/reward_cell.prefab index def10c57a..f106e5e0d 100644 --- a/Assets/prefabs/ui/common/reward_cell.prefab +++ b/Assets/prefabs/ui/common/reward_cell.prefab @@ -34,7 +34,6 @@ RectTransform: - {fileID: 3335062103840720553} - {fileID: 7171483589642333812} - {fileID: 4089771124753005517} - - {fileID: 2557292112129412969} - {fileID: 6425122533841886504} - {fileID: 4296149395571454274} - {fileID: 5164977974539208548} @@ -151,7 +150,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5993802040676866955} - m_RootOrder: 6 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -227,7 +226,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5993802040676866955} - m_RootOrder: 5 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -635,82 +634,6 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!1 &4101644123587406057 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2557292112129412969} - - component: {fileID: 2112654984025354848} - - component: {fileID: 8530827503362446664} - m_Layer: 5 - m_Name: s - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &2557292112129412969 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4101644123587406057} - 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: 5993802040676866955} - m_RootOrder: 4 - 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: 47, y: 48} - m_SizeDelta: {x: 28, y: 31.2} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &2112654984025354848 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4101644123587406057} - m_CullTransparentMesh: 1 ---- !u!114 &8530827503362446664 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4101644123587406057} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 0 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: c1d35f3153f12a14c9c8957a905b0b28, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 --- !u!1 &4940665596048500704 GameObject: m_ObjectHideFlags: 0 @@ -1181,10 +1104,6 @@ MonoBehaviour: hashName: 1351759297 objectType: 0 gameObject: {fileID: 2025453443738186468} - - name: reward_cell.item_bg.s - hashName: 1558924346 - objectType: 0 - gameObject: {fileID: 4101644123587406057} - name: reward_cell.item_bg.match_img hashName: 3024145168 objectType: 0 @@ -1559,7 +1478,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5993802040676866955} - m_RootOrder: 7 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0}