Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
						commit
						4a36c62362
					
				| 
						 | 
				
			
			@ -901,10 +901,10 @@ RectTransform:
 | 
			
		|||
  m_Father: {fileID: 8713029853791401389}
 | 
			
		||||
  m_RootOrder: 3
 | 
			
		||||
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 | 
			
		||||
  m_AnchorMin: {x: 0, y: 1}
 | 
			
		||||
  m_AnchorMax: {x: 0, y: 1}
 | 
			
		||||
  m_AnchoredPosition: {x: 951.2, y: 148.2}
 | 
			
		||||
  m_SizeDelta: {x: 257.7, y: 358.4}
 | 
			
		||||
  m_AnchorMin: {x: 1, y: 0.5}
 | 
			
		||||
  m_AnchorMax: {x: 1, y: 0.5}
 | 
			
		||||
  m_AnchoredPosition: {x: -128.84998, y: 222}
 | 
			
		||||
  m_SizeDelta: {x: 257.69995, y: 358.4}
 | 
			
		||||
  m_Pivot: {x: 0.5, y: 0.5}
 | 
			
		||||
--- !u!114 &8090959466128949049
 | 
			
		||||
MonoBehaviour:
 | 
			
		||||
| 
						 | 
				
			
			@ -2528,7 +2528,7 @@ RectTransform:
 | 
			
		|||
  - {fileID: 7306400500366346521}
 | 
			
		||||
  - {fileID: 700173074565294965}
 | 
			
		||||
  m_Father: {fileID: 1454780772259464311}
 | 
			
		||||
  m_RootOrder: 4
 | 
			
		||||
  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}
 | 
			
		||||
| 
						 | 
				
			
			@ -3627,12 +3627,12 @@ RectTransform:
 | 
			
		|||
  - {fileID: 4392713943104514778}
 | 
			
		||||
  - {fileID: 8208061848372739616}
 | 
			
		||||
  m_Father: {fileID: 1454780772259464311}
 | 
			
		||||
  m_RootOrder: 3
 | 
			
		||||
  m_RootOrder: 2
 | 
			
		||||
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 | 
			
		||||
  m_AnchorMin: {x: 0.5, y: 0}
 | 
			
		||||
  m_AnchorMax: {x: 0.5, y: 0}
 | 
			
		||||
  m_AnchorMin: {x: 0, y: 0}
 | 
			
		||||
  m_AnchorMax: {x: 1, y: 0}
 | 
			
		||||
  m_AnchoredPosition: {x: 0, y: 50}
 | 
			
		||||
  m_SizeDelta: {x: 1080, y: 164}
 | 
			
		||||
  m_SizeDelta: {x: 0, y: 100}
 | 
			
		||||
  m_Pivot: {x: 0.5, y: 0.5}
 | 
			
		||||
--- !u!222 &6653583057432736955
 | 
			
		||||
CanvasRenderer:
 | 
			
		||||
| 
						 | 
				
			
			@ -6043,7 +6043,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: -334, y: -538}
 | 
			
		||||
  m_AnchoredPosition: {x: -300, y: -538}
 | 
			
		||||
  m_SizeDelta: {x: 320, y: 267}
 | 
			
		||||
  m_Pivot: {x: 0.5, y: 0.5}
 | 
			
		||||
--- !u!222 &6406424020756372936
 | 
			
		||||
| 
						 | 
				
			
			@ -6568,7 +6568,7 @@ RectTransform:
 | 
			
		|||
  - {fileID: 6377394198622654848}
 | 
			
		||||
  - {fileID: 8105622087091877764}
 | 
			
		||||
  m_Father: {fileID: 1454780772259464311}
 | 
			
		||||
  m_RootOrder: 2
 | 
			
		||||
  m_RootOrder: 4
 | 
			
		||||
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 | 
			
		||||
  m_AnchorMin: {x: 1, y: 1}
 | 
			
		||||
  m_AnchorMax: {x: 1, y: 1}
 | 
			
		||||
| 
						 | 
				
			
			@ -8487,9 +8487,9 @@ RectTransform:
 | 
			
		|||
  m_Children:
 | 
			
		||||
  - {fileID: 5260388766404069698}
 | 
			
		||||
  - {fileID: 3414800266310949691}
 | 
			
		||||
  - {fileID: 6199128604822066698}
 | 
			
		||||
  - {fileID: 8713029853791401389}
 | 
			
		||||
  - {fileID: 8345460704408680873}
 | 
			
		||||
  - {fileID: 6199128604822066698}
 | 
			
		||||
  - {fileID: 2004447905712542448}
 | 
			
		||||
  - {fileID: 3838651866340592857}
 | 
			
		||||
  - {fileID: 3554899174824847006}
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue