1

res

@@ -1 +1 @@
-config
+../conf_test/game2004api/webapp/res2001_5991

webapp/classes/AddReward.php

@@ -13,7 +13,7 @@ class AddReward {
             'port' => $mysql_conf['port'],
             'user' => $mysql_conf['user'],
             'passwd' => $mysql_conf['passwd'],
-            'dbname' => 'gamedb2004_' . $mysql_conf['instance_id']
+            'dbname' => DBNAME_PREFIX . $mysql_conf['instance_id']
         ));
         return $conn;
     }

webapp/classes/Quest.php

@@ -14,7 +14,7 @@ class Quest{
             'port' => $mysql_conf['port'],
             'user' => $mysql_conf['user'],
             'passwd' => $mysql_conf['passwd'],
-            'dbname' => 'gamedb2004_' . $mysql_conf['instance_id']
+            'dbname' => DBNAME_PREFIX . $mysql_conf['instance_id']
         ));
         return $conn;
     }

webapp/controller/ActivityController.class.php

@@ -13,7 +13,7 @@ class ActivityController{
             'port' => $mysql_conf['port'],
             'user' => $mysql_conf['user'],
             'passwd' => $mysql_conf['passwd'],
-            'dbname' => 'gamedb2004_' . $mysql_conf['instance_id']
+            'dbname' => DBNAME_PREFIX . $mysql_conf['instance_id']
         ));
         return $conn;
     }

webapp/controller/AdditemController.class.php

@@ -9,7 +9,7 @@ class AdditemController{
             'port' => $mysql_conf['port'],
             'user' => $mysql_conf['user'],
             'passwd' => $mysql_conf['passwd'],
-            'dbname' => 'gamedb2004_' . $mysql_conf['instance_id']
+            'dbname' => DBNAME_PREFIX . $mysql_conf['instance_id']
         ));
         return $conn;
     }

webapp/controller/BagController.class.php

@@ -13,7 +13,7 @@ class BagController{
             'port' => $mysql_conf['port'],
             'user' => $mysql_conf['user'],
             'passwd' => $mysql_conf['passwd'],
-            'dbname' => 'gamedb2004_' . $mysql_conf['instance_id']
+            'dbname' => DBNAME_PREFIX . $mysql_conf['instance_id']
         ));
         return $conn;
     }

webapp/controller/EquipController.class.php

@@ -13,7 +13,7 @@ class EquipController{
             'port' => $mysql_conf['port'],
             'user' => $mysql_conf['user'],
             'passwd' => $mysql_conf['passwd'],
-            'dbname' => 'gamedb2004_' . $mysql_conf['instance_id']
+            'dbname' => DBNAME_PREFIX . $mysql_conf['instance_id']
         ));
         return $conn;
     }

webapp/controller/FriendController.class.php

@@ -13,7 +13,7 @@ class FriendController{
             'port' => $mysql_conf['port'],
             'user' => $mysql_conf['user'],
             'passwd' => $mysql_conf['passwd'],
-            'dbname' => 'gamedb2004_' . $mysql_conf['instance_id']
+            'dbname' => DBNAME_PREFIX . $mysql_conf['instance_id']
         ));
         return $conn;
     }
@@ -103,5 +103,41 @@ class FriendController{
             'errmsg' => '',
         ));
     }
+
+    public function changeRoleInfo()
+    {
+        $account_id = $_REQUEST['account_id'];
+        //登录校验
+        $login = loginVerify($account_id, $_REQUEST['session_id']);
+        if (!$login) {
+            phpcommon\sendError(ERR_USER_BASE + 1, 'session无效');
+            return;
+        }
+        $conn = $this->getMysql($account_id);
+        if (!$conn) {
+            phpcommon\sendError(ERR_USER_BASE + 1, '没有这个玩家');
+            return;
+        }
+        $user_name = $_REQUEST['user_name'];
+        $avatar_url = $_REQUEST['avatar_url'];
+        $ret = $conn->execScript('UPDATE user SET user_name=:user_name, avatar_url=:avatar_url,  modify_time=:modify_time ' .
+                                 ' WHERE accountid=:accountid;',
+                                 array(
+                                     ':user_name' => $user_name,
+                                     ':avatar_url' => $avatar_url,
+                                     ':modify_time' => time(),
+                                     ':accountid' => $account_id
+                                 ));
+        if (!$ret) {
+            die();
+            return;
+        }
+        echo json_encode(array(
+            'errcode' => 0,
+            'errmsg' => '',
+            'user_name' => $user_name,
+            'avatar_url' => $avatar_url,
+        ));
+    }
 }
 ?>

webapp/controller/GameOverController.class.php

@@ -13,7 +13,7 @@ class GameOverController{
             'port' => $mysql_conf['port'],
             'user' => $mysql_conf['user'],
             'passwd' => $mysql_conf['passwd'],
-            'dbname' => 'gamedb2004_' . $mysql_conf['instance_id']
+            'dbname' => DBNAME_PREFIX . $mysql_conf['instance_id']
         ));
         return $conn;
     }
@@ -129,7 +129,7 @@ class GameOverController{
         $rank = $_REQUEST['rank'];
         $type = 0;
         $coin = 0;
-        $score = 0;
+        $score = 5;
         $kills = 0;
         if (isset($_REQUEST['type'])) {
             $type = $_REQUEST['type'];
@@ -138,7 +138,7 @@ class GameOverController{
             $ar = $this->getRankReward($rank);
             $coin = $ar['zbmode_param'];
             if (isset($_REQUEST['kills'])) {
-                $score = $_REQUEST['kills'] * 10;
+                $score = $_REQUEST['kills'] * 10 + $score;
             }
         }
         //道具物品

webapp/controller/HangController.class.php

@@ -10,7 +10,7 @@ class HangController{
             'port' => $mysql_conf['port'],
             'user' => $mysql_conf['user'],
             'passwd' => $mysql_conf['passwd'],
-            'dbname' => 'gamedb2004_' . $mysql_conf['instance_id']
+            'dbname' => DBNAME_PREFIX . $mysql_conf['instance_id']
         ));
         return $conn;
     }

webapp/controller/PassController.class.php

@@ -13,7 +13,7 @@ class PassController{
             'port' => $mysql_conf['port'],
             'user' => $mysql_conf['user'],
             'passwd' => $mysql_conf['passwd'],
-            'dbname' => 'gamedb2004_' . $mysql_conf['instance_id']
+            'dbname' => DBNAME_PREFIX . $mysql_conf['instance_id']
         ));
         return $conn;
     }

webapp/controller/PayController.class.php

@@ -13,7 +13,7 @@ class PayController{
             'port' => $mysql_conf['port'],
             'user' => $mysql_conf['user'],
             'passwd' => $mysql_conf['passwd'],
-            'dbname' => 'gamedb2004_' . $mysql_conf['instance_id']
+            'dbname' => DBNAME_PREFIX . $mysql_conf['instance_id']
         ));
         return $conn;
     }

webapp/controller/PayNotifyController.class.php

@@ -12,7 +12,7 @@ class PayNotifyController{
             'port' => $mysql_conf['port'],
             'user' => $mysql_conf['user'],
             'passwd' => $mysql_conf['passwd'],
-            'dbname' => 'gamedb2004_' . $mysql_conf['instance_id']
+            'dbname' => DBNAME_PREFIX . $mysql_conf['instance_id']
         ));
         return $conn;
     }

webapp/controller/QuestController.class.php

@@ -13,7 +13,7 @@ class QuestController{
             'port' => $mysql_conf['port'],
             'user' => $mysql_conf['user'],
             'passwd' => $mysql_conf['passwd'],
-            'dbname' => 'gamedb2004_' . $mysql_conf['instance_id']
+            'dbname' => DBNAME_PREFIX . $mysql_conf['instance_id']
         ));
         return $conn;
     }

webapp/controller/RankController.class.php

@@ -10,7 +10,7 @@ class RankController{
             'port' => $mysql_conf['port'],
             'user' => $mysql_conf['user'],
             'passwd' => $mysql_conf['passwd'],
-            'dbname' => 'gamedb2004_' . $mysql_conf['instance_id']
+            'dbname' => DBNAME_PREFIX . $mysql_conf['instance_id']
         ));
         return $conn;
     }
@@ -122,8 +122,11 @@ class RankController{
         ini_set('memory_limit','3072M');
         //击杀榜
         $r = $this->getRedis();
-        /*$channel = phpcommon\extractChannel($account_id);
+        $channel = phpcommon\extractChannel($account_id);
         $kill_rank_db = $r->get("game2004api:kill_rank_" . $channel);
+        if ($_SERVER['HTTP_HOST'] == 'game2001api-banshu.kingsome.cn') {
+            $win_rank_db = $r->get("game2004api_2001:kill_rank_" . $channel);
+        }
         $kill_db = json_decode($kill_rank_db);
         $i = 0;
         foreach ($kill_db as $kill) {
@@ -177,11 +180,14 @@ class RankController{
             ));
             $i++;
 
-            }*/
+        }
 
         //胜场榜
         $channel = phpcommon\extractChannel($account_id);
         $win_rank_db = $r->get("game2004api:win_rank_" . $channel);
+        if ($_SERVER['HTTP_HOST'] == 'game2001api-banshu.kingsome.cn') {
+            $win_rank_db = $r->get("game2004api_2001:win_rank_" . $channel);
+        }
         $win_db = json_decode($win_rank_db);
         $i = 0;
         foreach ($win_db as $win) {
@@ -239,6 +245,9 @@ class RankController{
         //积分榜
         $channel = phpcommon\extractChannel($account_id);
         $integral_rank_db = $r->get("game2004api:integral_rank_" . $channel);
+        if ($_SERVER['HTTP_HOST'] == 'game2001api-banshu.kingsome.cn') {
+            $integral_rank_db = $r->get("game2004api_2001:integral_rank_" . $channel);
+        }
         $integral_db = json_decode($integral_rank_db);
         $i = 0;
         foreach ($integral_db as $integral) {
@@ -311,8 +320,8 @@ class RankController{
             'errcode' => 0,
             'errmsg' => "",
             'user_list' => $user_list,
-            //'kill_rank' => $kill_rank,
+            'kill_rank' => $kill_rank,
-            //'kill_list' => $kill_list,
+            'kill_list' => $kill_list,
             'win_rank' => $win_rank,
             'win_list' => $win_list,
             'integral_rank' => $integral_rank,

webapp/controller/RoleController.class.php

@@ -13,7 +13,7 @@ class RoleController{
             'port' => $mysql_conf['port'],
             'user' => $mysql_conf['user'],
             'passwd' => $mysql_conf['passwd'],
-            'dbname' => 'gamedb2004_' . $mysql_conf['instance_id']
+            'dbname' => DBNAME_PREFIX . $mysql_conf['instance_id']
         ));
         return $conn;
     }
@@ -146,8 +146,8 @@ class RoleController{
     public function roleInfo()
     {
         $account_id = $_REQUEST['account_id'];
-        $user_name = $_REQUEST['name'];
+        $user_name = '突击队员';
-        $avatar_url = $_REQUEST['avatar_url'];
+        $avatar_url = '1';
         $switch_id = 1;
         $switch_id = isset($_REQUEST['switch_id']);
         //登录校验
@@ -247,28 +247,10 @@ class RoleController{
                 'act_video_status' => 0,
                 'act_ad_status' => 0,
                 'biogame_times' => 0,
+                'user_name' => $user_name,
+                'avatar_url' => $avatar_url,
             ));
         } else {
-            if ($avatar_url != '') {
-                if ($user_name != $row['user_name']) {
-                    $ret = $conn->execScript('UPDATE user SET user_name=:user_name, modify_time=:modify_time ' .
-                                             ' WHERE accountid=:accountid;',
-                                             array(
-                                                 ':accountid' => $account_id,
-                                                 ':user_name' => $user_name,
-                                                 ':modify_time' => time()
-                                             ));
-                }
-                if ($avatar_url != $row['avatar_url']) {
-                    $ret = $conn->execScript('UPDATE user SET avatar_url=:avatar_url, modify_time=:modify_time ' .
-                                             ' WHERE accountid=:accountid;',
-                                             array(
-                                                 ':accountid' => $account_id,
-                                                 ':avatar_url' => $avatar_url,
-                                                 ':modify_time' => time()
-                                             ));
-                }
-            }
             $nowTime = phpcommon\getdayseconds(time());
             $daily_first_login = $row['daily_first_login'];
             $coin_times = $row['coin_times'];
@@ -359,6 +341,8 @@ class RoleController{
                 'act_video_status' => $row['act_video_status'],
                 'act_ad_status' => $act_ad_status,
                 'biogame_times' => $row['biogame_times'],
+                'user_name' => $row['user_name'],
+                'avatar_url' => $row['avatar_url'],
             ));
         }
     }
@@ -630,7 +614,8 @@ class RoleController{
         $rank = $_REQUEST['rank'];
         $ar = $this->getRankReward($rank);
         $coin_num = $ar['zbmode_param'];
-        $row = $conn->execQueryOne('SELECT daily_time, coin_num, biogame_times FROM user WHERE accountid=:accountid;',
+        $kills = $_REQUEST['kills'];
+        $row = $conn->execQueryOne('SELECT daily_time, coin_num, biogame_times, kills, game_times FROM user WHERE accountid=:accountid;',
                                    array(
                                        ':accountid' => $account_id
                                    ));
@@ -652,7 +637,7 @@ class RoleController{
         if ($daily_time == 0 || ($nowTime - phpcommon\getdayseconds($daily_time) > 0)) {
             $daily_time = time();
         }
-        $ret = $conn->execScript('UPDATE user SET coin_num=:coin_num, modify_time=:modify_time, daily_time=:daily_time, biogame_times=:biogame_times ' .
+        $ret = $conn->execScript('UPDATE user SET coin_num=:coin_num, modify_time=:modify_time, kills=:kills, daily_time=:daily_time, biogame_times=:biogame_times, game_times=:game_times ' .
                                  'WHERE accountid=:accountid;',
                                  array(
                                      ':accountid' => $account_id,
@@ -660,6 +645,8 @@ class RoleController{
                                      ':modify_time' => time(),
                                      ':daily_time' => $daily_time,
                                      ':biogame_times' => $row['biogame_times'] + 1,
+                                     ':kills' => $row['kills'] + $kills,
+                                     ':game_times' => $row['game_times'] + 1,
                                  ));
         if (!$ret) {
             die();
@@ -668,7 +655,15 @@ class RoleController{
         //刷新任务
         //$quest = new classes\Quest();
         //$quest->triggerQuest(QUEST_DAY_FIGHT, 1, 1, $account_id);
-
+        //刷新任务
+        $quest = new classes\Quest();
+        $quest->triggerQuest(QUEST_DAY_FIGHT, 1, 1, $account_id);
+        // $quest->triggerQuest(QUEST_DAY_ALIVE, 1, (int)($alive_time / 1000 / 60), $account_id);
+        // $quest->triggerQuest(QUEST_DAY_HARM, 1, $harm, $account_id);
+        $quest->triggerQuest(QUEST_DAY_KILL, 1, $kills, $account_id);
+        if ($rank <= 5) {
+            $quest->triggerQuest(QUEST_DAY_RANK, 1, 1, $account_id);
+        }
         echo json_encode(array(
             'errcode' => 0,
             'errmsg' => '',

webapp/controller/ServerSwitchController.class.php

@@ -10,7 +10,7 @@ class ServerSwitchController {
             'port' => $mysql_conf['port'],
             'user' => $mysql_conf['user'],
             'passwd' => $mysql_conf['passwd'],
-            'dbname' => 'gamedb2004_' . $mysql_conf['instance_id']
+            'dbname' => DBNAME_PREFIX . $mysql_conf['instance_id']
         ));
         return $conn;
     }

webapp/controller/ShareController.class.php

@@ -13,7 +13,7 @@ class ShareController{
             'port' => $mysql_conf['port'],
             'user' => $mysql_conf['user'],
             'passwd' => $mysql_conf['passwd'],
-            'dbname' => 'gamedb2004_' . $mysql_conf['instance_id']
+            'dbname' => DBNAME_PREFIX . $mysql_conf['instance_id']
         ));
         return $conn;
     }

webapp/controller/ShopController.class.php

@@ -24,7 +24,7 @@ class ShopController{
             'port' => $mysql_conf['port'],
             'user' => $mysql_conf['user'],
             'passwd' => $mysql_conf['passwd'],
-            'dbname' => 'gamedb2004_' . $mysql_conf['instance_id']
+            'dbname' => DBNAME_PREFIX . $mysql_conf['instance_id']
         ));
         return $conn;
     }

webapp/controller/SignController.class.php

@@ -13,7 +13,7 @@ class SignController{
             'port' => $mysql_conf['port'],
             'user' => $mysql_conf['user'],
             'passwd' => $mysql_conf['passwd'],
-            'dbname' => 'gamedb2004_' . $mysql_conf['instance_id']
+            'dbname' => DBNAME_PREFIX . $mysql_conf['instance_id']
         ));
         return $conn;
     }
@@ -153,11 +153,13 @@ class SignController{
             $quest = new classes\Quest();
             $quest->triggerQuest(QUEST_DAY_LOGIN, 1, 1, $account_id);
         } else {
-            $last_sign_time = 0;
+            $last_sign_time = $rows[0]['sign_time'];
             $flag = 0;
             foreach ($rows as $row) {
                 if ($row['sign_id'] > $last_sign_id) {
-                    $last_sign_time = $row['sign_time'];
+                    if ($last_sign_time <= $row['sign_time']) {
+                        $last_sign_time = $row['sign_time'];
+                    }
                     $last_sign_id = $row['sign_id'];
                 }
                 if ($row['signable'] != 1) {

webapp/controller/TeamController.class.php

@@ -23,7 +23,7 @@ class TeamController{
             'port' => $mysql_conf['port'],
             'user' => $mysql_conf['user'],
             'passwd' => $mysql_conf['passwd'],
-            'dbname' => 'gamedb2004_' . $mysql_conf['instance_id']
+            'dbname' => DBNAME_PREFIX . $mysql_conf['instance_id']
         ));
         return $conn;
     }

webapp/controller/TempController.class.php

@@ -13,7 +13,7 @@ class TempController{
             'port' => $mysql_conf['port'],
             'user' => $mysql_conf['user'],
             'passwd' => $mysql_conf['passwd'],
-            'dbname' => 'gamedb2004_' . 1
+            'dbname' => DBNAME_PREFIX . 1
         ));
         return $conn;
     }

webapp/controller/VoiceController.class.php

@@ -10,7 +10,7 @@ class VoiceController{
             'port' => $mysql_conf['port'],
             'user' => $mysql_conf['user'],
             'passwd' => $mysql_conf['passwd'],
-            'dbname' => 'gamedb2004_' . $mysql_conf['instance_id']
+            'dbname' => DBNAME_PREFIX . $mysql_conf['instance_id']
         ));
         return $conn;
     }

webapp/index.php

@@ -1,5 +1,6 @@
 <?php
 
+require '../config/config.php';
 require 'bootstrap/init.php';
 
 if (empty($_REQUEST['c']) || empty($_REQUEST['a'])) {

webapp/phpcommon/functions.php

@@ -320,7 +320,7 @@ function isValidSessionId($account_id, $session_id)
     }
     if (SERVER_ENV == _ONLINE) {
         $channel = extractChannel($account_id);
-        if ($channel == 6000) {
+        if ($channel == 6000 && !defined('ENABLE_6000_CHANNEL')) {
             return false;
         }
     }