Merge branch 'tcx_xiyou_yueNan' of http://192.168.1.21:3000/root/miduo_client into tcx_xiyou_yueNan

tcx_xiyou_yueNan
zhangjiannan 2025-01-14 15:34:00 +08:00
commit cfb10831c2
2 changed files with 581 additions and 142 deletions

View File

@ -10076,7 +10076,7 @@ RectTransform:
m_AnchorMin: {x: 1, y: 0} m_AnchorMin: {x: 1, y: 0}
m_AnchorMax: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0}
m_AnchoredPosition: {x: -59, y: 18.7} m_AnchoredPosition: {x: -59, y: 18.7}
m_SizeDelta: {x: 381, y: 70} m_SizeDelta: {x: 0, y: 70}
m_Pivot: {x: 1, y: 0} m_Pivot: {x: 1, y: 0}
--- !u!114 &708116011 --- !u!114 &708116011
MonoBehaviour: MonoBehaviour:
@ -10891,10 +10891,10 @@ RectTransform:
m_Father: {fileID: 708116007} m_Father: {fileID: 708116007}
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, y: 1} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: -35} m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 240, y: 68.95} m_SizeDelta: {x: 0, y: 68.95}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1240811747 --- !u!222 &1240811747
CanvasRenderer: CanvasRenderer:
@ -11123,7 +11123,7 @@ GameObject:
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
m_IsActive: 0 m_IsActive: 1
--- !u!224 &1388929535 --- !u!224 &1388929535
RectTransform: RectTransform:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -11216,10 +11216,10 @@ RectTransform:
m_Father: {fileID: 708116007} m_Father: {fileID: 708116007}
m_RootOrder: 1 m_RootOrder: 1
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}
m_AnchorMax: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: -35} m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 48, y: 68.95} m_SizeDelta: {x: 0, y: 68.95}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1596169479 --- !u!222 &1596169479
CanvasRenderer: CanvasRenderer:
@ -191989,10 +191989,10 @@ RectTransform:
m_Father: {fileID: 708116007} m_Father: {fileID: 708116007}
m_RootOrder: 2 m_RootOrder: 2
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}
m_AnchorMax: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: -35} m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 52, y: 69.49} m_SizeDelta: {x: 0, y: 69.49}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7203306409298755909 --- !u!222 &7203306409298755909
CanvasRenderer: CanvasRenderer:

File diff suppressed because it is too large Load Diff