diff --git a/conf/server/RewardGroup.txt b/conf/server/RewardGroup.txt index 9a90df9ba..66cdb99a6 100644 --- a/conf/server/RewardGroup.txt +++ b/conf/server/RewardGroup.txt @@ -1,3 +1,3 @@ -RewardGroupID Info IsUpset RewardItem RewardMaxNum Loop -int string int mut,int#int,1 int int -1 钻石招募卡池1 2 1#2#3#4#5#6#7#8#9#10#11#12#13#14#15#16#17#18#19#20#21#22#23#24#25#26#27#28#29#30#31#32#33#34#35#36#37#38#39#40#41#42#43#44#45#46#47#48#49#50#51#52#53#54#55#56 1 0 +Id IsUpset RewardItem RewardMaxNum Loop +int int mut,int#int,1 int int +1 2 1#2#3#4#5#6#7#8#9#10#11#12#13#14#15#16#17#18#19#20#21#22#23#24#25#26#27#28#29#30#31#32#33#34#35#36#37#38#39#40#41#42#43#44#45#46#47#48#49#50#51#52#53#54#55#56 1 0 diff --git a/conf/server/RewardItemConfig.txt b/conf/server/RewardItemConfig.txt index d44de6dc4..ae0aa1b37 100644 --- a/conf/server/RewardItemConfig.txt +++ b/conf/server/RewardItemConfig.txt @@ -1,4 +1,4 @@ -Id ItemId Chance GrowChance RandomMin RandomMax +id itemId Chance GrowChance RandomMin RandomMax int int int int int int 1 10001 100 0 1 1 2 10002 100 0 1 1 diff --git a/serverlogic/src/main/java/com/ljsd/jieling/config/SCHeroRankUpConfig.java b/serverlogic/src/main/java/com/ljsd/jieling/config/SCHeroRankUpConfig.java index 579a0e938..365a43d0f 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/config/SCHeroRankUpConfig.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/config/SCHeroRankUpConfig.java @@ -29,7 +29,7 @@ public class SCHeroRankUpConfig implements BaseConfig{ @Override public void init() throws Exception { - scHeroRankUpConfigMap = STableManager.getConfig(SCHeroRankUpConfig.class); +// scHeroRankUpConfigMap = STableManager.getConfig(SCHeroRankUpConfig.class); } public static Map getScHeroRankUpConfigMap() { diff --git a/serverlogic/src/main/java/com/ljsd/jieling/config/SRewardGroup.java b/serverlogic/src/main/java/com/ljsd/jieling/config/SRewardGroup.java index 636d7a0e2..de037bc0a 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/config/SRewardGroup.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/config/SRewardGroup.java @@ -16,7 +16,7 @@ public class SRewardGroup implements BaseConfig { * 3按照组内道具概率,依次抽取 */ private int isUpset; // 掉落type - private int[] rewardGroupID; + private int[] rewardItem; private int rewardMaxNum; // 道具数 /** * 如果抽取规则选3 ,则需要设置循环轮数 @@ -41,8 +41,8 @@ public class SRewardGroup implements BaseConfig { return isUpset; } - public int[] getRewardGroupID() { - return rewardGroupID; + public int[] getRewardItem() { + return rewardItem; } public int getRewardMaxNum() { diff --git a/serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java b/serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java index 2de29b2fe..bf983833a 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java @@ -34,7 +34,7 @@ public class ItemUtil { } private static void selectDrop(SRewardGroup sRewardGroup,Map itemMap, Map cardMap) { - int[] rewardItem = sRewardGroup.getRewardGroupID(); + int[] rewardItem = sRewardGroup.getRewardItem(); StringBuilder rewardStr = new StringBuilder(); StringBuilder weight = new StringBuilder(); for (int dropId :rewardItem){ diff --git a/serverlogic/src/main/resources/application.properties b/serverlogic/src/main/resources/application.properties index 6dfd8afd2..0289e1dda 100644 --- a/serverlogic/src/main/resources/application.properties +++ b/serverlogic/src/main/resources/application.properties @@ -1,5 +1,5 @@ #server info -server.id = 10180 +server.id = 10212 server.openTime = 20190101000101 server.num = 1 @@ -30,7 +30,7 @@ spring.redis.expireTime = -1 #spring.data.mongodb.uri = mongodb://mongouser:ysj#2017#ljsd@111.231.54.96:27017/ysj_wx_1 #spring.data.mongodb2.uri = mongodb://mongouser:ysj#2017#ljsd@111.231.54.96:27017/develop_ysj_wx_1 #mongodb2 develop -spring.data.mongodb.uri = mongodb://60.1.1.14:27017/jieling_msy +spring.data.mongodb.uri = mongodb://60.1.1.14:27017/jieling_10212 mongodb.options.maxWaitTime = 120000 mongodb.options.connectTimeout = 1000 mongodb.options.socketTimeout = 0