Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev
commit
270b53cab1
|
@ -201,7 +201,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 &1792764959241262439
|
--- !u!224 &1792764959241262439
|
||||||
RectTransform:
|
RectTransform:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
@ -298,10 +298,10 @@ RectTransform:
|
||||||
m_Father: {fileID: 2413760011081062320}
|
m_Father: {fileID: 2413760011081062320}
|
||||||
m_RootOrder: 4
|
m_RootOrder: 4
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 20}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 20}
|
||||||
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: 134.1, y: -18.5}
|
m_AnchoredPosition: {x: 0, y: 0}
|
||||||
m_SizeDelta: {x: 37, y: 37}
|
m_SizeDelta: {x: 0, y: 0}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &8297261512285701012
|
--- !u!222 &8297261512285701012
|
||||||
CanvasRenderer:
|
CanvasRenderer:
|
||||||
|
@ -372,10 +372,10 @@ RectTransform:
|
||||||
m_Father: {fileID: 7588784792515497567}
|
m_Father: {fileID: 7588784792515497567}
|
||||||
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: 0}
|
m_AnchorMin: {x: 0, y: 1}
|
||||||
m_AnchorMax: {x: 0, y: 0}
|
m_AnchorMax: {x: 0, y: 1}
|
||||||
m_AnchoredPosition: {x: 0, y: 0}
|
m_AnchoredPosition: {x: 14.5, y: -59.6}
|
||||||
m_SizeDelta: {x: 0, y: 0}
|
m_SizeDelta: {x: 29, y: 29}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &2783646490405650716
|
--- !u!222 &2783646490405650716
|
||||||
CanvasRenderer:
|
CanvasRenderer:
|
||||||
|
@ -630,10 +630,10 @@ RectTransform:
|
||||||
m_Father: {fileID: 3230929696008119618}
|
m_Father: {fileID: 3230929696008119618}
|
||||||
m_RootOrder: 2
|
m_RootOrder: 2
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 20}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 20}
|
||||||
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: 76.3, y: -18.5}
|
m_AnchoredPosition: {x: 0, y: 0}
|
||||||
m_SizeDelta: {x: 37, y: 37}
|
m_SizeDelta: {x: 0, y: 0}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &7879158120740199685
|
--- !u!222 &7879158120740199685
|
||||||
CanvasRenderer:
|
CanvasRenderer:
|
||||||
|
@ -784,10 +784,10 @@ RectTransform:
|
||||||
m_Father: {fileID: 2413760011081062320}
|
m_Father: {fileID: 2413760011081062320}
|
||||||
m_RootOrder: 0
|
m_RootOrder: 0
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 20}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 20}
|
||||||
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: 18.5, y: -18.5}
|
m_AnchoredPosition: {x: 0, y: 0}
|
||||||
m_SizeDelta: {x: 37, y: 37}
|
m_SizeDelta: {x: 0, y: 0}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &2843983231285575064
|
--- !u!222 &2843983231285575064
|
||||||
CanvasRenderer:
|
CanvasRenderer:
|
||||||
|
@ -1058,7 +1058,7 @@ RectTransform:
|
||||||
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: 0, y: -83.02002}
|
m_AnchoredPosition: {x: 0, y: -83.02002}
|
||||||
m_SizeDelta: {x: 0, y: 0}
|
m_SizeDelta: {x: 29, y: 119.2}
|
||||||
m_Pivot: {x: 0, y: 1}
|
m_Pivot: {x: 0, y: 1}
|
||||||
--- !u!114 &3470999910211126998
|
--- !u!114 &3470999910211126998
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
|
@ -1210,10 +1210,10 @@ RectTransform:
|
||||||
m_Father: {fileID: 2106075156670374493}
|
m_Father: {fileID: 2106075156670374493}
|
||||||
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: 0}
|
m_AnchorMin: {x: 0, y: 1}
|
||||||
m_AnchorMax: {x: 0, y: 0}
|
m_AnchorMax: {x: 0, y: 1}
|
||||||
m_AnchoredPosition: {x: 0, y: 0}
|
m_AnchoredPosition: {x: 14.5, y: -37.05}
|
||||||
m_SizeDelta: {x: 0, y: 0}
|
m_SizeDelta: {x: 29, y: 29}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &4979344293772254403
|
--- !u!222 &4979344293772254403
|
||||||
CanvasRenderer:
|
CanvasRenderer:
|
||||||
|
@ -1478,7 +1478,7 @@ MonoBehaviour:
|
||||||
m_BestFit: 0
|
m_BestFit: 0
|
||||||
m_MinSize: 2
|
m_MinSize: 2
|
||||||
m_MaxSize: 40
|
m_MaxSize: 40
|
||||||
m_Alignment: 4
|
m_Alignment: 7
|
||||||
m_AlignByGeometry: 0
|
m_AlignByGeometry: 0
|
||||||
m_RichText: 1
|
m_RichText: 1
|
||||||
m_HorizontalOverflow: 0
|
m_HorizontalOverflow: 0
|
||||||
|
@ -1835,7 +1835,7 @@ RectTransform:
|
||||||
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: -43.299988, y: -529.55}
|
m_AnchoredPosition: {x: -43.299988, y: -529.55}
|
||||||
m_SizeDelta: {x: 152.6, y: 37}
|
m_SizeDelta: {x: 0, y: 0}
|
||||||
m_Pivot: {x: 0, y: 1}
|
m_Pivot: {x: 0, y: 1}
|
||||||
--- !u!114 &2970137455973610504
|
--- !u!114 &2970137455973610504
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
|
@ -1907,10 +1907,10 @@ RectTransform:
|
||||||
m_Father: {fileID: 2106075156670374493}
|
m_Father: {fileID: 2106075156670374493}
|
||||||
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, y: 0}
|
m_AnchorMin: {x: 0, y: 1}
|
||||||
m_AnchorMax: {x: 0, y: 0}
|
m_AnchorMax: {x: 0, y: 1}
|
||||||
m_AnchoredPosition: {x: 0, y: 0}
|
m_AnchoredPosition: {x: 14.5, y: -82.15}
|
||||||
m_SizeDelta: {x: 0, y: 0}
|
m_SizeDelta: {x: 29, y: 29}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &5670229394036247307
|
--- !u!222 &5670229394036247307
|
||||||
CanvasRenderer:
|
CanvasRenderer:
|
||||||
|
@ -2642,10 +2642,10 @@ RectTransform:
|
||||||
m_Father: {fileID: 2413760011081062320}
|
m_Father: {fileID: 2413760011081062320}
|
||||||
m_RootOrder: 2
|
m_RootOrder: 2
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 20}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 20}
|
||||||
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: 76.3, y: -18.5}
|
m_AnchoredPosition: {x: 0, y: 0}
|
||||||
m_SizeDelta: {x: 37, y: 37}
|
m_SizeDelta: {x: 0, y: 0}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &8240119575978186335
|
--- !u!222 &8240119575978186335
|
||||||
CanvasRenderer:
|
CanvasRenderer:
|
||||||
|
@ -2952,7 +2952,7 @@ RectTransform:
|
||||||
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: -36.39998, y: -428.56}
|
m_AnchoredPosition: {x: -36.39998, y: -428.56}
|
||||||
m_SizeDelta: {x: 152.6, y: 37}
|
m_SizeDelta: {x: 0, y: 0}
|
||||||
m_Pivot: {x: 0, y: 1}
|
m_Pivot: {x: 0, y: 1}
|
||||||
--- !u!114 &2926674203893923322
|
--- !u!114 &2926674203893923322
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
|
@ -7564,7 +7564,7 @@ ParticleSystem:
|
||||||
--- !u!199 &6683236217412788304
|
--- !u!199 &6683236217412788304
|
||||||
ParticleSystemRenderer:
|
ParticleSystemRenderer:
|
||||||
serializedVersion: 6
|
serializedVersion: 6
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 2
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
m_PrefabInstance: {fileID: 0}
|
m_PrefabInstance: {fileID: 0}
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
@ -7729,10 +7729,10 @@ RectTransform:
|
||||||
m_Father: {fileID: 2106075156670374493}
|
m_Father: {fileID: 2106075156670374493}
|
||||||
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: 0}
|
m_AnchorMin: {x: 0, y: 1}
|
||||||
m_AnchorMax: {x: 0, y: 0}
|
m_AnchorMax: {x: 0, y: 1}
|
||||||
m_AnchoredPosition: {x: 0, y: 0}
|
m_AnchoredPosition: {x: 14.5, y: -14.5}
|
||||||
m_SizeDelta: {x: 0, y: 0}
|
m_SizeDelta: {x: 29, y: 29}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &1085086755886307282
|
--- !u!222 &1085086755886307282
|
||||||
CanvasRenderer:
|
CanvasRenderer:
|
||||||
|
@ -7788,7 +7788,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 &6254695140225478355
|
--- !u!224 &6254695140225478355
|
||||||
RectTransform:
|
RectTransform:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
@ -8130,10 +8130,10 @@ RectTransform:
|
||||||
m_Father: {fileID: 7588784792515497567}
|
m_Father: {fileID: 7588784792515497567}
|
||||||
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, y: 0}
|
m_AnchorMin: {x: 0, y: 1}
|
||||||
m_AnchorMax: {x: 0, y: 0}
|
m_AnchorMax: {x: 0, y: 1}
|
||||||
m_AnchoredPosition: {x: 0, y: 0}
|
m_AnchoredPosition: {x: 14.5, y: -82.15}
|
||||||
m_SizeDelta: {x: 0, y: 0}
|
m_SizeDelta: {x: 29, y: 29}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &1540993906226609194
|
--- !u!222 &1540993906226609194
|
||||||
CanvasRenderer:
|
CanvasRenderer:
|
||||||
|
@ -8435,10 +8435,10 @@ RectTransform:
|
||||||
m_Father: {fileID: 8035045893584556928}
|
m_Father: {fileID: 8035045893584556928}
|
||||||
m_RootOrder: 3
|
m_RootOrder: 3
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 20}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 20}
|
||||||
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: 105.2, y: -18.5}
|
m_AnchoredPosition: {x: 0, y: 0}
|
||||||
m_SizeDelta: {x: 37, y: 37}
|
m_SizeDelta: {x: 0, y: 0}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &3680916616229775796
|
--- !u!222 &3680916616229775796
|
||||||
CanvasRenderer:
|
CanvasRenderer:
|
||||||
|
@ -9271,10 +9271,10 @@ RectTransform:
|
||||||
m_Father: {fileID: 3230929696008119618}
|
m_Father: {fileID: 3230929696008119618}
|
||||||
m_RootOrder: 0
|
m_RootOrder: 0
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 20}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 20}
|
||||||
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: 18.5, y: -18.5}
|
m_AnchoredPosition: {x: 0, y: 0}
|
||||||
m_SizeDelta: {x: 37, y: 37}
|
m_SizeDelta: {x: 0, y: 0}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &1921485182742021991
|
--- !u!222 &1921485182742021991
|
||||||
CanvasRenderer:
|
CanvasRenderer:
|
||||||
|
@ -10040,10 +10040,10 @@ RectTransform:
|
||||||
m_Father: {fileID: 7588784792515497567}
|
m_Father: {fileID: 7588784792515497567}
|
||||||
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: 0}
|
m_AnchorMin: {x: 0, y: 1}
|
||||||
m_AnchorMax: {x: 0, y: 0}
|
m_AnchorMax: {x: 0, y: 1}
|
||||||
m_AnchoredPosition: {x: 0, y: 0}
|
m_AnchoredPosition: {x: 14.5, y: -14.5}
|
||||||
m_SizeDelta: {x: 0, y: 0}
|
m_SizeDelta: {x: 29, y: 29}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &3625634006044404378
|
--- !u!222 &3625634006044404378
|
||||||
CanvasRenderer:
|
CanvasRenderer:
|
||||||
|
@ -10353,10 +10353,10 @@ RectTransform:
|
||||||
m_Father: {fileID: 2413760011081062320}
|
m_Father: {fileID: 2413760011081062320}
|
||||||
m_RootOrder: 1
|
m_RootOrder: 1
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 20}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 20}
|
||||||
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: 47.4, y: -18.5}
|
m_AnchoredPosition: {x: 0, y: 0}
|
||||||
m_SizeDelta: {x: 37, y: 37}
|
m_SizeDelta: {x: 0, y: 0}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &1353509363754156616
|
--- !u!222 &1353509363754156616
|
||||||
CanvasRenderer:
|
CanvasRenderer:
|
||||||
|
@ -10548,10 +10548,10 @@ RectTransform:
|
||||||
m_Father: {fileID: 2413760011081062320}
|
m_Father: {fileID: 2413760011081062320}
|
||||||
m_RootOrder: 3
|
m_RootOrder: 3
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 20}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 20}
|
||||||
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: 105.2, y: -18.5}
|
m_AnchoredPosition: {x: 0, y: 0}
|
||||||
m_SizeDelta: {x: 37, y: 37}
|
m_SizeDelta: {x: 0, y: 0}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &2853174573882955397
|
--- !u!222 &2853174573882955397
|
||||||
CanvasRenderer:
|
CanvasRenderer:
|
||||||
|
@ -10625,8 +10625,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: 11.699997, y: 0.000019073486}
|
m_AnchoredPosition: {x: 11.699997, y: -0.000041505813}
|
||||||
m_SizeDelta: {x: 196.51, y: 73}
|
m_SizeDelta: {x: 196.51, y: 0}
|
||||||
m_Pivot: {x: 0, y: 1}
|
m_Pivot: {x: 0, y: 1}
|
||||||
--- !u!222 &3578854696546125194
|
--- !u!222 &3578854696546125194
|
||||||
CanvasRenderer:
|
CanvasRenderer:
|
||||||
|
@ -11073,10 +11073,10 @@ RectTransform:
|
||||||
m_Father: {fileID: 3230929696008119618}
|
m_Father: {fileID: 3230929696008119618}
|
||||||
m_RootOrder: 3
|
m_RootOrder: 3
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 20}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 20}
|
||||||
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: 105.2, y: -18.5}
|
m_AnchoredPosition: {x: 0, y: 0}
|
||||||
m_SizeDelta: {x: 37, y: 37}
|
m_SizeDelta: {x: 0, y: 0}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &4708395115664245504
|
--- !u!222 &4708395115664245504
|
||||||
CanvasRenderer:
|
CanvasRenderer:
|
||||||
|
@ -11147,10 +11147,10 @@ RectTransform:
|
||||||
m_Father: {fileID: 7588784792515497567}
|
m_Father: {fileID: 7588784792515497567}
|
||||||
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: 0}
|
m_AnchorMin: {x: 0, y: 1}
|
||||||
m_AnchorMax: {x: 0, y: 0}
|
m_AnchorMax: {x: 0, y: 1}
|
||||||
m_AnchoredPosition: {x: 0, y: 0}
|
m_AnchoredPosition: {x: 14.5, y: -37.05}
|
||||||
m_SizeDelta: {x: 0, y: 0}
|
m_SizeDelta: {x: 29, y: 29}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &2856595146202989509
|
--- !u!222 &2856595146202989509
|
||||||
CanvasRenderer:
|
CanvasRenderer:
|
||||||
|
@ -11221,10 +11221,10 @@ RectTransform:
|
||||||
m_Father: {fileID: 8035045893584556928}
|
m_Father: {fileID: 8035045893584556928}
|
||||||
m_RootOrder: 4
|
m_RootOrder: 4
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 20}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 20}
|
||||||
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: 134.1, y: -18.5}
|
m_AnchoredPosition: {x: 0, y: 0}
|
||||||
m_SizeDelta: {x: 37, y: 37}
|
m_SizeDelta: {x: 0, y: 0}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &5189729580954329309
|
--- !u!222 &5189729580954329309
|
||||||
CanvasRenderer:
|
CanvasRenderer:
|
||||||
|
@ -11389,8 +11389,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: 11.699997, y: -0.000008128568}
|
m_AnchoredPosition: {x: 11.699997, y: 0.000010365819}
|
||||||
m_SizeDelta: {x: 196.5, y: 0}
|
m_SizeDelta: {x: 196.5, y: 73}
|
||||||
m_Pivot: {x: 0, y: 1}
|
m_Pivot: {x: 0, y: 1}
|
||||||
--- !u!222 &3974276503969912513
|
--- !u!222 &3974276503969912513
|
||||||
CanvasRenderer:
|
CanvasRenderer:
|
||||||
|
@ -11871,10 +11871,10 @@ RectTransform:
|
||||||
m_Father: {fileID: 8035045893584556928}
|
m_Father: {fileID: 8035045893584556928}
|
||||||
m_RootOrder: 0
|
m_RootOrder: 0
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 20}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 20}
|
||||||
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: 18.5, y: -18.5}
|
m_AnchoredPosition: {x: 0, y: 0}
|
||||||
m_SizeDelta: {x: 37, y: 37}
|
m_SizeDelta: {x: 0, y: 0}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &4326468927235050550
|
--- !u!222 &4326468927235050550
|
||||||
CanvasRenderer:
|
CanvasRenderer:
|
||||||
|
@ -12056,10 +12056,10 @@ RectTransform:
|
||||||
m_Father: {fileID: 3230929696008119618}
|
m_Father: {fileID: 3230929696008119618}
|
||||||
m_RootOrder: 1
|
m_RootOrder: 1
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 20}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 20}
|
||||||
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: 47.4, y: -18.5}
|
m_AnchoredPosition: {x: 0, y: 0}
|
||||||
m_SizeDelta: {x: 37, y: 37}
|
m_SizeDelta: {x: 0, y: 0}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &1662423057411876915
|
--- !u!222 &1662423057411876915
|
||||||
CanvasRenderer:
|
CanvasRenderer:
|
||||||
|
@ -12492,10 +12492,10 @@ RectTransform:
|
||||||
m_Father: {fileID: 3230929696008119618}
|
m_Father: {fileID: 3230929696008119618}
|
||||||
m_RootOrder: 4
|
m_RootOrder: 4
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 20}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 20}
|
||||||
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: 134.1, y: -18.5}
|
m_AnchoredPosition: {x: 0, y: 0}
|
||||||
m_SizeDelta: {x: 37, y: 37}
|
m_SizeDelta: {x: 0, y: 0}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &9005618400333294438
|
--- !u!222 &9005618400333294438
|
||||||
CanvasRenderer:
|
CanvasRenderer:
|
||||||
|
@ -13590,10 +13590,10 @@ RectTransform:
|
||||||
m_Father: {fileID: 3211327466320176163}
|
m_Father: {fileID: 3211327466320176163}
|
||||||
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: 0}
|
m_AnchorMin: {x: 0, y: 1}
|
||||||
m_AnchorMax: {x: 0, y: 0}
|
m_AnchorMax: {x: 0, y: 1}
|
||||||
m_AnchoredPosition: {x: 0, y: 0}
|
m_AnchoredPosition: {x: 14.5, y: -14.5}
|
||||||
m_SizeDelta: {x: 0, y: 0}
|
m_SizeDelta: {x: 29, y: 29}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &3292543106800690701
|
--- !u!222 &3292543106800690701
|
||||||
CanvasRenderer:
|
CanvasRenderer:
|
||||||
|
@ -13664,10 +13664,10 @@ RectTransform:
|
||||||
m_Father: {fileID: 3211327466320176163}
|
m_Father: {fileID: 3211327466320176163}
|
||||||
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, y: 0}
|
m_AnchorMin: {x: 0, y: 1}
|
||||||
m_AnchorMax: {x: 0, y: 0}
|
m_AnchorMax: {x: 0, y: 1}
|
||||||
m_AnchoredPosition: {x: 0, y: 0}
|
m_AnchoredPosition: {x: 14.5, y: -82.15}
|
||||||
m_SizeDelta: {x: 0, y: 0}
|
m_SizeDelta: {x: 29, y: 29}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &8402281851977887647
|
--- !u!222 &8402281851977887647
|
||||||
CanvasRenderer:
|
CanvasRenderer:
|
||||||
|
@ -14163,7 +14163,7 @@ MonoBehaviour:
|
||||||
m_BestFit: 0
|
m_BestFit: 0
|
||||||
m_MinSize: 2
|
m_MinSize: 2
|
||||||
m_MaxSize: 44
|
m_MaxSize: 44
|
||||||
m_Alignment: 4
|
m_Alignment: 7
|
||||||
m_AlignByGeometry: 0
|
m_AlignByGeometry: 0
|
||||||
m_RichText: 1
|
m_RichText: 1
|
||||||
m_HorizontalOverflow: 0
|
m_HorizontalOverflow: 0
|
||||||
|
@ -14203,10 +14203,10 @@ RectTransform:
|
||||||
m_Father: {fileID: 8035045893584556928}
|
m_Father: {fileID: 8035045893584556928}
|
||||||
m_RootOrder: 1
|
m_RootOrder: 1
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 20}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 20}
|
||||||
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: 47.4, y: -18.5}
|
m_AnchoredPosition: {x: 0, y: 0}
|
||||||
m_SizeDelta: {x: 37, y: 37}
|
m_SizeDelta: {x: 0, y: 0}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &872411510600422855
|
--- !u!222 &872411510600422855
|
||||||
CanvasRenderer:
|
CanvasRenderer:
|
||||||
|
@ -14557,10 +14557,10 @@ RectTransform:
|
||||||
m_Father: {fileID: 2106075156670374493}
|
m_Father: {fileID: 2106075156670374493}
|
||||||
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: 0}
|
m_AnchorMin: {x: 0, y: 1}
|
||||||
m_AnchorMax: {x: 0, y: 0}
|
m_AnchorMax: {x: 0, y: 1}
|
||||||
m_AnchoredPosition: {x: 0, y: 0}
|
m_AnchoredPosition: {x: 14.5, y: -59.6}
|
||||||
m_SizeDelta: {x: 0, y: 0}
|
m_SizeDelta: {x: 29, y: 29}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &7694398329779257277
|
--- !u!222 &7694398329779257277
|
||||||
CanvasRenderer:
|
CanvasRenderer:
|
||||||
|
@ -14799,7 +14799,7 @@ RectTransform:
|
||||||
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: 0, y: -108.880005}
|
m_AnchoredPosition: {x: 0, y: -108.880005}
|
||||||
m_SizeDelta: {x: 0, y: 0}
|
m_SizeDelta: {x: 29, y: 119.2}
|
||||||
m_Pivot: {x: 0, y: 1}
|
m_Pivot: {x: 0, y: 1}
|
||||||
--- !u!114 &201099454942590022
|
--- !u!114 &201099454942590022
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
|
@ -14945,10 +14945,10 @@ RectTransform:
|
||||||
m_Father: {fileID: 3211327466320176163}
|
m_Father: {fileID: 3211327466320176163}
|
||||||
m_RootOrder: 4
|
m_RootOrder: 4
|
||||||
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: 1}
|
||||||
m_AnchorMax: {x: 0, y: 0}
|
m_AnchorMax: {x: 0, y: 1}
|
||||||
m_AnchoredPosition: {x: 0, y: 0}
|
m_AnchoredPosition: {x: 14.5, y: -104.7}
|
||||||
m_SizeDelta: {x: 0, y: 0}
|
m_SizeDelta: {x: 29, y: 29}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &8649085916934297884
|
--- !u!222 &8649085916934297884
|
||||||
CanvasRenderer:
|
CanvasRenderer:
|
||||||
|
@ -16107,10 +16107,10 @@ RectTransform:
|
||||||
m_Father: {fileID: 3211327466320176163}
|
m_Father: {fileID: 3211327466320176163}
|
||||||
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: 0}
|
m_AnchorMin: {x: 0, y: 1}
|
||||||
m_AnchorMax: {x: 0, y: 0}
|
m_AnchorMax: {x: 0, y: 1}
|
||||||
m_AnchoredPosition: {x: 0, y: 0}
|
m_AnchoredPosition: {x: 14.5, y: -59.6}
|
||||||
m_SizeDelta: {x: 0, y: 0}
|
m_SizeDelta: {x: 29, y: 29}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &6450536134465378955
|
--- !u!222 &6450536134465378955
|
||||||
CanvasRenderer:
|
CanvasRenderer:
|
||||||
|
@ -16304,7 +16304,7 @@ RectTransform:
|
||||||
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: 0, y: -99.77991}
|
m_AnchoredPosition: {x: 0, y: -99.77991}
|
||||||
m_SizeDelta: {x: 0, y: 0}
|
m_SizeDelta: {x: 29, y: 119.2}
|
||||||
m_Pivot: {x: 0, y: 1}
|
m_Pivot: {x: 0, y: 1}
|
||||||
--- !u!114 &3702195843563287096
|
--- !u!114 &3702195843563287096
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
|
@ -16450,10 +16450,10 @@ RectTransform:
|
||||||
m_Father: {fileID: 8035045893584556928}
|
m_Father: {fileID: 8035045893584556928}
|
||||||
m_RootOrder: 2
|
m_RootOrder: 2
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 20}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 20}
|
||||||
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: 76.3, y: -18.5}
|
m_AnchoredPosition: {x: 0, y: 0}
|
||||||
m_SizeDelta: {x: 37, y: 37}
|
m_SizeDelta: {x: 0, y: 0}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &2499232235660203075
|
--- !u!222 &2499232235660203075
|
||||||
CanvasRenderer:
|
CanvasRenderer:
|
||||||
|
@ -16709,10 +16709,10 @@ RectTransform:
|
||||||
m_Father: {fileID: 7588784792515497567}
|
m_Father: {fileID: 7588784792515497567}
|
||||||
m_RootOrder: 4
|
m_RootOrder: 4
|
||||||
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: 1}
|
||||||
m_AnchorMax: {x: 0, y: 0}
|
m_AnchorMax: {x: 0, y: 1}
|
||||||
m_AnchoredPosition: {x: 0, y: 0}
|
m_AnchoredPosition: {x: 14.5, y: -104.7}
|
||||||
m_SizeDelta: {x: 0, y: 0}
|
m_SizeDelta: {x: 29, y: 29}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &5308931093923569506
|
--- !u!222 &5308931093923569506
|
||||||
CanvasRenderer:
|
CanvasRenderer:
|
||||||
|
@ -17139,10 +17139,10 @@ RectTransform:
|
||||||
m_Father: {fileID: 3211327466320176163}
|
m_Father: {fileID: 3211327466320176163}
|
||||||
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: 0}
|
m_AnchorMin: {x: 0, y: 1}
|
||||||
m_AnchorMax: {x: 0, y: 0}
|
m_AnchorMax: {x: 0, y: 1}
|
||||||
m_AnchoredPosition: {x: 0, y: 0}
|
m_AnchoredPosition: {x: 14.5, y: -37.05}
|
||||||
m_SizeDelta: {x: 0, y: 0}
|
m_SizeDelta: {x: 29, y: 29}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &436220714891359273
|
--- !u!222 &436220714891359273
|
||||||
CanvasRenderer:
|
CanvasRenderer:
|
||||||
|
@ -17213,10 +17213,10 @@ RectTransform:
|
||||||
m_Father: {fileID: 2106075156670374493}
|
m_Father: {fileID: 2106075156670374493}
|
||||||
m_RootOrder: 4
|
m_RootOrder: 4
|
||||||
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: 1}
|
||||||
m_AnchorMax: {x: 0, y: 0}
|
m_AnchorMax: {x: 0, y: 1}
|
||||||
m_AnchoredPosition: {x: 0, y: 0}
|
m_AnchoredPosition: {x: 14.5, y: -104.7}
|
||||||
m_SizeDelta: {x: 0, y: 0}
|
m_SizeDelta: {x: 29, y: 29}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &620176505748672955
|
--- !u!222 &620176505748672955
|
||||||
CanvasRenderer:
|
CanvasRenderer:
|
||||||
|
@ -22189,7 +22189,7 @@ ParticleSystem:
|
||||||
--- !u!199 &305727223664186203
|
--- !u!199 &305727223664186203
|
||||||
ParticleSystemRenderer:
|
ParticleSystemRenderer:
|
||||||
serializedVersion: 6
|
serializedVersion: 6
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 2
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
m_PrefabInstance: {fileID: 0}
|
m_PrefabInstance: {fileID: 0}
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
@ -22558,7 +22558,7 @@ RectTransform:
|
||||||
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: 14.5, y: -601.8}
|
m_AnchoredPosition: {x: 14.5, y: -601.8}
|
||||||
m_SizeDelta: {x: 152.6, y: 37}
|
m_SizeDelta: {x: 0, y: 0}
|
||||||
m_Pivot: {x: 0, y: 1}
|
m_Pivot: {x: 0, y: 1}
|
||||||
--- !u!114 &5055619192251861648
|
--- !u!114 &5055619192251861648
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
|
@ -22744,7 +22744,7 @@ MonoBehaviour:
|
||||||
m_BestFit: 0
|
m_BestFit: 0
|
||||||
m_MinSize: 2
|
m_MinSize: 2
|
||||||
m_MaxSize: 40
|
m_MaxSize: 40
|
||||||
m_Alignment: 4
|
m_Alignment: 7
|
||||||
m_AlignByGeometry: 0
|
m_AlignByGeometry: 0
|
||||||
m_RichText: 1
|
m_RichText: 1
|
||||||
m_HorizontalOverflow: 0
|
m_HorizontalOverflow: 0
|
||||||
|
|
Loading…
Reference in New Issue