wanggangzero 5 месяцев назад
Родитель
Сommit
73ed305cd6

+ 2 - 0
Gameserver/App/Services/AppServer.php

@@ -147,6 +147,7 @@ class AppServer {
      */
     private static function checkVersion() {
         $ret = ErrCode::ok;
+
         if (req()->CV == "unityEditor" || req()->CV == "unity") {
             return $ret;
         }
@@ -163,6 +164,7 @@ class AppServer {
             if ($clientArr[0] < $serverArr[0]                                   # 主版本号小
                     || $clientArr[1] < $serverArr[1]) {                         # 或者次版本号小
                 $ret = ErrCode::clientversionlow_err;                           # 返回错误码,强制更新1
+
                 req()->updateInfo = "请更新游戏后再继续!";
             } else if ($clientArr[2] < $serverArr[2]                            # 小版本号不一致
                     && req()->cmd == CmdCode::cmd_user_getzonelist) {           # 只有在请求分区列表的时候提示下, 其他消息不强制更新

+ 2 - 2
Gameserver/App/process/PayProc.php

@@ -363,6 +363,7 @@ class PayProc {
         $shopItem = GameConfig::shop_getItem($order->product_id);               # 商城总表中查找下配置数据
         $mod = "";
         if (null != $shopItem) {
+            $mod = $shopItem->shopItemType;
             switch ($shopItem->shopItemType) {
                 case 'cash':                                                    # 充值二级货币
                     $cashMo = GameConfig::shop_cash_getItem($shopItem->shopItemTypeId);
@@ -394,7 +395,6 @@ class PayProc {
                     my_Assert(false, "该道具并非现金充值类!");
                     break;
             }
-            $mod = $shopItem->shopItemType;
         }
 
         // <editor-fold defaultstate="collapsed" desc="已废弃逻辑">
@@ -664,7 +664,7 @@ class PayProc {
                             'goods' => $item->goods, #                                  # 发货内容
                             'count' => $product_count, #                                # 发货数量
                         )
-        );
+                );
     }
 
     /**

+ 1 - 1
Gameserver/App/service_call/pay/official/pay_op.php

@@ -83,7 +83,7 @@ class pay_op {
             return Resp::err(8, "更新订单状态,数据库操作失败");                   # 数据库操作失败
         }
 
-        CLog::pay("订单发货成功: $cpOrderId");
+        CLog::pay("订单发货成功: $cpOrderId  ( $mod )");
         return Resp::ok($mod);
     }