Merge branch 'dev' of http://ylsjtt.game7000.com:3000/YLSJ/jzhj2024server into dev

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) {           # 只有在请求分区列表的时候提示下, 其他消息不强制更新

Gameserver/App/process/ActiveProc.php

@@ -122,13 +122,13 @@ class ActiveProc {
 
         $costTag = true;
         if ($num == 1 && ctx()->privateState->lotteryNum_free < GameConfig::glc2()->activity_lottery_FreeNum + GameConfig::glc2()->activity_lottery_GuanggaoNum) {
-            $costTag = false;            
+            $costTag = false;
         }
 
-        if($num == 1){
+        if ($num == 1) {
             ctx()->privateState->lotteryNum_free += 1;
         }
-        
+
         if ($costTag) {
             $cost = "";
             if ($num == 1) {
@@ -147,15 +147,15 @@ class ActiveProc {
 
         if (ctx()->privateState->lotteryNum_free > GameConfig::glc2()->activity_lottery_FreeNum && ctx()->privateState->lotteryNum_free <= GameConfig::glc2()->activity_lottery_FreeNum + GameConfig::glc2()->activity_lottery_GuanggaoNum) {
             my_Assert(now() - ctx()->privateData(true)->activity_lottery_guanggaoTs >= GameConfig::glc2()->activity_lottery_GuanggaoDownTs, ErrCode::user_shop_DownTsLimit);
-            ctx()->privateData(true)->activity_lottery_guanggaoTs = now();  
-            
+            ctx()->privateData(true)->activity_lottery_guanggaoTs = now();
+
             TaskProc::OnLookGuanggao();
         }
 
         if (ctx()->privateState->lotteryNum < glc()->activity_lottery_allNum) {
             ctx()->privateState->lotteryNum += $num;
         }
-      
+
         $rewardList = array();
         $dic = GameConfig::activity_lottery_tree();
         for ($i = 0; $i < $num; $i++) {
@@ -632,5 +632,4 @@ class ActiveProc {
                     'reward_equip' => StoreProc::$reward_equip,
         ));
     }
-
 }

Gameserver/App/process/FightProc.php

@@ -270,7 +270,7 @@ class FightProc {
 //            $max = glc()->sweepMaxNum;
 //            my_Assert(ctx()->gates->fightSweepNum < $max, ErrCode::gate_SweepMaxNum_limit);
 //        }
-        if (ctx()->gates->fightSweepNum <= glc()->sweepMaxNum) {
+        if (ctx()->gates->fightSweepNum < glc()->sweepMaxNum) {
             ctx()->gates->fightSweepTs = now();                                 # 前三次无冷却
         } else {
             ctx()->gates->fightSweepTs = now(60);                               # 下次扫荡时间戳(广告时需要间隔)

Gameserver/App/process/PayProc.php

@@ -333,6 +333,7 @@ class PayProc {
         list($cpOrderId) = req()->paras;
 
         $result = pay_op::CheckAndDrawOrder(req()->uid, $cpOrderId, array(new PayProc, 'distributePayGoods'));
+        CLog::pay($result);
         my_Assert($result->err == 0, ErrCode::pay_fail);
 
         $user = ctx();
@@ -340,7 +341,7 @@ class PayProc {
         UserProc::updateUserInfo();                                             # 回写玩家数据
         return Resp::ok(array(
                     "ret" => self::$retArr, #                                   # 奖励串
-                    "mod" => $result->ret, #                                    # 商品刷新模块名
+                    "mod" => $result->result, #                                 # 商品刷新模块名
                     "baseInfo" => $user->baseInfo,
 //                    "shopdata" => $user->shopdata,
                     "store" => $user->store,
@@ -363,6 +364,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 +396,6 @@ class PayProc {
                     my_Assert(false, "该道具并非现金充值类!");
                     break;
             }
-            $mod = $shopItem->shopItemType;
         }
 
         // <editor-fold defaultstate="collapsed" desc="已废弃逻辑">
@@ -664,7 +665,7 @@ class PayProc {
                             'goods' => $item->goods, #                                  # 发货内容
                             'count' => $product_count, #                                # 发货数量
                         )
-        );
+                );
     }
 
     /**

Gameserver/App/process/TaskProc.php

@@ -35,12 +35,12 @@ class TaskProc {
             case CmdCode::cmd_task_prizesAllreceived:                           # 6206 任务奖励一键领取
                 return TaskProc::taskPrizesAllreceived();
             case CmdCode::cmd_task_lookGuangGao:                                # 6207 观看广告 通知后端
-                return TaskProc::LookGuangGao();               
+                return TaskProc::LookGuangGao();
             default:
                 Err(ErrCode::cmd_err);
         }
     }
-    
+
     /**
      * 6207 观看广告 通知后端
      * @return type
@@ -48,9 +48,9 @@ class TaskProc {
     public static function LookGuangGao() {
         //list($type) = req()->paras;
         TaskProc::OnLookGuanggao();
-        
+
         UserProc::updateUserInfo();
-        return Resp::ok(array("task" => ctx()->task,                 
+        return Resp::ok(array("task" => ctx()->task,
         ));
     }
 
@@ -433,6 +433,7 @@ class TaskProc {
         if (!$unlock && !FightProc::isFunUnlock(5)) {//之所以这有两个判断是因为这个 活动解锁的代码监测位置问题，fightProc 里解锁监测代码在 $gateInfo->tz_state = $index;之前了 这个位置没有办法解锁
             return;
         }
+
         self::ClearActiveTask(Enum_ActiveTaskType::WeekTask);
         self::initActiveTask(Enum_ActiveTaskType::WeekTask);
 
@@ -492,7 +493,7 @@ class TaskProc {
         $taskEventArg = new Ins_TaskEventArgs(Enum_ActiveTaskCmdType::DailyLogin, Enum_PropelType::add, 1, array());
         self::CheckActiveTaskConditions($taskEventArg);
     }
-    
+
     /**
      * 改名字
      */
@@ -501,7 +502,6 @@ class TaskProc {
         self::CheckActiveTaskConditions($taskEventArg);
     }
 
-
     /**
      * 登录第X天
      */
@@ -722,7 +722,7 @@ class TaskProc {
         $taskEventArg = new Ins_TaskEventArgs(Enum_ActiveTaskCmdType::BuyTiliOrLookGuanggao, Enum_PropelType::add, 1, array());
         self::CheckActiveTaskConditions($taskEventArg);
     }
-    
+
     /**
      * 观看广告
      */

Gameserver/App/service_call/pay/Mo/payRequest.php

@@ -14,7 +14,7 @@ class PayRequest extends loyalsoft\Object_ext {
     /**
      * @var bool 是否测试(金额降低100倍)(线上版千万别瞎改)
      */
-    const isTest = true;
+    const isTest = false;
 
     /**
      * @var string 充值回调透传参数(len=250)

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);
     }