|
|
@@ -139,10 +139,10 @@ class PVPProc {
|
|
|
UserProc::updateUserInfo(); # 回写数据
|
|
|
// 记录拉取时间戳(在主界面有个未读消息条数显示, 需要靠最后拉取时间戳对比, 时间戳之后的消息是未读消息)
|
|
|
// 回传数据记录
|
|
|
- array_walk($offLog, function (&$i) {
|
|
|
+ array_walk($offLog, function (&$i) { # 解码一下
|
|
|
$i = JsonUtil::decode($i);
|
|
|
});
|
|
|
- array_walk($defLog, function (&$i) {
|
|
|
+ array_walk($defLog, function (&$i) { # 解码一下
|
|
|
$i = JsonUtil::decode($i);
|
|
|
});
|
|
|
return Resp::ok(array(
|
|
|
@@ -151,114 +151,65 @@ class PVPProc {
|
|
|
));
|
|
|
}
|
|
|
|
|
|
- // <editor-fold defaultstate="collapsed" desc=" 竞技场 681x">
|
|
|
- //
|
|
|
-
|
|
|
+ // <editor-fold defaultstate="collapsed" desc=" 竞技商店 ">
|
|
|
/**
|
|
|
- * 取当前赛季的编号(从赛季起始开始算起)
|
|
|
- * @return int
|
|
|
+ * 王刚 16:23:39 (2020.5.9)
|
|
|
+ 商店现在的模式定位:
|
|
|
+ 商店显示所有物品, 刷新时是重置购买/售罄记录
|
|
|
+ 刘海 16:24:23 (2020.5.9)
|
|
|
+ 没错
|
|
|
*/
|
|
|
- public static function GetCurSeasonID() {
|
|
|
- $n = ceil((now() - self::pvpStartTs ) / self::pvpSeasonLengt); # 进一取整
|
|
|
- return $n;
|
|
|
- }
|
|
|
-
|
|
|
- /**
|
|
|
- * 取指定赛季的结束时间戳
|
|
|
- * @param int $seasonID
|
|
|
- * @return int
|
|
|
- */
|
|
|
- public static function GetSeasonEndTs($seasonID) {
|
|
|
- $ts = self::pvpStartTs + $seasonID * self::pvpSeasonLengt; # 从起始点开始 + n个赛季时常
|
|
|
- return $ts;
|
|
|
- }
|
|
|
-
|
|
|
- /**
|
|
|
- * [6810] 竞技场 拉取主界面信息
|
|
|
- * @param Req $req
|
|
|
- */
|
|
|
- static function pvpMainInfo($req) {
|
|
|
- $uid = $req->uid; # 快速访问UID
|
|
|
- $zoneid = $req->zoneid; # 快速访问zoneid
|
|
|
- $pvp = new UserPVPModel($req->userInfo->game->pvp); # 设计玩家pvp数据结构
|
|
|
- $seasonId = self::GetCurSeasonID(); # 当前赛季ID
|
|
|
- $key = MemKey_GameRun::Game_PVPScoreByZoneSeason_zset($zoneid, $seasonId); # 积分总榜
|
|
|
- // 玩家数据
|
|
|
- // 积分 + 排名
|
|
|
- // 总战力
|
|
|
- // 战报小红点
|
|
|
- // 对手列表
|
|
|
- // =======
|
|
|
- // 检查昨日奖励是否发放
|
|
|
- // 检查赛季奖励是否发放
|
|
|
- // 返回
|
|
|
- $score = self::_getScore_by_uid($uid, $key); # 玩家积分
|
|
|
- $rank = self::_getRank_by_uid($uid, $key); # 玩家排名
|
|
|
- $fPower = HeroProc::CalcUserFightPower($zoneid, $uid, $req->userInfo->game); # 玩家总战力?还是当前防守队伍的战斗力?
|
|
|
- $bHasNewLog = true; // todo: 真正查询是否有新战报
|
|
|
- $matches = self::getNewMatches($pvp, gMem(), $uid, $zoneid); # 获得新的匹配对手
|
|
|
-
|
|
|
- if ($pvp->haventReward_season > 0 && $pvp->haventReward_season < $seasonId) { # 尚未发放上赛季奖励
|
|
|
- $haventKey = MemKey_GameRun::Game_PVPScoreByZoneSeason_zset($zoneid, $pvp->haventReward_season);
|
|
|
- // todo:发放上周奖励邮件
|
|
|
- }
|
|
|
- if ($pvp->haventReward_tsDay > 0 && $pvp->haventReward_tsDay < tsDay()) { # 尚未发放昨天奖励
|
|
|
- $haventKey_day = MemKey_GameRun::Game_PVPScoreByZone_zset_Day($zoneid, $day);
|
|
|
- if (gMem()->exists($haventKey_day)) { # 昨天的积分记录不存在
|
|
|
- gMem()->zcopy($key, $haventKey_day); # 复制一份当前积分作为昨天的截止积分榜
|
|
|
- }
|
|
|
- // todo:发放昨天奖励
|
|
|
- }
|
|
|
- // 组装 返回值结构
|
|
|
- $ret = array(
|
|
|
- 'score' => $score, # # 自己的积分
|
|
|
- 'rank' => $rank, # # 自己的排名
|
|
|
- 'pvpCoins' => $pvp->pvpCoins, # # 自己的竞技币
|
|
|
- 'fPower' => $fPower, # # 自己的总战力
|
|
|
- 'fightTicket' => $pvp->fightTicket, # # 自己的挑战票
|
|
|
- 'defTeam' => $pvp->defTeam, # # 自己的防守队伍
|
|
|
- 'bHasNewFightLog' => $bHasNewLog, # # 是否有战报刷新
|
|
|
- 'matches' => $matches, # # 对手列表
|
|
|
- );
|
|
|
- return Resp::ok($ret); # 返回
|
|
|
- }
|
|
|
-
|
|
|
-// </editor-fold>
|
|
|
-//
|
|
|
-// <editor-fold defaultstate="collapsed" desc=" 竞技商店 ">
|
|
|
|
|
|
/**
|
|
|
* [6820] 竞技商店 主界面
|
|
|
- * @param type $req
|
|
|
+ * @param req $req
|
|
|
*/
|
|
|
public static function pvpShopMain($req) {
|
|
|
- // 商品列表
|
|
|
- // 检查刷新时间<now => 刷新商品列表
|
|
|
- // 返回
|
|
|
+ $pvp = new UserPVPModel($req->userInfo->game->pvp); # PVP信息
|
|
|
+ if ($pvp->shopRefreshTs < now()) { # 检查刷新时间<now => 刷新商品列表
|
|
|
+ $pvp->shopRefreshTs = now() + glc()->PVP_shop_refresh_interval; # 更新刷新时间
|
|
|
+ $pvp->curShopItems = GameConfig::pvp_shop(); # 重刷道具
|
|
|
+ $req->userInfo->game->pvp = $pvp; # 回写
|
|
|
+ UserProc::updateUserInfo();
|
|
|
+ }
|
|
|
+ return Resp::ok($pvp); // 返回
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
* [6821] 竞技 商店 购买道具
|
|
|
- * @param type $req
|
|
|
+ * @param req $req
|
|
|
*/
|
|
|
public static function pvpShopBuy($req) {
|
|
|
- // 查询物品配置数据
|
|
|
- // 扣除竞技币
|
|
|
- // 发放道具
|
|
|
- // 回写数据
|
|
|
- // 返回
|
|
|
+ $index = $req->paras[0]; # 参数:道具索引(typeId)
|
|
|
+ $pvp = new UserPVPModel($req->userInfo->game->pvp); # PVP 数据
|
|
|
+ my_Assert(CommUtil::isPropertyExists($pvp->curShopItems, $index), ErrCode::err_innerfault); # 没有找到改商品
|
|
|
+// isEditor() && $citem = new \sm_pvp_shop();
|
|
|
+ $citem = $pvp->curShopItems->$index; # 查询物品数据
|
|
|
+ my_Assert($citem->sealed == 0, ErrCode::pvp_item_soldout); # 防御道具已售罄
|
|
|
+ my_Assert($citem->pricetype == 5, ErrCode::pay_price_err); # 防御定价异常
|
|
|
+ my_Assert($pvp->pvpCoins > $citem->price, ErrCode::pvp_coinnotenough); # pvp币不足
|
|
|
+ $citem->sealed += 1; # 设置已售罄/已购买标志
|
|
|
+ $pvp->pvpCoins -= $citem->price; # 扣除竞技币
|
|
|
+ StoreProc::AddMultiItemInStore($req, $citem->goods); // 发放道具
|
|
|
+ $req->userInfo->game->pvp = $pvp; // 回写数据
|
|
|
+ UserProc::updateUserInfo();
|
|
|
+ return Resp::ok(); // 返回
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
* [6822] 竞技 商店 刷新道具
|
|
|
- * @param type $req
|
|
|
+ * @param req $req
|
|
|
*/
|
|
|
public static function pvpShopRefresh($req) {
|
|
|
// 扣除刷新消耗
|
|
|
- // 更新刷新时间
|
|
|
- // 重刷道具
|
|
|
- // 回写数据
|
|
|
- // 返回
|
|
|
+ $pvp = new UserPVPModel($req->userInfo->game->pvp);
|
|
|
+ $costCash = glc()->PVP_shop_refresh_cash;
|
|
|
+ my_Assert(UserGameModel::Consume_Cash($req->userInfo->game, $costCash), ErrCode::notenough_cash_msg);
|
|
|
+ $pvp->shopRefreshTs = now() + glc()->PVP_shop_refresh_interval; # 更新刷新时间
|
|
|
+ $pvp->curShopItems = GameConfig::pvp_shop(); # 重刷道具
|
|
|
+ $req->userInfo->game->pvp = $pvp; # 回写
|
|
|
+ UserProc::updateUserInfo(); # 回写玩家数据
|
|
|
+ return Resp::ok($pvp); # 返回
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
@@ -334,80 +285,90 @@ class PVPProc {
|
|
|
|
|
|
// // </editor-fold>
|
|
|
//
|
|
|
- // <editor-fold defaultstate="collapsed" desc=" 旧版PVP 681x ">
|
|
|
-//
|
|
|
+ // <editor-fold defaultstate="collapsed" desc=" 竞技场 681x">
|
|
|
+ //
|
|
|
|
|
|
/**
|
|
|
- * @deprecated since version 2020.5.8
|
|
|
- * @param Req $req
|
|
|
- * @param type $uid
|
|
|
- * @param type $addValue Description
|
|
|
+ * 辅助方法:取当前赛季的编号(从赛季起始开始算起)
|
|
|
+ * @return int
|
|
|
*/
|
|
|
- private static function _addScore_by_uid($req, $uid, $addValue) {
|
|
|
- if ($addValue <= 0) { # 防御
|
|
|
- return;
|
|
|
- }
|
|
|
- $mem = $req->mem;
|
|
|
- $zoneid = $req->zoneid;
|
|
|
- $key = MemKey_GameRun::Game_PVPScoreByZone_zset($zoneid); # 积分榜
|
|
|
- $score = $mem->zscore($key, $uid);
|
|
|
- if (!$score || $score <= 0) { # 分数异常
|
|
|
- $leagueScore = GameConfig::pvp_leaguescore_getItem(1); # 新手基础分
|
|
|
- $score = $leagueScore->minScore;
|
|
|
- $mem->zadd($key, array($uid => $score)); # 重置玩家积分
|
|
|
- }
|
|
|
- $newscore = $mem->zincrby($key, $uid, $addValue); # 返回最新值
|
|
|
- $mem->zadd(MemKey_GameRun::Game_PVPScoreByZone_zset_curWeek($zoneid), array($uid => $newscore));
|
|
|
- return $newscore;
|
|
|
+ public static function GetCurSeasonID() {
|
|
|
+ $n = ceil((now() - self::pvpStartTs ) / self::pvpSeasonLengt); # 进一取整
|
|
|
+ return $n;
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
- * @deprecated since version 2020.5.8
|
|
|
- * @param type $req
|
|
|
- * @param type $uid
|
|
|
- * @param type $subValue
|
|
|
+ * 辅助方法:取指定赛季的结束时间戳
|
|
|
+ * @param int $seasonID
|
|
|
+ * @return int
|
|
|
*/
|
|
|
- private static function _subScore_by_uid($req, $uid, $subValue) {
|
|
|
- if ($subValue >= 0) { # 防御异常数值
|
|
|
- return;
|
|
|
- }
|
|
|
- $mem = $req->mem;
|
|
|
- $zoneid = $req->zoneid;
|
|
|
- $key = MemKey_GameRun::Game_PVPScoreByZone_zset($zoneid); # 积分榜
|
|
|
- $score = $mem->zscore($key, $uid);
|
|
|
- $leagueScore = GameConfig::pvp_leaguescore_getItem(1); # 新手基础分
|
|
|
- if (!$score || $score <= 0 #
|
|
|
- || ($score + $subValue) <= $leagueScore->minScore) { # 分数异常
|
|
|
- $score = $leagueScore->minScore; # 新手基础分
|
|
|
- $mem->zadd($key, array($uid => $score)); # 重置玩家积分
|
|
|
- } else {
|
|
|
- $score = $mem->zincrby($key, $uid, $subValue); # 扣除积分并返回最新值
|
|
|
- }
|
|
|
- $mem->zadd(MemKey_GameRun::Game_PVPScoreByZone_zset_curWeek($zoneid), array($uid => $score)); # 同步记录
|
|
|
- return $score;
|
|
|
+ public static function GetSeasonEndTs($seasonID) {
|
|
|
+ $ts = self::pvpStartTs + $seasonID * self::pvpSeasonLengt; # 从起始点开始 + n个赛季时常
|
|
|
+ return $ts;
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
- * 发送上周上榜奖励
|
|
|
+ * [6810] 竞技场 拉取主界面信息
|
|
|
* @param Req $req
|
|
|
*/
|
|
|
- public static function sendLastRankReward($req) {
|
|
|
- $mem = gMem();
|
|
|
- $zoneid = $req->zoneid;
|
|
|
- $tsweek = TimeUtil::tsWeek();
|
|
|
- $key = MemKey_GameRun::Game_PVPRankRewardRecord_set($zoneid);
|
|
|
- if (!$mem->sismember($key, $tsweek)) { # 上周榜单尚未处理, 每周只处理一次
|
|
|
- // 上周是空的情况.
|
|
|
- $lastKey = MemKey_GameRun::Game_PVPRankRewardRecord_byWeek_str($zoneid, $tsweek - 1);
|
|
|
- $mem->sadd($key, $tsweek); # 添加处理记录
|
|
|
- $key_total = MemKey_GameRun::Game_PVPScoreByZone_zset($zoneid); # 拉取上榜人员
|
|
|
- $uids = $mem->zrevrange($key_total, 0, 99);
|
|
|
- $rank = 0;
|
|
|
- foreach ($uids as $uid) {
|
|
|
- EmailProc::SendPvpRankReward($zoneid, $uid, ++$rank); # 发送奖励邮件
|
|
|
+ static function pvpMainInfo($req) {
|
|
|
+ $uid = $req->uid; # 快速访问UID
|
|
|
+ $zoneid = $req->zoneid; # 快速访问zoneid
|
|
|
+ $pvp = new UserPVPModel($req->userInfo->game->pvp); # 设计玩家pvp数据结构
|
|
|
+ $seasonId = self::GetCurSeasonID(); # 当前赛季ID
|
|
|
+ $key = MemKey_GameRun::Game_PVPScoreByZoneSeason_zset($zoneid, $seasonId); # 积分总榜
|
|
|
+
|
|
|
+ $score = self::_getScore_by_uid($uid, $key); # 玩家积分
|
|
|
+ $rank = self::_getRank_by_uid($uid, $key); # 玩家排名
|
|
|
+ $fPower = HeroProc::CalcUserFightPower($zoneid, $uid, $req->userInfo->game); # 玩家总战力?还是当前防守队伍的战斗力?
|
|
|
+ $bHasNewLog = true; // todo: 真正查询是否有新战报
|
|
|
+ $matches = self::getNewMatches($pvp, gMem(), $uid, $zoneid); # 获得新的匹配对手
|
|
|
+
|
|
|
+ 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) {
|
|
|
+ $cfg = new \sm_pvp_rankreward();
|
|
|
+ if ($rank >= $cfg->minRank && $rank <= $cfg->maxRank) { # 找到对应的名次段
|
|
|
+ EmailProc::SendPvpRankReward_Season($zoneid, $uid, $rank); # 发放奖励邮件(竞技币)
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
- $mem->add($lastKey, $uids);
|
|
|
+ $pvp->haventReward_season = $seasonId; # 更新待发奖赛季
|
|
|
}
|
|
|
+ if ($pvp->haventReward_tsDay > 0 && $pvp->haventReward_tsDay < tsDay()) { # 尚未发放昨天奖励
|
|
|
+ $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) {
|
|
|
+ $cfg = new \sm_pvp_rankreward();
|
|
|
+ if ($rank >= $cfg->minRank && $rank <= $cfg->maxRank) { # 找到对应的名次段
|
|
|
+ EmailProc::SendPvpRankReward_Lastday($zoneid, $uid, $rank); # 发放奖励邮件(竞技币)
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ $pvp->haventReward_tsDay = tsDay(); # 更新待发放奖励日期
|
|
|
+ }
|
|
|
+
|
|
|
+ // 组装 返回值结构
|
|
|
+ $ret = array(
|
|
|
+ 'score' => $score, # # 自己的积分
|
|
|
+ 'rank' => $rank, # # 自己的排名
|
|
|
+ 'pvpCoins' => $pvp->pvpCoins, # # 自己的竞技币
|
|
|
+ 'fPower' => $fPower, # # 自己的总战力
|
|
|
+ 'fightTicket' => $pvp->fightTicket, # # 自己的挑战票
|
|
|
+ 'defTeam' => $pvp->defTeam, # # 自己的防守队伍
|
|
|
+ 'bHasNewFightLog' => $bHasNewLog, # # 是否有战报刷新
|
|
|
+ 'matches' => $matches, # # 对手列表
|
|
|
+ );
|
|
|
+ return Resp::ok($ret); # 返回
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
@@ -416,41 +377,16 @@ class PVPProc {
|
|
|
*/
|
|
|
static function pvp_Refresh($req) {
|
|
|
// 刷新无花费, 间隔时间3秒(客户端控制得了)
|
|
|
- // 根据匹配规格获得5个对手即可(1. 排除自己, 2. 最好不要出现已经刷到过的对手)
|
|
|
- // 低于玩家当前积分 -- 2个 -5%~-20%之间
|
|
|
- // 与玩家当前积分基本持平 1个, ±5%之间
|
|
|
- // 高于玩家当前积分 -- 2个 +5%~+40%之间
|
|
|
-// $amt = $req->paras[0]; # 提取 params , 验证下花费
|
|
|
-// $pvp = new UserPVPModel($req->userInfo->game->pvp);
|
|
|
-// $ts = now();
|
|
|
-// if ($amt <= 0) { # 免费情况
|
|
|
-// if ($pvp->nextRefreshTs > $ts) { # 验证时间
|
|
|
-// return Resp::err(ErrCode::pvp_refresh_time);
|
|
|
-// }
|
|
|
-// } else { # 扣除钻石刷新的情况
|
|
|
-// $priceArr = explode(',', glc()->PVP_reFresh_Match_cost); # 价格
|
|
|
-// if (count($priceArr) < $pvp->dailyRefreshMatchTimes) { # 超过最大刷新次数
|
|
|
-// return Resp::err(ErrCode::pvp_refresh_max);
|
|
|
-// }
|
|
|
-// $costCash = $priceArr[$pvp->dailyRefreshMatchTimes++]; # 查找对应的定价, 并计次
|
|
|
-// if ($costCash != $amt) { # 跟预期值不一致,
|
|
|
-// return Resp::err(ErrCode::pvp_refresh_cost_ilegal);
|
|
|
-// }
|
|
|
-// if (!UserGameModel::Consume_Cash($req->userInfo->game, $costCash)) {# 扣除钻石失败
|
|
|
-// return Resp::err(ErrCode::notenough_cash_msg);
|
|
|
-// }
|
|
|
-// }
|
|
|
-//
|
|
|
-// $pvp->curMatches = self::getNewMatches($pvp, $req->mem, $req->uid, $req->zoneid);
|
|
|
-// $pvp->nextRefreshTs = now(glc()->PVP_refresh_Match_RecoverSeconds);
|
|
|
-// $req->userInfo->game->pvp = $pvp;
|
|
|
-// UserProc::updateUserInfo(); # 回写数据
|
|
|
-//
|
|
|
-// $ret = array(
|
|
|
-// 'nextRefreshTs' => $pvp->nextRefreshTs, # # 下次免费刷新的时间戳
|
|
|
-// 'dailyRefreshMatchTimes' => $pvp->dailyRefreshMatchTimes,
|
|
|
-// 'curMatches' => $pvp->curMatches # # 当前对手清单
|
|
|
-// );
|
|
|
+ $pvp = new UserPVPModel($req->userInfo->game->pvp);
|
|
|
+ $ts = now();
|
|
|
+ my_Assert($pvp->nextRefreshTs < $ts, ErrCode::pvp_refresh_time); # 验证时间间隔
|
|
|
+ $pvp->curMatches = self::getNewMatches($pvp, $req->uid, $req->zoneid);
|
|
|
+ $pvp->nextRefreshTs = now(3);
|
|
|
+ $req->userInfo->game->pvp = $pvp;
|
|
|
+ UserProc::updateUserInfo(); # 回写数据
|
|
|
+ $ret = array(
|
|
|
+ 'curMatches' => $pvp->curMatches # # 当前对手清单
|
|
|
+ );
|
|
|
return Resp::ok($ret);
|
|
|
}
|
|
|
|
|
|
@@ -463,82 +399,38 @@ class PVPProc {
|
|
|
$target_uid = $req->paras[0]; # 对手id
|
|
|
$result = $req->paras[1]; # 胜负结果 0负,1胜
|
|
|
$pvp = $req->userInfo->game->pvp;
|
|
|
- // 根据挑战结果, 计算双方积分变化
|
|
|
- // 更新双方的积分变化
|
|
|
- // redis->zincr 修改各自积分
|
|
|
- // 返回
|
|
|
-// if (!property_exists($pvp->curMatches, $target_uid)//
|
|
|
-// or property_exists($pvp->curMatches->$target_uid, 'killed')) { # 对手已被ko
|
|
|
-// return Resp::err(ErrCode::pvp_wrongMather);
|
|
|
-// }
|
|
|
-// $g = glc();
|
|
|
-// if (now() - $pvp->tiliTs > $g->PVP_reCover_Tili_costSec * 5) { # 检查并扣除体力
|
|
|
-// $pvp->tiliTs = now() - $g->PVP_reCover_Tili_costSec * 5;
|
|
|
-// }
|
|
|
-// if ($pvp->tiliExtra > 0) { # 优先扣除溢出值
|
|
|
-// $pvp->tiliExtra--;
|
|
|
-// } else {
|
|
|
-// $pvp->tiliTs += $g->PVP_reCover_Tili_costSec;
|
|
|
-// if ($pvp->tiliTs > now()) {
|
|
|
-// return Resp::err(ErrCode::pvp_wrongtili);
|
|
|
-// }
|
|
|
-// }
|
|
|
-//# 发放对应奖励并记录挑战记录
|
|
|
-// $score = 0;
|
|
|
-// if ($result) { # 1 胜, 奖金币、积分、pvp币
|
|
|
-// UserGameModel::Add_Gold($req->userInfo->game, $g->PVP_PK_Win_Gold);
|
|
|
-// # × 奖励积分的公式: 获胜基础奖励积分 + 积分差距修正系数 * 积分差
|
|
|
-// # 挑战胜利, 积分改为固定值.
|
|
|
-// $winnerGainScore = $g->PVP_PK_Win_Score; # 本局得分
|
|
|
-// $score = self::_addScore_by_uid($req, $uid, intval($winnerGainScore)); # 增加积分
|
|
|
-// $pvp->pvpCoins += $g->PVP_PK_Win_PvpCoin; # 发放金币
|
|
|
-// self::_subScore_by_uid($req, $target_uid, -intval($g->PVP_PK_be_defeated_score)); # 给对手扣除积分
|
|
|
-// $pvp->contWin++; # 连胜记录
|
|
|
-// $pvp->winTimes++; # 获胜记录
|
|
|
-// $all = true; # 全部战胜标记
|
|
|
-// foreach ($pvp->curMatches as $pid => &$p) {
|
|
|
-// if ($pid == $target_uid) { #
|
|
|
-// $p->killed = 1; # 添加ko标志
|
|
|
-// if (property_exists($p, 'fog')) {
|
|
|
-// $score = self::_addScore_by_uid($req, $uid, intval($winnerGainScore)); # 神秘对手, 积分翻倍(再加一遍)
|
|
|
-// }
|
|
|
-// }
|
|
|
-// if (!property_exists($p, 'killed')) {
|
|
|
-// $all = false; # 尚未全部战胜
|
|
|
-// }
|
|
|
-// }
|
|
|
-// if ($all) { # 全部战胜之后,刷新对手
|
|
|
-// $pvp->curMatches = self::getNewMatches($pvp, $req->mem, $req->uid, $req->zoneid);
|
|
|
-// $pvp->nextRefreshTs = now(glc()->PVP_refresh_Match_RecoverSeconds);
|
|
|
-// }
|
|
|
-// } else { # 0 挑战失败 只扣除积分
|
|
|
-// # × 奖励积分的公式: 获胜基础奖励积分 + 积分差距修正系数 * 积分差
|
|
|
-// # 挑战失败, 扣除固定积分
|
|
|
-// $loserGainScore = $g->PVP_PK_Fail_Score;
|
|
|
-// $score = self::_subScore_by_uid($req, $uid, -intval($loserGainScore)); # 扣除积分
|
|
|
-// self::_addScore_by_uid($req, $target_uid, intval($g->PVP_PK_be_undefeated_score)); # 给对手发放积分
|
|
|
-// $pvp->contWin = 0; # 连胜置零
|
|
|
-// }
|
|
|
-// if (property_exists($pvp->curMatches, $target_uid) && property_exists($pvp->curMatches->$target_uid, 'fog')) {
|
|
|
-// unset($pvp->curMatches->$target_uid->fog);
|
|
|
-// }
|
|
|
-// $pvp->totalTimes++;
|
|
|
-// $leagueid = self::GetLeagueByScore($score);
|
|
|
-// if ($pvp->leagueId != $leagueid) {
|
|
|
-// $pvp->leagueId = $leagueid;
|
|
|
-// SystemProc::PVP_league($req->zoneid, $req->userInfo->game, $leagueid);
|
|
|
-// }
|
|
|
-// $pvp->actives++;
|
|
|
-// $pvp->dailyPkCnt++;
|
|
|
-// $req->userInfo->game->pvp = $pvp;
|
|
|
-////todo: debuging...
|
|
|
-// UserProc::updateUserInfo(); # 回写数据
|
|
|
-// $ret = array(
|
|
|
-// 'contWin' => $pvp->contWin,
|
|
|
-// 'leagueId' => $pvp->leagueId,
|
|
|
-// 'newscore' => $score, # # 返回最新积分
|
|
|
-// );
|
|
|
- return Resp::ok($ret);
|
|
|
+
|
|
|
+ if ($pvp->freeFightTickets > 0) { # 有免费挑战票,先扣除免费的
|
|
|
+ $pvp->freeFightTickets -= 1;
|
|
|
+ } else {
|
|
|
+ my_Assert($pvp->fightTicket > 0, ErrCode::pvp_no_tickets); # 防御: 挑战票不足
|
|
|
+ $pvp->fightTicket -= 1; # 扣除挑战票
|
|
|
+ }
|
|
|
+ $season = self::GetCurSeasonID(); # 当前赛季
|
|
|
+ $key = MemKey_GameRun::Game_PVPScoreByZoneSeason_zset($zoneid, $season); # redis key
|
|
|
+ $RA = self::_getScore_by_uid($uid, $key); # A的积分
|
|
|
+ $RB = self::_getScore_by_uid($uid, $key); # B的积分
|
|
|
+ $EA = 1 / (1 + pow(10, ($RA - $RB) / 400)); # A的胜率期望值
|
|
|
+ $EB = 1 / (1 + pow(10, ($RB - $RA) / 400)); # B的胜率期望值
|
|
|
+ $K = 32; # 浮动系数, 暂定为32
|
|
|
+ $SA = $result; # 我的胜负结果
|
|
|
+ $SB = ($result == 1) ? 0 : 1; # 对手的胜负结果
|
|
|
+ $R_A = $RA + $K * ($SA - $EA ); # 我的最终积分
|
|
|
+ $R_B = $RB + $K * ($SB - $EB); # 对手的最终积分
|
|
|
+ #
|
|
|
+ self::_addScore_by_uid($zoneid, $uid, $R_A - $RA); # 更新A的积分
|
|
|
+ self::_addScore_by_uid($zoneid, $uid, $R_B - $RB); # 更新B的积分
|
|
|
+ $req->userInfo->game->pvp = $pvp;
|
|
|
+ UserProc::updateUserInfo(); # 回写数据
|
|
|
+ $ret = array(# # 组装返回值
|
|
|
+ 'freeFightTickets' => $pvp->freeFightTickets, # # 自己剩余免费票
|
|
|
+ 'fightTicket' => $pvp->fightTicket, # # 自己剩余挑战票
|
|
|
+ 'RA' => $RA, # # 自己挑战之前积分
|
|
|
+ 'RB' => $RB, # # 对手挑战之前积分
|
|
|
+ 'R_A' => $R_A, # # 自己最新积分
|
|
|
+ 'R_B' => $R_B, # # 对手最新积分
|
|
|
+ );
|
|
|
+ return Resp::ok($ret); # 返回
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
@@ -562,46 +454,28 @@ class PVPProc {
|
|
|
* @return type
|
|
|
*/
|
|
|
static function pvp_buyticket($req) {
|
|
|
- $amt = $req->paras[0]; # 验证下本次扣除的钻石数量
|
|
|
+ $amt = $req->paras[0]; # 购买数量
|
|
|
# 检查并扣除消耗
|
|
|
# 增加挑战票
|
|
|
# 回存数据
|
|
|
# 返回
|
|
|
-// $pvp = new UserPVPModel($req->userInfo->game->pvp);
|
|
|
-// $g = glc();
|
|
|
-// $curTili = intval((now() - $pvp->tiliTs) / $g->PVP_reCover_Tili_costSec);
|
|
|
-// if ($curTili > 5) {
|
|
|
-// $curTili = 5;
|
|
|
-// }
|
|
|
-// if ($pvp->tiliExtra > 0) { # 体力溢出值大于0的时候不要购买
|
|
|
-// return Resp::err(ErrCode::pvp_tili_chargenum);
|
|
|
-// }
|
|
|
-// $priceArr = explode(',', $g->PVP_recover_tili_cost_cash);
|
|
|
-//
|
|
|
-// if (count($priceArr) < $pvp->dailyBuyTiliTimes) {
|
|
|
-// return Resp::err(ErrCode::pvp_tili_soldout);
|
|
|
-// }
|
|
|
-// $costCash = $priceArr[$pvp->dailyBuyTiliTimes++]; # 查找对应的定价, 并计次
|
|
|
-// if ($costCash != $amt) { # 跟预期值不一致,
|
|
|
-// return Resp::err(ErrCode::pvp_tili_cost_ilegal);
|
|
|
-// }
|
|
|
-// if (!UserGameModel::Consume_Cash($req->userInfo->game, $costCash)) { # 扣除钻石失败
|
|
|
-// return Resp::err(ErrCode::notenough_cash_msg);
|
|
|
-// }
|
|
|
-// if ($curTili > 0) { # 增加溢出值
|
|
|
-// $pvp->tiliExtra = $curTili;
|
|
|
-// }
|
|
|
-//
|
|
|
-// $pvp->tiliTs = now() - ( 5 * $g->PVP_reCover_Tili_costSec); # 补满
|
|
|
-// $req->userInfo->game->pvp = $pvp;
|
|
|
-// UserProc::updateUserInfo(); # 回写玩家数据
|
|
|
-// $ret = array(
|
|
|
-// 'tiliTs' => $pvp->tiliTs,
|
|
|
-// 'tiliExtra' => $pvp->tiliExtra,
|
|
|
-// 'costCash' => $costCash,
|
|
|
-// 'dailyBuyTiliTimes' => $pvp->dailyBuyTiliTimes,
|
|
|
-// 'userCash' => $req->userInfo->game->cash
|
|
|
-// );
|
|
|
+ my_Assert($amt > 0, ErrCode::paras_err); # 数量>0
|
|
|
+ $pvp = new UserPVPModel($req->userInfo->game->pvp);
|
|
|
+ $g = glc();
|
|
|
+ $costCash = $g->PVP_pk_ticket_price * $amt; # 计算消耗钻石
|
|
|
+ my_Assert($costCash > 0, ErrCode::pvp_ticket_cost_ilegal); # 定价数据异常
|
|
|
+
|
|
|
+ if (!UserGameModel::Consume_Cash($req->userInfo->game, $costCash)) { # 扣除钻石失败
|
|
|
+ return Resp::err(ErrCode::notenough_cash_msg);
|
|
|
+ }
|
|
|
+ $pvp->fightTicket += $amt; # 发放挑战票
|
|
|
+ $req->userInfo->game->pvp = $pvp;
|
|
|
+ UserProc::updateUserInfo(); # 回写玩家数据
|
|
|
+ $ret = array(
|
|
|
+ 'tickets' => $pvp->fightTicket,
|
|
|
+ 'costCash' => $costCash,
|
|
|
+ 'userCash' => $req->userInfo->game->cash
|
|
|
+ );
|
|
|
return Resp::ok($ret); # 返回
|
|
|
}
|
|
|
|
|
|
@@ -614,23 +488,24 @@ class PVPProc {
|
|
|
$zoneid = $req->zoneid;
|
|
|
$index = $req->paras[0]; # 起始(0)
|
|
|
$n = $req->paras[1]; # 数量, (n<=max)
|
|
|
-// if ($n < 1 || $n > $maxAmt) { # 防御非法情况
|
|
|
-// $n = $maxAmt;
|
|
|
-// }
|
|
|
-// $arr = self::getRankPlayers($req->mem, $zoneid, $index - 1, ($index + $n) - 1);
|
|
|
+ #
|
|
|
+ if ($n < 1 || $n > $maxAmt) { # 防御非法情况
|
|
|
+ $n = $maxAmt;
|
|
|
+ }
|
|
|
+ $arr = self::getRankPlayers($req->mem, $zoneid, $index - 1, ($index + $n) - 1);
|
|
|
//
|
|
|
-// $rankId = $index;
|
|
|
-// $result = ObjectInit();
|
|
|
-// if (count($arr)) {
|
|
|
-// foreach ($arr as $key => $value) {//$value 的数据类型是array
|
|
|
-// $value["uid"] = $key;
|
|
|
-// $result->$rankId = $value;
|
|
|
-// $rankId += 1;
|
|
|
-// }
|
|
|
-// }
|
|
|
-// $ret = array(
|
|
|
-// 'arr' => $result
|
|
|
-// );
|
|
|
+ $rankId = $index;
|
|
|
+ $result = ObjectInit();
|
|
|
+ if (count($arr)) {
|
|
|
+ foreach ($arr as $key => $value) {// $value 的数据类型是array
|
|
|
+ $value["uid"] = $key;
|
|
|
+ $result->$rankId = $value;
|
|
|
+ $rankId += 1;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ $ret = array(
|
|
|
+ 'dic' => $result
|
|
|
+ );
|
|
|
return Resp::ok($ret);
|
|
|
}
|
|
|
|
|
|
@@ -642,12 +517,51 @@ class PVPProc {
|
|
|
// 提取主动挑战+被挑战记录
|
|
|
// 更新下刷新时间
|
|
|
// 返回
|
|
|
+ // 参数:无
|
|
|
+ $key_off = MemKey_User::PVP_OffensiveLog_zset($req->zoneid, $req->uid);
|
|
|
+ $key_def = MemKey_User::PVP_DefensiveLog_zset($req->zoneid, $req->uid);
|
|
|
+ // 拉取自己的挑战记录
|
|
|
+ $offLog = $req->mem->zrange($key_off, 0, self::maxLogCount); # 主动挑战数据
|
|
|
+ $defLog = $req->mem->zrange($key_def, 0, self::maxLogCount); # 防守数据
|
|
|
+ // Ps. 挑战记录分为2个榜, 且按照时间戳记录,晚于指定时间戳的判定为未读消息,挑战记录最多记录50条
|
|
|
+ $pvp = new UserPVPModel($req->userInfo->game->pvp); # 玩家竞技场数据
|
|
|
+ $pvp->lastCheckDefLog_ts = now(); # 记录时间戳
|
|
|
+ UserProc::updateUserInfo(); # 回写数据
|
|
|
+ array_walk($offLog, function (&$i) { # 解码一下
|
|
|
+ $i = JsonUtil::decode($i);
|
|
|
+ });
|
|
|
+ array_walk($defLog, function (&$i) { # 解码一下
|
|
|
+ $i = JsonUtil::decode($i);
|
|
|
+ });
|
|
|
+ return Resp::ok(array(
|
|
|
+ 'offLog' => $offLog,
|
|
|
+ 'defLog' => $defLog
|
|
|
+ ));
|
|
|
return Resp::ok($ret);
|
|
|
}
|
|
|
|
|
|
// ---------------- 辅助函数 -----------------------
|
|
|
// <editor-fold defaultstate="collapsed" desc=" 辅助 函数 ">
|
|
|
|
|
|
+ /**
|
|
|
+ * 修改积分
|
|
|
+ * @param int $zoneid
|
|
|
+ * @param string $uid
|
|
|
+ * @param int $addValue 可以是负值
|
|
|
+ */
|
|
|
+ private static function _addScore_by_uid($zoneid, $uid, $addValue) {
|
|
|
+ $mem = gMem();
|
|
|
+ $seasonId = self::GetCurSeasonID();
|
|
|
+ $key = MemKey_GameRun::Game_PVPScoreByZoneSeason_zset($zoneid, $seasonId); # 积分榜
|
|
|
+ $score = $mem->zscore($key, $uid);
|
|
|
+ if (is_null($score) || $score <= 0) { # 分数异常, 理论上不会出现负分
|
|
|
+ $score = self::pvpBaseScore; # 新手基础分
|
|
|
+ $mem->zadd($key, array($uid => $score)); # 重置玩家积分
|
|
|
+ }
|
|
|
+ $newscore = $mem->zincrby($key, $uid, $addValue); # 返回最新值
|
|
|
+ return $newscore;
|
|
|
+ }
|
|
|
+
|
|
|
/**
|
|
|
* 竞技场 查询玩家的积分
|
|
|
* @param type $uid
|
|
|
@@ -660,7 +574,7 @@ class PVPProc {
|
|
|
}
|
|
|
$mem = gMem();
|
|
|
$score = $mem->zscore($key, $uid);
|
|
|
- if (!$score || $score <= 0) { # 分数异常
|
|
|
+ if (is_null($score) || $score <= 0) { # 分数异常
|
|
|
$score = self::pvpBaseScore; # 新手基础分
|
|
|
$mem->zadd($key, array($uid => $score)); # 更新玩家积分
|
|
|
}
|
|
|
@@ -687,38 +601,6 @@ class PVPProc {
|
|
|
return $rank; # 返回
|
|
|
}
|
|
|
|
|
|
- /**
|
|
|
- * 清理每日计数器
|
|
|
- * @deprecated since version 2020.5.8
|
|
|
- * @param Req $req
|
|
|
- */
|
|
|
- public static function ClearDailyPkcnt($req) {
|
|
|
- $pvp = new UserPVPModel($req->userInfo->game->pvp);
|
|
|
- $pvp->dailyPkCnt = 0;
|
|
|
- $pvp->dailyBuyTiliTimes = 0;
|
|
|
- $pvp->dailyRefreshMatchTimes = 0;
|
|
|
- $pvp->dailyMatchRecord = array($req->uid); # 屏蔽自己
|
|
|
- $pvp->curMatches = self::getNewMatches($pvp, $req->mem, $req->uid, $req->zoneid); # added by: 李宁,2017年8月1日 11:45:41
|
|
|
- $pvp->nextRefreshTs = tsDay() * 86400 + glc()->PVP_refresh_Match_RecoverSeconds;
|
|
|
- $req->userInfo->game->pvp = $pvp;
|
|
|
- }
|
|
|
-
|
|
|
- /**
|
|
|
- * 依据积分获得所在阶段的id
|
|
|
- * @deprecated since version 2020.5.8
|
|
|
- * @param type $curScore
|
|
|
- * @return int
|
|
|
- */
|
|
|
- private static function GetLeagueByScore($curScore) {
|
|
|
- foreach (GameConfig::pvp_leaguescore() as $id => $lg) {
|
|
|
- isEditor() and $lg = new sm_pvp_leaguescore;
|
|
|
- if ($lg->maxScore >= $curScore && $lg->minScore <= $curScore) {
|
|
|
- return $id;
|
|
|
- }
|
|
|
- }
|
|
|
- return 1; # 找不到对应所属阶段的时候,返回 默认值 1
|
|
|
- }
|
|
|
-
|
|
|
/**
|
|
|
* 获取对手匹配结果
|
|
|
* @param UserPVPModel $pvp
|
|
|
@@ -727,16 +609,13 @@ class PVPProc {
|
|
|
* @param type $zoneid
|
|
|
*/
|
|
|
private static function getNewMatches($pvp, $uid, $zoneid) {
|
|
|
- $arr = array();
|
|
|
$seasonID = self::GetCurSeasonID();
|
|
|
$key = MemKey_GameRun::Game_PVPScoreByZoneSeason_zset($zoneid, $seasonID); # redis key
|
|
|
- self::findmatcher($zoneid, $key, $uid, $pvp, $arr); # 积分榜查找
|
|
|
+ $arr = self::findmatcher($zoneid, $key, $uid, $pvp); # 积分榜查找
|
|
|
if (count($arr) < self::matchCount) { # 再不行, 准备机器人吧
|
|
|
-// todo: 这里引入gm对手数据,
|
|
|
- CLog::err('PVP刷对手数量不足, 赶快考虑加入机器人.', 'PVP');
|
|
|
+ CLog::err('PVP刷对手数量不足, 赶快考虑加入机器人.', 'PVP'); // todo: 这里引入gm对手数据,
|
|
|
}
|
|
|
$ret = self::GetPlayerInfosForPVP(gMem(), $zoneid, $arr);
|
|
|
-
|
|
|
return $ret;
|
|
|
}
|
|
|
|
|
|
@@ -749,41 +628,45 @@ class PVPProc {
|
|
|
* @param type $arr
|
|
|
*/
|
|
|
private static function findmatcher($zoneid, $key, $uid, &$pvp, &$arr) {
|
|
|
+ // 根据匹配规格获得5个对手即可(1. 排除自己, 2. 最好不要出现已经刷到过的对手)
|
|
|
+ // 低于玩家当前积分 -- 2个 -5%~-20%之间
|
|
|
+ // 与玩家当前积分基本持平 1个, ±5%之间
|
|
|
+ // 高于玩家当前积分 -- 2个 +5%~+40%之间
|
|
|
$mem = gMem();
|
|
|
- $rank = $mem->zrevrank($key, $uid); # 直接查排名
|
|
|
+ $rank = self::_getRank_by_uid($uid, $key); # 直接查排名
|
|
|
+ $score = self::_getScore_by_uid($uid, $key); # 查积分
|
|
|
$zlen = $mem->zlen($key); # 数据长度
|
|
|
$i = 0; # 计数器
|
|
|
$b = false; # 上下标志位
|
|
|
- while (count($arr) < self::matchCount && $i < 50) { # 找够数量为止,或者查找超过100个位置, 跳出查找
|
|
|
- $index = $rank + ($b ? - $i : $i);
|
|
|
- $b = !$b;
|
|
|
- if ($b) { # 变化查找方向
|
|
|
- $i++; #
|
|
|
- }
|
|
|
- if ($index < 0 || $index >= $zlen) { # 跳过不合理位置
|
|
|
- continue;
|
|
|
- }
|
|
|
- $back = $mem->zrevrange($key, $index, $index, true); # 取1个人
|
|
|
- if (count($back) <= 0) {
|
|
|
- continue; # 跳过
|
|
|
- }
|
|
|
- $us = array_keys($back);
|
|
|
- $d_uid = $us[0];
|
|
|
- if ($d_uid == $uid) { # 避开自己
|
|
|
- continue;
|
|
|
- }
|
|
|
- $user = $mem->get(MemKey_User::Info_hash($zoneid, $d_uid));
|
|
|
- if (null == $user) { # 找不到对手数据,跳过
|
|
|
- continue;
|
|
|
- }
|
|
|
-// $fp = HeroProc::CalcTeamFightPower($zoneid, $d_uid, $user);
|
|
|
-// if ($fp > 0) {
|
|
|
- if (!in_array($d_uid, $pvp->dailyMatchRecord)) { # 已经匹配过的对手不在出现
|
|
|
- $arr[$d_uid] = $back[$d_uid];
|
|
|
- $pvp->dailyMatchRecord[] = $d_uid;
|
|
|
- }
|
|
|
-// }
|
|
|
+ // 计算 比自己弱的 上线下线
|
|
|
+ $bH = ceil($score * (1 - 0.05)); # 低于当前玩家积分5%
|
|
|
+ $bL = ceil($score * (1 - 0.2)); # 低于当前玩家积分20%
|
|
|
+ $aL = ceil($score * (1 + 0.05)); # 高于当前玩家积分5%
|
|
|
+ $aH = ceil($score * (1 + 0.2)); # 高于当前玩家积分20%
|
|
|
+ $bPlayerUIDs = gMem()->zrevrangebyscore($key, $bH, $bL, true, true, 0, 2); # 取低于玩家积分的uids2个
|
|
|
+ $mPlayerUIDs = gMem()->zrevrangebyscore($key, $aL, $bH, true, true, 0, 2); # 取玩家相当的uid2个(以防包含玩家自己)
|
|
|
+ $aPlayerUIDs = gMem()->zrevrangebyscore($key, $aH, $aL, true, true, 0, 2); # 取高于玩家的uids2个
|
|
|
+ if (array_key_exists($uid, $mPlayerUIDs)) { # 如果积分相近的那一组包含自己
|
|
|
+ unset($mPlayerUIDs[$uid]); # 剔除掉
|
|
|
+ } else { # 或者不包含自己
|
|
|
+ array_pop($mPlayerUIDs); # 那多一个人,踢掉一个
|
|
|
}
|
|
|
+ $uidWithScore = array_merge($bPlayerUIDs, $mPlayerUIDs, $aPlayerUIDs); # 合并为玩家列表
|
|
|
+ return $uidWithScore; # 返回uid集合
|
|
|
+ }
|
|
|
+
|
|
|
+ /**
|
|
|
+ * 获取榜单玩家
|
|
|
+ * @param Credisutil $mem
|
|
|
+ * @param int $zoneid
|
|
|
+ * @param int $start
|
|
|
+ * @param int $stop
|
|
|
+ * @return type
|
|
|
+ */
|
|
|
+ private static function getRankPlayers($mem, $zoneid, $start, $stop) {
|
|
|
+ $key = MemKey_GameRun::Game_PVPScoreByZoneSeason_zset($zoneid, self::GetCurSeasonID());
|
|
|
+ $retUidsWithScore = $mem->zrevrange($key, $start, $stop, true);
|
|
|
+ return self::GetPlayerInfosForPVP($mem, $zoneid, $retUidsWithScore);
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
@@ -812,7 +695,7 @@ class PVPProc {
|
|
|
$heros->$n_hid = $userGameInfo->game->heros->collectHeros->$hid;
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
+ $fpower = HeroProc::CalcUserFightPower($zoneid, $uid, $userGameInfo); # 计算总战力
|
|
|
$adversary = array(# # 拼装玩家信息
|
|
|
'uid' => $uid,
|
|
|
'name' => my_null_default($userGameInfo->game->name, ""),
|
|
|
@@ -823,6 +706,7 @@ class PVPProc {
|
|
|
'yanling' => array("items" => my_null_default($userGameInfo->game->store->yanling, new \stdClass())), # 言灵
|
|
|
'heros' => my_null_default($heros, new \stdClass()), # # 英雄集合
|
|
|
'score' => $retUidsWithScore[$uid], # # 积分
|
|
|
+ 'fpower' => $fpower, # # 总战力
|
|
|
);
|
|
|
$arr[$uid] = $adversary;
|
|
|
}
|
|
|
@@ -832,67 +716,6 @@ class PVPProc {
|
|
|
return $arr;
|
|
|
}
|
|
|
|
|
|
- /**
|
|
|
- * 获取榜单玩家
|
|
|
- * @deprecated since version 2020.5.8
|
|
|
- * @param Credisutil $mem
|
|
|
- * @param int $zoneid
|
|
|
- * @param int $start
|
|
|
- * @param int $stop
|
|
|
- * @return type
|
|
|
- */
|
|
|
- private static function getRankPlayers($mem, $zoneid, $start, $stop) {
|
|
|
- $key = MemKey_GameRun::Game_PVPScoreByZone_zset($zoneid);
|
|
|
- $retUidsWithScore = $mem->zrevrange($key, $start, $stop, true);
|
|
|
- return self::GetPlayerInfosForPVP($mem, $zoneid, $retUidsWithScore);
|
|
|
- }
|
|
|
-
|
|
|
- /**
|
|
|
- * 提取英雄信息以供其他人使用
|
|
|
- * @deprecated since version 2020.5.8
|
|
|
- * @param type $userInfo
|
|
|
- * @param type $heroId
|
|
|
- * @return UserHeroModel
|
|
|
- */
|
|
|
- public static function getHeroInfoForShare($userInfo, $heroId) {
|
|
|
- if ($heroId) {
|
|
|
- $heroInfo = $userInfo->heros->collectHeros->$heroId;
|
|
|
- } else { // todo: 暂定如果没有设置共享英雄,默认取集合中第一个英雄, 征询策划是否修订规则
|
|
|
- $coll = $userInfo->heros->collectHeros;
|
|
|
- $keys = array_keys((array) $coll);
|
|
|
- if (count($keys) <= 0) {
|
|
|
- return null; // 暴力跳过, 防止出现更大的错误
|
|
|
- }
|
|
|
- $heroId = $keys[0];
|
|
|
- $heroInfo = $userInfo->heros->collectHeros->$heroId;
|
|
|
- }
|
|
|
-// 额外将英雄的装备数据替换为实例数据
|
|
|
- self::getArmor($userInfo, $heroInfo, 'weapon');
|
|
|
- self::getArmor($userInfo, $heroInfo, 'armor');
|
|
|
- self::getArmor($userInfo, $heroInfo, 'ring');
|
|
|
- return $heroInfo;
|
|
|
- }
|
|
|
-
|
|
|
- /**
|
|
|
- * @deprecated since version 2020.5.8
|
|
|
- * @param type $userInfo
|
|
|
- * @param type $hero
|
|
|
- * @param type $armor
|
|
|
- * @return type
|
|
|
- */
|
|
|
- private static function getArmor($userInfo, $hero, $armor) {
|
|
|
- if (isset($hero->equip->$armor)) {
|
|
|
- if (property_exists($hero->equip->$armor, 'itemuid')) {
|
|
|
- $armorid = $hero->equip->$armor->itemuid;
|
|
|
- if ($armorid > 0 && isset($userInfo->store->equipment->$armorid)) {
|
|
|
- $hero->equip->$armor = $userInfo->store->equipment->$armorid;
|
|
|
- return; # 找到后直接跳出
|
|
|
- }
|
|
|
- }
|
|
|
- }
|
|
|
- $hero->equip->$armor = null;
|
|
|
- }
|
|
|
-
|
|
|
// </editor-fold>
|
|
|
//
|
|
|
// </editor-fold>
|
gwang