Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
commit
3640a17c22
|
@ -1575,7 +1575,7 @@ MonoBehaviour:
|
|||
m_Left: 0
|
||||
m_Right: 0
|
||||
m_Top: 50
|
||||
m_Bottom: 0
|
||||
m_Bottom: 20
|
||||
m_ChildAlignment: 1
|
||||
m_Spacing: 0
|
||||
m_ChildForceExpandWidth: 0
|
||||
|
@ -7695,6 +7695,7 @@ GameObject:
|
|||
m_Component:
|
||||
- component: {fileID: 7965465661199545857}
|
||||
- component: {fileID: 8719623030371130511}
|
||||
- component: {fileID: 7059279459876196396}
|
||||
m_Layer: 5
|
||||
m_Name: tasuilingxiao
|
||||
m_TagString: Untagged
|
||||
|
@ -7715,13 +7716,14 @@ RectTransform:
|
|||
m_Children:
|
||||
- {fileID: 6344554526000443219}
|
||||
- {fileID: 3292122025960207525}
|
||||
- {fileID: 1911067696981310013}
|
||||
m_Father: {fileID: 2019008144071928809}
|
||||
m_RootOrder: 4
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 540, y: -93.9}
|
||||
m_SizeDelta: {x: 631.5, y: 87.8}
|
||||
m_AnchoredPosition: {x: 540, y: -129.5}
|
||||
m_SizeDelta: {x: 631.5, y: 159}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &8719623030371130511
|
||||
MonoBehaviour:
|
||||
|
@ -7745,7 +7747,21 @@ MonoBehaviour:
|
|||
m_ChildForceExpandWidth: 1
|
||||
m_ChildForceExpandHeight: 1
|
||||
m_ChildControlWidth: 0
|
||||
m_ChildControlHeight: 0
|
||||
m_ChildControlHeight: 1
|
||||
--- !u!114 &7059279459876196396
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6114027109585916005}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_HorizontalFit: 0
|
||||
m_VerticalFit: 2
|
||||
--- !u!1 &6131695887020746290
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -9229,6 +9245,86 @@ MonoBehaviour:
|
|||
m_LineSpacing: 1
|
||||
m_Text: "\u672C\u6B21\u4F24\u5BB3\uFF1A"
|
||||
LanguageIndex: 0
|
||||
--- !u!1 &7100971265349252576
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 1911067696981310013}
|
||||
- component: {fileID: 5422920324513542960}
|
||||
- component: {fileID: 1304808370459285152}
|
||||
m_Layer: 0
|
||||
m_Name: Text
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &1911067696981310013
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7100971265349252576}
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: -100}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 7965465661199545857}
|
||||
m_RootOrder: 2
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 315.75, y: -142.5}
|
||||
m_SizeDelta: {x: 100, y: 33}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &5422920324513542960
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7100971265349252576}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &1304808370459285152
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7100971265349252576}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 0.9882353, g: 0.9607843, b: 0.827451, a: 1}
|
||||
m_RaycastTarget: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_FontData:
|
||||
m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3}
|
||||
m_FontSize: 30
|
||||
m_FontStyle: 0
|
||||
m_BestFit: 0
|
||||
m_MinSize: 0
|
||||
m_MaxSize: 50
|
||||
m_Alignment: 1
|
||||
m_AlignByGeometry: 0
|
||||
m_RichText: 1
|
||||
m_HorizontalOverflow: 1
|
||||
m_VerticalOverflow: 0
|
||||
m_LineSpacing: 1
|
||||
m_Text: "\u672A\u8FBE\u5230\u4E0B\u4E00\u6863\u5956\u52B1\u7684\u603B\u4F24\u5BB3\u6570\u503C"
|
||||
LanguageIndex: 0
|
||||
--- !u!1 &7200369799085031094
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -10219,7 +10315,7 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 315.75, y: -76.5}
|
||||
m_AnchoredPosition: {x: 315.75, y: -86.5}
|
||||
m_SizeDelta: {x: 311, y: 39}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &431933340056216266
|
||||
|
|
Loading…
Reference in New Issue