Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev

dev_chengFeng
wangzhenxing 2021-12-13 15:10:13 +08:00
commit 0bb0031e86
1 changed files with 58 additions and 58 deletions

View File

@ -296,8 +296,8 @@ 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: 1, y: 1} m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: -194.27} m_AnchoredPosition: {x: -2.199997, y: -194.27002}
m_SizeDelta: {x: -115, y: -1012.56} m_SizeDelta: {x: -209, y: -1012.6}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &263232123 --- !u!222 &263232123
CanvasRenderer: CanvasRenderer:
@ -341,7 +341,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: 152, y: -53} m_AnchoredPosition: {x: 182.7, y: -57}
m_SizeDelta: {x: 8, y: 110} m_SizeDelta: {x: 8, y: 110}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &273463933 --- !u!222 &273463933
@ -414,10 +414,10 @@ RectTransform:
m_Father: {fileID: 700413942} m_Father: {fileID: 700413942}
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: 1, y: 1} m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 1, y: 1} m_AnchorMax: {x: 0.5, y: 1}
m_AnchoredPosition: {x: -415, y: -617.5} m_AnchoredPosition: {x: 64.03, y: -113}
m_SizeDelta: {x: 324, y: 1273.4} m_SizeDelta: {x: 324, y: 264.40002}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &381764992 --- !u!222 &381764992
CanvasRenderer: CanvasRenderer:
@ -895,7 +895,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: 142.1, y: -28.5} m_AnchoredPosition: {x: 189, y: -28.5}
m_SizeDelta: {x: 160, y: 50} m_SizeDelta: {x: 160, y: 50}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &718967643 --- !u!222 &718967643
@ -957,7 +957,7 @@ GameObject:
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
m_IsActive: 1 m_IsActive: 0
--- !u!224 &769230676 --- !u!224 &769230676
RectTransform: RectTransform:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -979,10 +979,10 @@ RectTransform:
m_Father: {fileID: 662672666} m_Father: {fileID: 662672666}
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.5, y: 0.5}
m_AnchorMax: {x: 0, y: 1} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -1919, y: 272.5} m_AnchoredPosition: {x: -2.2, y: 209.43}
m_SizeDelta: {x: 950, y: 100} m_SizeDelta: {x: 871, y: 100}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &769230677 --- !u!222 &769230677
CanvasRenderer: CanvasRenderer:
@ -1027,10 +1027,10 @@ RectTransform:
m_Father: {fileID: 417611533} m_Father: {fileID: 417611533}
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.5, y: 1} m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0.5, y: 1} m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: -416} m_AnchoredPosition: {x: 0, y: -416}
m_SizeDelta: {x: 856, y: 378} m_SizeDelta: {x: -224, y: 378}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &794766832 --- !u!222 &794766832
CanvasRenderer: CanvasRenderer:
@ -1103,8 +1103,8 @@ 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: 88.25, y: -52} m_AnchoredPosition: {x: 104.600006, y: -52}
m_SizeDelta: {x: 119.5, y: 100} m_SizeDelta: {x: 148.2, y: 100}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1222381459 --- !u!222 &1222381459
CanvasRenderer: CanvasRenderer:
@ -1144,8 +1144,8 @@ MonoBehaviour:
m_Alignment: 4 m_Alignment: 4
m_AlignByGeometry: 0 m_AlignByGeometry: 0
m_RichText: 1 m_RichText: 1
m_HorizontalOverflow: 0 m_HorizontalOverflow: 1
m_VerticalOverflow: 0 m_VerticalOverflow: 1
m_LineSpacing: 1 m_LineSpacing: 1
m_Text: 0 m_Text: 0
--- !u!1 &1548439227 --- !u!1 &1548439227
@ -1259,10 +1259,10 @@ RectTransform:
m_Father: {fileID: 769230676} m_Father: {fileID: 769230676}
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: 1}
m_AnchorMax: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 807, y: -50} m_AnchoredPosition: {x: -145.8, y: -50}
m_SizeDelta: {x: 190, y: 70} m_SizeDelta: {x: 152.5, y: 70}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1679051616 --- !u!222 &1679051616
CanvasRenderer: CanvasRenderer:
@ -1365,9 +1365,9 @@ RectTransform:
m_Father: {fileID: 700413942} m_Father: {fileID: 700413942}
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.5, y: 1}
m_AnchorMax: {x: 0, y: 1} m_AnchorMax: {x: 0.5, y: 1}
m_AnchoredPosition: {x: 335, y: -28.5} m_AnchoredPosition: {x: -177, y: -28.5}
m_SizeDelta: {x: 160, y: 50} m_SizeDelta: {x: 160, y: 50}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1714223451 --- !u!222 &1714223451
@ -1583,10 +1583,10 @@ RectTransform:
m_Father: {fileID: 769230676} m_Father: {fileID: 769230676}
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.5, y: 0.5} m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: -8, y: 60} m_AnchoredPosition: {x: -8, y: 10}
m_SizeDelta: {x: 873, y: 9} m_SizeDelta: {x: -77, y: 9}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2093586629 --- !u!222 &2093586629
CanvasRenderer: CanvasRenderer:
@ -1642,7 +1642,7 @@ GameObject:
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
m_IsActive: 1 m_IsActive: 0
--- !u!224 &8522078921106535360 --- !u!224 &8522078921106535360
RectTransform: RectTransform:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -1658,10 +1658,10 @@ RectTransform:
m_Father: {fileID: 1679051612} m_Father: {fileID: 1679051612}
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.5, y: 0.5} m_AnchorMin: {x: 1, y: 1}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0} m_AnchoredPosition: {x: -76.25, y: -35}
m_SizeDelta: {x: 190, y: 70} m_SizeDelta: {x: 152.5, y: 70}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &392290363513713079 --- !u!222 &392290363513713079
CanvasRenderer: CanvasRenderer:
@ -2120,10 +2120,10 @@ RectTransform:
m_Father: {fileID: 1679051612} m_Father: {fileID: 1679051612}
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.5, y: 0.5} m_AnchorMin: {x: 1, y: 1}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0} m_AnchoredPosition: {x: -76.25, y: -35}
m_SizeDelta: {x: 190, y: 70} m_SizeDelta: {x: 152.5, y: 70}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &9080305000098355600 --- !u!222 &9080305000098355600
CanvasRenderer: CanvasRenderer:
@ -2274,9 +2274,9 @@ RectTransform:
m_Father: {fileID: 1679051612} m_Father: {fileID: 1679051612}
m_RootOrder: 3 m_RootOrder: 3
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: 1, y: 1}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 74, y: 17.9} m_AnchoredPosition: {x: -21, y: -17.1}
m_SizeDelta: {x: 30, y: 30} m_SizeDelta: {x: 30, y: 30}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &335254081599527853 --- !u!222 &335254081599527853
@ -2349,7 +2349,7 @@ 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: 99, y: -10} m_AnchoredPosition: {x: 64, y: -10}
m_SizeDelta: {x: 262.8, y: 100} m_SizeDelta: {x: 262.8, y: 100}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &3333102989217380818 --- !u!114 &3333102989217380818
@ -2502,8 +2502,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: -183.1, y: -18} m_AnchoredPosition: {x: -161.74, y: -18}
m_SizeDelta: {x: 235.7, y: 100} m_SizeDelta: {x: 162.9, y: 100}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &3901255681791354113 --- !u!114 &3901255681791354113
MonoBehaviour: MonoBehaviour:
@ -2725,9 +2725,9 @@ RectTransform:
m_Father: {fileID: 769230676} m_Father: {fileID: 769230676}
m_RootOrder: 6 m_RootOrder: 6
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: 1, y: 1}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 333, y: -10} m_AnchoredPosition: {x: -142, y: -60}
m_SizeDelta: {x: 128, y: 40} m_SizeDelta: {x: 128, y: 40}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1401826056226417853 --- !u!222 &1401826056226417853
@ -2800,10 +2800,10 @@ RectTransform:
m_Father: {fileID: 1679051612} m_Father: {fileID: 1679051612}
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.5, y: 0.5} m_AnchorMin: {x: 1, y: 1}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0} m_AnchoredPosition: {x: -76.24998, y: -35}
m_SizeDelta: {x: 190, y: 70} m_SizeDelta: {x: 152.5, y: 70}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5029010809554487346 --- !u!222 &5029010809554487346
CanvasRenderer: CanvasRenderer:
@ -3022,10 +3022,10 @@ RectTransform:
m_Father: {fileID: 718967641} m_Father: {fileID: 718967641}
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.5, y: 0.5} m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 95.1, y: -0.33} m_AnchoredPosition: {x: 179.59, y: -25.33}
m_SizeDelta: {x: 83, y: 41.3} m_SizeDelta: {x: 115.64, y: 41.300003}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &455196130103154195 --- !u!222 &455196130103154195
CanvasRenderer: CanvasRenderer:
@ -3062,7 +3062,7 @@ MonoBehaviour:
m_BestFit: 0 m_BestFit: 0
m_MinSize: 3 m_MinSize: 3
m_MaxSize: 40 m_MaxSize: 40
m_Alignment: 4 m_Alignment: 3
m_AlignByGeometry: 0 m_AlignByGeometry: 0
m_RichText: 1 m_RichText: 1
m_HorizontalOverflow: 1 m_HorizontalOverflow: 1