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

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

Browse Source
This commit is contained in:
xiekaidong 2023-09-19 21:16:31 +08:00
commit da59410f2b
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

Binary file not shown.

BIN
Assets/lua/app/userdata/activity/full_moon/full_moon_data.lua.bytes
View File

Binary file not shown.

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

@ -332,7 +332,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -80, y: 0}
m_SizeDelta: {x: 220, y: 50}
m_SizeDelta: {x: 240, y: 50}
m_Pivot: {x: 0, y: 0.5}
--- !u!222 &1863564359952686411
CanvasRenderer:
@ -466,7 +466,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -80, y: 0}
m_SizeDelta: {x: 220, y: 50}
m_SizeDelta: {x: 240, y: 50}
m_Pivot: {x: 0, y: 0.5}
--- !u!222 &6370944687771601201
CanvasRenderer:
@ -7279,7 +7279,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -80, y: 0}
m_SizeDelta: {x: 220, y: 50}
m_SizeDelta: {x: 240, y: 50}
m_Pivot: {x: 0, y: 0.5}
--- !u!222 &7038675289103269147
CanvasRenderer:
@ -7834,7 +7834,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 0.5}
m_AnchorMax: {x: 1, y: 0.5}
m_AnchoredPosition: {x: -85, y: 0}
m_AnchoredPosition: {x: -82, y: 0}
m_SizeDelta: {x: 50, y: 40}
m_Pivot: {x: 0, y: 0.5}
--- !u!222 &1155838015682861634
@ -16928,7 +16928,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: -30}
m_SizeDelta: {x: 100, y: 50}
m_SizeDelta: {x: 150, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2136015237019632555
CanvasRenderer:
@ -17001,7 +17001,7 @@ MonoBehaviour:
m_lineSpacingMax: 0
m_paragraphSpacing: 0
m_charWidthMaxAdj: 0
m_enableWordWrapping: 0
m_enableWordWrapping: 1
m_wordWrappingRatios: 0.4
m_overflowMode: 0
m_linkedTextComponent: {fileID: 0}
@ -18609,7 +18609,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -80, y: 0}
m_SizeDelta: {x: 220, y: 50}
m_SizeDelta: {x: 240, y: 50}
m_Pivot: {x: 0, y: 0.5}
--- !u!222 &2900119163274684114
CanvasRenderer:
@ -19878,7 +19878,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -80, y: 0}
m_SizeDelta: {x: 220, y: 50}
m_SizeDelta: {x: 240, y: 50}
m_Pivot: {x: 0, y: 0.5}
--- !u!222 &9100755258446037272
CanvasRenderer:
@ -30323,7 +30323,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -80, y: 0}
m_SizeDelta: {x: 220, y: 50}
m_SizeDelta: {x: 240, y: 50}
m_Pivot: {x: 0, y: 0.5}
--- !u!222 &3634042052778304151
CanvasRenderer:

2
Assets/prefabs/ui/runes/runes_source_ui.prefab
View File

@ -108,7 +108,7 @@ MonoBehaviour:
m_lineSpacingMax: 0
m_paragraphSpacing: 0
m_charWidthMaxAdj: 0
m_enableWordWrapping: 1
m_enableWordWrapping: 0
m_wordWrappingRatios: 0.4
m_overflowMode: 0
m_linkedTextComponent: {fileID: 0}