diff --git a/Assets/lua/app/ui/battle/battle_base_ui.lua.bytes b/Assets/lua/app/ui/battle/battle_base_ui.lua.bytes index 453e3872a..2487e606f 100644 Binary files a/Assets/lua/app/ui/battle/battle_base_ui.lua.bytes and b/Assets/lua/app/ui/battle/battle_base_ui.lua.bytes differ diff --git a/Assets/lua/app/ui/summon/summon_reward_ui.lua.bytes b/Assets/lua/app/ui/summon/summon_reward_ui.lua.bytes index 313995422..a33b2e613 100644 Binary files a/Assets/lua/app/ui/summon/summon_reward_ui.lua.bytes and b/Assets/lua/app/ui/summon/summon_reward_ui.lua.bytes differ diff --git a/Assets/prefabs/ui/fund/fund_chapter_comp.prefab b/Assets/prefabs/ui/fund/fund_chapter_comp.prefab index 47121799a..e90daf3cc 100644 --- a/Assets/prefabs/ui/fund/fund_chapter_comp.prefab +++ b/Assets/prefabs/ui/fund/fund_chapter_comp.prefab @@ -608,7 +608,7 @@ RectTransform: 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: 670, y: 78} + m_SizeDelta: {x: 632, y: 78} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &284067057054194576 CanvasRenderer: @@ -1789,7 +1789,7 @@ RectTransform: 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: 20} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 280, y: 46} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &9140028355339004701 @@ -1830,7 +1830,7 @@ MonoBehaviour: m_fontColor32: serializedVersion: 2 rgba: 4286316445 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_fontColor: {r: 0.44313726, g: 1, b: 0.45490196, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -1847,8 +1847,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 22 - m_fontSizeBase: 22 + m_fontSize: 24 + m_fontSizeBase: 24 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 20 @@ -5786,7 +5786,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &6370813537043075987 RectTransform: m_ObjectHideFlags: 0 @@ -6018,7 +6018,7 @@ RectTransform: m_AnchorMin: {x: 1, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} m_AnchoredPosition: {x: 19, y: 31} - m_SizeDelta: {x: 46, y: 46} + m_SizeDelta: {x: 36, y: 36} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7732875022604163676 CanvasRenderer: @@ -8353,7 +8353,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &9144740701880374163 RectTransform: m_ObjectHideFlags: 0 @@ -9648,7 +9648,7 @@ RectTransform: 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: 264} + m_AnchoredPosition: {x: 0, y: 258} m_SizeDelta: {x: 680, y: 558} m_Pivot: {x: 0.5, y: 1} --- !u!222 &8578553726053284260 diff --git a/Assets/prefabs/ui/fund/fund_level_comp.prefab b/Assets/prefabs/ui/fund/fund_level_comp.prefab index 7ed793249..6d9a6a14d 100644 --- a/Assets/prefabs/ui/fund/fund_level_comp.prefab +++ b/Assets/prefabs/ui/fund/fund_level_comp.prefab @@ -2548,11 +2548,11 @@ RectTransform: m_Father: {fileID: 5803352611547744195} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.5} - m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 24, y: 65} - m_SizeDelta: {x: 394, y: 46} - m_Pivot: {x: 0, y: 0.5} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 20} + m_SizeDelta: {x: 280, y: 46} + m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &9140028355339004701 CanvasRenderer: m_ObjectHideFlags: 0 @@ -2687,8 +2687,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: -2, y: -226} - m_SizeDelta: {x: 412, y: 78} + m_AnchoredPosition: {x: 31, y: -224} + m_SizeDelta: {x: 286, y: 96} m_Pivot: {x: 0, y: 1} --- !u!222 &4559766042588961237 CanvasRenderer: @@ -2711,15 +2711,15 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 0.8} 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: 5da8fae6f60c59845b0bd13f86d15bc4, type: 3} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: 51055eb9cf4f94f28b380c0a96047c79, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -3246,7 +3246,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 1280, y: 362} + m_SizeDelta: {x: 1280, y: 373} m_Pivot: {x: 0.5, y: 1} --- !u!222 &4594304111367787504 CanvasRenderer: @@ -3443,17 +3443,17 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2197524981953862448} - m_LocalRotation: {x: 0, y: 0, z: 0.30070576, w: 0.953717} + m_LocalRotation: {x: 0, y: 0, z: -0.32556805, w: 0.9455186} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1843862956182225414} m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 35} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: -38} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -40, y: 24} + m_AnchoredPosition: {x: 40, y: 24} m_SizeDelta: {x: 136.0602, y: 50.0511} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4679260746775732334 @@ -3486,8 +3486,8 @@ MonoBehaviour: m_Calls: [] m_text: m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 9d1aadd9ebaf54ce2b217ab8427fa0db, type: 2} - m_sharedMaterial: {fileID: 2100000, guid: d9526b8cb4bc030488db413ef429c6f9, type: 2} + m_fontAsset: {fileID: 11400000, guid: b0c1339d1d91a8846affd442449dbf31, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: 2e0b5790ea0ce0a4eb6bf1b8b43a6bda, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -7122,7 +7122,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 24, y: 0} + m_AnchoredPosition: {x: 24, y: -20} m_SizeDelta: {x: 0, y: 50} m_Pivot: {x: 0, y: 0.5} --- !u!222 &5544252558585464748 @@ -8578,11 +8578,11 @@ RectTransform: m_Father: {fileID: 3696810091675979774} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 198, y: 140} - m_Pivot: {x: 0, y: 1} + m_Pivot: {x: 1, y: 1} --- !u!222 &7854744715175178862 CanvasRenderer: m_ObjectHideFlags: 0 @@ -8611,7 +8611,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 41f05facab6c90349a9d210b6694273c, type: 3} + m_Sprite: {fileID: 21300000, guid: 1fe01cb8eb0904079a1359cb409a7c55, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1