|
@@ -349,7 +349,7 @@ class TaskProc {
|
|
|
|
|
|
foreach ($taskCard->curSteps as &$tsp) { # 初期里面只有一个任务
|
|
foreach ($taskCard->curSteps as &$tsp) { # 初期里面只有一个任务
|
|
$tsp = new Ins_TaskStep($tsp);
|
|
$tsp = new Ins_TaskStep($tsp);
|
|
- if ($tsp->isStatusType()) { # 如果是道具收集类的, 扣除所收集道具
|
|
|
|
|
|
+ if ($tsp->mo()->cmd == Enum_TaskCmdType::GainItem) { # 如果是道具收集类的, 扣除所收集道具
|
|
$ok = StoreProc::removeItemFromStore($store, $tsp->mo()->paras, $tsp->mo()->num);
|
|
$ok = StoreProc::removeItemFromStore($store, $tsp->mo()->paras, $tsp->mo()->num);
|
|
my_Assert(ErrCode::ok == $ok, ErrCode::taskCard_gainItem_no);
|
|
my_Assert(ErrCode::ok == $ok, ErrCode::taskCard_gainItem_no);
|
|
}
|
|
}
|
|
@@ -363,9 +363,9 @@ class TaskProc {
|
|
$taskCard->state = Enum_TaskCardStateType::drawed;
|
|
$taskCard->state = Enum_TaskCardStateType::drawed;
|
|
//2021-3-4
|
|
//2021-3-4
|
|
$college = new Info_College($req->userInfo->game->college);
|
|
$college = new Info_College($req->userInfo->game->college);
|
|
- $college->modifyTaskCardState($taskCard->typeId, Enum_TaskCardStateType::drawed);
|
|
|
|
|
|
+ $college->modifyTaskCardState($taskCard->typeId, Enum_TaskCardStateType::drawed);
|
|
$req->userInfo->game->college = $college;
|
|
$req->userInfo->game->college = $college;
|
|
-
|
|
|
|
|
|
+
|
|
$store->taskcards->$taskCardUID = $taskCard; # 回写任务数据
|
|
$store->taskcards->$taskCardUID = $taskCard; # 回写任务数据
|
|
NormalEventProc::OnTaskCard_Reward($taskCard->mo()->reward, null); # 带入事件
|
|
NormalEventProc::OnTaskCard_Reward($taskCard->mo()->reward, null); # 带入事件
|
|
self::OnFinishTaskCard(); # 触发检查任务卡的任务卡[・_・?]
|
|
self::OnFinishTaskCard(); # 触发检查任务卡的任务卡[・_・?]
|
|
@@ -377,7 +377,7 @@ class TaskProc {
|
|
'gold' => $req->userInfo->game->baseInfo->gold,
|
|
'gold' => $req->userInfo->game->baseInfo->gold,
|
|
'cash' => $req->userInfo->game->baseInfo->cash,
|
|
'cash' => $req->userInfo->game->baseInfo->cash,
|
|
'store' => $req->userInfo->game->store,
|
|
'store' => $req->userInfo->game->store,
|
|
- 'college'=> $req->userInfo->game->college, )); # 返回值更新背包
|
|
|
|
|
|
+ 'college' => $req->userInfo->game->college,)); # 返回值更新背包
|
|
}
|
|
}
|
|
|
|
|
|
/**
|
|
/**
|
|
@@ -690,7 +690,7 @@ class TaskProc {
|
|
$taskParam = new Ins_TaskParams(Enum_TaskCmdType::PassGateN, $gateId, $difficulty);
|
|
$taskParam = new Ins_TaskParams(Enum_TaskCmdType::PassGateN, $gateId, $difficulty);
|
|
self::CheckTaskConditions($taskParam);
|
|
self::CheckTaskConditions($taskParam);
|
|
self::OnPassGate();
|
|
self::OnPassGate();
|
|
-
|
|
|
|
|
|
+ var_dump("通关剧情检测");
|
|
$taskEventArg = new Ins_TaskEventArgs(Enum_TaskCmdType::PassGateN, Enum_PropelType::set, 1, array($gateId, $difficulty));
|
|
$taskEventArg = new Ins_TaskEventArgs(Enum_TaskCmdType::PassGateN, Enum_PropelType::set, 1, array($gateId, $difficulty));
|
|
self::CheckTaskCardConditions($taskEventArg);
|
|
self::CheckTaskCardConditions($taskEventArg);
|
|
}
|
|
}
|