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

Gameserver/App/model/User/Info_Gates.php

@@ -203,7 +203,7 @@ class Info_Gates extends Object_ext {
     /**
      * 最大通关id
      */
-    public function maxPassGateId() {
+    public function maxPassGateNumId() {
         $maxIndex = 0;
         //$maxGateId = 0;
         foreach ($this->GateList as $gateId => $Ins_GateInfo) {
@@ -214,4 +214,19 @@ class Info_Gates extends Object_ext {
         }
         return $maxIndex;
     }
+    
+    /**
+     * 最大通关id
+     */
+    public function maxPassGateId() {
+        $maxIndex = 0;
+        $maxGateId = 0;
+        foreach ($this->GateList as $gateId => $Ins_GateInfo) {
+            if ($Ins_GateInfo->pass > 0 && Ins_GateInfo::gateNum($gateId) > $maxIndex) {
+                $maxIndex = Ins_GateInfo::gateNum($gateId);
+                $maxGateId = $gateId;
+            }
+        }
+        return $maxGateId;
+    }
 }

Gameserver/App/process/FightProc.php

@@ -67,13 +67,14 @@ class FightProc {
         my_Assert($passGateId != 0, ErrCode::gate_NoSweep);
         //$mo = GameConfig::gate_getItem(ctx()->gates->UnlockedGatesMaxId);
         $costTili = glc()->sweep_cost_tili;
-        my_Assert(ctx()->baseInfo->tili >= $costTili, ErrCode::notenough_tili);
+        $curTili =  ctx()->baseInfo->CurTili();       
+        my_Assert($curTili >= $costTili, ErrCode::notenough_tili);
         $max = glc()->sweepMaxNum;
         my_Assert(ctx()->gates->fightSweepNum < $max, ErrCode::gate_SweepMaxNum_limit);
         ctx()->gates->fightSweepNum += 1;
         ctx()->baseInfo->Consume_tili($costTili);
         $prizeArr = array();
-
+      
         $wavesArr = GameConfig::waves_getItemArray($passGateId);
         $count = count($wavesArr);
         $wavesMo = $wavesArr[$count - 1];
@@ -433,7 +434,7 @@ class FightProc {
             if (ctx()->gates->GateList->$gateId->pass == 0) {
                 ctx()->gates->GateList->$gateId->pass = 1;
                 TaskProc::Day7TaskReset($gateId);                               # 刷新七日任务
-                $maxGateId = ctx()->gates->maxPassGateId();
+                $maxGateId = ctx()->gates->maxPassGateNumId();
                 if ($maxGateId > 0) {
                     self::Ranking_MainGateIndex($maxGateId);
                     self::IsAchievedMainGate_PassReward($maxGateId);
@@ -679,7 +680,7 @@ class FightProc {
         $isExistFinishReward = false;
         if ($type == 1) {
             $list = gMem()->zrevrange(MemKey_GameRun::Rank_MainGateIndex_Zone_zset(req()->zoneid), 0, glc()->Rank_MainGateIndex_OnListRank, true);
-            $selfExtraInfo = ctx()->gates->maxPassGateId();
+            $selfExtraInfo = ctx()->gates->maxPassGateNumId();
 
             $memKey = MemKey_GameRun::RankReward_MainGateIndex_Zone_hash(req()->zoneid);
             $dic = gMem()->hgetall($memKey);