Merge remote-tracking branch 'remotes/origin/guodong' into zhaoyang

GameClient/Assets/Game/CSShare

@@ -1 +1 @@
-Subproject commit 610d9b26362dc4aa47a3f5eaf8dd39e918f9c696
+Subproject commit f51e6328d799724344d3e756b714b07b548b2e93

GameClient/Assets/Game/HotUpdate/Data/RoleDataManager.cs

@@ -80,7 +80,7 @@ namespace GFGGame
 
         public static bool CheckPowerFull()
         {
-            return GameGlobal.myNumericComponent.GetAsInt(NumericType.Power) >= GameConst.MAX_POWER_AUTO_REGAIN;
+            return GameGlobal.myNumericComponent.GetAsInt(NumericType.Power) >= GameGlobal.myNumericComponent.GetAsInt(NumericType.PowerLimit);
         }
 
         public static void InitServerData()

GameClient/Assets/Game/HotUpdate/ETView/Numeric/Event.meta → GameClient/Assets/Game/HotUpdate/ETCodes.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 9283fec05969fc74abdb5ccbfaa7a7d4
+guid: 8ba467b2d4c65654eb062ac058ce26d8
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

GameClient/Assets/Game/HotUpdate/ETView/Numeric.meta → GameClient/Assets/Game/HotUpdate/ETCodes/Hotfix.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 9cb45779ec6a31a4f9c1b07f29971482
+guid: 6ffaa1b273c44ad4bb6efbcb01727a4f
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

GameClient/Assets/Game/HotUpdate/ETCodes/Hotfix/App.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: d889b65602e27f0468a8785cb361b418
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

GameClient/Assets/Game/HotUpdate/ETCodes/Hotfix/App/DisConnected.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: fbec92628fa655e449a7e6bb48d572c6
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

GameClient/Assets/Game/HotUpdate/ETCodes/Hotfix/App/DisConnected/DisConnectedCompnentSystem.cs

@@ -0,0 +1,21 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using GFGGame;
+
+namespace ET
+{
+    public class DisConnectedCompnentDestroy : DestroySystem<DisConnectedCompnent>
+    {
+        public override void Destroy(DisConnectedCompnent self)
+        {
+            Alert.Show("服务器连接已断开！");
+        }
+    }
+
+    public static class DisConnectedCompnentSystem
+    {
+        
+    }
+}

GameClient/Assets/Game/HotUpdate/ETView/Numeric/Event/NumericWatcher_RefreshMainUI.cs.meta → GameClient/Assets/Game/HotUpdate/ETCodes/Hotfix/App/DisConnected/DisConnectedCompnentSystem.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 30c6d2be1b263354e800473724c87389
+guid: 976c06972b6201c4eac08ca910ccae42
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

GameClient/Assets/Game/HotUpdate/ETCodes/Hotfix/NewBehaviourScript.cs

@@ -0,0 +1,18 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class NewBehaviourScript : MonoBehaviour
+{
+    // Start is called before the first frame update
+    void Start()
+    {
+        
+    }
+
+    // Update is called once per frame
+    void Update()
+    {
+        
+    }
+}

GameClient/Assets/Game/HotUpdate/ETCodes/Hotfix/NewBehaviourScript.cs.meta

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

GameClient/Assets/Game/HotUpdate/ETCodes/Model.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: e6fe58a6de3a6a64483efdbf0db35a71
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

GameClient/Assets/Game/HotUpdate/ETCodes/Model/App.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: c269176a180e7364c865109cddfa1ba6
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

GameClient/Assets/Game/HotUpdate/ETCodes/Model/App/DisConnected.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 4b67c8bc06f265b47862b646a5b2e22d
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

GameClient/Assets/Game/HotUpdate/ETCodes/Model/App/DisConnected/DisConnectedCompnent.cs

@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ET
+{
+    public class DisConnectedCompnent : Entity, IAwake, IDestroy
+    {
+
+    }
+}

GameClient/Assets/Game/HotUpdate/ETCodes/Model/App/DisConnected/DisConnectedCompnent.cs.meta

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

GameClient/Assets/Game/HotUpdate/ETView/Numeric/Event/NumericWatcher_RefreshMainUI.cs

@@ -1,13 +0,0 @@
-using ET.EventType;
-
-namespace ET
-{
-    [NumericWatcher(NumericType.Lvl)]
-    public class NumericWatcher_RefreshMainUI : INumericWatcher
-    {
-        public void Run(NumbericChange args)
-        {
-            //args.Parent.ZoneScene().GetComponent<UIComponent>().GetDlgLogic<DlgMain>()?.Refresh();
-        }
-    }
-}

GameClient/Assets/Game/Launcher/GameLauncher.cs

@@ -9,6 +9,7 @@ public class GameLauncher : MonoBehaviour
 {
     private void Awake()
     {
+        Application.runInBackground = true;
         //ET
         System.AppDomain.CurrentDomain.UnhandledException += (sender, e) =>
         {