修改bug

(cherry picked from commit 171f830000eefc5202506a9a56a2b38bad5ecf57)

# Conflicts:
#	Assets/Scenes/testCombat.scene   resolved by master version
#	Assets/Scripts/GameLogic/Bag/BagController.cs
#	Assets/Scripts/GameLogic/Player/AccountFileInfo.cs
#	Assets/Scripts/GameLogic/SDK/CloudSaveManager.cs   resolved by master version
#	Assets/Scripts/GameLogic/SDK/TakuSDKManager.cs   resolved by master version
#	Assets/Scripts/GameLogic/SDK/TapSDKManager.cs   resolved by master version
#	Assets/Scripts/GameUI/GameApplction.cs
#	Assets/StreamingAssets/assetConfig.txt   resolved by master version
#	ProjectSettings/ProjectSettings.asset   resolved by master version
#	UserSettings/Layouts/default-2022.dwlt   resolved by master version
#	XiuXianGame_Taptap.sln.DotSettings.user   resolved by master version

Assets/Res/UI/Canvas/Canvas.prefab

@@ -262,7 +262,7 @@ MonoBehaviour:
   m_ScaleFactor: 1
   m_ReferenceResolution: {x: 750, y: 1624}
   m_ScreenMatchMode: 0
-  m_MatchWidthOrHeight: 0
+  m_MatchWidthOrHeight: 1
   m_PhysicalUnit: 3
   m_FallbackScreenDPI: 96
   m_DefaultSpriteDPI: 96
@@ -427,7 +427,7 @@ MonoBehaviour:
   m_RenderShadows: 0
   m_RequiresDepthTextureOption: 0
   m_RequiresOpaqueTextureOption: 2
-  m_CameraType: 1
+  m_CameraType: 0
   m_Cameras: []
   m_RendererIndex: -1
   m_VolumeLayerMask:

Assets/Res/UI/LoginMainPanel.prefab

@@ -1,5 +1,139 @@
 %YAML 1.1
 %TAG !u! tag:yousandi.cn,2023:
+--- !u!1 &4486599056176389083
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 4081330743179339612}
+  - component: {fileID: 4946186619170166794}
+  - component: {fileID: 724498571649078918}
+  - component: {fileID: 2611010534754045306}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Btn_SettingPanel
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &4081330743179339612
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4486599056176389083}
+  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_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 8311278189826985699}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 1, y: 0}
+  m_AnchorMax: {x: 1, y: 0}
+  m_AnchoredPosition: {x: -29, y: 98}
+  m_SizeDelta: {x: 60, y: 45}
+  m_Pivot: {x: 1, y: 0}
+--- !u!222 &4946186619170166794
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4486599056176389083}
+  m_CullTransparentMesh: 1
+--- !u!114 &724498571649078918
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4486599056176389083}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: dec_xuanxiang
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
+  packInfo:
+    packName: tongyong
+    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
+    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
+    lasetJsonGUID: 9c62e511fc97bc019d716bfc92e68086
+  imageH: 100
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
+--- !u!114 &2611010534754045306
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4486599056176389083}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_WrapAround: 0
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 1
+  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_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, 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_SelectedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_SelectedTrigger: Selected
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 724498571649078918}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
 --- !u!1 &4993911372966654358
 GameObject:
   m_ObjectHideFlags: 0
@@ -35,8 +169,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: 5, y: -216}
-  m_SizeDelta: {x: 1440, y: 2560}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 1008.9492, y: 1793.6875}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5060074385960820424
 CanvasRenderer:
@@ -98,6 +232,7 @@ GameObject:
   serializedVersion: 7
   m_Component:
   - component: {fileID: 8311278189826985699}
+  - component: {fileID: 8171916528849988951}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: LoginMainPanel
@@ -120,6 +255,7 @@ RectTransform:
   m_Children:
   - {fileID: 1669281409109345828}
   - {fileID: 3062357519343784547}
+  - {fileID: 4081330743179339612}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
@@ -127,6 +263,25 @@ RectTransform:
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 750, y: 1624}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &8171916528849988951
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5484466371172864172}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4810a0857c909354fa00c3aafdeac753, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  data:
+  - key: Btn_SettingPanel
+    gameObject: {fileID: 2611010534754045306}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  isAssetBundle: 1
 --- !u!1 &6256583385672431352
 GameObject:
   m_ObjectHideFlags: 0
@@ -162,7 +317,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 1}
   m_AnchorMax: {x: 0.5, y: 1}
-  m_AnchoredPosition: {x: 0, y: -29}
+  m_AnchoredPosition: {x: 5, y: -61}
   m_SizeDelta: {x: 497, y: 313}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!222 &2011940515455338190

Assets/Res/UI/LoginPanel.prefab

@@ -1,94 +1,5 @@
 %YAML 1.1
 %TAG !u! tag:yousandi.cn,2023:
---- !u!1 &4993911372966654358
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 1669281409109345828}
-  - component: {fileID: 5060074385960820424}
-  - component: {fileID: 8936581939649475887}
-  m_Layer: 0
-  m_HasEditorInfo: 1
-  m_Name: myImage
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &1669281409109345828
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4993911372966654358}
-  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_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 8311278189826985699}
-  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: 0}
-  m_SizeDelta: {x: 1440, y: 2560}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &5060074385960820424
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4993911372966654358}
-  m_CullTransparentMesh: 1
---- !u!114 &8936581939649475887
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4993911372966654358}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 1
-  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: a7151090b5e39ea43b49260b8b1677d0, 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
-  m_PixelsPerUnitMultiplier: 1
-  _icon_name: 
-  isNotLoadDeftIcon: 1
-  CurrSpriteAtlas: {fileID: 0}
-  packInfo:
-    packName: 
-    packgJsonPath: 
-    packgSpritePath: 
-    lasetJsonGUID: 
-  imageH: 100
-  useGradient: 0
-  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
-  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
-  direction: 0
 --- !u!1 &5484466371172864172
 GameObject:
   m_ObjectHideFlags: 0
@@ -98,6 +9,7 @@ GameObject:
   serializedVersion: 7
   m_Component:
   - component: {fileID: 8311278189826985699}
+  - component: {fileID: 6015648164429520880}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: LoginPanel
@@ -117,9 +29,7 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
-  m_Children:
-  - {fileID: 1669281409109345828}
-  - {fileID: 3062357519343784547}
+  m_Children: []
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
@@ -127,92 +37,17 @@ RectTransform:
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 750, y: 1624}
   m_Pivot: {x: 0.5, y: 0.5}
---- !u!1 &6256583385672431352
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 3062357519343784547}
-  - component: {fileID: 2011940515455338190}
-  - component: {fileID: 7145450703204254466}
-  m_Layer: 0
-  m_HasEditorInfo: 1
-  m_Name: myImage (1)
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &3062357519343784547
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6256583385672431352}
-  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_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 8311278189826985699}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 1}
-  m_AnchorMax: {x: 0.5, y: 1}
-  m_AnchoredPosition: {x: 0, y: -29}
-  m_SizeDelta: {x: 497, y: 313}
-  m_Pivot: {x: 0.5, y: 1}
---- !u!222 &2011940515455338190
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6256583385672431352}
-  m_CullTransparentMesh: 1
---- !u!114 &7145450703204254466
+--- !u!114 &6015648164429520880
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6256583385672431352}
+  m_GameObject: {fileID: 5484466371172864172}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Script: {fileID: 11500000, guid: 4810a0857c909354fa00c3aafdeac753, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 1
-  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: c445c0199876d6c4f954649a5f0863a3, 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
-  m_PixelsPerUnitMultiplier: 1
-  _icon_name: 
-  isNotLoadDeftIcon: 1
-  CurrSpriteAtlas: {fileID: 0}
-  packInfo:
-    packName: 
-    packgJsonPath: 
-    packgSpritePath: 
-    lasetJsonGUID: 
-  imageH: 100
-  useGradient: 0
-  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
-  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
-  direction: 0
+  data: []
+  isAssetBundle: 1

Assets/Res/UI/SettingPanel/SettingPanel.prefab

@@ -30,8 +30,14 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 4703102438106375782}
+  m_Children:
+  - {fileID: 3335154821151865286}
+  - {fileID: 2829838969233991924}
+  - {fileID: 7755063153901822474}
+  - {fileID: 105685565816049142}
+  - {fileID: 1649823919967249636}
+  - {fileID: 8913697450959205694}
+  m_Father: {fileID: 9037135992368401232}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -121,11 +127,11 @@ RectTransform:
   m_Children:
   - {fileID: 4465562703701704461}
   - {fileID: 2992885620383388598}
-  m_Father: {fileID: 4703102438106375782}
+  m_Father: {fileID: 4160643369365326472}
   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: 164.3}
+  m_AnchoredPosition: {x: 0, y: 256.13312}
   m_SizeDelta: {x: 476.71, y: 100}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &3505351788308317489
@@ -184,7 +190,6 @@ GameObject:
   - component: {fileID: 4933128729536331500}
   - component: {fileID: 2324201114895334489}
   - component: {fileID: 3892912416871182358}
-  - component: {fileID: 4702113793143319526}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: txt
@@ -269,19 +274,6 @@ MonoBehaviour:
   m_EffectColor: {r: 0.41960785, g: 0.31764707, b: 0.16862746, a: 1}
   m_EffectDistance: {x: 1.4, y: 1.4}
   m_UseGraphicAlpha: 1
---- !u!114 &4702113793143319526
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2992072252845435866}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  id: 10809
 --- !u!1 &3069451813354621096
 GameObject:
   m_ObjectHideFlags: 0
@@ -315,11 +307,11 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 2794589414433100854}
-  m_Father: {fileID: 4703102438106375782}
+  m_Father: {fileID: 4160643369365326472}
   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: -267}
+  m_AnchoredPosition: {x: 0, y: 250.93182}
   m_SizeDelta: {x: 315.7455, y: 100}
   m_Pivot: {x: 0.5, y: 0}
 --- !u!222 &4241911780120012977
@@ -530,11 +522,11 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 1859887993827162509}
-  m_Father: {fileID: 4703102438106375782}
+  m_Father: {fileID: 4160643369365326472}
   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: -400}
+  m_AnchoredPosition: {x: 0, y: 117.93182}
   m_SizeDelta: {x: 315.7455, y: 100}
   m_Pivot: {x: 0.5, y: 0}
 --- !u!222 &2754880386697749742
@@ -834,11 +826,11 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 4703102438106375782}
+  m_Father: {fileID: 4160643369365326472}
   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: -7.4744, y: 276}
+  m_AnchoredPosition: {x: -7.4744, y: 367.83313}
   m_SizeDelta: {x: 450.8513, y: 50.4935}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1336933346209753520
@@ -947,8 +939,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0.5}
   m_AnchorMax: {x: 0, y: 0.5}
-  m_AnchoredPosition: {x: 261.5, y: 0}
-  m_SizeDelta: {x: 286.7485, y: 100}
+  m_AnchoredPosition: {x: 122.89, y: 0}
+  m_SizeDelta: {x: 344.1171, y: 100}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &292930128566588381
 CanvasRenderer:
@@ -971,7 +963,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_Color: {r: 0, g: 0, b: 0, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 1, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -981,11 +973,11 @@ MonoBehaviour:
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
     m_FontSize: 48
-    m_FontStyle: 1
+    m_FontStyle: 0
     m_BestFit: 1
     m_MinSize: 4
     m_MaxSize: 48
-    m_Alignment: 3
+    m_Alignment: 5
     m_AlignByGeometry: 0
     m_RichText: 1
     m_HorizontalOverflow: 0
@@ -1038,7 +1030,7 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 2354120935780841372}
-  - {fileID: 4703102438106375782}
+  - {fileID: 4160643369365326472}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
@@ -1105,163 +1097,13 @@ MonoBehaviour:
     isList: 0
     ListCollectorDatas: []
   isAssetBundle: 0
---- !u!1 &9217173751443165169
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 4703102438106375782}
-  - component: {fileID: 7284275627011986882}
-  - component: {fileID: 3279608994731833665}
-  m_Layer: 0
-  m_HasEditorInfo: 1
-  m_Name: kz
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &4703102438106375782
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 9217173751443165169}
-  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_ConstrainProportionsScale: 0
-  m_Children:
-  - {fileID: 4160643369365326472}
-  - {fileID: 3335154821151865286}
-  - {fileID: 2829838969233991924}
-  - {fileID: 7755063153901822474}
-  - {fileID: 105685565816049142}
-  - {fileID: 1649823919967249636}
-  - {fileID: 8913697450959205694}
-  m_Father: {fileID: 9037135992368401232}
-  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: 0}
-  m_SizeDelta: {x: 0, y: 0}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!114 &7284275627011986882
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 9217173751443165169}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 6a23dadfaa104ddf929b8c98dd02623c, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  maxDuration: 0.15
-  isUpdate: 0
-  currTime: 0.15348649
-  GrpupInfos:
-  - Foldout: 1
-    isActive: 1
-    animName: show
-    isLoop: 0
-    allTargets:
-    - {fileID: 9217173751443165169}
-    - {fileID: 9217173751443165169}
-    TweenAssetInfo: {fileID: 11400000, guid: 96c6b714e3d902942b0ceb19d51a1f4f, type: 2}
-    TargetFoldout: 1
-    maxDuration: 0.15
-    isUpdate: 1
-    currTime: 0
-  MinMaxGradient:
-    m_Mode: 0
-    m_GradientMin:
-      serializedVersion: 2
-      key0: {r: 1, g: 1, b: 1, a: 1}
-      key1: {r: 1, g: 1, b: 1, a: 1}
-      key2: {r: 0, g: 0, b: 0, a: 0}
-      key3: {r: 0, g: 0, b: 0, a: 0}
-      key4: {r: 0, g: 0, b: 0, a: 0}
-      key5: {r: 0, g: 0, b: 0, a: 0}
-      key6: {r: 0, g: 0, b: 0, a: 0}
-      key7: {r: 0, g: 0, b: 0, a: 0}
-      ctime0: 0
-      ctime1: 65535
-      ctime2: 0
-      ctime3: 0
-      ctime4: 0
-      ctime5: 0
-      ctime6: 0
-      ctime7: 0
-      atime0: 0
-      atime1: 65535
-      atime2: 0
-      atime3: 0
-      atime4: 0
-      atime5: 0
-      atime6: 0
-      atime7: 0
-      m_Mode: 0
-      m_ColorSpace: -1
-      m_NumColorKeys: 2
-      m_NumAlphaKeys: 2
-    m_GradientMax:
-      serializedVersion: 2
-      key0: {r: 1, g: 1, b: 1, a: 1}
-      key1: {r: 1, g: 1, b: 1, a: 1}
-      key2: {r: 0, g: 0, b: 0, a: 0}
-      key3: {r: 0, g: 0, b: 0, a: 0}
-      key4: {r: 0, g: 0, b: 0, a: 0}
-      key5: {r: 0, g: 0, b: 0, a: 0}
-      key6: {r: 0, g: 0, b: 0, a: 0}
-      key7: {r: 0, g: 0, b: 0, a: 0}
-      ctime0: 0
-      ctime1: 65535
-      ctime2: 0
-      ctime3: 0
-      ctime4: 0
-      ctime5: 0
-      ctime6: 0
-      ctime7: 0
-      atime0: 0
-      atime1: 65535
-      atime2: 0
-      atime3: 0
-      atime4: 0
-      atime5: 0
-      atime6: 0
-      atime7: 0
-      m_Mode: 0
-      m_ColorSpace: -1
-      m_NumColorKeys: 2
-      m_NumAlphaKeys: 2
-    m_ColorMin: {r: 0, g: 0, b: 0, a: 0}
-    m_ColorMax: {r: 0, g: 0, b: 0, a: 0}
-  isLoop: 0
---- !u!225 &3279608994731833665
-CanvasGroup:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 9217173751443165169}
-  m_Enabled: 1
-  m_Alpha: 1
-  m_Interactable: 1
-  m_BlocksRaycasts: 1
-  m_IgnoreParentGroups: 0
 --- !u!1001 &1888838191946430018
 PrefabInstance:
   m_ObjectHideFlags: 0
   serializedVersion: 2
   m_Modification:
     serializedVersion: 3
-    m_TransformParent: {fileID: 4703102438106375782}
+    m_TransformParent: {fileID: 4160643369365326472}
     m_Modifications:
     - target: {fileID: 3308491540371593500, guid: 26fedd89aec1dbe4ebd42196b3982338, type: 3}
       propertyPath: m_IsActive
@@ -1337,7 +1179,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8190082389412779080, guid: 26fedd89aec1dbe4ebd42196b3982338, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 77
+      value: 168.83313
       objectReference: {fileID: 0}
     - target: {fileID: 8190082389412779080, guid: 26fedd89aec1dbe4ebd42196b3982338, type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
@@ -1414,7 +1256,7 @@ PrefabInstance:
   serializedVersion: 2
   m_Modification:
     serializedVersion: 3
-    m_TransformParent: {fileID: 4703102438106375782}
+    m_TransformParent: {fileID: 4160643369365326472}
     m_Modifications:
     - target: {fileID: 3308491540371593500, guid: 26fedd89aec1dbe4ebd42196b3982338, type: 3}
       propertyPath: m_IsActive
@@ -1490,7 +1332,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8190082389412779080, guid: 26fedd89aec1dbe4ebd42196b3982338, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -57.19999
+      value: 34.63308
       objectReference: {fileID: 0}
     - target: {fileID: 8190082389412779080, guid: 26fedd89aec1dbe4ebd42196b3982338, type: 3}
       propertyPath: m_LocalEulerAnglesHint.x

Assets/Res/UI/SettingPanel/UploadLogPanel.prefab

@@ -587,7 +587,6 @@ GameObject:
   - component: {fileID: 1336933346209753520}
   - component: {fileID: 7915566129711929088}
   - component: {fileID: 1950754695086212799}
-  - component: {fileID: 6806393073505273313}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text_Title
@@ -672,19 +671,6 @@ MonoBehaviour:
   m_EffectColor: {r: 0.4198112, g: 0.31755278, b: 0.17030072, a: 1}
   m_EffectDistance: {x: 1, y: -1}
   m_UseGraphicAlpha: 1
---- !u!114 &6806393073505273313
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6791344915447867474}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  id: 10807
 --- !u!1 &7525949078730949717
 GameObject:
   m_ObjectHideFlags: 0

Assets/Scripts/Core/Utility/Helper/TimeHelper.cs

@@ -140,9 +140,9 @@ namespace Fort23.Core
             return GetSafeNowMs() + (8 * 60 * 60 * 1000); // 东八区
         }
 
-        public static long ClientNowSeconds()
+        public static int ClientNowSeconds()
         {
-            return ClientNow() / 1000;
+            return (int)(ClientNow() / 1000);
         }
 
         public static DateTime DateTimeNow()

Assets/Scripts/GameLogic/Bag/BagController.cs

@@ -245,7 +245,8 @@ namespace GameLogic.Bag
             else if (item.config.itemTag == 28)
             {
                 EventManager.Instance.Dispatch(CustomEventType.AddEvent,
-                    new DefaultEventData(){eventData = item.config.associateVlaue[0]});
+                    new DefaultEventData() { eventData = (int)count });
+
                 return true;
             }
 

Assets/Scripts/GameLogic/Player/AccountFileInfo.cs

@@ -649,6 +649,7 @@ public class AccountFileInfo : Singleton<AccountFileInfo>
         RestoreIndexMap();
     }
 
+
     public void SavePlayerData(bool clean = false)
     {
         if (clean)
@@ -656,6 +657,20 @@ public class AccountFileInfo : Singleton<AccountFileInfo>
             CleanEmptyData();
         }
 
+
+        // if (lasetSaveLocalTime == 0)
+        // {
+        //     lasetSaveLocalTime = System.DateTime.Now.Ticks;
+        // }
+
+        long currTime = System.DateTime.Now.Ticks;
+        // if (currTime - lasetSaveLocalTime < 100000000 && hasFocus)
+        // {
+        //     return;
+        // }
+        //
+        // lasetSaveLocalTime = currTime;
+
         if (!string.IsNullOrEmpty(persistentDataPath))
         {
             string playerSettingJson = JsonManager.ToJson(playerData);
@@ -663,8 +678,8 @@ public class AccountFileInfo : Singleton<AccountFileInfo>
             WXFileSystemManager wxFileSystemManager = WX.GetFileSystemManager();
             wxFileSystemManager.WriteFileSync(persistentDataPath, playerSettingJson, "utf8");
 #else
+
             File.WriteAllText(persistentDataPath, playerSettingJson);
-#endif
         }
     }
 

Assets/Scripts/GameLogic/Player/PlayerData.cs

@@ -1,12 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-
-/// <summary>
-/// 玩家数据管理
-/// </summary>
-public class PlayerData : MonoBehaviour
-{
-    public int playerLevel = 1;
-    public int playerExp = 0;
-}

Assets/Scripts/GameUI/GameApplction.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.IO;
 using System.Text;
 using Core.AssetLoadTool.Asset;
@@ -55,28 +56,22 @@ public class GameApplction : IGameStart, ILogSend
     public async void StartGame(LoadType LoadType, string h5Url, GameStartUIPanel gameStartUIPanel,
         System.Action LoadFinish)
     {
+        Debug.Log("开始游戏逻辑");
         HotSyncContent.DownloadUI = gameStartUIPanel;
         this.LoadFinish = LoadFinish;
         gameApplction = this;
         Debug.Log("开始游戏逻辑");
         LogTool.LogSend = this;
         Crasheye.SendScriptException("测试错误", "测试错误", "ZH");
-        // UnityEngine.Screen.SetResolution(Screen.width);
-        // GameUpdateAsset.Instance.Init(h5Url);
         Crasheye.SetRegisterLogFunction(UnityLogic);
         this.gameStartUIPanel = gameStartUIPanel;
         gameStartUIPanel.ShowMassge("开始加载资源");
         gameStartUIPanel.SetSlider(0);
-        this.h5Url = h5Url;
         BundleLoadType = (BundleLoadType)LoadType;
         GameObject gameObject = new GameObject("app");
         gameObject.AddComponent<GameApplctionMono>();
         GameAssetUpdatePanel gameAssetUpdatePanel = new GameAssetUpdatePanel();
         gameAssetUpdatePanel.StartUpdateAsset(AssetUpdateFinish);
-        // await InitGameApplication();
-
-
-        Debug.Log("初始化完成");
     }
 
 
@@ -84,7 +79,11 @@ public class GameApplction : IGameStart, ILogSend
     {
         Debug.Log("finish AssetUpdateFinish");
         await InitGameApplication();
+        await LoginMainPanel.OpenPanel();
         LoadFinish?.Invoke();
+        UIManager.Instance.Canvas.gameObject.SetActive(true);
+        await Login();
+        // DBManager.Instance.SetUserID(AccountFileInfo.Instance.playerData.playerId);
         Debug.Log("初始化完成");
     }
 
@@ -140,29 +139,30 @@ public class GameApplction : IGameStart, ILogSend
 
         await UIManager.Instance.InitUI();
         CustomTweenManager.Init();
-
         RedDotManager.Instance.Init();
-
-        await Login();
+        
     }
 
     private async CTask Login()
     {
-#if TapTap
-           await LoginPanel.OpenPanel();
+        
+#if UNITY_ANDROID && Taptap
+        //登录
+        CTask<bool> callback = CTask<bool>.Create();
+        LoginPanel.OpenPanel(callback);
+        await callback;
+#else
+        AccountFileInfo.Instance.LoadPlayerData();
 #endif
 
         await TimeHelper.InitNetworkTime();
+        Dictionary<string, object> dict = new Dictionary<string, object>();
+        DBManager.Instance.CustomEvent("StartGame", dict);
 
-        DBManager.Instance.CustomEvent("StartGame", null);
 
         EventManager.Instance.RemoveEventListener(CustomEventType.DialoguePanelOpen, DialoguePanelOpenEvent);
         EventManager.Instance.AddEventListener(CustomEventType.DialoguePanelOpen, DialoguePanelOpenEvent);
-        UIManager.Instance.Canvas.gameObject.SetActive(true);
-        if (PlayerGuideManager.Instance.GuideIsCanDo(1))
-        {
-            await MarskPanel.OpenPanel(255);
-        }
+
 
         PlayerManager.Instance.Init();
         ShopManger.Instance.CustomInit();
@@ -241,18 +241,18 @@ public class GameApplction : IGameStart, ILogSend
 
         gameStartUIPanel.ShowMassge("loadFinish");
         gameStartUIPanel.SetSlider(1f);
+        LoginMainPanel.ClsoePanel();
 
         XinShouCombat();
     }
 
     private void DialoguePanelOpenEvent(IEventData e)
     {
-        MarskPanel.ClosePanel();
+        LoginMainPanel.ClsoePanel();
     }
 
     public async void XinShouCombat()
     {
-        // MarskPanel.ClosePanel();
         if (PlayerGuideManager.Instance.GuideIsCanDo(1))
         {
             AccountFileInfo.EventList eventList2 = EventSystemManager.Instance.AddEvent(9999);
@@ -285,7 +285,7 @@ public class GameApplction : IGameStart, ILogSend
         }
         else
         {
-            MarskPanel.ClosePanel();
+            LoginMainPanel.ClsoePanel();
         }
     }
 

Assets/Scripts/GameUI/UI/LoginPanel/LoginMainPanel.cs

@@ -2,35 +2,40 @@ using Fort23.Core;
 
 namespace Fort23.Mono
 {
-	[UIBinding(prefab = "LoginMainPanel"  )]
-	public partial class LoginMainPanel : UIPanel
-	{
-		private void Init()
-		{
+    [UIBinding(prefab = "LoginMainPanel")]
+    public partial class LoginMainPanel : UIPanel
+    {
+        private void Init()
+        {
+        }
 
-		}
-		protected override void AddEvent()
-		{
+        protected override void AddEvent()
+        {
+        }
 
-		}
-		protected override void DelEvent()
-		{
+        protected override void DelEvent()
+        {
+        }
 
-		}
-		public override void AddButtonEvent()
-		{
+        public override void AddButtonEvent()
+        {
+            Btn_SettingPanel.onClick.AddListener(() => { UploadLogPanel.OpenPanel(); });
+        }
 
-		}
-		
-		public async static CTask OpenPanel()
-		{
-			await UIManager.Instance.LoadAndOpenPanel<LoginMainPanel>(null);
-		}
+        public async static CTask OpenPanel()
+        {
+            await UIManager.Instance.LoadAndOpenPanel<LoginMainPanel>(null, UILayer.Loading);
+        }
 
-		public static void ClsoePanel()
-		{
-			UIManager.Instance.HideUIUIPanel<LoginMainPanel>();
-		}
+        public static void ClsoePanel()
+        {
+            UIManager.Instance.HideUIUIPanel<LoginMainPanel>();
+        }
 
-	}
-}
+        public override CTask Close()
+        {
+            UIManager.Instance.HideUIUIPanel<UploadLogPanel>();
+            return base.Close();
+        }
+    }
+}

Assets/Scripts/GameUI/UI/LoginPanel/LoginMainPanelData.cs

@@ -0,0 +1,29 @@
+using Fort23.Core;
+using Fort23.UTool;
+using UnityEngine.UI;
+using UnityEngine;
+using System.Collections.Generic;
+namespace Fort23.Mono
+{
+	public partial class LoginMainPanel 
+	{
+	  #region 自定义数据 
+	  private Button _Btn_SettingPanel;
+	  public Button Btn_SettingPanel
+	   {
+	   get{
+	      if (_Btn_SettingPanel == null)
+	       {
+	         _Btn_SettingPanel  = GetUIUnit<Button>("Btn_SettingPanel"); 
+	       }
+	      return _Btn_SettingPanel;
+	     }
+	   }
+	  #endregion 自定义数据结束 
+	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
+	{
+	 await base.SetUIGameObject(gObjectPoolInterface);
+	 Init();
+	}
+	}
+}

Assets/Scripts/GameUI/UI/LoginPanel/LoginMainPanelData.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: Cywd4yioWninrc8MLCdYH8LhiYJd0EaPKeNZJCZ39bUy+S4vaTFtsd969CZ1
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/GameUI/UI/LoginPanel/LoginPanel.cs

@@ -2,6 +2,7 @@ using System.Collections.Generic;
 using Fort23.Core;
 using Fort23.UTool;
 using GameLogic.NetworkClient;
+using GameMono;
 using NetCore.Protocol.MemoryPack;
 using Protocol.Protocol.MemoryPack.MemoryMessage;
 using UnityEngine;
@@ -17,22 +18,28 @@ namespace Fort23.Mono
 
         protected override void AddEvent()
         {
+         
         }
 
         protected override void DelEvent()
         {
         }
 
-        public async static CTask<bool> OpenPanel()
+        public async static CTask OpenPanel(CTask<bool> callback)
         {
-            CTask<bool> callback = CTask<bool>.Create();
-            LoginPanel loginPanel = await UIManager.Instance.LoadAndOpenPanel<LoginPanel>(null, UILayer.Top);
+            LoginPanel loginPanel = await UIManager.Instance.LoadAndOpenPanel<LoginPanel>(null, UILayer.Loading);
             loginPanel.CustomInit(callback);
-            return await callback;
         }
 
-        private void CustomInit(CTask<bool> callback)
+        private async void CustomInit(CTask<bool> callback)
         {
+            await TapSDKManager.Instance.Login();
+            await CloudSaveManager.Instance.Custominit();
+            await CloudSaveManager.Instance.DelAll();
+            //获取玩家数据
+            await CloudSaveManager.Instance.LoadOrCreateArchiveAsync();
+            callback.SetResult(true);
+            UIManager.Instance.HideUIUIPanel(this);
         }
 
         public override void AddButtonEvent()

Assets/Scripts/GameUI/UI/LoginPanel/LoginPanelData.cs

@@ -0,0 +1,18 @@
+using Fort23.Core;
+using Fort23.UTool;
+using UnityEngine.UI;
+using UnityEngine;
+using System.Collections.Generic;
+namespace Fort23.Mono
+{
+	public partial class LoginPanel 
+	{
+	  #region 自定义数据 
+	  #endregion 自定义数据结束 
+	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
+	{
+	 await base.SetUIGameObject(gObjectPoolInterface);
+	 Init();
+	}
+	}
+}

Assets/Scripts/GameUI/UI/LoginPanel/LoginPanelData.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: Xn5OtC+sAHiNNKyKt8281d1xqLM6Iy4NOhmnt6tDHVhpN6qElgY/b6Of+tWm
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/GameUI/UI/SettingPanel/SettingPanel.cs

@@ -99,9 +99,9 @@ namespace Fort23.Mono
             });
         }
 
-        public async static CTask OpenPanel()
+        public async static CTask OpenPanel( UILayer layer = UILayer.Top)
         {
-            await UIManager.Instance.LoadAndOpenPanel<SettingPanel>(null, UILayer.Top, isShowBG: true);
+            await UIManager.Instance.LoadAndOpenPanel<SettingPanel>(null, layer, isShowBG: true);
         }
     }
 }

Assets/Scripts/GameUI/UI/SettingPanel/UploadLogPanel.cs

@@ -25,11 +25,11 @@ namespace Fort23.Mono
                 bool isOk = await FTPManager.Instance.UploadWithFTP();
                 if (isOk)
                 {
-                    TipMessagePanel.OpenTipMessagePanel("上传成功！");
+                    TipMessagePanel.OpenTipMessagePanel("上传成功！", layer: UILayer.Loading);
                 }
                 else
                 {
-                    TipMessagePanel.OpenTipMessagePanel("上传失败！");
+                    TipMessagePanel.OpenTipMessagePanel("上传失败！", layer:UILayer.Loading);
                 }
             });
         }
@@ -42,7 +42,7 @@ namespace Fort23.Mono
 
         public async static CTask OpenPanel()
         {
-            await UIManager.Instance.LoadAndOpenPanel<SettingPanel>(null, UILayer.Top, isShowBG: true);
+            await UIManager.Instance.LoadAndOpenPanel<UploadLogPanel>(null, UILayer.Loading, isShowBG: true);
         }
     }
 }

Assets/Scripts/GameUI/UI/TipMessagePanel/TipMessagePanel.cs

@@ -8,7 +8,7 @@ namespace Fort23.Mono
     [UIBinding(prefab = "TipMessagePanel")]
     public partial class TipMessagePanel : UIComponent
     {
-        public static async CTask<TipMessagePanel> OpenTipMessagePanel(string meg, Vector2 worldPos = default)
+        public static async CTask<TipMessagePanel> OpenTipMessagePanel(string meg, Vector2 worldPos = default,UILayer layer = UILayer.Top)
         {
             if (PlayerManager.Instance.serverTime - UIManager.Instance.ShowTextTime < 700)
             {
@@ -18,7 +18,7 @@ namespace Fort23.Mono
             UIManager.Instance.ShowTextTime = PlayerManager.Instance.serverTime;
             TipMessagePanel tipMessagePanel =
                 await UIManager.Instance.CreateGComponent<TipMessagePanel>(null,
-                    UIManager.Instance.GetLayer(UILayer.Top));
+                    UIManager.Instance.GetLayer(layer));
             tipMessagePanel.SetTipMessage(meg, worldPos);
             return tipMessagePanel;
         }