代码整理

Gameserver/Amfphp/Services/TestServer.php

@@ -11,7 +11,6 @@ require_once __DIR__ . '/../process/ActiveProc/CipheredBase32.php';
  * @author jgao
  */
 class TestServer {
-//put your code here
 
     /**
      * 入口函数专用测试
@@ -35,62 +34,9 @@ class TestServer {
         SelfChecker::CheckConfig();                                             # 进行配置环境检测
     }
 
-    public function testMemDelete($key) {
-        $mem = gMem();
-        $res = $mem->delete($key);
-        return $res;
-    }
-
-    public function testMemSet($key, $value) {
-        $mem = gMem();
-        $res = $mem->set($key, $value);
-        return $res;
-    }
-
-    public function testMemGet($key) {
-        $mem = gMem();
-        $res = $mem->get($key);
-        return $res;
-    }
-
-    public static function dtCurrent() {
-        $timezone = date_default_timezone_get();
-        echoLine($timezone . " " . date('Y-m-d H:i:s'));
-        echoLine("tsweek: " . TimeUtil::tsWeek());
-        echoLine("tsday: " . TimeUtil::tsDay());
-    }
-
 //----------------------------------------------------
 
 
-    public static function efficiencyOfOldLog() {
-        /**
-         * 测试结果说明,采用写本地文件的性能还是略高于写redis数据库的.
-         */
-        for ($i = 0; $i < 1000; $i++) {
-            CLog::pay("我们的祖国像花园,花园里花朵真鲜艳.和暖的阳光照耀着我们,每个人的脸上都笑开颜.");
-        }
-    }
-
-    public function testRedisGet($key) {
-        $mem = gMem();
-        $ret = $mem->get($key);
-        DebugHelper:: var_dump($ret);
-        $mem->close();
-        return $ret;
-    }
-
-    /**
-     * 删除某个key
-     * @param type $key
-     */
-    public function testRedisDel($key) {
-        $mem = gMem();
-        $num = $mem->delete($key);
-        echo $num > 0 ? 'ok' : 'not exist';
-        $mem->close();
-    }
-
     public function testRedisLua($key, $value) {
         $mem = gMem();
         $script = <<<SCR
@@ -126,20 +72,4 @@ SCR;
         echo($index);
     }
 
-    public function tsetIp() {
-        DebugHelper::debug(HttpUtil::getClientEP());
-    }
-
-    public function testLogfile() {
-        CLog::warn("日志测试", 'log');
-    }
-
-    public static function testDecodeToken($token) {
-        echoLine("中文显示");
-        $activeCode = CipheredBase32::Decode($token);                      # 解码
-        var_dump($activeCode);
-        $codePlatStr = GameConstants::GetPlatStringByActivteCode($activeCode);  # platstr
-        var_dump($codePlatStr);
-    }
-
 }

Gameserver/Amfphp/base/Include.php

@@ -12,6 +12,5 @@ if (!defined("VO_ROOT")) {
     include_once VO_ROOT . '/Resp.php';
     include_once VO_ROOT . '/MemKey_User.php';
     include_once VO_ROOT . '/MemKey_GameRun.php';
-//    include_once VO_ROOT . '/MemKey_Guild.php';
     include_once VO_ROOT . '/HashSaver.php';
 }

Gameserver/Amfphp/model/User/Data_UserGame.php

@@ -55,7 +55,7 @@ class Data_UserGame extends HashSaver {
 //    public $task;
 
     /**
-     * 
+     * 玩家任务卡商店数据
      * @var Info_TaskCard_Shop
      */
     public $taskCardShop;

Gameserver/Amfphp/model/User/Enum_PropelType.php

@@ -1,11 +1,5 @@
 <?php
 
-/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
- */
-
 namespace loyalsoft;
 
 /**

Gameserver/Amfphp/service_call/InquireApi/CheckUpdate.php

@@ -26,7 +26,7 @@ class UpdateRetInfo {
 }
 
 /**
- * 检查更新
+ * 检查更新(基于和王解的update模块的约定)
  * @author gwang
  * @version 1.0.0 Created by wanggangzero at 2020.4.27 13:48:33.
  */
@@ -70,17 +70,17 @@ class CheckUpdate {
             $ret->newVer = $newVer;
             $ret->cdn = self::CDN_Root();
 
-            if (($newVer - $clientVer) > 10) {                                      # 版本号差异大于10=>整包更
-                $ret->err = ErrCode::clientversionlow_err;                          # 返回错误码，强制更新1
+            if (($newVer - $clientVer) > 10) {                                  # 版本号差异大于10=>整包更
+                $ret->err = ErrCode::clientversionlow_err;                      # 返回错误码，强制更新1
                 $ret->msg = "客户端有更新-整包更";
-            } else if (($newVer - $clientVer) > 0) { #                              # 修订版本号不一致, 提示更新
+            } else if (($newVer - $clientVer) > 0) { #                          # 修订版本号不一致, 提示更新
                 $ret->err = ErrCode::clientnewversion_msg;
                 $ret->msg = "客户端有更新-差分更";
-            } elseif (self::HaltWithMsg) {                                          # 显示消息并且退出游戏 
+            } elseif (self::HaltWithMsg) {                                      # 显示消息并且退出游戏 
                 $ret->msg = "sorry";
                 $ret->err = ErrCode::clientPrintMsg_Halt;
             } else {
-                $ret->err = ErrCode::ok;                                                # 平安无事
+                $ret->err = ErrCode::ok;                                        # 平安无事
                 $ret->msg = "平安无事";
             }
         } else {                                                                # 检查更新失败

Gameserver/Amfphp/util/SelfChecker.php

@@ -80,6 +80,8 @@ class SelfChecker {
         }
     }
 
+// <editor-fold defaultstate="collapsed" desc="  内部函数  ">
+
     /**
      * 测试NoSql连接,以及读写性能
      */
@@ -122,6 +124,7 @@ class SelfChecker {
         echoLine("delete table $tableName " . (daoInst()->tableExist($tableName) ? "failed!" : "success!"));
     }
 
+// </editor-fold>
 }
 
 SelfChecker::checkkPHPVersion();                                                # 检查PHP版本

Gameserver/nbproject/private/private.xml

@@ -12,18 +12,30 @@
     </editor-bookmarks>
     <open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/2">
         <group>
-            <file>file:/D:/local_svn/0_ylsj2019/ylsj2019Server/Gameserver/Amfphp/process/del_MissProc.php</file>
-            <file>file:/D:/local_svn/0_ylsj2019/ylsj2019Server/Gameserver/Amfphp/process/HeroProc.php</file>
-            <file>file:/D:/local_svn/0_ylsj2019/ylsj2019Server/Gameserver/Amfphp/base/ErrCode.php</file>
-            <file>file:/D:/local_svn/0_ylsj2019/ylsj2019Server/Gameserver/Amfphp/process/FightProc/PVPProc.php</file>
+            <file>file:/D:/local_svn/0_ylsj2019/ylsj2019Server/Gameserver/Amfphp/base/Include.php</file>
+            <file>file:/D:/local_svn/0_ylsj2019/ylsj2019Server/Gameserver/Amfphp/base/MemKey_GameRun.php</file>
             <file>file:/D:/local_svn/0_ylsj2019/ylsj2019Server/Gameserver/Amfphp/process/SystemProc.php</file>
-            <file>file:/D:/local_svn/0_ylsj2019/ylsj2019Server/Gameserver/Amfphp/process/PayProc.php</file>
+            <file>file:/D:/local_svn/0_ylsj2019/ylsj2019Server/Gameserver/Amfphp/model/User/Enum_EventType.php</file>
+            <file>file:/D:/local_svn/0_ylsj2019/ylsj2019Server/Gameserver/Amfphp/process/del_MissProc.php</file>
             <file>file:/D:/local_svn/0_ylsj2019/ylsj2019Server/Gameserver/Amfphp/process/ShopProc.php</file>
+            <file>file:/D:/local_svn/0_ylsj2019/ylsj2019Server/Gameserver/Amfphp/service_call/triggers/TestTrigger.php</file>
             <file>file:/D:/local_svn/0_ylsj2019/ylsj2019Server/Gameserver/Amfphp/process/StoreProc.php</file>
-            <file>file:/D:/local_svn/0_ylsj2019/ylsj2019Server/Gameserver/Amfphp/base/CmdCode.php</file>
+            <file>file:/D:/local_svn/0_ylsj2019/ylsj2019Server/Gameserver/Amfphp/service_call/InquireApi/VerifyReturnCode.php</file>
+            <file>file:/D:/local_svn/0_ylsj2019/ylsj2019Server/Gameserver/Amfphp/service_call/triggers/TriggerDumpLog2Sql.php</file>
             <file>file:/D:/local_svn/0_ylsj2019/ylsj2019Server/Gameserver/Amfphp/process/EventProc/NormalEventProc.php</file>
-            <file>file:/D:/local_svn/0_ylsj2019/ylsj2019Server/Gameserver/Amfphp/process/TaskProc.php</file>
+            <file>file:/D:/local_svn/0_ylsj2019/ylsj2019Server/Gameserver/Amfphp/process/FightProc/PVPProc.php</file>
+            <file>file:/D:/local_svn/0_ylsj2019/ylsj2019Server/Gameserver/Amfphp/base/MemKey_User.php</file>
+            <file>file:/D:/local_svn/0_ylsj2019/ylsj2019Server/Gameserver/Amfphp/process/PayProc.php</file>
+            <file>file:/D:/local_svn/0_ylsj2019/ylsj2019Server/Gameserver/Amfphp/service_call/cmemdata/kvflush.php</file>
+            <file>file:/D:/local_svn/0_ylsj2019/ylsj2019Server/Gameserver/Amfphp/model/User/Enum_PropelType.php</file>
+            <file>file:/D:/local_svn/0_ylsj2019/ylsj2019Server/Gameserver/Amfphp/base/CmdCode.php</file>
+            <file>file:/D:/local_svn/0_ylsj2019/ylsj2019Server/Gameserver/Amfphp/process/HeroProc.php</file>
+            <file>file:/D:/local_svn/0_ylsj2019/ylsj2019Server/Gameserver/Amfphp/service_call/InquireApi/CheckUpdate.php</file>
+            <file>file:/D:/local_svn/0_ylsj2019/ylsj2019Server/Gameserver/Amfphp/base/Object_ext.php</file>
+            <file>file:/D:/local_svn/0_ylsj2019/ylsj2019Server/Gameserver/Amfphp/base/ErrCode.php</file>
             <file>file:/D:/local_svn/0_ylsj2019/ylsj2019Server/Gameserver/Amfphp/model/User/Data_UserGame.php</file>
+            <file>file:/D:/local_svn/0_ylsj2019/ylsj2019Server/Gameserver/Amfphp/process/TaskProc.php</file>
+            <file>file:/D:/local_svn/0_ylsj2019/ylsj2019Server/Gameserver/Amfphp/base/MemKey_Stat.php</file>
         </group>
     </open-files>
 </project-private>