Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev

dev_chengFeng
yuanshuai 2022-07-18 16:11:55 +08:00
commit 4e1c0323fb
10 changed files with 614 additions and 92 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 180 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 112 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 160 KiB

View File

@ -35894,6 +35894,7 @@ GameObject:
- component: {fileID: 1481527223116321039}
- component: {fileID: 1481527223116321038}
- component: {fileID: 4591342464696123865}
- component: {fileID: 7808126542128160076}
m_Layer: 5
m_Name: tabsContent
m_TagString: Untagged
@ -35949,13 +35950,42 @@ MonoBehaviour:
m_Right: 0
m_Top: 0
m_Bottom: 0
m_ChildAlignment: 0
m_ChildAlignment: 4
m_StartCorner: 0
m_StartAxis: 0
m_CellSize: {x: 179, y: 100}
m_Spacing: {x: 5, y: 0}
m_Constraint: 0
m_ConstraintCount: 2
--- !u!114 &7808126542128160076
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1481527223116321136}
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: ff423d7f2dcdb204ca377c232a1144c1, 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 &1481527223208621136
GameObject:
m_ObjectHideFlags: 0

View File

@ -250,7 +250,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 75.20001, y: -295.2}
m_SizeDelta: {x: 356.12, y: 50}
m_SizeDelta: {x: 0, y: 50}
m_Pivot: {x: 0, y: 0.5}
--- !u!222 &1363644824
CanvasRenderer:
@ -377,6 +377,86 @@ MonoBehaviour:
m_LineSpacing: 1
m_Text: "\u4E2D\u6587"
LanguageIndex: 0
--- !u!1 &54928518589857218
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 3790582014197539165}
- component: {fileID: 2975182658249078811}
- component: {fileID: 3241522223800471490}
m_Layer: 5
m_Name: Text
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &3790582014197539165
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 54928518589857218}
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: 388023533648000268}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: -0.5}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2975182658249078811
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 54928518589857218}
m_CullTransparentMesh: 0
--- !u!114 &3241522223800471490
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 54928518589857218}
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.98823535, g: 0.909804, b: 0.77647066, 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: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
m_FontSize: 40
m_FontStyle: 0
m_BestFit: 1
m_MinSize: 30
m_MaxSize: 42
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: "\u6CE8\u9500\u8D26\u53F7"
LanguageIndex: 0
--- !u!1 &149030172425292457
GameObject:
m_ObjectHideFlags: 0
@ -920,7 +1000,7 @@ RectTransform:
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
@ -1546,10 +1626,10 @@ RectTransform:
m_Father: {fileID: 7918180147338563178}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 300.12, y: -25}
m_SizeDelta: {x: 342, y: 50}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8125554209045365674
CanvasRenderer:
@ -1712,7 +1792,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 75.20001, y: -369.00006}
m_SizeDelta: {x: 471.12, y: 50}
m_SizeDelta: {x: 0, y: 50}
m_Pivot: {x: 0, y: 0.5}
--- !u!222 &2987089090262414451
CanvasRenderer:
@ -3235,10 +3315,10 @@ RectTransform:
m_Father: {fileID: 3108939400385051967}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 66.5, y: -25}
m_SizeDelta: {x: 133, y: 50}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5596262344586851770
CanvasRenderer:
@ -4223,11 +4303,11 @@ RectTransform:
m_Children:
- {fileID: 3451281081214366336}
m_Father: {fileID: 2077706981486909814}
m_RootOrder: 1
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: 770, y: -90}
m_AnchoredPosition: {x: 310, y: -90}
m_SizeDelta: {x: 420, y: 90}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5553963892648162005
@ -4367,7 +4447,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
m_AnchoredPosition: {x: 37.7, y: -460.2}
m_SizeDelta: {x: 300, y: 2}
m_SizeDelta: {x: 0, y: 2}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5511845180508393253
CanvasRenderer:
@ -4935,10 +5015,10 @@ RectTransform:
m_Father: {fileID: 7918180147338563178}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 66.5, y: -25}
m_SizeDelta: {x: 133, y: 50}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8325260529644194972
CanvasRenderer:
@ -5592,10 +5672,10 @@ RectTransform:
m_Father: {fileID: 1363644822}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 100, y: -25}
m_SizeDelta: {x: 200, y: 50}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8648002110989727275
CanvasRenderer:
@ -5812,10 +5892,10 @@ RectTransform:
m_Father: {fileID: 3108939400385051967}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 214.62, y: -25}
m_SizeDelta: {x: 171, y: 50}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &685418134066581939
CanvasRenderer:
@ -6090,12 +6170,12 @@ RectTransform:
- {fileID: 3859439430310529040}
- {fileID: 7964369023937820060}
m_Father: {fileID: 2077706981486909814}
m_RootOrder: 4
m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 770, y: -90}
m_SizeDelta: {x: 420, y: 90}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8440280213579013307
CanvasRenderer:
@ -6333,8 +6413,8 @@ RectTransform:
m_Father: {fileID: 487119190421528606}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 2, y: -20}
m_Pivot: {x: 0.5, y: 0.5}
@ -6391,7 +6471,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!224 &7423535894473370959
RectTransform:
m_ObjectHideFlags: 0
@ -6827,12 +6907,12 @@ RectTransform:
- {fileID: 8922594842200410294}
- {fileID: 8613978124162266975}
m_Father: {fileID: 2077706981486909814}
m_RootOrder: 5
m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 310, y: -210}
m_SizeDelta: {x: 420, y: 90}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7031863245927049396
CanvasRenderer:
@ -7228,10 +7308,10 @@ RectTransform:
m_Father: {fileID: 7208282135257852769}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 120, y: 25}
m_SizeDelta: {x: 200, y: 50}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1496011867776578882
CanvasRenderer:
@ -8478,8 +8558,8 @@ RectTransform:
m_Father: {fileID: 1264010298304086847}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 1}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 35, y: 20}
m_Pivot: {x: 0.5, y: 0.5}
@ -9238,7 +9318,7 @@ RectTransform:
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0.5, y: 1}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
@ -10002,7 +10082,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: 566.07996, y: -0}
m_AnchoredPosition: {x: 566.07996, y: 0}
m_SizeDelta: {x: 475.8, y: 30}
m_Pivot: {x: 1, y: 1}
--- !u!222 &6354023907938239484
@ -10128,6 +10208,144 @@ MonoBehaviour:
m_LineSpacing: 1
m_Text: "\u9690\u79C1\u6761\u6B3E"
LanguageIndex: 0
--- !u!1 &5644005024328490972
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 5085271697276289239}
- component: {fileID: 4342740482737671006}
- component: {fileID: 222027743540196163}
- component: {fileID: 8591120837987777568}
- component: {fileID: 5723636169280890560}
m_Layer: 5
m_Name: BindAccount
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!224 &5085271697276289239
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5644005024328490972}
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:
- {fileID: 509567271642093631}
m_Father: {fileID: 2077706981486909814}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 310, y: -90}
m_SizeDelta: {x: 420, y: 90}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4342740482737671006
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5644005024328490972}
m_CullTransparentMesh: 0
--- !u!114 &222027743540196163
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5644005024328490972}
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: 5ed7ef07e3639904ebe859531605372c, type: 3}
m_Type: 1
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!114 &8591120837987777568
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5644005024328490972}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Navigation:
m_Mode: 3
m_SelectOnUp: {fileID: 0}
m_SelectOnDown: {fileID: 0}
m_SelectOnLeft: {fileID: 0}
m_SelectOnRight: {fileID: 0}
m_Transition: 3
m_Colors:
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
m_ColorMultiplier: 1
m_FadeDuration: 0.1
m_SpriteState:
m_HighlightedSprite: {fileID: 0}
m_PressedSprite: {fileID: 0}
m_DisabledSprite: {fileID: 0}
m_AnimationTriggers:
m_NormalTrigger: Normal
m_HighlightedTrigger: Highlighted
m_PressedTrigger: Pressed
m_DisabledTrigger: Disabled
m_Interactable: 1
m_TargetGraphic: {fileID: 222027743540196163}
m_OnClick:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
Culture=neutral, PublicKeyToken=null
--- !u!95 &5723636169280890560
Animator:
serializedVersion: 3
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5644005024328490972}
m_Enabled: 1
m_Avatar: {fileID: 0}
m_Controller: {fileID: 9100000, guid: 6ffe000b5a58aac48a9d130543849d76, type: 2}
m_CullingMode: 0
m_UpdateMode: 0
m_ApplyRootMotion: 0
m_LinearVelocityBlending: 0
m_WarningMessage:
m_HasTransformHierarchy: 1
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorControllerStateOnDisable: 0
--- !u!1 &5660646882954551335
GameObject:
m_ObjectHideFlags: 0
@ -10576,10 +10794,10 @@ RectTransform:
m_Father: {fileID: 7208282135257852769}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 260, y: 25}
m_SizeDelta: {x: 60, y: 60}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 60}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1921196671334142994
CanvasRenderer:
@ -11080,8 +11298,8 @@ RectTransform:
m_Father: {fileID: 5971151517739497893}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 1}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 35, y: 20}
m_Pivot: {x: 0.5, y: 0.5}
@ -11451,10 +11669,10 @@ RectTransform:
m_Father: {fileID: 6177706233782077277}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 60, y: -25}
m_SizeDelta: {x: 120, y: 50}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1218803080807232002
CanvasRenderer:
@ -12007,6 +12225,144 @@ MonoBehaviour:
m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5}
m_EffectDistance: {x: 1, y: -1}
m_UseGraphicAlpha: 1
--- !u!1 &6761275783891420557
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 388023533648000268}
- component: {fileID: 7907907109022668617}
- component: {fileID: 3975687345082111407}
- component: {fileID: 2033780891722486627}
- component: {fileID: 5094850262081364421}
m_Layer: 5
m_Name: CancelAccount
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!224 &388023533648000268
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6761275783891420557}
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:
- {fileID: 3790582014197539165}
m_Father: {fileID: 2077706981486909814}
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: 770, y: -90}
m_SizeDelta: {x: 420, y: 90}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7907907109022668617
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6761275783891420557}
m_CullTransparentMesh: 0
--- !u!114 &3975687345082111407
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6761275783891420557}
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: 5ed7ef07e3639904ebe859531605372c, type: 3}
m_Type: 1
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!114 &2033780891722486627
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6761275783891420557}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Navigation:
m_Mode: 3
m_SelectOnUp: {fileID: 0}
m_SelectOnDown: {fileID: 0}
m_SelectOnLeft: {fileID: 0}
m_SelectOnRight: {fileID: 0}
m_Transition: 3
m_Colors:
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
m_ColorMultiplier: 1
m_FadeDuration: 0.1
m_SpriteState:
m_HighlightedSprite: {fileID: 0}
m_PressedSprite: {fileID: 0}
m_DisabledSprite: {fileID: 0}
m_AnimationTriggers:
m_NormalTrigger: Normal
m_HighlightedTrigger: Highlighted
m_PressedTrigger: Pressed
m_DisabledTrigger: Disabled
m_Interactable: 1
m_TargetGraphic: {fileID: 3975687345082111407}
m_OnClick:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
Culture=neutral, PublicKeyToken=null
--- !u!95 &5094850262081364421
Animator:
serializedVersion: 3
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6761275783891420557}
m_Enabled: 1
m_Avatar: {fileID: 0}
m_Controller: {fileID: 9100000, guid: 6ffe000b5a58aac48a9d130543849d76, type: 2}
m_CullingMode: 0
m_UpdateMode: 0
m_ApplyRootMotion: 0
m_LinearVelocityBlending: 0
m_WarningMessage:
m_HasTransformHierarchy: 1
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorControllerStateOnDisable: 0
--- !u!1 &6820043412616059345
GameObject:
m_ObjectHideFlags: 0
@ -13219,7 +13575,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 676, y: -295.2}
m_SizeDelta: {x: 276.12, y: 50}
m_SizeDelta: {x: 0, y: 50}
m_Pivot: {x: 0, y: 0.5}
--- !u!222 &4595186048822524206
CanvasRenderer:
@ -14403,6 +14759,86 @@ MonoBehaviour:
m_TypeName: UnityEngine.UI.Toggle+ToggleEvent, UnityEngine.UI, Version=1.0.0.0,
Culture=neutral, PublicKeyToken=null
m_IsOn: 1
--- !u!1 &7838260385710276430
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 509567271642093631}
- component: {fileID: 231108346454027382}
- component: {fileID: 1893617053644319866}
m_Layer: 5
m_Name: Text
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &509567271642093631
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7838260385710276430}
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: 5085271697276289239}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: -0.5}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &231108346454027382
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7838260385710276430}
m_CullTransparentMesh: 0
--- !u!114 &1893617053644319866
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7838260385710276430}
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.98823535, g: 0.909804, b: 0.77647066, 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: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
m_FontSize: 40
m_FontStyle: 0
m_BestFit: 1
m_MinSize: 30
m_MaxSize: 42
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: "\u6E38\u5BA2\u7ED1\u5B9A"
LanguageIndex: 0
--- !u!1 &7891739003137624059
GameObject:
m_ObjectHideFlags: 0
@ -14436,11 +14872,11 @@ RectTransform:
m_Children:
- {fileID: 2981156652590807914}
m_Father: {fileID: 2077706981486909814}
m_RootOrder: 3
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 770, y: -210}
m_AnchoredPosition: {x: 770, y: -90}
m_SizeDelta: {x: 420, y: 90}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &484804807104045716
@ -14573,10 +15009,10 @@ RectTransform:
m_Father: {fileID: 6177706233782077277}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 196.12, y: -25}
m_SizeDelta: {x: 160, y: 50}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8165058738964680849
CanvasRenderer:
@ -14659,7 +15095,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 676, y: -369.00006}
m_SizeDelta: {x: 300.12, y: 50}
m_SizeDelta: {x: 0, y: 50}
m_Pivot: {x: 0, y: 0.5}
--- !u!222 &7315864861956468244
CanvasRenderer:
@ -14998,6 +15434,8 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 1172898592}
- {fileID: 5085271697276289239}
- {fileID: 388023533648000268}
- {fileID: 6323907669162332623}
- {fileID: 1042795630689291113}
- {fileID: 7403415200051497663}
@ -15831,7 +16269,7 @@ RectTransform:
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0.5, y: 1}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
@ -16205,12 +16643,12 @@ RectTransform:
m_Children:
- {fileID: 2636509398870528520}
m_Father: {fileID: 2077706981486909814}
m_RootOrder: 2
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: 310, y: -90}
m_SizeDelta: {x: 420, y: 90}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1028344318468334643
CanvasRenderer:
@ -16342,10 +16780,10 @@ RectTransform:
m_Father: {fileID: 1363644822}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 276.12, y: -25}
m_SizeDelta: {x: 160, y: 50}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8668985701043168789
CanvasRenderer:

View File

@ -31,7 +31,8 @@ SDKSubMitType = {
TYPE_ENTER_COPY = 6,
TYPE_EXIT_COPY = 7,
TYPE_VIP_LEVELUP = 8,
TYPE_CHANGE_NAME = 9
TYPE_CHANGE_NAME = 9,
TYPE_FENGTI_BIND_ACCOUNT = 10,
}
SDK_RESULT = {

View File

@ -90,11 +90,11 @@ function FirstRechargePanel:InitComponent()
self.rewardGrid = Util.GetGameObject(self.transform, "frame/rewardBg/rewardBg")
self.rewardGridPos = self.rewardGrid.transform.localPosition
self.itemWidth = self.rewardGrid:GetComponent("HorizontalLayoutGroup").spacing
self.preList={}
self.dayRewardList = {}
-- for i = 1, kMaxDay do
--
-- end
for i = 1, 4 do
table.insert(self.preList,Util.GetGameObject(self.transform, "frame/tabsContent/tabs_"..i))
end
--bottomPart
self.reChargeBtn = Util.GetGameObject(self.transform, "frame/rechargeBtn")
@ -183,7 +183,7 @@ function FirstRechargePanel:OnOpen(context,_fun)
self.ani.enabled = true
end, qyTime):Start()
Timer.New(function ()
self.tabs[1]:SetActive(true)
--self.tabs[1]:SetActive(true)
self.closeBtn:GetComponent("Button").enabled = true
end, qyTime + 1):Start()
end
@ -207,6 +207,7 @@ function FirstRechargePanel:OnShow()
table.insert(_MoneyDataNum[index], missInfo)
end
end
-- 判断数据
local minIndex
for index, dataList in pairs(_MoneyDataNum) do
@ -215,18 +216,30 @@ function FirstRechargePanel:OnShow()
table.sort(dataList,function(a,b)
return a.missionId < b.missionId
end)
-- 找到最小的
if not minIndex or index < minIndex then
minIndex = index
local isAll=true
for key, value in pairs(dataList) do
if value.state~=1 then
isAll=false
end
end
if isAll then
-- table.remove(_MoneyDataNum,index)
self.preList[index]:SetActive(false)
else
-- 找到最小的
if not minIndex or index < minIndex then
minIndex = index
end
end
end
end
-- 如果想看的不存在就显示最小的
if not _MoneyDataNum[self.selectTabIndex] or #_MoneyDataNum[self.selectTabIndex] <= 0 then
-- if not _MoneyDataNum[self.selectTabIndex] or #_MoneyDataNum[self.selectTabIndex] <= 0 then
self.selectTabIndex = minIndex
end
--end
self.reChargeTips.text = Language[10664]..string.format(MoneyUtil.GetMoneyUnitName(),AccumRecharge)--string.format(Language[10665], AccumRecharge)
self:OnTabChanged(self.selectTabIndex)
@ -307,7 +320,6 @@ end
function FirstRechargePanel:ShowContent(index)
local tempData = {}
for _, missionInfo in ipairs(_MoneyDataNum[index]) do
table.insert(tempData, activityRewardConfig[missionInfo.missionId])
end
@ -323,7 +335,6 @@ function FirstRechargePanel:ShowContent(index)
else
if not self.dayRewardList[i] then
--local go = newObjToParent(self.rewardDay,self.rewardGrid)
LogError("i==="..i)
local go=self.rewardGrid.transform:GetChild(i-1).gameObject
self.dayRewardList[i] = DayRewardItem.new(self,go)
end

View File

@ -280,6 +280,10 @@ end
--界面打开时调用(用于子类重写)
function this:OnOpen(...)
-- local url="http://82.157.34.193:9991/delivery/ohayooGetExternal"
-- local data="body;高级基金;notify_url;http://82.157.34.193:9991/delivery/OhayooCallback;open_id;32AtGSX36PYLuNbx;custom_callback_info;20001190_78_4001_IOS;order_no;200011901931657796390;product_id;78;sign_type;MD5;subject;高级基金;total_amount;12800;trade_time;1657796390;valid_time;2592000"
-- HttpManager:SendPostHttp(url,data, this.OnReceiveLogin, nil, nil, nil)
--设置背景
PackageManager.SetVideo(this.video, this.bg)
if AppConst.Code ~= "" then

View File

@ -12,7 +12,7 @@ function HttpManager:SendGetHttp(url, callback, _, _, failCB)
_Counter = _Counter + 1
local count = _Counter
LogWarn("Http请求" .. count.. ""..request)
if isCrypt then
if isCrypt and ServerConfigManager.GetVersionInfo("channel") == "MHT" then
local urlList = string.split(url, "?")
urlList[2] = HTTP_ENCRYPT(urlList[2], CRYPT_KEY)
request = urlList[1] .. "?crypt=" .. urlList[2]
@ -20,7 +20,7 @@ function HttpManager:SendGetHttp(url, callback, _, _, failCB)
end
networkMgr:SendGetHttp(request, function(msg)
LogWarn("Http请求" .. count.. "结果:"..msg)
if isCrypt then
if isCrypt and ServerConfigManager.GetVersionInfo("channel") == "MHT" then
msg = HTTP_DECRYPT(msg, CRYPT_KEY)
LogWarn("Http请求" .. count.. "结果解密:"..msg)
end
@ -30,4 +30,24 @@ function HttpManager:SendGetHttp(url, callback, _, _, failCB)
end, nil, nil, failCB)
end
-- post 请求
function HttpManager:SendPostHttp(url, data,callback, _, _, failCB)
local request = url
_Counter = _Counter + 1
local count = _Counter
LogWarn("Http请求" .. count.. ""..request)
LogError("chanel=="..ServerConfigManager.GetVersionInfo("channel"))
LogError("request=="..request)
networkMgr:SendHttpPost_Json_Lua(request,data,function(msg)
LogError("Http请求" .. count.. "结果:"..msg)
if callback then
callback(msg)
end
end,failCB)
end
return HttpManager

View File

@ -33,6 +33,8 @@ function SettingInfo:InitComponent(gameObject, rootPanel)
this.btnChangeLogin = Util.GetGameObject(gameObject, "setting/changelogin")
this.btnOneKeyCopy = Util.GetGameObject(gameObject, "setting/oneKeyCopy")
this.btnBind = Util.GetGameObject(gameObject, "other/box/BindAccount")
this.btnCancel = Util.GetGameObject(gameObject, "other/box/CancelAccount")
--兑换码
this.cdKey = Util.GetGameObject(gameObject, "other/box/cdkey")
this.submit = Util.GetGameObject(gameObject, "other/box/submit")
@ -59,6 +61,12 @@ function SettingInfo:InitComponent(gameObject, rootPanel)
this.selectResolution = Util.GetGameObject(gameObject,"other/box/selectResolution")
this.selectResolution:SetActive(false)
end
if AppConst.isSDKLogin and SDKMgr:GetSubChannel() and SDKMgr:GetSubChannel()=="Yes" then
this.btnBind:SetActive(true)
else
this.btnBind:SetActive(false)
end
end
function SettingInfo:SetTipShow()
@ -124,6 +132,16 @@ function SettingInfo:BindEvent()
--cdKey兑换
Util.AddClick(this.cdKey, function()
UIManager.OpenPanel(UIName.CDKeyExchangePanel)
end)
--游客绑定
Util.AddClick(this.btnBind, function()
if AppConst.isSDKLogin and SDKMgr:GetSubChannel() and SDKMgr:GetSubChannel()=="Yes" then
SubmitExtraData({type=SDKSubMitType.TYPE_FENGTI_BIND_ACCOUNT})
end
end)
--账号注销
Util.AddClick(this.btnCancel, function()
end)
-- --语言切换
-- Util.AddClick(this.languageBtn, function()