set open server time & fix random reward
parent
3e338096d5
commit
f24b6f3ccb
|
@ -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");
|
||||
|
|
|
@ -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);
|
||||
|
|
Loading…
Reference in New Issue