Преглед изворни кода

1. fixed: cnd_root, 2. add cdn folder

gwang пре 5 година
родитељ
комит
271309f48d

Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
CDN/UpdateFileAndroid.json


Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
CDN/UpdateFileIOS.json


+ 42 - 24
Gameserver/Amfphp/service_call/InquireApi/CheckUpdate.php

@@ -16,6 +16,7 @@ class UpdateRetInfo {
     public $err = 0;
     public $msg = "";
     public $newVer = "";
+    public $cdn = "";
 
     /**
      * @var  \sm_clientVersionHistory  版本信息
@@ -35,8 +36,15 @@ class CheckUpdate {
      * 打印消息并且停止游戏
      */
     const HaltWithMsg = false;
-    const CDN_Root = "http://115.159.121.129/SweepAllTower/CDN/";
-    const Md5_file = "Update";
+    const Md5_file = "UpdateFile";
+
+    static function CDN_Root() {
+        if (GAME_ONLINE) {
+            return "http://115.159.121.129/ylsj2019/CDN/";
+        } else {
+            return "http://192.168.10.86/ylsj2019/CDN/";
+        }
+    }
 
     /**
      * 检查客户端版本是否需要强制更新
@@ -47,28 +55,38 @@ class CheckUpdate {
         $clientVer = self::GetClientVersion();                                  # 客户端版本号
         $platform = self::GetClientPlatform();                                  # 客户端平台(安卓/IOS)
 
-        $url = self::CDN_Root . self::Md5_file . $platform . "json";            # 资源文件MD5列表
-        $lisJson = HttpUtil::makeRequest($url, array(), array(), array(), "get"); # 取CDN上版本列表
-        $fileList = JsonUtil::decode($lisJson);
-        $newVer = $fileList->Version;                                           # 取出最新版本号
 
         $ret = new UpdateRetInfo();                                             # 返回值
-        $ret->versionInfo = GameConfig::clientVersionHistory_getItem($newVer);
-        $ret->newVer = $newVer;
-        $ret->cdn = self::CDN_Root;
-
-        if (($newVer - $clientVer) > 10) {                                      # 版本号差异大于10=>整包更
-            $ret->err = ErrCode::clientversionlow_err;                          # 返回错误码,强制更新1
-            $ret->msg = "客户端有更新-整包更";
-        } else if (($newVer - $clientVer) > 0) { #                              # 修订版本号不一致, 提示更新
-            $ret->err = ErrCode::clientnewversion_msg;
-            $ret->msg = "客户端有更新-差分更";
-        } elseif (self::HaltWithMsg) {                                          # 显示消息并且退出游戏 
-            $ret->msg = "sorry";
-            $ret->err = ErrCode::clientPrintMsg_Halt;
-        }
 
-        $ret->err = ErrCode::ok;                                                # 平安无事
+
+        $url = self::CDN_Root() . self::Md5_file . $platform . ".json";            # 资源文件MD5列表
+        $lisJson = HttpUtil::makeRequest($url, array(), array(), array(), "get"); # 取CDN上版本列表
+
+        if (isset($lisJson["result"]) && $lisJson["result"]) {
+            $fileList = JsonUtil::decode($lisJson["msg"]);
+            $newVer = $fileList->Version;                                           # 取出最新版本号
+
+            $ret->versionInfo = GameConfig::clientVersionHistory_getItem($newVer);
+            $ret->newVer = $newVer;
+            $ret->cdn = self::CDN_Root();
+
+            if (($newVer - $clientVer) > 10) {                                      # 版本号差异大于10=>整包更
+                $ret->err = ErrCode::clientversionlow_err;                          # 返回错误码,强制更新1
+                $ret->msg = "客户端有更新-整包更";
+            } else if (($newVer - $clientVer) > 0) { #                              # 修订版本号不一致, 提示更新
+                $ret->err = ErrCode::clientnewversion_msg;
+                $ret->msg = "客户端有更新-差分更";
+            } elseif (self::HaltWithMsg) {                                          # 显示消息并且退出游戏 
+                $ret->msg = "sorry";
+                $ret->err = ErrCode::clientPrintMsg_Halt;
+            } else {
+                $ret->err = ErrCode::ok;                                                # 平安无事
+                $ret->msg = "平安无事";
+            }
+        } else {                                                                # 检查更新失败
+            $ret->err = 1031;
+            $ret->msg = "检查更新失败!";
+        }
         return $ret;                                                            # 返回
     }
 
@@ -78,18 +96,18 @@ class CheckUpdate {
      */
     static function GetClientVersion() {
         $valueMap = HttpUtil::getQueryParas(); // array
-        var_dump($valueMap);
+//        var_dump($valueMap);
         if (!is_array($valueMap)) {
             exit("无参数");
         }
         $clientVer = "";
-        var_dump($clientVer);
+//        var_dump($clientVer);
         if (isset($valueMap["clientVer"])) {
             $clientVer = urldecode($valueMap['clientVer']);
         } else {
             exit("缺少参数 'clientVer'!");
         }
-        return $clientVer;
+        return intval($clientVer);
     }
 
     /**

+ 6 - 5
Gameserver/nbproject/private/private.xml

@@ -12,14 +12,15 @@
     </editor-bookmarks>
     <open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/2">
         <group>
+            <file>file:/E:/www/ylsj2019/Gameserver/Amfphp/util/HttpUtil.php</file>
+            <file>file:/E:/www/ylsj2019/Gameserver/Amfphp/process/PayProc.php</file>
             <file>file:/E:/www/ylsj2019/Gameserver/Amfphp/process/UserProc.php</file>
             <file>file:/E:/www/ylsj2019/Gameserver/Amfphp/process/ActiveProc.php</file>
+            <file>file:/E:/www/ylsj2019/Gameserver/Amfphp/process/PreProc.php</file>
             <file>file:/E:/www/ylsj2019/Gameserver/Amfphp/model/User/UserInfoMo.php</file>
-            <file>file:/E:/www/ylsj2019/Gameserver/Amfphp/process/FightProc/PVPProc.php</file>
-            <file>file:/E:/www/ylsj2019/Gameserver/Amfphp/model/User/userSecretshopModel.php</file>
-            <file>file:/E:/www/ylsj2019/Gameserver/Amfphp/base/Object_ext.php</file>
-            <file>file:/E:/www/ylsj2019/Gameserver/Amfphp/base/HashSaver.php</file>
-            <file>file:/E:/www/ylsj2019/Gameserver/Amfphp/model/User/UserGameModel.php</file>
+            <file>file:/E:/www/ylsj2019/Gameserver/Amfphp/base/ErrCode.php</file>
+            <file>file:/E:/www/ylsj2019/Gameserver/Amfphp/test.php</file>
+            <file>file:/E:/www/ylsj2019/Gameserver/Amfphp/service_call/InquireApi/CheckUpdate.php</file>
         </group>
     </open-files>
 </project-private>

Неке датотеке нису приказане због велике количине промена