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

xiyou_yueNanZhengshi
zhangjiannan 2024-11-28 12:46:33 +08:00
commit 1763132835
3 changed files with 28 additions and 12 deletions

View File

@ -17457,7 +17457,7 @@ RectTransform:
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: 1}
m_AnchorMax: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 194, y: -157.2002} m_AnchoredPosition: {x: 194, y: -148}
m_SizeDelta: {x: 405, y: 138} m_SizeDelta: {x: 405, y: 138}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &986331373234966081 --- !u!222 &986331373234966081
@ -59469,6 +59469,7 @@ GameObject:
- component: {fileID: 7005041792594746024} - component: {fileID: 7005041792594746024}
- component: {fileID: 391976876171911855} - component: {fileID: 391976876171911855}
- component: {fileID: 3911194884108104252} - component: {fileID: 3911194884108104252}
- component: {fileID: 4308974779633373240}
m_Layer: 5 m_Layer: 5
m_Name: value m_Name: value
m_TagString: Untagged m_TagString: Untagged
@ -59492,8 +59493,8 @@ 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: 54.5, y: -14.8} m_AnchoredPosition: {x: 86.600006, y: 7.925}
m_SizeDelta: {x: 190.6, y: 61.2} m_SizeDelta: {x: 231.8, y: 84.15}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7005041792594746024 --- !u!222 &7005041792594746024
CanvasRenderer: CanvasRenderer:
@ -59525,11 +59526,11 @@ MonoBehaviour:
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData: m_FontData:
m_Font: {fileID: 12800000, guid: 0a607ef861fe8a24e9c6079e935099b8, type: 3} m_Font: {fileID: 12800000, guid: 0a607ef861fe8a24e9c6079e935099b8, type: 3}
m_FontSize: 0 m_FontSize: 85
m_FontStyle: 0 m_FontStyle: 2
m_BestFit: 0 m_BestFit: 0
m_MinSize: 0 m_MinSize: 0
m_MaxSize: 40 m_MaxSize: 85
m_Alignment: 3 m_Alignment: 3
m_AlignByGeometry: 0 m_AlignByGeometry: 0
m_RichText: 1 m_RichText: 1
@ -59550,6 +59551,21 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
_textSpacing: -3 _textSpacing: -3
--- !u!114 &4308974779633373240
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6936257900029251030}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5}
m_EffectDistance: {x: 1, y: -1}
m_UseGraphicAlpha: 1
--- !u!1 &6951883564668579738 --- !u!1 &6951883564668579738
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0

View File

@ -483,7 +483,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 444.5, y: 0} m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 936, y: 0} m_SizeDelta: {x: 936, y: 0}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6618502649577932062 --- !u!222 &6618502649577932062
@ -1687,8 +1687,8 @@ 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: 0.0000017881} m_AnchoredPosition: {x: -1.7, y: -9.7}
m_SizeDelta: {x: 197.07, y: 47.75} m_SizeDelta: {x: 461.5, y: 85.3}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7774098811719839289 --- !u!222 &7774098811719839289
CanvasRenderer: CanvasRenderer:
@ -1728,7 +1728,7 @@ MonoBehaviour:
m_Alignment: 4 m_Alignment: 4
m_AlignByGeometry: 0 m_AlignByGeometry: 0
m_RichText: 1 m_RichText: 1
m_HorizontalOverflow: 1 m_HorizontalOverflow: 0
m_VerticalOverflow: 1 m_VerticalOverflow: 1
m_LineSpacing: 1 m_LineSpacing: 1
m_Text: "\u51A5\u754C\u5904\u5211\u4EBA" m_Text: "\u51A5\u754C\u5904\u5211\u4EBA"

View File

@ -6102,7 +6102,7 @@ MonoBehaviour:
m_Alignment: 3 m_Alignment: 3
m_AlignByGeometry: 0 m_AlignByGeometry: 0
m_RichText: 1 m_RichText: 1
m_HorizontalOverflow: 1 m_HorizontalOverflow: 0
m_VerticalOverflow: 1 m_VerticalOverflow: 1
m_LineSpacing: 1 m_LineSpacing: 1
m_Text: "\u6D77\u519B\u58EB\u5175" m_Text: "\u6D77\u519B\u58EB\u5175"
@ -6861,7 +6861,7 @@ MonoBehaviour:
m_Alignment: 3 m_Alignment: 3
m_AlignByGeometry: 0 m_AlignByGeometry: 0
m_RichText: 1 m_RichText: 1
m_HorizontalOverflow: 1 m_HorizontalOverflow: 0
m_VerticalOverflow: 1 m_VerticalOverflow: 1
m_LineSpacing: 1 m_LineSpacing: 1
m_Text: "\u6D77\u519B\u58EB\u5175" m_Text: "\u6D77\u519B\u58EB\u5175"