Merge branch 'master' of http://10.108.64.190:3000/gfg/client

GameClient/Assets/Editor/Excel/Template/FunctionGroup.txt

@@ -2,6 +2,7 @@
         private Dictionary<string, List<{CfgName}>> {cfgsGroupDicName} = new Dictionary<string, List<{CfgName}>>();
         public List<{CfgName}> {FunctionName}({params})
         {
+            {CfgArrayName}.Instance.Init();
             var colNames = new string[] { {colNames}};
             var colValues = new string[] { {colValues} };
             return ConfigUtil.GetCfgs<{CfgName}>("{CfgArrayName}", colNames, colValues, {cfgsGroupDicName});

GameClient/Assets/Editor/Excel/Template/FunctionSingle.txt

@@ -1,6 +1,7 @@
         private Dictionary<string, {CfgName}> {cfgsDicName} = new Dictionary<string, {CfgName}>();
         public {CfgName} {FunctionName}({params})
         { 
+            {CfgArrayName}.Instance.Init();
             var colNames = new string[] { {colNames}};
             var colValues = new string[] { {colValues} };
             return ConfigUtil.GetCfg<{CfgName}>("{CfgArrayName}", colNames, colValues, {cfgsDicName});

GameClient/Assets/Game/HotUpdate/Controller/GameController.cs

@@ -26,7 +26,7 @@ namespace GFGGame
             //获取游戏配置
             GetGameCfg();
             //预加载配置数据
-            InitSqliteData();
+            //InitSqliteData();
             // InitAllCfgsCache.Instance.InitAll();
         }
 

GameClient/Assets/Game/HotUpdate/Controller/GuideController.cs

@@ -65,7 +65,10 @@ namespace GFGGame
         private static GList targetList = null;
         public static bool TryGuide(GComponent target, string guideKey, int index, string guideStr = null, int listIndex = -1, bool checkPriorIndex = true, float yTxt = 0, bool justHint = false)
         {
-
+            if(!GameGlobal.DataInited)
+            {
+                return false;
+            }
             GuideCfg cfg = GuideCfgArray.Instance.GetCfg(guideKey);
             if (GuideDataManager.currentGuideId != 0 && GuideDataManager.currentGuideId != cfg.id) return false;
             GRoot.inst.touchable = false;

GameClient/Assets/Game/HotUpdate/Controller/LogController.cs

@@ -71,7 +71,9 @@ namespace GFGGame
                     // }
                     if (LauncherConfig.onDebug >= 0)
                     {
+#if !UNITY_EDITOR
                         ViewManager.Show(ViewName.LOG_VIEW);
+#endif
                     }
                     break;
                 default:

GameClient/Assets/Game/HotUpdate/Controller/LoginController.cs

@@ -257,6 +257,9 @@ namespace GFGGame
 
         public static async ETTask ReqReConnectGate()
         {
+#if UNITY_EDITOR
+            return;
+#endif
             ViewManager.Show<ModalStatusView>("重新连接中...");
             int errorCode = await LoginHelper.EnterGame(GameGlobal.zoneScene);
             if (errorCode != ErrorCode.ERR_Success)