diff --git a/Assets/arts/atlas/icon/avatar.spriteatlas b/Assets/arts/atlas/icon/avatar.spriteatlas index 39188b669..2489fae34 100644 --- a/Assets/arts/atlas/icon/avatar.spriteatlas +++ b/Assets/arts/atlas/icon/avatar.spriteatlas @@ -63,7 +63,7 @@ SpriteAtlas: m_PackedSprites: - {fileID: 21300000, guid: e1559cf5b8a501f4fbf7fe9081997063, type: 3} - {fileID: 21300000, guid: 3297fc665edcde34cb54957166a8e63c, type: 3} - - {fileID: 21300000, guid: 107429cda8f26954b9c221c6d79134b7, type: 3} + - {fileID: 21300000, guid: 80d8b79692d1b7b4393ba7be095fed7b, type: 3} - {fileID: 21300000, guid: 23f8691ed89b279409896acfe8179617, type: 3} m_PackedSpriteNamesToIndex: - avatar_frame_3 diff --git a/Assets/arts/atlas/ui/module.spriteatlas b/Assets/arts/atlas/ui/module.spriteatlas index 52385e65f..dd284020b 100644 --- a/Assets/arts/atlas/ui/module.spriteatlas +++ b/Assets/arts/atlas/ui/module.spriteatlas @@ -67,6 +67,7 @@ SpriteAtlas: - {fileID: 21300000, guid: 134a5aa805646e140ae431abe42dde91, type: 3} - {fileID: 21300000, guid: 0d38908ad3a58e0458098eed1d3adde3, type: 3} - {fileID: 21300000, guid: 6be553fddd82a3f47ae41e7e3ff8d757, type: 3} + - {fileID: 21300000, guid: 4d07972ef67402145b41dd3f74d617f3, type: 3} m_PackedSpriteNamesToIndex: - module_unlock_dailyshop - module_unlock_sevenday @@ -74,6 +75,7 @@ SpriteAtlas: - module_unlock_fund - module_unlock_task - module_unlock_dailychallenge + - module_unlock_arena m_RenderDataMap: {} m_Tag: module m_IsVariant: 0 diff --git a/Assets/arts/textures/icon/avatar/avatar_frame_celect.png b/Assets/arts/textures/icon/avatar/avatar_frame_celect.png index 5bd0d3ce5..323a04e11 100644 Binary files a/Assets/arts/textures/icon/avatar/avatar_frame_celect.png and b/Assets/arts/textures/icon/avatar/avatar_frame_celect.png differ diff --git a/Assets/arts/textures/icon/avatar/avatar_frame_celect.png.meta b/Assets/arts/textures/icon/avatar/avatar_frame_celect.png.meta index 8e848e5b5..86c0c9e45 100644 --- a/Assets/arts/textures/icon/avatar/avatar_frame_celect.png.meta +++ b/Assets/arts/textures/icon/avatar/avatar_frame_celect.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 107429cda8f26954b9c221c6d79134b7 +guid: 80d8b79692d1b7b4393ba7be095fed7b TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/Assets/lua/app/module/arena/arena_manager.lua.bytes b/Assets/lua/app/module/arena/arena_manager.lua.bytes index 341c105e7..15093e047 100644 Binary files a/Assets/lua/app/module/arena/arena_manager.lua.bytes and b/Assets/lua/app/module/arena/arena_manager.lua.bytes differ diff --git a/Assets/lua/app/ui/battle/battle_result_ui.lua.bytes b/Assets/lua/app/ui/battle/battle_result_ui.lua.bytes index cd9b583fb..7b2b8c6a6 100644 Binary files a/Assets/lua/app/ui/battle/battle_result_ui.lua.bytes and b/Assets/lua/app/ui/battle/battle_result_ui.lua.bytes differ diff --git a/Assets/lua/app/ui/main_city/component/arena_comp.lua.bytes b/Assets/lua/app/ui/main_city/component/arena_comp.lua.bytes index 582537873..fcfc8be97 100644 Binary files a/Assets/lua/app/ui/main_city/component/arena_comp.lua.bytes and b/Assets/lua/app/ui/main_city/component/arena_comp.lua.bytes differ diff --git a/Assets/lua/app/ui/player_info/frame_cell.lua.bytes b/Assets/lua/app/ui/player_info/frame_cell.lua.bytes index f1c4af524..239a0dec8 100644 Binary files a/Assets/lua/app/ui/player_info/frame_cell.lua.bytes and b/Assets/lua/app/ui/player_info/frame_cell.lua.bytes differ diff --git a/Assets/prefabs/ui/player_info/player_info_ui.prefab b/Assets/prefabs/ui/player_info/player_info_ui.prefab index 12c3dc0a1..35e79147f 100644 --- a/Assets/prefabs/ui/player_info/player_info_ui.prefab +++ b/Assets/prefabs/ui/player_info/player_info_ui.prefab @@ -605,8 +605,8 @@ MonoBehaviour: direction: 0 reverse: 0 cellWidth: 0 - cellHeight: 130 - perLineNum: 4 + cellHeight: 180 + perLineNum: 3 --- !u!222 &6986497812126672825 CanvasRenderer: m_ObjectHideFlags: 0 @@ -755,7 +755,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 4547667164256332759} - m_RootOrder: 0 + 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} @@ -2150,7 +2150,7 @@ RectTransform: m_Children: - {fileID: 7861818053534987986} m_Father: {fileID: 4547667164256332759} - m_RootOrder: 3 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 0} @@ -2977,17 +2977,17 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.85, y: 0.85, z: 1} m_Children: - - {fileID: 6209964235759052017} - - {fileID: 249366822193557803} - {fileID: 5639794728462867043} + - {fileID: 6209964235759052017} - {fileID: 8307999258996475831} + - {fileID: 5920434528018983517} m_Father: {fileID: 2916998918226955802} 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: 0} - m_SizeDelta: {x: 128, y: 128} + m_SizeDelta: {x: 180, y: 180} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &6537284775275793481 MonoBehaviour: @@ -3021,7 +3021,7 @@ MonoBehaviour: - name: frame_cell.lock hashName: 3429466597 objectType: 0 - gameObject: {fileID: 8873645401032957490} + gameObject: {fileID: 7586209428781875982} - name: frame_cell.select hashName: 1668918070 objectType: 0 @@ -4117,15 +4117,15 @@ RectTransform: m_GameObject: {fileID: 6808884220670791709} 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_LocalScale: {x: 1.15, y: 1.15, z: 1} m_Children: [] m_Father: {fileID: 4547667164256332759} - 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: 0} - m_SizeDelta: {x: 160, y: 160} + m_SizeDelta: {x: 174, y: 174} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1897965997980458475 CanvasRenderer: @@ -4155,7 +4155,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 107429cda8f26954b9c221c6d79134b7, type: 3} + m_Sprite: {fileID: 21300000, guid: 80d8b79692d1b7b4393ba7be095fed7b, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -4320,7 +4320,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 249366822193557803} + m_Father: {fileID: 5920434528018983517} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -4506,6 +4506,82 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &7586209428781875982 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5920434528018983517} + - component: {fileID: 729263336946775130} + - component: {fileID: 4324710122115052718} + m_Layer: 5 + m_Name: lock + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5920434528018983517 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7586209428781875982} + 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: 8752461290734915897} + m_Father: {fileID: 4547667164256332759} + 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} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 180, y: 180} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &729263336946775130 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7586209428781875982} + m_CullTransparentMesh: 1 +--- !u!114 &4324710122115052718 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7586209428781875982} + 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: 0, g: 0, b: 0, a: 0.78431374} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 23f8691ed89b279409896acfe8179617, 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 &8104505608620054792 GameObject: m_ObjectHideFlags: 0 @@ -4972,82 +5048,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: IsShowClickAnimation: 1 ---- !u!1 &8873645401032957490 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 249366822193557803} - - component: {fileID: 6972765156508108371} - - component: {fileID: 4887696315504173215} - m_Layer: 5 - m_Name: lock - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &249366822193557803 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8873645401032957490} - 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: 8752461290734915897} - m_Father: {fileID: 4547667164256332759} - m_RootOrder: 1 - 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!222 &6972765156508108371 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8873645401032957490} - m_CullTransparentMesh: 1 ---- !u!114 &4887696315504173215 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8873645401032957490} - 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: 0.78431374} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 91e9e926c6246844aba4b734caefb6f9, 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 &8984831291698394988 GameObject: m_ObjectHideFlags: 0