Merge branch 'china/dev_bt_develop' of http://60.1.1.230/gaoxin/JL_Client into china/dev_bt_develop
commit
047274e736
|
@ -36,8 +36,8 @@ RectTransform:
|
|||
m_Father: {fileID: 7828067444209862821}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 25, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0, y: 1}
|
||||
|
@ -244,7 +244,7 @@ MonoBehaviour:
|
|||
m_HorizontalOverflow: 0
|
||||
m_VerticalOverflow: 1
|
||||
m_LineSpacing: 1
|
||||
m_Text: "\u81EA\u8EAB\u56DE\u5408\u5F00\u59CB\u81EA\u8EAB\u56DE\u5408\u5F00\u59CB\u81EA\u8EAB\u56DE\u5408\u5F00\u59CB\u81EA\u8EAB\u56DE\u5408\u5F00\u59CB\u81EA\u8EAB\u56DE\u5408\u5F00\u59CB\u81EA\u8EAB"
|
||||
m_Text: "\u81EA\u8EAB\u56DE\u5408\u5F00\u59CB\u81EA\u8EAB\u56DE\u5408\u5F00\u59CB\u81EA\u8EAB\u56DE\u5408\u5F00\u59CB\u81EA\u8EAB\u56DE\u5408\u5F00\u59CB\u81EA\u8EAB\u56DE\u5408\u5F00\u59CB\u81EA\u8EAB\u81EA\u8EAB\u56DE\u5408\u5F00\u59CB\u81EA\u8EAB\u56DE\u5408\u5F00\u59CB\u81EA\u8EAB\u56DE\u5408\u5F00\u59CB\u81EA\u8EAB\u56DE\u5408\u5F00\u59CB\u81EA\u8EAB\u56DE\u5408\u5F00\u59CB\u81EA\u8EAB\u81EA\u8EAB\u56DE\u5408\u5F00\u59CB\u81EA\u8EAB\u56DE\u5408\u5F00\u59CB\u81EA\u8EAB\u56DE\u5408\u5F00\u59CB\u81EA\u8EAB\u56DE\u5408\u5F00\u59CB\u81EA\u8EAB\u56DE\u5408\u5F00\u59CB\u81EA\u8EAB\u81EA\u8EAB\u56DE\u5408\u5F00\u59CB\u81EA\u8EAB\u56DE\u5408\u5F00\u59CB\u81EA\u8EAB\u56DE\u5408\u5F00\u59CB\u81EA\u8EAB\u56DE\u5408\u5F00\u59CB\u81EA\u8EAB\u56DE\u5408\u5F00\u59CB\u81EA\u8EAB"
|
||||
--- !u!114 &1264153467
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -1741,7 +1741,7 @@ MonoBehaviour:
|
|||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_Sprite: {fileID: 21300000, guid: 47b0d71d3c8ef79468a5fb4d8ec5f365, type: 3}
|
||||
m_Sprite: {fileID: 21300000, guid: 9bc69e961cda94a47b9d03ff3c746b06, type: 3}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
|
@ -2106,7 +2106,7 @@ RectTransform:
|
|||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 160, y: 49}
|
||||
m_SizeDelta: {x: 160, y: 80}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &2696076604144975371
|
||||
CanvasRenderer:
|
||||
|
@ -2138,11 +2138,11 @@ MonoBehaviour:
|
|||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_FontData:
|
||||
m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3}
|
||||
m_FontSize: 45
|
||||
m_FontSize: 55
|
||||
m_FontStyle: 0
|
||||
m_BestFit: 0
|
||||
m_MinSize: 3
|
||||
m_MaxSize: 45
|
||||
m_MaxSize: 55
|
||||
m_Alignment: 4
|
||||
m_AlignByGeometry: 0
|
||||
m_RichText: 1
|
||||
|
@ -2182,6 +2182,7 @@ RectTransform:
|
|||
- {fileID: 8403995213330156062}
|
||||
- {fileID: 477276882712494042}
|
||||
- {fileID: 3345913646983354681}
|
||||
- {fileID: 8357413011783037125}
|
||||
m_Father: {fileID: 2696076605879052416}
|
||||
m_RootOrder: 1
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
|
@ -2335,7 +2336,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: 0, y: 170.19998}
|
||||
m_AnchoredPosition: {x: 0, y: 131}
|
||||
m_SizeDelta: {x: 858, y: 35}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &2696076604500978525
|
||||
|
@ -2882,8 +2883,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: 0, y: 230.96005}
|
||||
m_SizeDelta: {x: 217, y: 49}
|
||||
m_AnchoredPosition: {x: 0, y: 252}
|
||||
m_SizeDelta: {x: 220, y: 55}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &2696076605080798652
|
||||
CanvasRenderer:
|
||||
|
@ -3267,7 +3268,7 @@ RectTransform:
|
|||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: -170, y: -115}
|
||||
m_SizeDelta: {x: 190, y: 70}
|
||||
m_SizeDelta: {x: 220, y: 90}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &2696076605480272384
|
||||
CanvasRenderer:
|
||||
|
@ -3297,7 +3298,7 @@ MonoBehaviour:
|
|||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_Sprite: {fileID: 21300000, guid: addacd5860691b74db509358d99a6dfb, type: 3}
|
||||
m_Sprite: {fileID: 21300000, guid: a379642716d30e746a7730ece97c7704, type: 3}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
|
@ -3385,7 +3386,7 @@ RectTransform:
|
|||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 170, y: -115}
|
||||
m_SizeDelta: {x: 190, y: 70}
|
||||
m_SizeDelta: {x: 220, y: 90}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &2696076605662271635
|
||||
CanvasRenderer:
|
||||
|
@ -3415,7 +3416,7 @@ MonoBehaviour:
|
|||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_Sprite: {fileID: 21300000, guid: cc47a59ad14ba0344b8eaa93093a8bd5, type: 3}
|
||||
m_Sprite: {fileID: 21300000, guid: a379642716d30e746a7730ece97c7704, type: 3}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
|
@ -3698,7 +3699,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: 0, y: -184.75}
|
||||
m_AnchoredPosition: {x: 0, y: -232}
|
||||
m_SizeDelta: {x: 1010, y: 688.61}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &2696076605811343762
|
||||
|
@ -3748,7 +3749,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: 0, y: 381.53998}
|
||||
m_AnchoredPosition: {x: 0, y: 348}
|
||||
m_SizeDelta: {x: 1033, y: 414.58}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &2696076605879052418
|
||||
|
@ -4594,7 +4595,7 @@ MonoBehaviour:
|
|||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_Sprite: {fileID: 21300000, guid: 47b0d71d3c8ef79468a5fb4d8ec5f365, type: 3}
|
||||
m_Sprite: {fileID: 21300000, guid: 9bc69e961cda94a47b9d03ff3c746b06, type: 3}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
|
@ -5530,7 +5531,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: 25, y: -182.94}
|
||||
m_AnchoredPosition: {x: 25, y: -298.8}
|
||||
m_SizeDelta: {x: 892.9, y: 149.8}
|
||||
m_Pivot: {x: 0, y: 1}
|
||||
--- !u!222 &7186235034439321287
|
||||
|
@ -6169,7 +6170,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: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: -0.000030465273}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0, y: 1}
|
||||
--- !u!222 &3992972364876945023
|
||||
|
@ -6212,7 +6213,7 @@ MonoBehaviour:
|
|||
m_Top: 0
|
||||
m_Bottom: 0
|
||||
m_ChildAlignment: 0
|
||||
m_Spacing: 33.14
|
||||
m_Spacing: 50
|
||||
m_ChildForceExpandWidth: 0
|
||||
m_ChildForceExpandHeight: 1
|
||||
m_ChildControlWidth: 0
|
||||
|
@ -7172,7 +7173,7 @@ MonoBehaviour:
|
|||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_Sprite: {fileID: 21300000, guid: 47b0d71d3c8ef79468a5fb4d8ec5f365, type: 3}
|
||||
m_Sprite: {fileID: 21300000, guid: 9bc69e961cda94a47b9d03ff3c746b06, type: 3}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
|
@ -8314,6 +8315,80 @@ CanvasRenderer:
|
|||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7883647339807552791}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!1 &7910095383941984639
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 8357413011783037125}
|
||||
- component: {fileID: 1151083078638495039}
|
||||
- component: {fileID: 3571430839230743426}
|
||||
m_Layer: 5
|
||||
m_Name: Image (3)
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &8357413011783037125
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7910095383941984639}
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 2696076604178069307}
|
||||
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: 0, y: -117}
|
||||
m_SizeDelta: {x: 900, y: 5}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &1151083078638495039
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7910095383941984639}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &3571430839230743426
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7910095383941984639}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 1, g: 1, b: 1, 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_Sprite: {fileID: 21300000, guid: 574c62b02e62a3e47ad4d4cb5a7f9098, type: 3}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
m_FillMethod: 4
|
||||
m_FillAmount: 1
|
||||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
--- !u!1 &7959172040792756672
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -8380,7 +8455,7 @@ MonoBehaviour:
|
|||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_Sprite: {fileID: 21300000, guid: 47b0d71d3c8ef79468a5fb4d8ec5f365, type: 3}
|
||||
m_Sprite: {fileID: 21300000, guid: 9bc69e961cda94a47b9d03ff3c746b06, type: 3}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
|
@ -8710,7 +8785,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: 25, y: -365.88}
|
||||
m_AnchoredPosition: {x: 25, y: -498.59998}
|
||||
m_SizeDelta: {x: 892.9, y: 149.8}
|
||||
m_Pivot: {x: 0, y: 1}
|
||||
--- !u!222 &4420288654056150154
|
||||
|
@ -8916,7 +8991,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: 25, y: -548.82}
|
||||
m_AnchoredPosition: {x: 25, y: -647.82}
|
||||
m_SizeDelta: {x: 892.9, y: 149.8}
|
||||
m_Pivot: {x: 0, y: 1}
|
||||
--- !u!222 &4929367550509420520
|
||||
|
|
Loading…
Reference in New Issue