助战英雄战力
parent
ebff88ed90
commit
3592547ada
|
@ -1553,7 +1553,7 @@ public class TimeUtils {
|
|||
* @return
|
||||
*/
|
||||
public static double getDoubleTime(){
|
||||
return (Integer.MAX_VALUE-now()/1000)/Math.pow(10,9);
|
||||
return (Integer.MAX_VALUE-nowInt())/Math.pow(10,9);
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -261,19 +261,19 @@ public class FourChallengeLogic {
|
|||
String miniSubKey = MINI + campId;
|
||||
|
||||
// 首次通关记录
|
||||
Map<String, ArenaRecord> first = RedisUtil.getInstence().getMapValues(RedisKey.FOUR_CHALLENGE, firstSubKey, String.class, ArenaRecord.class);
|
||||
if (first.get(floorIds) == null){
|
||||
ArenaRecord first = RedisUtil.getInstence().getMapValue(RedisKey.FOUR_CHALLENGE, firstSubKey, floorIds, ArenaRecord.class);
|
||||
if (first == null){
|
||||
// 记录redis
|
||||
RedisUtil.getInstence().putMapEntry(RedisKey.FOUR_CHALLENGE, firstSubKey, floorIds, arenaRecord);
|
||||
}
|
||||
|
||||
// 最低战力记录
|
||||
Map<String, ArenaRecord> force = RedisUtil.getInstence().getMapValues(RedisKey.FOUR_CHALLENGE, miniSubKey, String.class, ArenaRecord.class);
|
||||
if (force.get(floorIds) == null){
|
||||
ArenaRecord force = RedisUtil.getInstence().getMapValue(RedisKey.FOUR_CHALLENGE, miniSubKey, floorIds, ArenaRecord.class);
|
||||
if (force == null){
|
||||
// 记录redis
|
||||
RedisUtil.getInstence().putMapEntry(RedisKey.FOUR_CHALLENGE, miniSubKey, floorIds, arenaRecord);
|
||||
}else {
|
||||
int attackForce = force.get(floorIds).getAttackForce();
|
||||
int attackForce = force.getAttackForce();
|
||||
if (myforce < attackForce){
|
||||
// 记录redis
|
||||
RedisUtil.getInstence().putMapEntry(RedisKey.FOUR_CHALLENGE, miniSubKey, floorIds, arenaRecord);
|
||||
|
@ -427,12 +427,7 @@ public class FourChallengeLogic {
|
|||
*/
|
||||
private void getFightRecord2(int tier,int function, String subKey, List<CommonProto.UserRank> lists) throws Exception {
|
||||
// 根据子key获取对应的回放信息
|
||||
Map<String, ArenaRecord> mapValues = RedisUtil.getInstence().getMapValues(RedisKey.FOUR_CHALLENGE, subKey, String.class, ArenaRecord.class);
|
||||
if (mapValues == null || mapValues.isEmpty()){
|
||||
return;
|
||||
}
|
||||
// 获取对应层数的战斗记录
|
||||
ArenaRecord arenaRecord = mapValues.get(String.valueOf(tier));
|
||||
ArenaRecord arenaRecord = RedisUtil.getInstence().getMapValue(RedisKey.FOUR_CHALLENGE, subKey, String.valueOf(tier), ArenaRecord.class);
|
||||
if (arenaRecord == null){
|
||||
return;
|
||||
}
|
||||
|
|
|
@ -3043,7 +3043,7 @@ public class HeroLogic{
|
|||
*
|
||||
* // TODO isMyself ???
|
||||
*/
|
||||
public int calTeamTotalForce(User targetUser,int teamId,boolean isMyself){
|
||||
public int calTeamTotalForce(User targetUser,int teamId,boolean isMyself){
|
||||
int totalForce =0;
|
||||
targetUser.getTeamPosManager().setCurTeamPosId(teamId);
|
||||
Map<Integer, List<TeamPosHeroInfo>> teamPosForHero = targetUser.getTeamPosManager().getTeamPosForHero();
|
||||
|
@ -3060,7 +3060,11 @@ public class HeroLogic{
|
|||
for (TeamPosHeroInfo teamPosHeroInfo : teamPosHeroInfoList) {
|
||||
Hero hero = targetUser.getHeroManager().getHero(teamPosHeroInfo.getHeroId());
|
||||
if (hero == null) {
|
||||
continue;
|
||||
// 助战获取,随后最好加上编队验证
|
||||
hero = HelpHeroLogic.getHelpHero(targetUser.getId(),teamPosHeroInfo.getHeroId()).getHero();
|
||||
if (hero == null){
|
||||
continue;
|
||||
}
|
||||
}
|
||||
long force = calHeoForce(targetUser, hero, teamId);
|
||||
if(maxForceHero<force){
|
||||
|
|
Loading…
Reference in New Issue