diff --git a/conf/server/ActivityGroups.txt b/conf/server/ActivityGroups.txt index 4c44b82..8bdff00 100644 --- a/conf/server/ActivityGroups.txt +++ b/conf/server/ActivityGroups.txt @@ -202,5 +202,6 @@ + diff --git a/conf/server/ArtResourcesConfig.txt b/conf/server/ArtResourcesConfig.txt index 9f58e84..15b23c0 100644 --- a/conf/server/ArtResourcesConfig.txt +++ b/conf/server/ArtResourcesConfig.txt @@ -2919,3 +2919,4 @@ int 41190 41191 41192 +41193 diff --git a/conf/server/Language.txt b/conf/server/Language.txt index 12abec5..31474b3 100644 --- a/conf/server/Language.txt +++ b/conf/server/Language.txt @@ -18738,7 +18738,7 @@ int string string string string string string 34010404 终身礼包 51010501 超级卖场 1013000 神龙币 -1013001 可以购买除超级卖场以外所有礼包 +1013001 神龙币可以在购物中抵扣同样等值的现金使用,神龙币不可与货币共同使用 1013002 是否消耗%s神龙币完成支付\n(当前拥有%s神龙币) 1013003 神龙币支付 1013004 直接支付 diff --git a/conf/server/RechargeCommodityConfig.txt b/conf/server/RechargeCommodityConfig.txt index 2377c4c..1adb3b1 100644 --- a/conf/server/RechargeCommodityConfig.txt +++ b/conf/server/RechargeCommodityConfig.txt @@ -1,5 +1,5 @@ Id RechargeId Name Type ShowType Price FirstMultiple OtherBuy BaseReward RewardShow ContiueDays PlayerLevel ExtraReward OpenPrivilege Limit LimitShow FirstInvest IsDiscount DiscountType Order AccumulativeRecharge Time StartTime Endtime DailyUpdate PassiveSkill RechargeId2 RechargeId3 Otype IsMail Mail OnSaleRule PriceWeight SystemMessageShow ItemPrice VipExp IsDevalue PriceDevalue CashPointPay MutualGroup IsExtraItem RelateRechargeID -int string string int int int mut,int#int,2 mut,int#int,2 mut,int#int,2 mut,int#int,2 int mut,int#int,2 mut,int#int,3 mut,int#int,1 int int int int mut,int#int,1 int int int string string int mut,int#int,1 string string int int mut,int#int,1 string mut,int#int,1 int mut,int#int,1 int int mut,int#int,2 int int int mut,int#int,1 +int string string int int int mut,int#int,2 mut,int#int,1 mut,int#int,2 mut,int#int,2 int mut,int#int,2 mut,int#int,3 mut,int#int,1 int int int int mut,int#int,1 int int int string string int mut,int#int,1 string string int int mut,int#int,1 string mut,int#int,1 int mut,int#int,1 int int mut,int#int,2 int int int mut,int#int,1 33 34010001 5 12 128 null 116#128 16#1888|20#1|87#18|61#1 16#1888|20#1|87#18|61#1 0 null null 1006 1 1 1 4 null 0 1 3 0 431999 0 null 2 0 null 1#999#999|4#0#0 null 0 920000#1280 1280 0 null 0 0 0 null 34 34010001 5 13 6 null 116#6 16#18|87#1|61#1 16#18|87#1|61#1 0 null null 1006 1 1 1 1 null 0 1 3 0 431999 1 null 2 0 null 1#999#999|4#0#0 null 0 920000#60 60 0 null 0 0 0 null 35 34010001 5 13 6 null 116#6 16#88|87#2|61#1 16#88|87#2|61#1 0 null null 1006 1 1 1 1 null 0 1 3 0 431999 1 null 2 0 null 1#999#999|4#0#0 null 0 920000#60 60 0 null 0 0 0 null @@ -681,8 +681,33 @@ int string string int int int mut,int#int,2 mut,int#int,2 mut,int#int,2 mut,int# 2071 34010395 5 987 6 null 116#50 16#60|19#5|60#12|14#50000 16#60|19#5|60#12|14#50000 0 null null 1006 1 0 1 0 null 0 1 3 0 0 0 null 1 0 10020710#10020711 3#207 null 0 920000#60 60 0 null 0 0 0 null 2072 34010396 5 987 18 null 116#100 16#120|19#10|61#1|14#100000 16#120|19#10|61#1|14#100000 0 null null 1006 1 0 1 0 null 0 1 3 0 0 0 null 1 0 10020720#10020721 3#207 null 0 920000#180 180 0 null 0 0 0 null 2073 34010397 5 987 30 null 116#250 16#300|19#30|60415#1|14#200000 16#300|19#30|60415#1|14#200000 0 null null 1006 1 0 1 0 null 0 1 3 0 0 0 null 1 0 10020730#10020731 3#207 null 0 920000#300 300 0 null 0 0 0 null -540001 34010400 5 54 6 null 116#500 16#60 16#60 0 null null 1006 1 0 1 0 null 0 1 3 0 0 0 null 1 0 null 1#1#999 null 0 null 60 0 null 0 0 0 null -550001 34010401 5 55 6 null 116#50 16#60 16#60 0 null null 1006 1 0 1 0 null 0 1 3 0 0 0 null 1 0 null 1#1#999 null 0 null 60 0 null 0 0 0 null -560001 34010402 5 56 6 null 116#100 16#60 16#60 0 null null 1006 1 0 1 0 null 0 1 3 0 0 0 null 1 0 null 1#1#999 null 0 null 60 0 null 0 0 0 null -570001 34010403 5 57 6 null 116#250 16#60 16#60 0 null null 1006 1 0 1 0 null 0 1 3 0 0 0 null 1 0 null 1#1#999 null 0 null 60 0 null 0 0 0 null -580001 34010404 5 58 6 null 116#500 16#60 16#60 0 null null 1006 1 0 1 0 null 0 1 3 0 0 0 null 1 0 null 1#1#999 null 0 null 60 0 null 0 0 0 null +540001 34010400 5 54 30 null 116#30 16#300|116#15|4#50 16#300|116#15|4#50 0 null null 1006 1 0 1 0 null 0 1 3 0 0 0 null 1 0 null 1#1#999 null 0 null 300 0 null 0 0 0 null +540002 34010400 5 54 68 null 116#68 16#680|116#34|91#5 16#680|116#34|91#5 0 null null 1006 1 0 1 0 null 0 1 3 0 0 0 null 1 0 null 1#1#999 null 0 null 680 0 null 0 0 0 null +540003 34010400 5 54 98 null 116#98 16#980|116#49|60431#1|6000110#1000 16#980|116#49|60431#1|6000110#1000 0 null null 1006 1 0 1 0 null 0 1 3 0 0 0 null 1 0 null 1#1#999 null 0 null 980 0 null 0 0 0 null +540004 34010400 5 54 128 null 116#128 16#1280|116#64|19#10|6000110#1500 16#1280|116#64|19#10|6000110#1500 0 null null 1006 1 0 1 0 null 0 1 3 0 0 0 null 1 0 null 1#1#999 null 0 null 1280 0 null 0 0 0 null +540005 34010400 5 54 328 null 116#328 16#3280|116#164|17011#300|17009#1000 16#3280|116#164|17011#300|17009#1000 0 null null 1006 1 0 1 0 null 0 1 3 0 0 0 null 1 0 null 1#1#999 null 0 null 3280 0 null 0 0 0 null +540006 34010400 5 54 648 null 116#648 16#6480|116#324|81113#5|60431#2|19#10 16#6480|116#324|81113#5|60431#2|19#10 0 null null 1006 1 0 1 0 null 0 1 3 0 0 0 null 1 0 null 1#1#999 null 0 null 6480 0 null 0 0 0 null +550001 34010401 5 55 30 null 116#30 16#300|116#15|19#5 16#300|116#15|19#5 0 null null 1006 1 0 1 0 null 0 1 3 0 0 0 null 1 0 null 1#1#999 null 0 null 300 0 null 0 0 0 null +550002 34010401 5 55 68 null 116#68 16#680|116#34|87#10 16#680|116#34|87#10 0 null null 1006 1 0 1 0 null 0 1 3 0 0 0 null 1 0 null 1#1#999 null 0 null 680 0 null 0 0 0 null +550003 34010401 5 55 98 null 116#98 16#980|116#49|19#5|6000110#1000 16#980|116#49|19#5|6000110#1000 0 null null 1006 1 0 1 0 null 0 1 3 0 0 0 null 1 0 null 1#1#999 null 0 null 980 0 null 0 0 0 null +550004 34010401 5 55 128 null 116#128 16#1280|116#64|60431#1|6000110#1000 16#1280|116#64|60431#1|6000110#1000 0 null null 1006 1 0 1 0 null 0 1 3 0 0 0 null 1 0 null 1#1#999 null 0 null 1280 0 null 0 0 0 null +550005 34010401 5 55 328 null 116#328 16#3280|116#164|10424#15|10425#600 16#3280|116#164|10424#15|10425#600 0 null null 1006 1 0 1 0 null 0 1 3 0 0 0 null 1 0 null 1#1#999 null 0 null 3280 0 null 0 0 0 null +550006 34010401 5 55 648 null 116#648 16#6480|116#324|60459#1|20#10|19#10 16#6480|116#324|60459#1|20#10|19#10 0 null null 1006 1 0 1 0 null 0 1 3 0 0 0 null 1 0 null 1#1#999 null 0 null 6480 0 null 0 0 0 null +560001 34010402 5 56 30 null 116#30 16#300|116#15|19#5 16#300|116#15|19#5 0 null null 1006 1 0 1 0 null 0 1 3 0 0 0 null 1 0 null 1#1#999 null 0 null 300 0 null 0 0 0 null +560002 34010402 5 56 68 null 116#68 16#680|116#34|87#10 16#680|116#34|87#10 0 null null 1006 1 0 1 0 null 0 1 3 0 0 0 null 1 0 null 1#1#999 null 0 null 680 0 null 0 0 0 null +560003 34010402 5 56 98 null 116#98 16#980|116#49|87#15|60431#1 16#980|116#49|87#15|60431#1 0 null null 1006 1 0 1 0 null 0 1 3 0 0 0 null 1 0 null 1#1#999 null 0 null 980 0 null 0 0 0 null +560004 34010402 5 56 128 null 116#128 16#1280|116#64|14#10000000 16#1280|116#64|14#10000000 0 null null 1006 1 0 1 0 null 0 1 3 0 0 0 null 1 0 null 1#1#999 null 0 null 1280 0 null 0 0 0 null +560005 34010402 5 56 328 null 116#328 16#3280|116#164|6000110#15000 16#3280|116#164|6000110#15000 0 null null 1006 1 0 1 0 null 0 1 3 0 0 0 null 1 0 null 1#1#999 null 0 null 3280 0 null 0 0 0 null +560006 34010402 5 56 648 null 116#648 16#6480|116#324|20#7|19#40|6000110#2000 16#6480|116#324|20#7|19#40|6000110#2000 0 null null 1006 1 0 1 0 null 0 1 3 0 0 0 null 1 0 null 1#1#999 null 0 null 6480 0 null 0 0 0 null +570001 34010403 5 57 30 null 116#30 16#300|116#15|19#5|14#1000000 16#300|116#15|19#5|14#1000000 0 null null 1006 1 0 1 0 null 0 1 3 0 0 0 null 1 0 null 1#1#999 null 0 null 300 0 null 0 0 0 null +570002 34010403 5 57 68 null 116#68 16#680|116#34|50005#4|60431#1 16#680|116#34|50005#4|60431#1 0 null null 1006 1 0 1 0 null 0 1 3 0 0 0 null 1 0 null 1#1#999 null 0 null 680 0 null 0 0 0 null +570003 34010403 5 57 98 null 116#98 16#980|116#49|6000115#300|19#15 16#980|116#49|6000115#300|19#15 0 null null 1006 1 0 1 0 null 0 1 3 0 0 0 null 1 0 null 1#1#999 null 0 null 980 0 null 0 0 0 null +570004 34010403 5 57 128 null 116#128 16#1280|116#64|72001#150|61#1|60#12|14#5000000|3#5000000 16#1280|116#64|72001#150|61#1|60#12|14#5000000|3#5000000 0 null null 1006 1 0 1 0 null 0 1 3 0 0 0 null 1 0 null 1#1#999 null 0 null 1280 0 null 0 0 0 null +570005 34010403 5 57 328 null 116#328 16#3280|116#164|6000085#20|20#5|19#20 16#3280|116#164|6000085#20|20#5|19#20 0 null null 1006 1 0 1 0 null 0 1 3 0 0 0 null 1 0 null 1#1#999 null 0 null 3280 0 null 0 0 0 null +570006 34010403 5 57 648 null 116#648 16#6480|116#324|50005#20|60431#6|6000110#3000 16#6480|116#324|50005#20|60431#6|6000110#3000 0 null null 1006 1 0 1 0 null 0 1 3 0 0 0 null 1 0 null 1#1#999 null 0 null 6480 0 null 0 0 0 null +580001 34010404 5 58 30 null 116#30 16#300|116#15|50002#10|14#1000000 16#300|116#15|50002#10|14#1000000 0 null null 1006 1 0 1 0 null 0 1 3 0 0 0 null 1 0 null 1#1#999 null 0 null 300 0 null 0 0 0 null +580002 34010404 5 58 68 null 116#68 16#680|116#34|19#15|4#1000|6000110#1000 16#680|116#34|19#15|4#1000|6000110#1000 0 null null 1006 1 0 1 0 null 0 1 3 0 0 0 null 1 0 null 1#1#999 null 0 null 680 0 null 0 0 0 null +580003 34010404 5 58 98 null 116#98 16#980|116#49|6000088#2|6000110#5000 16#980|116#49|6000088#2|6000110#5000 0 null null 1006 1 0 1 0 null 0 1 3 0 0 0 null 1 0 null 1#1#999 null 0 null 980 0 null 0 0 0 null +580004 34010404 5 58 128 null 116#128 16#1280|116#64|6000097#15|6000098#60|6000092#120|61#2|60#12|14#5000000|3#2000000 16#1280|116#64|6000097#15|6000098#60|6000092#120|61#2|60#12|14#5000000|3#2000000 0 null null 1006 1 0 1 0 null 0 1 3 0 0 0 null 1 0 null 1#1#999 null 0 null 1280 0 null 0 0 0 null +580005 34010404 5 58 328 null 116#328 16#3280|116#164|60432#1|19#50|6000088#1 16#3280|116#164|60432#1|19#50|6000088#1 0 null null 1006 1 0 1 0 null 0 1 3 0 0 0 null 1 0 null 1#1#999 null 0 null 3280 0 null 0 0 0 null +580006 34010404 5 58 648 null 116#648 16#6480|116#324|6000097#100|6000098#200|6000095#130 16#6480|116#324|6000097#100|6000098#200|6000095#130 0 null null 1006 1 0 1 0 null 0 1 3 0 0 0 null 1 0 null 1#1#999 null 0 null 6480 0 null 0 0 0 null diff --git a/serverlogic/src/main/java/com/ljsd/Test.java b/serverlogic/src/main/java/com/ljsd/Test.java index 81aeeb0..4e4bd6e 100644 --- a/serverlogic/src/main/java/com/ljsd/Test.java +++ b/serverlogic/src/main/java/com/ljsd/Test.java @@ -4,6 +4,7 @@ import com.google.common.collect.Sets; import config.SBaseLevelConfig; import manager.STableManager; +import java.util.Arrays; import java.util.List; import java.util.Set; @@ -13,9 +14,5 @@ public class Test { public static void main(String[] args) throws Exception { - - STableManager.initialize("config"); - List resourceIds = SBaseLevelConfig.randBaseResourceByLevel(1); - System.out.println(resourceIds.size()); } } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/db/redis/RedisUtil.java b/serverlogic/src/main/java/com/ljsd/jieling/db/redis/RedisUtil.java index 25954b0..3caeaa3 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/db/redis/RedisUtil.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/db/redis/RedisUtil.java @@ -885,8 +885,7 @@ public class RedisUtil { public void zsetRemoveOne(String key, String... value) { for (int i = 0; i < MAX_TRY_TIMES; i++) { try { - redisTemplate.opsForZSet().remove(key, - value); + redisTemplate.opsForZSet().remove(key, value); return; } catch (Exception e) { LOGGER.error("redis err {}", e.getMessage()); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/globals/BIReason.java b/serverlogic/src/main/java/com/ljsd/jieling/globals/BIReason.java index 3a280da..068128d 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/globals/BIReason.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/globals/BIReason.java @@ -320,6 +320,7 @@ public interface BIReason { int CURRENCY_BUY_GOODS_CONSUME = 2191;//货币购买商品消耗 + int VOUCHER_BUY_GOODS_CONSUME = 2192;//货币购买商品消耗 int INVESTIGATE_LEVEL_UP_COST = 220; //启明星消耗 int CARD_COUNT_EXTEND = 221; //扩充卡库 diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/rankingReward/RankingRewardLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/rankingReward/RankingRewardLogic.java index 02a6bf5..0e0e1bc 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/rankingReward/RankingRewardLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/rankingReward/RankingRewardLogic.java @@ -231,7 +231,7 @@ public class RankingRewardLogic { }catch (Exception ee) { LOGGER.error("load user failed {}", _uid, e); } - + if(user == null) continue; PlayerManager playerManager = user.getPlayerInfoManager(); CommonProto.RankingInfo info = CommonProto.RankingInfo.newBuilder() .setId(_id) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsLogic.java index ee0f3e3..92a654f 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsLogic.java @@ -174,8 +174,10 @@ public class BuyGoodsLogic { } } - int[][] otherBuy = sRechargeCommodityConfig.getOtherBuy(); - if (!ItemUtil.itemCost(user, otherBuy, BIReason.CURRENCY_BUY_GOODS_CONSUME, 1)){ + Map cost = new HashMap<>(); + int[] otherBuy = sRechargeCommodityConfig.getOtherBuy(); + cost.put(otherBuy[0], otherBuy[1]); + if (!ItemUtil.itemCost(user, cost, BIReason.VOUCHER_BUY_GOODS_CONSUME, 1)){ throw new ErrorCodeException(ErrorCode.ITEM_NOT_ENOUGH); } diff --git a/tablemanager/src/main/java/config/SRechargeCommodityConfig.java b/tablemanager/src/main/java/config/SRechargeCommodityConfig.java index 9260200..69ccdbc 100644 --- a/tablemanager/src/main/java/config/SRechargeCommodityConfig.java +++ b/tablemanager/src/main/java/config/SRechargeCommodityConfig.java @@ -91,7 +91,7 @@ public class SRechargeCommodityConfig implements BaseConfig { private int mutualGroup; private int[] itemPrice; - private int[][] otherBuy; + private int[] otherBuy; private int isExtraItem; @@ -457,7 +457,11 @@ public class SRechargeCommodityConfig implements BaseConfig { return itemPrice; } - public int[][] getOtherBuy() { + public void setOtherBuy(int[] otherBuy) { + this.otherBuy = otherBuy; + } + + public int[] getOtherBuy() { return otherBuy; }