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

Merge branch 'dev_20230829'

Browse Source
This commit is contained in:
xiekaidong 2023-08-29 21:41:35 +08:00
commit f08af571e2
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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