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

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

Browse Source
This commit is contained in:
chenxi 2023-08-14 19:59:07 +08:00
commit cfac263d3a
6 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Assets/lua/app/module/hero/hero_const.lua.bytes
View File

Binary file not shown.

BIN
Assets/lua/app/module/hero/hero_manager.lua.bytes
View File

Binary file not shown.

BIN
Assets/lua/app/module/tips/tips_manager.lua.bytes
View File

Binary file not shown.

BIN
Assets/lua/app/ui/hero/hero_detail_ui.lua.bytes
View File

Binary file not shown.

BIN
Assets/lua/app/ui/hero/skin_info_comp.lua.bytes
View File

Binary file not shown.

10
Assets/prefabs/ui/hero/hero_detail_ui.prefab
View File

@ -1761,10 +1761,6 @@ MonoBehaviour:
hashName: 2961698895
objectType: 0
gameObject: {fileID: 6066099240745823888}
- name: skin_info.spine_root
hashName: 2893951420
objectType: 0
gameObject: {fileID: 7332645682829393387}
- name: skin_info.tx_desc_1
hashName: 3206181344
objectType: 0
@ -11110,9 +11106,9 @@ RectTransform:
m_Father: {fileID: 6851917422746872335}
m_RootOrder: 9
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: -913}
m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0}
m_AnchoredPosition: {x: 0, y: 30}
m_SizeDelta: {x: 589, y: 127}
m_Pivot: {x: 0.5, y: 0}
--- !u!222 &332983630553361421