调整完毕

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

@@ -68,7 +68,7 @@ namespace GFGGame
             try
             {
                 // 初始化并加载Luban配置
-                CommonDataManager.instance.InitAsync(() =>
+                CommonDataManager.InitAsync(() =>
                 {
                     // 配置加载完成后的回调
                     Debug.Log("Luban配置加载完成！");

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

@@ -19,7 +19,7 @@ namespace GFGGame
                 StoryChapterCfg chapterCfg = _chapterCfgs[i];
                 if (i == _chapterCfgs.Count - 1 && MainStoryDataManager.CheckChapterUnlock(chapterCfg.Id))
                 {
-                    if (StoryController.CheckSuitGot(_chapterCfgs[i-1].SuitId))
+                    if (StoryController.CheckSuitGot(_chapterCfgs[i - 1].SuitId))
                     {
                         MainStoryDataManager.currentChapterCfgId = chapterCfg.Id;
                         ViewManager.Show<StoryChapterView>(new object[] { chapterCfg.Id, 0 });
@@ -37,7 +37,8 @@ namespace GFGGame
                 {
                     StoryChapterCfg chapterTowCfg = _chapterCfgs[Mathf.Max(0, i - 1)];
                     StoryChapterCfg chaptersuitCfg = _chapterCfgs[Mathf.Max(0, i - 2)];
-                    var list = StoryLevelConfigManager.GetConfigs(chapterTowCfg.Type, chapterTowCfg.SubType, chapterTowCfg.Id);
+                    var list = StoryLevelConfigManager.GetConfigs(chapterTowCfg.Type, chapterTowCfg.SubType,
+                        chapterTowCfg.Id);
                     StoryLevelCfg lastLevelCfg = list[list.Count - 1];
                     //这里是当下一章没解锁，但是上一章的最后一关已经通过了
                     if (lastLevelCfg != null && InstanceZonesDataManager.CheckLevelPass(lastLevelCfg.Id))
@@ -46,6 +47,7 @@ namespace GFGGame
                         isOpen = false;
                         return isOpen;
                     }
+
                     if (StoryController.CheckSuitGot(chaptersuitCfg.SuitId))
                     {
                         MainStoryDataManager.currentChapterCfgId = chapterCfg.Id - 1;
@@ -61,7 +63,8 @@ namespace GFGGame
                     }
                 }
             }
+
             return isOpen;
         }
     }
-}
+}

GameClient/Assets/Game/HotUpdate/ETCodes/Hotfix/App/Login/LoginHelper.cs

@@ -26,14 +26,14 @@ namespace ET
             }
             catch (Exception e)
             {
-                accountSession?.Dispose();
+                //accountSession?.Dispose();
                 Log.Debug(e.ToString());
                 return (ErrorCode.ERR_NetWorkError, 0);
             }
 
             if (a2CLoginAccount.Error != ErrorCode.ERR_Success)
             {
-                accountSession?.Dispose();
+                //accountSession?.Dispose();
                 return (a2CLoginAccount.Error, a2CLoginAccount.DeleteTime);
             }
 
@@ -69,14 +69,14 @@ namespace ET
             }
             catch (Exception e)
             {
-                accountSession?.Dispose();
+                //accountSession?.Dispose();
                 Log.Debug(e.ToString());
                 return (ErrorCode.ERR_NetWorkError, 0);
             }
 
             if (a2CLoginAccount.Error != ErrorCode.ERR_Success)
             {
-                accountSession?.Dispose();
+                //accountSession?.Dispose();
                 return (a2CLoginAccount.Error, a2CLoginAccount.DeleteTime);
             }
 
@@ -129,13 +129,13 @@ namespace ET
             }
             catch (Exception e)
             {
-                session?.Dispose();
+                //session?.Dispose();
                 Log.Debug(e.ToString());
                 return ErrorCode.ERR_NetWorkError;
             }
 
             return ErrorCode.ERR_Success;
-        }
+        }   
 
         public static async ETTask<int> GetServerInfos(Scene zoneScene)
         {
@@ -310,7 +310,7 @@ namespace ET
 
             zoneScene.GetComponent<AccountInfoComponent>().RealmKey = a2C_GetRealmKey.RealmKey;
             zoneScene.GetComponent<AccountInfoComponent>().RealmAddress = a2C_GetRealmKey.RealmAddress;
-            zoneScene.GetComponent<SessionComponent>().DisconnectAccount();
+            //zoneScene.GetComponent<SessionComponent>().DisconnectAccount();
 
             await ETTask.CompletedTask;
             return ErrorCode.ERR_Success;
@@ -335,11 +335,11 @@ namespace ET
             catch (Exception e)
             {
                 Log.Debug(e.ToString());
-                session?.Dispose();
+                //session?.Dispose();
                 return ErrorCode.ERR_NetWorkError;
             }
 
-            session?.Dispose();
+            //session?.Dispose();
 
             if (r2C_LoginRealm.Error != ErrorCode.ERR_Success)
             {
@@ -370,13 +370,13 @@ namespace ET
             catch (Exception e)
             {
                 Log.Debug(e.ToString());
-                zoneScene.GetComponent<SessionComponent>().GateSession?.Dispose();
+                //zoneScene.GetComponent<SessionComponent>().GateSession?.Dispose();
                 return ErrorCode.ERR_NetWorkError;
             }
 
             if (g2C_LoginGate.Error != ErrorCode.ERR_Success)
             {
-                zoneScene.GetComponent<SessionComponent>().GateSession?.Dispose();
+                //zoneScene.GetComponent<SessionComponent>().GateSession?.Dispose();
                 return g2C_LoginGate.Error;
             }
 
@@ -391,7 +391,7 @@ namespace ET
             catch (Exception e)
             {
                 Log.Debug(e.ToString());
-                zoneScene.GetComponent<SessionComponent>().GateSession.Dispose();
+                //zoneScene.GetComponent<SessionComponent>().GateSession.Dispose();
                 return ErrorCode.ERR_NetWorkError;
             }
 
@@ -468,7 +468,7 @@ namespace ET
                 Log.Debug(e.ToString());
                 if (notLogin)
                 {
-                    accountSession?.Dispose();
+                   // accountSession?.Dispose();
                 }
 
                 return (ErrorCode.ERR_NetWorkError, "");
@@ -479,7 +479,7 @@ namespace ET
                 //Log.Error(response.Error.ToString());
                 if (notLogin)
                 {
-                    accountSession?.Dispose();
+                    //accountSession?.Dispose();
                 }
 
                 return (ErrorCode.ERR_NetWorkError, "");
@@ -487,7 +487,7 @@ namespace ET
 
             if (notLogin)
             {
-                accountSession?.Dispose();
+                //accountSession?.Dispose();
             }
 
             return (ErrorCode.ERR_Success, response.Name);

GameClient/Assets/Game/HotUpdate/LubanManager/CommonDataManager.cs

@@ -1,44 +1,44 @@
-using GFGGame;
-using SimpleJSON;
-using UnityEngine;
-using YooAsset;
-
-public class CommonDataManager2 : Singleton<CommonDataManager2>
-{
-    public static cfg.Tables Tables;
-
-    protected override void Awake()
-    {
-        base.Awake();
-        DontDestroyOnLoad(gameObject);
-    }
-
-    public void Init()
-    {
-        Tables = new cfg.Tables(LoadByteBuf);
-    }
-
-    private JSONNode LoadByteBuf(string file)
-    {
-        var str = ReadStringSync(file);
-        if (string.IsNullOrEmpty(str))
-        {
-            Debug.LogError("load luban json failed:" + file);
-            return null;
-        }
-
-        return JSON.Parse(str);
-    }
-
-    public string ReadStringSync(string loc)
-    {
-        var handler = YooAssets.LoadAssetSync<Sprite>(loc);
-        if (handler == null)
-        {
-            return null;
-        }
-
-        var data = handler.AssetObject as TextAsset;
-        return data != null ? data.text : null;
-    }
-}
+// using GFGGame;
+// using SimpleJSON;
+// using UnityEngine;
+// using YooAsset;
+//
+// public class CommonDataManager2 : Singleton<CommonDataManager2>
+// {
+//     public static cfg.Tables Tables;
+//
+//     protected override void Awake()
+//     {
+//         base.Awake();
+//         DontDestroyOnLoad(gameObject);
+//     }
+//
+//     public void Init()
+//     {
+//         Tables = new cfg.Tables(LoadByteBuf);
+//     }
+//
+//     private JSONNode LoadByteBuf(string file)
+//     {
+//         var str = ReadStringSync(file);
+//         if (string.IsNullOrEmpty(str))
+//         {
+//             Debug.LogError("load luban json failed:" + file);
+//             return null;
+//         }
+//
+//         return JSON.Parse(str);
+//     }
+//
+//     public string ReadStringSync(string loc)
+//     {
+//         var handler = YooAssets.LoadAssetSync<Sprite>(loc);
+//         if (handler == null)
+//         {
+//             return null;
+//         }
+//
+//         var data = handler.AssetObject as TextAsset;
+//         return data != null ? data.text : null;
+//     }
+// }

GameClient/Assets/Game/HotUpdate/LubanManager/SqliteController.cs

@@ -1,37 +0,0 @@
-// using System;
-// using UnityEngine;
-// using YooAsset;
-//
-// namespace GFGGame
-// {
-//     public class SqliteController : SingletonBase<SqliteController>
-//     {
-//
-//         public void Init(bool logable, string resPath)
-//         {
-//
-//             string dbPath = null;
-//             string connectionPath;
-// #if UNITY_EDITOR
-//             dbPath = $"{Environment.CurrentDirectory}/{ResPathUtil.SQLITE_FILE_PATH}";
-//
-// #else
-//             dbPath = GetSqlFilePath(resPath);
-// #endif
-//
-// #if !UNITY_EDITOR && UNITY_ANDROID
-//             connectionPath =  "uri=file:" + dbPath;
-// #else
-//             connectionPath = "data source=" + dbPath;
-// #endif
-//             SQLiteHelper.Instance.Init(logable, connectionPath);
-//         }
-//
-//         private string GetSqlFilePath(string resPath)
-//         {
-//             RawFileOperationHandle handle = YooAssets.LoadRawFileAsync(resPath);
-//             return handle.GetRawFilePath();
-//         }
-//
-//     }
-// }

GameClient/Assets/Game/HotUpdate/LubanManager/SqliteController.cs.meta

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

GameClient/Assets/Game/HotUpdate/Views/MainUI/MainUIView.cs

@@ -43,6 +43,7 @@ namespace GFGGame
         private GButton _btnGallery;
         private GButton _btnPoem;
         private GButton _btnTest;
+        private GButton _btnTest02;
         private List<EffectUI> _effectUIList = new List<EffectUI>();
         private UI_ButtonModle1[] _btns;
         private bool firstIn;
@@ -106,7 +107,8 @@ namespace GFGGame
             _btnBag = _ui.m_list.GetChild("btnBag").asButton;
             _btnGallery = _ui.m_list.GetChild("btnGallery").asButton;
             _btnPoem = _ui.m_list.GetChild("btnPoem").asButton;
-            _btnTest = _ui.m_list.GetChild("btnTest").asButton;
+            _btnTest = _ui.m_list.GetChild("btnPoem").asButton;
+            _btnTest02 = _ui.m_list.GetChild("btnPoem").asButton;
 
             _btnActivityDay7 = _ui.m_btnActivityDay7.target;
 
@@ -152,7 +154,8 @@ namespace GFGGame
             _ui.m_btnTapTapJump.target.onClick.Add(OnClickTapTapJump);
             _btnGallery.onClick.Add(OnClickGallery);
             _btnPoem.onClick.Add(OnClickPoem);
-            _btnTest.onClick.Add(OnClickBagEquipment);
+            _btnTest.onClick.Add(OnClickPoem);
+            _btnTest02.onClick.Add(OnClickPoem);
 
             _ui.m_btnActivityXDMH.target.onClick.Add(OnClickBtnXDMH);
 
@@ -214,7 +217,7 @@ namespace GFGGame
         protected override void OnShown()
         {
             base.OnShown();
-            
+
             MainDataManager.Instance.CanSwipe = false;
             //防止引导检测之前触发点击事件
             GRoot.inst.touchable = false;
@@ -569,11 +572,6 @@ namespace GFGGame
             ViewManager.Show<PoemPhotoView>();
         }
 
-        private void OnClickBagEquipment()
-        {
-            //ViewManager.Show<BagEquipmentView>();
-        }
-
         private void OnClickBtnLeague()
         {
             // LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.SHANG_CHENG, 1);
@@ -754,9 +752,11 @@ namespace GFGGame
                 else
                 {
                     ActivityOpenCfg activityCfg =
-                        CommonDataManager.Tables.TblActivityOpenCfg.GetOrDefault(ActivityDataManager.Instance.GetCurOpenActiveByType(101));
+                        CommonDataManager.Tables.TblActivityOpenCfg.Get(ActivityDataManager.Instance
+                            .GetCurOpenActiveByType(101));
                     int giftShopId = activityCfg.Params1[0];
-                    ShopCfg shopCfg = CommonDataManager.Tables.TblShopCfg.GetOrDefault(giftShopId);
+                    ShopCfg shopCfg = CommonDataManager.Tables.TblShopCfg.Get(giftShopId);
+
                     var remainBuyNum = shopCfg.MaxBuyNum - ShopDataManager.Instance.GetGoodsBuyNumById(shopCfg.Id);
                     if (remainBuyNum == 0)
                     {
@@ -789,11 +789,13 @@ namespace GFGGame
                 bool isSoldOut = true;
                 foreach (var activityInfo in list)
                 {
-                    ActivityOpenCfg activityOpenCfg = CommonDataManager.Tables.TblActivityOpenCfg.GetOrDefault(activityInfo.ActivityId);
+                    ActivityOpenCfg activityOpenCfg =
+                        CommonDataManager.Tables.TblActivityOpenCfg.GetOrDefault(activityInfo.ActivityId);
                     var paramsArr = activityOpenCfg.Params1;
                     foreach (var shopCfgId in paramsArr)
                     {
                         var shopCfg = CommonDataManager.Tables.TblShopCfg.GetOrDefault(shopCfgId);
+
                         var remainBuyNum = shopCfg.MaxBuyNum - ShopDataManager.Instance.GetGoodsBuyNumById(shopCfgId);
                         //只要有一个商品还能购买，就不是售罄
                         if (remainBuyNum > 0)
@@ -845,7 +847,9 @@ namespace GFGGame
                     ActivityDataManager.Instance.lastActLuckyBoxId = actLuckyBoxId;
                 }
 
-                ActivityOpenCfg activityOpenCfg = CommonDataManager.Tables.TblActivityOpenCfg.GetOrDefault(actLuckyBoxId);
+                ActivityOpenCfg activityOpenCfg =
+                    CommonDataManager.Tables.TblActivityOpenCfg.GetOrDefault(actLuckyBoxId);
+
                 _ui.m_btnActivityLuckyBox.target.title = activityOpenCfg.ThemeName;
                 string path = "zjm_icon_" + activityOpenCfg.Res.Split('_')[1];
                 _ui.m_btnActivityLuckyBox.target.icon =
@@ -856,7 +860,9 @@ namespace GFGGame
             }
 
             ActivityOpenCfg zcjbCfg =
-                CommonDataManager.Tables.TblActivityOpenCfg.GetOrDefault(ActivityDataManager.Instance.GetCurOpenActiveByType(17));
+                CommonDataManager.Tables.TblActivityOpenCfg.GetOrDefault(ActivityDataManager.Instance
+                    .GetCurOpenActiveByType(17));
+
             if (zcjbCfg != null)
             {
                 _ui.m_btnActivityZCJB.m_iconMain.url = ResPathUtil.GetActivityPath(zcjbCfg.Res, "png");
@@ -870,6 +876,7 @@ namespace GFGGame
             if (actLimitId > 0)
             {
                 ActivityOpenCfg activityOpenCfg = CommonDataManager.Tables.TblActivityOpenCfg.GetOrDefault(actLimitId);
+
                 long time = TimeUtil.DateTimeToTimestamp(activityOpenCfg.EndTime) - TimeHelper.ServerNow();
                 _ui.m_btnOpenServerActivity.m_txtTime.text = TimeUtil.FormattingTimeTo_DDHHmm(time);
             }
@@ -972,9 +979,12 @@ namespace GFGGame
             if (ActivityDataManager.Instance.CanGetSevenDayBonus())
             {
                 //显示今日可领取
-                int id = CommonDataManager.Tables.TblDailyLoginCfg.DataList[ActivityDataManager.Instance.NowSevenDayBonusDay(true)]
+                int id = CommonDataManager.Tables.TblDailyLoginCfg
+                    .DataList[ActivityDataManager.Instance.NowSevenDayBonusDay(true)]
                     .Rewards[0].ItemId;
-                if (CommonDataManager.Tables.TblDailyLoginCfg.DataList[ActivityDataManager.Instance.NowSevenDayBonusDay(true)]
+
+                if (CommonDataManager.Tables.TblDailyLoginCfg
+                        .DataList[ActivityDataManager.Instance.NowSevenDayBonusDay(true)]
                         .Type == 2)
                 {
                     _ui.m_btnSevenReward.m_Icon.url = ResPathUtil.GetIconPath("tz_kongquednf", "png");
@@ -992,8 +1002,11 @@ namespace GFGGame
                      ActivityDataManager.Instance.NowSevenDayBonusDay(false) < 6)
             {
                 //显示明日可领取
-                int id = CommonDataManager.Tables.TblDailyLoginCfg.DataList[ActivityDataManager.Instance.NowSevenDayBonusDay(false) + 1].Rewards[0].ItemId;
-                if (CommonDataManager.Tables.TblDailyLoginCfg.DataList[ActivityDataManager.Instance.NowSevenDayBonusDay(false) + 1]
+                int id = CommonDataManager.Tables.TblDailyLoginCfg
+                    .DataList[ActivityDataManager.Instance.NowSevenDayBonusDay(false) + 1].Rewards[0].ItemId;
+
+                if (CommonDataManager.Tables.TblDailyLoginCfg
+                        .DataList[ActivityDataManager.Instance.NowSevenDayBonusDay(false) + 1]
                         .Type == 2)
                 {
                     _ui.m_btnSevenReward.m_Icon.url = ResPathUtil.GetIconPath("tz_kongquednf", "png");
@@ -1132,6 +1145,7 @@ namespace GFGGame
         private void GetAdIds()
         {
             _adIds.Clear();
+
             for (int i = 0; i < CommonDataManager.Tables.TblAdCfg.DataList.Count; i++)
             {
                 AdCfg adCfg = CommonDataManager.Tables.TblAdCfg.DataList[i];
@@ -1279,6 +1293,7 @@ namespace GFGGame
             _btnTuJian.visible =
                 FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(FieldGuideView).Name, false);
             _btnTest.visible = true;
+            _btnTest02.visible = true;
 
             _btnActivityDay7.visible = ActivityDay7DataManager.Instance.CheckOpen();
             _ui.m_btnActivityAfuGift.target.visible = ActivityAfuGiftDataManager.Instance.CheckIconShow();

GameClient/Assets/Game/Launcher/Net/Http/HttpTool.cs

@@ -15,7 +15,7 @@ namespace GFGGame
     public class HttpTool : SingletonMonoBase<HttpTool>
     {
         //最大尝试次数
-        const int TryTimes = 3;
+        const int TryTimes = 5;
         //存储尝试次数
         public Dictionary<string, int> TryTimesDic = new Dictionary<string, int>();