diff --git a/Assets/Editor/JenkinsAdapter.cs b/Assets/Editor/JenkinsAdapter.cs index 6ff15514e..e63d0eed6 100644 --- a/Assets/Editor/JenkinsAdapter.cs +++ b/Assets/Editor/JenkinsAdapter.cs @@ -12,7 +12,7 @@ public class JenkinsAdapter { /// private static string BuildVersion = (int.Parse(DateTime.Now.ToString("yyMMddHH"))).ToString(); private static int versionCode = 9; - private static string versionName = "1.3.4"; + private static string versionName = "1.3.5"; [MenuItem("Jenkins/JenkinsBuildIos")] public static void CommandLineBuildIos() { diff --git a/Assets/lua/app/module/battle/controller/battle_base_controller.lua.bytes b/Assets/lua/app/module/battle/controller/battle_base_controller.lua.bytes index 3b509a564..7187459ea 100644 Binary files a/Assets/lua/app/module/battle/controller/battle_base_controller.lua.bytes and b/Assets/lua/app/module/battle/controller/battle_base_controller.lua.bytes differ diff --git a/Assets/lua/app/module/battle/controller/battle_controller_pvp.lua.bytes b/Assets/lua/app/module/battle/controller/battle_controller_pvp.lua.bytes index fa554016c..a08d04487 100644 Binary files a/Assets/lua/app/module/battle/controller/battle_controller_pvp.lua.bytes and b/Assets/lua/app/module/battle/controller/battle_controller_pvp.lua.bytes differ diff --git a/Assets/lua/app/ui/arena/cell/arena_grading_reward_cell.lua.bytes b/Assets/lua/app/ui/arena/cell/arena_grading_reward_cell.lua.bytes index 956d9757f..dcd4a6dc6 100644 Binary files a/Assets/lua/app/ui/arena/cell/arena_grading_reward_cell.lua.bytes and b/Assets/lua/app/ui/arena/cell/arena_grading_reward_cell.lua.bytes differ diff --git a/Assets/prefabs/ui/activity/hero_fund/activity_herofund_ui.prefab b/Assets/prefabs/ui/activity/hero_fund/activity_herofund_ui.prefab index 86436c66f..80fd62540 100644 --- a/Assets/prefabs/ui/activity/hero_fund/activity_herofund_ui.prefab +++ b/Assets/prefabs/ui/activity/hero_fund/activity_herofund_ui.prefab @@ -1036,7 +1036,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: 30, y: -0.24996948} + m_AnchoredPosition: {x: 30, y: -0.24993896} m_SizeDelta: {x: 474, y: 528.6} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5031475301407079092 @@ -2807,9 +2807,9 @@ RectTransform: m_Father: {fileID: 8461932745927490369} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 1} - m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: -307} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 333} m_SizeDelta: {x: 610, y: 797} m_Pivot: {x: 0.5, y: 1} --- !u!222 &8423204439961451282