四灵试炼,代码合并
parent
6e601e035a
commit
5e561f5fcd
|
|
@ -104,6 +104,11 @@ public interface GlobalsDef {
|
|||
int VIP_UNLOCK_PRIVILEGE = 3;
|
||||
int RECHARGE_UNLOCK_PRIVILEGE = 4;
|
||||
|
||||
// 四灵试炼
|
||||
int FOURCHALLENGE_PEOPLE_TEAM = 1701;
|
||||
int FOURCHALLENGE_BUDDHA_TEAM = 1702;
|
||||
int FOURCHALLENGE_MONSTER_TEAM = 1703;
|
||||
int FOURCHALLENGE_MORALITY_TEAM = 1704;
|
||||
|
||||
//特殊商店id
|
||||
int DAILY_GOODS_FAST_ID = 1004;//每日礼包一键购买的礼包ID
|
||||
|
|
|
|||
|
|
@ -1239,8 +1239,9 @@ public class RedisUtil {
|
|||
for (int i = 0; i < MAX_TRY_TIMES; i++) {
|
||||
try {
|
||||
String valueStr = (String) redisTemplate.opsForHash().get(rkey, mapKey);
|
||||
if (valueStr != null)
|
||||
if (valueStr != null) {
|
||||
return gson.fromJson(valueStr, clazz);
|
||||
}
|
||||
} catch (Exception e) {
|
||||
TimeUtils.sleep(FAILED_SLEEP);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -210,7 +210,7 @@ public class FourChallengeLogic {
|
|||
// 战斗逻辑
|
||||
PVEFightEvent pveFightEvent = new PVEFightEvent(user.getId(), teamId, 20, "", GameFightType.FourChallenge, sCampTowerConfig.getMonster(), 3);
|
||||
FightResult fightResult = FightDispatcher.dispatcher(pveFightEvent);
|
||||
int[] checkResult = fightResult.getCheckResult();
|
||||
long[] checkResult = fightResult.getCheckResult();
|
||||
response.setFightData(fightResult.getFightData());
|
||||
|
||||
AbstractRank rank = RankContext.getRankEnum(RankEnum.FOUR_CHALLENGE_TIER_RANK.getType());
|
||||
|
|
|
|||
|
|
@ -84,11 +84,7 @@ public class Jewel extends PropertyItem implements Cloneable {
|
|||
@Override
|
||||
public Jewel clone() {
|
||||
Jewel jewel = null;
|
||||
try {
|
||||
jewel = (Jewel) super.clone();
|
||||
} catch (CloneNotSupportedException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
jewel = (Jewel) super.clone();
|
||||
return jewel;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -181,12 +181,10 @@ public class CrossDeathPathLogic {
|
|||
|
||||
Map<Object, Object> hmget = RedisUtil.getInstence().hmget(RedisKey.DEATH_PATH_EVERY_OVER_HASH);
|
||||
if (hmget == null || hmget.size() < 1) {
|
||||
Cursor<String> cursor = RedisUtil.getInstence().scan("DEATH_PATH*"+groupId+":*", -1);
|
||||
while (cursor.hasNext()) {
|
||||
//找到一次就添加一次
|
||||
String next = cursor.next();
|
||||
LOGGER.info("=================删除跨服十绝阵排行:{}", next);
|
||||
RedisUtil.getInstence().del(next);
|
||||
Set<String> dimKey = RedisUtil.getInstence().getDimKey("DEATH_PATH*" + groupId + ":*", -1);
|
||||
for (String key : dimKey) {
|
||||
RedisUtil.getInstence().del(key);
|
||||
LOGGER.info("=================删除跨服十绝阵排行:{}", key);
|
||||
}
|
||||
}
|
||||
return hashMap;
|
||||
|
|
|
|||
|
|
@ -2298,10 +2298,6 @@ public class HeroLogic{
|
|||
//装备总战力评分
|
||||
int equipForce=0;
|
||||
Iterator<Map.Entry<Integer, Integer>> iterator = hero.getEquipByHongmengPositionMap(user.getHeroManager()).entrySet().iterator();
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
|
||||
>>>>>>> master_test_hw_four_challenge
|
||||
// 套装list初始化
|
||||
ArrayList<SEquipConfig> suiteNumList = new ArrayList<>();
|
||||
while (iterator.hasNext()){
|
||||
|
|
|
|||
Loading…
Reference in New Issue