zhangyuqian пре 11 месеци
родитељ
комит
6043dc53b4

+ 1 - 0
GameClient/Assets/Game/HotUpdate/Controller/GameController.cs

@@ -372,6 +372,7 @@ namespace GFGGame
             NewYearRedEnvelopeDataManager.Instance.Clear();
             MatchingCompetitionDataManager.Instance.MyNtextture = null;
             MatchingCompetitionDataManager.Instance.MathingDressDate.bgId = 0;
+            FieldWorkDataManager.Instance.IsAutoStart = false;
             GameGlobal.zoneScene.GetComponent<SessionComponent>()?.Disconnect();
             GameGlobal.zoneScene.GetComponent<ServerInfosComponent>()?.ServerInfoList?.Clear();
             GameGlobal.zoneScene.GetComponent<AccountInfoComponent>()?.Clear();

+ 1 - 0
GameClient/Assets/Game/HotUpdate/Data/FieldWorkDataManager.cs

@@ -46,6 +46,7 @@ namespace GFGGame
         {"壹","贰","叄","肆","伍","陆","柒","捌","玖","拾","拾壹","终"};
         public int guideLevelID = 100005009;
         public int MaxLevelId = 0;
+        public bool IsAutoStart = false;
         /// <summary>
         /// 更新战斗结算总分,含胜负
         /// </summary>

+ 2 - 3
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/FieldWork/UI_FieldWorkLevelInfoUI.cs

@@ -17,7 +17,7 @@ namespace UI.FieldWork
         public UI_Component1 m_guideTarget;
         public GList m_listBonus;
         public GButton m_btnStart;
-        public UI_Button1 m_btnSkip;
+        public GLoader m_btnSkip;
         public GList m_cardList;
         public const string URL = "ui://efym480mo8twl";
         public const string PACKAGE_NAME = "FieldWork";
@@ -76,7 +76,7 @@ namespace UI.FieldWork
             m_guideTarget = (UI_Component1)UI_Component1.Create(comp.GetChild("guideTarget"));
             m_listBonus = (GList)comp.GetChild("listBonus");
             m_btnStart = (GButton)comp.GetChild("btnStart");
-            m_btnSkip = (UI_Button1)UI_Button1.Create(comp.GetChild("btnSkip"));
+            m_btnSkip = (GLoader)comp.GetChild("btnSkip");
             m_cardList = (GList)comp.GetChild("cardList");
         }
         public void Dispose(bool disposeTarget = false)
@@ -92,7 +92,6 @@ namespace UI.FieldWork
             m_guideTarget = null;
             m_listBonus = null;
             m_btnStart = null;
-            m_btnSkip.Dispose();
             m_btnSkip = null;
             m_cardList = null;
             if(disposeTarget && target != null)

+ 29 - 13
GameClient/Assets/Game/HotUpdate/Views/FieldWork/FieldWorkLevelInfoView.cs

@@ -33,7 +33,7 @@ namespace GFGGame
             _ui.m_listBonus.itemRenderer = UpdateBonusItem;
             _ui.m_cardList.itemRenderer = RenderListCardItem;
             _ui.m_btnStart.onClick.Add(OnClickBtnStart);
-            _ui.m_btnSkip.target.onClick.Add(OnClickBtnSkip);
+            _ui.m_btnSkip.onClick.Add(OnClickBtnSkip);
             
         }
         protected override void OnShown()
@@ -50,6 +50,14 @@ namespace GFGGame
             InstanceZonesDataManager.FightScene = ConstInstanceZonesType.FieldWork;
             FieldWorkDataManager.Instance.CurFightIndex = 0;
             FieldWorkDataManager.Instance.currentLevelID = _levelID;
+            if (_ui.m_btnSkip.url == null ||_ui.m_btnSkip.url == "")
+            {
+                FieldWorkDataManager.Instance.IsAutoStart = false;
+            }
+            else
+            {
+                FieldWorkDataManager.Instance.IsAutoStart = true;
+            }
             UpDressdate();
             UpdateView();
             Timers.inst.AddUpdate(CheckGuide);
@@ -189,11 +197,21 @@ namespace GFGGame
             //判断是否搭配了三套衣服和词牌
             if (FieldWorkDataManager.Instance.SetCanStart())
             {
-                UpDressdate();
-                FieldWorkDataManager.Instance.GetFightResult();
-                FieldWorkDataManager.Instance.myScore.Clear();
-                EventAgent.DispatchEvent(ConstMessage.FieldWork_STARTCHANGE);
-                this.Hide();
+                if(FieldWorkDataManager.Instance.IsAutoStart)
+                {
+                    FieldWorkDataManager.Instance.myScore.Clear();
+                    FieldWorkDataManager.Instance.GetFightResult();
+                    this.Hide();
+                    ViewManager.Show<FieldWorkRoundResultView>();
+                }
+                else
+                {
+                    UpDressdate();
+                    FieldWorkDataManager.Instance.GetFightResult();
+                    FieldWorkDataManager.Instance.myScore.Clear();
+                    EventAgent.DispatchEvent(ConstMessage.FieldWork_STARTCHANGE);
+                    this.Hide();
+                }
             }
             else
             {
@@ -205,17 +223,15 @@ namespace GFGGame
         }
         private void OnClickBtnSkip()
         {
-            FieldWorkDataManager.Instance.currentLevelID = _levelID;
-            if (FieldWorkDataManager.Instance.SetCanStart())
+            if(FieldWorkDataManager.Instance.IsAutoStart)
             {
-                FieldWorkDataManager.Instance.myScore.Clear();
-                FieldWorkDataManager.Instance.GetFightResult();
-                this.Hide();
-                ViewManager.Show<FieldWorkRoundResultView>();
+                FieldWorkDataManager.Instance.IsAutoStart = false;
+                _ui.m_btnSkip.url = "";
             }
             else
             {
-                PromptController.Instance.ShowFloatTextPrompt("请优先完成三套搭配方案");
+                FieldWorkDataManager.Instance.IsAutoStart = true;
+                _ui.m_btnSkip.url = "ui://FieldWork/jrbzts_gou";
             }
         }
         private void CheckGuide(object param)

+ 1 - 1
GameClient/Assets/Game/HotUpdate/Views/FieldWork/FieldWorkLevelView.cs

@@ -233,7 +233,7 @@ namespace GFGGame
                         if (result)
                         {
                             UpdateLevel();
-                            PromptController.Instance.ShowFloatTextPrompt("跳过成功!");
+                            PromptController.Instance.ShowFloatTextPrompt("一键通关成功!");
                         }
                     });
                 }

BIN
GameClient/Assets/ResIn/UI/FieldWork/FieldWork_atlas0!a.png


BIN
GameClient/Assets/ResIn/UI/FieldWork/FieldWork_atlas0.png


BIN
GameClient/Assets/ResIn/UI/FieldWork/FieldWork_fui.bytes