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

Gameserver/App/base/CmdCode.php

@@ -348,6 +348,11 @@ class CmdCode {
      * 领取通关荣誉榜奖励
      */
     const fight_rank_ReceiveRankReward_MainGate = 6815;
+    
+    /*
+     * 
+     */
+    const fight_rank_ReceiveRankReward_FightPower = 6816;
     // </editor-fold>
     // <editor-fold defaultstate="collapsed" desc="    反射方法    ">
 

Gameserver/App/configs/GameConfig.php

@@ -4,7 +4,7 @@
 // 由CodeGenerator创建。
 // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
 // author： gwang
-// 日期: 2024-05-30 15:39:54
+// 日期: 2024-05-30 17:32:02
 ////////////////////
 
 namespace loyalsoft;

Gameserver/App/model/Const/GameConfig.php

@@ -3,7 +3,7 @@
  // 由CodeGenerator创建。
  // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
  // author： gwang 
- // 日期: 2024-05-30 15:39:54
+ // 日期: 2024-05-30 17:32:02
 ////////////////////
 
 /**

Gameserver/App/model/Const/sm_waveItem.php

@@ -3,7 +3,7 @@
  // 由CodeGenerator创建。
  // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
  // author： gwang 
- // 日期: 2024-05-30 10:57:10
+ // 日期: 2024-05-30 17:20:46
 ////////////////////
 
 

Gameserver/App/model/Const/sm_waves.php

@@ -3,7 +3,7 @@
  // 由CodeGenerator创建。
  // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
  // author： gwang 
- // 日期: 2024-05-30 10:57:10
+ // 日期: 2024-05-30 17:20:46
 ////////////////////
 
 

Gameserver/App/process/FightProc.php

@@ -850,9 +850,20 @@ class FightProc {
         $memKey = MemKey_GameRun::RankReward_MainGateIndex_Zone_hash(req()->zoneid);
         $dic = gMem()->hgetall($memKey);
 
+        $retArr = new \stdClass();
+        foreach ($dic as $gateId => $uid) {
+            $ins_rank = new Ins_rank();
+            $ins_rank->uid = $uid;
+            $userInfo = UserProc::getUserGame(req()->zoneid, $uid);
+            $ins_rank->name = $userInfo->baseInfo->name;
+            $ins_rank->headImg = $userInfo->baseInfo->headImg;
+            $ins_rank->score = $gateId;
+            $retArr->$gateId= $ins_rank;
+        }
+        
         UserProc::updateUserInfo();
         $ret = array(
-            'rankReward' => $dic,
+            'rankReward' => $retArr,
         );
         return Resp::ok($ret);
     }
@@ -867,9 +878,21 @@ class FightProc {
         $memKey = MemKey_GameRun::RankReward_FightPower_Zone_hash(req()->zoneid);
         $dic = gMem()->hgetall($memKey);
 
+        $retArr = new \stdClass();
+        foreach ($dic as $fightPower => $uid) {
+            $ins_rank = new Ins_rank();
+            $ins_rank->uid = $uid;
+            $userInfo = UserProc::getUserGame(req()->zoneid, $uid);
+            $ins_rank->name = $userInfo->baseInfo->name;
+            $ins_rank->headImg = $userInfo->baseInfo->headImg;
+            $ins_rank->score = $fightPower;
+            $retArr->$fightPower= $ins_rank;
+        }
+        
+        
         UserProc::updateUserInfo();
         $ret = array(
-            'rankReward' => $dic,
+            'rankReward' => $retArr,
         );
         return Resp::ok($ret);
     }