diff --git a/Assets/arts/atlas/ui/login.spriteatlas b/Assets/arts/atlas/ui/login.spriteatlas index d8db6f7be..73836542f 100644 --- a/Assets/arts/atlas/ui/login.spriteatlas +++ b/Assets/arts/atlas/ui/login.spriteatlas @@ -62,8 +62,12 @@ SpriteAtlas: m_MasterAtlas: {fileID: 0} m_PackedSprites: - {fileID: 21300000, guid: f5d8239cd8995a745bdc76064dae90c7, type: 3} + - {fileID: 21300000, guid: 4c8cc7cd53e3b2846a4626abf9c5a69d, type: 3} + - {fileID: 21300000, guid: 0cd13a5ea8777fb4684a713c9c239ba4, type: 3} m_PackedSpriteNamesToIndex: - login_cn + - login_zh + - login_en m_RenderDataMap: {} m_Tag: login m_IsVariant: 0 diff --git a/Assets/lua/app/module/formation/formation_manager.lua.bytes b/Assets/lua/app/module/formation/formation_manager.lua.bytes index f5b3faf32..a137426b9 100644 Binary files a/Assets/lua/app/module/formation/formation_manager.lua.bytes and b/Assets/lua/app/module/formation/formation_manager.lua.bytes differ diff --git a/Assets/lua/app/ui/main_city/main_city_ui.lua.bytes b/Assets/lua/app/ui/main_city/main_city_ui.lua.bytes index 10dbc8635..3f72126bd 100644 Binary files a/Assets/lua/app/ui/main_city/main_city_ui.lua.bytes and b/Assets/lua/app/ui/main_city/main_city_ui.lua.bytes differ diff --git a/Assets/lua/app/userdata/hero/hero_data.lua.bytes b/Assets/lua/app/userdata/hero/hero_data.lua.bytes index 07e1c7ddf..901bb6cb4 100644 Binary files a/Assets/lua/app/userdata/hero/hero_data.lua.bytes and b/Assets/lua/app/userdata/hero/hero_data.lua.bytes differ diff --git a/Assets/prefabs/ui/main_city/main_ui.prefab b/Assets/prefabs/ui/main_city/main_ui.prefab index 052b3ebbf..9487ec51a 100644 --- a/Assets/prefabs/ui/main_city/main_ui.prefab +++ b/Assets/prefabs/ui/main_city/main_ui.prefab @@ -75,6 +75,50 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &751691943515882629 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1029675062634136158} + - component: {fileID: 4358790806233977181} + m_Layer: 5 + m_Name: rp_node + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1029675062634136158 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 751691943515882629} + 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: 4345138650635023754} + 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: 40, y: 35} + m_SizeDelta: {x: 32, y: 34} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4358790806233977181 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 751691943515882629} + m_CullTransparentMesh: 1 --- !u!1 &983854123331512579 GameObject: m_ObjectHideFlags: 0 @@ -1506,6 +1550,10 @@ MonoBehaviour: hashName: 4233215021 objectType: 0 gameObject: {fileID: 7484727003861654123} + - name: main_ui.bottom_node.icons.ui_spine_obj_r.rp_node + hashName: 1903028440 + objectType: 0 + gameObject: {fileID: 751691943515882629} --- !u!114 &6214590949040345325 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2044,13 +2092,13 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: ffd4741b3d6d4b24791c2c141760266c, type: 3} ---- !u!1 &2354727283849138858 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 5997397792976241942, guid: ffd4741b3d6d4b24791c2c141760266c, type: 3} - m_PrefabInstance: {fileID: 8329023202578667452} - m_PrefabAsset: {fileID: 0} --- !u!224 &502275081594006781 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 8461932745927490369, guid: ffd4741b3d6d4b24791c2c141760266c, type: 3} m_PrefabInstance: {fileID: 8329023202578667452} m_PrefabAsset: {fileID: 0} +--- !u!1 &2354727283849138858 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 5997397792976241942, guid: ffd4741b3d6d4b24791c2c141760266c, type: 3} + m_PrefabInstance: {fileID: 8329023202578667452} + m_PrefabAsset: {fileID: 0}