server/game2005api
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
aozhiwei 2020-12-28 17:29:36 +08:00
parent bdeba31bfb
commit 53a106371a
3 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
webapp/controller/PayActivityController.class.php
View File

@ -487,7 +487,7 @@ class PayActivityController{
} else if ($type == 2) { } else if ($type == 2) {
$item_list = $this->getSumReward($account_id, $user_db['sum_list'], $id, $draw_type); $item_list = $this->getSumReward($account_id, $user_db['sum_list'], $id, $draw_type);
} else if ($type == 3) { } else if ($type == 3) {
$item_list = $this->getQuestReward($account_id, $user_db, $type, $id, $idx); $item_list = $this->getQuestReward($account_id, $user_db, $type, $id, $idx, $draw_type);
} else if ($type == 4) { } else if ($type == 4) {
$item_list = $this->getShopReward($account_id, $user_db, $type, $id, $idx); $item_list = $this->getShopReward($account_id, $user_db, $type, $id, $idx);
} else if ($type == 5) { } else if ($type == 5) {
@ -595,7 +595,6 @@ class PayActivityController{
protected function getSumReward($account_id, $info_list, $id, $draw_type) protected function getSumReward($account_id, $info_list, $id, $draw_type)
{ {
error_log($id);
$act = metatable\getActPlusById($id); $act = metatable\getActPlusById($id);
$item_conf = metatable\getItemById($act['reward']); $item_conf = metatable\getItemById($act['reward']);
$item_list = array(); $item_list = array();
@ -629,16 +628,26 @@ class PayActivityController{
return $item_list; return $item_list;
} }
protected function getQuestReward($account_id, $user_db, $type, $id, $idx) protected function getQuestReward($account_id, $user_db, $type, $id, $idx, $condition)
{ {
$item_list = array(); $item_list = array();
foreach ($user_db['quest_list'] as &$us) { foreach ($user_db['quest_list'] as &$us) {
if ($us['id'] != $id) { if (!isset($us['id']) || $us['id'] != $id) {
continue; continue;
} }
$num = 0; $num = 0;
foreach ($us['quest_list'] as &$q) { foreach ($us['quest_list'] as &$q) {
if ($q['id'] != $idx || $q['status'] != 1) { if ($q['id'] != $idx) {
$num++;
continue;
}
if ($q['condition'] != $condition) {
$num++;
continue;
}
if ($q['status'] != 1) {
$num++; $num++;
continue; continue;
} }

4
webapp/controller/RoleController.class.php
View File

@ -438,8 +438,8 @@ class RoleController{
die(); die();
} }
$ret1 = $conn->execScript('INSERT INTO bag(accountid, id, color_id, status, num, active_time, create_time, modify_time) ' . $ret1 = $conn->execScript('INSERT INTO bag(accountid, id, color_id, status, num, active_time, create_time, modify_time) ' .
' VALUES(:account_id, :id, 0, :status, 300, :active_time, :create_time, :modify_time) ' . ' VALUES(:account_id, :id, 0, :status, 400, :active_time, :create_time, :modify_time) ' .
' ON DUPLICATE KEY UPDATE accountid=:account_id, id=:id, color_id=0, status=:status, num=200, active_time=:active_time, modify_time=:modify_time;', ' ON DUPLICATE KEY UPDATE accountid=:account_id, id=:id, color_id=0, status=:status, num=400, active_time=:active_time, modify_time=:modify_time;',
array( array(
':account_id' => $account_id, ':account_id' => $account_id,
':id' => 10010, ':id' => 10010,

2
webapp/controller/ShopController.class.php
View File

@ -488,7 +488,7 @@ class ShopController{
return; return;
} }
foreach ($user_db['shop_list'] as &$us) { foreach ($user_db['shop_list'] as &$us) {
if ($us['id'] != $id) { if (!isset($us['id']) || $us['id'] != $id) {
continue; continue;
} }
if ($us['reward']['refreshnum'] != '') { if ($us['reward']['refreshnum'] != '') {