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

1

Browse Source
This commit is contained in:
aozhiwei 2020-06-04 20:13:12 +08:00
parent c1d9b71757
commit 5c94b86b61
2 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -453,7 +453,7 @@ class ActivityController{
return;
}
if ($row['free_times'] + $row['video_times'] + 1 == 3) {
if ($row['free_times'] + $row['video_times'] + 1 == 5) {
$g_conf_lot_cluster = require('../res/lottery@lottery.php');
for($g = 1; $g <= count($g_conf_lot_cluster); $g++) {
$l = $this->getLottery($g);

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

@ -40,7 +40,9 @@ class ShopController{
'discount' => $item_conf['discount'],
'shop_type' => $item_conf['shop_type'],
'type' => $item_conf['fuction'],
'bug_groupnum' => $item_conf['bug_groupnum']
'bug_groupnum' => $item_conf['bug_groupnum'],
'shop_list' => $item_conf['shop_list'],
'bug_groupnum' => $item_conf['bug_groupnum'],
);
return $it;
}
@ -121,7 +123,7 @@ class ShopController{
'price' => $shop['price'],
'tip' => $shop['tip'],
'status' => $shop['status'],
'time' => $shop['time']
'time' => $shop['time'],
));
}
}
@ -168,7 +170,7 @@ class ShopController{
if ($r['status'] == 2 || $r['active_time'] != 0) {
continue;
}
if ($it['type'] == 10) {
if ($it['type'] == 10 || $it['type'] == 11) {
continue;
}
$status = 1;
@ -180,8 +182,8 @@ class ShopController{
'id' => $it['id'],
));
}
if ($it['type'] == 10) {
$num = 10;
if ($it['type'] == 10 || $it['type'] == 11) {
$num = $it['bug_groupnum'];
}
array_push($coin_shop,array(
'id' => $it['id'],
@ -189,7 +191,8 @@ class ShopController{
'status' => $status,
'discount' => 0,
'coin_id' => 10001,
'num' => $num
'num' => $num,
'shop_list' => $it['shop_list'],
));
} else if ($it['shop_type'] == 2) {
if ($status == 0) {
@ -197,8 +200,8 @@ class ShopController{
'id' => $it['id'],
));
}
if ($it['type'] == 10) {
$num = 10;
if ($it['type'] == 10 || $it['type'] == 11) {
$num = $it['bug_groupnum'];
}
array_push($diamond_shop,array(
'id' => $it['id'],
@ -206,7 +209,8 @@ class ShopController{
'status' => $status,
'discount' => 0,
'coin_id' => 10003,
'num' => $num
'num' => $num,
'shop_list' => $it['shop_list'],
));
} else if ($it['shop_type'] == 3) {
if ($status == 0) {
@ -214,8 +218,8 @@ class ShopController{
'id' => $it['id'],
));
}
if ($it['type'] == 10) {
$num = 10;
if ($it['type'] == 10 || $it['type'] == 11) {
$num = $it['bug_groupnum'];
}
array_push($coin_shop,array(
'id' => $it['id'],
@ -223,7 +227,8 @@ class ShopController{
'status' => $status,
'discount' => 0,
'coin_id' => 10001,
'num' => $num
'num' => $num,
'shop_list' => $it['shop_list'],
));
if ($status == 0) {
array_push($rand_diamondshop,array(
@ -236,7 +241,8 @@ class ShopController{
'status' => $status,
'discount' => 0,
'coin_id' => 10003,
'num' => $num
'num' => $num,
'shop_list' => $it['shop_list'],
));
}
}
@ -374,7 +380,7 @@ class ShopController{
));
if ($row) {
$it = $this->getItem($id);
if ($row['status'] != 2 && $row['active_time'] == 0 && $it['type'] != 10) {
if ($row['status'] != 2 && $row['active_time'] == 0 && $it['type'] != 10 && $it['type'] != 11) {
phpcommon\sendError(ERR_USER_BASE + 4, '商品已购买');
return;
}