走远了呀

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

@@ -68,7 +68,7 @@ namespace GFGGame
             try
             {
                 // 初始化并加载Luban配置
-                CommonDataManager.InitOneAsync(() =>
+                CommonDataManager.InitAllAsync(() =>
                 {
                     // 配置加载完成后的回调
                     Debug.Log("Luban配置加载完成！");
@@ -387,7 +387,7 @@ namespace GFGGame
             NewYearRedEnvelopeDataManager.Instance.Clear();
             MatchingCompetitionDataManager.Instance.MyNtextture = null;
             MatchingCompetitionDataManager.Instance.MathingDressDate.bgId = 0;
-            FieldWorkDataManager.Instance.IsAutoStart = false;
+           // FieldWorkDataManager.Instance.IsAutoStart = false;
             GameGlobal.zoneScene.GetComponent<SessionComponent>()?.Disconnect();
             GameGlobal.zoneScene.GetComponent<ServerInfosComponent>()?.ServerInfoList?.Clear();
             GameGlobal.zoneScene.GetComponent<AccountInfoComponent>()?.Clear();

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

@@ -87,7 +87,7 @@ namespace GFGGame
             }
         }
 
-        private static async ETTask OnLoginSuccess()
+        public static async ETTask OnLoginSuccess()
         {
             await GetServerInfos();
             ServerInfosComponent serverInfosComponent = GameGlobal.zoneScene.GetComponent<ServerInfosComponent>();
@@ -100,6 +100,7 @@ namespace GFGGame
             }
 
             await ReqNoticeInfo();
+            LoginController.GetRoles().Coroutine();
 
             ViewManager.Hide<ModalStatusView>();
         }
@@ -288,27 +289,28 @@ namespace GFGGame
                 ErrorCodeController.Handler(errorCode);
                 return;
             }
-
-            CommonDataManager.InitAllAsync(async () =>
+            errorCode = await LoginHelper.EnterGame(GameGlobal.zoneScene);
+            if (errorCode != ErrorCode.ERR_Success)
             {
-                errorCode = await LoginHelper.EnterGame(GameGlobal.zoneScene);
-                if (errorCode != ErrorCode.ERR_Success)
-                {
-                    ErrorCodeController.Handler(errorCode);
-                    return;
-                }
+                ErrorCodeController.Handler(errorCode);
+                return;
+            }
 
-                ViewManager.Hide<ModalStatusView>();
-                ViewManager.Hide<LoginView>();
-                ViewManager.Show<LoadingView>(0.01f);
-                LoadingView.Instance.SetProgress(99);
-                LoadingView.Instance.SetDesc("正在加载数据...");
-                LogServerHelper.SendNodeLog((int)LogNode.StartEnterGame);
-                await GameGlobal.zoneScene.GetComponent<ObjectWait>().Wait<ET.WaitType.Wait_SceneChangeFinish>();
-                AlertSystem.Hide();
-                await GameController.PreEnterGameAsync();
-                LogServerHelper.SendNodeLog((int)LogNode.OnEnterGame);
-            });
+            ViewManager.Hide<ModalStatusView>();
+            ViewManager.Hide<LoginView>();
+            ViewManager.Show<LoadingView>(0.01f);
+            LoadingView.Instance.SetProgress(99);
+            LoadingView.Instance.SetDesc("正在加载数据...");
+            LogServerHelper.SendNodeLog((int)LogNode.StartEnterGame);
+            await GameGlobal.zoneScene.GetComponent<ObjectWait>().Wait<ET.WaitType.Wait_SceneChangeFinish>();
+            AlertSystem.Hide();
+            await GameController.PreEnterGameAsync();
+            LogServerHelper.SendNodeLog((int)LogNode.OnEnterGame);
+            
+            // CommonDataManager.InitAllAsync(async () =>
+            // {
+            //
+            // });
         }
 
         public static async ETTask ReqReConnectGate()

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

@@ -108,9 +108,9 @@ namespace GFGGame
             {
                 long curTime = TimeHelper.ServerNow();
                 long startTime = TimeUtil.GetCurWeekTime( CommonDataManager.Tables.TblGlobalCfg.ClearingStartWeekDay,
-                    CommonDataManager.Tables.TblGlobalCfg.ClearingStartTime);
+                    CommonDataManager.Tables.TblGlobalCfg.ClearingStartTime.Split(' ')[1]);
                 long endTime = TimeUtil.GetCurWeekTime(CommonDataManager.Tables.TblGlobalCfg.ClearingEndWeekDay,
-                    CommonDataManager.Tables.TblGlobalCfg.ClearingEndTime);
+                    CommonDataManager.Tables.TblGlobalCfg.ClearingEndTime.Split(' ')[1]);
                 if (CommonDataManager.Tables.TblGlobalCfg.ClearingEndWeekDay >= CommonDataManager.Tables.TblGlobalCfg.ClearingStartWeekDay)
                 {
                     //结算时间开始到结束未跨周(例：本周六开始，本周日结束)

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

@@ -267,7 +267,7 @@ namespace GFGGame
                 {
                     endTime = TimeUtil.GetNextWeekTime(
                         CommonDataManager.Tables.TblGlobalCfg.GalleryClearingWeekTime - 1,
-                        CommonDataManager.Tables.TblGlobalCfg.GalleryClearingEndTime);
+                        CommonDataManager.Tables.TblGlobalCfg.GalleryClearingEndTime.Split(' ')[1]);
                 }
             }
 
@@ -287,7 +287,7 @@ namespace GFGGame
                 CommonDataManager.Tables.TblGlobalCfg.GalleryClearingStartTime);
             //本周一5点刷新本周
             long end = TimeUtil.GetCurWeekTime(CommonDataManager.Tables.TblGlobalCfg.GalleryClearingWeekTime,
-                CommonDataManager.Tables.TblGlobalCfg.GalleryClearingEndTime); //本周一4点结算上周
+                CommonDataManager.Tables.TblGlobalCfg.GalleryClearingEndTime.Split(' ')[1]); //本周一4点结算上周
             long now = TimeInfo.Instance.ServerNow();
             return now > start && now < end;
         }

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

@@ -141,7 +141,6 @@ namespace ET
             accountInfoComponent.AccountId = a2CLoginAccount.AccountId;
             accountInfoComponent.Account = account;
             accountInfoComponent.Age = a2CLoginAccount.Age;
-            LoginController.GetRoles().Coroutine();
         }
 
         public static async ETTask<int> Register(Scene zoneScene, string address, string account, string password,

GameClient/Assets/Game/HotUpdate/ETCodes/PreGeneratedTypes.cs

@@ -1073,6 +1073,7 @@ namespace GFGGame.HotUpdate
             "cfg.GfgCfg.GalleryRewardCfg, Game.HotUpdate",
             "cfg.GfgCfg.GalleryThemeCfg, Game.HotUpdate",
             "cfg.GfgCfg.GameFunctionCfg, Game.HotUpdate",
+            "cfg.GfgCfg.GeneralMaterialCfg, Game.HotUpdate",
             "cfg.GfgCfg.GiftBagCfg, Game.HotUpdate",
             "cfg.GfgCfg.GrowthFundCfg, Game.HotUpdate",
             "cfg.GfgCfg.GuideCfg, Game.HotUpdate",
@@ -1111,7 +1112,7 @@ namespace GFGGame.HotUpdate
             "cfg.GfgCfg.PassivitySkillLvlCfg, Game.HotUpdate",
             "cfg.GfgCfg.PearlGiftCfg, Game.HotUpdate",
             "cfg.GfgCfg.PickUpCfg, Game.HotUpdate",
-            "cfg.GfgCfg.PickUpGame, Game.HotUpdate",
+            "cfg.GfgCfg.PickUpGameCfg, Game.HotUpdate",
             "cfg.GfgCfg.RechargeCfg, Game.HotUpdate",
             "cfg.GfgCfg.RobotNameCfg, Game.HotUpdate",
             "cfg.GfgCfg.RoleLevelCfg, Game.HotUpdate",
@@ -1196,6 +1197,7 @@ namespace GFGGame.HotUpdate
             "cfg.GfgCfg.TblGalleryRewardCfg, Game.HotUpdate",
             "cfg.GfgCfg.TblGalleryThemeCfg, Game.HotUpdate",
             "cfg.GfgCfg.TblGameFunctionCfg, Game.HotUpdate",
+            "cfg.GfgCfg.TblGeneralMaterialCfg, Game.HotUpdate",
             "cfg.GfgCfg.TblGiftBagCfg, Game.HotUpdate",
             "cfg.GfgCfg.TblGrowthFundCfg, Game.HotUpdate",
             "cfg.GfgCfg.TblGuideCfg, Game.HotUpdate",
@@ -1235,7 +1237,7 @@ namespace GFGGame.HotUpdate
             "cfg.GfgCfg.TblPassivitySkillLvlCfg, Game.HotUpdate",
             "cfg.GfgCfg.TblPearlGiftCfg, Game.HotUpdate",
             "cfg.GfgCfg.TblPickUpCfg, Game.HotUpdate",
-            "cfg.GfgCfg.TblPickUpGame, Game.HotUpdate",
+            "cfg.GfgCfg.TblPickUpGameCfg, Game.HotUpdate",
             "cfg.GfgCfg.TblRechargeCfg, Game.HotUpdate",
             "cfg.GfgCfg.TblRobotNameCfg, Game.HotUpdate",
             "cfg.GfgCfg.TblRoleLevelCfg, Game.HotUpdate",
@@ -1293,24 +1295,6 @@ namespace GFGGame.HotUpdate
             "ET.ZoneSceneManagerComponentDestroySystem, Game.HotUpdate",
             "ET.ConfigAwakeSystem, Game.HotUpdate",
             "ET.ConfigDestroySystem, Game.HotUpdate",
-            "ET.MessageDispatcherComponentAwakeSystem, Game.HotUpdate",
-            "ET.MessageDispatcherComponentLoadSystem, Game.HotUpdate",
-            "ET.MessageDispatcherComponentDestroySystem, Game.HotUpdate",
-            "ET.NetThreadComponentAwakeSystem, Game.HotUpdate",
-            "ET.NetThreadComponentUpdateSystem, Game.HotUpdate",
-            "ET.NetThreadComponentDestroySystem, Game.HotUpdate",
-            "ET.NetWSComponentAwakeSystem, Game.HotUpdate",
-            "ET.NetWSComponentAwake1System, Game.HotUpdate",
-            "ET.NetWSComponentDestroySystem, Game.HotUpdate",
-            "ET.SessionAcceptTimeout, Game.HotUpdate",
-            "ET.SessionAcceptTimeoutComponentAwakeSystem, Game.HotUpdate",
-            "ET.SessionAcceptTimeoutComponentDestroySystem, Game.HotUpdate",
-            "ET.SessionIdleChecker, Game.HotUpdate",
-            "ET.SessionIdleCheckerComponentAwakeSystem, Game.HotUpdate",
-            "ET.SessionIdleCheckerComponentDestroySystem, Game.HotUpdate",
-            "ET.SessionStreamDispatcherAwakeSystem, Game.HotUpdate",
-            "ET.SessionStreamDispatcherLoadSystem, Game.HotUpdate",
-            "ET.SessionStreamDispatcherDestroySystem, Game.HotUpdate",
             "ET.NumericChangeEvent_NotifyWatcher, Game.HotUpdate",
             "ET.PingComponentAwakeSystem, Game.HotUpdate",
             "ET.PingComponentDestroySystem, Game.HotUpdate",
@@ -2116,6 +2100,7 @@ namespace GFGGame.HotUpdate
             "ET.M2C_RegisterRoleInfo, Game.HotUpdate",
             "ET.C2S_CreateWeChatPayOrder, Game.HotUpdate",
             "ET.S2C_CreateWeChatPayOrder, Game.HotUpdate",
+            "ET.C2A_H5Login, Game.HotUpdate",
             "ET.ActorResponse, Game.HotUpdate",
             "ET.ConfigAttribute, Game.HotUpdate",
             "ET.ConfigComponent, Game.HotUpdate",
@@ -2134,23 +2119,6 @@ namespace GFGGame.HotUpdate
             "ET.CoroutineLockQueueTypeDestroySystem, Game.HotUpdate",
             "ET.CoroutineLockQueueType, Game.HotUpdate",
             "ET.CoroutineLockTimer, Game.HotUpdate",
-            "ET.ErrorResponse, Game.HotUpdate",
-            "ET.MessageAttribute, Game.HotUpdate",
-            "ET.MessageDispatcherComponent, Game.HotUpdate",
-            "ET.MessageHandlerAttribute, Game.HotUpdate",
-            "ET.NetThreadComponent, Game.HotUpdate",
-            "ET.NetWSComponent, Game.HotUpdate",
-            "ET.OpcodeTypeComponentAwakeSystem, Game.HotUpdate",
-            "ET.OpcodeTypeComponentDestroySystem, Game.HotUpdate",
-            "ET.OpcodeTypeComponent, Game.HotUpdate",
-            "ET.ResponseTypeAttribute, Game.HotUpdate",
-            "ET.SessionAwakeSystem, Game.HotUpdate",
-            "ET.Session, Game.HotUpdate",
-            "ET.SessionAcceptTimeoutComponent, Game.HotUpdate",
-            "ET.SessionCallbackComponent, Game.HotUpdate",
-            "ET.SessionIdleCheckerComponent, Game.HotUpdate",
-            "ET.SessionStreamDispatcher, Game.HotUpdate",
-            "ET.SessionStreamDispatcherAttribute, Game.HotUpdate",
             "ET.LeagueNumericType, Game.HotUpdate",
             "ET.NumericComponentAwakeSystem, Game.HotUpdate",
             "ET.NumericComponent, Game.HotUpdate",
@@ -2163,6 +2131,65 @@ namespace GFGGame.HotUpdate
             "ET.UnityWebRequestAsync, Game.HotUpdate",
             "ET.UnityWebRequestRenewalUpdateSystem, Game.HotUpdate",
             "ET.UnityWebRequestRenewalAsync, Game.HotUpdate",
+            "ET.DressUpRarity, Game.HotUpdate",
+            "ET.FriendType, Game.HotUpdate",
+            "ET.GlobalConst, Game.HotUpdate",
+            "ET.ConstBonusStatus, Game.HotUpdate",
+            "ET.ConstBonusType, Game.HotUpdate",
+            "ET.ConstInstanceZonesType, Game.HotUpdate",
+            "ET.ConstInstanceZonesSubType, Game.HotUpdate",
+            "ET.ConstStudioSubType, Game.HotUpdate",
+            "ET.ConstItemID, Game.HotUpdate",
+            "ET.ConstItemType, Game.HotUpdate",
+            "ET.ConstItemSubType, Game.HotUpdate",
+            "ET.ConstItemFuncType, Game.HotUpdate",
+            "ET.TravelGuideConst, Game.HotUpdate",
+            "ET.ConstItemAttributeType, Game.HotUpdate",
+            "ET.ConstItemAttributeActionType, Game.HotUpdate",
+            "ET.RefreshType, Game.HotUpdate",
+            "ET.ConstMailStatus, Game.HotUpdate",
+            "ET.ConstGiveGiftStatus, Game.HotUpdate",
+            "ET.PictureSourceType, Game.HotUpdate",
+            "ET.PictureType, Game.HotUpdate",
+            "ET.TravelGuideType, Game.HotUpdate",
+            "ET.GallerySortType, Game.HotUpdate",
+            "ET.ConstMailCfgId, Game.HotUpdate",
+            "ET.ConstQDId, Game.HotUpdate",
+            "ET.ConstDressUpItemType, Game.HotUpdate",
+            "ET.LockType, Game.HotUpdate",
+            "ET.CostType, Game.HotUpdate",
+            "ET.FightTargetType, Game.HotUpdate",
+            "ET.ArenaRankType, Game.HotUpdate",
+            "ET.ArenaGradeAndRankChangeType, Game.HotUpdate",
+            "ET.LimitClearType, Game.HotUpdate",
+            "ET.CarInfoChangeType, Game.HotUpdate",
+            "ET.LeaguePrayType, Game.HotUpdate",
+            "ET.LeagueBuildingType, Game.HotUpdate",
+            "ET.LeaguePos, Game.HotUpdate",
+            "ET.LeagueJoinQuitLogType, Game.HotUpdate",
+            "ET.LeaguePower, Game.HotUpdate",
+            "ET.LeaguePosPower, Game.HotUpdate",
+            "ET.LeagueApplyStatus, Game.HotUpdate",
+            "ET.LeagueWelfareType, Game.HotUpdate",
+            "ET.LeagueWelfareTypes, Game.HotUpdate",
+            "ET.LeagueQuestionStatus, Game.HotUpdate",
+            "ET.ChatType, Game.HotUpdate",
+            "ET.SkillType, Game.HotUpdate",
+            "ET.ChatSave, Game.HotUpdate",
+            "ET.MonthCardType, Game.HotUpdate",
+            "ET.MonthCardPrivilegeType, Game.HotUpdate",
+            "ET.MonthCardPrivilegeParamsType, Game.HotUpdate",
+            "ET.ConstTaskType, Game.HotUpdate",
+            "ET.AnswerQuestionRewardEnd, Game.HotUpdate",
+            "ET.ConstStoreTabId, Game.HotUpdate",
+            "ET.ConstStoreSubId, Game.HotUpdate",
+            "ET.ConstLivenessType, Game.HotUpdate",
+            "ET.LeagueTeaPartyStatus, Game.HotUpdate",
+            "ET.MiniGameType, Game.HotUpdate",
+            "ET.RedPacketStatus, Game.HotUpdate",
+            "ET.CollectPartID, Game.HotUpdate",
+            "ET.SConstCardRarity, Game.HotUpdate",
+            "ET.ItemParamProto, Game.HotUpdate",
             "ET.DoubleMap`2, Game.HotUpdate",
             "ET.HashSetComponent`1, Game.HotUpdate",
             "ET.ListComponent`1, Game.HotUpdate",
@@ -2181,19 +2208,7 @@ namespace GFGGame.HotUpdate
             "ET.AcceptAllCertificate, Game.HotUpdate",
             "ET.MonoStaticMethod, Game.HotUpdate",
             "ET.RpcException, Game.HotUpdate",
-            "ET.ChannelType, Game.HotUpdate",
-            "ET.Packet, Game.HotUpdate",
-            "ET.CircularBuffer, Game.HotUpdate",
-            "ET.KcpWaitPacket, Game.HotUpdate",
-            "ET.KChannel, Game.HotUpdate",
-            "ET.ServiceType, Game.HotUpdate",
-            "ET.KService, Game.HotUpdate",
-            "ET.ParserState, Game.HotUpdate",
-            "ET.PacketParser, Game.HotUpdate",
-            "ET.TChannel, Game.HotUpdate",
-            "ET.TService, Game.HotUpdate",
-            "ET.WChannel, Game.HotUpdate",
-            "ET.WService, Game.HotUpdate",
+            "ET.MemoryBuffer, Game.HotUpdate",
             "ET.CanvasConfig, Game.HotUpdate",
             "ET.ComponentView, Game.HotUpdate",
             "ET.GizmosDebug, Game.HotUpdate",
@@ -2234,6 +2249,51 @@ namespace GFGGame.HotUpdate
             "ET.PlayerComponent, Game.HotUpdate",
             "ET.Unit, Game.HotUpdate",
             "ET.UnitComponent, Game.HotUpdate",
+            "ET.MessageDispatcherComponentAwakeSystem, Game.HotUpdate",
+            "ET.MessageDispatcherComponentLoadSystem, Game.HotUpdate",
+            "ET.MessageDispatcherComponentDestroySystem, Game.HotUpdate",
+            "ET.NetThreadComponentAwakeSystem, Game.HotUpdate",
+            "ET.NetThreadComponentUpdateSystem, Game.HotUpdate",
+            "ET.NetThreadComponentDestroySystem, Game.HotUpdate",
+            "ET.NetWSComponentAwakeSystem, Game.HotUpdate",
+            "ET.NetWSComponentAwake1System, Game.HotUpdate",
+            "ET.NetWSComponentDestroySystem, Game.HotUpdate",
+            "ET.SessionAcceptTimeout, Game.HotUpdate",
+            "ET.SessionAcceptTimeoutComponentAwakeSystem, Game.HotUpdate",
+            "ET.SessionAcceptTimeoutComponentDestroySystem, Game.HotUpdate",
+            "ET.SessionIdleChecker, Game.HotUpdate",
+            "ET.SessionIdleCheckerComponentAwakeSystem, Game.HotUpdate",
+            "ET.SessionIdleCheckerComponentDestroySystem, Game.HotUpdate",
+            "ET.SessionStreamDispatcherAwakeSystem, Game.HotUpdate",
+            "ET.SessionStreamDispatcherLoadSystem, Game.HotUpdate",
+            "ET.SessionStreamDispatcherDestroySystem, Game.HotUpdate",
+            "ET.ErrorResponse, Game.HotUpdate",
+            "ET.MessageAttribute, Game.HotUpdate",
+            "ET.MessageDispatcherComponent, Game.HotUpdate",
+            "ET.MessageHandlerAttribute, Game.HotUpdate",
+            "ET.NetThreadComponent, Game.HotUpdate",
+            "ET.NetWSComponent, Game.HotUpdate",
+            "ET.OpcodeTypeComponentAwakeSystem, Game.HotUpdate",
+            "ET.OpcodeTypeComponentDestroySystem, Game.HotUpdate",
+            "ET.OpcodeTypeComponent, Game.HotUpdate",
+            "ET.ResponseTypeAttribute, Game.HotUpdate",
+            "ET.SessionAwakeSystem, Game.HotUpdate",
+            "ET.Session, Game.HotUpdate",
+            "ET.SessionAcceptTimeoutComponent, Game.HotUpdate",
+            "ET.SessionCallbackComponent, Game.HotUpdate",
+            "ET.SessionIdleCheckerComponent, Game.HotUpdate",
+            "ET.SessionStreamDispatcher, Game.HotUpdate",
+            "ET.SessionStreamDispatcherAttribute, Game.HotUpdate",
+            "ET.ChannelType, Game.HotUpdate",
+            "ET.Packet, Game.HotUpdate",
+            "ET.ServiceType, Game.HotUpdate",
+            "ET.CircularBuffer, Game.HotUpdate",
+            "ET.ParserState, Game.HotUpdate",
+            "ET.PacketParser, Game.HotUpdate",
+            "ET.TChannel, Game.HotUpdate",
+            "ET.TService, Game.HotUpdate",
+            "ET.WChannel, Game.HotUpdate",
+            "ET.WService, Game.HotUpdate",
             "ET.ActivityLoginInfoProtoHandler, Game.HotUpdate",
             "ET.ActivitySummerGiftProtoHandler, Game.HotUpdate",
             "ET.S2C_NoticeActivityOpenHandler, Game.HotUpdate",
@@ -2276,65 +2336,6 @@ namespace GFGGame.HotUpdate
             "ET.EventType.AppStart, Game.HotUpdate",
             "Hutool.DateUtil, Game.HotUpdate",
             "GFGGame.CalculateHelper, Game.HotUpdate",
-            "GFGGame.DressUpRarity, Game.HotUpdate",
-            "GFGGame.FriendType, Game.HotUpdate",
-            "GFGGame.GlobalConst, Game.HotUpdate",
-            "GFGGame.ConstBonusStatus, Game.HotUpdate",
-            "GFGGame.ConstBonusType, Game.HotUpdate",
-            "GFGGame.ConstInstanceZonesType, Game.HotUpdate",
-            "GFGGame.ConstInstanceZonesSubType, Game.HotUpdate",
-            "GFGGame.ConstStudioSubType, Game.HotUpdate",
-            "GFGGame.ConstItemID, Game.HotUpdate",
-            "GFGGame.ConstItemType, Game.HotUpdate",
-            "GFGGame.ConstItemSubType, Game.HotUpdate",
-            "GFGGame.ConstItemFuncType, Game.HotUpdate",
-            "GFGGame.TravelGuideConst, Game.HotUpdate",
-            "GFGGame.ConstItemAttributeType, Game.HotUpdate",
-            "GFGGame.ConstItemAttributeActionType, Game.HotUpdate",
-            "GFGGame.RefreshType, Game.HotUpdate",
-            "GFGGame.ConstMailStatus, Game.HotUpdate",
-            "GFGGame.ConstGiveGiftStatus, Game.HotUpdate",
-            "GFGGame.PictureSourceType, Game.HotUpdate",
-            "GFGGame.PictureType, Game.HotUpdate",
-            "GFGGame.TravelGuideType, Game.HotUpdate",
-            "GFGGame.GallerySortType, Game.HotUpdate",
-            "GFGGame.ConstMailCfgId, Game.HotUpdate",
-            "GFGGame.ConstQDId, Game.HotUpdate",
-            "GFGGame.ConstDressUpItemType, Game.HotUpdate",
-            "GFGGame.LockType, Game.HotUpdate",
-            "GFGGame.CostType, Game.HotUpdate",
-            "GFGGame.FightTargetType, Game.HotUpdate",
-            "GFGGame.ArenaRankType, Game.HotUpdate",
-            "GFGGame.ArenaGradeAndRankChangeType, Game.HotUpdate",
-            "GFGGame.LimitClearType, Game.HotUpdate",
-            "GFGGame.CarInfoChangeType, Game.HotUpdate",
-            "GFGGame.LeaguePrayType, Game.HotUpdate",
-            "GFGGame.LeagueBuildingType, Game.HotUpdate",
-            "GFGGame.LeaguePos, Game.HotUpdate",
-            "GFGGame.LeagueJoinQuitLogType, Game.HotUpdate",
-            "GFGGame.LeaguePower, Game.HotUpdate",
-            "GFGGame.LeaguePosPower, Game.HotUpdate",
-            "GFGGame.LeagueApplyStatus, Game.HotUpdate",
-            "GFGGame.LeagueWelfareType, Game.HotUpdate",
-            "GFGGame.LeagueWelfareTypes, Game.HotUpdate",
-            "GFGGame.LeagueQuestionStatus, Game.HotUpdate",
-            "GFGGame.ChatType, Game.HotUpdate",
-            "GFGGame.SkillType, Game.HotUpdate",
-            "GFGGame.ChatSave, Game.HotUpdate",
-            "GFGGame.MonthCardType, Game.HotUpdate",
-            "GFGGame.MonthCardPrivilegeType, Game.HotUpdate",
-            "GFGGame.MonthCardPrivilegeParamsType, Game.HotUpdate",
-            "GFGGame.ConstTaskType, Game.HotUpdate",
-            "GFGGame.AnswerQuestionRewardEnd, Game.HotUpdate",
-            "GFGGame.ConstStoreTabId, Game.HotUpdate",
-            "GFGGame.ConstStoreSubId, Game.HotUpdate",
-            "GFGGame.ConstLivenessType, Game.HotUpdate",
-            "GFGGame.LeagueTeaPartyStatus, Game.HotUpdate",
-            "GFGGame.MiniGameType, Game.HotUpdate",
-            "GFGGame.RedPacketStatus, Game.HotUpdate",
-            "GFGGame.CollectPartID, Game.HotUpdate",
-            "GFGGame.SConstCardRarity, Game.HotUpdate",
-            "GFGGame.ItemParamProto, Game.HotUpdate",
             "GFGGame.ActivityOpenCfgArray, Game.HotUpdate",
             "GFGGame.ArenaRewardCfgArray, Game.HotUpdate",
             "GFGGame.CollegeBoostCfgArray, Game.HotUpdate",
@@ -2555,6 +2556,8 @@ namespace GFGGame.HotUpdate
             "GFGGame.GameGlobal, Game.HotUpdate",
             "GFGGame.HotUpdateDriver, Game.HotUpdate",
             "GFGGame.OperationSystem, Game.HotUpdate",
+            "GFGGame.QDJGameManager, Game.HotUpdate",
+            "GFGGame.JHGameSDKListener, Game.HotUpdate",
             "GFGGame.QDManager, Game.HotUpdate",
             "GFGGame.ActivityAfuGiftSProxy, Game.HotUpdate",
             "GFGGame.ActivityDay7SProxy, Game.HotUpdate",
@@ -2974,13 +2977,10 @@ namespace GFGGame.HotUpdate
             "BillItem+BILL_TYPE, Game.HotUpdate",
             "CommonDataManager+<>c__DisplayClass4_0, Game.HotUpdate",
             "CommonDataManager+<>c__DisplayClass5_0, Game.HotUpdate",
+            "CommonDataManager+<>c__DisplayClass6_0, Game.HotUpdate",
             "ET.ConfigComponentSystem+<>c__DisplayClass2_0, Game.HotUpdate",
             "ET.ConfigComponentSystem+<>c__DisplayClass2_1, Game.HotUpdate",
             "ET.ConfigComponentSystem+<LoadAsync>d__2, Game.HotUpdate",
-            "ET.NetThreadComponentSystem+<>c__DisplayClass1_0, Game.HotUpdate",
-            "ET.NetThreadComponentSystem+<>c__DisplayClass2_0, Game.HotUpdate",
-            "ET.NetWSComponentAwakeSystem+<>c__DisplayClass0_0, Game.HotUpdate",
-            "ET.NetWSComponentAwake1System+<>c__DisplayClass0_0, Game.HotUpdate",
             "ET.NumericChangeEvent_NotifyWatcher+<Run>d__0, Game.HotUpdate",
             "ET.PingComponentAwakeSystem+<PingAsync>d__1, Game.HotUpdate",
             "ET.ETCancelationTokenHelper+<CancelAfter>d__0, Game.HotUpdate",
@@ -2998,10 +2998,6 @@ namespace GFGGame.HotUpdate
             "ET.TimerComponent+<>c__DisplayClass18_0, Game.HotUpdate",
             "ET.TimerComponent+<WaitAsync>d__18, Game.HotUpdate",
             "ET.CoroutineLockComponentSystem+<Wait>d__2, Game.HotUpdate",
-            "ET.Session+RpcInfo, Game.HotUpdate",
-            "ET.Session+<>c__DisplayClass26_0, Game.HotUpdate",
-            "ET.Session+<Call>d__26, Game.HotUpdate",
-            "ET.Session+<Call>d__27, Game.HotUpdate",
             "ET.UnityWebRequestAsync+<DownloadAsync>d__10, Game.HotUpdate",
             "ET.UnityWebRequestRenewalAsync+RequestType, Game.HotUpdate",
             "ET.UnityWebRequestRenewalAsync+<DownloadAsync>d__21, Game.HotUpdate",
@@ -3013,13 +3009,6 @@ namespace GFGGame.HotUpdate
             "ET.ProcessHelper+<>c__DisplayClass3_0, Game.HotUpdate",
             "ET.ProcessHelper+<WaitForExitAsync>d__3, Game.HotUpdate",
             "ET.ThreadSynchronizationContext+<>c__DisplayClass8_0, Game.HotUpdate",
-            "ET.TChannel+<>c__DisplayClass10_0, Game.HotUpdate",
-            "ET.TService+<>c__DisplayClass6_0, Game.HotUpdate",
-            "ET.WChannel+<>c__DisplayClass11_0, Game.HotUpdate",
-            "ET.WChannel+<ConnectAsync>d__13, Game.HotUpdate",
-            "ET.WChannel+<StartSend>d__15, Game.HotUpdate",
-            "ET.WChannel+<StartRecv>d__17, Game.HotUpdate",
-            "ET.WService+<StartAccept>d__12, Game.HotUpdate",
             "ET.ETTask+<InnerCoroutine>d__10, Game.HotUpdate",
             "ET.ETTask`1+<InnerCoroutine>d__8, Game.HotUpdate",
             "ET.ETTaskHelper+CoroutineBlocker, Game.HotUpdate",
@@ -3040,24 +3029,34 @@ namespace GFGGame.HotUpdate
             "ET.DisConnectedCompnentDestroy+<>c, Game.HotUpdate",
             "ET.M2C_NoticeUnitItemAttributeHandler+<Run>d__0, Game.HotUpdate",
             "ET.M2C_NoticeUnitItemHandler+<Run>d__0, Game.HotUpdate",
-            "ET.LoginHelper+<LoginTest>d__0, Game.HotUpdate",
-            "ET.LoginHelper+<Login>d__1, Game.HotUpdate",
-            "ET.LoginHelper+<Register>d__3, Game.HotUpdate",
-            "ET.LoginHelper+<GetServerInfos>d__4, Game.HotUpdate",
-            "ET.LoginHelper+<GetRoles>d__5, Game.HotUpdate",
-            "ET.LoginHelper+<CreateRole>d__6, Game.HotUpdate",
-            "ET.LoginHelper+<>c__DisplayClass7_0, Game.HotUpdate",
-            "ET.LoginHelper+<DeleteRole>d__7, Game.HotUpdate",
-            "ET.LoginHelper+<GetRealmKey>d__8, Game.HotUpdate",
-            "ET.LoginHelper+<EnterGame>d__9, Game.HotUpdate",
-            "ET.LoginHelper+<ReqGetLatestNotice>d__10, Game.HotUpdate",
-            "ET.LoginHelper+<ReqRandomRoleName>d__11, Game.HotUpdate",
-            "ET.LoginHelper+<RegisterRoleInfo>d__12, Game.HotUpdate",
+            "ET.LoginHelper+<H5Login>d__0, Game.HotUpdate",
+            "ET.LoginHelper+<LoginTest>d__1, Game.HotUpdate",
+            "ET.LoginHelper+<Login>d__2, Game.HotUpdate",
+            "ET.LoginHelper+<Register>d__4, Game.HotUpdate",
+            "ET.LoginHelper+<GetServerInfos>d__5, Game.HotUpdate",
+            "ET.LoginHelper+<GetRoles>d__6, Game.HotUpdate",
+            "ET.LoginHelper+<CreateRole>d__7, Game.HotUpdate",
+            "ET.LoginHelper+<>c__DisplayClass8_0, Game.HotUpdate",
+            "ET.LoginHelper+<DeleteRole>d__8, Game.HotUpdate",
+            "ET.LoginHelper+<GetRealmKey>d__9, Game.HotUpdate",
+            "ET.LoginHelper+<EnterGame>d__10, Game.HotUpdate",
+            "ET.LoginHelper+<ReqGetLatestNotice>d__11, Game.HotUpdate",
+            "ET.LoginHelper+<ReqRandomRoleName>d__12, Game.HotUpdate",
+            "ET.LoginHelper+<RegisterRoleInfo>d__13, Game.HotUpdate",
             "ET.NumericHelper+<TestUpdateNumeric>d__0, Game.HotUpdate",
             "ET.NumericHelper+<RequestAddAttributePoint>d__1, Game.HotUpdate",
             "ET.CurrentScenesComponentSystem+CurrentScenesComponentAwakeSystem, Game.HotUpdate",
             "ET.M2C_StartSceneChangeHandler+<Run>d__0, Game.HotUpdate",
             "ET.M2C_CreateMyUnitHandler+<Run>d__0, Game.HotUpdate",
+            "ET.NetThreadComponentSystem+<>c__DisplayClass1_0, Game.HotUpdate",
+            "ET.NetThreadComponentSystem+<>c__DisplayClass2_0, Game.HotUpdate",
+            "ET.NetWSComponentAwake1System+<>c__DisplayClass0_0, Game.HotUpdate",
+            "ET.Session+RpcInfo, Game.HotUpdate",
+            "ET.Session+<>c__DisplayClass26_0, Game.HotUpdate",
+            "ET.Session+<Call>d__26, Game.HotUpdate",
+            "ET.Session+<Call>d__27, Game.HotUpdate",
+            "ET.TChannel+<>c__DisplayClass10_0, Game.HotUpdate",
+            "ET.TService+<>c__DisplayClass5_0, Game.HotUpdate",
             "ET.ActivityLoginInfoProtoHandler+<Run>d__0, Game.HotUpdate",
             "ET.ActivitySummerGiftProtoHandler+<Run>d__0, Game.HotUpdate",
             "ET.S2C_NoticeActivityOpenHandler+<Run>d__0, Game.HotUpdate",
@@ -3108,14 +3107,13 @@ namespace GFGGame.HotUpdate
             "GFGGame.CollegeBoostCfgArray+<>c, Game.HotUpdate",
             "GFGGame.CollegeBoostCfgArray+<>c__DisplayClass2_0, Game.HotUpdate",
             "GFGGame.CollegeBoostCfgArray+<>c__DisplayClass3_0, Game.HotUpdate",
-            "GFGGame.StoryLevelConfigManager+<>c__DisplayClass0_0, Game.HotUpdate",
             "GFGGame.TaskCfgArray+<>c__DisplayClass0_0, Game.HotUpdate",
             "GFGGame.TaskCfgArray+<>c, Game.HotUpdate",
             "GFGGame.ListUtil+NavigateType, Game.HotUpdate",
             "GFGGame.ListUtil+<>c__0`1, Game.HotUpdate",
-            "GFGGame.RandomUtil+<>c__5`1, Game.HotUpdate",
             "GFGGame.RandomUtil+<>c__6`1, Game.HotUpdate",
-            "GFGGame.RandomUtil+<>c__8`2, Game.HotUpdate",
+            "GFGGame.RandomUtil+<>c__7`1, Game.HotUpdate",
+            "GFGGame.RandomUtil+<>c__9`2, Game.HotUpdate",
             "GFGGame.TimeUtil+<>c__DisplayClass53_0, Game.HotUpdate",
             "GFGGame.TimeUtil+<>c__DisplayClass53_1, Game.HotUpdate",
             "GFGGame.TimeUtil+<>c__DisplayClass55_0, Game.HotUpdate",
@@ -3127,6 +3125,7 @@ namespace GFGGame.HotUpdate
             "GFGGame.PrefabManager+<>c__DisplayClass6_0, Game.HotUpdate",
             "GFGGame.PrefabManager+<>c__DisplayClass7_0, Game.HotUpdate",
             "GFGGame.PrefabManager+<>c__DisplayClass8_0, Game.HotUpdate",
+            "GFGGame.PrefabManager+<>c__DisplayClass10_0, Game.HotUpdate",
             "GFGGame.SpriteHelper+<>c__DisplayClass0_0, Game.HotUpdate",
             "GFGGame.SpriteHelper+<AddSpriteTo>d__0, Game.HotUpdate",
             "GFGGame.SpriteHelper+<>c__DisplayClass1_0, Game.HotUpdate",
@@ -3155,6 +3154,7 @@ namespace GFGGame.HotUpdate
             "GFGGame.LoginController+<GetRoles>d__10, Game.HotUpdate",
             "GFGGame.LoginController+<ReqRandomRoleName>d__11, Game.HotUpdate",
             "GFGGame.LoginController+<ReqCreateRole>d__12, Game.HotUpdate",
+            "GFGGame.LoginController+<>c__DisplayClass13_0, Game.HotUpdate",
             "GFGGame.LoginController+<ReqEnterGame>d__13, Game.HotUpdate",
             "GFGGame.LoginController+<ReqReConnectGate>d__14, Game.HotUpdate",
             "GFGGame.LoginController+<RegisterRoleInfo>d__15, Game.HotUpdate",
@@ -3221,6 +3221,7 @@ namespace GFGGame.HotUpdate
             "GFGGame.DressUpOperationBase+EDressUpSteps, Game.HotUpdate",
             "GFGGame.DressUpUtil+<>c__DisplayClass17_0, Game.HotUpdate",
             "GFGGame.DressUpUtil+<>c__DisplayClass18_0, Game.HotUpdate",
+            "GFGGame.DressUpUtil+<>c__DisplayClass19_0, Game.HotUpdate",
             "GFGGame.DressUpUtil+<>c__DisplayClass23_0, Game.HotUpdate",
             "GFGGame.SceneController+<>c__DisplayClass1_0, Game.HotUpdate",
             "GFGGame.SceneController+<>c__DisplayClass1_1, Game.HotUpdate",
@@ -3233,12 +3234,14 @@ namespace GFGGame.HotUpdate
             "GFGGame.SceneController+<>c__DisplayClass6_0, Game.HotUpdate",
             "GFGGame.SceneController+<>c__DisplayClass6_1, Game.HotUpdate",
             "GFGGame.ETManager+<>c, Game.HotUpdate",
+            "GFGGame.EffectUI+<>c__DisplayClass3_0, Game.HotUpdate",
             "GFGGame.GFGUIPackage+<>c__DisplayClass3_0, Game.HotUpdate",
             "GFGGame.GFGUIPackage+<>c__DisplayClass3_1, Game.HotUpdate",
             "GFGGame.GFGUIPackage+<>c__DisplayClass3_2, Game.HotUpdate",
             "GFGGame.GFGUIPackage+<>c__DisplayClass3_3, Game.HotUpdate",
             "GFGGame.FontLoader+<Init>d__0, Game.HotUpdate",
-            "GFGGame.FontLoader+<LoadFontAsync>d__1, Game.HotUpdate",
+            "GFGGame.FontLoader+<Init2>d__1, Game.HotUpdate",
+            "GFGGame.FontLoader+<LoadFontAsync>d__2, Game.HotUpdate",
             "GFGGame.GameConfig+Result, Game.HotUpdate",
             "GFGGame.AccountSProxy+<ReqDeleteAccount>d__0, Game.HotUpdate",
             "GFGGame.ActivityAfuGiftSProxy+<GetAfuGiftInfo>d__0, Game.HotUpdate",
@@ -3856,6 +3859,7 @@ namespace GFGGame.HotUpdate
             "GFGGame.TypingFadeEffectPro+<UpdateFadeProgressSingle>d__14, Game.HotUpdate",
             "GFGGame.MainUIView+<UpdateButtons>d__40, Game.HotUpdate",
             "GFGGame.MainUIView+<>c, Game.HotUpdate",
+            "GFGGame.MainUIView+<>c__DisplayClass96_0, Game.HotUpdate",
             "GFGGame.MainUIView+<CardBgRes>d__96, Game.HotUpdate",
             "GFGGame.MatchingCompetitionGatheringView+<>c__DisplayClass10_0, Game.HotUpdate",
             "GFGGame.MatchingCompetitionRankView+<>c, Game.HotUpdate",
@@ -4017,6 +4021,7 @@ namespace GFGGame.HotUpdate
             "ET.ETTaskHelper+<>c__DisplayClass5_0+<<WaitAll>g__RunOneTask|0>d, Game.HotUpdate",
             "ET.ETTaskHelper+<>c__DisplayClass6_0+<<WaitAll>g__RunOneTask|0>d, Game.HotUpdate",
             "ET.M2C_TaskResetHandler+M2C_AchievementTaskTypeChangeHandler+<Run>d__0, Game.HotUpdate",
+            "GFGGame.LoginController+<>c__DisplayClass13_0+<<ReqEnterGame>b__0>d, Game.HotUpdate",
             "GFGGame.PhotographSceneManager+<>c__DisplayClass7_0+<<UpdatePhotographBody>b__0>d, Game.HotUpdate",
             "GFGGame.SceneController+<>c__DisplayClass1_1+<<UpdateDialogBg>g__LastBgFadeOut|0>d, Game.HotUpdate",
             "GFGGame.SceneController+<>c__DisplayClass4_0+<<UpdateDialogPic>g__UpdateDialogPicAlpha|0>d, Game.HotUpdate",
@@ -4049,8 +4054,7 @@ namespace GFGGame.HotUpdate
                     UnityEngine.Debug.LogWarning($"Type not found: {typeName}");
                 }
             }
-
             return result.ToArray();
         }
     }
-}
+}

GameClient/Assets/Game/HotUpdate/GameConfig.cs

@@ -33,7 +33,7 @@ namespace GFGGame
             LoginAddress = result.loginApiUrl;
             //LoginAddress = "43.139.184.240:10003";
             //LoginAddress = "129.204.4.238:11005";//测试地址
-            //LoginAddress = "192.168.20.198:11005";//测试地址
+            LoginAddress = "192.168.1.2:10005";//测试地址       
             showGM = int.Parse(result.showGM);
             if(!string.IsNullOrEmpty(result.openTime))
             {

GameClient/Assets/Game/HotUpdate/NetworkTCP/WChannel_WebGL.cs

@@ -24,7 +24,7 @@ namespace ET
             this.ChannelType = ChannelType.Connect;
             this.Id = id;
 
-            string wsStr = $"ws://{ipEndPoint}";
+            string wsStr = $"ws://192.168.1.2:10005";
 
             Log.Debug($"wc address:{address}");
             if (LauncherConfig.isHttps)

GameClient/Assets/Game/HotUpdate/Platform/QDJGameManager.cs

@@ -26,6 +26,7 @@ namespace GFGGame
             QDJHGameManagerInit.Instance._jhGameSDKListener = new JHGameSDKListener();
 
             string url = Application.absoluteURL;
+            url = "https://webgltest.goufuguiwxw.com/?user_id=hxj001&user_name=%E6%99%93%E6%8D%B7&uuid=9872147&sign=testsign&timestamp=1750568368768&cp_ext=xxxx";
             Dictionary<string, object> sdkParams = WebUrlUtil.ParseSDKParamsFromUrl(url);
             UserId = sdkParams["user_id"].ToString();
             UserName = sdkParams["user_name"].ToString();

GameClient/Assets/Game/HotUpdate/UGUI/UGUIManager.cs

@@ -1,5 +1,6 @@
 using System;
 using ET;
+using GFGGame.Launcher;
 using UnityEngine;
 using YooAsset;
 
@@ -120,6 +121,8 @@ namespace GFGGame
                 // TaskCfgArray.Instance.Init();
 
                 LauncherView.Instance.Close();
+                QDJHGameManagerInit.Instance.InitSDK();
+                QDJGameManager.Instance.Init();
                 //显示登录
                 LoginController.ShowLogin();
             });

GameClient/Assets/Game/HotUpdate/Views/DailyWelfare/DailySupplyView.cs

@@ -1,4 +1,3 @@
-
 using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
@@ -14,6 +13,7 @@ namespace GFGGame
     public class DailySupplyView : BaseWindow
     {
         private UI_DailySupplyUI _ui;
+
         // private ValueBarController _valueBarController;
         private EffectUI _effectUI1;
         private EffectUI _effectUI2;
@@ -45,6 +45,7 @@ namespace GFGGame
                 _ui.Dispose();
                 _ui = null;
             }
+
             base.Dispose();
         }
 
@@ -63,13 +64,17 @@ namespace GFGGame
             // _ui.m_btnback.onClick.Add(OnBtnBackClick);
             UpdateEffect();
         }
+
         private void UpdateEffect()
         {
             _effectUI1 = EffectUIPool.CreateEffectUI(_ui.m_holder, "ui_Activity", "Time_thing_book");
             _effectUI2 = EffectUIPool.CreateEffectUI(_ui.m_comSupply.m_holder, "ui_Activity", "Time_thing_hudie");
-            _effectUI3 = EffectUIPool.CreateEffectUI(_ui.m_comSupply.m_comSupply0.m_holder, "ui_Activity", "Time_thing_zhuti");
-            _effectUI4 = EffectUIPool.CreateEffectUI(_ui.m_comSupply.m_comSupply1.m_holder, "ui_Activity", "Time_thing_zhuti");
+            _effectUI3 = EffectUIPool.CreateEffectUI(_ui.m_comSupply.m_comSupply0.m_holder, "ui_Activity",
+                "Time_thing_zhuti");
+            _effectUI4 = EffectUIPool.CreateEffectUI(_ui.m_comSupply.m_comSupply1.m_holder, "ui_Activity",
+                "Time_thing_zhuti");
         }
+
         protected override void AddEventListener()
         {
             base.AddEventListener();
@@ -93,6 +98,7 @@ namespace GFGGame
             base.OnHide();
             _ui.m_t0.Stop();
         }
+
         protected override void RemoveEventListener()
         {
             base.RemoveEventListener();
@@ -104,6 +110,7 @@ namespace GFGGame
         {
             ViewManager.GoBackFrom(typeof(DailyWelfareView).FullName);
         }
+
         private void UpdateView()
         {
             UpdateSupplyView();
@@ -111,8 +118,10 @@ namespace GFGGame
 
         private void UpdateSupplyView()
         {
-            UpdateReward(_ui.m_comSupply.m_comSupply0.target, CommonDataManager.Tables.TblDailySupplyCfg.DataList[0].Id);
-            UpdateReward(_ui.m_comSupply.m_comSupply1.target, CommonDataManager.Tables.TblDailySupplyCfg.DataList[1].Id);
+            UpdateReward(_ui.m_comSupply.m_comSupply0.target,
+                CommonDataManager.Tables.TblDailySupplyCfg.DataList[0].Id);
+            UpdateReward(_ui.m_comSupply.m_comSupply1.target,
+                CommonDataManager.Tables.TblDailySupplyCfg.DataList[1].Id);
         }
 
 
@@ -124,10 +133,12 @@ namespace GFGGame
 
             long openTime = TimeUtil.GetCurDayTime(TimeUtil.GetDateTime(supplyCfg.OpenTime).ToString("HH:mm:ss"));
             long endTime = TimeUtil.GetCurDayTime(TimeUtil.GetDateTime(supplyCfg.EndTime).ToString("HH:mm:ss"));
-            item.m_txtTime.text = TimeUtil.FormattingTimeTo_HHmm(openTime) + "-" + TimeUtil.FormattingTimeTo_HHmm(endTime);
+            item.m_txtTime.text =
+                TimeUtil.FormattingTimeTo_HHmm(openTime) + "-" + TimeUtil.FormattingTimeTo_HHmm(endTime);
             item.m_txtCount.text = supplyCfg.Bonus[0].Count.ToString();
 
-            ItemUtil.UpdateItemNeedNum(item.m_comCost, CommonDataManager.Tables.TblGlobalCfg.DailySupplyConsume[0].ToGfgGameItemParam(), false, "#FFF6ED");
+            ItemUtil.UpdateItemNeedNum(item.m_comCost,
+                CommonDataManager.Tables.TblGlobalCfg.DailySupplyConsume[0].ToGfgGameItemParam(), false, "#FFF6ED");
             item.m_comCost.visible = false;
 
             if (MathUtil.isBitSet(GameGlobal.myNumericComponent.GetAsInt(NumericType.DailySupplyReward), supplyCfg.Id))
@@ -138,7 +149,8 @@ namespace GFGGame
             }
 
             long curTime = TimeHelper.ServerNow();
-            if (curTime < openTime && curTime > TimeUtil.GetCurDayTime(CommonDataManager.Tables.TblGlobalCfg.RefreshTime))
+            if (curTime < openTime && curTime >
+                TimeUtil.GetCurDayTime(CommonDataManager.Tables.TblGlobalCfg.RefreshTime.Split(' ')[1]))
             {
                 item.m_btnGet.title = "领取";
                 item.m_btnGet.enabled = false;
@@ -154,13 +166,16 @@ namespace GFGGame
                 item.m_btnGet.title = "补领";
                 item.m_btnGet.enabled = true;
             }
+
             if (item.m_btnGet.data == null)
             {
                 item.m_btnGet.onClick.Add(OnBtnGetSupplyClick);
             }
+
             item.m_btnGet.data = supplyCfg;
             UI_ComSupplyItem.ProxyEnd();
         }
+
         private void OnBtnGetSupplyClick(EventContext context)
         {
             GObject obj = context.sender as GObject;
@@ -170,23 +185,25 @@ namespace GFGGame
             if (TimeHelper.ServerNow() > endTime)
             {
                 ItemParamProto cost = CommonDataManager.Tables.TblGlobalCfg.DailySupplyConsume[0].ToGfgGameItemParam();
-                AlertUI.Show(string.Format("是否确定花费{0}{1}补领？", cost.Count, CommonDataManager.Tables.TblItemCfg.GetOrDefault(cost.ItemId).Name)).
-                  SetLeftButton(true, "否").
-                  SetRightButton(true, "是", (object param) =>
-                   {
-                       if (ItemDataManager.GetItemNum(cost.ItemId) < cost.Count)
-                       {
-                           PromptController.Instance.ShowFloatTextPrompt("消耗不足");
-                           return;
-                       }
-                       ReqSupplyAsync(supplyCfg.Id);
-                   });
+                AlertUI.Show(string.Format("是否确定花费{0}{1}补领？", cost.Count,
+                        CommonDataManager.Tables.TblItemCfg.GetOrDefault(cost.ItemId).Name)).SetLeftButton(true, "否")
+                    .SetRightButton(true, "是", (object param) =>
+                    {
+                        if (ItemDataManager.GetItemNum(cost.ItemId) < cost.Count)
+                        {
+                            PromptController.Instance.ShowFloatTextPrompt("消耗不足");
+                            return;
+                        }
+
+                        ReqSupplyAsync(supplyCfg.Id);
+                    });
             }
             else
             {
                 ReqSupplyAsync(supplyCfg.Id);
             }
         }
+
         private async void ReqSupplyAsync(int id)
         {
             bool result = await DailyWelfareSProxy.ReqGetSupplyReward(id);
@@ -195,10 +212,13 @@ namespace GFGGame
                 UpdateSupplyView();
             }
         }
+
         private void UpdateRedDot()
         {
-            RedDotController.Instance.SetComRedDot(_ui.m_comSupply.m_comSupply0.m_btnGet, RedDotDataManager.Instance.DailySupplyRed(CommonDataManager.Tables.TblDailySupplyCfg.DataList[0]));
-            RedDotController.Instance.SetComRedDot(_ui.m_comSupply.m_comSupply1.m_btnGet, RedDotDataManager.Instance.DailySupplyRed(CommonDataManager.Tables.TblDailySupplyCfg.DataList[1]));
+            RedDotController.Instance.SetComRedDot(_ui.m_comSupply.m_comSupply0.m_btnGet,
+                RedDotDataManager.Instance.DailySupplyRed(CommonDataManager.Tables.TblDailySupplyCfg.DataList[0]));
+            RedDotController.Instance.SetComRedDot(_ui.m_comSupply.m_comSupply1.m_btnGet,
+                RedDotDataManager.Instance.DailySupplyRed(CommonDataManager.Tables.TblDailySupplyCfg.DataList[1]));
         }
     }
 }

GameClient/Assets/Game/HotUpdate/Views/Field/FieldView.cs

@@ -1,4 +1,3 @@
-
 using cfg.GfgCfg;
 using ET;
 using FairyGUI;
@@ -30,6 +29,7 @@ namespace GFGGame
                 _ui.Dispose();
                 _ui = null;
             }
+
             base.Dispose();
         }
 
@@ -53,12 +53,14 @@ namespace GFGGame
             _ui.m_btnRule.onClick.Add(RuleController.ShowRuleView);
             _ui.m_btnRule.data = 300016;
         }
+
         protected override void AddEventListener()
         {
             base.AddEventListener();
             EventAgent.AddEventListener(ConstMessage.FIELD_RESULT, UpdateView);
             EventAgent.AddEventListener(ConstMessage.FIELD_TASK, UpdateView);
         }
+
         protected override void OnShown()
         {
             base.OnShown();
@@ -95,12 +97,14 @@ namespace GFGGame
             Timers.inst.Remove(CheckGuide);
             _valueBarController.OnHide();
         }
+
         protected override void RemoveEventListener()
         {
             base.RemoveEventListener();
             EventAgent.RemoveEventListener(ConstMessage.FIELD_RESULT, UpdateView);
             EventAgent.RemoveEventListener(ConstMessage.FIELD_TASK, UpdateView);
         }
+
         private void OnClickBtnBack()
         {
             _dataManager.difficulty = 0;
@@ -110,18 +114,20 @@ namespace GFGGame
         private void OnDifficultyChange()
         {
             int priorIndex = _ui.m_c1.selectedIndex - 1;
-            FieldCfg selectCfg =  CommonDataManager.Tables.TblFieldCfg.DataList[_ui.m_c1.selectedIndex];
+            FieldCfg selectCfg = CommonDataManager.Tables.TblFieldCfg.DataList[_ui.m_c1.selectedIndex];
             bool isPass = InstanceZonesDataManager.CheckLevelPass(selectCfg.StoryLvId);
             if (priorIndex >= 0 && !isPass)
             {
-
                 _ui.m_c1.selectedIndex = _selectedIndex;
-                StoryLevelCfg storyLevelCfg = CommonDataManager.Tables.TblStoryLevelCfg.GetOrDefault(selectCfg.StoryLvId);
-                StoryChapterCfg storyChapterCfg = CommonDataManager.Tables.TblStoryChapterCfg.GetOrDefault(storyLevelCfg.ChapterId);
+                StoryLevelCfg storyLevelCfg =
+                    CommonDataManager.Tables.TblStoryLevelCfg.GetOrDefault(selectCfg.StoryLvId);
+                StoryChapterCfg storyChapterCfg =
+                    CommonDataManager.Tables.TblStoryChapterCfg.GetOrDefault(storyLevelCfg.ChapterId);
                 string str = string.Format("完成主线{0}-{1}解锁", storyChapterCfg.Order, storyLevelCfg.Order);
                 PromptController.Instance.ShowFloatTextPrompt(str);
                 return;
             }
+
             // FieldCfg priorfg = priorIndex >= 0 ? FieldCfgArray.Instance.dataArray[priorIndex] : null;
             // if (priorIndex >= 0 && _dataManager.GetHighestLvByChapterId(priorfg.id) < priorfg.num)
             // {
@@ -130,28 +136,31 @@ namespace GFGGame
             //     return;
             // }
             _selectedIndex = _ui.m_c1.selectedIndex;
-            _curCfg =  CommonDataManager.Tables.TblFieldCfg.DataList[_selectedIndex];
+            _curCfg = CommonDataManager.Tables.TblFieldCfg.DataList[_selectedIndex];
             _dataManager.chapterId = _curCfg.Id;
             _dataManager.difficulty = _selectedIndex;
             // UpdateView();
             OnClickBtnGo();
 
-            if (GuideDataManager.IsGuideFinish(ConstGuideId.FIELD) <= 0) {
-                GuideController.TryCompleteGuideIndex(ConstGuideId.FIELD,1);
+            if (GuideDataManager.IsGuideFinish(ConstGuideId.FIELD) <= 0)
+            {
+                GuideController.TryCompleteGuideIndex(ConstGuideId.FIELD, 1);
                 GuideController.TryCompleteGuide(ConstGuideId.FIELD, 1);
             }
         }
 
-        private  async void UpdateStroyFightResult()
+        private async void UpdateStroyFightResult()
         {
             var resultData = InstanceZonesDataManager.resultData;
-            FieldCfg fieldCfg =  CommonDataManager.Tables.TblFieldCfg.GetOrDefault(FieldDataManager.Instance.chapterId);
+            FieldCfg fieldCfg = CommonDataManager.Tables.TblFieldCfg.GetOrDefault(FieldDataManager.Instance.chapterId);
             int needPower = 0;
             for (int i = 0; i < FieldDataManager.Instance.currFightLv + 1; i++)
             {
                 needPower += fieldCfg.NeedPower;
             }
-            if (!resultData.Result || FieldDataManager.Instance.currFightLv == fieldCfg.Num || RoleDataManager.power < needPower)
+
+            if (!resultData.Result || FieldDataManager.Instance.currFightLv == fieldCfg.Num ||
+                RoleDataManager.power < needPower)
             {
                 bool result = await FieldSProxy.ReqFieldInstanceResult();
                 if (result)
@@ -164,37 +173,40 @@ namespace GFGGame
                 FieldDataManager _dataManager = FieldDataManager.Instance;
                 _dataManager.accumulateReward += (FieldDataManager.Instance.difficulty + 1) * 5;
                 //这里判断如果获取的马蹄金超过上限了，就终止挑战
-                if (_dataManager.fieldInfos.bonusWeekly + _dataManager.accumulateReward >= _dataManager.fieldInfos.bonusMaxLimit)
+                if (_dataManager.fieldInfos.bonusWeekly + _dataManager.accumulateReward >=
+                    _dataManager.fieldInfos.bonusMaxLimit)
                 {
                     AlertUI.Show("本周可获得奖励已达上限，是否继续挑战？")
-                    .SetLeftButton(true, "取消", async (object data) =>
-                    {
-                        _dataManager.accumulateReward = 0;
-                        bool result = await FieldSProxy.ReqFieldInstanceResult();
-                        if (result)
+                        .SetLeftButton(true, "取消", async (object data) =>
+                        {
+                            _dataManager.accumulateReward = 0;
+                            bool result = await FieldSProxy.ReqFieldInstanceResult();
+                            if (result)
+                            {
+                                ViewManager.Show<FieldFightEndView>();
+                            }
+                        })
+                        .SetRightButton(true, "确认", async (object data) =>
                         {
-                            ViewManager.Show<FieldFightEndView>();
-                        }
-                    })
-                    .SetRightButton(true, "确认", async (object data) =>
-                    {
-                        bool result = await FieldSProxy.ReqFieldInstanceResult();
-                        _dataManager.accumulateReward = 0;
-                        FieldCfg _curCfg =  CommonDataManager.Tables.TblFieldCfg.DataList[FieldDataManager.Instance.difficulty];
-                        LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.TIAN_YE_DIAO_CHA, 2);
-                        int curLevelId = StoryLevelConfigManager.GetConfigs(_curCfg.Type, 0, _curCfg.Id)[0].Id;
-                        DressUpFightType dressUpFightType = new DressUpFightType();
-                        dressUpFightType.levelID = curLevelId;
-                        dressUpFightType.teaPartID = 0;
-                        ViewManager.Show<DressUpFightView>(dressUpFightType, true);
-                        InstanceZonesDataManager.currentLevelCfgId = curLevelId;
-                    });
+                            bool result = await FieldSProxy.ReqFieldInstanceResult();
+                            _dataManager.accumulateReward = 0;
+                            FieldCfg _curCfg =
+                                CommonDataManager.Tables.TblFieldCfg.DataList[FieldDataManager.Instance.difficulty];
+                            LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.TIAN_YE_DIAO_CHA, 2);
+                            int curLevelId = StoryLevelConfigManager.GetConfigs(_curCfg.Type, 0, _curCfg.Id)[0].Id;
+                            DressUpFightType dressUpFightType = new DressUpFightType();
+                            dressUpFightType.levelID = curLevelId;
+                            dressUpFightType.teaPartID = 0;
+                            ViewManager.Show<DressUpFightView>(dressUpFightType, true);
+                            InstanceZonesDataManager.currentLevelCfgId = curLevelId;
+                        });
                 }
                 else
                 {
                     ViewManager.Show<FieldFightInfoView>();
                 }
             }
+
             InstanceZonesDataManager.isFightResultHide = false;
         }
 
@@ -212,7 +224,7 @@ namespace GFGGame
             _ui.m_btn2.m_txtConsume.text = string.Format("{0}", selectCfg2.NeedPower);
 
             bool isPass0 = selectCfg0.StoryLvId == 0 || InstanceZonesDataManager.CheckLevelPass(selectCfg0.StoryLvId);
-            bool isPass1 = selectCfg1.StoryLvId == 0 || InstanceZonesDataManager.CheckLevelPass(selectCfg1.StoryLvId); 
+            bool isPass1 = selectCfg1.StoryLvId == 0 || InstanceZonesDataManager.CheckLevelPass(selectCfg1.StoryLvId);
             bool isPass2 = selectCfg2.StoryLvId == 0 || InstanceZonesDataManager.CheckLevelPass(selectCfg2.StoryLvId);
             _ui.m_btn0.m_c1.selectedIndex = isPass0 ? 1 : 0;
             _ui.m_btn1.m_c1.selectedIndex = isPass1 ? 1 : 0;
@@ -220,36 +232,38 @@ namespace GFGGame
 
             _ui.m_proTaskReward.max = _dataManager.fieldInfos.bonusMaxLimit;
             _ui.m_proTaskReward.value = _dataManager.fieldInfos.bonusWeekly;
-            _ui.m_loaTaskReward.url = ResPathUtil.GetIconPath(CommonDataManager.Tables.TblItemCfg.GetOrDefault(ConstItemID.DIAMOND_RED));
+            _ui.m_loaTaskReward.url =
+                ResPathUtil.GetIconPath(CommonDataManager.Tables.TblItemCfg.GetOrDefault(ConstItemID.DIAMOND_RED));
             RedDotController.Instance.SetComRedDot(_ui.m_btnTask, RedDotDataManager.Instance.GetFieldRed());
         }
 
         private void UpdateShowTime(object param)
         {
-            _ui.m_txtTime.text = string.Format("{0}后刷新", TimeUtil.FormattingTime(TimeHelper.ServerNow(), TimeUtil.GetNextWeekTime( CommonDataManager.Tables.TblGlobalCfg.RefreshTime)));
+            _ui.m_txtTime.text = string.Format("{0}后刷新",
+                TimeUtil.FormattingTime(TimeHelper.ServerNow(),
+                    TimeUtil.GetNextWeekTime(CommonDataManager.Tables.TblGlobalCfg.RefreshTime.Split(' ')[1])));
         }
+
         private void OnClickBtnGo()
         {
-
             if (RoleDataManager.power < _curCfg.NeedPower)
             {
                 PromptController.Instance.ShowFloatTextPrompt("体力不足");
                 return;
             }
+
             if (_dataManager.fieldInfos.bonusWeekly >= _dataManager.fieldInfos.bonusMaxLimit)
             {
                 AlertUI.Show("本周可获得奖励已达上限，是否继续挑战？")
-                .SetLeftButton(true)
-                .SetRightButton(true, "确定", (object data) =>
-                {
-                    StartFight();
-                });
+                    .SetLeftButton(true)
+                    .SetRightButton(true, "确定", (object data) => { StartFight(); });
             }
             else
             {
                 StartFight();
             }
         }
+
         private void StartFight()
         {
             LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.TIAN_YE_DIAO_CHA, 2);
@@ -260,6 +274,7 @@ namespace GFGGame
             ViewManager.Show<DressUpFightView>(dressUpFightType, true);
             InstanceZonesDataManager.currentLevelCfgId = curLevelId;
         }
+
         private void OnBtnTaskClick()
         {
             ViewManager.Show<FieldTaskView>();

GameClient/Assets/Game/HotUpdate/Views/Login/LoginView.cs

@@ -221,9 +221,11 @@ namespace GFGGame
                     return;
                 }
 
+
                 LoginHelper.H5Login(GameGlobal.zoneScene, GameConfig.LoginAddress,
                     error =>
                     {
+                        LoginController.OnLoginSuccess().Coroutine();
                         _ui.m_btnStart.visible = true;
                         _ui.m_btnStart.text = "开始游戏";
                     }).Coroutine();

GameClient/Assets/Game/Launcher/LauncherConfig.cs

@@ -109,7 +109,7 @@ namespace GFGGame
 #else
             netType = EnumNetType.LOCAL;
             cfgName = "cfg_webgllocal";
-            ChannelId = (int)ChannelID.Test;
+            ChannelId = (int)ChannelID.H5;
 #endif
 
             cfgUrl = launcherRootUrl + "platform/{cfgName}.json";
@@ -166,6 +166,7 @@ namespace GFGGame
             if (!string.IsNullOrEmpty(result.isHttps))
             {
                 LauncherConfig.isHttps = result.isHttps == "1";
+                LauncherConfig.isHttps = false;
             }
 
             if (!string.IsNullOrEmpty(result.promptSizeMB))

GameClient/Assets/Game/Launcher/Platform/QDJHGameManagerInit.cs

@@ -1,31 +1,9 @@
 using System.Collections.Generic;
 using JHGameSDK;
-using Unity.Plastic.Newtonsoft.Json;
 using UnityEngine;
 
 namespace GFGGame.Launcher
 {
-    #region MyRegion
-
-    // // 辅助类：可序列化的字典
-    // [System.Serializable]
-    // public class SerializableDictionary
-    // {
-    //     public List<string> keys = new List<string>();
-    //     public List<object> values = new List<object>();
-    //
-    //     public SerializableDictionary(Dictionary<string, object> dict)
-    //     {
-    //         foreach (var pair in dict)
-    //         {
-    //             keys.Add(pair.Key);
-    //             values.Add(pair.Value);
-    //         }
-    //     }
-    // }
-
-    #endregion
-
     public class QDJHGameManagerInit : SingletonBase<QDJHGameManagerInit>
     {
         public IJHGameSDKListener _jhGameSDKListener;
@@ -46,7 +24,7 @@ namespace GFGGame.Launcher
         private void CallJSFunction(string functionName, Dictionary<string, object> parameters)
         {
             // 将参数字典转换为JSON字符串
-            string jsonParams = JsonConvert.SerializeObject(parameters);
+            string jsonParams =JsonUtility.ToJson(parameters);
 
             // 调用JS函数
             Application.ExternalCall(functionName, jsonParams);

GameClient/GameClient.sln.DotSettings.user

@@ -28,6 +28,7 @@
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AScreen_002Ecs_002Fl_003AC_0021_003FUsers_003Fadmin_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F683a2b31bf9142429c44f02c75dbc6c913ce00_003Fee_003Ff58d2431_003FScreen_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AScriptableObject_002Ecs_002Fl_003AC_0021_003FUsers_003Fss510_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F683a2b31bf9142429c44f02c75dbc6c913ce00_003F1f_003F8a732769_003FScriptableObject_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AStack_00601_002Ecs_002Fl_003AC_0021_003FUsers_003Fss510_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E1_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003Fc0c221501f3a41f8ac0af9d6a9dc9ff335fd90_003F1e_003Fdd8639eb_003FStack_00601_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AString_002Ecs_002Fl_003AC_0021_003FUsers_003Fss510_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E1_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F3789ee403a53437cbb6b5d9ab6311f51573620_003F99_003F0ea27859_003FString_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ATaskCompletionSource_00601_002Ecs_002Fl_003AC_0021_003FUsers_003Fss510_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E1_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F695d1cc93cca45069c528c15c9fdd7493e2800_003Fdc_003Fa749e100_003FTaskCompletionSource_00601_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ATask_002Ecs_002Fl_003AC_0021_003FUsers_003Fss510_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E1_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F695d1cc93cca45069c528c15c9fdd7493e2800_003F5f_003F0c6d83c7_003FTask_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ATask_00601_002Ecs_002Fl_003AC_0021_003FUsers_003Fss510_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E1_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F3789ee403a53437cbb6b5d9ab6311f51573620_003Fa4_003F44ebb4e8_003FTask_00601_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
@@ -37,5 +38,6 @@
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AWebSocket_002Ecs_002Fl_003AC_0021_003FUsers_003Fadmin_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003Fc0c221501f3a41f8ac0af9d6a9dc9ff335fd90_003F40_003F4c808bad_003FWebSocket_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/Environment/AssemblyExplorer/XmlDocument/@EntryValue">&lt;AssemblyExplorer&gt;&#xD;
   &lt;Assembly Path="C:\Windows\Microsoft.NET\assembly\GAC_MSIL\System\v4.0_4.0.0.0__b77a5c561934e089\System.dll" /&gt;&#xD;
+  &lt;Assembly Path="D:\gfgProject\gfg_dev\0A-GFGClient\5client_webgl\Client\GameClient\Library\PackageCache\com.unity.collab-proxy@1.15.15\Lib\Editor\PlasticSCM\Unity.Plastic.Newtonsoft.Json.dll" /&gt;&#xD;
 &lt;/AssemblyExplorer&gt;</s:String>
 	</wpf:ResourceDictionary>