diff --git a/conf/server/ChallengeMapConfig.txt b/conf/server/ChallengeMapConfig.txt index c6033597f..80ae2e673 100644 --- a/conf/server/ChallengeMapConfig.txt +++ b/conf/server/ChallengeMapConfig.txt @@ -16,18 +16,18 @@ int int mut,int#int,1 int int mut,int#int,1 mut,int#int,1 113 14 15#20 0 0 2013 9#11 114 15 15#20 0 0 2014 6#16 115 16 15#20 0 0 2015 7#6 -201 101 15#20 0 1 3001#3001#3001#3001#3001#3001#3001#3001#3001#10110#2305#700002#700001#700001#700002#700001 14#12 -202 102 15#20 0 1 700001#700002#700001#700002#700001#700002#3006#3006#3006#3006#3006#3006#3006#3006#3006#3006#3006#10211#3006#10212#3006#10213#10110#2305 6#15 -203 103 15#20 0 1 3011#3011#3011#55001#10110#10305#2305#2304#2304 12#15 -204 104 20#15 0 1 2304#700001#2304#700002#3018#3018#3018#3018#3018#3018#3018#10410#3018#10410#10110#10409#2305 7#15 -205 105 15#20 0 1 3020#3020#3020#3020#3020#55003#10110#10411#10110#10411#2305#700003#700004#700003 13#17 -206 106 20#30 0 1 700003#700004#700003#700004#3026#10412#3026#10412#3026#10412#10110#10411#10110#10411#2305 11#17 -207 107 15#20 0 1 700003#700003#700003#700003#700003#700003#700003#700004#3031#3031#3031#3031#3031#3031#3031#10412#3031#10412#10110#10411#10110#10411#10110#10411#10110#10411#10110#10411#2305 5#2 -208 108 20#15 0 1 3036#3036#3036#3036#3036#3036#3036#3036#3036#3036#10110#10413#3036#10412#3036#10412#3036#10412#10110#10413#10412#10412#700004#10412#700003#700004#700003#700003 19#6 -209 109 10#20 0 1 700003#700004#10412#10412#700003#3038#3038#3038#3038#3038#3038#10906#20906#10906#20906#10907#20907 5#20 -210 110 15#20 0 1 700003#700004#10412#3041#3041#3041#3041#3041#3041#10906#20906#10907#20907 13#17 -211 111 15#20 0 1 3011#3011#3011#55001#10110#10305#2305#2304#2304 13#6 -212 112 10#20 0 1 700003#700004#10412#10412#700003#3038#3038#3038#3038#3038#3038#10906#20906#10906#20906#10907#20907 8#8 -213 113 20#15 0 1 2304#700001#2304#700002#3018#3018#3018#3018#3018#3018#3018#10410#3018#10410#10110#10409#2305 4#3 -214 114 20#30 0 1 700003#700004#700003#700004#3026#10412#3026#10412#3026#10412#10110#10411#10110#10411#2305 18#5 -215 115 15#20 0 1 3011#3011#3011#55001#10110#10305#2305#2304#2304 3#9 +201 101 10#15 0 1 null 6#3 +202 102 10#15 0 1 null 6#6 +203 103 10#15 0 1 null 4#8 +204 104 10#15 0 1 null 8#6 +205 105 10#15 0 1 null 2#5 +206 106 10#15 0 1 null 2#2 +207 107 10#15 0 1 null 9#8 +208 108 10#15 0 1 null 4#3 +209 109 10#15 0 1 null 5#5 +210 110 10#15 0 1 null 4#7 +211 111 10#15 0 1 null 5#4 +212 112 10#15 0 1 null 6#11 +213 113 10#15 0 1 null 8#4 +214 114 10#15 0 1 null 3#3 +215 115 10#15 0 1 null 2#13 diff --git a/conf/server/ChallengeMissionConfig.txt b/conf/server/ChallengeMissionConfig.txt index 9b9a156f7..6d7d8cdaa 100644 --- a/conf/server/ChallengeMissionConfig.txt +++ b/conf/server/ChallengeMissionConfig.txt @@ -16,18 +16,18 @@ int int mut,int#int,1 14 2 2013#61 15 3 2014#61 16 5 2015#71 -101 1 null -102 1 null -103 1 null -104 1 null -105 1 null -106 1 null -107 1 null -108 1 null -109 1 null -110 1 null -111 1 null -112 1 null -113 1 null -114 1 null -115 1 null +101 2 null +102 2 null +103 3 null +104 3 null +105 4 null +106 3 null +107 4 null +108 2 null +109 3 null +110 4 null +111 3 null +112 3 null +113 2 null +114 4 null +115 3 null diff --git a/conf/server/EventPointConfig.txt b/conf/server/EventPointConfig.txt index 72eadbeff..10e2a4e9a 100644 --- a/conf/server/EventPointConfig.txt +++ b/conf/server/EventPointConfig.txt @@ -740,6 +740,9 @@ int mut,int#int,1 113041 113081 113042 113082 113043 113083 +113044 113084#113085 +113045 113086#113087 +113046 113088#113089 114001 114001#114002 114002 114003#114004 114003 114005#114006 @@ -843,168 +846,139 @@ int mut,int#int,1 115055 115108 115056 115109 115057 115110 -201001 201001 -201002 201002 -201003 201003 -201004 201004 -201005 201005 -201006 201006 -201007 201001#201002 -201008 201003 -201009 201004#201005 -202001 202001 -202002 202002 -202003 202003 -202004 202004 -202005 202005 -202006 202006 -202007 202001#202002 -202008 202003 -202009 202004#202005 -203001 203001 -203002 203002 -203003 203003 -203004 203004 -203005 203005 -203006 203006 -203007 203001#203002 -203008 203003 -203009 203004#203005 -203010 203006 -203011 203007#203008 -204001 204001 -204002 204002 -204003 204003 -204004 204004 -204005 204005 -204006 204006 -204007 204001#204002 -204008 204003 -204009 204004#204005 -204010 204006 -204011 204007#204008 -205001 205001 -205002 205002 -205003 205003 -205004 205004 -205005 205005 -205006 205006 -205007 205001#205002 -205008 205003 -205009 205004#205005 -205010 205006 -205011 205007#205008 -205012 205009 -205013 205010#205011 -206001 206001 -206002 206002 -206003 206003 -206004 206004 -206005 206005 -206006 206006 -206007 206001#206002 -206008 206003 -206009 206004#206005 -206010 206006 -206011 206007#206008 -207001 207001 -207002 207002 -207003 207003 -207004 207004 -207005 207005 -207006 207006 -207007 207001#207002 -207008 207003 -207009 207004#207005 -207010 207006 -207011 207007#207008 -207012 207009 -207013 207010#207011 -208001 208001 -208002 208002 -208003 208003 -208004 208004 -208005 208005 -208006 208006 -208007 208001#208002 -208008 208003 -208009 208004#208005 -209001 209001 -209002 209002 -209003 209003 -209004 209004 -209005 209005 -209006 209006 -209007 209001#209002 -209008 209003 -209009 209004#209005 -209010 209006 -209011 209007#209008 -210001 210001 -210002 210002 -210003 210003 -210004 210004 -210005 210005 -210006 210006 -210007 210001#210002 -210008 210003 -210009 210004#210005 -210010 210006 -210011 210007#210008 -210012 210009 -210013 210010#210011 -211001 211001 -211002 211002 -211003 211003 -211004 211004 -211005 211005 -211006 211006 -211007 211001#211002 -211008 211003 -211009 211004#211005 -211010 211006 -211011 211007#211008 -212001 212001 -212002 212002 -212003 212003 -212004 212004 -212005 212005 -212006 212006 -212007 212001#212002 -212008 212003 -212009 212004#212005 -212010 212006 -212011 212007#212008 -213001 213001 -213002 213002 -213003 213003 -213004 213004 -213005 213005 -213006 213006 -213007 213001#213002 -213008 213003 -213009 213004#213005 -214001 214001 -214002 214002 -214003 214003 -214004 214004 -214005 214005 -214006 214006 -214007 214001#214002 -214008 214003 -214009 214004#214005 -214010 214006 -214011 214007#214008 -214012 214009 -214013 214010#214011 -215001 215001 -215002 215002 -215003 215003 -215004 215004 -215005 215005 -215006 215006 -215007 215001#215002 -215008 215003 -215009 215004#215005 -215010 215006 -215011 215007#215008 +201001 201001#201002 +201002 201003#201004 +201003 201005#201006 +201004 201007#201008 +201005 201009#201010 +201006 201011#201012 +202001 202001#202002 +202002 202003#202004 +202003 202005#202006 +202004 202007#202008 +202005 202009#202010 +202006 202011#202012 +202007 202013#202014 +203001 203001#203002 +203002 203003#203004 +203003 203005#203006 +203004 203007#203008 +203005 203009#203010 +203006 203011#203012 +203007 203013#203014 +203008 203015#203016 +203009 203017#203018 +204001 204001#204002 +204002 204003#204004 +204003 204005#204006 +204004 204007#204008 +204005 204009#204010 +204006 204011#204012 +204007 204013#204014 +204008 204015#204016 +204009 204017#204018 +205001 205001#205002 +205002 205003#205004 +205003 205005#205006 +205004 205007#205008 +205005 205009#205010 +205006 205011#205012 +205007 205013#205014 +205008 205015#205016 +205009 205017#205018 +205010 205019#205020 +205011 205021#205022 +205012 205023#205024 +206001 206001#206002 +206002 206003#206004 +206003 206005#206006 +206004 206007#206008 +206005 206009#206010 +206006 206011#206012 +206007 206013#206014 +206008 206015#206016 +206009 206017#206018 +207001 207001#207002 +207002 207003#207004 +207003 207005#207006 +207004 207007#207008 +207005 207009#207010 +207006 207011#207012 +207007 207013#207014 +207008 207015#207016 +207009 207017#207018 +207010 207019#207020 +207011 207021#207022 +207012 207023#207024 +208001 208001#208002 +208002 208003#208004 +208003 208005#208006 +208004 208007#208008 +208005 208009#208010 +208006 208011#208012 +209001 209001#209002 +209002 209003#209004 +209003 209005#209006 +209004 209007#209008 +209005 209009#209010 +209006 209011#209012 +209007 209013#209014 +209008 209015#209016 +209009 209017#209018 +210001 210001#210002 +210002 210003#210004 +210003 210005#210006 +210004 210007#210008 +210005 210009#210010 +210006 210011#210012 +210007 210013#210014 +210008 210015#210016 +210009 210017#210018 +210010 210019#210020 +210011 210021#210022 +210012 210023#210024 +211001 211001#211002 +211002 211003#211004 +211003 211005#211006 +211004 211007#211008 +211005 211009#211010 +211006 211011#211012 +211007 211013#211014 +211008 211015#211016 +211009 211017#211018 +212001 212001#212002 +212002 212003#212004 +212003 212005#212006 +212004 212007#212008 +212005 212009#212010 +212006 212011#212012 +212007 212013#212014 +212008 212015#212016 +212009 212017#212018 +213001 213001#213002 +213002 213003#213004 +213003 213005#213006 +213004 213007#213008 +213005 213009#213010 +213006 213011#213012 +214001 214001#214002 +214002 214003#214004 +214003 214005#214006 +214004 214007#214008 +214005 214009#214010 +214006 214011#214012 +214007 214013#214014 +214008 214015#214016 +214009 214017#214018 +214010 214019#214020 +214011 214021#214022 +214012 214023#214024 +215001 215001#215002 +215002 215003#215004 +215003 215005#215006 +215004 215007#215008 +215005 215009#215010 +215006 215011#215012 +215007 215013#215014 +215008 215015#215016 +215009 215017#215018 diff --git a/conf/server/GameSetting.txt b/conf/server/GameSetting.txt index 2bf6a7307..cd9748971 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 -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 +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 diff --git a/conf/server/GlobalSystemConfig.txt b/conf/server/GlobalSystemConfig.txt index 71921e72d..d6746289f 100644 --- a/conf/server/GlobalSystemConfig.txt +++ b/conf/server/GlobalSystemConfig.txt @@ -5,15 +5,15 @@ int mut,int#int,1 int string string string string int 3 2#30 1 20190210 080000 20290210 080000 20190210 080000 20290210 080000 0 4 2#99 1 20190210 080000 20290210 080000 20190210 080000 20290210 080000 0 5 1#3011 1 20190210 080000 20290210 080000 20190210 080000 20290210 080000 0 -6 2#99 1 20190210 080000 20290210 080000 20190210 080000 20290210 080000 0 +6 2#99 0 20190210 080000 20290210 080000 20190210 080000 20290210 080000 0 7 2#17 1 20190210 080000 20290210 080000 20190210 080000 20290210 080000 0 8 2#19 1 20190210 080000 20290210 080000 20190210 050000 20190224 030000 2 -9 2#30 1 20190210 080000 20290210 080000 20190210 080000 20290210 080000 0 -10 2#30 1 20190210 080000 20290210 080000 20190210 080000 20290210 080000 0 +9 2#30 0 20190210 080000 20290210 080000 20190210 080000 20290210 080000 0 +10 2#30 0 20190210 080000 20290210 080000 20190210 080000 20290210 080000 0 11 1#1051 1 20190210 080000 20290210 080000 20190210 080000 20290210 080000 0 12 2#99 1 20190210 080000 20290210 080000 20190210 080000 20290210 080000 0 -13 2#99 1 20190210 080000 20290210 080000 20190210 080000 20290210 080000 0 -14 2#99 1 20190210 080000 20290210 080000 20190210 080000 20290210 080000 0 +13 2#99 0 20190210 080000 20290210 080000 20190210 080000 20290210 080000 0 +14 2#99 0 20190210 080000 20290210 080000 20190210 080000 20290210 080000 0 15 2#12 1 20190210 080000 20290210 080000 20190210 080000 20290210 080000 0 16 2#1 1 20190210 080000 20290210 080000 20190210 080000 20290210 080000 0 17 1#1051 1 20190210 080000 20290210 080000 20190210 080000 20290210 080000 @@ -25,4 +25,4 @@ int mut,int#int,1 int string string string string int 23 2#1 1 20190210 080000 20290210 080000 20190210 080000 20290210 080000 24 2#1 1 20190210 080000 20290210 080000 20190210 080000 20290210 080000 25 2#1 1 20190210 080000 20290210 080000 20190210 080000 20290210 080000 -0 null 0 22 +26 2#1 1 20190210 080000 20290210 080000 20190210 080000 20290210 080000 diff --git a/conf/server/MapPointConfig.txt b/conf/server/MapPointConfig.txt index 53a88aa0f..3071d2700 100644 --- a/conf/server/MapPointConfig.txt +++ b/conf/server/MapPointConfig.txt @@ -162,167 +162,77 @@ int int int int int 115008 7 2 2 115056 115009 7 2 2 115057 0 0 0 0 0 -201001 1 2 1 201001 -201002 1 2 1 201002 -201003 1 2 1 201003 -201004 1 2 1 201004 -201005 1 2 1 201005 -201006 1 2 1 201006 -201007 5 2 2 201007 -201008 5 2 2 201009 -201009 8 2 0 0 +201001 5 2 2 201001 +201002 5 2 2 201004 +201003 8 0 0 0 0 0 0 0 0 -202001 1 2 1 202001 -202002 1 2 1 202002 -202003 1 2 1 202003 -202004 1 2 1 202004 -202005 1 2 1 202005 -202006 1 2 1 202006 -202007 5 2 2 202007 -202008 5 2 2 202009 -202009 8 2 0 0 +202001 5 2 2 202001 +202002 5 2 2 202005 +202003 8 0 0 0 0 0 0 0 0 -203001 1 2 1 203001 -203002 1 2 1 203002 -203003 1 2 1 203003 -203004 1 2 1 203004 -203005 1 2 1 203005 -203006 1 2 1 203006 -203007 5 2 2 203007 -203008 5 2 2 203009 -203009 5 2 2 203011 -203010 8 2 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 1 2 1 204001 -204002 1 2 1 204002 -204003 1 2 1 204003 -204004 1 2 1 204004 -204005 1 2 1 204005 -204006 1 2 1 204006 -204007 5 2 2 204007 -204008 5 2 2 204009 -204009 5 2 2 204011 -204010 8 2 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 1 2 1 205001 -205002 1 2 1 205002 -205003 1 2 1 205003 -205004 1 2 1 205004 -205005 1 2 1 205005 -205006 1 2 1 205006 -205007 5 2 2 205007 -205008 5 2 2 205009 -205009 5 2 2 205011 -205010 5 2 2 205013 -205011 8 2 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 1 2 1 206001 -206002 1 2 1 206002 -206003 1 2 1 206003 -206004 1 2 1 206004 -206005 1 2 1 206005 -206006 1 2 1 206006 -206007 5 2 2 206007 -206008 5 2 2 206009 -206009 5 2 2 206011 -206010 8 2 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 1 2 1 207001 -207002 1 2 1 207002 -207003 1 2 1 207003 -207004 1 2 1 207004 -207005 1 2 1 207005 -207006 1 2 1 207006 -207007 5 2 2 207007 -207008 5 2 2 207009 -207009 5 2 2 207011 -207010 5 2 2 207013 -207011 8 2 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 1 2 1 208001 -208002 1 2 1 208002 -208003 1 2 1 208003 -208004 1 2 1 208004 -208005 1 2 1 208005 -208006 1 2 1 208006 -208007 5 2 2 208007 -208008 5 2 2 208009 -208009 8 2 0 0 +208001 5 2 2 208001 +208002 5 2 2 208004 +208003 8 0 0 0 0 0 0 0 0 -209001 1 2 1 209001 -209002 1 2 1 209002 -209003 1 2 1 209003 -209004 1 2 1 209004 -209005 1 2 1 209005 -209006 1 2 1 209006 -209007 5 2 2 209007 -209008 5 2 2 209009 -209009 5 2 2 209011 -209010 8 2 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 1 2 1 210001 -210002 1 2 1 210002 -210003 1 2 1 210003 -210004 1 2 1 210004 -210005 1 2 1 210005 -210006 1 2 1 210006 -210007 5 2 2 210007 -210008 5 2 2 210009 -210009 5 2 2 210011 -210010 5 2 2 210013 -210011 8 2 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 1 2 1 211001 -211002 1 2 1 211002 -211003 1 2 1 211003 -211004 1 2 1 211004 -211005 1 2 1 211005 -211006 1 2 1 211006 -211007 5 2 2 211007 -211008 5 2 2 211009 -211009 5 2 2 211011 -211010 8 2 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 1 2 1 212001 -212002 1 2 1 212002 -212003 1 2 1 212003 -212004 1 2 1 212004 -212005 1 2 1 212005 -212006 1 2 1 212006 -212007 5 2 2 212007 -212008 5 2 2 212009 -212009 5 2 2 212011 -212010 8 2 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 1 2 1 213001 -213002 1 2 1 213002 -213003 1 2 1 213003 -213004 1 2 1 213004 -213005 1 2 1 213005 -213006 1 2 1 213006 -213007 5 2 2 213007 -213008 5 2 2 213009 -213009 8 2 0 0 +213001 5 2 2 213001 +213002 5 2 2 213004 +213003 8 0 0 0 0 0 0 0 0 -214001 1 2 1 214001 -214002 1 2 1 214002 -214003 1 2 1 214003 -214004 1 2 1 214004 -214005 1 2 1 214005 -214006 1 2 1 214006 -214007 5 2 2 214007 -214008 5 2 2 214009 -214009 5 2 2 214011 -214010 5 2 2 214013 -214011 8 2 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 1 2 1 215001 -215002 1 2 1 215002 -215003 1 2 1 215003 -215004 1 2 1 215004 -215005 1 2 1 215005 -215006 1 2 1 215006 -215007 5 2 2 215007 -215008 5 2 2 215009 -215009 5 2 2 215011 -215010 8 2 0 0 +215001 5 2 2 215001 +215002 5 2 2 215004 +215003 5 2 2 215007 +215004 8 0 0 0 diff --git a/conf/server/MonsterConfig.txt b/conf/server/MonsterConfig.txt index 384d0e89c..698e0aceb 100644 --- a/conf/server/MonsterConfig.txt +++ b/conf/server/MonsterConfig.txt @@ -784,3 +784,57 @@ int int int int int int int int int int int float float float float float float 100106 43 3 0 1 144 41276 3925 3830 3830 246 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 20283 null 100107 10030 1 5 2 144 82553 3956 3830 3830 3696 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 20283#20283 null 100108 10001 1 3 3 144 247661 3872 3830 3830 3696 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 1000114#1000124 null +6010101 10024 1 3 2 30 39166 21874 733 488 1600 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 2 0.0 0#0#0#0#0#0 1002414 null +6010201 10025 1 1 2 146 1449594 257272 6426 4285 3744 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 1002514 null +6010301 10029 1 4 2 198 3848138 604270 15427 10286 8320 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 4 0.0 0#0#0#0#0#0 1002914 null +6010302 10030 1 5 2 198 3848138 604270 15427 10286 4992 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 2 0.0 0#0#0#0#0#0 1003014 null +6010303 10046 1 2 3 198 3848138 604270 15427 10286 166 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 5 0.0 0#0#0#0#0#0 1004614#1004624 null +6020101 10031 1 3 2 71 152460 61797 1889 1260 3240 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 4 0.0 0#0#0#0#0#0 1003114 null +6020102 10032 1 2 2 71 152460 61797 1889 1260 1944 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 4 0.0 0#0#0#0#0#0 1003214 null +6020201 10033 1 4 2 150 1787672 297745 7340 4893 6400 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 4 0.0 0#0#0#0#0#0 1003314 null +6020202 10036 1 1 2 150 1787672 297745 7340 4893 3840 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 3 0.0 0#0#0#0#0#0 1003614 null +6020301 10037 1 2 2 201 7064027 770297 28911 19274 8440 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 3 0.0 0#0#0#0#0#0 1003714 null +6020302 10038 1 4 2 201 7064027 770297 28911 19274 5064 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 1003814 null +6020303 10044 1 2 3 201 7064027 770297 28911 19274 168 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 6 0.0 0#0#0#0#0#0 1004414#1004424 null +6030101 10039 1 2 2 120 536267 141107 3762 2509 5200 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 3 0.0 0#0#0#0#0#0 1003914 null +6030102 10040 1 3 2 120 536267 141107 3762 2509 3120 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 1004014 null +6030201 10041 1 3 2 162 2202509 367259 9351 6234 6880 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 1004114 null +6030202 10042 1 3 2 162 2202509 367259 9351 6234 4128 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 2 0.0 0#0#0#0#0#0 1004214 null +6030301 10043 1 4 2 201 7064027 770297 28911 19274 8440 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 3 0.0 0#0#0#0#0#0 1004314 null +6030302 10045 1 5 2 201 7064027 770297 28911 19274 5064 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 2 0.0 0#0#0#0#0#0 1004514 null +6030303 10026 1 3 3 201 7064027 770297 28911 19274 168 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 5 0.0 0#0#0#0#0#0 1002614#1002624 null +6040101 10046 1 2 3 126 626254 159235 4117 2744 5440 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 5 0.0 0#0#0#0#0#0 1004614#1004624 null +6040102 10044 1 2 3 126 626254 159235 4117 2744 3264 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 6 0.0 0#0#0#0#0#0 1004414#1004424 null +6040201 10027 1 5 3 187 3284447 535967 14128 9419 7880 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 5 0.0 0#0#0#0#0#0 1002714#1002724 null +6040202 10028 1 4 3 187 3284447 535967 14128 9419 4728 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 5 0.0 0#0#0#0#0#0 1002814#1002824 null +6040301 10026 1 3 3 204 10530397 887451 42440 28293 8560 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 5 0.0 0#0#0#0#0#0 1002614#1002624 null +6040302 10035 1 1 3 204 10530397 887451 42440 28293 5136 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 6 0.0 0#0#0#0#0#0 1003514#1003524 null +6040303 10022 1 2 3 204 10530397 887451 42440 28293 171 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 2 0.0 0#0#0#0#0#0 1002214#1002224 null +6050101 10027 1 5 3 136 876679 191107 5315 3543 5840 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 5 0.0 0#0#0#0#0#0 1002714#1002724 null +6050102 10028 1 4 3 136 876679 191107 5315 3543 3504 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 5 0.0 0#0#0#0#0#0 1002814#1002824 null +6050201 10046 1 2 3 185 3088254 508691 13509 9006 7800 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 5 0.0 0#0#0#0#0#0 1004614#1004624 null +6050202 10044 1 2 3 185 3088254 508691 13509 9006 4680 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 6 0.0 0#0#0#0#0#0 1004414#1004424 null +6050301 10034 1 4 3 216 14000790 1005007 56029 37353 9040 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 6 0.0 0#0#0#0#0#0 1003414#1003424 null +6050302 10035 1 1 3 216 14000790 1005007 56029 37353 5424 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 6 0.0 0#0#0#0#0#0 1003514#1003524 null +6050303 10016 1 4 3 216 14000790 1005007 56029 37353 180 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 1001614#1001624 null +6060101 10001 1 3 3 138 1436650 207220 8292 5529 5920 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 3 0.0 0#0#0#0#0#0 1000114#1000124 null +6060102 10002 1 3 3 138 1436650 207220 8292 5529 3552 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 2 0.0 0#0#0#0#0#0 1000214#1000224 null +6060201 10003 1 3 3 187 3284447 535967 14128 9419 7880 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 4 0.0 0#0#0#0#0#0 1000314#1000324 null +6060202 10004 1 5 3 187 3284447 535967 14128 9419 4728 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 2 0.0 0#0#0#0#0#0 1000414#1000424 null +6060301 10005 1 5 3 216 14000790 1005007 56029 37353 9040 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 4 0.0 0#0#0#0#0#0 1000514#1000524 null +6060302 10006 1 5 3 216 14000790 1005007 56029 37353 5424 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 1000614#1000624 null +6060303 10007 1 5 3 216 14000790 1005007 56029 37353 180 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 3 0.0 0#0#0#0#0#0 1000714#1000724 null +6070101 10008 1 1 3 140 1933949 219986 10660 7107 6000 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 5 0.0 0#0#0#0#0#0 1000814#1000824 null +6070102 10009 1 1 3 140 1933949 219986 10660 7107 3600 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 6 0.0 0#0#0#0#0#0 1000914#1000924 null +6070201 10010 1 1 3 190 3717225 599071 15488 10325 8000 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 3 0.0 0#0#0#0#0#0 1001014#1001024 null +6070202 10011 1 1 3 190 3717225 599071 15488 10325 4800 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 4 0.0 0#0#0#0#0#0 1001114#1001124 null +6070301 10012 1 2 3 220 17671389 1109650 69300 46201 9200 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 1001214#1001224 null +6070302 10013 1 2 3 220 17671389 1109650 69300 46201 5520 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 4 0.0 0#0#0#0#0#0 1001314#1001324 null +6070303 10014 1 2 3 220 17671389 1109650 69300 46201 183 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 6 0.0 0#0#0#0#0#0 1001414#1001424 null +6080101 10015 1 2 3 144 2621982 240299 13791 9194 6160 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 5 0.0 0#0#0#0#0#0 1001514#1001524 null +6080102 10017 1 4 3 144 2621982 240299 13791 9194 3696 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 6 0.0 0#0#0#0#0#0 1001714#1001724 null +6080201 10018 1 4 3 192 3883831 623693 15911 10608 8080 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 5 0.0 0#0#0#0#0#0 1001814#1001824 null +6080202 10019 1 4 3 192 3883831 623693 15911 10608 4848 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 2 0.0 0#0#0#0#0#0 1001914#1001924 null +6080301 10020 1 3 3 224 18318893 1173348 70902 47268 9360 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 1002014#1002024 null +6080302 10021 1 1 3 224 18318893 1173348 70902 47268 5616 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 3 0.0 0#0#0#0#0#0 1002114#1002124 null +6080303 10023 1 4 3 224 18318893 1173348 70902 47268 187 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 5 0.0 0#0#0#0#0#0 1002314#1002324 null diff --git a/conf/server/MonsterGroup.txt b/conf/server/MonsterGroup.txt index 00596d2cb..70edc968e 100644 --- a/conf/server/MonsterGroup.txt +++ b/conf/server/MonsterGroup.txt @@ -250,3 +250,81 @@ int mut,int#int,2 mut,int#int,1 51083 1153121#1153122|1153231#1153232#1153233 null 51084 1154131#1154132#1154133 null 51085 1155121#1155122|1155221#1155222#1155331|1155332#1155333 null +601011 6010101 null +601012 null null +601021 6010201 null +601022 null null +601031 6010301 null +601032 6010302 null +601033 6010303 null +601034 null null +602011 6020101 null +602012 6020102 null +602013 null null +602021 6020201 null +602022 6020202 null +602023 null null +602031 6020301 null +602032 6020302 null +602033 6020303 null +602034 null null +603011 6030101 null +603012 6030102 null +603013 null null +603021 6030201 null +603022 6030202 null +603023 null null +603031 6030301 null +603032 6030302 null +603033 6030303 null +603034 null null +604011 6040101 null +604012 6040102 null +604013 null null +604021 6040201 null +604022 6040202 null +604023 null null +604031 6040301 null +604032 6040302 null +604033 6040303 null +604034 null null +605011 6050101 null +605012 6050102 null +605013 null null +605021 6050201 null +605022 6050202 null +605023 null null +605031 6050301 null +605032 6050302 null +605033 6050303 null +605034 null null +606011 6060101 null +606012 6060102 null +606013 null null +606021 6060201 null +606022 6060202 null +606023 null null +606031 6060301 null +606032 6060302 null +606033 6060303 null +606034 null null +607011 6070101 null +607012 6070102 null +607013 null null +607021 6070201 null +607022 6070202 null +607023 null null +607031 6070301 null +607032 6070302 null +607033 6070303 null +607034 null null +608011 6080101 null +608012 6080102 null +608013 null null +608021 6080201 null +608022 6080202 null +608023 null null +608031 6080301 null +608032 6080302 null +608033 6080303 null +608034 null null diff --git a/conf/server/OptionAddCondition.txt b/conf/server/OptionAddCondition.txt index 974b755cf..337d419d7 100644 --- a/conf/server/OptionAddCondition.txt +++ b/conf/server/OptionAddCondition.txt @@ -23,7 +23,7 @@ int int mut,int#int,2 10901 6 0#10#6 10902 6 1#10#6 11001 6 0#11#5 -11101 6 0#12#4 +11101 2 1523#1|1524#1|1525#10 11401 2 1526#15 11501 6 0#16#4 20101 2 1529#4 diff --git a/conf/server/OptionConfig.txt b/conf/server/OptionConfig.txt index 4cd304e12..dc51af15e 100644 --- a/conf/server/OptionConfig.txt +++ b/conf/server/OptionConfig.txt @@ -1333,7 +1333,7 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2 113022 0 35 113001|113#6#17#113002 null 4 null 113023 0 0 null null 1 113013 113024 0 0 null null 1 113015 -113025 0 0 null null 1 113014 +113025 0 0 null null 1 113044 113026 0 0 null null 1 113015 113027 0 0 null null 1 113015 113028 0 0 null null 1 113015 @@ -1353,7 +1353,7 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2 113042 0 0 null null 1 113030 113043 0 0 null null 1 113023 113044 0 0 null null 1 113030 -113045 0 0 null null 1 113024 +113045 0 0 null null 1 113045 113046 0 0 null null 1 113030 113047 0 0 null null 1 113025 113048 0 0 null null 1 113030 @@ -1377,7 +1377,7 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2 113066 0 9 14 null 4 null 113067 0 0 null null 1 113035 113068 0 9 14 null 4 null -113069 0 0 null null 1 113036 +113069 0 0 null null 1 113046 113070 0 9 14 null 4 null 113071 0 0 null null 1 113037 113072 0 9 14 null 4 null @@ -1392,6 +1392,12 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2 113081 0 15 113004 40013 4 null 113082 0 15 113005 40013 4 null 113083 0 15 113006 40013 4 null +113084 0 0 null null 1 113014 +113085 0 0 null null 1 113015 +113086 0 0 null null 1 113024 +113087 0 0 null null 1 113030 +113088 0 0 null null 1 113036 +113089 0 9 14 null 4 null 114001 0 0 null null 1 114002 114002 0 0 null null 1 114010 114003 0 0 null null 1 114003 @@ -1589,123 +1595,275 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2 115108 0 15 115007 40015 4 null 115109 0 15 115008 40015 4 null 115110 0 15 115009 40015 4 null -201001 0 1 201007 null 1 201008 -201002 0 0 null null 4 null -201003 0 17 1#201007|201#3#10#201008 100006 4 null -201004 0 18 101#201008#201008 null 4 null -201005 0 0 null null 4 null -202001 0 1 202007 null 1 202008 -202002 0 0 null null 4 null -202003 0 17 1#202007|202#12#14#202008 100006 4 null -202004 0 18 102#202008#202008 null 4 null -202005 0 0 null null 4 null -203001 0 1 203007 null 1 203008 -203002 0 0 null null 4 null -203003 0 17 1#203007|203#6#9#203008 100006 4 null -203004 0 1 203008 null 1 203010 -203005 0 0 null null 4 null -203006 0 17 1#203008|203#13#6#203009 100006 4 null -203007 0 18 103#203009#203009 null 4 null -203008 0 0 null null 4 null -204001 0 1 204007 null 1 204008 -204002 0 0 null null 4 null -204003 0 17 1#204007|204#9#4#204008 100006 4 null -204004 0 1 204008 null 1 204010 -204005 0 0 null null 4 null -204006 0 17 1#204008|204#4#5#204009 100006 4 null -204007 0 18 104#204009#204009 null 4 null -204008 0 0 null null 4 null -205001 0 1 205007 null 1 205008 -205002 0 0 null null 4 null -205003 0 17 1#205007|205#2#6#205008 100006 4 null -205004 0 1 205008 null 1 205010 -205005 0 0 null null 4 null -205006 0 17 1#205008|205#5#3#205009 100006 4 null -205007 0 1 205009 null 1 205012 -205008 0 0 null null 4 null -205009 0 17 1#205009|205#10#6#205010 100006 4 null -205010 0 18 105#205010#205010 null 4 null -205011 0 0 null null 4 null -206001 0 1 206007 null 1 206008 -206002 0 0 null null 4 null -206003 0 17 1#206007|206#16#7#206008 100006 4 null -206004 0 1 206008 null 1 206010 -206005 0 0 null null 4 null -206006 0 17 1#206008|206#11#25#206009 100006 4 null -206007 0 18 106#206009#206009 null 4 null -206008 0 0 null null 4 null -207001 0 1 207007 null 1 207008 -207002 0 0 null null 4 null -207003 0 17 1#207007|207#5#16#207008 100006 4 null -207004 0 1 207008 null 1 207010 -207005 0 0 null null 4 null -207006 0 17 1#207008|207#12#4#207009 100006 4 null -207007 0 1 207009 null 1 207012 -207008 0 0 null null 4 null -207009 0 17 1#207009|207#4#7#207010 100006 4 null -207010 0 18 107#207010#207010 null 4 null -207011 0 0 null null 4 null -208001 0 1 208007 null 1 208008 -208002 0 0 null null 4 null -208003 0 17 1#208007|208#3#14#208008 100006 4 null -208004 0 18 108#208008#208008 null 4 null -208005 0 0 null null 4 null -209001 0 1 209007 null 1 209008 -209002 0 0 null null 4 null -209003 0 17 1#209007|209#6#5#209008 100006 4 null -209004 0 1 209008 null 1 209010 -209005 0 0 null null 4 null -209006 0 17 1#209008|209#8#8#209009 100006 4 null -209007 0 18 109#209009#209009 null 4 null -209008 0 0 null null 4 null -210001 0 1 210007 null 1 210008 -210002 0 0 null null 4 null -210003 0 17 1#210007|210#4#15#210008 100006 4 null -210004 0 1 210008 null 1 210010 -210005 0 0 null null 4 null -210006 0 17 1#210008|210#10#15#210009 100006 4 null -210007 0 1 210009 null 1 210012 -210008 0 0 null null 4 null -210009 0 17 1#210009|210#7#2#210010 100006 4 null -210010 0 18 110#210010#210010 null 4 null -210011 0 0 null null 4 null -211001 0 1 211007 null 1 211008 -211002 0 0 null null 4 null -211003 0 17 1#211007|211#5#9#211008 100006 4 null -211004 0 1 211008 null 1 211010 -211005 0 0 null null 4 null -211006 0 17 1#211008|211#10#15#211009 100006 4 null -211007 0 18 111#211009#211009 null 4 null -211008 0 0 null null 4 null -212001 0 1 212007 null 1 212008 -212002 0 0 null null 4 null -212003 0 17 1#212007|212#6#5#212008 100006 4 null -212004 0 1 212008 null 1 212010 -212005 0 0 null null 4 null -212006 0 17 1#212008|212#3#17#212009 100006 4 null -212007 0 18 112#212009#212009 null 4 null -212008 0 0 null null 4 null -213001 0 1 213007 null 1 213008 -213002 0 0 null null 4 null -213003 0 17 1#213007|213#5#13#213008 100006 4 null -213004 0 18 113#213008#213008 null 4 null -213005 0 0 null null 4 null -214001 0 1 214007 null 1 214008 -214002 0 0 null null 4 null -214003 0 17 1#214007|214#10#26#214008 100006 4 null -214004 0 1 214008 null 1 214010 -214005 0 0 null null 4 null -214006 0 17 1#214008|214#5#17#214009 100006 4 null -214007 0 1 214009 null 1 214012 -214008 0 0 null null 4 null -214009 0 17 1#214009|214#10#5#214010 100006 4 null -214010 0 18 114#214010#214010 null 4 null -214011 0 0 null null 4 null -215001 0 1 215007 null 1 215008 -215002 0 0 null null 4 null -215003 0 17 1#215007|215#14#5#215008 100006 4 null -215004 0 1 215008 null 1 215010 -215005 0 0 null null 4 null -215006 0 17 1#215008|215#12#17#215009 100006 4 null -215007 0 18 115#215009#215009 null 4 null -215008 0 0 null null 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 +201004 0 0 null null 4 null +201005 0 0 null null 0 null +201006 0 0 null null 0 null +201007 0 0 null null 1 201005 +201008 0 0 null null 1 201005 +201009 0 18 101#201008#201002 null 4 null +201010 0 0 null null 4 null +201011 0 0 null null 0 null +201012 0 0 null null 0 null +202001 0 0 null null 1 202002 +202002 0 0 null null 1 202003 +202003 0 0 null null 1 202003 +202004 0 0 null null 1 202003 +202005 0 32 202007#202001|202#7#3#202002 null 4 null +202006 0 0 null null 4 null +202007 0 0 null null 0 null +202008 0 0 null null 0 null +202009 0 0 null null 1 202006 +202010 0 0 null null 1 202006 +202011 0 18 102#202008#202002 null 4 null +202012 0 0 null null 4 null +202013 0 0 null null 0 null +202014 0 0 null null 0 null +203001 0 0 null null 1 203002 +203002 0 0 null null 1 203002 +203003 0 32 203007#203001|203#5#3#203002 null 4 null +203004 0 0 null null 4 null +203005 0 0 null null 0 null +203006 0 0 null null 0 null +203007 0 0 null null 1 203005 +203008 0 0 null null 1 203005 +203009 0 32 203008#203002|203#7#7#203003 null 4 null +203010 0 0 null null 4 null +203011 0 0 null null 0 null +203012 0 0 null null 0 null +203013 0 0 null null 1 203008 +203014 0 0 null null 1 203008 +203015 0 18 103#203009#203003 null 4 null +203016 0 0 null null 4 null +203017 0 0 null null 0 null +203018 0 0 null null 0 null +204001 0 0 null null 1 204002 +204002 0 0 null null 1 204002 +204003 0 32 204007#204001|204#5#7#204002 null 4 null +204004 0 0 null null 4 null +204005 0 0 null null 0 null +204006 0 0 null null 0 null +204007 0 0 null null 1 204005 +204008 0 0 null null 1 204005 +204009 0 32 204008#204002|204#4#2#204003 null 4 null +204010 0 0 null null 4 null +204011 0 0 null null 0 null +204012 0 0 null null 0 null +204013 0 0 null null 1 204008 +204014 0 0 null null 1 204008 +204015 0 18 104#204009#204003 null 4 null +204016 0 0 null null 4 null +204017 0 0 null null 0 null +204018 0 0 null null 0 null +205001 0 0 null null 1 205002 +205002 0 0 null null 1 205002 +205003 0 32 205007#205001|205#5#4#205002 null 4 null +205004 0 0 null null 4 null +205005 0 0 null null 0 null +205006 0 0 null null 0 null +205007 0 0 null null 1 205005 +205008 0 0 null null 1 205005 +205009 0 32 205008#205002|205#6#3#205003 null 4 null +205010 0 0 null null 4 null +205011 0 0 null null 0 null +205012 0 0 null null 0 null +205013 0 0 null null 1 205008 +205014 0 0 null null 1 205008 +205015 0 32 205009#205003|205#6#6#205004 null 4 null +205016 0 0 null null 4 null +205017 0 0 null null 0 null +205018 0 0 null null 0 null +205019 0 0 null null 1 205011 +205020 0 0 null null 1 205011 +205021 0 18 105#205010#205004 null 4 null +205022 0 0 null null 4 null +205023 0 0 null null 0 null +205024 0 0 null null 0 null +206001 0 0 null null 1 206002 +206002 0 0 null null 1 206002 +206003 0 32 206007#206001|206#7#3#206002 null 4 null +206004 0 0 null null 4 null +206005 0 0 null null 0 null +206006 0 0 null null 0 null +206007 0 0 null null 1 206005 +206008 0 0 null null 1 206005 +206009 0 32 206008#206002|206#2#7#206003 null 4 null +206010 0 0 null null 4 null +206011 0 0 null null 0 null +206012 0 0 null null 0 null +206013 0 0 null null 1 206008 +206014 0 0 null null 1 206008 +206015 0 18 106#206009#206003 null 4 null +206016 0 0 null null 4 null +206017 0 0 null null 0 null +206018 0 0 null null 0 null +207001 0 0 null null 1 207002 +207002 0 0 null null 1 207002 +207003 0 32 207007#207001|207#8#5#207002 null 4 null +207004 0 0 null null 4 null +207005 0 0 null null 0 null +207006 0 0 null null 0 null +207007 0 0 null null 1 207005 +207008 0 0 null null 1 207005 +207009 0 32 207008#207002|207#4#1#207003 null 4 null +207010 0 0 null null 4 null +207011 0 0 null null 0 null +207012 0 0 null null 0 null +207013 0 0 null null 1 207008 +207014 0 0 null null 1 207008 +207015 0 32 207009#207003|207#6#7#207004 null 4 null +207016 0 0 null null 4 null +207017 0 0 null null 0 null +207018 0 0 null null 0 null +207019 0 0 null null 1 207011 +207020 0 0 null null 1 207011 +207021 0 18 107#207010#207004 null 4 null +207022 0 0 null null 4 null +207023 0 0 null null 0 null +207024 0 0 null null 0 null +208001 0 0 null null 1 208002 +208002 0 0 null null 1 208002 +208003 0 32 208007#208001|208#7#2#208002 null 4 null +208004 0 0 null null 4 null +208005 0 0 null null 0 null +208006 0 0 null null 0 null +208007 0 0 null null 1 208005 +208008 0 0 null null 1 208005 +208009 0 18 108#208008#208002 null 4 null +208010 0 0 null null 4 null +208011 0 0 null null 0 null +208012 0 0 null null 0 null +209001 0 0 null null 1 209002 +209002 0 0 null null 1 209002 +209003 0 32 209007#209001|209#4#5#209002 null 4 null +209004 0 0 null null 4 null +209005 0 0 null null 0 null +209006 0 0 null null 0 null +209007 0 0 null null 1 209005 +209008 0 0 null null 1 209005 +209009 0 32 209008#209002|209#8#5#209003 null 4 null +209010 0 0 null null 4 null +209011 0 0 null null 0 null +209012 0 0 null null 0 null +209013 0 0 null null 1 209008 +209014 0 0 null null 1 209008 +209015 0 18 109#209009#209003 null 4 null +209016 0 0 null null 4 null +209017 0 0 null null 0 null +209018 0 0 null null 0 null +210001 0 0 null null 1 210002 +210002 0 0 null null 1 210002 +210003 0 32 210007#210001|210#6#3#210002 null 4 null +210004 0 0 null null 4 null +210005 0 0 null null 0 null +210006 0 0 null null 0 null +210007 0 0 null null 1 210005 +210008 0 0 null null 1 210005 +210009 0 32 210008#210002|210#3#2#210003 null 4 null +210010 0 0 null null 4 null +210011 0 0 null null 0 null +210012 0 0 null null 0 null +210013 0 0 null null 1 210008 +210014 0 0 null null 1 210008 +210015 0 32 210009#210003|210#5#12#210004 null 4 null +210016 0 0 null null 4 null +210017 0 0 null null 0 null +210018 0 0 null null 0 null +210019 0 0 null null 1 210011 +210020 0 0 null null 1 210011 +210021 0 18 110#210010#210004 null 4 null +210022 0 0 null null 4 null +210023 0 0 null null 0 null +210024 0 0 null null 0 null +211001 0 0 null null 1 211002 +211002 0 0 null null 1 211002 +211003 0 32 211007#211001|211#8#10#211002 null 4 null +211004 0 0 null null 4 null +211005 0 0 null null 0 null +211006 0 0 null null 0 null +211007 0 0 null null 1 211005 +211008 0 0 null null 1 211005 +211009 0 32 211008#211002|211#7#3#211003 null 4 null +211010 0 0 null null 4 null +211011 0 0 null null 0 null +211012 0 0 null null 0 null +211013 0 0 null null 1 211008 +211014 0 0 null null 1 211008 +211015 0 18 111#211009#211003 null 4 null +211016 0 0 null null 4 null +211017 0 0 null null 0 null +211018 0 0 null null 0 null +212001 0 0 null null 1 212002 +212002 0 0 null null 1 212002 +212003 0 32 212007#212001|212#7#2#212002 null 4 null +212004 0 0 null null 4 null +212005 0 0 null null 0 null +212006 0 0 null null 0 null +212007 0 0 null null 1 212005 +212008 0 0 null null 1 212005 +212009 0 32 212008#212002|212#3#8#212003 null 4 null +212010 0 0 null null 4 null +212011 0 0 null null 0 null +212012 0 0 null null 0 null +212013 0 0 null null 1 212008 +212014 0 0 null null 1 212008 +212015 0 18 112#212009#212003 null 4 null +212016 0 0 null null 4 null +212017 0 0 null null 0 null +212018 0 0 null null 0 null +213001 0 0 null null 1 213002 +213002 0 0 null null 1 213002 +213003 0 32 213007#213001|213#6#3#213002 null 4 null +213004 0 0 null null 4 null +213005 0 0 null null 0 null +213006 0 0 null null 0 null +213007 0 0 null null 1 213005 +213008 0 0 null null 1 213005 +213009 0 18 113#213008#213002 null 4 null +213010 0 0 null null 4 null +213011 0 0 null null 0 null +213012 0 0 null null 0 null +214001 0 0 null null 1 214002 +214002 0 0 null null 1 214002 +214003 0 32 214007#214001|214#7#5#214002 null 4 null +214004 0 0 null null 4 null +214005 0 0 null null 0 null +214006 0 0 null null 0 null +214007 0 0 null null 1 214005 +214008 0 0 null null 1 214005 +214009 0 32 214008#214002|214#6#13#214003 null 4 null +214010 0 0 null null 4 null +214011 0 0 null null 0 null +214012 0 0 null null 0 null +214013 0 0 null null 1 214008 +214014 0 0 null null 1 214008 +214015 0 32 214009#214003|214#4#10#214004 null 4 null +214016 0 0 null null 4 null +214017 0 0 null null 0 null +214018 0 0 null null 0 null +214019 0 0 null null 1 214011 +214020 0 0 null null 1 214011 +214021 0 18 114#214010#214004 null 4 null +214022 0 0 null null 4 null +214023 0 0 null null 0 null +214024 0 0 null null 0 null +215001 0 0 null null 1 215002 +215002 0 0 null null 1 215002 +215003 0 32 215007#215001|215#6#3#215002 null 4 null +215004 0 0 null null 4 null +215005 0 0 null null 0 null +215006 0 0 null null 0 null +215007 0 0 null null 1 215005 +215008 0 0 null null 1 215005 +215009 0 32 215008#215002|215#5#10#215003 null 4 null +215010 0 0 null null 4 null +215011 0 0 null null 0 null +215012 0 0 null null 0 null +215013 0 0 null null 1 215008 +215014 0 0 null null 1 215008 +215015 0 18 115#215009#215003 null 4 null +215016 0 0 null null 4 null +215017 0 0 null null 0 null +215018 0 0 null null 0 null diff --git a/conf/server/TaskConfig.txt b/conf/server/TaskConfig.txt index 01f812050..14afec0ec 100644 --- a/conf/server/TaskConfig.txt +++ b/conf/server/TaskConfig.txt @@ -1,5 +1,5 @@ Id TaskType TaskValue Reward Jump -int int mut,int#int,1 mut,int#int,1 mut,int#int,1 +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 diff --git a/serverlogic/src/main/java/com/ljsd/jieling/config/STaskConfig.java b/serverlogic/src/main/java/com/ljsd/jieling/config/STaskConfig.java index a0cf477fe..9aa0d8e01 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/config/STaskConfig.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/config/STaskConfig.java @@ -17,7 +17,7 @@ public class STaskConfig implements BaseConfig { private int[] taskValue; - private int[] reward; + private int[][] reward; private int[] jump; @@ -62,7 +62,7 @@ public class STaskConfig implements BaseConfig { return taskValue; } - public int[] getReward() { + public int[][] getReward() { return reward; } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/MissionLoigc.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/MissionLoigc.java index 9130f4a1a..96ae8e5da 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/MissionLoigc.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/MissionLoigc.java @@ -70,7 +70,7 @@ public class MissionLoigc { Map> gameMisionTypeListMap = userMissionManager.onGameEvent(user, GameEvent.VIP_MISSION_REWARD, missionId); List missionStateChangeInfos = gameMisionTypeListMap.get(GameMisionType.VIPMISSION); if(!missionStateChangeInfos.isEmpty()){ - CommonProto.Drop.Builder drop = ItemUtil.drop(user, missionStateChangeInfos.get(0).getRewwardGroups(), 1f, 0); + CommonProto.Drop.Builder drop = ItemUtil.drop(user, missionStateChangeInfos.get(0).getRewwardGroups()); PlayerInfoProto.TakeMissionRewardResponse build = PlayerInfoProto.TakeMissionRewardResponse.newBuilder().setDrop(drop).build(); MessageUtil.sendMessage(session,1, MessageTypeProto.MessageType.TAKE_MISSION_REWARD_RESPONSE_VALUE,build,true); }else{ diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/main/AbstractMissionType.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/main/AbstractMissionType.java index 44a30a808..37484b2fa 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/main/AbstractMissionType.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/main/AbstractMissionType.java @@ -21,7 +21,7 @@ public abstract class AbstractMissionType { public abstract void openMission(User user,int missionId); - public abstract int[] reward(int missionId); + public abstract int[][] reward(int missionId); public void rewardMission(int missionId, List missionTypeEnumListMap){ if (!finishMissionIds.contains(missionId)) { diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/main/MissionStateChangeInfo.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/main/MissionStateChangeInfo.java index 73a623890..ee886c8c5 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/main/MissionStateChangeInfo.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/main/MissionStateChangeInfo.java @@ -5,12 +5,12 @@ import com.ljsd.jieling.logic.mission.MissionState; public class MissionStateChangeInfo { private int missionId; private MissionState missionState; - private int[] rewwardGroups; + private int[][] rewwards; - public MissionStateChangeInfo(int missionId, MissionState missionState, int[] rewwardGroups) { + public MissionStateChangeInfo(int missionId, MissionState missionState, int[][] rewwards) { this.missionId = missionId; this.missionState = missionState; - this.rewwardGroups = rewwardGroups; + this.rewwards = rewwards; } public int getMissionId() { @@ -21,7 +21,7 @@ public class MissionStateChangeInfo { return missionState; } - public int[] getRewwardGroups() { - return rewwardGroups; + public int[][] getRewwardGroups() { + return rewwards; } } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/main/VipMissionIdsType.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/main/VipMissionIdsType.java index e32a0612d..65a2ddb51 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/main/VipMissionIdsType.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/main/VipMissionIdsType.java @@ -32,7 +32,7 @@ public class VipMissionIdsType extends AbstractMissionType{ } @Override - public int[] reward(int missionId) { + public int[][] reward(int missionId) { STaskConfig sTaskConfig = STaskConfig.getsTaskConfigById(missionId); return sTaskConfig.getReward(); }