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-25 14:02:31 +08:00
parent bf9b9f68c0
commit bdeba31bfb
2 changed files with 4 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -315,12 +315,8 @@ class ActivityController{
return;
}
if ($row['free_times'] + $row['video_times'] + 1 == 6) {
$day = 1;
if (phpcommon\extractChannel($account_id) == 6001 ||
phpcommon\extractChannel($account_id) == 6000 ||
phpcommon\extractChannel($account_id) == 6006) {
$day = $row['now_days'];
}
//$day = 1;
$day = $row['now_days'];
$g_conf_lot_cluster = require('../res/lottery@lottery.php');
for($g = 1; $g <= count($g_conf_lot_cluster); $g++) {
$l = $this->getLottery($g);
@ -331,14 +327,6 @@ class ActivityController{
}
}
$key = $lot_array[0]['key'];
// } else if ($row['free_times'] + $row['video_times'] + 1 == 6) {
// foreach ($user_db['draw_list'] as $draw) {
// if (isset($draw['status']) && $draw['status'] != 0) {
// continue;
// }
// $key = $draw['key'] + 1;
// }
} else {
foreach ($user_db['draw_list'] as $draw) {
if (isset($draw['status']) && $draw['status'] != 0) {
@ -677,10 +665,7 @@ class ActivityController{
$day = 1;
if ($type == 1) {
if (phpcommon\extractChannel($accountid) == 6001 ||
phpcommon\extractChannel($accountid) == 6000) {
$day = $days;
}
$day = $days;
}
for ($i = 1; $i <= count($g_conf_lot_cluster); $i++) {
$item_id = 0;

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

@ -199,7 +199,7 @@ class FriendController{
$robot_meta = getRobotConfig($robot_meta_cluster, $robot_id);
if ($robot_meta['name'] == $user_name) {
$flag = 1;
$accountid = '6000_2004_robot' . $i;
$accountid = '6511_2005_robot' . $i;
break;
}
}