diff --git a/Assets/arts/textures/icon/hero/hero_fragment.png b/Assets/arts/textures/icon/hero/hero_fragment.png index af96012eb..fccda45f2 100644 Binary files a/Assets/arts/textures/icon/hero/hero_fragment.png and b/Assets/arts/textures/icon/hero/hero_fragment.png differ diff --git a/Assets/lua/app/module/battle/battle_const.lua.bytes b/Assets/lua/app/module/battle/battle_const.lua.bytes index e195bc75c..3275deb2f 100644 Binary files a/Assets/lua/app/module/battle/battle_const.lua.bytes and b/Assets/lua/app/module/battle/battle_const.lua.bytes differ diff --git a/Assets/lua/app/module/battle/component/battle_unit_comp.lua.bytes b/Assets/lua/app/module/battle/component/battle_unit_comp.lua.bytes index 55877d6b9..40c784915 100644 Binary files a/Assets/lua/app/module/battle/component/battle_unit_comp.lua.bytes and b/Assets/lua/app/module/battle/component/battle_unit_comp.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 27f952af5..a4402a592 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/prefabs/ui/common/reward_cell.prefab b/Assets/prefabs/ui/common/reward_cell.prefab index 7bf0aa7e8..7a1fffbc4 100644 --- a/Assets/prefabs/ui/common/reward_cell.prefab +++ b/Assets/prefabs/ui/common/reward_cell.prefab @@ -30,6 +30,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 3335062103840720553} + - {fileID: 4089771124753005517} - {fileID: 5164977974539208548} - {fileID: 7171483589642333812} m_Father: {fileID: 2568998946116628564} @@ -108,7 +109,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 5993802040676866955} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -303,6 +304,81 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &4940665596048500704 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4089771124753005517} + - component: {fileID: 2123021332735512846} + - component: {fileID: 5978744269033148093} + m_Layer: 0 + m_Name: fragment + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4089771124753005517 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4940665596048500704} + 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: [] + m_Father: {fileID: 5993802040676866955} + 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: 49, y: 51} + m_SizeDelta: {x: 40, y: 40} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2123021332735512846 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4940665596048500704} + m_CullTransparentMesh: 1 +--- !u!114 &5978744269033148093 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4940665596048500704} + 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: 063945c3b6adee543ada4d5f7cdd0a26, 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 &6717709196054680970 GameObject: m_ObjectHideFlags: 0 @@ -378,6 +454,10 @@ MonoBehaviour: hashName: 433738181 objectType: 0 gameObject: {fileID: 3441384696332212169} + - name: reward_cell.item_bg.fragment + hashName: 2860980393 + objectType: 0 + gameObject: {fileID: 4940665596048500704} --- !u!225 &6876715644725703649 CanvasGroup: m_ObjectHideFlags: 0 @@ -461,7 +541,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 5993802040676866955} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0} diff --git a/Assets/prefabs/ui/login/test_login_ui.prefab b/Assets/prefabs/ui/login/test_login_ui.prefab index b4556756f..1a83a3821 100644 --- a/Assets/prefabs/ui/login/test_login_ui.prefab +++ b/Assets/prefabs/ui/login/test_login_ui.prefab @@ -2263,7 +2263,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &3064541426395101181 RectTransform: m_ObjectHideFlags: 0 diff --git a/Assets/prefabs/ui/tips/rewards_tips.prefab b/Assets/prefabs/ui/tips/rewards_tips.prefab index b984669f9..f427e1c25 100644 --- a/Assets/prefabs/ui/tips/rewards_tips.prefab +++ b/Assets/prefabs/ui/tips/rewards_tips.prefab @@ -188,8 +188,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4290217278 - m_fontColor: {r: 0.24313726, g: 0.52156866, b: 0.7176471, a: 1} + rgba: 4278190080 + m_fontColor: {r: 0, g: 0, b: 0, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -206,8 +206,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 22 - m_fontSizeBase: 22 + m_fontSize: 26 + m_fontSizeBase: 26 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18