Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn

back_recharge
mengchengzhen 2021-05-29 16:16:30 +08:00
commit 4292f3cca2
6 changed files with 53 additions and 13 deletions

View File

@ -18,17 +18,22 @@ public class MongoRechargeConverter implements Converter<BasicDBObject, Abstract
SRechargeCommodityNewConfig config = STableManager.getConfig(SRechargeCommodityNewConfig.class).get(source.getInt("modId"));
Class<? extends AbstractWelfareBag> 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;

View File

@ -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";

View File

@ -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<ActivityProto.Tasuilingxia
user.getPlayerInfoManager().updateVipPrivilage(newHeroConfig.getDailyNumber(),1);
}
Poster.getPoster().dispatchEvent(new TaSuiLingXiaoEvent(uid,(int)lessBlood,goal));
AbstractRank rank= RankContext.getRankEnum(RankEnum.TA_SUI_LING_XIAO_RANK.getType());
double score = rank.getScoreById(uid, String.valueOf(proto.getActivityId()));
if(score==-1||score<lessBlood){
rank.addRank(uid,String.valueOf(proto.getActivityId()),lessBlood);
}
ItemUtil.drop(user,dropList.stream().mapToInt(Integer::intValue).toArray(),drop,1,0, BIReason.TA_SUI_LING_XIAO);
return ActivityProto.TasuilingxiaoResponse.newBuilder().setFightData(fightData).setDrop(drop).setDamageVal((int)lessBlood).build();
}

View File

@ -298,6 +298,9 @@ public class EndlessMap extends AbstractMap{
// user.getTeamPosManager().updateTeamPosByTeamId(GlobalsDef.ENDLESS_TEAM, updateTeam);
user.getUserMissionManager().onGameEvent(user,GameEvent.ENDLESS_KILL_MONTER);
mapManager.removeEndlessOneMonsterHp(mapManager.getTriggerXY());
SMonsterGroup sMonsterGroup = SMonsterGroup.getsMonsterGroupMap().get(groupId);
CommonProto.Drop.Builder drop = ItemUtil.drop(user, sMonsterGroup.getRewardgroup(), 1, 0, BIReason.MAP_FAST_FIGHT_REWARD);
fastFightResponseBuilder.setEnventDrop(drop.build());
}
@ -307,15 +310,12 @@ public class EndlessMap extends AbstractMap{
mapManager.setLastFightResult(resultCode);
SMonsterGroup sMonsterGroup = SMonsterGroup.getsMonsterGroupMap().get(groupId);
CommonProto.Drop.Builder drop = ItemUtil.drop(user, sMonsterGroup.getRewardgroup(), 1, 0, BIReason.MAP_FAST_FIGHT_REWARD);
checkMoraleLevel(user);
// if (mapManager.getMonsterId() > 0) {
// BaseBehavior baseBehavior = baseBehaviorMap.get(1);
// baseBehavior.process(user, groupId, fastFightResponseBuilder);
// }
fastFightResponseBuilder.setEnventDrop(drop.build());
fastFightResponseBuilder.setResult(resultCode);
fastFightResponseBuilder.setFightData(fightResult.getFightData());

View File

@ -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;

View File

@ -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();
}
}