引导取消Gm

GameClient/Assets/Game/HotUpdate/Constant/ConstMessage.cs

@@ -11,6 +11,8 @@ namespace GFGGame
         public const string CJ_FINISH = "CJ_FINISH";
         public const string MAIL_REFRESH = "MAIL_REFRESH";
         public const string MAIL_CHANGE = "MAIL_CHANGE";
+        public const string MAIL_ADD = "MAIL_ADD";
+        public const string MAIL_DELETE = "MAIL_DELETE";
         public const string DRESS_FILTER = "DRESS_FILTER";
         public const string DRESS_SEARCH = "DRESS_SEARCH";
         public const string CARD_CHOOSE = "CARD_CHOOSE";

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

@@ -177,15 +177,14 @@ namespace GFGGame
             else
             {
                 MainStoryDataManager.currentChapterCfgId = 10001;
-                // if (GameGlobal.isFirstEntry == true)
-                // {
-                //     // ViewManager.Show(ViewName.STORY_CHAPTER_VIEW, StoryDataManager.currentChapter, new object[] { ViewName.STORY_CHAPTER_LIST_VIEW, });
-                //     StoryController.ShowPriorStoryDialog();
-                // }
-                // else
-                // {
-                ViewManager.Show(ViewName.STORY_CHAPTER_VIEW, MainStoryDataManager.currentChapterCfgId, new object[] { ViewName.STORY_CHAPTER_LIST_VIEW });
-                // }
+                if (GameGlobal.isFirstEntry == true)
+                {
+                    StoryController.ShowPriorStoryDialog();
+                }
+                else
+                {
+                    ViewManager.Show(ViewName.STORY_CHAPTER_VIEW, MainStoryDataManager.currentChapterCfgId, new object[] { ViewName.STORY_CHAPTER_LIST_VIEW });
+                }
             }
             Timers.inst.CallLater(AfterEnterGame);
         }

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

@@ -56,7 +56,7 @@ namespace GFGGame
                 LevelCfgId = levelCfgId,
                 Score = score,
                 NpcScore = npcScore,
-                UseRecommend = false
+                UseRecommend = useRecomend
             });
             bool isFirstFinish = false;
             if (response != null)

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

@@ -11,6 +11,7 @@ namespace ET
         {
             MailDataManager.Instance.TotolCount = message.TotolCount;
             MailDataManager.Instance.UnreadCount = message.UnreadCount;
+            EventAgent.DispatchEvent(ConstMessage.MAIL_CHANGE);
             await ETTask.CompletedTask;
         }
     }
@@ -67,7 +68,7 @@ namespace GFGGame
         public static async ETTask<bool> ReqMailContent(long mailId)
         {
             Mail2C_GetMailData response = null;
-            response = (Mail2C_GetMailData)await MessageHelper.SendToServer(new C2Mail_GetMailData() { RoleId = mailId });
+            response = (Mail2C_GetMailData)await MessageHelper.SendToServer(new C2Mail_GetMailData() { RoleId = RoleDataManager.roleId, MailId = mailId });
             if (response != null)
             {
                 if (response.Error == ErrorCode.ERR_Success)
@@ -77,6 +78,7 @@ namespace GFGGame
                     int state = response.Status;
                     string content = response.MailDetail.Content;
                     List<ItemData> itemDatas = ItemUtil.CreateItemDataList(response.MailDetail.ItemList);
+
                     MailDataManager.Instance.UpdateMailContent(response.MailId, state, content, itemDatas);
                     return true;
                 }
@@ -101,33 +103,34 @@ namespace GFGGame
             }
             return false;
         }
-        public static async ETTask<bool> ReqDeleteMail(long mailId)
+
+        public static async ETTask<bool> ReqAllMailRewards()
         {
-            Mail2C_DeleteMail response = null;
-            response = (Mail2C_DeleteMail)await MessageHelper.SendToServer(new C2Mail_DeleteMail() { MailId = mailId });
+            M2C_GetAllMailItems response = null;
+            response = (M2C_GetAllMailItems)await MessageHelper.SendToServer(new C2M_GetAllMailItems());
             if (response != null)
             {
                 if (response.Error == ErrorCode.ERR_Success)
                 {
-                    MailDataManager.Instance.TotolCount = response.TotolCount;
-                    EventAgent.DispatchEvent(ConstMessage.MAIL_CHANGE);
+                    List<ItemData> itemDatas = ItemUtil.CreateItemDataList(response.ItemList);
+                    BonusController.TryShowBonusList(itemDatas);
+                    EventAgent.DispatchEvent(ConstMessage.MAIL_REFRESH);
 
                     return true;
                 }
             }
             return false;
         }
-        public static async ETTask<bool> ReqAllMailRewards()
+        public static async ETTask<bool> ReqDeleteMail(long mailId)
         {
-            M2C_GetAllMailItems response = null;
-            response = (M2C_GetAllMailItems)await MessageHelper.SendToServer(new C2M_GetAllMailItems());
+            Mail2C_DeleteMail response = null;
+            response = (Mail2C_DeleteMail)await MessageHelper.SendToServer(new C2Mail_DeleteMail() { RoleId = RoleDataManager.roleId, MailId = mailId });
             if (response != null)
             {
                 if (response.Error == ErrorCode.ERR_Success)
                 {
-                    List<ItemData> itemDatas = ItemUtil.CreateItemDataList(response.ItemList);
-                    BonusController.TryShowBonusList(itemDatas);
-                    EventAgent.DispatchEvent(ConstMessage.MAIL_REFRESH);
+                    MailDataManager.Instance.TotolCount = response.TotolCount;
+                    // EventAgent.DispatchEvent(ConstMessage.MAIL_CHANGE);
 
                     return true;
                 }
@@ -137,7 +140,7 @@ namespace GFGGame
         public static async ETTask<bool> ReqDeleteAllMails()
         {
             Mail2C_DeleteAllMails response = null;
-            response = (Mail2C_DeleteAllMails)await MessageHelper.SendToServer(new C2Mail_DeleteAllMails());
+            response = (Mail2C_DeleteAllMails)await MessageHelper.SendToServer(new C2Mail_DeleteAllMails() { RoleId = RoleDataManager.roleId });
             if (response != null)
             {
                 if (response.Error == ErrorCode.ERR_Success)

GameClient/Assets/Game/HotUpdate/Views/DressUp/DressUpFightView.cs

@@ -111,7 +111,7 @@ namespace GFGGame
             InstanceZonesDataManager.usedRecommend = false;
             // _ui.m_comboBox.title = "我的套装";
             _ui.m_txtRecommendCount.SetVar("v1", "" + GameGlobal.myNumericComponent.GetAsInt(ET.NumericType.RecommendCount)).FlushVars();
-            // _ui.m_btnRecommend.enabled = GameGlobal.myNumericComponent.GetAsInt(ET.NumericType.RecommendCount) > 0;
+            _ui.m_btnRecommend.enabled = GameGlobal.myNumericComponent.GetAsInt(ET.NumericType.RecommendCount) > 0;
             _scoreIndex = _ui.m_partsList.m_comboBoxRarity.selectedIndex;
             _ui.m_btnAutoPlay.selected = EquipDataCache.cacher.autoPlay;
             _ui.m_btnAutoPlay.visible = FunctionOpenDataManager.Instance.CheckIsFunOpenById(ConstFunctionId.FUNCTION_AUTOPLAY_FIGHT, false);