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

Gameserver/App/process/FightProc.php

@@ -824,7 +824,12 @@ class FightProc {
         $memKey = MemKey_GameRun::RankReward_MainGateIndex_Zone_hash(req()->zoneid);
         foreach ($rewards as $passGateId => $mo) {
             if ($passGateId == $maxGateIndex && !gMem()->hexists($memKey, $maxGateIndex)) {
-                gMem()->hset($memKey, $maxGateIndex, req()->uid);
+                $ins_rank = new Ins_rank();
+                $ins_rank->uid = req()->uid;
+                $ins_rank->name = ctx()->baseInfo->name;
+                $ins_rank->headImg = ctx()->baseInfo->headImg;
+                $ins_rank->score = $passGateId;
+                gMem()->hset($memKey, $maxGateIndex, $ins_rank);
                 break;
             }
         }
@@ -840,8 +845,13 @@ class FightProc {
 
         $memKey = MemKey_GameRun::RankReward_FightPower_Zone_hash(req()->zoneid);
         foreach ($rewards as $fightPower => $mo) {
-            if ($power >= $fightPower && !gMem()->hexists($memKey, $fightPower)) {
-                gMem()->hset($memKey, $fightPower, req()->uid);
+            if ($power >= $fightPower && !gMem()->hexists($memKey, $fightPower)) {               
+                $ins_rank = new Ins_rank();
+                $ins_rank->uid = req()->uid;
+                $ins_rank->name = ctx()->baseInfo->name;
+                $ins_rank->headImg = ctx()->baseInfo->headImg;
+                $ins_rank->score = $fightPower;
+                gMem()->hset($memKey, $fightPower,$ins_rank);
             }
         }
     }
@@ -856,20 +866,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;
-        }
+//        $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' => $retArr,
+            'rankReward' => $dic,
         );
         return Resp::ok($ret);
     }
@@ -884,21 +894,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;
-        }
+//        $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' => $retArr,
+            'rankReward' => $dic,
         );
         return Resp::ok($ret);
     }

Gameserver/App/process/TaskProc.php

@@ -235,7 +235,6 @@ class TaskProc {
 
     static function ResetTask() {
         //self::ResetTask_Daily();
-        TaskProc::Day7TaskReset(110011001);
         self::DailyTaskReset();
         self::ClearDay7Task();      
         $week = date("w");