瀏覽代碼

fixed: 竞技场初始队伍调整为默认战队.

gwang 4 年之前
父節點
當前提交
aca44a3914

+ 1 - 1
Gameserver/Amfphp/model/User/UserGameModel.php

@@ -62,7 +62,7 @@ class UserGameModel extends HashSaver {
 
     /**
      * 战斗队伍配置信息
-     * @var UserGateDifficulty
+     * @var dictionary
      */
     public $heroTeamConfig;
 

+ 5 - 0
Gameserver/Amfphp/model/User/UserPVPModel.php

@@ -134,6 +134,11 @@ class UserPVPModel extends Object_ext {
         if (null == $this->curShopItems) {
             $this->curShopItems = GameConfig::pvp_shop();
         }
+        if ($this->defTeam[0] <= 0) {
+            $one = 1;
+            $teams = req()->userInfo->game->heroTeamConfig->teamDic;
+            $this->defTeam = array_slice($teams->$one->heros, 0, 3);
+        }
     }
 
 }

+ 2 - 37
Gameserver/Amfphp/process/FightProc/PVPProc.php

@@ -256,45 +256,10 @@ class PVPProc {
         $fPower = HeroProc::CalcUserFightPower($zoneid, $uid, $req->userInfo->game); # 玩家总战力?还是当前防守队伍的战斗力?
         $numNewLog = 0; // todo: 真正查询是否有新战报
         $matches = self::getNewMatches($pvp, $uid, $zoneid);                    # 获得新的匹配对手
-        $pvp->sendRewardEmail($zoneid, $uid, $seasonId);                        # 发奖励邮件
-//        if ($pvp->haventReward_season >= 0 && $pvp->haventReward_season < $seasonId) { # 尚未发放上赛季奖励
-//            $haventKey = MemKey_GameRun::Game_PVPScoreByZoneSeason_zset($zoneid, $pvp->haventReward_season);
-//            // todo:发放上赛季奖励邮件
-//            $rank = self::_getRank_by_uid($uid, $haventKey);                    # 查询上赛季排名
-//            if ($rank <= self::pvpMaxRank) {                                    # 防御未上榜
-//                foreach (GameConfig::pvp_rankreward() as $cfg) {
-//                    isEditor() and $cfg = new \sm_pvp_rankreward();
-//                    if ($rank >= $cfg->minRank && $rank <= $cfg->maxRank) {     # 找到对应的名次段
-//                        EmailProc::SendPvpRankReward_Season($zoneid, $uid, $rank); # 发放奖励邮件(竞技币)
-//                    }
-//                }
-//                UserProc::updateUserInfo();
-//            }
-//        }
-//        $pvp->haventReward_season = $seasonId;                                  # 更新待发奖赛季
-//        if ($pvp->haventReward_tsDay == tsDay() - 1) {                          # 尚未发放昨天奖励
-//            $haventKey_day = MemKey_GameRun::Game_PVPScoreByZone_zset_Day($zoneid, $pvp->haventReward_tsDay);
-//            if (!gMem()->exists($haventKey_day) && $pvp->haventReward_tsDay == tsDay() - 1) { # 昨天的积分记录不存在
-//                gMem()->zcopy($key, $haventKey_day);                            # 复制一份当前积分作为昨天的截止积分榜
-//            } else {
-//                // 不是昨天登录的, 且没有对应的数据 就不再复制当前数据了.直接未上榜处理
-//            }
-//            $rank = self::_getRank_by_uid($uid, $haventKey_day);                # 查询上一天排名
-//            if ($rank <= self::pvpMaxRank) {                                    # 防御未上榜
-//                foreach (GameConfig::pvp_rankreward() as $cfg) {
-//                    isEditor() and $cfg = new \sm_pvp_rankreward();
-//                    if ($rank >= $cfg->minRank && $rank <= $cfg->maxRank) {     # 找到对应的名次段
-//                        EmailProc::SendPvpRankReward_Lastday($zoneid, $uid, $rank); # 发放奖励邮件(竞技币)
-//                    }
-//                }
-//                UserProc::updateUserInfo();
-//            }
-//        }
-//        $pvp->haventReward_tsDay = tsDay();                                     # 更新待发放奖励日期
+        $pvp->sendRewardEmail($zoneid, $uid, $seasonId);                        # 发奖励邮件 
         $req->userInfo->game->pvp = $pvp;
         UserProc::updateUserInfo();
-        // 组装 返回值结构
-        $ret = array(
+        $ret = array(#                                                          # 组装 返回值结构
             'score' => $score, #                                                # 自己的积分
             'rank' => $rank, #                                                  # 自己的排名
             'pvpCoins' => $pvp->pvpCoins, #                                     # 自己的竞技币