diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/Expedition/HeroNodeRequestHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/Expedition/HeroNodeRequestHandler.java index b8571cae9..01e185a19 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/Expedition/HeroNodeRequestHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/Expedition/HeroNodeRequestHandler.java @@ -122,7 +122,7 @@ public class HeroNodeRequestHandler extends BaseHandler rewardIds = new ArrayList<>(itemlistList.size()); List rewardNums = new ArrayList<>(itemlistList.size()); itemlistList.forEach(item->{rewardIds.add(item.getItemId());rewardIds.add(item.getItemNum());}); - ReportUtil.onReportEvent(user,ReportEventEnum.START_TIANGONG.getType(),nodeInfo.getType(),rewardIds,rewardNums); + ReportUtil.onReportEvent(user,ReportEventEnum.START_TIANGONG.getType(),expeditionManager.getLay(),nodeInfo.getType(),rewardIds,rewardNums); return Expedition.HeroNodeResponse.newBuilder().setDrop(drop).build(); } } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/Expedition/StartExpeditionBattleRequest.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/Expedition/StartExpeditionBattleRequest.java index 1ad32f8be..e620b479e 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/Expedition/StartExpeditionBattleRequest.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/Expedition/StartExpeditionBattleRequest.java @@ -126,7 +126,7 @@ public class StartExpeditionBattleRequest extends BaseHandler> idsByPeriods = worldBossTreasureStaticConfig.getIdsByPeriods(); WorldTreasureReward worldTreasureReward = user.getExpeditionManager().getWorldTreasureReward(); int round = worldTreasureReward.getRound(); - int changeState = getChangeState(user, round); + int changeState = getChangeState(user); List drops = new ArrayList<>(); if(id!=-1){ SWorldBossTreasureConfig sWorldBossTreasureConfig = worldBossTreasureStaticConfig.getsWorldBossTreasureConfigByIdMap().get(id); @@ -83,18 +83,19 @@ public class TakeTreasureRewardHandler extends BaseHandler1?trialInfo.getFloor()-7:1); + trialInfo.setFloor(trialInfo.getHighestTower()-7>1?trialInfo.getHighestTower()-7:1); trialInfo.setKillCount(0); trialInfo.setBombUseTimes(0); trialInfo.setTowerReceivedReward(new HashSet<>()); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/FourtyTwoBehavior.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/FourtyTwoBehavior.java index 1ce528118..df794da86 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/FourtyTwoBehavior.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/FourtyTwoBehavior.java @@ -57,7 +57,7 @@ public class FourtyTwoBehavior extends BaseBehavior { trialInfo.setHighestTower(floor); AbstractRank towerRank = RankContext.getRankEnum(RankEnum.TOWER_RANK.getType()); if(towerRank.getScore(floor,(int)(time/1000))>towerRank.getScoreById(user.getId(),"")){ - towerRank.addRank(user.getId(),"", floor,(int)(time/1000)); + towerRank.addRank(user.getId(),"", floor); } } ReportUtil.onReportEvent(user, ReportEventEnum.COMPLETE_PANOPTIC_MIRROR.getType(),trialInfo.getFloor()); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/ktbeans/ReportEventEnum.java b/serverlogic/src/main/java/com/ljsd/jieling/ktbeans/ReportEventEnum.java index c4904881a..73dbf118a 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/ktbeans/ReportEventEnum.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/ktbeans/ReportEventEnum.java @@ -39,7 +39,7 @@ public enum ReportEventEnum { JOIN_GUILD(25,"join_guild", new CommonEventHandler(),new String[]{"guild_id","guild_name","guild_level","guild_people_num","guild_fighting_capacity","guild_create_time"}), QUIT_GUILD(26,"quit_guild", new CommonEventHandler(),new String[]{"guild_id","guild_name","guild_level","guild_people_num","guild_fighting_capacity","guild_create_time"}), CREATE_ORDER(27,"create_order", new CommonEventHandler(),new String[]{"order_id","order_money_amount","Bundle_id","entrance","item_id","item_name","goods_id","item_list"}), - ORDER_COMPLETE(28,"order_complete", new ChargeAmountEventHandler(),new String[]{"order_id","order_money_amount","Bundle_id","channel_id","server_id","goods_id","goods_name","item_id","item_num","charge_time"}), + ORDER_COMPLETE(28,"order_complete", new ChargeAmountEventHandler(),new String[]{"order_id","order_money_amount","Bundle_id","channel_id","server_id","goods_id","goods_name","rewards_id_list","rewards_num_list","charge_time"}), CHECK_RANKING(29,"check_ranking", new CommonEventHandler(),new String[]{"ranking_type"}), ASK_FOR_BEING_FRIENDS(30,"ask_for_being_friends", new CommonEventHandler(),new String[]{"target_id","target_name","target_level","entrance"}), ALLOW_FRIENDS_ASK(31,"allow_friends_ask", new CommonEventHandler(),new String[]{"target_id","target_name","target_level","entrance"}), @@ -73,7 +73,7 @@ public enum ReportEventEnum { HERO_COMPOSITION(50,"hero_composition", new CommonEventHandler(),new String[]{"hero_id","hero_level","hero_quality","reward_list","reward_nums_list"}), - SEND_HERO(51,"send_hero", new CommonEventHandler(),new String[]{"hero_id","hero_level","hero_quality","reward_list","reward_nums_list"}), + SEND_HERO(51,"send_hero", new CommonEventHandler(),new String[]{"hero_id","hero_level_list","hero_quality_list","reward_list","reward_nums_list"}), TREASURE_DECOMPOSITION(52,"treasure_decomposition", new CommonEventHandler(),new String[]{"item_id","item_level","item_quality","reward_list","reward_nums_list"}), START_TIANGONG(53,"start_tiangong",new CommonEventHandler(),new String[]{"stage_id","stage_type","rewards_id_list","rewards_num_list"}), diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/TowerRank.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/TowerRank.java index fcfc72fed..81d6ebab2 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/TowerRank.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/TowerRank.java @@ -20,18 +20,25 @@ public class TowerRank extends AbstractRank { return super.getRank(uid,rkey,1, rankEndLine); } +// @Override +// public long[] getDataByScore(Double score) { +// long[] array = new long [2]; +// int scoreInt = score.intValue(); +// array[0] = scoreInt/3601; +// array[1] =3600-scoreInt%3601; +// return array; +// } + + @Override public long[] getDataByScore(Double score) { - long[] array = new long [2]; - int scoreInt = score.intValue(); - array[0] = scoreInt/3601; - array[1] =3600-scoreInt%3601; - return array; + return new long[]{score.longValue()}; } @Override public double getScore(double... data) { - double doubleTime = TimeUtils.getDoubleTime(); - return data[1]>3600?data[0]*3601+doubleTime:data[0]*3601+3600-data[1]+doubleTime; +// double doubleTime = TimeUtils.getDoubleTime(); +// return data[1]>3600?data[0]*3601+doubleTime:data[0]*3601+3600-data[1]+doubleTime; + return data[0]+TimeUtils.getDoubleTime(); } } diff --git a/tablemanager/src/main/java/config/SGlobalActivity.java b/tablemanager/src/main/java/config/SGlobalActivity.java index 0ded8ec7f..358299d76 100644 --- a/tablemanager/src/main/java/config/SGlobalActivity.java +++ b/tablemanager/src/main/java/config/SGlobalActivity.java @@ -50,6 +50,8 @@ public class SGlobalActivity implements BaseConfig { private int canBuyRechargeId; + private int isOpen; + public static Map> sGlobalActivityMapByType; public static Map> sGlobalActivityMapByOpenRules; @@ -181,4 +183,8 @@ public class SGlobalActivity implements BaseConfig { public int getCanBuyRechargeId() { return canBuyRechargeId; } + + public int getIsOpen() { + return isOpen; + } } \ No newline at end of file