From b9e8097a221ade738574fca620ac674435e9eb75 Mon Sep 17 00:00:00 2001 From: hujiabin <519660157@qq.com> Date: Fri, 16 Jun 2023 15:03:20 +0800 Subject: [PATCH] 1 --- doc/BattlePass.py | Bin 2207 -> 2189 bytes .../controller/BaseAuthedController.class.php | 3 +- webapp/controller/MissionController.class.php | 47 ++++++++++-------- webapp/controller/PassController.class.php | 2 + webapp/mt/Task.php | 7 +++ 5 files changed, 37 insertions(+), 22 deletions(-) diff --git a/doc/BattlePass.py b/doc/BattlePass.py index 1d2296d853a840f66b5a40bfacadd36fd02415b4..d9521c2495e4d06a2748ad4a77bb844a6c1dcf51 100644 GIT binary patch literal 2189 zcmds2TWb?R6n@XI7!jOAlGwgUAV~2=!G}_O3t^e;PLh$mj5`}^5uqa5i%1l)X)Rt- zk>sU@iZ_hXKhxQC|AjM|%{IGDP}@Ga56hm}@0>H|oNvB44{{fCKz9sc*9xHFRdbi+ zN-9Mx>bM@zbjPwBJC)K+#2A^4eNTq;y3|s}8Mr`6~TAE?ADt^dy`A9R5 zC}E%oO3~`Q=u1GLjVufc0M@W4qu(IRgV`9uz)Y72fAv}La{r*;=j(00+B$4^6Tq75 zG^j+%K#6}1*OY%2aRpI&iP#3do2PYpMK4P51yr1#pCT7oOn4uaFsu%Yx|3hPx36Jj zq%*ONmtz)mF{6&nWUeW0U+K(}6+bbLQ_X5((vyx! zHORzwuqhflBf2@*T^s!9Ozfk#L~)3kDfn9-gXLHJ!v+L2zvaZ7Df$`lM`VYigUlawgNI#3js)ZkXmLF6NtyA#PE84Sc_iwg7W|{ER|z(a zxUh#(Q$dXAf?FjO_(-M3&r6b=Lf@!~JYqMjNv_k*R-%YuuCprS&yrAr%tPLhAn;~S zu{zWQAqxE4r}$ECwvayf{xpJS#yb&}6UqBo6*IhMmAv`yR)U?)@w94itWnX%V0^7N o4Ozi8Vr%j~60?$u$$u{M&XdXaPYGh%7zYpfFZ|bUkAus<0mnFpTmS$7 literal 2207 zcmZ?q402{*U|?ckU{p*oOPFt9*ZL=U(dy}zzs4lH$SB`C$$)=5oDf`w37mU^B7i4I&e~Ai&4t~i{Sm& zPuOLA+WaPd4Fh*#L1s#RvR+nkejZ`--Xh$}Xn1F?meAr2J1;pcao%-(+vfyTJxfjo zuB80Zyp)_&z2Xd*TA=$@%Kb3E0(Re-`3^8~RR8kbe9U<0++7txw^J$X{BxI@ZM3nq z*}=dEbez6pX>v(sex6=IB}gyGJo#r+RPdX}r73Idm-GGYYKbS;^4LW4yE0}rm>yu@ z0-5KOm<}}yY+l=`RXo?jOj4jUcK4}FESgiPlA@4ZXuWN+^yajwCs(k#%wgb#m{(E) z^fJVGVD~9p`NV?XeVpr;yt>`dvfO`RknVq3+x&XLh^cW}Q1g<5Gx7^aGmk0jXk$eD zY+KPSKVv1{=7}XN?l1QL1~V_TIJF3F9>|~1`bEJ01=864%iWpC|2(O_j6XxE;LMJ? z`L{k#`MaE%K@jZUoc!c$=ZwTmaFl@JLuun0lN7B3ZX{F4KmL;BNOghNc_Uh%V5W09-nbW;gJ`XqJ`6o?l*>%pE!OoL`yn~ zfgfgGKw>&HMnLXUUck`;jF0J}r_EZhyN~7Y{s5 zMMbH3$(4{0gqa8S@1@=p?B=oVd)Tw?;QtGgXL*Xp9K1R+_$L3JXL<}gAoscE=4WNX zq63^>RQgga!0F}oH685cvA5dRoO0+$xMsiCX~o>-HzWIOtQIIh%_}TL3P6ziRBH~t z0sHq>KEgPZ@`YWiYClg)nCFRkg{uUX6)ipbc0w2XLIz>5`^r-DN`eyevNQ9LG72oc zz-WZQ$mJHhdZC)egTVY1tFjedzxkp!_fTM!LmedDxMdai#?RBhLkuv}0RKF+(Sx7!{E6PmGOMyiUC>#l!$29-q_7mB=J6=vMj>%fx zyZ!~6<(K2-44j~FboT|B1u{oHvZeule6YA3H?EkU>M?t&<+sjztLig<^f`x1LE_iF zG&2QWyfDDR3rq)!;z)n|YQige>fU*1?$!1YjMgrkDp{i~=LjkP+)H6)DJYC!=D=v| z;U;)@)j`%97R-#*0&8;hh9_^O)S% z-Ux_RZQiWB`X7R7*8XW8ALFx~W%;J*#B53vn#|Owfu={?>;wb;TPaZS*eEE~gB*V7` zN9ul_=H+hbYe|8m6W_$5>{Mu~gN9#z+W~O+0cq_16)#x%P-f=TeJ^$eJLNrCvs-Yn clGxeh5cm0J78fJcZ=ieuGp}yX6D;Nd0BRtIxc~qF diff --git a/webapp/controller/BaseAuthedController.class.php b/webapp/controller/BaseAuthedController.class.php index 2722cb79..ca6eb670 100644 --- a/webapp/controller/BaseAuthedController.class.php +++ b/webapp/controller/BaseAuthedController.class.php @@ -19,6 +19,7 @@ require_once('mt/LevelUp.php'); require_once('mt/Task.php'); require_once('mt/Drop.php'); require_once('mt/StarLevel.php'); +require_once('mt/BattlePass.php'); use phpcommon\SqlHelper; use models\Bag; @@ -331,7 +332,7 @@ class BaseAuthedController extends BaseController { $userDb = $this->_safeGetOrmUserInfo(); $newlV = $userDb['level']; $newExp = $userDb['exp']+$itemNum; - \mt\LevelUp::getExpByLv($newlV,$newExp); + \mt\BattlePass::getExpByLv($newlV,$newExp); // if ($newlV != $userDb['level']){ // //协议通知前端等级变更 // $propertyChgService->addUserLevelChg(); diff --git a/webapp/controller/MissionController.class.php b/webapp/controller/MissionController.class.php index e521ade9..097d03e6 100644 --- a/webapp/controller/MissionController.class.php +++ b/webapp/controller/MissionController.class.php @@ -181,7 +181,7 @@ class MissionController extends BaseAuthedController { public function commitAll() { $type = getReqVal('type', 0); - $missionMetaList = mt\Task::getCustomTypeMetaList($type, $this->missionService); + $missionMetaList = mt\Task::getCustomTypeMetaList(0, $this->missionService); $missionHash = Mission::allToHash(); $missionDtoList = array(); $specMissionDto = null; @@ -193,33 +193,38 @@ class MissionController extends BaseAuthedController { if ($missionDto['state'] == Mission::RECEIVEABLE_STATE) { array_push($missionDtoList, $missionDto); } - if ($missionMeta['type'] == mt\Task::DAILY_MISSON_TYPE) { - if ($missionMeta['subtype'] == mt\Task::DAILY_ACTIVE_VALUE_MISSON_SUBTYPE) { - } else { - if ($missionDto['state'] == Mission::NOT_FINISHED_STATE) { - $notFinishedCount++; - } - if ($missionMeta['condition'] == mt\Task::FINISHED_ALL_DAILY_MISSION_COND && - $missionDto['state'] == Mission::NOT_FINISHED_STATE) { - $specMissionDto = &$missionDto; - } - } - } - } - if ($specMissionDto && - $specMissionDto['state'] == Mission::NOT_FINISHED_STATE && - $notFinishedCount <= 1) { - $specMissionDto['state'] = Mission::RECEIVEABLE_STATE; - array_push($missionDtoList, $missionDto); +// if ($missionMeta['type'] == mt\Task::DAILY_MISSON_TYPE) { +// if ($missionMeta['subtype'] == mt\Task::DAILY_ACTIVE_VALUE_MISSON_SUBTYPE) { +// } else { +// if ($missionDto['state'] == Mission::NOT_FINISHED_STATE) { +// $notFinishedCount++; +// } +// if ($missionMeta['condition'] == mt\Task::FINISHED_ALL_DAILY_MISSION_COND && +// $missionDto['state'] == Mission::NOT_FINISHED_STATE) { +// $specMissionDto = &$missionDto; +// } +// } +// } } +// if ($specMissionDto && +// $specMissionDto['state'] == Mission::NOT_FINISHED_STATE && +// $notFinishedCount <= 1) { +// $specMissionDto['state'] = Mission::RECEIVEABLE_STATE; +// array_push($missionDtoList, $missionDto); +// } foreach ($missionDtoList as $missionDto) { - $missionMeta = mt\Mission::get($missionDto['mission_id']); + $missionMeta = mt\Task::get($missionDto['mission_id']); $dropMeta = mt\Drop::get($missionMeta['reward']); if ($dropMeta) { $dropSource = 'mission:' . $missionDto['mission_id']; $this->_scatterDrop($dropSource, $dropMeta, $this->awardService, $this->propertyChgService); + Mission::add($missionDto['mission_id']); + if ( $missionMeta['type'] == \mt\Task::DAILY_MISSON_TYPE && + ! $missionMeta['subtype'] ){ + $this->_incDailyV(TN_DAILY_COMPLETE_TASK_NUM, 0, 1); + } } - $this->procSpecMissionCommit($missionDto, $missionMeta); +// $this->procSpecMissionCommit($missionDto, $missionMeta); } $this->_rspData(array( 'award' => $this->awardService->toDto(), diff --git a/webapp/controller/PassController.class.php b/webapp/controller/PassController.class.php index 3e8e7b8d..a3879a42 100644 --- a/webapp/controller/PassController.class.php +++ b/webapp/controller/PassController.class.php @@ -42,6 +42,8 @@ class PassController extends BaseAuthedController { $data = emptyReplace(json_decode($row['data'], true), array()); $this->_rspData(array( 'time_info' => array( + 'name'=>strtotime($this->currSeasonMeta['battlepass_name']), + 'sub_name'=>strtotime($this->currSeasonMeta['battlepass_sub_name']), 'begin_time'=>strtotime($this->currSeasonMeta['begin_time']), 'end_time'=>strtotime($this->currSeasonMeta['end_time']) ), diff --git a/webapp/mt/Task.php b/webapp/mt/Task.php index 918595e3..81e599cf 100644 --- a/webapp/mt/Task.php +++ b/webapp/mt/Task.php @@ -113,6 +113,13 @@ class Task { array_push($metaList, $meta); } } + }else if ($type == 0) { + foreach ($missionService->getDailyMissions() as $mission) { + $meta = self::get($mission['mission_id']); + if ($meta) { + array_push($metaList, $meta); + } + } } else { foreach (self::getMetaList() as $meta) { switch ($type) {