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

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

Browse Source
This commit is contained in:
chenxi 2023-06-20 15:04:11 +08:00
commit d39b50c96a
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Assets/arts/spines/characters/m20038/m20038.skel.bytes
View File

Binary file not shown.

12
Assets/prefabs/ui/main_city/main_comp.prefab
View File

@ -3581,9 +3581,9 @@ RectTransform:
m_Father: {fileID: 4165930251451731960} m_Father: {fileID: 4165930251451731960}
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, y: 1} m_AnchorMin: {x: 1, y: 0.5}
m_AnchorMax: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 0.5}
m_AnchoredPosition: {x: 720, y: -1036} m_AnchoredPosition: {x: 0, y: -396}
m_SizeDelta: {x: 158, y: 94} m_SizeDelta: {x: 158, y: 94}
m_Pivot: {x: 1, y: 0.5} m_Pivot: {x: 1, y: 0.5}
--- !u!222 &2741045534911002026 --- !u!222 &2741045534911002026
@ -5158,9 +5158,9 @@ RectTransform:
m_Father: {fileID: 4165930251451731960} m_Father: {fileID: 4165930251451731960}
m_RootOrder: 4 m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1} m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 0.5}
m_AnchoredPosition: {x: 0, y: -1036} m_AnchoredPosition: {x: 0, y: -396}
m_SizeDelta: {x: 158, y: 94} m_SizeDelta: {x: 158, y: 94}
m_Pivot: {x: 0, y: 0.5} m_Pivot: {x: 0, y: 0.5}
--- !u!222 &6370390820492705620 --- !u!222 &6370390820492705620