Merge branch 'TCX_LongZhu' of http://192.168.1.21:3000/root/miduo_client into TCX_LongZhu
commit
ba5de79442
|
@ -926,8 +926,8 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 101.3, y: 31.3}
|
||||
m_SizeDelta: {x: 26, y: 26}
|
||||
m_AnchoredPosition: {x: 87.3, y: 39}
|
||||
m_SizeDelta: {x: 54, y: 54}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &1481190288339621002
|
||||
CanvasRenderer:
|
||||
|
@ -1248,7 +1248,7 @@ RectTransform:
|
|||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: -398.9, y: -0.000011444}
|
||||
m_SizeDelta: {x: 51, y: 50}
|
||||
m_SizeDelta: {x: 80, y: 80}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &6514878462385588368
|
||||
CanvasRenderer:
|
||||
|
@ -2185,7 +2185,7 @@ RectTransform:
|
|||
m_GameObject: {fileID: 1489901008684659140}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 0.8, y: 0.8, z: 1}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 4639615880994368187}
|
||||
m_RootOrder: 3
|
||||
|
@ -3619,8 +3619,8 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 29.2, y: 21.399992}
|
||||
m_SizeDelta: {x: 26, y: 26}
|
||||
m_AnchoredPosition: {x: 41.000004, y: 28}
|
||||
m_SizeDelta: {x: 54, y: 54}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &8435077041852863137
|
||||
CanvasRenderer:
|
||||
|
@ -8792,14 +8792,14 @@ RectTransform:
|
|||
m_GameObject: {fileID: 2311818336894525623}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 0.5, y: 0.5, z: 1}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 4789082650181137960}
|
||||
m_RootOrder: 3
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 50, y: 70}
|
||||
m_AnchoredPosition: {x: 57.999992, y: 70}
|
||||
m_SizeDelta: {x: 54, y: 54}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &7512548115318526588
|
||||
|
@ -9720,7 +9720,7 @@ MonoBehaviour:
|
|||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_FontData:
|
||||
m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3}
|
||||
m_FontSize: 25
|
||||
m_FontSize: 30
|
||||
m_FontStyle: 1
|
||||
m_BestFit: 0
|
||||
m_MinSize: 0
|
||||
|
@ -9841,8 +9841,8 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 29.2, y: 21.399992}
|
||||
m_SizeDelta: {x: 26, y: 26}
|
||||
m_AnchoredPosition: {x: 41.000004, y: 28}
|
||||
m_SizeDelta: {x: 54, y: 54}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &9097536272189287104
|
||||
CanvasRenderer:
|
||||
|
@ -10074,14 +10074,14 @@ RectTransform:
|
|||
m_GameObject: {fileID: 3363531509872522784}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 0.5, y: 0.5, z: 1}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 656048182935342059}
|
||||
m_RootOrder: 3
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 50, y: 70}
|
||||
m_AnchoredPosition: {x: 57.999992, y: 70}
|
||||
m_SizeDelta: {x: 54, y: 54}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &6443121422553116126
|
||||
|
@ -10315,7 +10315,7 @@ RectTransform:
|
|||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 50}
|
||||
m_SizeDelta: {x: 2, y: 100}
|
||||
m_SizeDelta: {x: 0, y: 100}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &862000527931299439
|
||||
CanvasRenderer:
|
||||
|
@ -20572,7 +20572,7 @@ RectTransform:
|
|||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: 0, y: -1220.1}
|
||||
m_SizeDelta: {x: 126, y: 831.6}
|
||||
m_SizeDelta: {x: 0, y: 831.6}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &4557464823285431404
|
||||
CanvasRenderer:
|
||||
|
@ -21604,7 +21604,7 @@ GameObject:
|
|||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
m_IsActive: 0
|
||||
--- !u!224 &9054709434670610905
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -21790,7 +21790,7 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0.5}
|
||||
m_AnchorMax: {x: 0, y: 0.5}
|
||||
m_AnchoredPosition: {x: 54, y: 47.1}
|
||||
m_AnchoredPosition: {x: 54, y: 63.6}
|
||||
m_SizeDelta: {x: 160, y: 30}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &3720905675739198426
|
||||
|
@ -21878,14 +21878,14 @@ RectTransform:
|
|||
m_GameObject: {fileID: 5803107965554706161}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 0.5, y: 0.5, z: 1}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 4549244020901848787}
|
||||
m_RootOrder: 3
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 50, y: 70}
|
||||
m_AnchoredPosition: {x: 58, y: 70}
|
||||
m_SizeDelta: {x: 54, y: 54}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &8899242933086968173
|
||||
|
@ -22101,14 +22101,14 @@ RectTransform:
|
|||
m_GameObject: {fileID: 5895867093542967032}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 0.5, y: 0.5, z: 1}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 6936828423261616642}
|
||||
m_RootOrder: 3
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 50, y: 70}
|
||||
m_AnchoredPosition: {x: 57.999992, y: 70}
|
||||
m_SizeDelta: {x: 54, y: 54}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &6637584471341954987
|
||||
|
@ -22782,14 +22782,14 @@ RectTransform:
|
|||
m_GameObject: {fileID: 6677091790379692153}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 0.5, y: 0.5, z: 1}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 4423045964338222198}
|
||||
m_RootOrder: 3
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 50, y: 70}
|
||||
m_AnchoredPosition: {x: 57.999992, y: 70}
|
||||
m_SizeDelta: {x: 54, y: 54}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &381364439432358341
|
||||
|
@ -23253,15 +23253,15 @@ RectTransform:
|
|||
m_GameObject: {fileID: 6832148857027702332}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 2.15, y: 2.15, z: 1}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 8135872788807024978}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: 2.5999756, y: 217}
|
||||
m_SizeDelta: {x: -568, y: -896}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &2155894465931919575
|
||||
CanvasRenderer:
|
||||
|
@ -23816,8 +23816,8 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 29.2, y: 21.4}
|
||||
m_SizeDelta: {x: 26, y: 26}
|
||||
m_AnchoredPosition: {x: 41.000004, y: 28}
|
||||
m_SizeDelta: {x: 54, y: 54}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &6737633403800009554
|
||||
CanvasRenderer:
|
||||
|
@ -24081,8 +24081,8 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 29.2, y: 21.399992}
|
||||
m_SizeDelta: {x: 26, y: 26}
|
||||
m_AnchoredPosition: {x: 41, y: 28}
|
||||
m_SizeDelta: {x: 54, y: 54}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &3707543394701845105
|
||||
CanvasRenderer:
|
||||
|
@ -24746,7 +24746,7 @@ RectTransform:
|
|||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 72, y: 77}
|
||||
m_SizeDelta: {x: 26, y: 26}
|
||||
m_SizeDelta: {x: 54, y: 54}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &2749442217511144586
|
||||
CanvasRenderer:
|
||||
|
@ -24893,8 +24893,8 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 92.2, y: 31.6}
|
||||
m_SizeDelta: {x: 26, y: 26}
|
||||
m_AnchoredPosition: {x: 87, y: 38}
|
||||
m_SizeDelta: {x: 54, y: 54}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &3682010506837265686
|
||||
CanvasRenderer:
|
||||
|
@ -25217,7 +25217,7 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 268, y: -713}
|
||||
m_AnchoredPosition: {x: 0, y: 195}
|
||||
m_SizeDelta: {x: 603.22, y: 50}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &4352256703930585495
|
||||
|
@ -25255,7 +25255,7 @@ MonoBehaviour:
|
|||
m_BestFit: 1
|
||||
m_MinSize: 2
|
||||
m_MaxSize: 30
|
||||
m_Alignment: 3
|
||||
m_Alignment: 4
|
||||
m_AlignByGeometry: 0
|
||||
m_RichText: 1
|
||||
m_HorizontalOverflow: 0
|
||||
|
@ -25694,14 +25694,14 @@ RectTransform:
|
|||
m_GameObject: {fileID: 8880585153594041640}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 0.5, y: 0.5, z: 1}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 645283470032121427}
|
||||
m_RootOrder: 3
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 50, y: 70}
|
||||
m_AnchoredPosition: {x: 57.999992, y: 70}
|
||||
m_SizeDelta: {x: 54, y: 54}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &9041359824821477975
|
||||
|
|
Loading…
Reference in New Issue