田野调查

FGUIProject/assets/Field/FieldUI.xml

@@ -8,7 +8,7 @@
     <component id="n1_8jo9" name="btnBack" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="30,80">
       <relation target="" sidePair="left-left,top-top"/>
     </component>
-    <component id="n11_ohun" name="comBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="159,90">
+    <component id="n11_ohun" name="comValueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="159,90">
       <relation target="" sidePair="right-right,top-top"/>
     </component>
     <image id="n12_ohun" name="n12" src="ohuni" fileName="images/tydc_jbkuang_1.png" xy="166,202" group="n19_ohun"/>

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

@@ -35,7 +35,7 @@ namespace ET
             try
             {
                 accountSession = zoneScene.GetComponent<NetKcpComponent>().Create(NetworkHelper.ToIPEndPoint(address));
-                
+
                 a2CLoginAccount = (A2C_LoginAccount)await accountSession.Call(new C2A_LoginTest() { Account = account });
             }
             catch (Exception e)

GameClient/Assets/Game/HotUpdate/ETCodes/Hotfix/App/ServerInfo/ServerInfosComponentSystem.cs

@@ -21,6 +21,7 @@
         }
         public static void SetRecentlyServerInfo(this ServerInfosComponent self, long recentId)
         {
+            recentId = 2;
             self.recentlyServerInfo = self.ServerInfoList[recentId];
             self.CurrentServerId = (int)recentId;
         }

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Field/UI_FieldUI.cs

@@ -9,7 +9,7 @@ namespace UI.Field
         public GComponent target;
         public Controller m_c1;
         public GButton m_btnBack;
-        public GComponent m_comBar;
+        public GComponent m_comValueBar;
         public UI_Button1 m_btn0;
         public UI_Button1 m_btn1;
         public UI_Button1 m_btn2;
@@ -74,7 +74,7 @@ namespace UI.Field
         {
             m_c1 = comp.GetController("c1");
             m_btnBack = (GButton)comp.GetChild("btnBack");
-            m_comBar = (GComponent)comp.GetChild("comBar");
+            m_comValueBar = (GComponent)comp.GetChild("comValueBar");
             m_btn0 = (UI_Button1)UI_Button1.Create(comp.GetChild("btn0"));
             m_btn1 = (UI_Button1)UI_Button1.Create(comp.GetChild("btn1"));
             m_btn2 = (UI_Button1)UI_Button1.Create(comp.GetChild("btn2"));
@@ -95,7 +95,7 @@ namespace UI.Field
         {
             m_c1 = null;
             m_btnBack = null;
-            m_comBar = null;
+            m_comValueBar = null;
             m_btn0.Dispose();
             m_btn0 = null;
             m_btn1.Dispose();

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

@@ -369,7 +369,7 @@ namespace GFGGame
             {
                 FieldFightDataManager.Instance.CurrentCardId = InstanceZonesDataManager.currentCardId;
                 FieldFightDataManager.Instance.CurrentScoreType = InstanceZonesDataManager.currentScoreType;
-                FieldFightDataManager.Instance.CurrentScoreType = InstanceZonesDataManager.currentLevelCfgId;
+                FieldFightDataManager.Instance.currentLevelCfgId = InstanceZonesDataManager.currentLevelCfgId;
                 FieldFightDataManager.Instance.equipDatas = EquipDataCache.cacher.equipDatas;
             }
             if (hasFightTarget)

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

@@ -18,6 +18,7 @@ namespace GFGGame
         protected override void OnInit()
         {
             base.OnInit();
+            packageName = UI_FieldUI.PACKAGE_NAME;
             _ui = UI_FieldFightEndUI.Create();
             this.viewCom = _ui.target;
             this.viewCom.Center();
@@ -30,7 +31,7 @@ namespace GFGGame
         protected override void OnShown()
         {
             base.OnShown();
-
+            UpdateView();
         }
         private void UpdateView()
         {

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

@@ -25,6 +25,7 @@ namespace GFGGame
             this.viewCom.Center();
             this.modal = true;
             viewAnimationType = EnumViewAnimationType.ZOOM_CENTER;
+            this.clickBlankToClose = false;
 
             _ui.m_btnStop.onClick.Add(OnBtnStopClick);
         }
@@ -65,9 +66,10 @@ namespace GFGGame
 
                 InstanceZonesDataManager.currentCardId = FieldFightDataManager.Instance.CurrentCardId;
                 InstanceZonesDataManager.currentScoreType = FieldFightDataManager.Instance.CurrentScoreType;
-                InstanceZonesDataManager.currentLevelCfgId = FieldFightDataManager.Instance.CurrentScoreType;
+                InstanceZonesDataManager.currentLevelCfgId = FieldFightDataManager.Instance.currentLevelCfgId;
                 EquipDataCache.cacher.equipDatas = FieldFightDataManager.Instance.equipDatas;
 
+                ViewManager.Hide<FieldView>();
                 ViewManager.Show(ViewName.STORY_FIGHT_TARGET_VIEW);
             }
             _ui.m_txtTime.text = string.Format("{0}秒后自动进入下一轮", _time);
@@ -86,7 +88,6 @@ namespace GFGGame
                 bool result = await FieldSProxy.ReqFieldInstanceResult();
                 if (result)
                 {
-                    ViewManager.Hide<FieldView>();
                     ViewManager.Show<FieldFightEndView>();
                 }
             });

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

@@ -50,7 +50,7 @@ namespace GFGGame
 
             FieldCfg cfg = FieldCfgArray.Instance.GetCfg(_cfgs[index].chapterId);
 
-            item.m_txtDesc.text = string.Format("{0}难度挑战成功", cfg.name);
+            item.m_txtDesc.text = string.Format("{0}难度挑战成功轮", cfg.name);
             item.m_btnGet.m_txtTitle.text = string.Format("每周上限+{0}", _cfgs[index].addRewardLimit);
             item.m_btnGet.m_c1.selectedIndex = FieldDataManager.Instance.GetTaskState(_cfgs[index].id);
             if (item.m_btnGet.target.data == null)

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

@@ -8,14 +8,18 @@ namespace GFGGame
     public class FieldView : BaseWindow
     {
         private UI_FieldUI _ui;
+        private ValueBarController _valueBarController;
 
 
         private FieldCfg _curCfg;
         private FieldDataManager _dataManager;
         private int _selectedIndex = 0;
+
         public override void Dispose()
         {
             base.Dispose();
+            _valueBarController.Dispose();
+            _valueBarController = null;
         }
 
         protected override void OnInit()
@@ -31,6 +35,7 @@ namespace GFGGame
             _ui.m_btnTask.onClick.Add(OnBtnTaskClick);
 
             _ui.m_c1.onChanged.Add(OnDifficultyChange);
+            _valueBarController = new ValueBarController(_ui.m_comValueBar);
 
             // FieldDataManager.Instance.fieldInfos.theme = 1;
             // FieldDataManager.Instance.fieldInfos.bonusWeekly = 250;
@@ -42,12 +47,14 @@ namespace GFGGame
         protected override void OnShown()
         {
             base.OnShown();
+            _valueBarController.OnShown();
             _selectedIndex = 0;
             _ui.m_c1.selectedIndex = _selectedIndex;
 
             _curCfg = FieldCfgArray.Instance.dataArray[_selectedIndex];
             _dataManager = FieldDataManager.Instance;
             _dataManager.chapterId = _curCfg.id;
+            _dataManager.currFightLv = 1;
 
             FieldCfg[] cfgs = FieldCfgArray.Instance.dataArray;
             for (int i = 0; i < cfgs.Length; i++)

GameClient/Assets/Game/HotUpdate/Views/MainStory/StroyFightResultView.cs

@@ -144,20 +144,22 @@ namespace GFGGame
             {
                 _ui.m_c1.selectedIndex = 1;
                 Timers.inst.Remove(OnClickBtnClose);
-                ViewManager.Show<FieldView>();
 
                 if (!this._resultData.Result || FieldDataManager.Instance.currFightLv == FieldCfgArray.Instance.GetCfg(FieldDataManager.Instance.chapterId).num)
                 {
                     bool result = await FieldSProxy.ReqFieldInstanceResult();
                     if (result)
                     {
+                        ViewManager.Show<FieldView>();
                         ViewManager.Show<FieldFightEndView>();
                     }
                 }
                 else
                 {
+                    ViewManager.Show<FieldView>();
                     ViewManager.Show<FieldFightInfoView>();
                 }
+
             }
             else
             {