puxuan/c1_unity
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into dev_20230919

Browse Source
This commit is contained in:
xiekaidong 2023-08-30 09:19:48 +08:00
commit d6046b2e7d
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Assets/Editor/JenkinsAdapter.cs
View File

@ -12,7 +12,7 @@ public class JenkinsAdapter {
/// </summary> /// </summary>
private static string BuildVersion = (int.Parse(DateTime.Now.ToString("yyMMddHH"))).ToString(); private static string BuildVersion = (int.Parse(DateTime.Now.ToString("yyMMddHH"))).ToString();
private static int versionCode = 9; private static int versionCode = 9;
private static string versionName = "1.3.4"; private static string versionName = "1.3.5";
[MenuItem("Jenkins/JenkinsBuildIos")] [MenuItem("Jenkins/JenkinsBuildIos")]
public static void CommandLineBuildIos() { public static void CommandLineBuildIos() {

BIN
Assets/lua/app/module/battle/controller/battle_base_controller.lua.bytes
View File

Binary file not shown.

BIN
Assets/lua/app/module/battle/controller/battle_controller_pvp.lua.bytes
View File

Binary file not shown.

BIN
Assets/lua/app/ui/arena/cell/arena_grading_reward_cell.lua.bytes
View File

Binary file not shown.

8
Assets/prefabs/ui/activity/hero_fund/activity_herofund_ui.prefab
View File

@ -1036,7 +1036,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {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_SizeDelta: {x: 474, y: 528.6}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5031475301407079092 --- !u!222 &5031475301407079092
@ -2807,9 +2807,9 @@ RectTransform:
m_Father: {fileID: 8461932745927490369} m_Father: {fileID: 8461932745927490369}
m_RootOrder: 0 m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 1} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: -307} m_AnchoredPosition: {x: 0, y: 333}
m_SizeDelta: {x: 610, y: 797} m_SizeDelta: {x: 610, y: 797}
m_Pivot: {x: 0.5, y: 1} m_Pivot: {x: 0.5, y: 1}
--- !u!222 &8423204439961451282 --- !u!222 &8423204439961451282