diff --git a/serverlogic/src/main/java/com/ljsd/jieling/db/mongo/MongoRechargeConverter.java b/serverlogic/src/main/java/com/ljsd/jieling/db/mongo/MongoRechargeConverter.java index 1278b9170..0594d7331 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/db/mongo/MongoRechargeConverter.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/db/mongo/MongoRechargeConverter.java @@ -18,17 +18,22 @@ public class MongoRechargeConverter implements Converter target =null; + if(config==null){ + target=PerpetualWelfareBag.class; + }else{ - if(config.getOtype() == RechargeType.timeLimit.getType()){ - target = TimeLimitWelfareBag.class; - }else if(config.getOtype() ==RechargeType.perpetual.getType()){ - target = PerpetualWelfareBag.class; + if(config.getOtype() == RechargeType.timeLimit.getType()){ + target = TimeLimitWelfareBag.class; + }else if(config.getOtype() ==RechargeType.perpetual.getType()){ + target = PerpetualWelfareBag.class; - }else if(config.getOtype()==RechargeType.receive.getType()){ - target = ReceiveWelfareBag.class; - }else if(config.getOtype()==RechargeType.push.getType()){ - target = PushWelfareBag.class; + }else if(config.getOtype()==RechargeType.receive.getType()){ + target = ReceiveWelfareBag.class; + }else if(config.getOtype()==RechargeType.push.getType()){ + target = PushWelfareBag.class; + } } + String s = gson.toJson(source); AbstractWelfareBag abstractWelfareBag = JSON.parseObject(s, target); return abstractWelfareBag; diff --git a/serverlogic/src/main/java/com/ljsd/jieling/db/redis/RedisKey.java b/serverlogic/src/main/java/com/ljsd/jieling/db/redis/RedisKey.java index 3ea90c06c..93043e4e1 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/db/redis/RedisKey.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/db/redis/RedisKey.java @@ -250,7 +250,7 @@ public class RedisKey { public static final String SHAN_HE_SHE_JI_STAR_RANK = "SHAN_HE_SHE_JI_STAR_RANK"; public static final String HARD_STAGE_FIST_PASS = "HARD_STAGE_FIST_PASS"; public static final String HARD_STAGE_PASS_MIN_FORCE = "HARD_STAGE_PASS_MIN_FORCE"; - + public static final String TA_SUI_LING_XIAO_RANK = "TA_SUI_LING_XIAO_RANK"; public static final String DEATH_PATH_TOTAL_CHALLENGE_COUNT = "DEATH_PATH_TOTAL_CHALLENGE_COUNT"; diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/activity/TasuilingxiaoHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/activity/TasuilingxiaoHandler.java index f2413ddee..101a546db 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/activity/TasuilingxiaoHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/activity/TasuilingxiaoHandler.java @@ -18,6 +18,10 @@ import com.ljsd.jieling.logic.dao.root.User; import com.ljsd.jieling.logic.fight.*; import com.ljsd.jieling.logic.fight.result.FightResult; import com.ljsd.jieling.logic.player.PlayerLogic; +import com.ljsd.jieling.logic.rank.RankContext; +import com.ljsd.jieling.logic.rank.RankEnum; +import com.ljsd.jieling.logic.rank.RankLogic; +import com.ljsd.jieling.logic.rank.rankImpl.AbstractRank; import com.ljsd.jieling.util.ItemUtil; import config.SMonsterConfig; import config.SMonsterGroup; @@ -128,6 +132,12 @@ public class TasuilingxiaoHandler extends BaseHandler 0) { // BaseBehavior baseBehavior = baseBehaviorMap.get(1); // baseBehavior.process(user, groupId, fastFightResponseBuilder); // } - fastFightResponseBuilder.setEnventDrop(drop.build()); fastFightResponseBuilder.setResult(resultCode); fastFightResponseBuilder.setFightData(fightResult.getFightData()); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/RankEnum.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/RankEnum.java index 074540ad4..7560d203f 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/RankEnum.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/RankEnum.java @@ -43,7 +43,7 @@ public enum RankEnum { WARLD_DIS_ARENA_RANK(28,RedisKey.WARLD_DIS_ARENA_RANK,ArenaRank::new,true),//世界服排行 SHAN_HE_SHE_JI_CHAPTER_RANK(29,RedisKey.SHAN_HE_SHE_JI_CHAPTER_RANK,ShanHeSheJiTuChapterRank::new,false),//山河社稷章节排行榜 SHAN_HE_SHE_JI_STAR_RANK(30,RedisKey.SHAN_HE_SHE_JI_STAR_RANK,ShanHeSheJiTuStarRank::new,false),//山河社稷星星排行榜 - + TA_SUI_LING_XIAO_RANK(31,RedisKey.TA_SUI_LING_XIAO_RANK,TaSuiLingXiaoRank::new,false) ; private int type; diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/TaSuiLingXiaoRank.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/TaSuiLingXiaoRank.java new file mode 100644 index 000000000..d6d1cf400 --- /dev/null +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/TaSuiLingXiaoRank.java @@ -0,0 +1,25 @@ +package com.ljsd.jieling.logic.rank.rankImpl; + +import util.TimeUtils; + +/** + * @author lvxinran + * @date 2021/6/5 + * @discribe + */ +public class TaSuiLingXiaoRank extends AbstractRank { + + public TaSuiLingXiaoRank(int type, String redisKey) { + super(type, redisKey); + } + + @Override + public long[] getDataByScore(Double score) { + return new long[]{score.longValue()}; + } + + @Override + public double getScore(double... data) { + return data[0]+ TimeUtils.getDoubleTime(); + } +}