暂存

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

@@ -42,7 +42,7 @@ namespace GFGGame
                 return false;
             }
             InstanceZonesSProxy.GetInstanceZonesInfos().Coroutine();
-            MainStorySProxy.GetStoryInfos().Coroutine();
+            MainStorySProxy.GetStoryBonusInfos().Coroutine();
             PromptController.Instance.ShowFloatTextPrompt(messageSuc, MessageType.SUCCESS);
             return true;
         }

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

@@ -171,14 +171,13 @@ namespace GFGGame
                         ViewManager.Show<StoryChapterView>(MainStoryDataManager.currentChapterCfgId, ViewManager.GetGoBackDatas(typeof(StoryChapterListView).FullName), true);
                     }
                 }
-                Timers.inst.Add(1f, 1, AfterEnterGame);
             });
         }
 
-        private static async void AfterEnterGame(object param)
+        public static async void AfterEnterGame(object param = null)
         {
             ItemProxy.GetItemAttributeInfos().Coroutine();
-            MainStorySProxy.GetStoryInfos().Coroutine();
+            MainStorySProxy.GetStoryBonusInfos().Coroutine();
             CardSProxy.GetCardInfos().Coroutine();
             TaskSProxy.GetTaskInfos();
             BattlePassTaskSProxy.GetBattlePassInfo().Coroutine();     

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

@@ -144,6 +144,7 @@ namespace GFGGame
             {
                 return value.itemType;
             }
+            //Debug.Log($"ItemDataManager GetItemType itemId {itemId}");
             ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(itemId);
             return itemCfg.itemType;
         }
@@ -197,10 +198,11 @@ namespace GFGGame
             _dataDic.Clear();
             foreach (ItemInfoProto roleItem in items)
             {
+                //LogHelper.LogEditor($"ItemDataManager InitServerData {roleItem.ConfigId}");
                 Add(roleItem);
             }
             //DressUpMenuItemDataManager.StartPreLoadItemCfg();
-            _ = DressUpMenuItemDataManager.GetAllDressUpGuideIdListBySubTypeAsync();
+            //_ = DressUpMenuItemDataManager.GetAllDressUpGuideIdListBySubTypeAsync();
 
         }
 

GameClient/Assets/Game/HotUpdate/DressUp/SceneController.cs

@@ -7,21 +7,6 @@ namespace GFGGame
 {
     public class SceneController
     {
-        //public static void UpdateLoginScene(GameObject sceneObj)
-        //{
-        //    //背景
-        //    Transform tf = sceneObj.transform.Find("Bg");
-        //    SpriteRenderer spr = tf.GetComponent<SpriteRenderer>();
-        //    var resPath = ResPathUtil.GetSceneBgPath("jhsy_bg");
-        //    //Sprite sp = GFGAsset.Load<Sprite>(resPath);
-        //    var handle = YooAssets.LoadAssetSync<Sprite>(resPath);
-        //    Sprite sp = handle.AssetObject as Sprite;
-        //    DressUpUtil.AddAssetReleaser(tf.gameObject, resPath, handle);
-        //    spr.sprite = sp;
-        //    //角色
-        //    DressUpUtil.UpdateBody("ui_loginrole", sceneObj);
-        //}
-
         public static void UpdateMainScene(GameObject sceneObj)
         {
             //背景0
@@ -29,11 +14,6 @@ namespace GFGGame
             SpriteRenderer spr = tf.GetComponent<SpriteRenderer>();
             var resPath = ResPathUtil.GetBgImgPath("zjm_1");
             SpriteHelper.AddSpriteTo(spr, resPath);
-            //背景1
-            Transform tf1 = sceneObj.transform.Find("Bg1");
-            SpriteRenderer spr1 = tf1.GetComponent<SpriteRenderer>();
-            var resPath1 = ResPathUtil.GetBgImgPath("fuben_bg");
-            SpriteHelper.AddSpriteTo(spr1, resPath1);
             //角色
             CustomSuitData suitSavedData = CustomSuitDataManager.GetCurrentSuitData();
             MyDressUpHelper.dressUpObj.setSceneObj(sceneObj.transform.Find("Scene").gameObject, false, true, null, false);

GameClient/Assets/Game/HotUpdate/ServerProxy/ItemProxy.cs

@@ -35,6 +35,7 @@ namespace GFGGame
                     for (int i = 0; i < response.NewItems.Count; i++)
                     {
                         var itemId = response.NewItems[i];
+                        if (ItemDataManager.GetItemNum(itemId) <= 0) continue;
                         var itemType = ItemDataManager.GetItemType(itemId);
                         if (itemType == ConstItemType.DRESS_UP)
                         {

GameClient/Assets/Game/HotUpdate/ServerProxy/MainStorySProxy.cs

@@ -24,7 +24,7 @@ namespace GFGGame
     public class MainStorySProxy
     {
         //请求剧情关卡数据
-        public static async ETTask GetStoryInfos()
+        public static async ETTask GetStoryBonusInfos()
         {
             M2C_GetMainStoryInfos response = null;
             response = (M2C_GetMainStoryInfos)await MessageHelper.SendToServer(new C2M_GetMainStoryInfos());

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

@@ -199,7 +199,7 @@ namespace GFGGame
 
             int _index = index >= 29 ? index - 1 : index;
             DailySignBonusCfg bonusCfg = DailySignBonusCfgArray.Instance.GetCfgsBymonth(_month)[_index];
-            ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(bonusCfg.bonusArr[0][0]);
+            int itemType = ItemDataManager.GetItemType(bonusCfg.bonusArr[0][0]);
             bool isGot = MathUtil.isBitSet(GameGlobal.myNumericComponent.GetAsLong(NumericType.SignDay), bonusCfg.day);
             if (bonusCfg.day == _day && !isGot && _effectUI3 == null)
             {
@@ -208,7 +208,7 @@ namespace GFGGame
             }
 
             item.m_holderSign.visible = false;
-            item.m_c1.selectedIndex = itemCfg.itemType == ConstItemType.DRESS_UP ? 0 : bonusCfg.type;
+            item.m_c1.selectedIndex = itemType == ConstItemType.DRESS_UP ? 0 : bonusCfg.type;
             item.m_txtDay.text = NumberUtil.GetChiniseNumberText(bonusCfg.day); //  bonusCfg.day.ToString();
             if (item.m_comItem.data == null)
             {

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

@@ -142,7 +142,7 @@ namespace GFGGame
             base.AddEventListener();
             EventAgent.AddEventListener(ConstMessage.NUMERIC_CHANGE, OnNumericChange);
             EventAgent.AddEventListener(ConstMessage.STORY_LEVEL_CHANGE, CheckFunOpen);
-            EventAgent.AddEventListener(ConstMessage.RED_CHANGE, UpdateRedDot);
+            EventAgent.AddEventListener(ConstMessage.RED_CHANGE, OnRedDotChanged);
             EventAgent.AddEventListener(ConstMessage.CHANGE_ROLE_HEAD, UpdateHead);
             EventAgent.AddEventListener(ConstMessage.RESET_DAILY_DATA, ResetDailyData);
             EventAgent.AddEventListener(ConstMessage.AFU_GIFT_CHANGED, ChangeAfuActivityState);
@@ -154,7 +154,7 @@ namespace GFGGame
             base.RemoveEventListener();
             EventAgent.RemoveEventListener(ConstMessage.NUMERIC_CHANGE, OnNumericChange);
             EventAgent.RemoveEventListener(ConstMessage.STORY_LEVEL_CHANGE, CheckFunOpen);
-            EventAgent.RemoveEventListener(ConstMessage.RED_CHANGE, UpdateRedDot);
+            EventAgent.RemoveEventListener(ConstMessage.RED_CHANGE, OnRedDotChanged);
             EventAgent.RemoveEventListener(ConstMessage.CHANGE_ROLE_HEAD, UpdateHead);
             EventAgent.RemoveEventListener(ConstMessage.AFU_GIFT_CHANGED, ChangeAfuActivityState);
             EventAgent.RemoveEventListener(ConstMessage.SEVENDAY_LOGIN, SevenDayLoginShow);
@@ -165,55 +165,33 @@ namespace GFGGame
             base.OnShown();
 
             MainDataManager.Instance.CanSwipe = false;
-            GRoot.inst.touchable = false;
-            _ui.m_loaGuidestudio.visible = true;
+            //GRoot.inst.touchable = false;
+            //_ui.m_loaGuidestudio.visible = true;
 
             _ui.m_headBar.m_txtName.text = RoleDataManager.roleName;
             if (_sceneObject == null)
             {
                 _sceneObject = PrefabManager.Instance.InstantiateSync(ResPathUtil.GetPrefabPath("SceneMain"));
             }
-            CheckFunOpen();
-            UpdateRedDot();
 
             SceneController.UpdateMainScene(_sceneObject);
             UpdateRoleLvl();
             UpdateHead();
-            UpdateBtnFirstRecharge();
-            CheckProbabilityUp();
             _valueBarController.OnShown();
 
-            Log.Debug("zyq" + GameGlobal.isLogon);
-            if (GameGlobal.isLogon)
-            {
-                ET.Log.Debug("zyq" + GameGlobal.isLogon);
-                ET.Log.Debug("zyq" + ActivityDataManager.Instance.sevenDayLoginBonusStatusList.Count + ":::" + GuideDataManager.currentGuideId);
-                if (ActivityDataManager.Instance.CanGetSevenDayBonus() &&
-                    GuideDataManager.currentGuideId <= 0)
-                {
-                    ViewManager.Show<SevenDayLoginView>();
-
-                }
-                else if (RedDotDataManager.Instance.DailySignRed())
-                {
-                    ViewManager.Show<DailySignView>(new object[] { 1 });
-                }
-            }
+            CheckFunOpen();
 
-            ChangeMainBg();
-            GetAdIds();
-            _ui.m_comListAd.target.visible = _ui.m_comListAd.m_listAd.numItems > 0;
-            if (_ui.m_comListAd.target.visible)
-            {
-                Timers.inst.Remove(UpdateAdListTime);
-                Timers.inst.Add(3, 0, UpdateAdListTime);
-            }
             Timers.inst.Remove(Update);
-            Timers.inst.Remove(CheckGuide);
-            Timers.inst.AddUpdate(CheckGuide);
+            //Timers.inst.Remove(CheckGuide);
+            //Timers.inst.AddUpdate(CheckGuide);
             Timers.inst.AddUpdate(Update);
             Update(null);
 
+            Timers.inst.Remove(OnShowLater);
+            Timers.inst.Add(1f, 1, OnShowLater);
+
+            //UpdateRedDot();
+
             // 刚进游戏不播放主界面入场动画
             if (firstIn)
             {
@@ -239,6 +217,36 @@ namespace GFGGame
             Timers.inst.Remove(Update);
             Timers.inst.Remove(CheckGuide);
             Timers.inst.Remove(UpdateAdListTime);
+            Timers.inst.Remove(OnShowLater);
+        }
+
+        private void OnShowLater(object param)
+        {
+            GameController.AfterEnterGame();
+            UpdateBtnFirstRecharge();
+            CheckProbabilityUp();
+            CheckDailySign();
+            GetAdIds();
+        }
+
+        private void CheckDailySign()
+        {
+            Log.Debug("zyq" + GameGlobal.isLogon);
+            if (GameGlobal.isLogon)
+            {
+                ET.Log.Debug("zyq" + GameGlobal.isLogon);
+                ET.Log.Debug("zyq" + ActivityDataManager.Instance.sevenDayLoginBonusStatusList.Count + ":::" + GuideDataManager.currentGuideId);
+                if (ActivityDataManager.Instance.CanGetSevenDayBonus() &&
+                    GuideDataManager.currentGuideId <= 0)
+                {
+                    ViewManager.Show<SevenDayLoginView>();
+
+                }
+                else if (RedDotDataManager.Instance.DailySignRed())
+                {
+                    ViewManager.Show<DailySignView>(new object[] { 1 });
+                }
+            }
         }
 
         private void AddEffect()
@@ -250,16 +258,6 @@ namespace GFGGame
             _effectUIList.Add(EffectUIPool.CreateEffectUI(_ui.m_BottomEffectHolder, "ui_zjm", "ZJM_DiBan"));
         }
 
-        private void ChangeMainBg()
-        {
-            GameObject Scene = _sceneObject.transform.Find("Scene").gameObject;
-            GameObject Bg = _sceneObject.transform.Find("Bg").gameObject;
-            GameObject Bg1 = _sceneObject.transform.Find("Bg1").gameObject;
-            Scene.SetActive(true);
-            Bg.SetActive(true);
-            Bg1.SetActive(false);
-        }
-
         private void OnClickBtnInstanceZones()
         {
             TryCompleteGuide();
@@ -753,6 +751,12 @@ namespace GFGGame
                 _ui.m_comListAd.m_listAd.ScrollToView(0);
                 _ui.m_comListAd.m_listAdSelect.selectedIndex = 0;
             }
+            _ui.m_comListAd.target.visible = _ui.m_comListAd.m_listAd.numItems > 0;
+            if (_ui.m_comListAd.target.visible)
+            {
+                Timers.inst.Remove(UpdateAdListTime);
+                Timers.inst.Add(3, 0, UpdateAdListTime);
+            }
         }
         private void UpdateAdListTime(object param)
         {
@@ -838,8 +842,19 @@ namespace GFGGame
             _ui.m_list.ResizeToFit();
         }
 
+        private void OnRedDotChanged()
+        {
+            Timers.inst.CallLater(OnRedDotChangedLater);
+        }
+
+        private void OnRedDotChangedLater(object o)
+        {
+            UpdateRedDot();
+        }
+
         private void UpdateRedDot()
         {
+            LogHelper.LogEditor("MainUIView UpdateRedDot");
             _valueBarController.UpRead();
             RedDotController.Instance.SetComRedDot(_btnGongGao, RedDotDataManager.Instance.GetNoticeRed(), "", -9, 12);
 

GameClient/Assets/Game/Launcher/Version/VersionController.cs

@@ -177,8 +177,8 @@ namespace GFGGame
         /// </summary>
         private string GetHostServerURL(string packageName)
         {
-            //string hostServerIP = "http://10.108.64.127";
-            string hostServerIP = LauncherConfig.CDN_ROOT;
+            string hostServerIP = "http://10.108.64.127";
+            //string hostServerIP = LauncherConfig.CDN_ROOT;
 
 #if UNITY_EDITOR
             if (UnityEditor.EditorUserBuildSettings.activeBuildTarget == UnityEditor.BuildTarget.Android)

GameClient/Assets/ResIn/Prefab/SceneMain.prefab

@@ -1,87 +1,5 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
---- !u!1 &846544056943548434
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 2397053893390390833}
-  - component: {fileID: 2950675430542732463}
-  m_Layer: 0
-  m_Name: Bg1
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &2397053893390390833
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 846544056943548434}
-  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_Children: []
-  m_Father: {fileID: 8934048990737965464}
-  m_RootOrder: 1
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!212 &2950675430542732463
-SpriteRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 846544056943548434}
-  m_Enabled: 1
-  m_CastShadows: 0
-  m_ReceiveShadows: 0
-  m_DynamicOccludee: 1
-  m_MotionVectors: 1
-  m_LightProbeUsage: 1
-  m_ReflectionProbeUsage: 1
-  m_RayTracingMode: 0
-  m_RayTraceProcedural: 0
-  m_RenderingLayerMask: 1
-  m_RendererPriority: 0
-  m_Materials:
-  - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
-  m_StaticBatchInfo:
-    firstSubMesh: 0
-    subMeshCount: 0
-  m_StaticBatchRoot: {fileID: 0}
-  m_ProbeAnchor: {fileID: 0}
-  m_LightProbeVolumeOverride: {fileID: 0}
-  m_ScaleInLightmap: 1
-  m_ReceiveGI: 1
-  m_PreserveUVs: 0
-  m_IgnoreNormalsForChartDetection: 0
-  m_ImportantGI: 0
-  m_StitchLightmapSeams: 1
-  m_SelectedEditorRenderState: 0
-  m_MinimumChartSize: 4
-  m_AutoUVMaxDistance: 0.5
-  m_AutoUVMaxAngle: 89
-  m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: 0
-  m_SortingLayer: 0
-  m_SortingOrder: -999
-  m_Sprite: {fileID: 21300000, guid: eee2437b6cdf59c46a1f6936ab081a3e, type: 3}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_FlipX: 0
-  m_FlipY: 0
-  m_DrawMode: 0
-  m_Size: {x: 10.8046875, y: 24}
-  m_AdaptiveModeThreshold: 0.5
-  m_SpriteTileMode: 0
-  m_WasSpriteAssigned: 1
-  m_MaskInteraction: 0
-  m_SpriteSortPoint: 0
 --- !u!1 &1202262495373414002
 GameObject:
   m_ObjectHideFlags: 0
@@ -153,7 +71,7 @@ SpriteRenderer:
   m_SortingLayerID: 0
   m_SortingLayer: 0
   m_SortingOrder: -999
-  m_Sprite: {fileID: 21300000, guid: 1813906bd64fd34458617bdd17d54c02, type: 3}
+  m_Sprite: {fileID: 0}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_FlipX: 0
   m_FlipY: 0
@@ -161,7 +79,7 @@ SpriteRenderer:
   m_Size: {x: 10.8046875, y: 24}
   m_AdaptiveModeThreshold: 0.5
   m_SpriteTileMode: 0
-  m_WasSpriteAssigned: 1
+  m_WasSpriteAssigned: 0
   m_MaskInteraction: 0
   m_SpriteSortPoint: 0
 --- !u!1 &8405276316792503526
@@ -193,7 +111,7 @@ Transform:
   m_Children:
   - {fileID: 3768987550495608174}
   m_Father: {fileID: 8934048990737965464}
-  m_RootOrder: 2
+  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &8934048990737965465
 GameObject:
@@ -223,7 +141,6 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 2432797848204161373}
-  - {fileID: 2397053893390390833}
   - {fileID: 2103957189071858077}
   m_Father: {fileID: 0}
   m_RootOrder: 0

GameClient/Assets/Resources/BuildinFileManifest.asset

@@ -16,34 +16,46 @@ MonoBehaviour:
   - 0022efeddce4602e7d1e442c7701ee3f.bundle
   - 02487e152d8608731a6e7a55e0563253.bundle
   - 02ce29974818897a51ef54629546ecf7.bundle
+  - 035c787a8cdd4a7747fe176b34ac3155.bundle
   - 0454346e3a595910522b7cb059895b27.bundle
+  - 0486e3cd87c4bd5ff6361203db732ab9.bundle
   - 049d4eb5cc0c792a9735c8f5c951e6b2.bundle
   - 04c435915970bb91ecce6810e15fb72e.bundle
   - 050e07ea07ef205553b63824df7be4f2.bundle
   - 06007e1cb87e9b25a0183ae5d670495d.bundle
+  - 0724e886fd0248092d771d948b05483d.bundle
   - 08670e459551ea964350883d41600cc6.bundle
   - 0996ecb0c9b99198362049fd6dbef4a6.bundle
   - 0a6bf7f6303e4405132f05227d1a1a71.bundle
   - 0ac8f7b2bfe7e29cbe3bf37b30fffde9.bundle
+  - 0aee38006de3fcf950b27391c4faf97e.bundle
   - 0af6c381e44d02a04bd555d00d9486ed.bundle
   - 0b439b9b7105946a8272fc40aa434e95.bundle
   - 0b6e504ef3fa792a4d95fb7157d5e9d2.bundle
   - 0bebfab6d1bd175fecd91925bbc31039.bundle
   - 0c8111fd87db6cc20749d1dda5725d01.bundle
+  - 0e0d248e2e34a9f86e51bb3e84ff5dba.bundle
   - 0eda81b30c2c68a338e01242eec8b51b.bundle
   - 0efd79fdd1bbe9850215ed5643409188.bundle
   - 0fdb2cff1b4ce245d353457077dd564b.bundle
+  - 10a0d781857af2dc2d0bea9463402eae.bundle
   - 116cc3604898b17747b846f150e9ab50.bundle
   - 1183e151bdf0146b6f793ef117357c3b.bundle
   - 11c13fc21576755624af2f6656db47ec.bundle
+  - 12085b110b7def3032617b6077b02cfd.bundle
   - 126321ddf520c48afa135326f054a15b.bundle
+  - 12d15c825109752c59a3cdcfc7fe71e7.bundle
+  - 13253fe02d452a65f3248bb239101a69.bundle
   - 14ab28d46fb5c587b56859b3e71bcb0f.bundle
   - 14ee621d615442d94a90fb2956ece7f1.bundle
   - 158f05f624957192a7d8bdc742088108.bundle
+  - 159bdff7e77925b79c7747fb5a90ad1d.bundle
   - 16600930ee9ca474bab550b4c220a3a8.bundle
   - 16a9e7c9e96722a2cce2461d387496a5.bundle
   - 174abfbaa0a04c63164c92d9c6ec12d3.bundle
   - 175ec6f3984e9a6ebe1355fffe5fbda1.bundle
+  - 175fa0f75aef9746c20fd7adb60c3092.bundle
+  - 182f7e2783665f7e528aca511fa8dd66.bundle
   - 19d0c885a88cea2d2ebc9138179cc75f.bundle
   - 1b3a9a1b83d08daa9d7d701fc1b834aa.bundle
   - 1ced95b45cf0db006b3ef7056ee8e714.bundle
@@ -59,15 +71,17 @@ MonoBehaviour:
   - 2360d34f0d4ddea6f7d4e102498e293b.bundle
   - 2363dba7c0fc782311760c09d29f37ac.bundle
   - 23d9e0e5eadc26d11fe62d26dc7ee026.bundle
+  - 24036434e27be40b0282f94de0e84272.rawfile
   - 24c397ff63c287189090a5caa9196cef.bundle
   - 2619bd96be0c4e92bd65462dab89d453.bundle
   - 29628b9f5940f31d79f3ab51d0da2091.bundle
+  - 2a620a711a9a9280cd5e49b9be72453c.bundle
   - 2b36a21f09ff7043dd6bbf3ee951dbf1.bundle
   - 2b66554b0e73c397e6b05b90b0acd4ba.bundle
+  - 2c12e56fd715a9fa404601a93d8590a4.bundle
   - 2c92fce54dad8e6f3798dff97466de28.bundle
   - 2d58720d0433d0342f4666cbc5b10367.bundle
   - 2ea734d7783f8ece32f548eafac2de6f.bundle
-  - 2ebaf8122b91efa2fc55f8a6b0d84807.bundle
   - 2f4ff00b716a5603f600734fb2ed2e30.bundle
   - 2f8fa5b7bbc1b4e086b640a3fd89d256.bundle
   - 2fe2f431a63c70e91c743a39d59c1258.bundle
@@ -77,9 +91,12 @@ MonoBehaviour:
   - 3484e062c96706125df8e885d4132e8a.bundle
   - 34e2c34653d05bb4ffdc898204c7d8b4.bundle
   - 389467199645f812903296d771443a1d.bundle
+  - 39669f38d2790efac4caaed9f4c503b7.bundle
   - 39d890046b1512f6b9cdfbb3d99929f2.bundle
   - 3a308654fb045f01c80de0f5d9ea12b3.bundle
+  - 3af5bc4782400d1e70957067d41e53f2.bundle
   - 3c479cbd2c6d7a43e68bb2cdd7c038a9.bundle
+  - 3ce61619ec17d2005ca0706ecc7ba63d.bundle
   - 3d286ebebbce3a9a98d9f5002fd7dbc9.bundle
   - 3d458e1bc41e473041e027ec0068dd02.bundle
   - 3e0c455b6fe7dc856144aa95011c183c.bundle
@@ -89,12 +106,15 @@ MonoBehaviour:
   - 438f54d0d6446c3578bf311a0a165083.bundle
   - 4595391f4b01c2187bb20cb5832fa553.bundle
   - 4674f7baf2af99f17d2ae0d02a9429ed.bundle
+  - 480a495f672d771ea34fb144e60adedd.bundle
+  - 483cf53baa34a40ab0bd8183795802f9.bundle
   - 48a565a8b420ac9055b5b6b6566a02e4.bundle
   - 4a64fcba37c249dec24dbf0c68fc6074.bundle
   - 4ac6a089f0eb744f3e51afa0ad7e3423.bundle
   - 4d240e7d20503e6c4edbcb281e348840.bundle
   - 4d8a12c713c12e875c530cb3c91d2fdd.bundle
   - 4dfc2955ae82af2bc5213373f9e6f6a6.bundle
+  - 4e64a42e2a1c77b50545490af42b7851.bundle
   - 4e795b4d84a1e38457f60a5222c64043.bundle
   - 4f55440b4b9589227121662d8549753c.bundle
   - 4fba511be4453a35f007f15b1e1601fd.bundle
@@ -104,28 +124,30 @@ MonoBehaviour:
   - 532594f3077543a4a25f8919cb2c8468.bundle
   - 53f59600170f8f1e4848b8718cb1349d.bundle
   - 5755769bcf9eacabf117f0514c541247.bundle
+  - 57b00e45402a1cf4c4a8f2eef63d84f3.bundle
   - 57fbaa65226c7dd05c4abbd3a66ddb58.bundle
   - 59008fe3484e1a7a4a90ca2a0939da2d.bundle
   - 598320e2a6c3233413bdbe834d19f568.bundle
-  - 59990f8db90cdebc0bf07230fbe24be3.bundle
-  - 59de46f6096f778d45f5d1e4fc176606.bundle
+  - 5b1630b2feba8a46e1cf40403d4d7f05.bundle
   - 5c044014844579395ac3733be5835bba.bundle
+  - 5c3882728fdd4e1deab2b55a2a6d4650.bundle
   - 5c3a89599bf59fa23e211f950e57fa3d.bundle
   - 5c67c6d67753c4fd92ed3016c1b5f6ba.bundle
   - 5cc9a4f2d5a5e4a0963008058991ef8c.bundle
   - 5d1e9fdd3008cb9b8a3c370e11934cf7.bundle
-  - 5df15c17ff50acc75b58154622185fef.bundle
+  - 5dac5cc46f3dcc5dfa06982e423c6be6.bundle
   - 5e52bfcef49f0eabeed6731c5a20433e.bundle
   - 60fdfc568035f2e57494f2a446b97b00.bundle
+  - 6288512c84173c5e5c89160bdefd1254.bundle
   - 62e1382767a281635b4a9c00024cf350.bundle
   - 63e6afa476fb0dc90b32a7e36baa2846.bundle
   - 65f0100281fc41568c0d83a8c1cffb4f.bundle
   - 665eb8f1705c6322eac0ee1618a1153b.bundle
-  - 667965edc224d9405b60a72e626ec022.bundle
   - 671ce69c0fe9aededdb2a116cb6221dc.rawfile
   - 67660b23b205cf12c4d150b1084bb36f.bundle
   - 678540a583e2ecd285dd83971123a7c6.bundle
   - 67bf447d41dbf25a5a52e95be2307668.bundle
+  - 67fc2e176f4e8a185c99d6d5ef6dc125.bundle
   - 6a87336133ef165044f75a5a04ab8b3f.bundle
   - 6b56e7ee7ad99aea8539c3608a17b7a6.bundle
   - 6b5c375fe150a1e7dcb95b8ffe584485.bundle
@@ -134,8 +156,8 @@ MonoBehaviour:
   - 6dd1e186c69325132a3ea9e96b276f78.bundle
   - 6de517a784934ca28386aad5bbbfae6b.bundle
   - 6e64e29925851284e20dbed4932a6ab1.bundle
+  - 6e7ba1b2e58ab1aa6d397bedbff25379.bundle
   - 70c119f57c1b2bea00aadda63ea96818.bundle
-  - 71083bc729860116f6ba44495fbd4339.bundle
   - 723415e529d85280bb472c91098428ea.bundle
   - 73a721745314a855e511e02ab2164d39.bundle
   - 73fe61979b2e32408f986adecd35f545.bundle
@@ -144,9 +166,12 @@ MonoBehaviour:
   - 77a61c6823665f98391999d012164a01.bundle
   - 77bda917e80eefc38b5ebb3b76219d0f.bundle
   - 78222395461fb7157b648254aa161d85.bundle
+  - 78fb4f5648796ceee49bd2f120c8c4ee.bundle
   - 798f9e9030ad316a9a2b5e41b588eb2f.bundle
+  - 7d7466a2bc0061f56c831ac3d7b22c0f.bundle
   - 7ded0d12b721a22232eec463d25fb0ea.bundle
   - 80891ffa41d0c4b0fba836eb432e6f08.bundle
+  - 80a4909a72cbf87d82c9480c70fee133.bundle
   - 8199c8688c43f85dd809dcc999ba1490.bundle
   - 83ed18fc4e31997219d50d72725d37d7.bundle
   - 8468e74202b0e51069d29395d626c75e.bundle
@@ -154,10 +179,13 @@ MonoBehaviour:
   - 85b86aa30872bf935a82f7d6a7fda57b.bundle
   - 877d38589bf1c46ace3d5bb51a7ab79b.bundle
   - 87f568a5f57b0bb894f129b94de3e299.bundle
+  - 8b0fb27a330139bd34bf86b016de8be8.bundle
   - 8bddf307a930a529d05d77e2da1acdfc.bundle
   - 8be21da1d6bdcb6f5db77b607bc7babf.bundle
   - 8c1c0968284e0579dea84792a6bca4d2.bundle
+  - 8d3d4b3b541b982ed9876255b3e6a7ec.bundle
   - 8ffd7c57e1051292e6b97e72537c6681.bundle
+  - 9090c0b63a6cdd4b89c65d2f7148487b.bundle
   - 912a433997ebe357a73112f86aeeda23.bundle
   - 9130d5c40b77a3f4af15647c9fa63810.bundle
   - 91eacbd3f89615a6fe2828cede13ebf4.bundle
@@ -165,11 +193,13 @@ MonoBehaviour:
   - 93b7bfcc5320be29164bf63023825c39.bundle
   - 940e60dfd9998cf3bc0f34f20557f72d.bundle
   - 94adbe91abe3dfeeaa982958dc8bb6c5.bundle
+  - 95e89038c6dfbb3329210dd7890e38a3.bundle
   - 968e1eed9b9456f69aed73a9bb5763e0.bundle
   - 970a9b4507f476f11c7a01f310696f80.bundle
   - 9784cea0832145e7b59682b72688853f.bundle
   - 97d75d97fc2d187a2738ffaed44f23fd.bundle
   - 98822caa7a8c29a32c683a952d7f3dd0.bundle
+  - 99d4191549679d0d041b4d31a7d61b3f.bundle
   - 9a75ab3a160c5d8efee95fe78883b48f.bundle
   - 9a8eb599d44e6591749774b8e588356b.bundle
   - 9cb31c916d17eb2e748890c761dd25d3.bundle
@@ -177,8 +207,8 @@ MonoBehaviour:
   - 9e27821383225233c3ef6613e6b4102d.bundle
   - a1b314be0a5113e747bcfc9d949ed6e5.bundle
   - a27218799e24f02f000038af5f5e621e.bundle
-  - a3189ea2f009efcd8190cd349fe33192.bundle
   - a74042e18051c7f520349ce4880a2ebb.bundle
+  - aaa430e97456b83a324ba8e2f57b4fd2.bundle
   - ac00e9d1615c80397acbb09309d57792.bundle
   - ac57be5e35b817947c0c83a98608f8e8.bundle
   - accfaf33013ce932180a0396b836b8a6.bundle
@@ -191,16 +221,17 @@ MonoBehaviour:
   - b3672f1c19a9d9ec7054aed59298aa54.bundle
   - b3aeef69577122f64d613ba1e7fb9d04.bundle
   - b422c8b6cbbde5ee1566a92dd2d5598d.bundle
+  - b7019ee3793359223b7a02a5a212e740.bundle
   - b73f0b6d3c4b29f85333ae63379cfb15.bundle
   - b7412dced8d0bae799899247a4c54e68.bundle
   - b797a4bbf1da69bf10d6ae02016ef016.bundle
   - b876095d0b6738a903e3a7ea6e99b249.bundle
   - b8ca602890fc6b2a39b3424342b58fa6.bundle
+  - b8fcebe962bbee7097c7a864ed93abc2.bundle
   - bbb972e53160449c786b61b3c84e7e6b.bundle
   - bbf6387e4b41785c318e5ad872af00b3.bundle
   - bc1be44372373d2d98bdf92012c5b5d6.bundle
   - bd3dae5c98990c12856001a0d886bd67.bundle
-  - bd67f05d981c3e399df85bea2c6b39c0.bundle
   - bd839c9a83c48f76869d72b3d5a9244b.bundle
   - bda34824195b9ba41e4e4b6eeafe061d.bundle
   - bec153fb84f6e1c7761c2f8db5a1755f.bundle
@@ -208,10 +239,11 @@ MonoBehaviour:
   - bf6376721c30345a5225357a2319b4de.bundle
   - bf9181e727310baa960f7ebdfddba81e.bundle
   - c20499d4e3397db4a21f41faa48416ef.bundle
-  - c353e3aea24c7fddfbed1443cadc2b1c.bundle
+  - c6ff6f14c17fd958f5f519bf76698e32.bundle
   - c702e5af73ce94e101a3b399889d83fa.bundle
   - c7ea5b7bb096117479634419cf57959d.bundle
   - c8bed04fa7474914d3a0c739a719ba80.bundle
+  - c99f8ae869e4c8f8bddc0767b2892c15.bundle
   - c9da6e9b84c95c60010e55c6bffe176c.bundle
   - caab7ae6c0a4a229105b0f01a1e808bf.bundle
   - cb4c5f3a6776445acdcb99c401c02729.bundle
@@ -221,6 +253,8 @@ MonoBehaviour:
   - d0b9b8159ea6a4b8c2237774c6883b1a.bundle
   - d1b26d59414885bd476bd69b1b8c3773.bundle
   - d1b9224d96677a87c2f0b9506db076ee.bundle
+  - d38da0c2274a648454750785d0fbb8a4.rawfile
+  - d4e783a35755f891eb1a4d2d27fbc662.bundle
   - d5d057794aa3b6fc4ab97527112d320a.bundle
   - d5db2d91abc434b402126ded41c6c0de.bundle
   - d7a84bd3f0448a41fdda065b08e206a4.bundle
@@ -233,16 +267,21 @@ MonoBehaviour:
   - dacabb00c1f1fb5e76389c78597809b2.bundle
   - dae6ed170f8f8a5234a264c3192ae9fe.bundle
   - dc169e426f30cb0be133154de364a4be.bundle
+  - dca6261a808a3aed60b423d924ab4c8f.bundle
   - dda4aa7b85f32108c550c16477995dc6.bundle
+  - dda82611122f75b13f06025584fd9ea6.bundle
+  - ddbc5a47c2c20398c80e14b096a8d1f7.bundle
   - dddee4e0e039df8df7c3dd5e7d04c6a4.bundle
-  - de1d6e85ed46774210a45d0c00ee2851.bundle
   - de5499b71ea154c1802ddc335f39a083.bundle
+  - dee924094a26f135ff02df8dc26c54ad.bundle
   - e159838ed79107ebd8ad4c1eded1e120.bundle
   - e164e6e1fce19d2ad84cbacc7cfee066.bundle
+  - e185ea56b1b84732d55f6bf1fb7a7ac3.bundle
   - e1bb081904331d49492a7ce92bd4ec94.bundle
   - e4c6f2f5a1c22be0e094c90046cf6869.bundle
   - e4fc341b7a0994a19a749b82dd373ce3.bundle
   - e55421b812a21e33ac073f4d242547d5.bundle
+  - e569b40dffce52048539c292c9a2ef3d.bundle
   - e61e67034f3c41c383066ebdf7e3fbda.bundle
   - e7b58a107748abff46f82c27f8dbf1ee.bundle
   - ea43a9fd157a5711f74e4e2cb55314e6.bundle
@@ -261,10 +300,10 @@ MonoBehaviour:
   - f347953d4854a4d0d3d3ffee2cf84646.bundle
   - f920d30ab7646549760dcc98423428a2.bundle
   - f930d2debe28c4ac2cf446767335d7cb.bundle
-  - f95d6490388c31ff116d9c2b32d699c0.bundle
   - fa03cce44cd6c7dfd5fcea8412c3ee16.bundle
   - fb7a3defd9337f5594bef798c5a86a4b.bundle
   - fc8eb31490afe1cfa4cbf033fcbd2815.bundle
+  - fcdc2835aa4941743319533fed593c07.bundle
   - fce1299d4d76d24fa50d7bd51320f7ea.bundle
   - fd0dc2179c21c29c24f57a8b9e4cfcaf.bundle
   - fd85cdc869d28db6daa099f9868b3e76.bundle

GameClient/ProjectSettings/ProjectSettings.asset

@@ -164,7 +164,7 @@ PlayerSettings:
   androidSupportedAspectRatio: 1
   androidMaxAspectRatio: 2.1
   applicationIdentifier:
-    Android: com.shenyou.gfg.local
+    Android: com.shenyou.gfg.local.zgd
     Standalone: com.DefaultCompany.GFGClient
   buildNumber:
     Standalone: 0