adjust
This commit is contained in:
parent
054f084542
commit
78dc2ee5f3
@ -197,10 +197,6 @@ class FesActivityController{
|
|||||||
foreach ($user_db['info_list'] as &$us) {
|
foreach ($user_db['info_list'] as &$us) {
|
||||||
if ($us['id'] == $id) {
|
if ($us['id'] == $id) {
|
||||||
if ($us['status'] != 1) {
|
if ($us['status'] != 1) {
|
||||||
phpcommon\sendError(ERR_USER_BASE + 4, '奖励不可领');
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if ($us['type'] == '2') {
|
if ($us['type'] == '2') {
|
||||||
//扣除钻石
|
//扣除钻石
|
||||||
$userrow = $conn->execQueryOne(
|
$userrow = $conn->execQueryOne(
|
||||||
@ -231,7 +227,12 @@ class FesActivityController{
|
|||||||
die();
|
die();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
} else {
|
||||||
|
phpcommon\sendError(ERR_USER_BASE + 4, '奖励不可领');
|
||||||
|
return;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
$us['status'] = 2;
|
$us['status'] = 2;
|
||||||
$status = 2;
|
$status = 2;
|
||||||
$reward = metatable\getRewardInfo($user_db['act_id'], $id, 0);
|
$reward = metatable\getRewardInfo($user_db['act_id'], $id, 0);
|
||||||
|
@ -67,10 +67,9 @@ function getActInfo($act_conf)
|
|||||||
$info_list = array();
|
$info_list = array();
|
||||||
$conditions = getExplode($act_conf['condition']);
|
$conditions = getExplode($act_conf['condition']);
|
||||||
for ($i = 0; $i < count($conditions); $i++) {
|
for ($i = 0; $i < count($conditions); $i++) {
|
||||||
$status = $conditions[$i][0] == '1' ? 0: 1; // contition 1:video; 2: cost diamond
|
|
||||||
array_push($info_list,array(
|
array_push($info_list,array(
|
||||||
'id' => $i,
|
'id' => $i,
|
||||||
'status' => $status,
|
'status' => 0,
|
||||||
'times' => 0,
|
'times' => 0,
|
||||||
'type' => $conditions[$i][0],
|
'type' => $conditions[$i][0],
|
||||||
'condition' => $conditions[$i][1],
|
'condition' => $conditions[$i][1],
|
||||||
|
Loading…
x
Reference in New Issue
Block a user