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

Compare commits

merge into: server:master
Branches Tags
server:master
server:6001
server:hunfu
server:qq
server:banshu2001
server:banshu
server:dev
server:zijie
server:banshu1.0.0.1
...
pull from: server:qq
Branches Tags
server:6001
server:master
server:hunfu
server:qq
server:banshu2001
server:banshu
server:dev
server:zijie
server:banshu1.0.0.1

7 Commits
master ... qq

Author SHA1 Message Date
aozhiwei
6b5fe94573 1 2021-02-05 20:08:47 +08:00
aozhiwei
a514696ffb 1 2020-12-01 19:10:45 +08:00
aozhiwei
9828497ea9 1 2020-12-01 10:22:37 +08:00
aozhiwei
ab7e59a084 1 2020-11-20 16:19:52 +08:00
aozhiwei
b2916c51c2 1 2020-11-20 16:14:42 +08:00
aozhiwei
fb099b0f73 1 2020-11-20 14:27:11 +08:00
aozhiwei
93938eed5e 1 2020-11-20 14:06:33 +08:00
3 changed files with 13 additions and 8 deletions
Show Stats Expand all files Collapse all files

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

@ -339,11 +339,12 @@ class ActivityController{
phpcommon\sendError(ERR_USER_BASE + 1,'session失效'); phpcommon\sendError(ERR_USER_BASE + 1,'session失效');
return; return;
} }
if ($row['free_times'] + $row['video_times'] + 1 == 5) { if ($row['free_times'] + $row['video_times'] + 1 == 6) {
$day = 1; $day = 1;
if (phpcommon\extractChannel($account_id) == 6001 || if (phpcommon\extractChannel($account_id) == 6001 ||
phpcommon\extractChannel($account_id) == 6000 || phpcommon\extractChannel($account_id) == 6000 ||
phpcommon\extractChannel($account_id) == 6006) { phpcommon\extractChannel($account_id) == 6006 ||
phpcommon\extractChannel($account_id) == 6007) {
$day = $row['now_days']; $day = $row['now_days'];
} }
$g_conf_lot_cluster = require('../res/lottery@lottery.php'); $g_conf_lot_cluster = require('../res/lottery@lottery.php');
@ -798,7 +799,8 @@ class ActivityController{
$day = 1; $day = 1;
if (phpcommon\extractChannel($account_id) == DOUYIN_CHANNEL || if (phpcommon\extractChannel($account_id) == DOUYIN_CHANNEL ||
phpcommon\extractChannel($account_id) == 6001 || phpcommon\extractChannel($account_id) == 6001 ||
phpcommon\extractChannel($account_id) == 6000) { phpcommon\extractChannel($account_id) == 6000 ||
phpcommon\extractChannel($account_id) == 6007) {
$day = date('w', time()); $day = date('w', time());
if ($day == 0) { if ($day == 0) {
$day = 7; $day = 7;
@ -1001,7 +1003,8 @@ class ActivityController{
$day = 1; $day = 1;
if ($type == 1) { if ($type == 1) {
if (phpcommon\extractChannel($accountid) == 6001 || if (phpcommon\extractChannel($accountid) == 6001 ||
phpcommon\extractChannel($accountid) == 6000) { phpcommon\extractChannel($accountid) == 6000 ||
phpcommon\extractChannel($accountid) == 6007) {
$day = $days; $day = $days;
} }
} }
@ -1068,7 +1071,8 @@ class ActivityController{
if ($type == 1) { if ($type == 1) {
if (phpcommon\extractChannel($accountid) == 6001 || if (phpcommon\extractChannel($accountid) == 6001 ||
phpcommon\extractChannel($accountid) == 6006 || phpcommon\extractChannel($accountid) == 6006 ||
phpcommon\extractChannel($accountid) == 6000) { phpcommon\extractChannel($accountid) == 6000 ||
phpcommon\extractChannel($accountid) == 6007) {
$day = date('w', time()); $day = date('w', time());
if ($day == 0) { if ($day == 0) {
$day = 7; $day = 7;

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

@ -58,7 +58,8 @@ class FriendController{
} }
} }
$avatar_url = $row['avatar_url']; $avatar_url = $row['avatar_url'];
if (phpcommon\extractChannel($row['accountid']) != 6001) { if (phpcommon\extractChannel($row['accountid']) != 6001 &&
phpcommon\extractChannel($row['accountid']) != 6007) {
$avatar_url = "https://wx.qlogo.cn/mmopen/vi_32/q4oRsMFYBwPEVAeVI7tiasWSqaibr0GPQia432JhibGRYhqqEJofpWDYxJPq6q0hQ0j7icdACdHL78hrjYYHSjZQ3YA/132"; $avatar_url = "https://wx.qlogo.cn/mmopen/vi_32/q4oRsMFYBwPEVAeVI7tiasWSqaibr0GPQia432JhibGRYhqqEJofpWDYxJPq6q0hQ0j7icdACdHL78hrjYYHSjZQ3YA/132";
} }

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

@ -165,8 +165,8 @@ class GameOverController{
//道具物品 //道具物品
$first_list = array(); $first_list = array();
if (phpcommon\extractChannel($account_id) == 6001 || if (phpcommon\extractChannel($account_id) == 6001 ||
phpcommon\extractChannel($account_id) == 6007 || phpcommon\extractChannel($account_id) == 6000 ||
phpcommon\extractChannel($account_id) == 6000) { phpcommon\extractChannel($account_id) == 6007) {
array_push($first_list, array( array_push($first_list, array(
'item_id' => 18006, 'item_id' => 18006,
'item_num' => $num, 'item_num' => $num,