|
@@ -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)
|