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

Merge branch 'dev_20230815' of http://git.juzugame.com/b6-client/b6-unity into dev_20230815

Browse Source
This commit is contained in:
xy_tu 2023-08-15 21:15:40 +08:00
commit 2ee3df25e9
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Assets/lua/app/common/bi_report.lua.bytes
View File

Binary file not shown.

BIN
Assets/lua/app/module/activity/activity_manager.lua.bytes
View File

Binary file not shown.

BIN
Assets/lua/app/userdata/activity/activity_data.lua.bytes
View File

Binary file not shown.

14
Assets/prefabs/ui/activity/activity_ui.prefab
View File

@ -4579,7 +4579,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: 0, y: -5.4} m_AnchoredPosition: {x: 0, y: -5.399994}
m_SizeDelta: {x: 420, y: 50} m_SizeDelta: {x: 420, y: 50}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &987991793791418965 --- !u!222 &987991793791418965
@ -6231,9 +6231,9 @@ RectTransform:
m_Father: {fileID: 8461932745927490369} m_Father: {fileID: 8461932745927490369}
m_RootOrder: 5 m_RootOrder: 5
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: -22.5} m_AnchoredPosition: {x: 0, y: 617.5}
m_SizeDelta: {x: 656, y: 163} m_SizeDelta: {x: 656, y: 163}
m_Pivot: {x: 0.5, y: 1} m_Pivot: {x: 0.5, y: 1}
--- !u!222 &6335529136858384195 --- !u!222 &6335529136858384195
@ -11681,9 +11681,9 @@ RectTransform:
m_Father: {fileID: 8461932745927490369} m_Father: {fileID: 8461932745927490369}
m_RootOrder: 6 m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 252.5} m_AnchoredPosition: {x: 0, y: -387.5}
m_SizeDelta: {x: 309, y: 38} m_SizeDelta: {x: 309, y: 38}
m_Pivot: {x: 0.5, y: 0} m_Pivot: {x: 0.5, y: 0}
--- !u!222 &8277174569845984948 --- !u!222 &8277174569845984948