From 53aa7109e4233897d385a1e450736538371000d3 Mon Sep 17 00:00:00 2001 From: wangyuan Date: Fri, 31 May 2019 12:30:07 +0800 Subject: [PATCH] cost --- conf/server/AccomplishmentConfig.txt | 4 +- conf/server/AudioConfig.txt | 117 ++++++++++++ conf/server/ChallengeMapConfig.txt | 2 +- conf/server/GameSetting.txt | 6 +- conf/server/MapPointConfig.txt | 2 +- conf/server/OptionConfig.txt | 58 +++--- conf/server/RewardItemConfig.txt | 4 +- conf/server/SkillConfig.txt | 10 + conf/server/SkillLogicConfig.txt | 30 ++- conf/server/StoreConfig.txt | 171 ++++++++++++++---- conf/server/StoreTypeConfig.txt | 2 +- conf/server/VipLevelConfig.txt | 32 ++-- .../ljsd/jieling/logic/fight/CombatLogic.java | 8 +- .../ljsd/jieling/logic/store/StoreLogic.java | 71 +++++--- 14 files changed, 386 insertions(+), 131 deletions(-) create mode 100644 conf/server/AudioConfig.txt diff --git a/conf/server/AccomplishmentConfig.txt b/conf/server/AccomplishmentConfig.txt index 537c1d9d3..e1f27fdf9 100644 --- a/conf/server/AccomplishmentConfig.txt +++ b/conf/server/AccomplishmentConfig.txt @@ -10,9 +10,9 @@ int int int mut,int#int,2 int 8 101 7 0|3 10 9 101 7 0|5 20 10 102 2 10204#10205|1 30 -11 102 1 102022#102024#102026#102028#102029#102030|1 15 +11 102 1 102024#102026#102028#102029#102030#102160#102162|1 15 12 102 1 102090#102092#102094#102096#102098#102100#102102#102104#102105#102106#102142#102144#102146#102148#102150#102151#102152|1 20 -13 102 1 102108#102110#102112#102114#102116#102118#102119#102120|1 15 +13 102 1 102108#102110#102112#102114#102116#102118#102119#102120#102168|1 15 14 102 2 10206|5 20 15 103 2 10304|1 20 16 103 1 103014#103016#103018#103020#103022#103024#103026#103028#103029#103030|1 15 diff --git a/conf/server/AudioConfig.txt b/conf/server/AudioConfig.txt new file mode 100644 index 000000000..937bc2348 --- /dev/null +++ b/conf/server/AudioConfig.txt @@ -0,0 +1,117 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/conf/server/ChallengeMapConfig.txt b/conf/server/ChallengeMapConfig.txt index 80ae2e673..2d1a42107 100644 --- a/conf/server/ChallengeMapConfig.txt +++ b/conf/server/ChallengeMapConfig.txt @@ -2,7 +2,7 @@ MapId MissionId Size Refresh IfRank SweepingAward Position int int mut,int#int,1 int int mut,int#int,1 mut,int#int,1 100 1 15#20 0 0 2000 8#17 101 2 15#20 0 0 2001 13#11 -102 3 15#20 0 0 2002 13#7 +102 3 21#26 0 0 2002 18#8 103 4 15#15 0 0 2003 13#7 104 5 15#20 0 0 2004 3#8 105 6 20#30 0 0 2005 4#27 diff --git a/conf/server/GameSetting.txt b/conf/server/GameSetting.txt index cd9748971..2bf6a7307 100644 --- a/conf/server/GameSetting.txt +++ b/conf/server/GameSetting.txt @@ -1,3 +1,3 @@ -Id BornItem SpeedFormula InitialEnergy EnergyRecoverSpeed ActionPowerRormula Speed HeroNumlimit EquipNumlimit WorldTalking BornPosition AdventureRefresh InvasionBossPrivilege InvasionBossTimesAdd AdventureOffline AdventureFastBattle AdventureFastBattlePrivilege AdventureBaseRewardPrivilege AdventureMineralPrivilege AdventureRunePrivilege NatureName ItemCompoundLimit HeroCompoundLimit EquipCompoundLimit HeroLocation -int mut,int#int,2 mut,float#float,1 int mut,int#int,1 mut,int#int,1 mut,int#int,1 int int int mut,int#int,1 int int int int int int int int int string int int int mut,int#int,2 -1 10046#1|2#80 0#0#0.3164#0 80 1#6 0#0#1#0 70#100 999 999 1 08#19 60 9 1800 10 28800 4 1 2 3 99 20 20 2#1|2#1|1#1031|1#3031|1#5031 +Id BornItem SpeedFormula InitialEnergy EnergyRecoverSpeed ActionPowerRormula Speed HeroNumlimit EquipNumlimit WorldTalking BornPosition AdventureRefresh InvasionBossPrivilege InvasionBossTimesAdd AdventureOffline AdventureFastBattle AdventureFastBattlePrivilege AdventureBaseRewardPrivilege AdventureMineralPrivilege AdventureRunePrivilege NatureName ItemCompoundLimit HeroCompoundLimit EquipCompoundLimit +int mut,int#int,2 mut,float#float,1 int mut,int#int,1 mut,int#int,1 mut,int#int,1 int int int mut,int#int,1 int int int int int int int int int string int int int +1 10046#1|2#80 0#0#0.3164#0 80 1#6 0#0#1#0 70#100 999 999 1 08#19 60 9 1800 10 28800 4 1 2 3 99 20 20 diff --git a/conf/server/MapPointConfig.txt b/conf/server/MapPointConfig.txt index b109dafd6..e7dac9c5f 100644 --- a/conf/server/MapPointConfig.txt +++ b/conf/server/MapPointConfig.txt @@ -19,7 +19,7 @@ int int int int int mut,int#int,2 101010 7 2 2 101051 null 101011 7 2 2 101052 null 101012 7 2 2 101053 null -101013 6 2 2 101054 1#100|0#400 +101013 6 2 2 101054 1#900|0#100 0 0 0 0 0 null 102001 5 2 2 102001 null 102002 5 2 2 102016 null diff --git a/conf/server/OptionConfig.txt b/conf/server/OptionConfig.txt index b56263080..19e722106 100644 --- a/conf/server/OptionConfig.txt +++ b/conf/server/OptionConfig.txt @@ -178,13 +178,13 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2 102021 0 0 null null 1 102082 102022 0 0 null null 1 102082 102023 0 0 null null 1 102013 -102024 0 35 102001|102#11#16#102002 null 4 null +102024 0 35 102001|102#14#20#102002 null 4 null 102025 0 0 null null 1 102014 -102026 0 35 102001|102#11#16#102002 null 4 null +102026 0 35 102001|102#14#20#102002 null 4 null 102027 0 0 null null 1 102015 -102028 0 35 102001|102#11#16#102002 null 4 null -102029 0 35 102001|102#11#16#102002 null 4 null -102030 0 35 102001|102#11#16#102002 null 4 null +102028 0 35 102001|102#14#20#102002 null 4 null +102029 0 35 102001|102#14#20#102002 null 4 null +102030 0 35 102001|102#14#20#102002 null 4 null 102031 0 0 null null 1 102017 102032 0 0 null null 1 102018 102033 0 0 null null 1 102018 @@ -244,23 +244,23 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2 102087 0 0 null null 1 102045 102088 0 0 null null 1 102045 102089 0 1 10204 null 1 102046 -102090 0 32 10204#102002|102#3#4#102003 null 4 null +102090 0 32 10204#102002|102#6#9#102003 null 4 null 102091 0 0 null null 1 102047 -102092 0 35 102002|102#3#4#102003 null 4 null +102092 0 35 102002|102#6#9#102003 null 4 null 102093 0 0 null null 1 102048 -102094 0 35 102002|102#3#4#102003 null 4 null +102094 0 35 102002|102#6#9#102003 null 4 null 102095 0 0 null null 1 102049 -102096 0 35 102002|102#3#4#102003 null 4 null +102096 0 35 102002|102#6#9#102003 null 4 null 102097 0 0 null null 1 102050 -102098 0 35 102002|102#3#4#102003 null 4 null +102098 0 35 102002|102#6#9#102003 null 4 null 102099 0 0 null null 1 102051 -102100 0 35 102002|102#3#4#102003 null 4 null +102100 0 35 102002|102#6#9#102003 null 4 null 102101 0 0 null null 1 102052 -102102 0 35 102002|102#3#4#102003 null 4 null +102102 0 35 102002|102#6#9#102003 null 4 null 102103 0 0 null null 1 102053 -102104 0 35 102002|102#3#4#102003 null 4 null -102105 0 35 102002|102#3#4#102003 null 4 null -102106 0 35 102002|102#3#4#102003 null 4 null +102104 0 35 102002|102#6#9#102003 null 4 null +102105 0 35 102002|102#6#9#102003 null 4 null +102106 0 35 102002|102#6#9#102003 null 4 null 102107 0 0 null null 1 102055 102108 0 36 102003|1520#1 null 4 102055 102109 0 2 1520#1 null 1 102087 @@ -276,11 +276,11 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2 102119 0 9 3 null 4 null 102120 0 9 3 null 4 null 102121 0 0 null null 1 102062 -102122 0 30 102#8#18#102005|102#6#10#102006|102#14#15#102007|102#5#5#102008 null 6 102064 +102122 0 30 102#17#14#102005 null 6 102064 102123 0 0 null null 1 102063 -102124 0 30 102#8#18#102005|102#6#10#102006|102#14#15#102007|102#5#5#102008 null 6 102064 -102125 0 30 102#8#18#102005|102#6#10#102006|102#14#15#102007|102#5#5#102008 null 6 102064 -102126 0 30 102#8#18#102005|102#6#10#102006|102#14#15#102007|102#5#5#102008 null 6 102064 +102124 0 30 102#17#14#102005 null 6 102064 +102125 0 30 102#17#14#102005 null 6 102064 +102126 0 30 102#17#14#102005 null 6 102064 102127 0 0 null null 1 102065 102128 0 0 null null 1 102065 102129 10201 2 1521#10|1522#10 null 1 102066 @@ -296,17 +296,17 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2 102139 0 0 null null 1 102071 102140 0 0 null null 1 102071 102141 0 1 10205 null 1 102072 -102142 0 32 10205#102002|102#3#4#102003 null 4 null +102142 0 32 10205#102002|102#6#9#102003 null 4 null 102143 0 0 null null 1 102073 -102144 0 35 102002|102#3#4#102003 null 4 null +102144 0 35 102002|102#6#9#102003 null 4 null 102145 0 0 null null 1 102074 -102146 0 35 102002|102#3#4#102003 null 4 null +102146 0 35 102002|102#6#9#102003 null 4 null 102147 0 0 null null 1 102075 -102148 0 35 102002|102#3#4#102003 null 4 null +102148 0 35 102002|102#6#9#102003 null 4 null 102149 0 0 null null 1 102076 -102150 0 35 102002|102#3#4#102003 null 4 null -102151 0 35 102002|102#3#4#102003 null 4 null -102152 0 35 102002|102#3#4#102003 null 4 null +102150 0 35 102002|102#6#9#102003 null 4 null +102151 0 35 102002|102#6#9#102003 null 4 null +102152 0 35 102002|102#6#9#102003 null 4 null 102153 0 15 102005 55002 4 null 102154 0 15 102006 55002 4 null 102155 0 15 102007 55002 4 null @@ -314,15 +314,15 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2 102157 0 1 10201 null 1 102083 102158 0 0 null null 4 null 102159 0 0 null null 1 102084 -102160 0 35 102001|102#11#16#102002 null 4 null +102160 0 35 102001|102#14#20#102002 null 4 null 102161 0 0 null null 1 102012 -102162 0 35 102001|102#11#16#102002 null 4 null +102162 0 35 102001|102#14#20#102002 null 4 null 102163 0 1 10203 null 1 102026 102164 0 1 10203 null 1 102041 102165 0 0 null null 1 102044 102166 0 0 null null 1 102045 102167 0 0 null null 1 102056 -102168 0 0 null null 4 null +102168 0 9 3 null 4 null 0 0 0 null null 0 null 103001 0 0 null null 1 103002 103002 0 0 null null 1 103006 diff --git a/conf/server/RewardItemConfig.txt b/conf/server/RewardItemConfig.txt index fba009dc8..1f9b2fe3c 100644 --- a/conf/server/RewardItemConfig.txt +++ b/conf/server/RewardItemConfig.txt @@ -1365,8 +1365,8 @@ int int int float int int 50017 3 100 1.0 16 16 50018 3 100 1.0 17 17 50401 1520 100 1.0 1 1 -50402 1521 100 1.0 3 4 -50403 1522 100 1.0 2 3 +50402 1521 100 1.0 10 10 +50403 1522 100 1.0 2 2 50404 11042 100 1.0 3 6 50405 14 100 1.0 100000 100000 50406 14 100 1.0 20000 20000 diff --git a/conf/server/SkillConfig.txt b/conf/server/SkillConfig.txt index 854196ac1..02ea57693 100644 --- a/conf/server/SkillConfig.txt +++ b/conf/server/SkillConfig.txt @@ -620,3 +620,13 @@ int 501008 501009 501010 +501101 +501102 +501103 +501104 +501105 +501106 +501107 +501108 +501109 +501110 diff --git a/conf/server/SkillLogicConfig.txt b/conf/server/SkillLogicConfig.txt index d0b62706d..615f1338a 100644 --- a/conf/server/SkillLogicConfig.txt +++ b/conf/server/SkillLogicConfig.txt @@ -903,16 +903,26 @@ int mut,float#float,2 mut,int#int,2 mut,float#float,2 float 500908 20003#0.7|20003#0.7|20003#0.7 26|3|35 41744|0.5#1#10|1#0.2#10 9.0 500909 20003#0.7|20003#0.7|20003#0.7 26|3|35 52181|0.5#1#10|1#0.2#10 9.0 500910 20003#0.7|20003#0.7|20003#0.7 26|3|35 52181|0.5#1#10|1#0.3#10 9.0 -501001 20004#0.7|10000#0.7|10000#0.7 26|4|4 6400|4#0.3#5#1|6#0.2#5#3 10.0 -501002 20004#0.7|10000#0.7|10000#0.7 26|4|4 6400|4#0.6#5#1|6#0.2#5#3 10.0 -501003 20004#0.7|10000#0.7|10000#0.7 26|4|4 12800|4#0.6#5#1|6#0.2#5#3 10.0 -501004 20004#0.7|10000#0.7|10000#0.7 26|4|4 12800|4#1#5#1|6#0.2#5#3 10.0 -501005 20004#0.7|10000#0.7|10000#0.7 26|4|4 19200|4#1#5#1|6#0.2#5#3 10.0 -501006 20004#0.7|10000#0.7|10000#0.7 26|4|4 19200|4#1#10#1|6#0.2#5#3 10.0 -501007 20004#0.7|10000#0.7|10000#0.7 26|4|4 25600|4#1#10#1|6#0.2#5#3 10.0 -501008 20004#0.7|10000#0.7|10000#0.7 26|4|4 25600|4#1#10#1|6#0.2#10#3 10.0 -501009 20004#0.7|10000#0.7|10000#0.7 26|4|4 32000|4#1#10#1|6#0.2#10#3 10.0 -501010 20004#0.7|10000#0.7|10000#0.7 26|4|4 32000|4#1#10#1|6#0.45#10#3 10.0 +501001 20004#0.7|10000#0.7|10000#0.7 26|4|4 12400|4#0.3#5#1|6#0.2#5#3 10.0 +501002 20004#0.7|10000#0.7|10000#0.7 26|4|4 12400|4#0.6#5#1|6#0.2#5#3 10.0 +501003 20004#0.7|10000#0.7|10000#0.7 26|4|4 24800|4#0.6#5#1|6#0.2#5#3 10.0 +501004 20004#0.7|10000#0.7|10000#0.7 26|4|4 24800|4#1#5#1|6#0.2#5#3 10.0 +501005 20004#0.7|10000#0.7|10000#0.7 26|4|4 37200|4#1#5#1|6#0.2#5#3 10.0 +501006 20004#0.7|10000#0.7|10000#0.7 26|4|4 37200|4#1#10#1|6#0.2#5#3 10.0 +501007 20004#0.7|10000#0.7|10000#0.7 26|4|4 49600|4#1#10#1|6#0.2#5#3 10.0 +501008 20004#0.7|10000#0.7|10000#0.7 26|4|4 49600|4#1#10#1|6#0.2#10#3 10.0 +501009 20004#0.7|10000#0.7|10000#0.7 26|4|4 62000|4#1#10#1|6#0.2#10#3 10.0 +501010 20004#0.7|10000#0.7|10000#0.7 26|4|4 62000|4#1#10#1|6#0.45#10#3 10.0 +501101 20003#0.7|20003#0.7|10004#0.7|10000#0.7 26|27|37|9 4400|400#5|0|6#0.25#5#0 11.0 +501102 20003#0.7|20003#0.7|10004#0.7|10000#0.7 26|27|37|9 4400|600#5|0|6#0.25#5#0 11.0 +501103 20003#0.7|20003#0.7|10004#0.7|10000#0.7 26|27|37|9 8800|600#5|0|6#0.25#5#0 11.0 +501104 20003#0.7|20003#0.7|10004#0.7|10000#0.7 26|27|37|9 8800|800#5|0|6#0.25#5#0 11.0 +501105 20003#0.7|20003#0.7|10004#0.7|10000#0.7 26|27|37|9 13200|800#5|0|6#0.25#5#0 11.0 +501106 20003#0.7|20003#0.7|10004#0.7|10000#0.7 26|27|37|9 13200|800#10|0|6#0.25#5#0 11.0 +501107 20003#0.7|20003#0.7|10004#0.7|10000#0.7 26|27|37|9 17600|800#10|0|6#0.25#5#0 11.0 +501108 20003#0.7|20003#0.7|10004#0.7|10000#0.7 26|27|37|9 17600|800#10|0|6#0.25#10#0 11.0 +501109 20003#0.7|20003#0.7|10004#0.7|10000#0.7 26|27|37|9 22000|800#10|0|6#0.25#10#0 11.0 +501110 20003#0.7|20003#0.7|10004#0.7|10000#0.7 26|27|37|9 22000|800#10|0|6#0.45#10#0 11.0 1101511 40001#0.7 1 1.25#1 0.0 1101521 20000#0.7 2 0.45#2 0.0 1101522 30001#0.7 5 1#0.2#7 0.0 diff --git a/conf/server/StoreConfig.txt b/conf/server/StoreConfig.txt index 27a753853..1c6a7673e 100644 --- a/conf/server/StoreConfig.txt +++ b/conf/server/StoreConfig.txt @@ -35,41 +35,142 @@ int string int int int mut,int#int,1 mut,int#int,1 int mut,int#int,2 int int int 33 颜无诡碎片 1 9 100 1#100 11022#50 1 26|0#0#0#4000 0 1 0 0 34 楚恒碎片 1 9 100 1#100 11002#50 1 26|0#0#0#4000 0 1 0 0 35 夏侯鸿天碎片 1 9 100 1#100 11003#50 1 26|0#0#0#4000 0 1 0 0 -51 伏冥碎片 3 6 100 1#100 11034#40 1 26|0#0#0#400 0 1 0 0 -52 司空染碎片 3 6 100 1#100 11035#40 1 26|0#0#0#400 0 1 0 0 -53 姜燧碎片 3 6 100 1#100 11044#40 1 26|0#0#0#400 0 1 0 0 -54 孙晴碎片 3 5 100 1#100 11026#40 1 26|0#0#0#400 0 1 0 0 -55 宁月碎片 3 5 100 1#100 11027#40 1 26|0#0#0#400 0 1 0 0 -56 紫川碎片 3 5 100 1#100 11028#40 1 26|0#0#0#400 0 1 0 0 -57 林越碎片 3 5 100 1#100 11046#40 1 26|0#0#0#400 0 1 0 0 -58 晏息碎片 3 4 100 1#100 11029#40 1 26|0#0#0#400 0 1 0 0 -59 贾裴武碎片 3 4 100 1#100 11031#40 1 26|0#0#0#400 0 1 0 0 -60 雷燕碎片 3 4 100 1#100 11032#40 1 26|0#0#0#400 0 1 0 0 -61 辛夷碎片 3 4 100 1#100 11033#40 1 26|0#0#0#400 0 1 0 0 -62 解幽碎片 3 3 100 1#100 11036#40 1 26|0#0#0#400 0 1 0 0 -63 薛苓碎片 3 3 100 1#100 11037#40 1 26|0#0#0#400 0 1 0 0 -64 呼延腾碎片 3 3 100 1#100 11039#40 1 26|0#0#0#400 0 1 0 0 -65 乌廉碎片 3 3 100 1#100 11043#40 1 26|0#0#0#400 0 1 0 0 -66 许槿然碎片 3 2 100 1#100 11024#40 1 26|0#0#0#400 0 1 0 0 -67 瑶瑶碎片 3 2 100 1#100 11030#40 1 26|0#0#0#400 0 1 0 0 -68 叶辽碎片 3 2 100 1#100 11042#40 1 26|0#0#0#400 0 1 0 0 -69 苏可碎片 3 2 100 1#100 11045#40 1 26|0#0#0#400 0 1 0 0 -70 唐萱碎片 3 1 100 1#100 11025#40 1 26|0#0#0#400 0 1 0 0 -71 常申碎片 3 1 100 1#100 11038#40 1 26|0#0#0#400 0 1 0 0 -72 冉宜碎片 3 1 100 1#100 11040#40 1 26|0#0#0#400 0 1 0 0 -73 孟灿碎片 3 1 100 1#100 11041#40 1 26|0#0#0#400 0 1 0 0 -74 端木葵碎片 3 7 100 1#100 11005#50 1 26|0#0#0#4000 0 1 0 0 -75 兰卿碎片 3 7 100 1#100 11006#50 1 26|0#0#0#4000 0 1 0 0 -76 靖之碎片 3 7 100 1#100 11007#50 1 26|0#0#0#4000 0 1 0 0 -77 颜祈佳碎片 3 7 100 1#100 11010#50 1 26|0#0#0#4000 0 1 0 0 -78 岳寅碎片 3 8 100 1#100 11011#50 1 26|0#0#0#4000 0 1 0 0 -79 云灵碎片 3 8 100 1#100 11013#50 1 26|0#0#0#4000 0 1 0 0 -80 岑以航碎片 3 8 100 1#100 11016#50 1 26|0#0#0#4000 0 1 0 0 -81 颜无雍碎片 3 8 100 1#100 11020#50 1 26|0#0#0#4000 0 1 0 0 -82 岑以璇碎片 3 9 100 1#100 11021#50 1 26|0#0#0#4000 0 1 0 0 -83 颜无诡碎片 3 9 100 1#100 11022#50 1 26|0#0#0#4000 0 1 0 0 -84 楚恒碎片 3 9 100 1#100 11002#50 1 26|0#0#0#4000 0 1 0 0 -85 夏侯鸿天碎片 3 9 100 1#100 11003#50 1 26|0#0#0#4000 0 1 0 0 +51 刹那神杖 3 1 100 1#100 55010#1 1 25|0#0#0#500 0 1 0 0 +52 一念神杖 3 1 100 1#100 55011#1 1 25|0#0#0#500 0 1 0 0 +53 须臾神杖 3 1 100 1#100 55012#1 1 25|0#0#0#500 0 1 0 0 +54 劫火神杖 3 1 100 1#100 55013#1 1 25|0#0#0#500 0 1 0 0 +55 破锋神杖 3 1 100 1#100 55014#1 1 25|0#0#0#500 0 1 0 0 +56 寂灭神杖 3 1 100 1#100 55015#1 1 25|0#0#0#500 0 1 0 0 +57 太玄神杖 3 1 100 1#100 55016#1 1 25|0#0#0#500 0 1 0 0 +58 刹那神刺 3 1 100 1#100 55030#1 1 25|0#0#0#500 0 1 0 0 +59 一念神刺 3 1 100 1#100 55031#1 1 25|0#0#0#500 0 1 0 0 +60 须臾神刺 3 1 100 1#100 55032#1 1 25|0#0#0#500 0 1 0 0 +61 劫火神刺 3 1 100 1#100 55033#1 1 25|0#0#0#500 0 1 0 0 +62 破锋神刺 3 1 100 1#100 55034#1 1 25|0#0#0#500 0 1 0 0 +63 寂灭神刺 3 1 100 1#100 55035#1 1 25|0#0#0#500 0 1 0 0 +64 太玄神刺 3 1 100 1#100 55036#1 1 25|0#0#0#500 0 1 0 0 +65 刹那神矛 3 1 100 1#100 55050#1 1 25|0#0#0#500 0 1 0 0 +66 一念神矛 3 1 100 1#100 55051#1 1 25|0#0#0#500 0 1 0 0 +67 须臾神矛 3 1 100 1#100 55052#1 1 25|0#0#0#500 0 1 0 0 +68 劫火神戟 3 1 100 1#100 55053#1 1 25|0#0#0#500 0 1 0 0 +69 破锋神戟 3 1 100 1#100 55054#1 1 25|0#0#0#500 0 1 0 0 +70 寂灭神戟 3 2 100 1#100 55055#1 1 25|0#0#0#500 0 1 0 0 +71 太玄神戟 3 2 100 1#100 55056#1 1 25|0#0#0#500 0 1 0 0 +72 刹那古剑 3 2 100 1#100 55070#1 1 25|0#0#0#500 0 1 0 0 +73 一念古剑 3 2 100 1#100 55071#1 1 25|0#0#0#500 0 1 0 0 +74 须臾古剑 3 2 100 1#100 55072#1 1 25|0#0#0#500 0 1 0 0 +75 劫火古剑 3 2 100 1#100 55073#1 1 25|0#0#0#500 0 1 0 0 +76 破锋古剑 3 2 100 1#100 55074#1 1 25|0#0#0#500 0 1 0 0 +77 寂灭古剑 3 2 100 1#100 55075#1 1 25|0#0#0#500 0 1 0 0 +78 太玄古剑 3 2 100 1#100 55076#1 1 25|0#0#0#500 0 1 0 0 +79 刹那宝录 3 2 100 1#100 55090#1 1 25|0#0#0#500 0 1 0 0 +80 一念宝录 3 2 100 1#100 55091#1 1 25|0#0#0#500 0 1 0 0 +81 须臾宝录 3 2 100 1#100 55092#1 1 25|0#0#0#500 0 1 0 0 +82 劫火宝录 3 2 100 1#100 55093#1 1 25|0#0#0#500 0 1 0 0 +83 破锋宝录 3 2 100 1#100 55094#1 1 25|0#0#0#500 0 1 0 0 +84 寂灭宝录 3 2 100 1#100 55095#1 1 25|0#0#0#500 0 1 0 0 +85 太玄宝录 3 2 100 1#100 55096#1 1 25|0#0#0#500 0 1 0 0 +86 朱雀神甲 3 2 100 1#100 55104#1 1 25|0#0#0#500 0 1 0 0 +87 微澜羽衣 3 3 100 1#100 55105#1 1 25|0#0#0#500 0 1 0 0 +88 无垠罩衣 3 3 100 1#100 55106#1 1 25|0#0#0#500 0 1 0 0 +89 玄冥战甲 3 3 100 1#100 55111#1 1 25|0#0#0#500 0 1 0 0 +90 千霄战甲 3 3 100 1#100 55112#1 1 25|0#0#0#500 0 1 0 0 +91 麒麟战甲 3 3 100 1#100 55113#1 1 25|0#0#0#500 0 1 0 0 +92 九霄华裳 3 3 100 1#100 55115#1 1 25|0#0#0#500 0 1 0 0 +93 若水罩帽 3 3 100 1#100 55121#1 1 25|0#0#0#500 0 1 0 0 +94 阎罗冠冕 3 3 100 1#100 55122#1 1 25|0#0#0#500 0 1 0 0 +95 神霄战盔 3 3 100 1#100 55123#1 1 25|0#0#0#500 0 1 0 0 +96 涅槃羽冠 3 3 100 1#100 55124#1 1 25|0#0#0#500 0 1 0 0 +97 盘龙战盔 3 3 100 1#100 55125#1 1 25|0#0#0#500 0 1 0 0 +98 玄冥战盔 3 3 100 1#100 55126#1 1 25|0#0#0#500 0 1 0 0 +99 千霄战盔 3 3 100 1#100 55127#1 1 25|0#0#0#500 0 1 0 0 +100 深渊战靴 3 3 100 1#100 55137#1 1 25|0#0#0#500 0 1 0 0 +101 九幽战靴 3 3 100 1#100 55138#1 1 25|0#0#0#500 0 1 0 0 +102 往生羽鞋 3 3 100 1#100 55139#1 1 25|0#0#0#500 0 1 0 0 +103 盘龙战靴 3 3 100 1#100 55140#1 1 25|0#0#0#500 0 1 0 0 +104 玄冥战靴 3 3 100 1#100 55141#1 1 25|0#0#0#500 0 1 0 0 +105 千霄战靴 3 3 100 1#100 55142#1 1 25|0#0#0#500 0 1 0 0 +106 止玄短杖-蓝图 3 4 100 1#100 3001#1 1 25|0#0#0#500 0 1 0 0 +107 无锋短杖-蓝图 3 4 100 1#100 3002#1 1 25|0#0#0#500 0 1 0 0 +108 千钧短杖-蓝图 3 4 100 1#100 3003#1 1 25|0#0#0#500 0 1 0 0 +109 撼岳短杖-蓝图 3 4 100 1#100 3004#1 1 25|0#0#0#500 0 1 0 0 +110 止玄之刺-蓝图 3 4 100 1#100 3005#1 1 25|0#0#0#500 0 1 0 0 +111 无锋之刺-蓝图 3 4 100 1#100 3006#1 1 25|0#0#0#500 0 1 0 0 +112 千钧之刺-蓝图 3 4 100 1#100 3007#1 1 25|0#0#0#500 0 1 0 0 +113 撼岳之刺-蓝图 3 4 100 1#100 3008#1 1 25|0#0#0#500 0 1 0 0 +114 止玄战矛-蓝图 3 4 100 1#100 3009#1 1 25|0#0#0#500 0 1 0 0 +115 无锋战矛-蓝图 3 4 100 1#100 3010#1 1 25|0#0#0#500 0 1 0 0 +116 千钧战矛-蓝图 3 4 100 1#100 3011#1 1 25|0#0#0#500 0 1 0 0 +117 撼岳战矛-蓝图 3 4 100 1#100 3012#1 1 25|0#0#0#500 0 1 0 0 +118 止玄之刃-蓝图 3 4 100 1#100 3013#1 1 25|0#0#0#500 0 1 0 0 +119 无锋之刃-蓝图 3 4 100 1#100 3014#1 1 25|0#0#0#500 0 1 0 0 +120 千钧之刃-蓝图 3 4 100 1#100 3015#1 1 25|0#0#0#500 0 1 0 0 +121 撼岳之刃-蓝图 3 4 100 1#100 3016#1 1 25|0#0#0#500 0 1 0 0 +122 止玄秘录-蓝图 3 4 100 1#100 3017#1 1 25|0#0#0#500 0 1 0 0 +123 无锋秘录-蓝图 3 4 100 1#100 3018#1 1 25|0#0#0#500 0 1 0 0 +124 千钧秘录-蓝图 3 4 100 1#100 3019#1 1 25|0#0#0#500 0 1 0 0 +125 撼岳秘录-蓝图 3 5 100 1#100 3020#1 1 25|0#0#0#500 0 1 0 0 +126 逐光战甲-蓝图 3 5 100 1#100 3021#1 1 25|0#0#0#500 0 1 0 0 +127 遗迹战甲-蓝图 3 5 100 1#100 3022#1 1 25|0#0#0#500 0 1 0 0 +128 天启战甲-蓝图 3 5 100 1#100 3023#1 1 25|0#0#0#500 0 1 0 0 +129 遗迹战盔-蓝图 3 5 100 1#100 3024#1 1 25|0#0#0#500 0 1 0 0 +130 天启战盔-蓝图 3 5 100 1#100 3025#1 1 25|0#0#0#500 0 1 0 0 +131 遗迹战靴-蓝图 3 5 100 1#100 3026#1 1 25|0#0#0#500 0 1 0 0 +132 天启战靴-蓝图 3 5 100 1#100 3027#1 1 25|0#0#0#500 0 1 0 0 +133 离恨神杖-蓝图 3 5 100 1#100 3028#1 1 25|0#0#0#500 0 1 0 0 +134 无始神杖-蓝图 3 5 100 1#100 3029#1 1 25|0#0#0#500 0 1 0 0 +135 归凡神杖-蓝图 3 5 100 1#100 3030#1 1 25|0#0#0#500 0 1 0 0 +136 道衍神杖-蓝图 3 5 100 1#100 3031#1 1 25|0#0#0#500 0 1 0 0 +137 离恨神刺-蓝图 3 5 100 1#100 3032#1 1 25|0#0#0#500 0 1 0 0 +138 无始神刺-蓝图 3 5 100 1#100 3033#1 1 25|0#0#0#500 0 1 0 0 +139 归凡神刺-蓝图 3 5 100 1#100 3034#1 1 25|0#0#0#500 0 1 0 0 +140 道衍神刺-蓝图 3 5 100 1#100 3035#1 1 25|0#0#0#500 0 1 0 0 +141 离恨神戟-蓝图 3 5 100 1#100 3036#1 1 25|0#0#0#500 0 1 0 0 +142 无始神戟-蓝图 3 5 100 1#100 3037#1 1 25|0#0#0#500 0 1 0 0 +143 归凡神戟-蓝图 3 5 100 1#100 3038#1 1 25|0#0#0#500 0 1 0 0 +144 道衍神戟-蓝图 3 6 100 1#100 3039#1 1 25|0#0#0#500 0 1 0 0 +145 离恨古剑-蓝图 3 6 100 1#100 3040#1 1 25|0#0#0#500 0 1 0 0 +146 无始古剑-蓝图 3 6 100 1#100 3041#1 1 25|0#0#0#500 0 1 0 0 +147 归凡古剑-蓝图 3 6 100 1#100 3042#1 1 25|0#0#0#500 0 1 0 0 +148 道衍古剑-蓝图 3 6 100 1#100 3043#1 1 25|0#0#0#500 0 1 0 0 +149 离恨宝录-蓝图 3 6 100 1#100 3044#1 1 25|0#0#0#500 0 1 0 0 +150 无始宝录-蓝图 3 6 100 1#100 3045#1 1 25|0#0#0#500 0 1 0 0 +151 归凡宝录-蓝图 3 6 100 1#100 3046#1 1 25|0#0#0#500 0 1 0 0 +152 道衍宝录-蓝图 3 6 100 1#100 3047#1 1 25|0#0#0#500 0 1 0 0 +153 神凰羽衣-蓝图 3 6 100 1#100 3048#1 1 25|0#0#0#500 0 1 0 0 +154 饕餮战衣-蓝图 3 6 100 1#100 3049#1 1 25|0#0#0#500 0 1 0 0 +155 轮回羽衣-蓝图 3 6 100 1#100 3050#1 1 25|0#0#0#500 0 1 0 0 +156 盘龙战甲-蓝图 3 6 100 1#100 3051#1 1 25|0#0#0#500 0 1 0 0 +157 麒麟战盔-蓝图 3 6 100 1#100 3052#1 1 25|0#0#0#500 0 1 0 0 +158 应龙战盔-蓝图 3 6 100 1#100 3053#1 1 25|0#0#0#500 0 1 0 0 +159 九霄华冠-蓝图 3 6 100 1#100 3054#1 1 25|0#0#0#500 0 1 0 0 +160 麒麟战靴-蓝图 3 6 100 1#100 3055#1 1 25|0#0#0#500 0 1 0 0 +161 应龙战靴-蓝图 3 6 100 1#100 3056#1 1 25|0#0#0#500 0 1 0 0 +162 九霄华履-蓝图 3 6 100 1#100 3057#1 1 25|0#0#0#500 0 1 0 0 +163 史诗减伤符文 3 7 100 1#100 8025#1 1 25|0#0#0#100 0 1 0 0 +164 史诗增伤符文 3 7 100 1#100 8026#1 1 25|0#0#0#100 0 1 0 0 +165 史诗命中符文 3 7 100 1#100 8027#1 1 25|0#0#0#100 0 1 0 0 +166 史诗抵抗符文 3 7 100 1#100 8028#1 1 25|0#0#0#100 0 1 0 0 +167 史诗暴击符文 3 7 100 1#100 8029#1 1 25|0#0#0#100 0 1 0 0 +168 史诗暴伤符文 3 7 100 1#100 8030#1 1 25|0#0#0#100 0 1 0 0 +169 传说减伤符文 3 7 100 1#100 8031#1 1 25|0#0#0#100 0 1 0 0 +170 传说增伤符文 3 7 100 1#100 8032#1 1 25|0#0#0#100 0 1 0 0 +171 传说命中符文 3 8 100 1#100 8033#1 1 25|0#0#0#100 0 1 0 0 +172 传说抵抗符文 3 8 100 1#100 8034#1 1 25|0#0#0#100 0 1 0 0 +173 传说暴击符文 3 8 100 1#100 8035#1 1 25|0#0#0#100 0 1 0 0 +174 传说暴伤符文 3 8 100 1#100 8036#1 1 25|0#0#0#100 0 1 0 0 +175 传说火焰符文 3 8 100 1#100 8037#1 1 25|0#0#0#100 0 1 0 0 +176 传说碧水符文 3 8 100 1#100 8038#1 1 25|0#0#0#100 0 1 0 0 +177 传说清风符文 3 8 100 1#100 8039#1 1 25|0#0#0#100 0 1 0 0 +178 传说大地符文 3 8 100 1#100 8040#1 1 25|0#0#0#100 0 1 0 0 +179 传说光明符文 3 9 100 1#100 8041#1 1 25|0#0#0#100 0 1 0 0 +180 传说暗黑符文 3 9 100 1#100 8042#1 1 25|0#0#0#100 0 1 0 0 +181 传说烈焰符文 3 9 100 1#100 8043#1 1 25|0#0#0#100 0 1 0 0 +182 传说洛水符文 3 9 100 1#100 8044#1 1 25|0#0#0#100 0 1 0 0 +183 传说狂风符文 3 9 100 1#100 8045#1 1 25|0#0#0#100 0 1 0 0 +184 传说裂地符文 3 9 100 1#100 8046#1 1 25|0#0#0#100 0 1 0 0 +185 传说纯白符文 3 9 100 1#100 8047#1 1 25|0#0#0#100 0 1 0 0 +186 传说黑曜符文 3 9 100 1#100 8048#1 1 25|0#0#0#100 0 1 0 0 101 100金币 2 1 100 1#100 14#100 1 14|0#0#0#100 0 1 0 0 102 1000金币 2 2 100 1#100 14#1000 1 14|0#0#0#100 0 2 0 0 103 10000金币 2 3 100 1#100 14#10000 1 14|0#0#0#100 0 3 0 0 diff --git a/conf/server/StoreTypeConfig.txt b/conf/server/StoreTypeConfig.txt index 2faef95b7..15e21bac0 100644 --- a/conf/server/StoreTypeConfig.txt +++ b/conf/server/StoreTypeConfig.txt @@ -2,7 +2,7 @@ Id Number RefreshItem RefreshPrivilege RefreshType IfManualRefresh StoreOpenRule int int mut,int#int,2 int mut,int#int,1 int int string string 1 9 26|0#0#0#5000 11 1#0 1 1 0 0 2 9 16|0#0#20#0 10 3#8 1 1 0 0 -3 9 25|0#0#0#10000 0 1#0 1 2 0 30 +3 9 25|0#0#0#10000 0 1#0 0 2 0 30 4 6 24|0#0#1#500 0 2#5 1 1 0 0 5 7 24|0#0#0#500 0 1#0 0 1 0 0 6 6 24|0#0#0#500 0 1#0 0 1 0 0 diff --git a/conf/server/VipLevelConfig.txt b/conf/server/VipLevelConfig.txt index 8a77e2961..deb656a46 100644 --- a/conf/server/VipLevelConfig.txt +++ b/conf/server/VipLevelConfig.txt @@ -1,18 +1,18 @@ VipLevel Privileges VipBoxDailyReward VipBoxReward OpenRules int mut,int#int,2 mut,int#int,2 mut,int#int,2 mut,int#int,1 -0 1#10000#2#10000#3#10000#4#2#5#2#6#5#7#3#8#1#9#10#10#1#11#1#12#2#501#0#502#0#503#0#504#0#505#0#13#0#14#0#15#0 14#5000|3#500|4#50|19#3 10301#11401#11001 100#200#300 -1 1#11000#2#10000#3#10000#4#2#5#2#6#5#7#4#8#2#9#10#10#2#11#2#12#2#501#0#502#0#503#0#504#0#505#0#13#0#14#0#15#0 14#10000|3#1000|4#100|19#5 11302#10302#11602#11002 400#500#600#700 -2 1#11000#2#10000#3#10000#4#2#5#3#6#5#7#5#8#3#9#10#10#3#11#3#12#3#501#1#502#0#503#0#504#0#505#0#13#0#14#0#15#0 12006#40|3#3000|4#200|19#8 10703#11903#10303#10103#11603 800#900#1000#1100#1200 -3 1#11000#2#10000#3#10000#4#2#5#3#6#10#7#5#8#4#9#10#10#4#11#4#12#3#501#1#502#1#503#0#504#0#505#0#13#1#14#0#15#0 20#5|3#5000|4#300|19#10 10404#10204#11704#11204#11004 1300#1400#1500#1600#1700 -4 1#11000#2#10000#3#10000#4#2#5#4#6#10#7#5#8#5#9#10#10#5#11#5#12#4#501#1#502#0#503#1#504#0#505#0#13#1#14#0#15#0 12013#50|20#5|4#500|19#10 11305#10305#11605#10905#10805 1800#1900#2000#2100#2200 -5 1#12000#2#10000#3#10000#4#2#5#5#6#10#7#5#8#6#9#10#10#6#11#6#12#5#501#1#502#0#503#0#504#1#505#0#13#1#14#0#15#0 21#5|12007#40|4#1000|14#100000 11306#11406#10606#10106#11706 2300#2400#2500#2600#2700 -6 1#12000#2#12000#3#12000#4#3#5#6#6#10#7#5#8#7#9#10#10#7#11#7#12#6#501#1#502#0#503#0#504#0#505#1#13#2#14#0#15#0 10010#1|3#5000|4#1500|20#5 11307#10407#11207#10307#11007 2800#2900#3000#3100#3200 -7 1#12000#2#12000#3#12000#4#3#5#7#6#10#7#5#8#8#9#10#10#8#11#8#12#7#501#1#502#0#503#0#504#0#505#0#13#3#14#0#15#0 6010#1|6011#1|6012#1|5#40 11908#11608#10808#11808#10608 3300#3400#3500#3600#3700 -8 1#12000#2#12000#3#12000#4#3#5#8#6#20#7#5#8#9#9#10#10#9#11#9#12#8#501#1#502#0#503#0#504#0#505#0#13#3#14#1#15#0 10010#1|5#50|3#5000|20#10 11908#11608#10808#11808#10608 3300#3400#3500#3600#3700 -9 1#12000#2#12000#3#12000#4#4#5#9#6#20#7#5#8#10#9#10#10#10#11#10#12#9#501#1#502#0#503#0#504#0#505#0#13#3#14#0#15#1 16#150|5#70|4#1500|21#10 11908#11608#10808#11808#10608 3300#3400#3500#3600#3700 -10 1#13000#2#15000#3#12000#4#4#5#10#6#30#7#6#8#11#9#10#10#11#11#11#12#10#501#1#502#0#503#0#504#0#505#0#13#3#14#0#15#0 6033#1|6034#1|4#1500|6#10 11908#11608#10808#11808#10608 3300#3400#3500#3600#3700 -11 1#13000#2#15000#3#12000#4#4#5#11#6#40#7#6#8#12#9#10#10#12#11#12#12#11#501#1#502#0#503#0#504#0#505#0#13#3#14#0#15#0 10010#1|5#100|3#5000|21#15 11908#11608#10808#11808#10608 3300#3400#3500#3600#3700 -12 1#13000#2#15000#3#12000#4#5#5#12#6#50#7#6#8#13#9#10#10#13#11#13#12#12#501#1#502#0#503#0#504#0#505#0#13#3#14#0#15#0 6035#1|6036#1|6#20|21#20 11908#11608#10808#11808#10608 3300#3400#3500#3600#3700 -13 1#14000#2#15000#3#12000#4#5#5#13#6#60#7#7#8#14#9#10#10#14#11#14#12#13#501#1#502#0#503#0#504#0#505#0#13#3#14#0#15#0 6001#1|6002#14 11908#11608#10808#11808#10608 3300#3400#3500#3600#3700 -14 1#14000#2#15000#3#12000#4#6#5#14#6#70#7#7#8#15#9#10#10#15#11#15#12#14#501#1#502#0#503#0#504#0#505#0#13#3#14#0#15#0 6001#1|6002#15 11908#11608#10808#11808#10608 3300#3400#3500#3600#3700 -15 1#15000#2#15000#3#12000#4#6#5#15#6#80#7#8#8#16#9#10#10#16#11#16#12#15#501#1#502#0#503#0#504#0#505#0#13#3#14#0#15#0 6001#1|6002#16 null null +0 1#10000|2#10000|3#10000|4#2|5#2|6#5|7#3|8#1|9#10|10#1|11#1|12#2|501#0|502#0|503#0|504#0|505#0|13#0|14#0|15#0 16#5 14#5000|3#500|4#50|19#3 10301#11401#11001 +1 1#11000|2#10000|3#10000|4#2|5#2|6#5|7#4|8#2|9#10|10#2|11#2|12#2|501#0|502#0|503#0|504#0|505#0|13#0|14#0|15#0 16#10 14#80000|3#3000|4#100|19#5 11302#10302#11602#11002 +2 1#11000|2#10000|3#10000|4#2|5#3|6#5|7#5|8#3|9#10|10#3|11#3|12#3|501#1|502#0|503#0|504#0|505#0|13#0|14#0|15#0 16#11 12006#40|3#3000|4#200|19#8 10703#11903#10303#10103#11603 +3 1#11000|2#10000|3#10000|4#2|5#3|6#10|7#5|8#4|9#10|10#4|11#4|12#3|501#1|502#1|503#0|504#0|505#0|13#1|14#0|15#0 16#12 20#5|3#4000|4#300|19#10 10404#10204#11704#11204#11004 +4 1#11000|2#10000|3#10000|4#2|5#4|6#10|7#5|8#5|9#10|10#5|11#5|12#4|501#1|502#0|503#1|504#0|505#0|13#1|14#0|15#0 16#13 12013#50|20#5|4#500|19#10 11305#10305#11605#10905#10805 +5 1#12000|2#10000|3#10000|4#2|5#5|6#10|7#5|8#6|9#10|10#6|11#6|12#5|501#1|502#0|503#0|504#1|505#0|13#1|14#0|15#0 16#20|12013#1 21#5|12007#40|4#1000|14#150000 11306#11406#10606#10106#11706 +6 1#12000|2#12000|3#12000|4#3|5#6|6#10|7#5|8#7|9#10|10#7|11#7|12#6|501#1|502#0|503#0|504#0|505#1|13#2|14#0|15#0 16#22|12013#1 10010#1|3#5000|4#1500|20#5 11307#10407#11207#10307#11007 +7 1#12000|2#12000|3#12000|4#3|5#7|6#10|7#5|8#8|9#10|10#8|11#8|12#7|501#1|502#0|503#0|504#0|505#0|13#3|14#0|15#0 16#24|12013#1 6010#1|6011#1|6012#1|5#40 11908#11608#10808#11808#10608 +8 1#12000|2#12000|3#12000|4#3|5#8|6#20|7#5|8#9|9#10|10#9|11#9|12#8|501#1|502#0|503#0|504#0|505#0|13#3|14#1|15#0 16#26|12013#1 10010#1|5#50|3#5000|20#10 11908#11608#10808#11808#10608 +9 1#12000|2#12000|3#12000|4#4|5#9|6#20|7#5|8#10|9#10|10#10|11#10|12#9|501#1|502#0|503#0|504#0|505#0|13#3|14#0|15#1 16#28|12013#2 16#150|5#70|4#1500|21#10 11908#11608#10808#11808#10608 +10 1#13000|2#15000|3#12000|4#4|5#10|6#30|7#6|8#11|9#10|10#11|11#11|12#10|501#1|502#0|503#0|504#0|505#0|13#3|14#0|15#0 16#30|12013#2|21#1 6033#1|6034#1|4#1500|6#10 11908#11608#10808#11808#10608 +11 1#13000|2#15000|3#12000|4#4|5#11|6#40|7#6|8#12|9#10|10#12|11#12|12#11|501#1|502#0|503#0|504#0|505#0|13#3|14#0|15#0 16#40|12013#2|21#1 10010#1|5#100|3#6000|21#15 11908#11608#10808#11808#10608 +12 1#13000|2#15000|3#12000|4#5|5#12|6#50|7#6|8#13|9#10|10#13|11#13|12#12|501#1|502#0|503#0|504#0|505#0|13#3|14#0|15#0 16#50|12013#2|21#2 6035#1|6036#1|6#20|21#20 11908#11608#10808#11808#10608 +13 1#14000|2#15000|3#12000|4#5|5#13|6#60|7#7|8#14|9#10|10#14|11#14|12#13|501#1|502#0|503#0|504#0|505#0|13#3|14#0|15#0 2#113 6001#1|6002#14 11908#11608#10808#11808#10608 +14 1#14000|2#15000|3#12000|4#6|5#14|6#70|7#7|8#15|9#10|10#15|11#15|12#14|501#1|502#0|503#0|504#0|505#0|13#3|14#0|15#0 2#114 6001#1|6002#15 11908#11608#10808#11808#10608 +15 1#15000|2#15000|3#12000|4#6|5#15|6#80|7#8|8#16|9#10|10#16|11#16|12#15|501#1|502#0|503#0|504#0|505#0|13#3|14#0|15#0 2#115 6001#1|6002#16 null 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 d6af6f72c..3d2bdc3c3 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 @@ -18,6 +18,7 @@ import com.ljsd.jieling.logic.dao.UserManager; import com.ljsd.jieling.logic.hero.HeroAttributeEnum; import com.ljsd.jieling.logic.mail.MailLogic; import com.ljsd.jieling.logic.mission.GameEvent; +import com.ljsd.jieling.logic.store.StoreLogic; import com.ljsd.jieling.network.session.ISession; import com.ljsd.jieling.protocols.CommonProto; import com.ljsd.jieling.protocols.FightInfoProto; @@ -355,7 +356,12 @@ public class CombatLogic { adventureFastReward = getAdventureReward(user, position); }else{ //todo 消耗 - adventureFastReward = getAdventureFastReward(user, SGameSetting.getGameSetting().getAdventureFastBattle()); + String err = StoreLogic.checkBuyGoodsAndUpdate(user,7,10008,1); + if (!"".equals(err)){ + MessageUtil.sendErrorResponse(session,0,MessageTypeProto.MessageType.ADVENTURE_REWARD_RESPONSE_VALUE,err); + return; + } + adventureFastReward = getAdventureFastReward(user, SGameSetting.getGameSetting().getAdventureFastBattle()); } FightInfoProto.TakeAventureRewardResponse build = FightInfoProto.TakeAventureRewardResponse.newBuilder().setDrop(adventureFastReward.get(1)).setRandomDrop(adventureFastReward.get(2)).build(); MessageUtil.sendMessage(session,1, MessageTypeProto.MessageType.ADVENTURE_REWARD_RESPONSE_VALUE,build,true); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/store/StoreLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/store/StoreLogic.java index ac94548fc..93a291306 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/store/StoreLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/store/StoreLogic.java @@ -179,21 +179,35 @@ public class StoreLogic { } User user = UserManager.getUser(uid); - Map storeInfoMap = user.getStoreManager().getStoreInfoMap(); - if (!storeInfoMap.containsKey(storeId)){ - LOGGER.info("buyStoreItem==> uid={},storeId={}",uid,storeId); - MessageUtil.sendErrorResponse(iSession,0,msgId,""); + + SStoreConfig sStoreConfig = SStoreConfig.getSstoreConfigMap().get(itemId); + String err = checkBuyGoodsAndUpdate(user,storeId, itemId,itemNum); + if (!"".equals(err)){ + MessageUtil.sendErrorResponse(iSession,0,msgId,err); return; } + int goodsId = sStoreConfig.getGoods()[0]; + int goodsNum = sStoreConfig.getGoods()[1]*itemNum; + String reward = goodsId +"#"+goodsNum; + CommonProto.Drop.Builder drop = ItemUtil.drop(user, StringUtil.parseFiledInt2(reward), BIReason.STORE_BUY_ITEM); + PlayerInfoProto.BuyStoreItemResponse builder = PlayerInfoProto.BuyStoreItemResponse.newBuilder().setDrop(drop).build(); + MessageUtil.sendMessage(iSession, 1,msgId, builder, true); + } + + public static String checkBuyGoodsAndUpdate(User user,int storeId,int itemId,int itemNum) throws Exception { + Map storeInfoMap = user.getStoreManager().getStoreInfoMap(); + if (!storeInfoMap.containsKey(storeId)){ + LOGGER.info("buyStoreItem==> uid={},storeId={}",user.getId(),storeId); + return "no store"; + } + SStoreConfig sStoreConfig = SStoreConfig.getSstoreConfigMap().get(itemId); StoreInfo storeInfo = storeInfoMap.get(storeId); Map itemNumMap =storeInfo.getItemNumMap(); if (!itemNumMap.containsKey(itemId)){ - LOGGER.info("buyStoreItem==> uid={},itemId={}",uid,itemId); - MessageUtil.sendErrorResponse(iSession,0,msgId,""); - return; + LOGGER.info("buyStoreItem==> uid={},itemId={}",user.getId(),itemId); + return "no goods"; } int buyTimes = itemNumMap.get(itemId); - SStoreConfig sStoreConfig = SStoreConfig.getSstoreConfigMap().get(itemId); int limit = sStoreConfig.getLimit(); int relatedtoVIP = sStoreConfig.getRelatedtoVIP(); PlayerManager playerInfoManager = user.getPlayerInfoManager(); @@ -205,46 +219,43 @@ public class StoreLogic { check = limit > buyTimes; } if(!check){ - MessageUtil.sendErrorResponse(iSession,0,msgId,"over limit"); - return; + return "over limit"; } } - - int[][] cost = getCost(buyTimes,sStoreConfig.getCost(),sStoreConfig.getPremiumType()); + int[][] cost = getCost(buyTimes ,itemNum, sStoreConfig.getCost(), sStoreConfig.getPremiumType()); boolean result = ItemUtil.itemCost(user, cost); if (!result){ - MessageUtil.sendErrorResponse(iSession,0,msgId,"道具不足"); - return; + return "道具不足"; } if(relatedtoVIP == 1 && limit!=0){ playerInfoManager.updateVipPrivilage(limit,itemNum); } - itemNumMap.put(itemId,buyTimes +itemNum); storeInfo.setItemNumMap(itemNumMap); - int goodsId = sStoreConfig.getGoods()[0]; - int goodsNum = sStoreConfig.getGoods()[1]*itemNum; - String reward = goodsId +"#"+goodsNum; - CommonProto.Drop.Builder drop = ItemUtil.drop(user, StringUtil.parseFiledInt2(reward), BIReason.STORE_BUY_ITEM); - PlayerInfoProto.BuyStoreItemResponse builder = PlayerInfoProto.BuyStoreItemResponse.newBuilder().setDrop(drop).build(); - MessageUtil.sendMessage(iSession, 1,msgId, builder, true); + return ""; } - private static int[][] getCost(int buyTimes, int[][] costs,int premiumType) { + private static int[][] getCost(int buyTimes,int itemNum,int[][] costs,int premiumType) { int costItemId = costs[0][0]; int[] ints = costs[1]; - int costNum = (int) (Math.ceil(Math.pow(ints[0], 3)) *buyTimes) + (int) (Math.ceil(Math.pow(ints[1], 2)) *buyTimes) +(int) (Math.ceil(Math.pow(ints[2], 1)) *buyTimes) + ints[3]; - if (premiumType == 2){ - if (buyTimes < ints.length){ - costNum = ints[buyTimes]; - }else{ - costNum = ints[ints.length-1]; + int nums = buyTimes+itemNum; + int totalCost = 0; + for(;buyTimes