|
@@ -91,9 +91,9 @@ class Ins_TaskStep_Active extends Object_ext {
|
|
|
*/
|
|
|
function isStatusType() {
|
|
|
return $this->mo()->cmd == Enum_ActiveTaskCmdType::SetSpecialQualGem || $this->mo()->cmd == Enum_ActiveTaskCmdType::DailyLogin #
|
|
|
- || $this->mo()->cmd == Enum_ActiveTaskCmdType::AnyEquipUpLevel_X || $this->mo()->cmd == Enum_ActiveTaskCmdType::AllEquipUpLevel_X || $this->mo()->cmd == Enum_ActiveTaskCmdType::OnLogin_X #
|
|
|
- || $this->mo()->cmd == Enum_ActiveTaskCmdType::PassLayer_ChallengeGate || $this->mo()->cmd == Enum_ActiveTaskCmdType::UserLevel_X || $this->mo()->cmd == Enum_ActiveTaskCmdType::RankPrize_Num#
|
|
|
- || $this->mo()->cmd == Enum_ActiveTaskCmdType::PassMainChallengeGate_X_Num;
|
|
|
+ || $this->mo()->cmd == Enum_ActiveTaskCmdType::AnyEquipUpLevel_X || $this->mo()->cmd == Enum_ActiveTaskCmdType::AllEquipUpLevel_X || $this->mo()->cmd == Enum_ActiveTaskCmdType::OnLogin_X #
|
|
|
+ || $this->mo()->cmd == Enum_ActiveTaskCmdType::PassLayer_ChallengeGate || $this->mo()->cmd == Enum_ActiveTaskCmdType::UserLevel_X || $this->mo()->cmd == Enum_ActiveTaskCmdType::RankPrize_Num#
|
|
|
+ || $this->mo()->cmd == Enum_ActiveTaskCmdType::PassMainChallengeGate_X_Num || $this->mo()->cmd == Enum_ActiveTaskCmdType::CompleteNumQiLing || $this->mo()->cmd == Enum_ActiveTaskCmdType::CompleteNumSpecialQiLing;
|
|
|
}
|
|
|
|
|
|
function calcStatusCur() {
|
|
@@ -116,27 +116,31 @@ class Ins_TaskStep_Active extends Object_ext {
|
|
|
}
|
|
|
|
|
|
switch ($mo->cmd) {
|
|
|
+ case Enum_ActiveTaskCmdType::CompleteNumQiLing:
|
|
|
+ return ctx()->gates->evolveMaxId_left;
|
|
|
+ case Enum_ActiveTaskCmdType::CompleteNumSpecialQiLing:
|
|
|
+ return ctx()->gates->evolveMaxId_right;
|
|
|
case Enum_ActiveTaskCmdType::PassMainChallengeGate_X_Num:
|
|
|
$gateId = $para0;
|
|
|
$gateInfo = ctx()->gates->GateList->$gateId;
|
|
|
$state = $gateInfo->tz_state;
|
|
|
-
|
|
|
- if($state >= $para1){
|
|
|
+
|
|
|
+ if ($state >= $para1) {
|
|
|
return 1;
|
|
|
}
|
|
|
return 0;
|
|
|
case Enum_ActiveTaskCmdType::RankPrize_Num:
|
|
|
$arr = ctx()->privateState->rankReward_drawed_MainGate;
|
|
|
$num = count($arr);
|
|
|
-
|
|
|
+
|
|
|
$arr2 = ctx()->privateState->rankReward_drawed_fightPower;
|
|
|
$num += count($arr2);
|
|
|
-
|
|
|
+
|
|
|
return $num;
|
|
|
case Enum_ActiveTaskCmdType::UserLevel_X:
|
|
|
return ctx()->baseInfo->level;
|
|
|
case Enum_ActiveTaskCmdType::DailyLogin: # 每日登录
|
|
|
- return 1;
|
|
|
+ return 1;
|
|
|
case Enum_ActiveTaskCmdType::SetSpecialQualGem: # 镶嵌3个普通品质以上宝石
|
|
|
$gemEquip = ctx()->store->gemEquip;
|
|
|
$num = 0;
|
|
@@ -188,7 +192,7 @@ class Ins_TaskStep_Active extends Object_ext {
|
|
|
if (TimeUtil::totalDays(now()) == $i) {
|
|
|
break;
|
|
|
}
|
|
|
- }
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
return $day;
|