From 7798bd3463a8e272a8f32435faa46e82fd045213 Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期一, 27 五月 2019 14:12:47 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/MainInterfacePanel/TaskModel.cs | 19 +++++++++++++++++--
1 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/System/MainInterfacePanel/TaskModel.cs b/System/MainInterfacePanel/TaskModel.cs
index d6ca1a5..a435892 100644
--- a/System/MainInterfacePanel/TaskModel.cs
+++ b/System/MainInterfacePanel/TaskModel.cs
@@ -141,6 +141,8 @@
private int Times = 0;
private int NeedWaitTime = 4;
+ public int clientGuardDugeonTask { get; private set; }
+
private float mainTaskAutoWaitTime = 0f;
public readonly TaskWait taskWait = new TaskWait();
@@ -163,6 +165,9 @@
mainTaskAutoWaitTime = int.Parse(Task_Auto.Numerical3) / 1000f;
FairyAuTaskCount_Day = int.Parse(FuncConfigConfig.Get("RunTaskCnt").Numerical1.Split('|')[1].Split('_')[1]);
FairyAuTaskCount_Round = int.Parse(FuncConfigConfig.Get("RunTaskCnt").Numerical2.Split('|')[1].Split('_')[1]);
+
+ var cliengGuardConfig = FuncConfigConfig.Get("ClientGuardDungeon");
+ clientGuardDugeonTask = int.Parse(cliengGuardConfig.Numerical5);
}
public override void UnInit()
@@ -426,7 +431,7 @@
{
if (!ModelCenter.Instance.GetModel<TeamModel>().teamPrepare.isPreparing)
{
- RequestGetTaskAward("OK");
+ RequestGetTaskAward("OK", _TaskNow);
}
}
}
@@ -905,8 +910,13 @@
}
- public void RequestGetTaskAward(string _answer)
+ public void RequestGetTaskAward(string _answer, int taskId = 0)
{
+ if (taskId == clientGuardDugeonTask)
+ {
+ ClientGuardDungeon.RequestEnter();
+ return;
+ }
var sendInfo = new C0802_tagCNPCAnswer();
sendInfo.Answer = _answer;
@@ -1379,6 +1389,11 @@
yield break;
}
+ if (BossShowModel.Instance.BossShowing)
+ {
+ yield break;
+ }
+
if (BountyDic.ContainsKey(_taskID) || FairyAuDic.ContainsKey(_taskID))
{
yield return WaitingForSecondConst.WaitMS800;//缂撳啿涓�绉掑啀杩涜
--
Gitblit v1.8.0