田野调查

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

@@ -207,15 +207,15 @@ namespace GFGGame
             GameGlobal.skipCheckOpen = StorageDataManager.Instance.GetStorageValue(ConstStorageId.SKIP_CHECK_OPEN) <= 0 ? false : true;
             GameGlobal.isEnterGame = true;
 
-            // bool result = await FieldSProxy.ReqFieldInstanceInfos();
-            // if (result && FieldDataManager.Instance.fieldInfos.hasBonus)
-            // {
-            //     bool result1 = await FieldSProxy.ReqFieldInstanceResult();
-            //     if (result1)
-            //     {
-            //         ViewManager.Show<FieldFightEndView>();
-            //     }
-            // }
+            bool result = await FieldSProxy.ReqFieldInstanceInfos();
+            if (result && FieldDataManager.Instance.fieldInfos.hasBonus)
+            {
+                bool result1 = await FieldSProxy.ReqFieldInstanceResult();
+                if (result1)
+                {
+                    ViewManager.Show<FieldFightEndView>();
+                }
+            }
         }
     }
 }

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

@@ -53,8 +53,9 @@ namespace GFGGame
     public class FieldDataManager : SingletonBase<FieldDataManager>
     {
 
-        public FieldInfos fieldInfos = new FieldInfos();
-        public FieldResult fieldResult = new FieldResult();
+        public FieldInfos fieldInfos= new FieldInfos();
+        public FieldResult fieldResult;//= new FieldResult();
+
 
         /// <summary>
         ///当前难度的副本Id

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

@@ -16,21 +16,23 @@ namespace GFGGame
             {
                 if (response.Error == ErrorCode.ERR_Success)
                 {
-                    FieldInfos fieldInfos = FieldDataManager.Instance.fieldInfos;
-                    fieldInfos.theme = response.Theme;
-                    fieldInfos.highestLvls = new Dictionary<int, int>();
+                    // FieldInfos fieldInfos =new FieldInfos();
+                    FieldDataManager.Instance.fieldInfos.theme = response.Theme;
+                    FieldDataManager.Instance.fieldInfos.highestLvls = new Dictionary<int, int>();
                     for (int i = 0; i < response.kHighestLvl.Count; i++)
                     {
-                        fieldInfos.highestLvls.Add(response.kHighestLvl[i], response.vHighestLvl[i]);
+                        FieldDataManager.Instance.fieldInfos.highestLvls.Add(response.kHighestLvl[i], response.vHighestLvl[i]);
                     }
-                    fieldInfos.bonusWeekly = response.BonusWeekly;
-                    fieldInfos.bonusMaxLimit = response.BonusMaxLimit;
-                    fieldInfos.hasBonus = response.HasBonus;
-                    fieldInfos.taskDic = new Dictionary<int, int>();
+                    FieldDataManager.Instance.fieldInfos.bonusWeekly = response.BonusWeekly;
+                    FieldDataManager.Instance.fieldInfos.bonusMaxLimit = response.BonusMaxLimit;
+                    FieldDataManager.Instance.fieldInfos.hasBonus = response.HasBonus;
+                    FieldDataManager.Instance.fieldInfos.taskDic = new Dictionary<int, int>();
                     for (int i = 0; i < response.kTaskIds.Count; i++)
                     {
-                        fieldInfos.taskDic.Add(response.kTaskIds[i], response.vTaskStatus[i]);
+                        FieldDataManager.Instance.fieldInfos.taskDic.Add(response.kTaskIds[i], response.vTaskStatus[i]);
                     }
+                    //  FieldDataManager.Instance.fieldInfos=fieldInfos;
+
                     return true;
                 }
             }
@@ -44,24 +46,24 @@ namespace GFGGame
             {
                 if (response.Error == ErrorCode.ERR_Success)
                 {
-                    FieldResult fieldResult = FieldDataManager.Instance.fieldResult;
-                    fieldResult.passLvl = response.PassLvl;
-                    fieldResult.bonusList = ItemUtil.CreateItemDataList(response.BonusList);
-                    fieldResult.costNum = response.CostNum;
-                    fieldResult.chapterId = response.ChapterId;
+                    // FieldResult fieldResult = FieldDataManager.Instance.fieldResult;
+                    FieldDataManager.Instance.fieldResult.passLvl = response.PassLvl;
+                    FieldDataManager.Instance.fieldResult.bonusList = ItemUtil.CreateItemDataList(response.BonusList);
+                    FieldDataManager.Instance.fieldResult.costNum = response.CostNum;
+                    FieldDataManager.Instance.fieldResult.chapterId = response.ChapterId;
 
-                    FieldInfos fieldInfos = FieldDataManager.Instance.fieldInfos;
-                    fieldInfos.highestLvls[fieldResult.chapterId] = response.HighestLvl;
-                    fieldInfos.bonusWeekly = response.BonusWeekly;
+                    // FieldInfos fieldInfos = FieldDataManager.Instance.fieldInfos;
+                    FieldDataManager.Instance.fieldInfos.highestLvls[FieldDataManager.Instance.fieldResult.chapterId] = response.HighestLvl;
+                    FieldDataManager.Instance.fieldInfos.bonusWeekly = response.BonusWeekly;
                     for (int i = 0; i < response.kTaskIds.Count; i++)
                     {
-                        if (!fieldInfos.taskDic.ContainsKey(response.kTaskIds[i]))
+                        if (!FieldDataManager.Instance.fieldInfos.taskDic.ContainsKey(response.kTaskIds[i]))
                         {
-                            fieldInfos.taskDic.Add(response.kTaskIds[i], response.vTaskStatus[i]);
+                            FieldDataManager.Instance.fieldInfos.taskDic.Add(response.kTaskIds[i], response.vTaskStatus[i]);
                         }
                         else
                         {
-                            fieldInfos.taskDic[response.kTaskIds[i]] = response.vTaskStatus[i];
+                            FieldDataManager.Instance.fieldInfos.taskDic[response.kTaskIds[i]] = response.vTaskStatus[i];
                         }
                     }
                     return true;
@@ -77,9 +79,9 @@ namespace GFGGame
             {
                 if (response.Error == ErrorCode.ERR_Success)
                 {
-                    FieldInfos fieldInfos = FieldDataManager.Instance.fieldInfos;
-                    fieldInfos.bonusMaxLimit = response.BonusMaxLimit;
-                    fieldInfos.taskDic[response.TaskId] = response.TaskStatus;
+                    // FieldInfos fieldInfos = FieldDataManager.Instance.fieldInfos;
+                    FieldDataManager.Instance.fieldInfos.bonusMaxLimit = response.BonusMaxLimit;
+                    FieldDataManager.Instance.fieldInfos.taskDic[response.TaskId] = response.TaskStatus;
                     return true;
                 }
             }

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

@@ -32,11 +32,11 @@ namespace GFGGame
 
             _ui.m_c1.onChanged.Add(OnDifficultyChange);
 
-            FieldDataManager.Instance.fieldInfos.theme = 1;
-            FieldDataManager.Instance.fieldInfos.bonusWeekly = 250;
-            FieldDataManager.Instance.fieldInfos.bonusMaxLimit = 800;
-            FieldDataManager.Instance.fieldInfos.highestLvls = new System.Collections.Generic.Dictionary<int, int>();
-            FieldDataManager.Instance.fieldInfos.taskDic = new System.Collections.Generic.Dictionary<int, int>();
+            // FieldDataManager.Instance.fieldInfos.theme = 1;
+            // FieldDataManager.Instance.fieldInfos.bonusWeekly = 250;
+            // FieldDataManager.Instance.fieldInfos.bonusMaxLimit = 800;
+            // FieldDataManager.Instance.fieldInfos.highestLvls = new System.Collections.Generic.Dictionary<int, int>();
+            // FieldDataManager.Instance.fieldInfos.taskDic = new System.Collections.Generic.Dictionary<int, int>();
         }
 
         protected override void OnShown()