Merge branch 'TCX_LongZhu' of http://192.168.1.21:3000/root/miduo_client into TCX_LongZhu
commit
bc04d70008
|
|
@ -33259,7 +33259,7 @@ MonoBehaviour:
|
|||
m_HorizontalOverflow: 0
|
||||
m_VerticalOverflow: 0
|
||||
m_LineSpacing: 1
|
||||
m_Text: "\u5FC3\u613F\u751F\u547D\u5361"
|
||||
m_Text: "\u5FC3\u613F\u610F\u5FF5"
|
||||
LanguageIndex: 11266
|
||||
--- !u!114 &7401428691232100085
|
||||
MonoBehaviour:
|
||||
|
|
@ -39647,7 +39647,7 @@ GameObject:
|
|||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
m_IsActive: 0
|
||||
--- !u!224 &1823191076860614843
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -59041,7 +59041,7 @@ RectTransform:
|
|||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: -2.7, y: 0}
|
||||
m_SizeDelta: {x: 884.8, y: 0}
|
||||
m_SizeDelta: {x: 884.8, y: 252}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &1478443720213518412
|
||||
CanvasRenderer:
|
||||
|
|
@ -59945,7 +59945,7 @@ MonoBehaviour:
|
|||
m_HorizontalOverflow: 0
|
||||
m_VerticalOverflow: 0
|
||||
m_LineSpacing: 1
|
||||
m_Text: "\u9009\u62E9\u5FC3\u613F\u6CD5\u5B9D: "
|
||||
m_Text: "\u9009\u62E9\u5FC3\u613F\u610F\u5FF5: "
|
||||
LanguageIndex: 0
|
||||
--- !u!1 &8889468002087379161
|
||||
GameObject:
|
||||
|
|
|
|||
|
|
@ -2810,7 +2810,7 @@ RectTransform:
|
|||
- {fileID: 3298455309370153164}
|
||||
- {fileID: 4599806389354651146}
|
||||
m_Father: {fileID: 6761033141322721514}
|
||||
m_RootOrder: 2
|
||||
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}
|
||||
|
|
@ -3066,7 +3066,7 @@ RectTransform:
|
|||
- {fileID: 1906746395904620968}
|
||||
- {fileID: 5203949206286687710}
|
||||
m_Father: {fileID: 5906423456385253720}
|
||||
m_RootOrder: 3
|
||||
m_RootOrder: 4
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
|
|
@ -3967,7 +3967,7 @@ RectTransform:
|
|||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 7438115198098257837}
|
||||
m_RootOrder: 0
|
||||
m_RootOrder: 1
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
|
|
@ -4120,7 +4120,7 @@ RectTransform:
|
|||
- {fileID: 508798751852099628}
|
||||
- {fileID: 707609949824295254}
|
||||
m_Father: {fileID: 5906423456385253720}
|
||||
m_RootOrder: 2
|
||||
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}
|
||||
|
|
@ -4330,7 +4330,7 @@ RectTransform:
|
|||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 6761033141322721514}
|
||||
m_RootOrder: 1
|
||||
m_RootOrder: 2
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
|
|
@ -4497,6 +4497,7 @@ RectTransform:
|
|||
m_LocalScale: {x: 0.90000004, y: 0.90000004, z: 1}
|
||||
m_Children:
|
||||
- {fileID: 2877947821654943278}
|
||||
- {fileID: 7421050671015278551}
|
||||
- {fileID: 7050171314929626220}
|
||||
- {fileID: 1079811506414918725}
|
||||
- {fileID: 3322227843367306562}
|
||||
|
|
@ -4625,6 +4626,7 @@ RectTransform:
|
|||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children:
|
||||
- {fileID: 6557353678973494664}
|
||||
- {fileID: 5965346305940923212}
|
||||
m_Father: {fileID: 8222799376925158843}
|
||||
m_RootOrder: 0
|
||||
|
|
@ -4704,7 +4706,7 @@ RectTransform:
|
|||
- {fileID: 7649123732126306174}
|
||||
- {fileID: 3003337059200903738}
|
||||
m_Father: {fileID: 6761033141322721514}
|
||||
m_RootOrder: 3
|
||||
m_RootOrder: 4
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
|
|
@ -5281,6 +5283,80 @@ MonoBehaviour:
|
|||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
--- !u!1 &7323436642646587577
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 1330551847189561466}
|
||||
- component: {fileID: 808644607515923090}
|
||||
- component: {fileID: 6797801116631876921}
|
||||
m_Layer: 5
|
||||
m_Name: NameBG
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &1330551847189561466
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7323436642646587577}
|
||||
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: 5906423456385253720}
|
||||
m_RootOrder: 1
|
||||
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: -51.4}
|
||||
m_SizeDelta: {x: 120, y: 46.88}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &808644607515923090
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7323436642646587577}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &6797801116631876921
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7323436642646587577}
|
||||
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: 0
|
||||
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: fd5ff3c7d2db3214693ff66dcf9dc8af, 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 &7449751328265020950
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -5503,6 +5579,80 @@ MonoBehaviour:
|
|||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
--- !u!1 &7476052426075180818
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 7421050671015278551}
|
||||
- component: {fileID: 4007952233081672364}
|
||||
- component: {fileID: 2999370019364198735}
|
||||
m_Layer: 5
|
||||
m_Name: NameBG
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &7421050671015278551
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7476052426075180818}
|
||||
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: 6761033141322721514}
|
||||
m_RootOrder: 1
|
||||
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: -61.559998}
|
||||
m_SizeDelta: {x: 120, y: 46.88}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &4007952233081672364
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7476052426075180818}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &2999370019364198735
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7476052426075180818}
|
||||
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: 0
|
||||
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: fd5ff3c7d2db3214693ff66dcf9dc8af, 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 &7562258272849120841
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -5759,6 +5909,80 @@ CanvasRenderer:
|
|||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7729263943990716201}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!1 &7784339725304670382
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 6557353678973494664}
|
||||
- component: {fileID: 7906825514236514472}
|
||||
- component: {fileID: 7348531441228935163}
|
||||
m_Layer: 5
|
||||
m_Name: NameBG (1)
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &6557353678973494664
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7784339725304670382}
|
||||
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: 7438115198098257837}
|
||||
m_RootOrder: 0
|
||||
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: -65.9}
|
||||
m_SizeDelta: {x: 120, y: 46.88}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &7906825514236514472
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7784339725304670382}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &7348531441228935163
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7784339725304670382}
|
||||
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: 0
|
||||
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: fd5ff3c7d2db3214693ff66dcf9dc8af, 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 &7845940882236901331
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -5790,7 +6014,7 @@ RectTransform:
|
|||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 5906423456385253720}
|
||||
m_RootOrder: 1
|
||||
m_RootOrder: 2
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
|
|
@ -6228,6 +6452,7 @@ RectTransform:
|
|||
m_LocalScale: {x: 0.9, y: 0.9, z: 1}
|
||||
m_Children:
|
||||
- {fileID: 7012391571410172215}
|
||||
- {fileID: 1330551847189561466}
|
||||
- {fileID: 8654895496356684777}
|
||||
- {fileID: 8825993594717728265}
|
||||
- {fileID: 4514471613183217850}
|
||||
|
|
|
|||
|
|
@ -383,9 +383,9 @@ RectTransform:
|
|||
m_Father: {fileID: 2126607397}
|
||||
m_RootOrder: 0
|
||||
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: -45}
|
||||
m_AnchorMin: {x: 0.5, y: 0}
|
||||
m_AnchorMax: {x: 0.5, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: -189.99998}
|
||||
m_SizeDelta: {x: 160, y: 30}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &2019625880
|
||||
|
|
@ -423,7 +423,7 @@ MonoBehaviour:
|
|||
m_BestFit: 0
|
||||
m_MinSize: 1
|
||||
m_MaxSize: 40
|
||||
m_Alignment: 1
|
||||
m_Alignment: 7
|
||||
m_AlignByGeometry: 0
|
||||
m_RichText: 1
|
||||
m_HorizontalOverflow: 1
|
||||
|
|
@ -541,7 +541,7 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0}
|
||||
m_AnchorMax: {x: 0.5, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 210}
|
||||
m_AnchoredPosition: {x: 0, y: 232}
|
||||
m_SizeDelta: {x: 876.85, y: 42.3}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &2126607399
|
||||
|
|
@ -620,7 +620,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: -20, y: -819.5}
|
||||
m_AnchoredPosition: {x: -20, y: -678}
|
||||
m_SizeDelta: {x: 100, y: 100}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!1 &543350825205658828
|
||||
|
|
@ -658,7 +658,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.000061035156, y: -441.09998}
|
||||
m_AnchoredPosition: {x: 0.000061035156, y: -240.09996}
|
||||
m_SizeDelta: {x: 1080, y: 1920}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &4661807140253643804
|
||||
|
|
@ -1052,7 +1052,7 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 629.28906, y: 0}
|
||||
m_AnchoredPosition: {x: 644.72375, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 70}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &8552513486474370558
|
||||
|
|
@ -1563,7 +1563,7 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 441.38623, y: 0}
|
||||
m_AnchoredPosition: {x: 447.5146, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 70}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &282263520566598444
|
||||
|
|
@ -1734,7 +1734,7 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 213.11255, y: 0}
|
||||
m_AnchoredPosition: {x: 213.89354, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 55}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &8866466603871563102
|
||||
|
|
@ -1903,7 +1903,7 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 535.33765, y: 0}
|
||||
m_AnchoredPosition: {x: 546.11914, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 55}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &6023902533507475951
|
||||
|
|
@ -2002,7 +2002,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: 52, y: -764}
|
||||
m_AnchoredPosition: {x: 52, y: -596}
|
||||
m_SizeDelta: {x: 0, y: 100}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &2913722661133017400
|
||||
|
|
@ -2381,7 +2381,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.000061035156, y: -79}
|
||||
m_AnchoredPosition: {x: 0.000061035156, y: 122}
|
||||
m_SizeDelta: {x: 650.3, y: 66}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &96469336164634113
|
||||
|
|
@ -2518,9 +2518,9 @@ RectTransform:
|
|||
m_Father: {fileID: 2126607397}
|
||||
m_RootOrder: 1
|
||||
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: 24.4, y: -168}
|
||||
m_AnchorMin: {x: 0.5, y: 0}
|
||||
m_AnchorMax: {x: 0.5, y: 0}
|
||||
m_AnchoredPosition: {x: 24.4, y: -162}
|
||||
m_SizeDelta: {x: 596.6, y: 27.8}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &3235671649354845481
|
||||
|
|
@ -3350,7 +3350,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.000061035156, y: -236}
|
||||
m_AnchoredPosition: {x: 0.000061035156, y: -34.999985}
|
||||
m_SizeDelta: {x: 650.3, y: 66}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &4886159882422686491
|
||||
|
|
@ -14217,7 +14217,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: -436}
|
||||
m_AnchoredPosition: {x: 0, y: -234.99998}
|
||||
m_SizeDelta: {x: 1024, y: 512}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &8490762427589792647
|
||||
|
|
@ -14293,7 +14293,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: 5.8, y: -266.2}
|
||||
m_AnchoredPosition: {x: 5.8, y: -65.2}
|
||||
m_SizeDelta: {x: 861, y: 267}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &8490762427662662561
|
||||
|
|
@ -19445,7 +19445,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: 9.7962, y: -489}
|
||||
m_AnchoredPosition: {x: 9.7962, y: -288}
|
||||
m_SizeDelta: {x: 1700.9, y: 222.6}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &8490762427899490212
|
||||
|
|
@ -43926,7 +43926,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: 9, y: -625}
|
||||
m_AnchoredPosition: {x: 9, y: -424}
|
||||
m_SizeDelta: {x: 500, y: 105.4}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &8490762428965110853
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -290,9 +290,9 @@ function this.InitPackInfo()
|
|||
""
|
||||
local ChannelID = LoginRoot_UserChannel == "" and LoginRoot_Channel or LoginRoot_UserChannel
|
||||
local packId = PackageManager.GetPackageID()
|
||||
if packId then
|
||||
ChannelID = ChannelID .. packId
|
||||
end
|
||||
--if packId then
|
||||
--ChannelID = ChannelID .. packId
|
||||
--end
|
||||
HttpManager:SendGetHttp(LoginRoot_Url .. "jl_loginserver/getChannelInfo?ccId=" .. ChannelID, function(str)
|
||||
if str == "" or str == "null" or string.find(str, "html") then
|
||||
LogWarn("获取到的数据是空值,请检查!")
|
||||
|
|
|
|||
|
|
@ -85,6 +85,7 @@ function this:InitComponent()
|
|||
--this.logo.sprite = sp
|
||||
this.logo:SetNativeSize()
|
||||
end)
|
||||
this.logo.gameObject:SetActive(false)
|
||||
else
|
||||
this.logo.gameObject:SetActive(false)
|
||||
end
|
||||
|
|
@ -220,7 +221,7 @@ function this:BindEvent()
|
|||
OpenWeb("http://smi.648sy.com/about/share")
|
||||
end)
|
||||
Util.AddClick(this.btn_beian, function()
|
||||
OpenWeb("https://beian.miit.gov.cn/#/Integrated/index")
|
||||
OpenWeb("https://beian.miit.gov.cn")
|
||||
end)
|
||||
Util.AddClick(this.ConfirmBtn, function()
|
||||
local confirm = PlayerPrefs.GetInt("IHaveConfirmProtos")
|
||||
|
|
@ -462,7 +463,8 @@ function this.RequestProtos(userId)
|
|||
local ChannelID = LoginRoot_UserChannel == "" and LoginRoot_Channel or LoginRoot_UserChannel
|
||||
local PackageID = PackageManager.GetPackageID()
|
||||
if PackageID then
|
||||
ChannelID = ChannelID .. PackageID
|
||||
--ChannelID = ChannelID .. PackageID
|
||||
ChannelID = ChannelID .. "9999"
|
||||
end
|
||||
local url = LoginRoot_Url .. "jl_loginserver/getAgreement?gamePack=" .. ChannelID
|
||||
LogError("协议地址为==" .. url)
|
||||
|
|
@ -869,7 +871,7 @@ function this.RequestHttpLogin()
|
|||
local url = ""
|
||||
local user_channel = LoginRoot_UserChannel == "" and LoginRoot_Channel or LoginRoot_UserChannel
|
||||
local tokenStr = AppConst.TokenStr
|
||||
local Platform = 1
|
||||
local Platform = LoginManager.SdkSubChannel == "" and "1" or LoginManager.SdkSubChannel
|
||||
-- if user_channel~="pc" then
|
||||
-- local chanel= SDKMgr:GetChannel()
|
||||
-- if chanel and chanel=="Ohayoo" then
|
||||
|
|
|
|||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading…
Reference in New Issue