From f24b6f3ccb42ceb0b93421ef483c1f780d9ed68a Mon Sep 17 00:00:00 2001 From: wangyuan Date: Wed, 6 Nov 2019 16:21:40 +0800 Subject: [PATCH] set open server time & fix random reward --- serverlogic/src/main/java/com/ljsd/GameApplication.java | 5 +++-- .../main/java/com/ljsd/jieling/logic/fight/CombatLogic.java | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/GameApplication.java b/serverlogic/src/main/java/com/ljsd/GameApplication.java index d0237958c..c823012d1 100644 --- a/serverlogic/src/main/java/com/ljsd/GameApplication.java +++ b/serverlogic/src/main/java/com/ljsd/GameApplication.java @@ -67,6 +67,7 @@ public class GameApplication { app.setWebEnvironment(false); configurableApplicationContext = app.run(args); + ServerConfiguration serverConfiguration = configurableApplicationContext.getBean(ServerConfiguration.class); serverProperties = serverConfiguration.getServerProperties(); serverId = serverProperties.getId(); @@ -75,6 +76,8 @@ public class GameApplication { LOGGER.info("ServerProperties ->{},coreIp=>{}", serverProperties.toString()); RedisUtil.getInstence().init(configurableApplicationContext); MongoUtil.getInstence().init(configurableApplicationContext); + //todo 设置开服时间 + setRegisterTime();// might loop //注册消息处理方法 register(configurableApplicationContext); ProtocolsManager protocolsManager = ProtocolsManager.getInstance(); @@ -85,8 +88,6 @@ public class GameApplication { //http线程池初始化 // HttpPool.init(); - //todo 设置开服时间 - setRegisterTime();// might loop GuilidManager.init(); STableManager.initialize("config"); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/fight/CombatLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/fight/CombatLogic.java index 5ddfac4e5..c1c0428f8 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/fight/CombatLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/fight/CombatLogic.java @@ -903,7 +903,7 @@ public class CombatLogic { ItemUtil.combineReward(user,true,randomRewardMin, times,baseItemMap,baseCardMap,baseEquipMap,baseRandomMap,BIReason.ADVENTURE_BASE_REWARD); int timesTemp =times; while (!viewBaseReward&×Temp-->0){ - ItemUtil.combineReward(user,false,sMainLevelConfig.getRandomReward(), 1f,randomItemMap,randomCardMap,randomEquipMap,randomRandomMap,BIReason.ADVENTURE_RANDOM_REWARDD); + ItemUtil.combineReward(user,true,sMainLevelConfig.getRandomReward(), 1f,randomItemMap,randomCardMap,randomEquipMap,randomRandomMap,BIReason.ADVENTURE_RANDOM_REWARDD); } takeTimes+=times; } @@ -926,6 +926,7 @@ public class CombatLogic { lastTimeTakes=times; } ItemUtil.extraAddItem(user,baseItemMap); + ItemUtil.extraAddItem(user,randomItemMap); if(viewBaseReward){ myResult = true; rewardStr = ItemUtil.getReward(baseItemMap, baseCardMap, baseEquipMap, baseRandomMap);