cyzhao 1 éve
szülő
commit
7eaebdcec9

+ 5 - 0
Gameserver/App/model/User/Ins_rank.php

@@ -28,6 +28,11 @@ class Ins_rank extends Object_ext{
      * 玩家名称
      */
     public $name = "";
+    
+    /*
+     * 头像
+     */
+    public $headImg = "";
 
     /*
      * 通关进度

+ 16 - 8
Gameserver/App/process/FightProc.php

@@ -604,8 +604,8 @@ class FightProc {
      * @return type
      */
     public static function GetRankInfo() {
-        list($type) = req()->paras;
-        $selfRank = 0;
+        list($type) = req()->paras;               
+        
         $selfIsHasRank = 0; //本人是否上榜 0未上榜没有排名 1上榜则selfRank就是排名
         $selfExtraInfo = 0;
                       
@@ -617,13 +617,15 @@ class FightProc {
             $selfExtraInfo = 0;//战力还没有
         }
         
+        $selfRank = self::initOtherUidRankInfo(req()->uid, $selfExtraInfo);
+        
         $retArr = array();
         if(count($list)>0){
             foreach ($list as $uid => $score) {
                 $rankInfo = self::initOtherUidRankInfo($uid, $score);
                 if($rankInfo->uid == req()->uid){
                     $selfIsHasRank = 1;
-                    $selfRank = $rankInfo->rank;
+                    $selfRank = $rankInfo;
                 }
                 
                 $retArr[] = $rankInfo;
@@ -634,8 +636,7 @@ class FightProc {
         $ret = array(
             'rankInfo' => $retArr,
             'selfRank' =>$selfRank,
-            'selfIsHasRank' => $selfIsHasRank,
-            'selfExtraInfo'=> $selfExtraInfo,
+            'selfIsHasRank' => $selfIsHasRank,         
         );
         return Resp::ok($ret);
     }
@@ -648,9 +649,16 @@ class FightProc {
      */
     static function initOtherUidRankInfo($uid,$score) {       
         $ins_rank = new Ins_rank();
-        $ins_rank->rank = gMem()->zrank(MemKey_GameRun::Rank_MainGateIndex_Zone_zset(req()->zoneid), $uid)+1;
+        $lv = gMem()->zrank(MemKey_GameRun::Rank_MainGateIndex_Zone_zset(req()->zoneid), $uid);
+        if($lv == null){
+            $lv = 0;
+        }
+        $ins_rank->rank = $lv+1;
         $ins_rank->uid = $uid;
-        $ins_rank->name = UserProc::getUserGame(req()->zoneid, $uid)->baseInfo->name;
+        $userInfo = UserProc::getUserGame(req()->zoneid, $uid);
+        $ins_rank->name = $userInfo->baseInfo->name;
+        $ins_rank->headImg = $userInfo->baseInfo->name;
+        
         $ins_rank->score = $score;
         return $ins_rank;
     }
@@ -673,7 +681,7 @@ class FightProc {
             'attackNum' => $attackNum,
             'hp' =>$hp,
             'equip' => $equip,
-            'gem'=>$gem,
+            'gemEquip'=>$gem,
             'equipPag'=>$equipPag,
         );
         return Resp::ok($ret);