From 3328d48b41e370b53c30e0445d280988fea0b788 Mon Sep 17 00:00:00 2001 From: lvxinran Date: Tue, 15 Sep 2020 11:02:02 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E9=87=8D=E7=BD=AE=E6=9C=80=E9=AB=98?= =?UTF-8?q?=E5=B1=82=E5=87=8F1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/ljsd/jieling/handler/map/MapLogic.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java index 8665d24c4..84df882ca 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java @@ -2850,7 +2850,7 @@ public class MapLogic { initBuff.add(STrialSetting.sTrialSetting.getBaseBuff()); } trialInfo.setBuffIds(initBuff); - trialInfo.setFloor(trialInfo.getFloor()-7>1?trialInfo.getFloor()-7:1); + trialInfo.setFloor(trialInfo.getHighestTower()-7>1?trialInfo.getHighestTower()-7:1); trialInfo.setKillCount(0); trialInfo.setBombUseTimes(0); trialInfo.setTowerReceivedReward(new HashSet<>()); From d0aebf10f3f8cb2edbdd3780e61878d1809b122a Mon Sep 17 00:00:00 2001 From: lvxinran Date: Tue, 15 Sep 2020 13:47:04 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E4=B8=8A=E6=8A=A5?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E4=BF=AE=E6=94=B9=EF=BC=8C=E6=A3=AE=E7=BD=97?= =?UTF-8?q?=E7=8E=AF=E5=A2=83=E5=B1=82=E6=95=B0=E6=8E=92=E8=A1=8C=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Expedition/HeroNodeRequestHandler.java | 2 +- .../StartExpeditionBattleRequest.java | 2 +- .../Expedition/StoreNodeRequestHandler.java | 2 +- .../ljsd/jieling/handler/map/MapLogic.java | 3 ++- .../map/behavior/FourtyTwoBehavior.java | 2 +- .../ljsd/jieling/ktbeans/ReportEventEnum.java | 4 ++-- .../logic/rank/rankImpl/TowerRank.java | 21 ++++++++++++------- 7 files changed, 22 insertions(+), 14 deletions(-) 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 BaseHandlertowerRank.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(); } } From bb6a149f89b41a820c24038ecc0f2731f6a0df22 Mon Sep 17 00:00:00 2001 From: lvxinran Date: Tue, 15 Sep 2020 14:43:13 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=A4=A9=E5=AE=AB=E7=A7=98=E5=AE=9D?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Expedition/TakeTreasureRewardHandler.java | 25 ++++++++++--------- .../src/main/java/config/SGlobalActivity.java | 6 +++++ 2 files changed, 19 insertions(+), 12 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/Expedition/TakeTreasureRewardHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/Expedition/TakeTreasureRewardHandler.java index 2ae6cc03a..cc60295e5 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/Expedition/TakeTreasureRewardHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/Expedition/TakeTreasureRewardHandler.java @@ -39,7 +39,7 @@ public class TakeTreasureRewardHandler 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 BaseHandler> sGlobalActivityMapByType; public static Map> sGlobalActivityMapByOpenRules; @@ -172,4 +174,8 @@ public class SGlobalActivity implements BaseConfig { public int getCanBuyRechargeId() { return canBuyRechargeId; } + + public int getIsOpen() { + return isOpen; + } } \ No newline at end of file