From 55ba2bde1982a161eec77145cff467d885a6c5a1 Mon Sep 17 00:00:00 2001 From: wangyuan Date: Thu, 30 May 2019 17:54:16 +0800 Subject: [PATCH] data --- conf/server/AccomplishmentConfig.txt | 2 +- conf/server/AdventureConfig.txt | 16 +- conf/server/AdventureReward.txt | 56 +-- conf/server/ArtResourcesConfig.txt | 10 + conf/server/DifferDemonsBoxSetting.txt | 64 ++-- conf/server/EquipPropertyPool.txt | 168 ++++----- conf/server/EventPointConfig.txt | 9 + conf/server/ItemConfig.txt | 6 +- conf/server/JumpConfig.txt | 51 +-- conf/server/LotteryRewardConfig.txt | 346 +++++++++--------- conf/server/MapPointConfig.txt | 476 ++++++++++++------------- conf/server/MonsterConfig.txt | 2 +- conf/server/MonsterGroup.txt | 72 ++-- conf/server/OptionAddCondition.txt | 1 + conf/server/OptionConfig.txt | 161 +++++---- conf/server/PrivilegeTypeConfig.txt | 44 +-- conf/server/RewardGroup.txt | 47 ++- conf/server/RewardItemConfig.txt | 273 +++++++++++++- conf/server/TaskConfig.txt | 144 ++++---- conf/server/VipLevelConfig.txt | 32 +- 20 files changed, 1168 insertions(+), 812 deletions(-) diff --git a/conf/server/AccomplishmentConfig.txt b/conf/server/AccomplishmentConfig.txt index 763e8222a..537c1d9d3 100644 --- a/conf/server/AccomplishmentConfig.txt +++ b/conf/server/AccomplishmentConfig.txt @@ -5,7 +5,7 @@ int int int mut,int#int,2 int 3 101 2 10101|1 15 4 101 1 101030#101032#101033#101034|1 15 5 101 1 101094#101095#101096|1 15 -6 101 1 101078#101080#101082#101084#101086#101088#101090#101091#101092|1 15 +6 101 1 101078#101080#101082#101084#101086#101088#101090#101091#101092#101103|1 15 7 101 7 0|1 10 8 101 7 0|3 10 9 101 7 0|5 20 diff --git a/conf/server/AdventureConfig.txt b/conf/server/AdventureConfig.txt index ba2e12af8..d27de6dfe 100644 --- a/conf/server/AdventureConfig.txt +++ b/conf/server/AdventureConfig.txt @@ -1,10 +1,10 @@ Id OpenLevel SystemBoss SystemBossTime BaseRewardGroup RandomRewardGroup UpgradeConsume InvasionBoss InvasionBossReward InvasionBossTime InvasionBossRefresh InvasionBossHolding int mut,int#int,1 int int mut,int#int,1 mut,int#int,2 mut,int#int,2 mut,int#int,3 mut,int#int,3 int int int -1 17#54#68 25001 300 101#151#191 111#121#131#140|161#171#181#140#231#241#251#261|201#211#221#140#271#281#291#301#351 14#10000|14#10000 25001#100|25002#100,25001#100|25002#100,25001#100|25002#100 25001#101|25002#102,25001#101|25002#102,25001#101|25002#102 180 3600 10800 -2 25#57#69 25002 300 102#152#192 112#122#132#140|162#172#182#140#232#242#252#262|202#212#222#140#272#282#292#302#352 14#10000|14#10000 25001#100|25002#100,25001#100|25002#100,25001#100|25002#100 25001#101|25002#102,25001#101|25002#102,25001#101|25002#102 180 3600 10800 -3 34#59#69 25003 300 103#153#193 113#123#133#140|163#173#183#140#233#243#253#263|203#213#223#140#273#283#293#303#353 14#10000|14#10000 25001#100|25002#100,25001#100|25002#100,25001#100|25002#100 25001#101|25002#102,25001#101|25002#102,25001#101|25002#102 180 3600 10800 -4 37#64#71 25004 300 104#154#194 114#124#134#140|164#174#184#140#234#244#254#264|204#214#224#140#274#284#294#304#354 14#10000|14#10000 25001#100|25002#100,25001#100|25002#100,25001#100|25002#100 25001#101|25002#102,25001#101|25002#102,25001#101|25002#102 180 3600 10800 -5 42#63#72 25005 300 105#155#195 115#125#135#140|165#175#185#140#235#245#255#265|205#215#225#140#275#285#295#305#355 14#10000|14#10000 25001#100|25002#100,25001#100|25002#100,25001#100|25002#100 25001#101|25002#102,25001#101|25002#102,25001#101|25002#102 180 3600 10800 -6 46#64#72 25006 300 106#156#196 116#126#136#140|166#176#186#140#236#246#256#266|206#216#226#140#276#286#296#306#356 14#10000|14#10000 25001#100|25002#100,25001#100|25002#100,25001#100|25002#100 25001#101|25002#102,25001#101|25002#102,25001#101|25002#102 180 3600 10800 -7 49#66#74 25007 300 107#157#197 117#127#137#140|167#177#187#140#237#247#257#267|207#217#227#140#277#287#297#307#357 14#10000|14#10000 25001#100|25002#100,25001#100|25002#100,25001#100|25002#100 25001#101|25002#102,25001#101|25002#102,25001#101|25002#102 180 3600 10800 -8 52#67#75 25008 300 108#158#198 118#128#138#140|168#178#188#140#238#248#258#268|208#218#228#140#278#288#298#308#358 14#10000|14#10000 25001#100|25002#100,25001#100|25002#100,25001#100|25002#100 25001#101|25002#102,25001#101|25002#102,25001#101|25002#102 180 3600 10800 +1 17#54#68 25001 300 101#151#191 111#121#131#140|161#171#181#140#231#241#251#261|201#211#221#140#271#281#291#301#351 29#110|29#140 601011#278|601012#100,601021#278|601022#100,601031#111|601032#111|601033#56|601034#100 601011#200103|601012#200103,601021#200103|601022#200103,601031#200103|601032#200103|601033#200103|601034#200103 180 3600 10800 +2 25#57#69 25002 300 102#152#192 112#122#132#140|162#172#182#140#232#242#252#262|202#212#222#140#272#282#292#302#352 29#120|29#140 602011#139|602012#139|602013#100,602021#139|602022#139|602023#100,602031#111|602032#111|602033#56|602034#100 602011#200103|602012#200103|602013#200103,602021#200103|602022#200103|602023#200103,602031#200103|602032#200103|602033#200103|602034#200103 180 3600 10800 +3 34#59#69 25003 300 103#153#193 113#123#133#140|163#173#183#140#233#243#253#263|203#213#223#140#273#283#293#303#353 29#120|29#140 603011#139|603012#139|603013#100,603021#139|603022#139|603023#100,603031#111|603032#111|603033#56|603034#100 603011#200103|603012#200103|603013#200103,603021#200103|603022#200103|603023#200103,603031#200103|603032#200103|603033#200103|603034#200103 180 3600 10800 +4 37#64#71 25004 300 104#154#194 114#124#134#140|164#174#184#140#234#244#254#264|204#214#224#140#274#284#294#304#354 29#130|29#140 604011#139|604012#139|604013#100,604021#139|604022#139|604023#100,604031#111|604032#111|604033#56|604034#100 604011#200405|604012#200405|604013#200405,604021#200405|604022#200405|604023#200405,604031#200405|604032#200405|604033#200405|604034#200405 180 3600 10800 +5 42#63#72 25005 300 105#155#195 115#125#135#140|165#175#185#140#235#245#255#265|205#215#225#140#275#285#295#305#355 29#130|29#150 605011#139|605012#139|605013#100,605021#139|605022#139|605023#100,605031#111|605032#111|605033#56|605034#100 605011#200405|605012#200405|605013#200405,605021#200405|605022#200405|605023#200405,605031#200405|605032#200405|605033#200405|605034#200405 180 3600 10800 +6 46#64#72 25006 300 106#156#196 116#126#136#140|166#176#186#140#236#246#256#266|206#216#226#140#276#286#296#306#356 29#130|29#150 606011#139|606012#139|606013#100,606021#139|606022#139|606023#100,606031#93|606032#93|606033#93|606034#100 606011#200608|606012#200608|606013#200608,606021#200608|606022#200608|606023#200608,606031#200608|606032#200608|606033#200608|606034#200608 180 3600 10800 +7 49#66#74 25007 300 107#157#197 117#127#137#140|167#177#187#140#237#247#257#267|207#217#227#140#277#287#297#307#357 29#140|29#150 607011#139|607012#139|607013#100,607021#139|607022#139|607023#100,607031#93|607032#93|607033#93|607034#100 607011#200608|607012#200608|607013#200608,607021#200608|607022#200608|607023#200608,607031#200608|607032#200608|607033#200608|607034#200608 180 3600 10800 +8 52#67#75 25008 300 108#158#198 118#128#138#140|168#178#188#140#238#248#258#268|208#218#228#140#278#288#298#308#358 29#140|29#150 608011#139|608012#139|608013#100,608021#139|608022#139|608023#100,608031#93|608032#93|608033#93|608034#100 608011#200608|608012#200608|608013#200608,608021#200608|608022#200608|608023#200608,608031#200608|608032#200608|608033#200608|608034#200608 180 3600 10800 diff --git a/conf/server/AdventureReward.txt b/conf/server/AdventureReward.txt index 46e5a3835..58842e4f5 100644 --- a/conf/server/AdventureReward.txt +++ b/conf/server/AdventureReward.txt @@ -1,30 +1,30 @@ Id MinRank MaxRank DailyReward int int int mut,int#int,2 -1 1 1 14#200|3#100 -2 2 2 14#200|3#120 -3 3 3 14#200|3#140 -4 4 4 14#200|3#160 -5 5 5 14#200|3#180 -6 6 6 14#200|3#200 -7 7 7 14#200|3#220 -8 8 8 14#200|3#240 -9 9 9 14#200|3#260 -10 10 10 14#200|3#280 -11 11 20 14#200|3#300 -12 21 40 14#200|3#320 -13 41 50 14#200|3#340 -14 51 80 14#200|3#360 -15 81 100 14#200|3#380 -16 101 300 14#200|3#400 -17 301 500 14#200|3#420 -18 501 1000 14#200|3#440 -19 1001 1500 14#200|3#460 -20 1501 2000 14#200|3#480 -21 2001 3000 14#200|3#500 -22 3001 4000 14#200|3#520 -23 4001 5000 14#200|3#540 -24 5001 8000 14#200|3#560 -25 8001 10000 14#200|3#580 -26 10001 12000 14#200|3#600 -27 12001 15000 14#200|3#620 -28 15001 999999 14#200|3#640 +1 1 1 14#300000|16#900|29#250 +2 2 2 14#250000|16#700|29#220 +3 3 3 14#220000|16#600|29#200 +4 4 4 14#210000|16#550|29#185 +5 5 5 14#200000|16#500|29#170 +6 6 6 14#190000|16#450|29#160 +7 7 7 14#180000|16#400|29#150 +8 8 8 14#170000|16#350|29#140 +9 9 9 14#160000|16#300|29#130 +10 10 10 14#150000|16#250|29#120 +11 11 20 14#140000|16#230|29#115 +12 21 40 14#120000|16#210|29#110 +13 41 50 14#100000|16#190|29#105 +14 51 80 14#80000|16#170|29#100 +15 81 100 14#60000|16#150|29#95 +16 101 300 14#40000|16#130|29#90 +17 301 500 14#30000|16#110|29#85 +18 501 999 14#20000|16#90|29#80 +19 1000 0 14#10000|16#70|29#75 +0 0 0 null +0 0 0 null +0 0 0 null +0 0 0 null +0 0 0 null +0 0 0 null +0 0 0 null +0 0 0 null +0 0 0 null diff --git a/conf/server/ArtResourcesConfig.txt b/conf/server/ArtResourcesConfig.txt index 53ad29687..16602a8d1 100644 --- a/conf/server/ArtResourcesConfig.txt +++ b/conf/server/ArtResourcesConfig.txt @@ -16,6 +16,16 @@ int 104 105 106 +201 +202 +203 +204 +205 +206 +207 +208 +209 +210 1001 1002 1003 diff --git a/conf/server/DifferDemonsBoxSetting.txt b/conf/server/DifferDemonsBoxSetting.txt index 271591808..ebd5e78ce 100644 --- a/conf/server/DifferDemonsBoxSetting.txt +++ b/conf/server/DifferDemonsBoxSetting.txt @@ -1,32 +1,32 @@ -Id MainCost SecondaryCost LevelLimit FreeTime ExtraItem SeasonTimes SeasonOpen SeasonEnd RandomPool LimitPrivigele -int mut,int#int,2 int int int mut,int#int,1 int string string int int -1 21#1 1 0 1 22#1 1 20190510 100000 20190517 100000 6 6 -2 21#10 10 0 0 22#11 1 20190510 100000 20190517 100000 6 6 -3 21#1 1 0 1 22#1 2 20190517 100000 20190524 100000 6 6 -4 21#10 10 0 0 22#11 2 20190517 100000 20190524 100000 6 6 -5 21#1 1 0 1 22#1 3 20190524 100000 20190531 100000 6 6 -6 21#10 10 0 0 22#11 3 20190524 100000 20190531 100000 6 6 -7 21#1 1 0 1 22#1 4 20190531 100000 20190601 100000 6 6 -8 21#10 10 0 0 22#11 4 20190531 100000 20190601 100000 6 6 -9 21#1 1 0 1 22#1 5 20190601 100000 20190608 100000 6 6 -10 21#10 10 0 0 22#11 5 20190601 100000 20190608 100000 6 6 -11 21#1 1 0 1 22#1 6 20190608 100000 20190615 100000 6 6 -12 21#10 10 0 0 22#11 6 20190608 100000 20190615 100000 6 6 -13 21#1 1 0 1 22#1 7 20190615 100000 20190622 100000 6 6 -14 21#10 10 0 0 22#11 7 20190615 100000 20190622 100000 6 6 -15 21#1 1 0 1 22#1 8 20190622 100000 20190629 100000 6 6 -16 21#10 10 0 0 22#11 8 20190622 100000 20190629 100000 6 6 -17 21#1 1 0 1 22#1 9 20190629 100000 20190706 100000 6 6 -18 21#10 10 0 0 22#11 9 20190629 100000 20190706 100000 6 6 -19 21#1 1 0 1 22#1 10 20190706 100000 20190713 100000 6 6 -20 21#10 10 0 0 22#11 10 20190706 100000 20190713 100000 6 6 -21 21#1 1 0 1 22#1 11 20190713 100000 20190720 100000 6 6 -22 21#10 10 0 0 22#11 11 20190713 100000 20190720 100000 6 6 -23 21#1 1 0 1 22#1 12 20190720 100000 20190727 100000 6 6 -24 21#10 10 0 0 22#11 12 20190720 100000 20190727 100000 6 6 -25 21#1 1 0 1 22#1 13 20190727 100000 20190803 100000 6 6 -26 21#10 10 0 0 22#11 13 20190727 100000 20190803 100000 6 6 -27 21#1 1 0 1 22#1 14 20190803 100000 20190810 100000 6 6 -28 21#10 10 0 0 22#11 14 20190803 100000 20190810 100000 6 6 -29 21#1 1 0 1 22#1 15 20190810 100000 20190817 100000 6 6 -30 21#10 10 0 0 22#11 15 20190810 100000 20190817 100000 6 6 +Id MainCost SecondaryCost LevelLimit ExtraItem SeasonTimes SeasonOpen SeasonEnd RandomPool LimitPrivigele +int mut,int#int,2 int int mut,int#int,1 int string string int int +1 21#1 1 0 22#1 1 20190510 100000 20190517 100000 6 6 +2 21#10 10 0 22#11 1 20190510 100000 20190517 100000 6 6 +3 21#1 1 0 22#1 2 20190517 100000 20190524 100000 6 6 +4 21#10 10 0 22#11 2 20190517 100000 20190524 100000 6 6 +5 21#1 1 0 22#1 3 20190524 100000 20190531 100000 6 6 +6 21#10 10 0 22#11 3 20190524 100000 20190531 100000 6 6 +7 21#1 1 0 22#1 4 20190531 100000 20190601 100000 6 6 +8 21#10 10 0 22#11 4 20190531 100000 20190601 100000 6 6 +9 21#1 1 0 22#1 5 20190601 100000 20190608 100000 6 6 +10 21#10 10 0 22#11 5 20190601 100000 20190608 100000 6 6 +11 21#1 1 0 22#1 6 20190608 100000 20190615 100000 6 6 +12 21#10 10 0 22#11 6 20190608 100000 20190615 100000 6 6 +13 21#1 1 0 22#1 7 20190615 100000 20190622 100000 6 6 +14 21#10 10 0 22#11 7 20190615 100000 20190622 100000 6 6 +15 21#1 1 0 22#1 8 20190622 100000 20190629 100000 6 6 +16 21#10 10 0 22#11 8 20190622 100000 20190629 100000 6 6 +17 21#1 1 0 22#1 9 20190629 100000 20190706 100000 6 6 +18 21#10 10 0 22#11 9 20190629 100000 20190706 100000 6 6 +19 21#1 1 0 22#1 10 20190706 100000 20190713 100000 6 6 +20 21#10 10 0 22#11 10 20190706 100000 20190713 100000 6 6 +21 21#1 1 0 22#1 11 20190713 100000 20190720 100000 6 6 +22 21#10 10 0 22#11 11 20190713 100000 20190720 100000 6 6 +23 21#1 1 0 22#1 12 20190720 100000 20190727 100000 6 6 +24 21#10 10 0 22#11 12 20190720 100000 20190727 100000 6 6 +25 21#1 1 0 22#1 13 20190727 100000 20190803 100000 6 6 +26 21#10 10 0 22#11 13 20190727 100000 20190803 100000 6 6 +27 21#1 1 0 22#1 14 20190803 100000 20190810 100000 6 6 +28 21#10 10 0 22#11 14 20190803 100000 20190810 100000 6 6 +29 21#1 1 0 22#1 15 20190810 100000 20190817 100000 6 6 +30 21#10 10 0 22#11 15 20190810 100000 20190817 100000 6 6 diff --git a/conf/server/EquipPropertyPool.txt b/conf/server/EquipPropertyPool.txt index 6fc5a7ffe..f858c90c1 100644 --- a/conf/server/EquipPropertyPool.txt +++ b/conf/server/EquipPropertyPool.txt @@ -4,55 +4,55 @@ int int int int int int 10002 2 41 18 1 100 10003 3 41 18 1 100 10004 4 40 22 1 100 -20061 61 7 3 2 100 -20062 62 7 3 2 100 -20063 63 7 3 2 100 -20064 64 7 3 2 100 +20061 61 700 300 2 100 +20062 62 700 300 2 100 +20063 63 700 300 2 100 +20064 64 700 300 2 100 30005 5 528 352 3 100 -30053 53 5 3 3 100 -30054 54 5 3 3 100 -40061 61 14 6 4 100 -40062 62 14 6 4 100 -40063 63 14 6 4 100 -40064 64 14 6 4 100 -40065 65 14 6 4 100 +30053 53 500 300 3 100 +30054 54 500 300 3 100 +40061 61 1400 600 4 100 +40062 62 1400 600 4 100 +40063 63 1400 600 4 100 +40064 64 1400 600 4 100 +40065 65 1400 600 4 100 50001 1 2880 1920 5 100 50002 2 240 160 5 100 -50053 53 3 1 5 100 -50054 54 3 1 5 100 +50053 53 300 100 5 100 +50054 54 300 100 5 100 60004 4 663 563 6 100 70003 3 300 200 7 100 70004 4 300 200 7 100 70005 5 211 140 7 100 -70053 53 12 7 7 100 -70054 54 12 7 7 100 +70053 53 1200 700 7 100 +70054 54 1200 700 7 100 80001 1 600 400 8 100 80002 2 120 80 8 100 80003 3 120 80 8 100 80004 4 120 80 8 100 90005 5 935 572 9 100 -90053 53 7 4 9 100 -90054 54 7 4 9 100 -90055 55 6 3 9 100 -90056 56 21 12 9 100 +90053 53 700 400 9 100 +90054 54 700 400 9 100 +90055 55 600 300 9 100 +90056 56 2100 1200 9 100 100001 1 5102 3120 10 100 100002 2 425 260 10 100 -100053 53 4 2 10 100 -100054 54 4 2 10 100 +100053 53 400 200 10 100 +100054 54 400 200 10 100 110004 4 1174 997 11 100 120003 3 531 325 12 100 120004 4 531 325 12 100 120005 5 374 228 12 100 -120053 53 18 10 12 100 -120054 54 18 10 12 100 -120055 55 1 0 12 100 -120056 56 6 3 12 100 +120053 53 1800 1000 12 100 +120054 54 1800 1000 12 100 +120055 55 100 0 12 100 +120056 56 600 300 12 100 130001 1 1063 650 13 100 130002 2 212 130 13 100 130003 3 212 130 13 100 130004 4 212 130 13 100 -130055 55 2 1 13 100 -130056 56 3 1 13 100 +130055 55 200 100 13 100 +130056 56 300 100 13 100 140005 5 1267 844 14 100 140101 101 1600 960 14 100 140102 102 1600 960 14 100 @@ -60,10 +60,10 @@ int int int int int int 140104 104 1600 960 14 100 140105 105 1600 960 14 100 140106 106 1600 960 14 100 -140053 53 12 7 14 100 -140054 54 12 7 14 100 -140055 55 12 7 14 100 -140056 56 42 25 14 100 +140053 53 1200 700 14 100 +140054 54 1200 700 14 100 +140055 55 1200 700 14 100 +140056 56 4200 2500 14 100 150001 1 5400 3600 15 100 150002 2 360 240 15 100 150101 101 1600 960 15 100 @@ -72,9 +72,9 @@ int int int int int int 150104 104 1600 960 15 100 150105 105 1600 960 15 100 150106 106 1600 960 15 100 -150053 53 7 4 15 100 -150054 54 7 4 15 100 -150060 60 20 12 15 100 +150053 53 700 400 15 100 +150054 54 700 400 15 100 +150060 60 2000 1200 15 100 160001 1 5400 3600 16 100 160002 2 360 240 16 100 160004 4 2340 1560 16 100 @@ -84,49 +84,49 @@ int int int int int int 160104 104 1600 960 16 100 160105 105 1600 960 16 100 160106 106 1600 960 16 100 -160053 53 7 4 16 100 -160054 54 7 4 16 100 -160060 60 20 12 16 100 +160053 53 700 400 16 100 +160054 54 700 400 16 100 +160060 60 2000 1200 16 100 170003 3 900 600 17 100 170004 4 900 600 17 100 170005 5 633 422 17 100 -170053 53 30 18 17 100 -170054 54 30 18 17 100 -170055 55 3 1 17 100 -170056 56 12 7 17 100 +170053 53 3000 1800 17 100 +170054 54 3000 1800 17 100 +170055 55 300 100 17 100 +170056 56 1200 700 17 100 180001 1 1800 1200 18 100 180002 2 360 240 18 100 180003 3 360 240 18 100 180004 4 360 240 18 100 -180055 55 5 3 18 100 -180056 56 6 3 18 100 +180055 55 500 300 18 100 +180056 56 600 300 18 100 190005 5 211 126 19 100 -190053 53 5 3 19 100 -200054 54 5 3 20 100 -200061 61 5 3 20 100 +190053 53 500 300 19 100 +200054 54 500 300 20 100 +200061 61 500 300 20 100 210005 5 374 224 21 100 -210053 53 10 6 21 100 -210055 55 5 3 21 100 -210056 56 10 6 21 100 -220054 54 10 6 22 100 -220060 60 5 3 22 100 -220061 61 10 6 22 100 +210053 53 1000 600 21 100 +210055 55 500 300 21 100 +210056 56 1000 600 21 100 +220054 54 1000 600 22 100 +220060 60 500 300 22 100 +220061 61 1000 600 22 100 230005 5 633 380 23 100 -230051 51 10 6 23 100 -230053 53 10 6 23 100 -230055 55 10 6 23 100 -230056 56 20 12 23 100 -230062 62 10 6 23 100 -240052 52 10 6 24 100 -240054 54 10 6 24 100 -240057 57 20 12 24 100 -240058 58 20 12 24 100 -240060 60 10 6 24 100 -240061 61 10 6 24 100 +230051 51 1000 600 23 100 +230053 53 1000 600 23 100 +230055 55 1000 600 23 100 +230056 56 2000 1200 23 100 +230062 62 1000 600 23 100 +240052 52 1000 600 24 100 +240054 54 1000 600 24 100 +240057 57 2000 1200 24 100 +240058 58 2000 1200 24 100 +240060 60 1000 600 24 100 +240061 61 1000 600 24 100 250001 1 3566 2373 25 100 250002 2 356 237 25 100 250003 3 356 237 25 100 -250063 63 18 11 25 100 +250063 63 1800 1100 25 100 260001 1 3566 2373 26 100 260003 3 356 237 26 100 260004 4 356 237 26 100 @@ -134,52 +134,52 @@ int int int int int int 270001 1 3566 2373 27 100 270002 2 356 237 27 100 270005 5 1267 844 27 100 -270061 61 18 11 27 100 +270061 61 1800 1100 27 100 280001 1 3566 2373 28 100 280002 2 356 237 28 100 280005 5 1267 844 28 100 -280055 55 12 7 28 100 +280055 55 1200 700 28 100 290001 1 3566 2373 29 100 290002 2 356 237 29 100 290005 5 1267 844 29 100 -290065 65 18 11 29 100 +290065 65 1800 1100 29 100 300001 1 3566 2373 30 100 300002 2 356 237 30 100 300005 5 1267 844 30 100 -300053 53 12 7 30 100 +300053 53 1200 700 30 100 310002 2 356 237 31 100 310005 5 1267 844 31 100 -310055 55 12 7 31 100 -310056 56 42 25 31 100 +310055 55 1200 700 31 100 +310056 56 4200 2500 31 100 320002 2 356 237 32 100 320005 5 1267 844 32 100 -320053 53 12 7 32 100 -320062 62 18 11 32 100 +320053 53 1200 700 32 100 +320062 62 1800 1100 32 100 330001 1 3566 2373 33 100 330002 2 356 237 33 100 330005 5 1267 844 33 100 -330062 62 18 11 33 100 +330062 62 1800 1100 33 100 340002 2 356 237 34 100 340005 5 1267 844 34 100 -340055 55 12 7 34 100 -340056 56 42 25 34 100 +340055 55 1200 700 34 100 +340056 56 4200 2500 34 100 350002 2 356 237 35 100 350005 5 1267 844 35 100 -350055 55 12 7 35 100 -350062 62 18 11 35 100 +350055 55 1200 700 35 100 +350062 62 1800 1100 35 100 360002 2 356 237 36 100 360005 5 1267 844 36 100 -360055 55 12 7 36 100 -360062 62 18 11 36 100 +360055 55 1200 700 36 100 +360062 62 1800 1100 36 100 370001 1 3566 2373 37 100 370005 5 1267 844 37 100 -370053 53 12 7 37 100 -370065 65 18 11 37 100 +370053 53 1200 700 37 100 +370065 65 1800 1100 37 100 380001 1 3566 2373 38 100 380002 2 356 237 38 100 380005 5 1267 844 38 100 -380053 53 12 7 38 100 +380053 53 1200 700 38 100 390001 1 3566 2373 39 100 390002 2 356 237 39 100 -390053 53 12 7 39 100 -390062 62 18 11 39 100 +390053 53 1200 700 39 100 +390062 62 1800 1100 39 100 diff --git a/conf/server/EventPointConfig.txt b/conf/server/EventPointConfig.txt index 10e2a4e9a..7c82a4d5b 100644 --- a/conf/server/EventPointConfig.txt +++ b/conf/server/EventPointConfig.txt @@ -94,6 +94,7 @@ int mut,int#int,1 101052 101100 101053 101101 101054 null +101055 101102#101103 102001 102001#102002 102002 102003#102004 102003 102005#102006 @@ -175,6 +176,12 @@ int mut,int#int,1 102079 102155 102080 102156 102081 10206 +102082 102157#102158 +102083 102159#102160 +102084 102161#102162 +102085 102163#102164 +102086 102165#102166 +102087 102167#102168 103001 103001#103002 103002 103003#103004 103003 103005#103006 @@ -244,6 +251,8 @@ int mut,int#int,1 103067 103132 103068 103133 103069 10306 +103070 103134#103135 +103071 103136#103137 104001 104001#104002 104002 104003#104004 104003 104005#104006 diff --git a/conf/server/ItemConfig.txt b/conf/server/ItemConfig.txt index b6989e340..7806b1c16 100644 --- a/conf/server/ItemConfig.txt +++ b/conf/server/ItemConfig.txt @@ -28,9 +28,9 @@ int bool int int int bool int string int int int int mut,int#int,1 int int 1004 true 0 2 4 false 1 100001 0 0 0 1 null 1 9999999 1005 true 0 2 5 false 1 100001 0 0 0 1 null 1 9999999 1006 true 0 2 1 false 1 100001 0 0 0 1 null 1 9999999 -1007 true 0 2 3 false 0 15001 0 0 0 1 null 1 9999999 -1008 true 0 2 4 false 0 15002 0 0 0 1 null 1 9999999 -1009 true 0 2 5 false 0 15003 0 0 0 1 null 1 9999999 +1007 true 8 2 3 false 0 15001 0 0 0 1 null 1 9999999 +1008 true 8 2 4 false 0 15002 0 0 0 1 null 1 9999999 +1009 true 8 2 5 false 0 15003 0 0 0 1 null 1 9999999 1010 true 0 3 1 false 1 100001 0 0 0 1 null 1 9999999 1011 true 0 3 2 false 1 100001 0 0 0 1 null 1 9999999 1012 true 0 3 3 false 1 100001 0 0 0 1 null 1 9999999 diff --git a/conf/server/JumpConfig.txt b/conf/server/JumpConfig.txt index 907421588..88fea57b7 100644 --- a/conf/server/JumpConfig.txt +++ b/conf/server/JumpConfig.txt @@ -1,27 +1,28 @@ Skipfactor SortId mut,int#int,1 int -1031 1 -1051 2 -4051 3 -1052 4 -4052 5 -1053 6 -4053 7 -1 8 -1 9 -2 10 -3 11 -4 12 -2 13 -12 14 -12 15 -0 16 -0 17 -0 18 -0 19 -0 20 -0 21 -0 22 -0 23 -0 24 -0 25 +null 1 +null 2 +null 3 +null 4 +null 5 +null 6 +null 7 +null 8 +null 9 +null 10 +1 11 +null 12 +null 13 +null 14 +null 15 +null 16 +1 17 +2 18 +null 19 +1 20 +null 21 +null 22 +null 23 +null 24 +null 25 +1011 26 diff --git a/conf/server/LotteryRewardConfig.txt b/conf/server/LotteryRewardConfig.txt index 75f23d823..602170e73 100644 --- a/conf/server/LotteryRewardConfig.txt +++ b/conf/server/LotteryRewardConfig.txt @@ -1,175 +1,175 @@ Id Reward Pool Weight OpenRules int mut,int#int,1 int int int,int#int,1 -2 10002#1 1 11 null -3 10003#1 1 11 null -4 10004#1 1 0 null -5 10005#1 1 0 null -6 10006#1 1 11 null -7 10007#1 1 11 null -8 10008#1 1 0 null -9 10009#1 1 0 null -10 10010#1 1 0 null -11 10011#1 1 11 null -12 10012#1 1 8 null -13 10013#1 1 11 null -14 10014#1 1 0 null -15 10015#1 1 0 null -16 10016#1 1 0 null -17 10017#1 1 0 null -18 10018#1 1 0 null -19 10019#1 1 5 null -20 10020#1 1 0 null -21 10021#1 1 11 null -22 10022#1 1 8 null -23 10023#1 1 0 null -24 10024#1 1 95 null -25 10025#1 1 95 null -26 10026#1 1 95 null -27 10027#1 1 0 null -28 10028#1 1 0 null -29 10029#1 1 0 null -30 10030#1 1 0 null -31 10031#1 1 0 null -32 10032#1 1 0 null -33 10033#1 1 0 null -34 10034#1 1 95 null -35 10035#1 1 0 null -36 10036#1 1 0 null -37 10037#1 1 95 null -38 10038#1 1 0 null -39 10039#1 1 0 null -40 10040#1 1 0 null -41 10041#1 1 0 null -42 10042#1 1 0 null -43 10043#1 1 0 null -44 10044#1 1 0 null -45 10045#1 1 0 null -46 10046#1 1 0 null -47 10047#1 1 100 null -48 10048#1 1 100 null -49 10049#1 1 100 null -50 10050#1 1 100 null -51 10051#1 1 0 null -52 10052#1 1 0 null -57 10001#1 11 20 null -58 10007#1 11 0 null -59 10010#1 11 0 null -60 10021#1 11 0 null -61 10036#1 11 0 null -62 10037#1 11 0 null -63 10039#1 11 0 null -64 10043#1 11 150 null -65 12008#10 11 50 null -66 12008#8 11 50 null -67 12008#12 11 50 null -68 12008#10 11 0 null -69 10006#1 12 60 null -70 10012#1 12 20 null -71 10016#1 12 60 null -72 10020#1 12 60 null -73 10025#1 12 150 null -74 10038#1 12 0 null -75 10040#1 12 0 null -76 10041#1 12 150 null -77 12009#10 12 50 null -78 12009#8 12 50 null -79 12009#12 12 50 null -80 12009#10 12 50 null -81 10002#1 13 60 null -82 10004#1 13 20 null -83 10019#1 13 60 null -84 10022#1 13 0 null -85 10024#1 13 0 null -86 10030#1 13 0 null -87 10042#1 13 0 null -88 10045#1 13 150 null -89 12011#10 13 50 null -90 12011#8 13 50 null -91 12011#12 13 50 null -92 12011#10 13 50 null -93 10003#1 14 0 null -94 10005#1 14 0 null -95 10011#1 14 60 null -96 10013#1 14 0 null -97 10029#1 14 0 null -98 10031#1 14 0 null -99 10032#1 14 0 null -100 10033#1 14 150 null -101 12010#10 14 50 null -102 12010#8 14 50 null -103 12010#12 14 50 null -104 12010#10 14 50 null -110 10024#1 20 0 null -111 10025#1 20 95 null -112 10026#1 20 0 null -113 10027#1 20 0 null -114 10028#1 20 0 null -115 10029#1 20 0 null -116 10030#1 20 0 null -117 10031#1 20 0 null -118 10032#1 20 0 null -119 10033#1 20 0 null -120 10034#1 20 95 null -121 10035#1 20 0 null -122 10036#1 20 0 null -123 10037#1 20 95 null -124 10038#1 20 0 null -125 10039#1 20 0 null -126 10040#1 20 0 null -127 10041#1 20 0 null -128 10042#1 20 0 null -129 10043#1 20 0 null -130 10044#1 20 0 null -131 10045#1 20 0 null -132 10046#1 20 0 null -201 10047#1 21 100 null -202 10048#1 21 100 null -203 10049#1 21 100 null -204 10050#1 21 100 null -205 10051#1 21 0 null -206 10052#1 21 0 null -301 10024#1 22 0 null -302 10025#1 22 95 null -303 10026#1 22 0 null -304 10027#1 22 0 null -305 10028#1 22 0 null -306 10029#1 22 0 null -307 10030#1 22 0 null -308 10031#1 22 0 null -309 10032#1 22 0 null -310 10033#1 22 0 null -311 10034#1 22 95 null -312 10035#1 22 0 null -313 10036#1 22 0 null -314 10037#1 22 95 null -315 10038#1 22 0 null -316 10039#1 22 0 null -317 10040#1 22 0 null -318 10041#1 22 0 null -319 10042#1 22 0 null -320 10043#1 22 0 null -321 10044#1 22 0 null -322 10045#1 22 0 null -323 10046#1 22 0 null -324 10047#1 22 100 null -325 10048#1 22 100 null -326 10049#1 22 100 null -327 10050#1 22 100 null -328 10051#1 22 0 null -329 10052#1 22 0 null -401 10008#1 23 0 null -402 10009#1 23 0 null -403 10010#1 23 0 null -404 10011#1 23 11 null -405 10012#1 23 8 null -406 10013#1 23 11 null -407 10014#1 23 0 null -408 10015#1 23 0 null -409 10016#1 23 0 null -410 10017#1 23 0 null -411 10018#1 23 0 null -412 10019#1 23 5 null -413 10020#1 23 0 null -414 10021#1 23 11 null -415 10022#1 23 5 null -416 10023#1 23 0 null +2 10002#1 1 32 null +3 10003#1 1 32 null +4 10004#1 1 24 null +5 10005#1 1 32 null +6 10006#1 1 32 null +7 10007#1 1 32 null +8 10008#1 1 12 null +9 10009#1 1 16 null +10 10010#1 1 32 null +11 10011#1 1 32 null +12 10012#1 1 24 null +13 10013#1 1 32 null +14 10014#1 1 16 null +15 10015#1 1 16 null +16 10016#1 1 24 null +17 10017#1 1 16 null +18 10018#1 1 16 null +19 10019#1 1 32 null +20 10020#1 1 32 null +21 10021#1 1 32 null +22 10022#1 1 32 null +23 10023#1 1 16 null +24 10024#1 1 40 null +25 10025#1 1 40 null +26 10026#1 1 20 null +27 10027#1 1 20 null +28 10028#1 1 20 null +29 10029#1 1 40 null +30 10030#1 1 40 null +31 10031#1 1 40 null +32 10032#1 1 40 null +33 10033#1 1 40 null +34 10034#1 1 20 null +35 10035#1 1 20 null +36 10036#1 1 40 null +37 10037#1 1 40 null +38 10038#1 1 40 null +39 10039#1 1 40 null +40 10040#1 1 40 null +41 10041#1 1 40 null +42 10042#1 1 40 null +43 10043#1 1 40 null +44 10044#1 1 20 null +45 10045#1 1 40 null +46 10046#1 1 20 null +47 10047#1 1 40 null +48 10048#1 1 40 null +49 10049#1 1 40 null +50 10050#1 1 40 null +51 10051#1 1 20 null +52 10052#1 1 20 null +57 10001#1 11 24 null +58 10007#1 11 32 null +59 10010#1 11 32 null +60 10021#1 11 32 null +61 10036#1 11 40 null +62 10037#1 11 40 null +63 10039#1 11 40 null +64 10043#1 11 40 null +65 12008#10 11 12 null +66 12008#8 11 12 null +67 12008#12 11 12 null +68 12008#10 11 12 null +69 10006#1 12 32 null +70 10012#1 12 24 null +71 10016#1 12 24 null +72 10020#1 12 32 null +73 10025#1 12 40 null +74 10038#1 12 40 null +75 10040#1 12 40 null +76 10041#1 12 40 null +77 12009#10 12 12 null +78 12009#8 12 12 null +79 12009#12 12 12 null +80 12009#10 12 12 null +81 10002#1 13 32 null +82 10004#1 13 24 null +83 10019#1 13 32 null +84 10022#1 13 32 null +85 10024#1 13 40 null +86 10030#1 13 40 null +87 10042#1 13 40 null +88 10045#1 13 40 null +89 12011#10 13 12 null +90 12011#8 13 12 null +91 12011#12 13 12 null +92 12011#10 13 12 null +93 10003#1 14 32 null +94 10005#1 14 32 null +95 10011#1 14 32 null +96 10013#1 14 32 null +97 10029#1 14 40 null +98 10031#1 14 40 null +99 10032#1 14 40 null +100 10033#1 14 40 null +101 12010#10 14 12 null +102 12010#8 14 12 null +103 12010#12 14 12 null +104 12010#10 14 12 null +110 10024#1 20 40 null +111 10025#1 20 40 null +112 10026#1 20 20 null +113 10027#1 20 20 null +114 10028#1 20 20 null +115 10029#1 20 40 null +116 10030#1 20 40 null +117 10031#1 20 40 null +118 10032#1 20 40 null +119 10033#1 20 40 null +120 10034#1 20 20 null +121 10035#1 20 20 null +122 10036#1 20 40 null +123 10037#1 20 40 null +124 10038#1 20 40 null +125 10039#1 20 40 null +126 10040#1 20 40 null +127 10041#1 20 40 null +128 10042#1 20 40 null +129 10043#1 20 40 null +130 10044#1 20 20 null +131 10045#1 20 40 null +132 10046#1 20 20 null +201 10047#1 21 40 null +202 10048#1 21 40 null +203 10049#1 21 40 null +204 10050#1 21 40 null +205 10051#1 21 20 null +206 10052#1 21 20 null +301 10024#1 22 40 null +302 10025#1 22 40 null +303 10026#1 22 20 null +304 10027#1 22 20 null +305 10028#1 22 20 null +306 10029#1 22 40 null +307 10030#1 22 40 null +308 10031#1 22 40 null +309 10032#1 22 40 null +310 10033#1 22 40 null +311 10034#1 22 20 null +312 10035#1 22 20 null +313 10036#1 22 40 null +314 10037#1 22 40 null +315 10038#1 22 40 null +316 10039#1 22 40 null +317 10040#1 22 40 null +318 10041#1 22 40 null +319 10042#1 22 40 null +320 10043#1 22 40 null +321 10044#1 22 20 null +322 10045#1 22 40 null +323 10046#1 22 20 null +324 10047#1 22 40 null +325 10048#1 22 40 null +326 10049#1 22 40 null +327 10050#1 22 40 null +328 10051#1 22 20 null +329 10052#1 22 20 null +401 10008#1 23 12 null +402 10009#1 23 16 null +403 10010#1 23 32 null +404 10011#1 23 32 null +405 10012#1 23 24 null +406 10013#1 23 32 null +407 10014#1 23 16 null +408 10015#1 23 16 null +409 10016#1 23 24 null +410 10017#1 23 16 null +411 10018#1 23 16 null +412 10019#1 23 32 null +413 10020#1 23 32 null +414 10021#1 23 32 null +415 10022#1 23 32 null +416 10023#1 23 16 null diff --git a/conf/server/MapPointConfig.txt b/conf/server/MapPointConfig.txt index 3071d2700..b109dafd6 100644 --- a/conf/server/MapPointConfig.txt +++ b/conf/server/MapPointConfig.txt @@ -1,238 +1,238 @@ -Id Style Refresh TriggerRules InitialEventId -int int int int int -100001 4 2 2 100001 -100002 5 2 2 100002 -100003 5 3 2 100019 -100004 1 2 1 100010 -100005 5 3 2 100014 -100006 5 3 2 100015 -0 0 0 0 0 -101001 5 2 2 101001 -101002 5 2 2 101012 -101003 5 2 2 101023 -101004 5 2 2 101032 -101005 5 2 2 101039 -101006 5 2 2 101047 -101007 8 2 0 0 -101008 7 2 2 101049 -101009 7 2 2 101050 -101010 7 2 2 101051 -101011 7 2 2 101052 -101012 7 2 2 101053 -101013 6 2 2 101054 -0 0 0 0 0 -102001 5 2 2 102001 -102002 5 2 2 102016 -102003 5 2 2 102054 -102004 1 2 1 102081 -102005 2 2 2 102077 -102006 2 2 2 102078 -102007 2 2 2 102079 -102008 2 2 2 102080 -102009 8 2 0 0 -0 0 0 0 0 -103001 5 2 2 103001 -103002 5 2 2 103016 -103003 5 2 2 103024 -103004 5 2 2 103034 -103005 5 2 2 103047 -103006 8 2 0 0 -103007 1 2 1 103069 -103008 7 2 2 103066 -103009 7 2 2 103067 -103010 7 2 2 103068 -0 0 0 0 0 -104001 5 2 2 104001 -104002 5 2 2 104011 -104003 5 2 2 104022 -104004 8 2 0 0 -104005 5 2 2 104038 -104006 1 2 1 104043 -104007 7 2 2 104040 -104008 7 2 2 104041 -104009 7 2 2 104042 -0 0 0 0 0 -105001 5 2 2 105001 -105002 10 2 1 105010 -105003 5 2 2 105025 -105004 5 2 2 105060 -105005 8 2 0 0 -105006 10 2 1 105052 -105007 1 2 1 105067 -105008 7 2 2 105064 -105009 7 2 2 105065 -105010 7 2 2 105066 -0 0 0 0 0 -106001 5 2 2 106001 -106002 5 2 2 106005 -106003 5 2 2 106023 -106004 5 2 2 106039 -106005 5 2 2 106018 -106006 5 2 2 106033 -106007 5 2 2 106049 -106008 8 0 0 0 -106009 7 2 2 106052 -106010 7 2 2 106053 -106011 7 2 2 106054 -106012 7 2 2 106055 -106013 7 2 2 106056 -0 0 0 0 0 -107001 5 2 2 107001 -107002 5 2 2 107007 -107003 5 2 2 107026 -107004 5 2 2 107051 -107005 1 2 1 107059 -107006 8 2 0 0 -107007 7 2 2 107060 -107008 7 2 2 107061 -107009 7 2 2 107062 -0 0 0 0 0 -108001 5 2 2 108001 -108002 5 2 2 108009 -108003 5 2 2 108018 -108004 8 2 0 0 -108005 7 2 2 108038 -108006 7 2 2 108039 -108007 7 2 2 108040 -0 0 0 0 0 -109001 5 2 2 109001 -109002 5 2 2 109003 -109003 5 2 2 109009 -109004 5 2 2 109031 -109005 5 2 2 109033 -109006 1 2 1 109034 -109007 8 2 0 0 -109008 5 2 2 109035 -109009 5 2 2 109036 -109010 7 2 2 109037 -109011 7 2 2 109038 -109012 7 2 2 109039 -0 0 0 0 0 -110001 5 2 2 110001 -110002 5 2 2 110011 -110005 8 2 2 0 -110006 1 2 1 110056 -110007 7 2 2 110057 -110008 7 2 2 110058 -110009 7 2 2 110059 -0 0 0 0 0 -111001 5 2 2 111001 -111002 5 2 2 111005 -111003 5 2 2 111014 -111004 5 2 2 111018 -111005 5 2 2 111027 -111006 8 2 2 0 -111007 7 2 2 111043 -111008 7 2 2 111044 -111009 7 2 2 111045 -0 0 0 0 0 -112001 5 2 2 112001 -112002 5 2 2 112004 -112003 5 2 2 112022 -112004 5 2 2 112026 -112005 5 2 2 112030 -112006 5 2 2 112034 -112007 8 0 0 0 -112008 7 2 2 112039 -112009 7 2 2 112040 -112010 7 2 2 112041 -112011 7 2 2 112042 -0 0 0 0 0 -113001 5 2 2 113001 -113002 5 2 2 113012 -113003 8 2 2 0 -113004 7 2 2 113041 -113005 7 2 2 113042 -113006 7 2 2 113043 -0 0 0 0 0 -114001 5 2 2 114001 -114002 1 2 1 114043 -114003 8 0 0 0 -114004 7 2 2 114044 -114005 7 2 2 114045 -114006 7 2 2 114046 -0 0 0 0 0 -115001 5 2 2 115001 -115002 5 2 2 115009 -115003 5 2 2 115015 -115004 5 2 2 115032 -115005 8 0 0 0 -115006 7 2 2 115054 -115007 7 2 2 115055 -115008 7 2 2 115056 -115009 7 2 2 115057 -0 0 0 0 0 -201001 5 2 2 201001 -201002 5 2 2 201004 -201003 8 0 0 0 -0 0 0 0 0 -202001 5 2 2 202001 -202002 5 2 2 202005 -202003 8 0 0 0 -0 0 0 0 0 -203001 5 2 2 203001 -203002 5 2 2 203004 -203003 5 2 2 203007 -203004 8 0 0 0 -0 0 0 0 0 -204001 5 2 2 204001 -204002 5 2 2 204004 -204003 5 2 2 204007 -204004 8 0 0 0 -0 0 0 0 0 -205001 5 2 2 205001 -205002 5 2 2 205004 -205003 5 2 2 205007 -205004 5 2 2 205010 -205005 8 0 0 0 -0 0 0 0 0 -206001 5 2 2 206001 -206002 5 2 2 206004 -206003 5 2 2 206007 -206004 8 0 0 0 -0 0 0 0 0 -207001 5 2 2 207001 -207002 5 2 2 207004 -207003 5 2 2 207007 -207004 5 2 2 207010 -207005 8 0 0 0 -0 0 0 0 0 -208001 5 2 2 208001 -208002 5 2 2 208004 -208003 8 0 0 0 -0 0 0 0 0 -209001 5 2 2 209001 -209002 5 2 2 209004 -209003 5 2 2 209007 -209004 8 0 0 0 -0 0 0 0 0 -210001 5 2 2 210001 -210002 5 2 2 210004 -210003 5 2 2 210007 -210004 5 2 2 210010 -210005 8 0 0 0 -0 0 0 0 0 -211001 5 2 2 211001 -211002 5 2 2 211004 -211003 5 2 2 211007 -211004 8 0 0 0 -0 0 0 0 0 -212001 5 2 2 212001 -212002 5 2 2 212004 -212003 5 2 2 212007 -212004 8 0 0 0 -0 0 0 0 0 -213001 5 2 2 213001 -213002 5 2 2 213004 -213003 8 0 0 0 -0 0 0 0 0 -214001 5 2 2 214001 -214002 5 2 2 214004 -214003 5 2 2 214007 -214004 5 2 2 214010 -214005 8 0 0 0 -0 0 0 0 0 -215001 5 2 2 215001 -215002 5 2 2 215004 -215003 5 2 2 215007 -215004 8 0 0 0 +Id Style Refresh TriggerRules InitialEventId RandomProbability +int int int int int mut,int#int,2 +100001 4 2 2 100001 null +100002 5 2 2 100002 null +100003 5 3 2 100019 null +100004 1 2 1 100010 null +100005 5 3 2 100014 null +100006 5 3 2 100015 null +0 0 0 0 0 null +101001 5 2 2 101001 null +101002 5 2 2 101012 null +101003 5 2 2 101023 null +101004 5 2 2 101032 null +101005 5 2 2 101039 null +101006 5 2 2 101047 null +101007 8 2 0 0 null +101008 7 2 2 101049 null +101009 7 2 2 101050 null +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 +0 0 0 0 0 null +102001 5 2 2 102001 null +102002 5 2 2 102016 null +102003 5 2 2 102054 null +102004 1 2 1 102081 null +102005 2 2 2 102077 null +102006 2 2 2 102078 null +102007 2 2 2 102079 null +102008 2 2 2 102080 null +102009 8 2 0 0 null +0 0 0 0 0 null +103001 5 2 2 103001 null +103002 5 2 2 103016 null +103003 5 2 2 103024 null +103004 5 2 2 103034 null +103005 5 2 2 103047 null +103006 8 2 0 0 null +103007 1 2 1 103069 null +103008 7 2 2 103066 null +103009 7 2 2 103067 null +103010 7 2 2 103068 null +0 0 0 0 0 null +104001 5 2 2 104001 null +104002 5 2 2 104011 null +104003 5 2 2 104022 null +104004 8 2 0 0 null +104005 5 2 2 104038 null +104006 1 2 1 104043 null +104007 7 2 2 104040 null +104008 7 2 2 104041 null +104009 7 2 2 104042 null +0 0 0 0 0 null +105001 5 2 2 105001 null +105002 10 2 1 105010 null +105003 5 2 2 105025 null +105004 5 2 2 105060 null +105005 8 2 0 0 null +105006 10 2 1 105052 null +105007 1 2 1 105067 null +105008 7 2 2 105064 null +105009 7 2 2 105065 null +105010 7 2 2 105066 null +0 0 0 0 0 null +106001 5 2 2 106001 null +106002 5 2 2 106005 null +106003 5 2 2 106023 null +106004 5 2 2 106039 null +106005 5 2 2 106018 null +106006 5 2 2 106033 null +106007 5 2 2 106049 null +106008 8 0 0 0 null +106009 7 2 2 106052 null +106010 7 2 2 106053 null +106011 7 2 2 106054 null +106012 7 2 2 106055 null +106013 7 2 2 106056 null +0 0 0 0 0 null +107001 5 2 2 107001 null +107002 5 2 2 107007 null +107003 5 2 2 107026 null +107004 5 2 2 107051 null +107005 1 2 1 107059 null +107006 8 2 0 0 null +107007 7 2 2 107060 null +107008 7 2 2 107061 null +107009 7 2 2 107062 null +0 0 0 0 0 null +108001 5 2 2 108001 null +108002 5 2 2 108009 null +108003 5 2 2 108018 null +108004 8 2 0 0 null +108005 7 2 2 108038 null +108006 7 2 2 108039 null +108007 7 2 2 108040 null +0 0 0 0 0 null +109001 5 2 2 109001 null +109002 5 2 2 109003 null +109003 5 2 2 109009 null +109004 5 2 2 109031 null +109005 5 2 2 109033 null +109006 1 2 1 109034 null +109007 8 2 0 0 null +109008 5 2 2 109035 null +109009 5 2 2 109036 null +109010 7 2 2 109037 null +109011 7 2 2 109038 null +109012 7 2 2 109039 null +0 0 0 0 0 null +110001 5 2 2 110001 null +110002 5 2 2 110011 null +110005 8 2 2 0 null +110006 1 2 1 110056 null +110007 7 2 2 110057 null +110008 7 2 2 110058 null +110009 7 2 2 110059 null +0 0 0 0 0 null +111001 5 2 2 111001 null +111002 5 2 2 111005 null +111003 5 2 2 111014 null +111004 5 2 2 111018 null +111005 5 2 2 111027 null +111006 8 2 2 0 null +111007 7 2 2 111043 null +111008 7 2 2 111044 null +111009 7 2 2 111045 null +0 0 0 0 0 null +112001 5 2 2 112001 null +112002 5 2 2 112004 null +112003 5 2 2 112022 null +112004 5 2 2 112026 null +112005 5 2 2 112030 null +112006 5 2 2 112034 null +112007 8 0 0 0 null +112008 7 2 2 112039 null +112009 7 2 2 112040 null +112010 7 2 2 112041 null +112011 7 2 2 112042 null +0 0 0 0 0 null +113001 5 2 2 113001 null +113002 5 2 2 113012 null +113003 8 2 2 0 null +113004 7 2 2 113041 null +113005 7 2 2 113042 null +113006 7 2 2 113043 null +0 0 0 0 0 null +114001 5 2 2 114001 null +114002 1 2 1 114043 null +114003 8 0 0 0 null +114004 7 2 2 114044 null +114005 7 2 2 114045 null +114006 7 2 2 114046 null +0 0 0 0 0 null +115001 5 2 2 115001 null +115002 5 2 2 115009 null +115003 5 2 2 115015 null +115004 5 2 2 115032 null +115005 8 0 0 0 null +115006 7 2 2 115054 null +115007 7 2 2 115055 null +115008 7 2 2 115056 null +115009 7 2 2 115057 null +0 0 0 0 0 null +201001 5 2 2 201001 null +201002 5 2 2 201004 null +201003 8 0 0 0 null +0 0 0 0 0 null +202001 5 2 2 202001 null +202002 5 2 2 202005 null +202003 8 0 0 0 null +0 0 0 0 0 null +203001 5 2 2 203001 null +203002 5 2 2 203004 null +203003 5 2 2 203007 null +203004 8 0 0 0 null +0 0 0 0 0 null +204001 5 2 2 204001 null +204002 5 2 2 204004 null +204003 5 2 2 204007 null +204004 8 0 0 0 null +0 0 0 0 0 null +205001 5 2 2 205001 null +205002 5 2 2 205004 null +205003 5 2 2 205007 null +205004 5 2 2 205010 null +205005 8 0 0 0 null +0 0 0 0 0 null +206001 5 2 2 206001 null +206002 5 2 2 206004 null +206003 5 2 2 206007 null +206004 8 0 0 0 null +0 0 0 0 0 null +207001 5 2 2 207001 null +207002 5 2 2 207004 null +207003 5 2 2 207007 null +207004 5 2 2 207010 null +207005 8 0 0 0 null +0 0 0 0 0 null +208001 5 2 2 208001 null +208002 5 2 2 208004 null +208003 8 0 0 0 null +0 0 0 0 0 null +209001 5 2 2 209001 null +209002 5 2 2 209004 null +209003 5 2 2 209007 null +209004 8 0 0 0 null +0 0 0 0 0 null +210001 5 2 2 210001 null +210002 5 2 2 210004 null +210003 5 2 2 210007 null +210004 5 2 2 210010 null +210005 8 0 0 0 null +0 0 0 0 0 null +211001 5 2 2 211001 null +211002 5 2 2 211004 null +211003 5 2 2 211007 null +211004 8 0 0 0 null +0 0 0 0 0 null +212001 5 2 2 212001 null +212002 5 2 2 212004 null +212003 5 2 2 212007 null +212004 8 0 0 0 null +0 0 0 0 0 null +213001 5 2 2 213001 null +213002 5 2 2 213004 null +213003 8 0 0 0 null +0 0 0 0 0 null +214001 5 2 2 214001 null +214002 5 2 2 214004 null +214003 5 2 2 214007 null +214004 5 2 2 214010 null +214005 8 0 0 0 null +0 0 0 0 0 null +215001 5 2 2 215001 null +215002 5 2 2 215004 null +215003 5 2 2 215007 null +215004 8 0 0 0 null diff --git a/conf/server/MonsterConfig.txt b/conf/server/MonsterConfig.txt index 698e0aceb..ef9f1aaa2 100644 --- a/conf/server/MonsterConfig.txt +++ b/conf/server/MonsterConfig.txt @@ -35,7 +35,7 @@ int int int int int int int int int int int float float float float float float 10903 8 3 0 1 100 24104 1919 596 2925 2544 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20050 null 10904 4 3 0 2 100 43387 2713 596 2925 4240 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20049 null 10905 41 4 0 2 100 43387 2713 596 2925 84 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20051 null -11001 17 4 0 2 100 22955 2042 565 2190 2640 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20053 null +11001 10040 4 0 2 100 41319 2929 565 2190 2640 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20053 null 11002 8 4 0 1 100 22955 2042 565 2190 4400 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20052 null 11003 8 4 0 1 100 22955 2042 565 2190 87 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20057 null 11004 8 4 0 1 100 22955 2042 565 2190 2640 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20056 null diff --git a/conf/server/MonsterGroup.txt b/conf/server/MonsterGroup.txt index 70edc968e..3abea8400 100644 --- a/conf/server/MonsterGroup.txt +++ b/conf/server/MonsterGroup.txt @@ -4,54 +4,54 @@ int mut,int#int,2 mut,int#int,1 100001 10001 null 100002 10002#10003#10004 null 100003 10005#10006#10007 null -10101 10101 3001 -10102 10102 3001 +10101 10101 40001#40001 +10102 10102 40001 10103 10104#10103#10105 3001 -10201 10201 3006 +10201 10201 40002#40002 10202 10202 3006 -10203 10202#10203|10204 3006 -10204 10205 3006#55001 -10205 10206 3006#55001 +10203 10202#10203|10204 40002 +10204 10205 40002#40002#55001 +10205 10206 40002#40002#55001 10206 10207 3006#55003 -10301 10301 3011 +10301 10301 40003 10302 10302 3011 -10303 10303 3011 -10304 10304 3011 -10305 10305#10306#10307 3011 +10303 10303 40003 +10304 10304 40003#51 +10305 10305#10306#10307 40003 10306 1035331#1035332#1035333 3011 -10401 10401 3018 -10402 10402 3018 -10403 10403 3018 +10401 10401 40004 +10402 10402 40004 +10403 10403 40004#52 10404 1045331#1045332#1045333 3018 10501 1055331#1055332#1055333 3020 10601 10601 3026 -10602 10602 3026 +10602 10602 40006 10701 10701 3031 10702 10701#10702#10703|10701#10702#10703|10701#10702#10703 3031 -10703 10704 3031 -10704 10704 3031#55007 -10801 10801 3036 -10802 10802 3036 +10703 10704 40007 +10704 10704 40007#55007 +10801 10801 40008 +10802 10802 40008#63 10901 10902#10901#10903 3038 -10902 10904 3038 -10903 10905 3038 -11001 11001 3041 +10902 10904 40009 +10903 10905 40009 +11001 11001 40010 11002 11003#11002#11004 3041 -11101 11101 null -11102 11102 null -11201 11201 null -11202 11202 null -11203 11203 null -11204 11204 null -11205 11205 null -11301 11301 null -11302 11302 null -11303 11303 null -11401 11401 null -11402 11403#11402#11404 55011 -11501 11501 null -11502 11502#11503#11504 null -11503 11505 null +11101 11101 3053 +11102 11102 40011 +11201 11201 40012 +11202 11202 40012 +11203 11203 40012 +11204 11204 40012 +11205 11205 40012#72 +11301 11301 40013 +11302 11302 40013 +11303 11303 40013 +11401 11401 40014#73 +11402 11403#11402#11404 3068#55011 +11501 11501 3073 +11502 11502#11503#11504 3073 +11503 11505 40015#82 20101 50431#50430#50432 3046 20102 50446#50442#50444 3046 20103 50461#50451#50453 3046#10411 diff --git a/conf/server/OptionAddCondition.txt b/conf/server/OptionAddCondition.txt index 337d419d7..b5bf3c986 100644 --- a/conf/server/OptionAddCondition.txt +++ b/conf/server/OptionAddCondition.txt @@ -18,6 +18,7 @@ int int mut,int#int,2 10001 2 14#40000 10201 2 1521#10|1522#10 10301 2 14#50000 +10302 6 0#4#4 10701 2 14#100000 10702 2 14#200000 10901 6 0#10#6 diff --git a/conf/server/OptionConfig.txt b/conf/server/OptionConfig.txt index dc51af15e..b56263080 100644 --- a/conf/server/OptionConfig.txt +++ b/conf/server/OptionConfig.txt @@ -132,7 +132,7 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2 101078 0 9 2 null 4 null 101079 0 0 null null 1 101041 101080 0 9 2 null 4 null -101081 0 6 2 null 1 101042 +101081 0 6 2 null 1 101055 101082 0 9 2 null 4 null 101083 0 0 null null 1 101043 101084 0 9 2 null 4 null @@ -153,28 +153,30 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2 101099 0 15 101010 40001 4 null 101100 0 15 101011 40001 4 null 101101 0 15 101012 40001 4 null +101102 0 0 null null 1 101042 +101103 0 9 2 null 4 null 102001 0 0 null null 1 102002 -102002 0 0 null null 1 102011 +102002 0 0 null null 1 102082 102003 0 0 null null 1 102003 -102004 0 0 null null 4 102011 +102004 0 0 null null 4 102082 102005 0 0 null null 1 102004 -102006 0 0 null null 1 102011 +102006 0 0 null null 1 102082 102007 0 0 null null 1 102005 -102008 0 0 null null 1 102011 +102008 0 0 null null 1 102082 102009 0 0 null null 1 102006 -102010 0 0 null null 1 102011 +102010 0 0 null null 1 102082 102011 0 0 null null 1 102007 -102012 0 0 null null 1 102011 +102012 0 0 null null 1 102082 102013 0 0 null null 1 102008 -102014 0 0 null null 1 102011 +102014 0 0 null null 1 102082 102015 0 0 null null 1 102009 -102016 0 0 null null 1 102011 +102016 0 0 null null 1 102082 102017 0 0 null null 1 102010 -102018 0 0 null null 1 102011 +102018 0 0 null null 1 102082 102019 0 0 null null 1 102011 -102020 0 0 null null 1 102011 -102021 0 1 10201 null 1 102012 -102022 0 32 10201#102001|102#11#16#102002 null 4 null +102020 0 0 null null 1 102082 +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 102025 0 0 null null 1 102014 @@ -201,7 +203,7 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2 102046 0 0 null null 1 102025 102047 0 0 null null 1 102025 102048 0 0 null null 1 102025 -102049 0 1 10203 null 1 102026 +102049 0 0 null null 1 102085 102050 0 0 null null 4 null 102051 0 0 null null 1 102027 102052 0 0 null null 1 102041 @@ -237,7 +239,7 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2 102082 0 0 null null 1 102061 102083 0 0 null null 1 102043 102084 0 0 null null 1 102045 -102085 0 0 null null 1 102044 +102085 0 0 null null 1 102086 102086 0 0 null null 1 102045 102087 0 0 null null 1 102045 102088 0 0 null null 1 102045 @@ -261,7 +263,7 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2 102106 0 35 102002|102#3#4#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 102056 +102109 0 2 1520#1 null 1 102087 102110 0 36 102003|1520#1 null 4 null 102111 0 0 null null 1 102057 102112 0 9 3 null 4 null @@ -309,6 +311,19 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2 102154 0 15 102006 55002 4 null 102155 0 15 102007 55002 4 null 102156 0 15 102008 55002 4 null +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 +102161 0 0 null null 1 102012 +102162 0 35 102001|102#11#16#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 +0 0 0 null null 0 null 103001 0 0 null null 1 103002 103002 0 0 null null 1 103006 103003 0 0 null null 1 103003 @@ -322,23 +337,23 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2 103011 0 1 10301 null 1 103007 103012 0 0 null null 4 null 103013 0 0 null null 1 103008 -103014 0 35 103001|103#6#4#103002 null 4 null +103014 0 11 4|103#6#4#103002 null 6 103070 103015 0 0 null null 1 103009 -103016 0 35 103001|103#6#4#103002 null 4 null +103016 0 11 4|103#6#4#103002 null 6 103070 103017 0 0 null null 1 103010 -103018 0 35 103001|103#6#4#103002 null 4 null +103018 0 11 4|103#6#4#103002 null 6 103070 103019 0 0 null null 1 103011 -103020 0 35 103001|103#6#4#103002 null 4 null +103020 0 11 4|103#6#4#103002 null 6 103070 103021 0 0 null null 1 103012 -103022 0 35 103001|103#6#4#103002 null 4 null +103022 0 11 4|103#6#4#103002 null 6 103070 103023 0 0 null null 1 103013 -103024 0 35 103001|103#6#4#103002 null 4 null +103024 0 11 4|103#6#4#103002 null 6 103070 103025 0 0 null null 1 103014 -103026 0 35 103001|103#6#4#103002 null 4 null +103026 0 11 4|103#6#4#103002 null 6 103070 103027 0 0 null null 1 103015 -103028 0 35 103001|103#6#4#103002 null 4 null -103029 0 35 103001|103#6#4#103002 null 4 null -103030 0 35 103001|103#6#4#103002 null 4 null +103028 0 11 4|103#6#4#103002 null 6 103070 +103029 0 11 4|103#6#4#103002 null 6 103070 +103030 0 11 4|103#6#4#103002 null 6 103070 103031 0 0 null null 1 103017 103032 0 0 null null 1 103017 103033 0 1 10302 null 1 103018 @@ -439,9 +454,13 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2 103128 0 9 4 null 4 null 103129 0 9 4 null 4 null 103130 0 9 4 null 4 null -103131 0 15 103008 40003 4 null -103132 0 15 103009 40003 4 null -103133 0 15 103010 40003 4 null +103131 0 15 103008 40003#51 4 null +103132 0 15 103009 40003#51 4 null +103133 0 15 103010 40003#51 4 null +103134 0 0 null null 1 103071 +103135 0 0 null null 1 103071 +103136 10302 0 null null 1 103047 +103137 0 0 null null 4 null 104001 0 0 null null 1 104002 104002 0 0 null null 1 104004 104003 0 0 null null 1 104003 @@ -521,9 +540,9 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2 104077 0 35 104005|104#8#9#104001 null 4 null 104078 0 35 104005|104#8#9#104001 null 4 null 104079 0 35 104005|104#8#9#104001 null 4 null -104080 0 15 104007 40004 4 null -104081 0 15 104008 40004 4 null -104082 0 15 104009 40004 4 null +104080 0 15 104007 40004#52 4 null +104081 0 15 104008 40004#52 4 null +104082 0 15 104009 40004#52 4 null 105001 0 0 null null 1 105002 105002 0 11 105001|105#16#19#105002|105#15#25#105002|105#16#23#105003|105#18#11#105004 null 6 105061 105003 0 0 null null 1 105003 @@ -650,9 +669,9 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2 105124 0 0 null null 1 105063 105125 0 0 null null 1 105020 105126 0 0 null null 6 105062 -105127 0 15 105008 40005 4 null -105128 0 15 105009 40005 4 null -105129 0 15 105010 40005 4 null +105127 0 15 105008 40005#61 4 null +105128 0 15 105009 40005#61 4 null +105129 0 15 105010 40005#61 4 null 106001 0 0 null null 1 106002 106002 0 35 106001|106#11#3#106002 null 4 null 106003 0 0 null null 1 106003 @@ -755,11 +774,11 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2 106100 0 9 7 null 4 null 106101 0 9 7 null 4 null 106102 0 9 7 null 4 null -106103 0 15 106009 40006 4 null -106104 0 15 106010 40006 4 null -106105 0 15 106011 40006 4 null -106106 0 15 106012 40006 4 null -106107 0 15 106013 40006 4 null +106103 0 15 106009 40006#61 4 null +106104 0 15 106010 40006#61 4 null +106105 0 15 106011 40006#61 4 null +106106 0 15 106012 40006#61 4 null +106107 0 15 106013 40006#61 4 null 107001 0 0 null null 1 107002 107002 0 35 107001|107#2#10#107002 null 4 null 107003 0 0 null null 1 107003 @@ -876,9 +895,9 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2 107114 0 9 8 null 4 null 107115 0 9 8 null 4 null 107116 0 9 8 null 4 null -107117 0 15 107007 40007 4 null -107118 0 15 107008 40007 4 null -107119 0 15 107009 40007 4 null +107117 0 15 107007 40007#62 4 null +107118 0 15 107008 40007#62 4 null +107119 0 15 107009 40007#62 4 null 108001 0 0 null null 1 108002 108002 0 35 108001|108#9#13#108002 null 4 null 108003 0 0 null null 1 108003 @@ -953,9 +972,9 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2 108072 0 9 9 null 4 null 108073 0 9 9 null 4 null 108074 0 9 9 null 4 null -108075 0 15 108005 40008 4 null -108076 0 15 108006 40008 4 null -108077 0 15 108007 40008 4 null +108075 0 15 108005 40008#63 4 null +108076 0 15 108006 40008#63 4 null +108077 0 15 108007 40008#63 4 null 109001 0 0 null null 1 109002 109002 0 35 109001|109#3#17#109002 null 4 null 109003 0 35 109001|109#3#17#109002 null 4 null @@ -1026,9 +1045,9 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2 109068 0 18 10#10903#109008 null 4 null 109069 0 18 10#10903#109009 null 4 null 109070 0 18 10#10903#109009 null 4 null -109071 0 15 109010 40009 4 null -109072 0 15 109011 40009 4 null -109073 0 15 109012 40009 4 null +109071 0 15 109010 40009#71 4 null +109072 0 15 109011 40009#71 4 null +109073 0 15 109012 40009#71 4 null 110001 0 0 null null 1 110002 110002 0 35 110001|110#8#7#110002 null 4 null 110003 0 0 null null 1 110003 @@ -1115,7 +1134,7 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2 110084 0 10 11002#3|110#4#17#110006|110#5#19#110006|110#8#13#110006 null 6 110046 110085 0 0 null null 1 110044 110086 0 10 11002#3|110#4#17#110006|110#5#19#110006|110#8#13#110006 null 6 110046 -110087 0 0 null null 6 110045 +110087 0 0 null null 1 110045 110088 0 10 11002#3|110#4#17#110006|110#5#19#110006|110#8#13#110006 null 6 110046 110089 0 10 11002#3|110#4#17#110006|110#5#19#110006|110#8#13#110006 null 6 110046 110090 0 10 11002#3|110#4#17#110006|110#5#19#110006|110#8#13#110006 null 6 110046 @@ -1139,9 +1158,9 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2 110108 0 0 null null 4 null 110109 0 9 11 null 4 null 110110 0 9 11 null 4 null -110111 0 15 110007 40010 4 null -110112 0 15 110008 40010 4 null -110113 0 15 110009 40010 4 null +110111 0 15 110007 40010#71 4 null +110112 0 15 110008 40010#71 4 null +110113 0 15 110009 40010#71 4 null 111001 0 0 null null 1 111002 111002 0 11 12|111#7#4#111002|111#5#15#111003|111#10#9#111004 null 6 111038 111003 0 0 null null 1 111003 @@ -1182,7 +1201,7 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2 111038 0 0 null null 4 null 111039 0 0 null null 1 111021 111040 0 0 null null 1 111021 -111041 0 0 null null 1 111022 +111041 0 6 1 null 1 111022 111042 0 0 null null 4 null 111043 0 0 null null 6 111023 111044 0 35 111004|111#13#10#111005 null 4 null @@ -1226,9 +1245,9 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2 111082 0 9 12 null 4 null 111083 0 9 12 null 4 null 111084 0 9 12 null 4 null -111085 0 15 111007 40011 4 null -111086 0 15 111008 40011 4 null -111087 0 15 111009 40011 4 null +111085 0 15 111007 40011#72 4 null +111086 0 15 111008 40011#72 4 null +111087 0 15 111009 40011#72 4 null 112001 0 0 null null 1 112002 112002 0 17 13#112001|112#6#14#112002 null 4 null 112003 0 0 null null 1 112003 @@ -1305,10 +1324,10 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2 112074 0 9 13 null 4 null 112075 0 9 13 null 4 null 112076 0 9 13 null 4 null -112077 0 15 112008 40012 4 null -112078 0 15 112009 40012 4 null -112079 0 15 112010 40012 4 null -112080 0 15 112011 40012 4 null +112077 0 15 112008 40012#72 4 null +112078 0 15 112009 40012#72 4 null +112079 0 15 112010 40012#72 4 null +112080 0 15 112011 40012#72 4 null 113001 0 0 null null 1 113002 113002 0 0 null null 1 113003 113003 0 0 null null 1 113003 @@ -1389,9 +1408,9 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2 113078 0 9 14 null 4 null 113079 0 9 14 null 4 null 113080 0 9 14 null 4 null -113081 0 15 113004 40013 4 null -113082 0 15 113005 40013 4 null -113083 0 15 113006 40013 4 null +113081 0 15 113004 40013#73 4 null +113082 0 15 113005 40013#73 4 null +113083 0 15 113006 40013#73 4 null 113084 0 0 null null 1 113014 113085 0 0 null null 1 113015 113086 0 0 null null 1 113024 @@ -1482,9 +1501,9 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2 114082 0 9 15 null 4 null 114083 0 9 15 null 4 null 114084 0 9 15 null 4 null -114085 0 15 114004 40014 4 null -114086 0 15 114005 40014 4 null -114087 0 15 114006 40014 4 null +114085 0 15 114004 40014#73 4 null +114086 0 15 114005 40014#73 4 null +114087 0 15 114006 40014#73 4 null 115001 0 0 null null 1 115002 115002 0 11 16|115#7#16#115002 null 6 115045 115003 0 0 null null 1 115003 @@ -1591,10 +1610,10 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2 115104 0 9 16 null 4 null 115105 0 9 16 null 4 null 115106 0 9 16 null 4 null -115107 0 15 115006 40015 4 null -115108 0 15 115007 40015 4 null -115109 0 15 115008 40015 4 null -115110 0 15 115009 40015 4 null +115107 0 15 115006 40015#81 4 null +115108 0 15 115007 40015#81 4 null +115109 0 15 115008 40015#82 4 null +115110 0 15 115009 40015#81 4 null 201001 0 0 null null 1 201002 201002 0 0 null null 1 201002 201003 0 32 201007#201001|201#6#6#201002 null 4 null diff --git a/conf/server/PrivilegeTypeConfig.txt b/conf/server/PrivilegeTypeConfig.txt index fdc654cb4..7d0b20966 100644 --- a/conf/server/PrivilegeTypeConfig.txt +++ b/conf/server/PrivilegeTypeConfig.txt @@ -1,22 +1,22 @@ -Id Type RefreshType MaxTimes -int int mut,int#int,1 int -1 0 3#0 99 -2 0 3#0 99 -3 0 3#0 99 -4 0 1#0 99 -5 0 1#0 99 -6 0 1#0 99 -7 0 1#0 99 -8 0 3#0 99 -9 0 3#0 99 -10 0 1#0 99 -11 0 1#0 99 -12 0 1#0 99 -501 1 3#0 0 -502 1 3#0 0 -503 1 3#0 0 -504 1 3#0 0 -505 1 3#0 0 -506 1 3#0 0 -507 1 3#0 0 -508 1 3#0 0 +Id Type RefreshType IfFloat MaxTimes +int int mut,int#int,1 int int +1 0 3#0 2 99 +2 0 3#0 2 99 +3 0 3#0 2 99 +4 0 1#0 1 99 +5 0 1#0 1 99 +6 0 1#0 1 99 +7 0 1#0 1 99 +8 0 3#0 1 99 +9 0 3#0 1 99 +10 0 1#0 1 99 +11 0 1#0 1 99 +12 0 1#0 1 99 +13 0 3#0 1 3 +14 0 1#0 1 99 +15 0 1#0 1 99 +501 1 3#0 1 0 +502 1 3#0 1 0 +503 1 3#0 1 0 +504 1 3#0 1 0 +505 1 3#0 1 0 diff --git a/conf/server/RewardGroup.txt b/conf/server/RewardGroup.txt index a53b7e619..4966cf0da 100644 --- a/conf/server/RewardGroup.txt +++ b/conf/server/RewardGroup.txt @@ -826,4 +826,49 @@ int int mut,int#int,1 int int 101006 1 25050 1 0 102006 1 25050 1 0 100000 2 25050 1 0 -0 0 null 0 0 +200103 2 100101#100102#100103#100104#100105#100106#100107#100108#100109#100110#100111#100112#100113#100114#100115#100116#100117#100118#100119#100120#100121#100122#100123#100124#100125#100126#100127#100128#100129#100130#100131#100132#100133#100134#100135#100136#100137#100138#100139#100140 1 0 +200405 2 100401#100402#100403#100404#100405#100406#100407#100408#100409#100410#100411#100412#100413#100414#100415#100416#100417#100418#100419#100420#100421#100422#100423#100424#100425#100426#100427#100428#100429#100430#100431#100432#100433#100434#100435#100436#100437#100438#100439#100440#100441#100442#100443#100444#100445#100446#100447#100448#100449#100450#100451#100452#100453#100454#100455#100456#100457#100458#100459#100460#100461#100462#100463 1 0 +200608 2 100601#100602#100603#100604#100605#100606#100607#100608#100609#100610#100611#100612#100613#100614#100615#100616#100617#100618#100619#100620#100621#100622#100623#100624#100625#100626#100627#100628#100629#100630#100631#100632#100633#100634#100635#100636#100637#100638#100639#100640 1 0 +210101 1 210101#220101#230101 3 0 +210102 1 210102#220102#230102 3 0 +210103 1 210103#220103#230103 3 0 +210201 1 210201#220201#230201 3 0 +210202 1 210202#220202#230202 3 0 +210203 1 210203#220203#230203 3 0 +210301 1 210301#220301#230301 3 0 +210302 1 210302#220302#230302 3 0 +210303 1 210303#220303#230303 3 0 +210401 1 210401#220401#230401 3 0 +210402 1 210402#220402#230402 3 0 +210403 1 210403#220403#230403 3 0 +210501 1 210501#220501#230501 3 0 +210502 1 210502#220502#230502 3 0 +210503 1 210503#220503#230503 3 0 +210601 1 210601#220601#230601 3 0 +210602 1 210602#220602#230602 3 0 +210603 1 210603#220603#230603 3 0 +210701 1 210701#220701#230701 3 0 +210702 1 210702#220702#230702 3 0 +210703 1 210703#220703#230703 3 0 +210801 1 210801#220801#230801 3 0 +210802 1 210802#220802#230802 3 0 +210803 1 210803#220803#230803 3 0 +300001 1 300001#400001#500001 3 0 +300002 1 300002#400002#500002 3 0 +300003 1 300003#400003#500003 3 0 +300004 1 300004#400004#500004 3 0 +300005 1 300005#400005#500005 3 0 +300006 1 300006#400006#500006 3 0 +300007 1 300007#400007#500007 3 0 +300008 1 300008#400008#500008 3 0 +300009 1 300009#400009#500009 3 0 +300010 1 300010#400010#500010 3 0 +300011 1 300011#400011#500011 3 0 +300021 1 300021#400021#500021 3 0 +300041 1 300041#400041#500041 3 0 +300051 1 300051#400051#500051 3 0 +300081 1 300081#400081#500081 3 0 +300101 1 300101#400101#500101 3 0 +300301 1 300301#400301#500301 3 0 +300501 1 300501#400501#500501 3 0 +301001 1 301001#401001#501001 3 0 diff --git a/conf/server/RewardItemConfig.txt b/conf/server/RewardItemConfig.txt index f36daa16d..fba009dc8 100644 --- a/conf/server/RewardItemConfig.txt +++ b/conf/server/RewardItemConfig.txt @@ -2380,4 +2380,275 @@ int int int float int int 85206 4 998611111 1.0 0 0 85207 4 998611111 1.0 0 0 85208 4 998611111 1.0 0 0 -0 0 0 0 0 0 +100401 11001 83 1.0 1 1 +100402 11002 83 1.0 1 1 +100403 11003 83 1.0 1 1 +100404 11004 83 1.0 1 1 +100405 11005 83 1.0 1 1 +100406 11006 83 1.0 1 1 +100407 11007 83 1.0 1 1 +100408 11008 83 1.0 1 1 +100409 11009 83 1.0 1 1 +100410 11010 83 1.0 1 1 +100411 11011 83 1.0 1 1 +100412 11012 83 1.0 1 1 +100413 11013 83 1.0 1 1 +100414 11014 83 1.0 1 1 +100415 11015 83 1.0 1 1 +100416 11016 83 1.0 1 1 +100417 11017 83 1.0 1 1 +100418 11018 83 1.0 1 1 +100419 11019 83 1.0 1 1 +100420 11020 83 1.0 1 1 +100421 11021 83 1.0 1 1 +100422 11022 83 1.0 1 1 +100423 11023 83 1.0 1 1 +100424 11024 330 1.0 1 1 +100425 11025 330 1.0 1 1 +100426 11026 330 1.0 1 1 +100427 11027 330 1.0 1 1 +100428 11028 330 1.0 1 1 +100429 11029 330 1.0 1 1 +100430 11030 330 1.0 1 1 +100431 11031 330 1.0 1 1 +100432 11032 330 1.0 1 1 +100433 11033 330 1.0 1 1 +100434 11034 330 1.0 1 1 +100435 11035 330 1.0 1 1 +100436 11036 330 1.0 1 1 +100437 11037 330 1.0 1 1 +100438 11038 330 1.0 1 1 +100439 11039 330 1.0 1 1 +100440 11040 330 1.0 1 1 +100441 11041 330 1.0 1 1 +100442 11042 330 1.0 1 1 +100443 11043 330 1.0 1 1 +100444 11044 330 1.0 1 1 +100445 11045 330 1.0 1 1 +100446 11046 330 1.0 1 1 +100447 6001 44 1.0 1 1 +100448 6002 44 1.0 1 1 +100449 6003 44 1.0 1 1 +100450 6004 44 1.0 1 1 +100451 6005 44 1.0 1 1 +100452 6006 44 1.0 1 1 +100453 6007 44 1.0 1 1 +100454 6008 44 1.0 1 1 +100455 6009 44 1.0 1 1 +100456 6013 13 1.0 1 1 +100457 6014 13 1.0 1 1 +100458 6015 13 1.0 1 1 +100459 6016 13 1.0 1 1 +100460 6017 13 1.0 1 1 +100461 6018 13 1.0 1 1 +100462 6019 13 1.0 1 1 +100463 6020 13 1.0 1 1 +100101 11024 413 1.0 1 1 +100102 11025 413 1.0 1 1 +100103 11026 413 1.0 1 1 +100104 11027 413 1.0 1 1 +100105 11028 413 1.0 1 1 +100106 11029 413 1.0 1 1 +100107 11030 413 1.0 1 1 +100108 11031 413 1.0 1 1 +100109 11032 413 1.0 1 1 +100110 11033 413 1.0 1 1 +100111 11034 413 1.0 1 1 +100112 11035 413 1.0 1 1 +100113 11036 413 1.0 1 1 +100114 11037 413 1.0 1 1 +100115 11038 413 1.0 1 1 +100116 11039 413 1.0 1 1 +100117 11040 413 1.0 1 1 +100118 11041 413 1.0 1 1 +100119 11042 413 1.0 1 1 +100120 11043 413 1.0 1 1 +100121 11044 413 1.0 1 1 +100122 11045 413 1.0 1 1 +100123 11046 413 1.0 1 1 +100124 6001 44 1.0 1 1 +100125 6002 44 1.0 1 1 +100126 6003 44 1.0 1 1 +100127 6004 44 1.0 1 1 +100128 6005 44 1.0 1 1 +100129 6006 44 1.0 1 1 +100130 6007 44 1.0 1 1 +100131 6008 44 1.0 1 1 +100132 6009 44 1.0 1 1 +100133 6013 13 1.0 1 1 +100134 6014 13 1.0 1 1 +100135 6015 13 1.0 1 1 +100136 6016 13 1.0 1 1 +100137 6017 13 1.0 1 1 +100138 6018 13 1.0 1 1 +100139 6019 13 1.0 1 1 +100140 6020 13 1.0 1 1 +100601 11001 391 1.0 1 1 +100602 11002 391 1.0 1 1 +100603 11003 391 1.0 1 1 +100604 11004 391 1.0 1 1 +100605 11005 391 1.0 1 1 +100606 11006 391 1.0 1 1 +100607 11007 391 1.0 1 1 +100608 11008 391 1.0 1 1 +100609 11009 391 1.0 1 1 +100610 11010 391 1.0 1 1 +100611 11011 391 1.0 1 1 +100612 11012 391 1.0 1 1 +100613 11013 391 1.0 1 1 +100614 11014 391 1.0 1 1 +100615 11015 391 1.0 1 1 +100616 11016 391 1.0 1 1 +100617 11017 391 1.0 1 1 +100618 11018 391 1.0 1 1 +100619 11019 391 1.0 1 1 +100620 11020 391 1.0 1 1 +100621 11021 391 1.0 1 1 +100622 11022 391 1.0 1 1 +100623 11023 391 1.0 1 1 +100624 6001 89 1.0 1 1 +100625 6002 89 1.0 1 1 +100626 6003 89 1.0 1 1 +100627 6004 89 1.0 1 1 +100628 6005 89 1.0 1 1 +100629 6006 89 1.0 1 1 +100630 6007 89 1.0 1 1 +100631 6008 89 1.0 1 1 +100632 6009 89 1.0 1 1 +100633 6013 25 1.0 1 1 +100634 6014 25 1.0 1 1 +100635 6015 25 1.0 1 1 +100636 6016 25 1.0 1 1 +100637 6017 25 1.0 1 1 +100638 6018 25 1.0 1 1 +100639 6019 25 1.0 1 1 +100640 6020 25 1.0 1 1 +210101 3 100 1.0 1300 10000 +210102 3 100 1.0 1700 1700 +210103 3 100 1.0 2300 2300 +210201 3 100 1.0 2400 2400 +210202 3 100 1.0 2800 2800 +210203 3 100 1.0 3400 3400 +210301 3 100 1.0 3500 3500 +210302 3 100 1.0 3900 3900 +210303 3 100 1.0 4500 4500 +210401 3 100 1.0 4600 4600 +210402 3 100 1.0 5000 5000 +210403 3 100 1.0 5600 5600 +210501 3 100 1.0 5700 5700 +210502 3 100 1.0 6100 6100 +210503 3 100 1.0 6700 6700 +210601 3 100 1.0 6800 6800 +210602 3 100 1.0 7200 7200 +210603 3 100 1.0 7800 7800 +210701 3 100 1.0 7900 7900 +210702 3 100 1.0 8300 8300 +210703 3 100 1.0 8900 8900 +210801 3 100 1.0 9000 9000 +210802 3 100 1.0 9400 9400 +210803 3 100 1.0 10000 10000 +220101 4 100 1.0 130 130 +220102 4 100 1.0 170 170 +220103 4 100 1.0 230 230 +220201 4 100 1.0 240 240 +220202 4 100 1.0 280 280 +220203 4 100 1.0 340 340 +220301 4 100 1.0 350 350 +220302 4 100 1.0 390 390 +220303 4 100 1.0 450 450 +220401 4 100 1.0 460 460 +220402 4 100 1.0 500 500 +220403 4 100 1.0 560 560 +220501 4 100 1.0 570 570 +220502 4 100 1.0 610 610 +220503 4 100 1.0 670 670 +220601 4 100 1.0 680 680 +220602 4 100 1.0 720 720 +220603 4 100 1.0 780 780 +220701 4 100 1.0 790 790 +220702 4 100 1.0 830 830 +220703 4 100 1.0 890 890 +220801 4 100 1.0 900 900 +220802 4 100 1.0 940 940 +220803 4 100 1.0 1000 1000 +230101 29 100 1.0 50 50 +230102 29 100 1.0 60 60 +230103 29 100 1.0 80 80 +230201 29 100 1.0 60 60 +230202 29 100 1.0 70 70 +230203 29 100 1.0 90 90 +230301 29 100 1.0 70 70 +230302 29 100 1.0 80 80 +230303 29 100 1.0 100 100 +230401 29 100 1.0 80 80 +230402 29 100 1.0 90 90 +230403 29 100 1.0 110 110 +230501 29 100 1.0 90 90 +230502 29 100 1.0 100 100 +230503 29 100 1.0 120 120 +230601 29 100 1.0 100 100 +230602 29 100 1.0 110 110 +230603 29 100 1.0 130 130 +230701 29 100 1.0 110 110 +230702 29 100 1.0 120 120 +230703 29 100 1.0 140 140 +230801 29 100 1.0 120 120 +230802 29 100 1.0 130 130 +230803 29 100 1.0 150 150 +300001 14 100 1.0 300000 300000 +300002 14 100 1.0 250000 250000 +300003 14 100 1.0 220000 220000 +300004 14 100 1.0 210000 210000 +300005 14 100 1.0 200000 200000 +300006 14 100 1.0 190000 190000 +300007 14 100 1.0 180000 180000 +300008 14 100 1.0 170000 170000 +300009 14 100 1.0 160000 160000 +300010 14 100 1.0 150000 150000 +300011 14 100 1.0 140000 140000 +300021 14 100 1.0 120000 120000 +300041 14 100 1.0 100000 100000 +300051 14 100 1.0 80000 80000 +300081 14 100 1.0 60000 60000 +300101 14 100 1.0 40000 40000 +300301 14 100 1.0 30000 30000 +300501 14 100 1.0 20000 20000 +301001 14 100 1.0 10000 10000 +400001 16 100 1.0 900 900 +400002 16 100 1.0 700 700 +400003 16 100 1.0 600 600 +400004 16 100 1.0 550 550 +400005 16 100 1.0 500 500 +400006 16 100 1.0 450 450 +400007 16 100 1.0 400 400 +400008 16 100 1.0 350 350 +400009 16 100 1.0 300 300 +400010 16 100 1.0 250 250 +400011 16 100 1.0 230 230 +400021 16 100 1.0 210 210 +400041 16 100 1.0 190 190 +400051 16 100 1.0 170 170 +400081 16 100 1.0 150 150 +400101 16 100 1.0 130 130 +400301 16 100 1.0 110 110 +400501 16 100 1.0 90 90 +401001 16 100 1.0 70 70 +500001 29 100 1.0 250 250 +500002 29 100 1.0 220 220 +500003 29 100 1.0 200 200 +500004 29 100 1.0 185 185 +500005 29 100 1.0 170 170 +500006 29 100 1.0 160 160 +500007 29 100 1.0 150 150 +500008 29 100 1.0 140 140 +500009 29 100 1.0 130 130 +500010 29 100 1.0 120 120 +500011 29 100 1.0 115 115 +500021 29 100 1.0 110 110 +500041 29 100 1.0 105 105 +500051 29 100 1.0 100 100 +500081 29 100 1.0 95 95 +500101 29 100 1.0 90 90 +500301 29 100 1.0 85 85 +500501 29 100 1.0 80 80 +501001 29 100 1.0 75 75 diff --git a/conf/server/TaskConfig.txt b/conf/server/TaskConfig.txt index 14afec0ec..a11d11685 100644 --- a/conf/server/TaskConfig.txt +++ b/conf/server/TaskConfig.txt @@ -1,74 +1,74 @@ Id TaskType TaskValue Reward Jump int int mut,int#int,1 mut,int#int,2 mut,int#int,1 -1100 1 0#50 4#1000 null -2600 1 0#150 4#1001 null -4800 1 0#50 4#1002 null -6300 1 0#150 4#1003 null -1400 2 5#5 4#1004 null -5100 2 5#5 4#1005 null -100 3 15#1 4#1006 null -3800 3 0#15 4#1007 null -500 3 40#5 4#1008 null -1000 3 60#5 4#1009 null -1900 3 80#5 4#1010 null -3100 3 100#10 4#1011 null -4200 3 40#5 4#1012 null -4700 3 60#5 4#1013 null -5600 3 80#5 4#1014 null -6800 3 100#10 4#1015 null -1300 4 0#1 4#1016 null -2900 4 0#5 4#1017 null -5000 4 0#1 4#1000 null -6600 4 0#5 4#1001 null -2500 6 0#80000 4#1002 null -3700 6 0#150000 4#1003 null -6200 6 0#80000 4#1004 null -800 7 0#20 4#1005 null -4500 7 0#20 4#1006 null -2200 8 0#1500 4#1007 null -3500 8 0#3000 4#1008 null -5900 8 0#1500 4#1009 null -7200 8 0#3000 4#1010 null -2100 9 0#90 4#1011 null -5800 9 0#90 4#1012 null -300 10 0#10000 4#1013 null -700 10 0#30000 4#1014 null -1700 10 0#100000 4#1015 null -3200 10 0#200000 4#1016 null -4000 10 0#10000 4#1017 null -4400 10 0#30000 4#1017 null -5400 10 0#100000 4#1000 -6900 10 0#200000 4#1001 null -1600 12 0#5 4#1002 null -3000 12 0#15 4#1003 null -5300 12 0#5 4#1004 null -6700 12 0#15 4#1005 null -400 13 2#6 4#1006 null -1800 13 3#12 4#1007 null -2300 13 4#15 4#1008 null -2800 13 5#15 4#1009 null -4100 13 2#6 4#1010 null -5500 13 3#12 4#1011 null -6000 13 4#15 4#1012 null -6500 13 5#15 4#1013 null -200 15 102#1 4#1014 null -2400 15 215#1 4#1015 null -3900 15 102#1 4#1016 null -6100 15 215#1 4#1017 null -600 16 202#1 4#1000 null -1200 16 203#1 4#1001 null -2000 16 206#1 4#1002 null -3400 16 209#1 4#1003 null -4300 16 202#1 4#1004 null -4900 16 203#1 4#1005 null -5700 16 206#1 4#1006 null -7100 16 209#1 4#1007 null -1500 17 0#8 4#1008 null -2700 17 0#50 4#1009 null -5200 17 0#8 4#1010 null -6400 17 0#50 4#1011 null -3600 18 0#300 4#1012 null -900 19 5000#1 4#1013 null -3300 19 10000#8 4#1014 null -4600 19 5000#1 4#1015 null -7000 19 10000#8 4#1016 +10103 1 0#50 4#1000 1001 +10106 1 0#150 4#1001 1001 +10111 1 0#50 4#1002 1001 +10114 1 0#150 4#1003 1001 +10204 2 5#5 4#1004 1001 +10211 2 5#5 4#1005 1001 +10301 3 15#1 4#1006 22001 +10309 3 0#15 4#1007 22001 +10302 3 40#5 4#1008 22001 +10303 3 60#5 4#1009 22001 +10305 3 80#5 4#1010 22001 +10307 3 100#10 4#1011 22001 +10309 3 40#5 4#1012 22001 +10310 3 60#5 4#1013 22001 +10312 3 80#5 4#1014 22001 +10315 3 100#10 4#1015 22001 +10404 4 0#1 4#1016 3001 +10407 4 0#5 4#1017 3001 +10411 4 0#1 4#1000 3001 +10414 4 0#5 4#1001 3001 +10606 6 0#80000 4#1002 3001 +10608 6 0#150000 4#1003 3001 +10613 6 0#80000 4#1004 3001 +10703 7 0#20 4#1005 8001 +10710 7 0#20 4#1006 8001 +10805 8 0#1500 4#1007 8001 +10808 8 0#3000 4#1008 8001 +10813 8 0#1500 4#1009 8001 +10815 8 0#3000 4#1010 8001 +10905 9 0#90 4#1011 2001 +10913 9 0#90 4#1012 2001 +11001 10 0#10000 4#1013 2001 +11002 10 0#30000 4#1014 2001 +11004 10 0#100000 4#1015 2001 +11007 10 0#200000 4#1016 2001 +11009 10 0#10000 4#1017 2001 +11010 10 0#30000 4#1017 2001 +11012 10 0#100000 4#1000 2001 +11015 10 0#200000 4#1001 2001 +11204 12 0#5 4#1002 5001 +11207 12 0#15 4#1003 5001 +11212 12 0#5 4#1004 5001 +11214 12 0#15 4#1005 5001 +11302 13 2#6 4#1006 18001 +11305 13 3#12 4#1007 18001 +11306 13 4#15 4#1008 18001 +11307 13 5#15 4#1009 18001 +11309 13 2#6 4#1010 18001 +11312 13 3#12 4#1011 18001 +11313 13 4#15 4#1012 18001 +11314 13 5#15 4#1013 18001 +11401 15 102#1 4#1014 17001 +11406 15 215#1 4#1015 17001 +11409 15 102#1 4#1016 17001 +11413 15 215#1 4#1017 17001 +11602 16 202#1 4#1000 17001 +11603 16 203#1 4#1001 17001 +11605 16 206#1 4#1002 17001 +11608 16 209#1 4#1003 17001 +11610 16 202#1 4#1004 17001 +11611 16 203#1 4#1005 17001 +11612 16 206#1 4#1006 17001 +11615 16 209#1 4#1007 17001 +11704 17 0#8 4#1008 7001 +11706 17 0#50 4#1009 7001 +11711 17 0#8 4#1010 7001 +11714 17 0#50 4#1011 7001 +11808 18 0#300 4#1012 21001 +11903 19 5000#1 4#1013 18001 +11908 19 10000#8 4#1014 18001 +11910 19 5000#1 4#1015 18001 +11915 19 10000#8 4#1016 18001 diff --git a/conf/server/VipLevelConfig.txt b/conf/server/VipLevelConfig.txt index 7fe01f60b..8a77e2961 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#2|3#3|4#10|5#10|6#20|7#5|8#1|9#10|10#1|11#1|12#1 2#100 6001#1|6002#1 100#200#300 -1 1#10000|2#3|3#3|4#10|5#10|6#30|7#6|8#2|9#11|10#2|11#2|12#2 2#101 6001#1|6002#2 400#500#600#700 -2 1#10000|2#4|3#3|4#10|5#10|6#40|7#7|8#3|9#12|10#3|11#3|12#3 2#102 6001#1|6002#3 800#900#1000#1100#1200 -3 1#10000|2#5|3#3|4#10|5#10|6#50|7#8|8#4|9#13|10#4|11#4|12#4 2#103 6001#1|6002#4 1300#1400#1500#1600#1700 -4 1#10000|2#6|3#3|4#10|5#10|6#60|7#9|8#5|9#14|10#5|11#5|12#5 2#104 6001#1|6002#5 1800#1900#2000#2100#2200 -5 1#10000|2#7|3#3|4#10|5#10|6#70|7#10|8#6|9#15|10#6|11#6|12#6 2#105 6001#1|6002#6 2300#2400#2500#2600#2700 -6 1#10000|2#8|3#3|4#10|5#10|6#80|7#11|8#7|9#16|10#7|11#7|12#7 2#106 6001#1|6002#7 2800#2900#3000#3100#3200 -7 1#10000|2#9|3#3|4#10|5#10|6#90|7#12|8#8|9#17|10#8|11#8|12#8 2#107 6001#1|6002#8 3300#3400#3500#3600#3700 -8 1#10000|2#10|3#3|4#10|5#10|6#100|7#13|8#9|9#18|10#9|11#9|12#9 2#108 6001#1|6002#9 3300#3400#3500#3600#3700 -9 1#10000|2#11|3#3|4#10|5#10|6#110|7#14|8#10|9#19|10#10|11#10|12#10 2#109 6001#1|6002#10 3300#3400#3500#3600#3700 -10 1#10000|2#12|3#3|4#10|5#10|6#120|7#15|8#11|9#20|10#11|11#11|12#11 2#110 6001#1|6002#11 3300#3400#3500#3600#3700 -11 1#10000|2#13|3#3|4#10|5#10|6#130|7#16|8#12|9#21|10#12|11#12|12#12 2#111 6001#1|6002#12 3300#3400#3500#3600#3700 -12 1#10000|2#14|3#3|4#10|5#10|6#140|7#17|8#13|9#22|10#13|11#13|12#13 2#112 6001#1|6002#13 3300#3400#3500#3600#3700 -13 1#10000|2#15|3#3|4#10|5#10|6#150|7#18|8#14|9#23|10#14|11#14|12#14 2#113 6001#1|6002#14 3300#3400#3500#3600#3700 -14 1#10000|2#16|3#3|4#10|5#10|6#160|7#19|8#15|9#24|10#15|11#15|12#15 2#114 6001#1|6002#15 3300#3400#3500#3600#3700 -15 1#10000|2#17|3#3|4#10|5#10|6#170|7#20|8#16|9#25|10#16|11#16|12#16 2#115 6001#1|6002#16 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 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