diff --git a/conf/server/GameSetting.txt b/conf/server/GameSetting.txt index 3f9caea5b..73dd656cd 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 -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 -1 10046#1|2#80 0#0#0.3164#0 80 1#6 0#0#1#0 70#100 999 9999 1 08#19 60 +Id BornItem SpeedFormula InitialEnergy EnergyRecoverSpeed ActionPowerRormula Speed HeroNumlimit EquipNumlimit WorldTalking BornPosition AdventureRefresh NatureName +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 string +1 10046#1|2#80 0#0#0.3164#0 80 1#6 0#0#1#0 70#100 999 9999 1 08#19 60 数值策划专场 diff --git a/conf/server/Map_100.txt b/conf/server/Map_100.txt index d2e97fb4b..b49617b1b 100644 --- a/conf/server/Map_100.txt +++ b/conf/server/Map_100.txt @@ -2,4 +2,5 @@ id Event Groups isMustAppear int int mut,int#int,2 int 1 100004 9#16 0 2 100002 7#14 0 -3 101010 3#11|4#11|5#11|6#11|7#11|8#11|9#11|10#11|11#11|12#11|3#12|12#12|3#13|12#13|3#14|12#14|3#15|12#15|3#16|12#16|3#17|12#17|3#18|12#18|3#19|12#19|3#20|12#20 1 +3 100003 8#19 0 +4 101010 3#11|4#11|5#11|6#11|7#11|8#11|9#11|10#11|11#11|12#11|3#12|12#12|3#13|12#13|3#14|12#14|3#15|12#15|3#16|12#16|3#17|12#17|3#18|12#18|3#19|12#19|3#20|12#20 1 diff --git a/conf/server/Map_105.txt b/conf/server/Map_105.txt index 5604dc88b..e291bc7dd 100644 --- a/conf/server/Map_105.txt +++ b/conf/server/Map_105.txt @@ -1,45 +1,12 @@ id Event Groups isMustAppear int int mut,int#int,2 int -1 105035 2#12 0 -2 105012 9#18|8#19|10#19|9#20 0 -3 105034 15#17 0 -4 105033 7#5 0 -5 105010 2#16|3#16|2#17 0 -6 105011 5#17|5#18|6#18 0 -7 105032 1#19 0 -8 105016 2#4 0 -9 105017 9#2 0 -10 105015 6#15 0 -11 105031 8#14 0 -12 105030 5#20 0 -13 105001 3#18|4#18|2#19|3#19 0 -14 105002 5#15|5#16|7#16|6#17|7#17 0 -15 105001 6#6|6#7|7#7|7#8|7#9 0 -16 105009 2#11|3#11|4#12 0 -17 105007 11#9|11#10|11#11 0 -18 105008 8#5|8#6|9#7 0 -19 105029 11#19 0 -20 105001 8#18|10#18|8#20|10#20 0 -21 105002 3#6 0 -22 105001 14#5|14#6|15#6|15#7|15#8 0 -23 105024 12#12 0 -24 105022 1#1|2#1|3#1|4#1|5#1|6#1|7#1|8#1|9#1|10#1|11#1|12#1|13#1|14#1|15#1|1#2|2#2|3#2|4#2|6#2|8#2|10#2|12#2|14#2|1#3|2#3|10#3|1#4|6#4|7#4|9#4|10#4|1#5|2#5|3#5|4#5|5#5|6#5|1#6|1#7|2#7|3#7|1#8|5#8|6#8|8#8|1#9|2#9|3#9|4#9|5#9|8#9|9#9|10#9|12#9|1#10|5#10|12#10|13#10|14#10|14#11|15#11|5#12|6#12|6#13|6#14|7#14|7#15|8#15|8#17|9#17|10#17|11#17|11#18|12#18|12#19|13#19 1 -25 105023 5#2 0 -26 105002 4#3|3#4|4#4|5#4 0 -27 105001 10#11|9#12|10#12|11#12|9#13 0 -28 105021 2#6 0 -29 105005 13#3|13#4|12#5 0 -30 105028 4#13 0 -31 105027 9#15 0 -32 105006 13#17|14#17|14#18|15#19 0 -33 105026 14#8 0 -34 105001 3#12|1#13|3#13|2#14|3#14 0 -35 105025 2#8 0 -36 105020 7#2 0 -37 105002 5#11|6#11|7#12|7#13 0 -38 105001 14#13|15#13|13#14|13#15|14#15|13#16 0 -39 105002 15#18|14#19|14#20|15#20 0 -40 105002 11#14|12#14|11#15|12#16 0 -41 105001 11#3|11#4|10#5|11#5|11#6 0 -42 105018 13#11 0 -43 105019 9#8 0 +1 105001 4#15|5#15|4#16|5#16 0 +2 105002 12#5|13#5|12#6|13#6 0 +3 105016 9#8 0 +4 105005 2#10|1#11|2#11|2#12 0 +5 105014 2#6 0 +6 105003 10#12|11#12|10#13|11#13 0 +7 105004 4#6|5#6|4#7|5#7 0 +8 105015 1#20 0 +9 105017 1#1|2#1|3#1|4#1|5#1|6#1|7#1|8#1|9#1|10#1|11#1|12#1|13#1|14#1|15#1|1#2|2#2|3#2|4#2|6#2|8#2|10#2|12#2|14#2|1#3|2#3|10#3|1#4|6#4|7#4|9#4|10#4|1#5|2#5|3#5|4#5|5#5|6#5|1#6|1#7|2#7|3#7|1#8|5#8|6#8|8#8|1#9|2#9|3#9|4#9|5#9|8#9|9#9|10#9|12#9|1#10|5#10|12#10|13#10|14#10|14#11|15#11|5#12|6#12|6#13|6#14|7#14|7#15|8#15|8#17|9#17|10#17|11#17|11#18|12#18|12#19|13#19 1 +10 105007 5#2|13#2|15#2|3#3|9#3|2#4|13#11|7#13|1#18|10#18|3#19|9#19 0 diff --git a/conf/server/Map_106.txt b/conf/server/Map_106.txt index 7bca00e78..1c60b0c7e 100644 --- a/conf/server/Map_106.txt +++ b/conf/server/Map_106.txt @@ -1,58 +1,22 @@ id Event Groups isMustAppear int int mut,int#int,2 int -1 106021 4#1 0 -2 106023 19#3 0 -3 106001 10#16|9#17|10#17|11#17 0 -4 106025 5#20 0 -5 106027 14#2|13#3|13#4|14#5 0 -6 106011 4#15 0 -7 106018 16#1|17#1|18#1|19#1|1#2|2#2|1#3|2#3|2#4|3#4|7#4|8#4|2#5|3#5|4#5|5#5|7#5|8#5|4#6|5#6|5#7|6#7|7#7|8#7|5#8|6#8|7#8|8#8|11#8|12#8|13#8|14#8|8#9|9#9|11#9|12#9|13#9|14#9|12#10|13#10|14#10|14#11|15#11|14#12|15#12|14#13|15#13|14#14|15#14|14#15|15#15|14#16|15#16|14#17|15#17|18#17|14#18|15#18|18#18|14#19|15#19|18#19|14#20|15#20|17#20|18#20|14#20|15#20|17#20|18#20|14#20|15#20|17#20|18#20|14#20|15#20|17#20|18#20|1#20|17#20|18#20|1#20|2#20|17#20|18#20|19#20|1#20|2#20|3#20|16#20|17#20|19#20|1#20|2#20|3#20|4#20|16#20|17#20|1#20|2#20|3#20|4#20|5#20|1#20|2#20|3#20|4#20|5#20|6#20|7#20|8#20|9#20|1#20|2#20|3#20|4#20|5#20|6#20|7#20|8#20|9#20|10#20|11#20|12#20|13#20|14#20 1 -8 106006 11#12|12#12 0 -9 106004 7#15|7#16|8#16 0 -10 106025 18#20|19#20|18#20|17#20|18#20 0 -11 106002 2#6|1#7|2#7|3#7 0 -12 106025 13#18|13#19|13#20 0 -13 106001 12#20|13#20|12#20|13#20 0 -14 106001 2#18 0 -15 106001 11#20|10#20|11#20|10#20 0 -16 106026 10#2|9#3|10#3|11#3 0 -17 106025 15#20|16#20 0 -18 106025 17#12 0 -19 106001 8#20 0 -20 106008 1#9|2#9 0 -21 106017 16#10 0 -22 106015 3#20 0 -23 106025 19#11 0 -24 106013 15#1 0 -25 106001 1#20 0 -26 106011 18#20 0 -27 106026 16#4 0 -28 106020 15#20 0 -29 106022 10#6 0 -30 106025 2#11|1#12|2#13|3#13 0 -31 106025 13#12|13#13|13#14|13#15 0 -32 106024 10#9|16#20|20#20 1 -33 106026 7#10|8#11|8#12|9#13 0 -34 106019 3#20 0 -35 106007 10#4|11#4 0 -36 106005 12#20|13#20 0 -37 106011 1#20 0 -38 106001 9#20 0 -39 106001 4#11|4#12|5#12|6#13|6#20 0 -40 106025 17#7 0 -41 106025 12#7|13#7|14#7 0 -42 106001 4#19 0 -43 106025 3#3|4#4|5#4 0 -44 106002 19#20|20#20|19#20|20#20 0 -45 106001 4#20 0 -46 106025 7#20 0 -47 106027 16#18|16#19 0 -48 106025 1#4|1#5 0 -49 106009 12#1|13#1 0 -50 106016 2#15|2#16|3#16|4#16|1#17|2#17|3#17|4#17|5#17|6#17|1#18|3#18|4#18|5#18|6#18|7#18|1#19|2#19|3#19|5#19|6#19|7#19|1#20|2#20|3#20|4#20|5#20|6#20|7#20|8#20|1#20|2#20|3#20|4#20|5#20|6#20|7#20|8#20|2#20|4#20|6#20|8#20|2#20|3#20|4#20|5#20|6#20|7#20|8#20|2#20|3#20|4#20|5#20|6#20|7#20|8#20|9#20|4#20|5#20|7#20|9#20|5#20|6#20|7#20|8#20|5#20|6#20|7#20|8#20|9#20|10#20|7#20|9#20|10#20|10#20|11#20 0 -51 106014 20#1|15#2|16#2|17#2|18#2|19#2|15#3|16#3|17#3|18#3|20#3|15#4|17#4|18#4|19#4|20#4|15#5|16#5|17#5|18#5|19#5|20#5|15#6|16#6|17#6|18#6|19#6|20#6|15#7|16#7|18#7|20#7|15#8|16#8|17#8|18#8|19#8|20#8|15#9|16#9|17#9|18#9|19#9|20#9|15#10|17#10|18#10|19#10|20#10|16#11|17#11|18#11|20#11|16#12|18#12|19#12|20#12|16#13|17#13|18#13|19#13|20#13|16#14|17#14|18#14|19#14|20#14|16#15|17#15|18#15|19#15|20#15|16#16|17#16|18#16|19#16|20#16|17#17|19#17|20#17|20#18|20#19 0 -52 106012 6#20 0 -53 106010 1#1|2#1 0 -54 106027 6#1|7#1|6#2|7#2 0 -55 106002 19#7 0 -56 106025 8#20 0 +1 106020 18#28 0 +2 106021 13#5 0 +3 106022 5#4 0 +4 106023 1#11 0 +5 106024 7#15 0 +6 106025 15#24 0 +7 106026 4#24 0 +8 106027 16#3 0 +9 106028 18#3 0 +10 106018 1#1|2#1|9#1|15#1|16#1|17#1|18#1|19#1|20#1|1#2|2#2|8#2|15#2|19#2|1#3|2#3|8#3|15#3|19#3|20#3|2#4|3#4|8#4|15#4|19#4|20#4|2#5|3#5|4#5|5#5|8#5|15#5|16#5|18#5|19#5|4#6|5#6|8#6|15#6|19#6|20#6|5#7|6#7|7#7|8#7|15#7|19#7|20#7|5#8|6#8|7#8|8#8|11#8|12#8|13#8|14#8|19#8|4#9|8#9|9#9|10#9|11#9|12#9|13#9|14#9|19#9|20#9|4#10|9#10|12#10|13#10|14#10|19#10|20#10|4#11|9#11|14#11|15#11|19#11|20#11|4#12|9#12|14#12|15#12|19#12|4#13|9#13|14#13|15#13|19#13|20#13|4#14|9#14|14#14|15#14|19#14|20#14|2#15|3#15|4#15|9#15|14#15|15#15|19#15|1#16|2#16|5#16|9#16|14#16|15#16|16#16|19#16|20#16|1#17|2#17|6#17|9#17|14#17|17#17|18#17|19#17|20#17|1#18|2#18|7#18|8#18|14#18|18#18|20#18|1#19|2#19|7#19|8#19|14#19|18#19|20#19|1#20|2#20|8#20|14#20|18#20|1#21|2#21|8#21|14#21|18#21|1#22|2#22|8#22|14#22|18#22|1#23|2#23|8#23|9#23|10#23|11#23|12#23|13#23|14#23|18#23|1#24|2#24|9#24|18#24|1#25|2#25|9#25|17#25|18#25|1#26|2#26|3#26|9#26|16#26|17#26|1#27|2#27|3#27|4#27|10#27|16#27|17#27|1#28|2#28|3#28|4#28|5#28|10#28|15#28|1#29|2#29|3#29|4#29|5#29|6#29|7#29|8#29|9#29|10#29|11#29|15#29|1#30|2#30|3#30|4#30|5#30|6#30|7#30|8#30|9#30|10#30|11#30|12#30|13#30|14#30 1 +11 106019 17#5 0 +12 106008 11#15 0 +13 106007 6#24 0 +14 106017 17#2 0 +15 106006 10#4 0 +16 106005 6#11 0 +17 106004 19#22 0 +18 106003 16#21 0 +19 106002 2#8 0 +20 106001 6#2 0 diff --git a/conf/server/Map_107.txt b/conf/server/Map_107.txt index cfba6bdfb..f59763eb4 100644 --- a/conf/server/Map_107.txt +++ b/conf/server/Map_107.txt @@ -1,64 +1,13 @@ id Event Groups isMustAppear int int mut,int#int,2 int -1 107031 18#3|17#4|18#4 0 -2 107007 24#21|21#23|18#26|10#27 0 -3 107030 6#16 0 -4 107032 13#4|12#5|13#5 0 -5 107011 2#19|2#20|2#21 0 -6 107005 6#6|7#6|6#7|7#7 0 -7 107036 22#14 0 -8 107017 15#7 0 -9 107001 10#24|10#25|11#25 0 -10 107019 24#16 0 -11 107034 3#17|4#17 0 -12 107013 26#30 0 -13 107015 8#9 0 -14 107036 12#25 0 -15 107002 21#12 0 -16 107031 1#4|1#5|2#5 0 -17 107020 1#25 0 -18 107022 21#26 0 -19 107002 21#13 0 -20 107035 9#16|10#16 0 -21 107033 11#11|11#12 0 -22 107005 28#21|27#23|28#23|27#24|28#25 0 -23 107028 3#24 0 -24 107007 24#4|24#5|23#6|23#7 0 -25 107031 16#24|16#25 0 -26 107001 29#10|28#11|29#11 0 -27 107036 5#14 0 -28 107024 29#19 0 -29 107026 25#15 0 -30 107036 26#17 0 -31 107036 25#2 0 -32 107009 8#12|8#13|9#13|8#14 0 -33 107032 27#3|28#3|27#4 0 -34 107031 29#24|30#25|29#26|30#26 0 -35 107006 14#17|14#18|15#18 0 -36 107033 21#2|22#2|23#2 0 -37 107010 6#22|5#23|6#23 0 -38 107031 11#16|12#16|11#17|13#17 0 -39 107002 19#17|20#17|20#18 0 -40 107035 2#10 0 -41 107016 26#14 0 -42 107018 14#26 0 -43 107035 3#6 0 -44 107012 3#10|3#12|3#13 0 -45 107002 8#17|8#18|6#20 0 -46 107014 19#1 0 -47 107001 4#23|4#25 0 -48 107002 4#1|4#2|5#3 0 -49 107036 11#5 0 -50 107021 7#1|10#1|12#1|13#1|14#1|15#1|16#1|17#1|18#1|20#1|21#1|22#1|23#1|24#1|25#1|26#1|2#2|3#2|7#2|12#2|13#2|14#2|16#2|2#3|3#3|9#3|10#3|11#3|16#3|17#3|21#3|22#3|24#3|5#4|9#4|10#4|11#4|21#4|22#4|25#4|3#5|8#5|9#5|10#5|15#5|16#5|17#5|18#5|19#5|20#5|21#5|22#5|26#5|27#5|8#6|9#6|10#6|14#6|28#6|2#7|4#7|9#7|13#7|16#7|29#7|2#8|5#8|9#8|12#8|16#8|17#8|18#8|19#8|22#8|23#8|24#8|25#8|26#8|27#8|28#8|29#8|2#9|6#9|11#9|16#9|17#9|18#9|19#9|21#9|22#9|25#9|26#9|27#9|7#10|8#10|9#10|10#10|11#10|20#10|21#10|25#10|26#10|27#10|1#11|2#11|5#11|15#11|16#11|17#11|18#11|19#11|20#11|25#11|26#11|27#11|4#12|5#12|15#12|17#12|18#12|19#12|23#12|25#12|26#12|27#12|2#13|4#13|7#13|11#13|14#13|15#13|17#13|18#13|19#13|23#13|25#13|26#13|27#13|2#14|6#14|7#14|10#14|13#14|23#14|27#14|1#15|2#15|6#15|7#15|9#15|10#15|12#15|17#15|18#15|19#15|20#15|21#15|22#15|23#15|26#15|1#16|2#16|3#16|4#16|7#16|8#16|17#16|25#16|30#16|7#17|10#17|16#17|17#17|21#17|22#17|24#17|28#17|29#17|3#18|4#18|5#18|6#18|7#18|11#18|16#18|17#18|18#18|19#18|22#18|24#18|27#18|7#19|9#19|12#19|13#19|16#19|17#19|18#19|19#19|22#19|23#19|24#19|26#19|1#20|3#20|4#20|5#20|7#20|9#20|13#20|16#20|17#20|18#20|19#20|20#20|24#20|26#20|28#20|1#21|3#21|4#21|5#21|8#21|9#21|13#21|17#21|18#21|19#21|21#21|26#21|29#21|1#22|3#22|4#22|5#22|10#22|13#22|14#22|22#22|26#22|28#22|1#23|9#23|10#23|11#23|14#23|15#23|16#23|17#23|18#23|23#23|24#23|26#23|29#23|1#24|5#24|6#24|7#24|8#24|9#24|12#24|19#24|23#24|24#24|25#24|26#24|28#24|5#25|6#25|7#25|8#25|13#25|14#25|20#25|22#25|23#25|29#25|2#26|3#26|4#26|5#26|6#26|7#26|8#26|15#26|26#26|28#26|2#27|3#27|4#27|7#27|8#27|9#27|13#27|14#27|15#27|16#27|20#27|25#27|29#27|2#28|3#28|4#28|6#28|7#28|13#28|14#28|15#28|17#28|18#28|21#28|22#28|23#28|25#28|26#28|27#28|28#28|3#29|4#29|9#29|10#29|11#29|18#29|19#29|20#29|3#30|4#30|13#30|14#30|15#30|23#30|24#30|25#30|27#30|28#30|29#30|30#30 1 -51 107001 1#17|1#18|2#18 0 -52 107036 15#21 0 -53 107006 28#13|29#13|29#14|30#14 0 -54 107034 17#14|18#14 0 -55 107027 6#27 0 -56 107031 18#6|14#11|13#12 0 -57 107029 29#2 0 -58 107032 26#6|20#7|26#7 0 -59 107008 13#9|13#10|12#11 0 -60 107023 6#2 0 -61 107002 18#30|19#30|20#30 0 -62 107025 12#20 0 +1 107009 7#2|13#2|15#4|6#9|13#9|1#15|12#17|8#18|5#20 0 +2 107005 2#10|1#11|2#11|2#12 0 +3 107016 1#1|2#1|3#1|4#1|5#1|6#1|7#1|8#1|9#1|10#1|11#1|12#1|13#1|14#1|15#1|1#2|2#2|3#2|4#2|6#2|8#2|10#2|12#2|14#2|1#3|2#3|10#3|1#4|6#4|7#4|9#4|10#4|1#5|2#5|3#5|4#5|5#5|6#5|1#6|1#7|2#7|3#7|1#8|5#8|6#8|8#8|1#9|2#9|3#9|4#9|5#9|8#9|9#9|10#9|12#9|1#10|5#10|12#10|13#10|14#10|14#11|15#11|5#12|6#12|6#13|6#14|7#14|7#15|8#15|8#17|9#17|10#17|11#17|11#18|12#18|12#19|13#19 1 +4 107006 14#15|15#15|14#16|15#16 0 +5 107008 10#10 0 +6 107001 4#15|5#15|4#16|5#16 0 +7 107002 12#5|13#5|12#6|13#6 0 +8 107014 2#6 0 +9 107003 10#12|11#12|10#13|11#13 0 +10 107015 11#2 0 +11 107004 4#6|5#6|4#7|5#7 0 diff --git a/conf/server/Map_108.txt b/conf/server/Map_108.txt index 3ecf9be98..f509586ca 100644 --- a/conf/server/Map_108.txt +++ b/conf/server/Map_108.txt @@ -1,35 +1,28 @@ id Event Groups isMustAppear int int mut,int#int,2 int -1 108013 1#1|2#1|3#1|4#1|5#1|6#1|7#1|8#1|9#1|10#1|1#2|2#2|3#2|4#2|5#2|6#2|7#2|8#2|9#2|10#2|2#3|3#3|4#3|5#3|6#3|7#3|8#3|9#3|2#4|3#4|4#4|5#4|6#4|7#4|8#4|4#5|5#5|7#5|8#5|9#5|2#6|2#7|3#7|4#7|6#7|7#7|8#7|9#7|6#8|9#8|2#9|4#9|6#9|8#9|9#9|4#10|6#10|8#10|2#11|3#11|6#11|8#11|10#11|2#12|5#12|8#12|2#13|4#13|5#13|2#14|5#14|8#14|9#14|6#15|8#15|9#15|2#16|3#16|4#16|6#16|8#16|2#17|4#17|6#17|8#17|10#17|2#18|4#18|6#18|8#18|6#19|8#19|9#19|2#20|6#20 1 -2 108014 1#20 0 -3 108016 10#3 0 -4 108015 1#3 0 -5 108018 6#5 0 -6 108017 8#8 0 -7 108009 8#13 0 -8 108019 10#5|5#6|10#9|1#10|5#10|7#10|7#17|5#18 0 -9 108010 5#20 0 -10 108009 3#6 0 -11 108005 7#6|8#6 0 -12 108004 7#12 0 -13 108009 1#14 0 -14 108003 2#5 0 -15 108002 2#8|1#9 0 -16 108001 9#12|9#13|10#13 0 -17 108002 3#12|3#13 0 -18 108002 7#19|7#20|8#20 0 -19 108003 4#8|5#8 0 -20 108001 3#20 0 -21 108004 4#15|5#15|5#16 0 -22 108004 10#16 0 -23 108005 1#11|1#12 0 -24 108009 3#17 0 -25 108021 3#5|6#13|9#16 0 -26 108020 1#5|3#9|2#15|2#19|10#20 0 -27 108001 1#16|1#17|1#18 0 -28 108001 6#14|7#14|7#15 0 -29 108002 9#18|10#19 0 -30 108005 1#6|1#7 0 -31 108003 10#6|10#7 0 -32 108004 9#10 0 -33 108009 2#10 0 +1 108014 8#3 0 +2 108013 2#6 0 +3 108016 4#14 0 +4 108015 6#6 0 +5 108018 9#12|8#13|9#14 0 +6 108017 6#12|5#13|6#13|7#14 0 +7 108019 1#1|2#1|3#1|4#1|5#1|6#1|7#1|8#1|9#1|10#1|11#1|12#1|13#1|14#1|15#1|16#1|17#1|18#1|19#1|20#1|1#2|2#2|3#2|4#2|5#2|6#2|7#2|8#2|9#2|10#2|15#2|16#2|17#2|18#2|19#2|20#2|1#3|2#3|3#3|4#3|5#3|6#3|10#3|19#3|20#3|1#4|2#4|3#4|4#4|5#4|8#4|20#4|1#5|2#5|3#5|4#5|5#5|7#5|20#5|7#6|20#6|2#7|3#7|4#7|5#7|6#7|7#7|20#7|1#8|2#8|3#8|4#8|5#8|6#8|7#8|20#8|1#9|2#9|3#9|4#9|5#9|6#9|20#9|1#10|2#10|3#10|4#10|5#10|6#10|7#10|18#10|19#10|20#10|1#11|2#11|3#11|4#11|5#11|7#11|8#11|9#11|10#11|11#11|17#11|18#11|19#11|20#11|1#12|2#12|11#12|15#12|16#12|17#12|18#12|19#12|20#12|3#13|12#13|14#13|15#13|16#13|17#13|18#13|19#13|20#13|11#14|12#14|13#14|14#14|15#14|16#14|17#14|18#14|19#14|4#15|11#15|12#15|13#15|14#15|15#15|16#15|17#15|18#15|19#15|20#15 1 +8 108010 11#13 0 +9 108012 7#4 0 +10 108011 4#6 0 +11 108002 12#3|11#4|12#4|12#5 0 +12 108025 1#14 0 +13 108024 1#7 0 +14 108003 16#8|16#9|17#9|15#10|16#10 0 +15 108004 13#7|14#7|13#8|14#8 0 +16 108005 8#6|8#7|9#7|9#8 0 +17 108026 2#15 0 +18 108006 11#7|11#8|11#9|10#10|11#10 0 +19 108007 14#4 0 +20 108008 7#9 0 +21 108009 12#12 0 +22 108021 11#2 0 +23 108020 9#4 0 +24 108023 1#6 0 +25 108001 17#4|18#4|16#5|17#5 0 +26 108022 13#13 0 diff --git a/conf/server/MonsterGroup.txt b/conf/server/MonsterGroup.txt index 9a72df402..b3a0b7822 100644 --- a/conf/server/MonsterGroup.txt +++ b/conf/server/MonsterGroup.txt @@ -48,42 +48,42 @@ int mut,int#int,2 mut,int#int,1 10504 50242#50232#50234 3020 10505 50251#50247#50249#50253#50255 3020 10506 50260#50259#50261 55003 -10507 50266 3018#10410 -10508 50239 3020#10410 -10601 50274#50276#50271#50213 10110#10410 -10602 50381#50383#50385 10110#10410 -10603 50305#50304#50306 10110#10410 -10604 50314 10110#10410 -10605 50320 10110#10410 -10701 50325#50327 10701#20701 -10702 50334#50335 10702#20702 -10703 50346#50358 10703#20703 -10704 50329#50325#50327 null -10705 50341#50334#50335 null -10706 50346#50358#50343#50345 null -10707 50257 null -10708 50353#50349#50351 100006 -10709 50377 10705#20705 -10710 50362 10706#20706 -10711 50368 10707#20707 -10712 50371 10708#20708 -10713 50374 10709#20709 -10801 50380#50379#50381 100000 -10802 50386#50379#50381 100000 -10803 50395#50379#50381 100000 -10804 50401#50379#50381 100000 -10805 50410#50379#50381 100000 -10806 50386#50395#50401#50410 100000 -10807 50386#50395#50401#50410 100000 -10808 50386#50395#50401#50410 100000 -10809 50416#50419 100000 -10810 50416#50419 100000 -10811 50425#50428 100000 -10812 50386 100000 -10813 50395 100000 -10814 50404 100000 -10815 50413 100000 -10816 50422 100000 +10507 50266 10110#10411 +10508 50239 10110#10411 +10601 50274#50276#50271#50213 3026#10412 +10602 50381#50383#50385 3026#10412 +10603 50305#50304#50306 3026#10412 +10604 50314 10110#10411 +10605 50320 10110#10411 +10701 50325#50327 3031 +10702 50334#50335 3031 +10703 50346#50358 3031 +10704 50329#50325#50327 3031 +10705 50341#50334#50335 3031 +10706 50346#50358#50343#50345 3031 +10707 50257 3031#10412 +10708 50353#50349#50351 3031#10412 +10709 50377 10110#10411 +10710 50362 10110#10411 +10711 50368 10110#10411 +10712 50371 10110#10411 +10713 50374 10110#10411 +10801 50380#50379#50381 3036 +10802 50386#50379#50381 3036 +10803 50395#50379#50381 3036 +10804 50401#50379#50381 3036 +10805 50410#50379#50381 3036 +10806 50386#50395#50401#50410 3036 +10807 50386#50395#50401#50410 3036 +10808 50386#50395#50401#50410 3036 +10809 50416#50419 3036 +10810 50416#50419 3036 +10811 50425#50428 10110#10413 +10812 50386 3036#10412 +10813 50395 3036#10412 +10814 50404 3036#10412 +10815 50413 10110#10413 +10816 50422 10110#10413 10901 106#107#108 10901#20901 10902 109#110#111 10902#20902 10903 104#109#111 10903#20903 diff --git a/conf/server/RewardGroup.txt b/conf/server/RewardGroup.txt index 4343f06f1..d3806f2a3 100644 --- a/conf/server/RewardGroup.txt +++ b/conf/server/RewardGroup.txt @@ -633,6 +633,9 @@ int int mut,int#int,1 int int 10213 2 51019#51020#51021#51022#51023#51024#51025#51026#51027#51028 1 0 10409 2 51065#51066#51067#51068#51069#51070#51071#51072 1 0 10410 2 101#102#103#104#105#106#107#108#109#110#111#112#113#114#115#116#117#118 1 0 +10411 2 301#302#303#304#305#306#307#308#309#310#311#312#313#314#315#316#317#318#603 1 0 +10412 2 201#202#203#204#205#206#207#208#209#210#211#212#213#214#215#216#217#218 1 0 +10413 2 301#302#303#304#305#306#307#308#309#310#311#312#313#314#315#316#317#318 1 0 15001 1 110001 1 0 15002 1 110002 1 0 15003 1 110003 1 0 diff --git a/conf/server/RewardItemConfig.txt b/conf/server/RewardItemConfig.txt index f8b9f9857..059ef2989 100644 --- a/conf/server/RewardItemConfig.txt +++ b/conf/server/RewardItemConfig.txt @@ -76,6 +76,7 @@ int int int float int int 600 3001 1 1.0 0 0 601 12013 12 1.0 1 1 602 12013 9988 1.0 0 0 +603 12013 770 0 0 0 1000 3 100 1.0 18 22 1001 3 100 1.0 14 17 1002 3 100 1.0 14 17 diff --git a/serverlogic/src/main/java/com/ljsd/jieling/config/SGameSetting.java b/serverlogic/src/main/java/com/ljsd/jieling/config/SGameSetting.java index 5ae65b13f..1bb551a1b 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/config/SGameSetting.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/config/SGameSetting.java @@ -32,6 +32,8 @@ public class SGameSetting implements BaseConfig { private int adventureRefresh; + private String natureName; + private static SGameSetting gameSetting; @@ -106,4 +108,8 @@ public class SGameSetting implements BaseConfig { public int getAdventureRefresh() { return adventureRefresh; } + + public String getNatureName() { + return natureName; + } } \ No newline at end of file diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/ActivityManager.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/ActivityManager.java index e722e7b5e..055c9d11b 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/ActivityManager.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/ActivityManager.java @@ -23,6 +23,7 @@ public class ActivityManager extends MongoBase { activityMission.initMissionInfo(activityId); activityMission.init(getRootId(),getMongoKey()+".activityMissionMap." + activityId); activityMissionMap.put(activityId,activityMission); + activityState.put(activityId, ActivityType.OPEN_STATE); updateString("activityState." + activityId, ActivityType.OPEN_STATE); updateString("activityMissionMap." + activityId,activityMission); } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/UserManager.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/UserManager.java index 7b8b81658..d613ac659 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/UserManager.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/UserManager.java @@ -66,7 +66,8 @@ public class UserManager { private static void initPlayer(User user) throws Exception { SGameSetting gameSetting = SGameSetting.getGameSetting(); PlayerManager playerManager = user.getPlayerInfoManager(); - playerManager.setNickName("戒灵666"); + long now = TimeUtils.now(); + playerManager.setNickName(gameSetting.getNatureName()); playerManager.setLevel(1); playerManager.setExp(0); playerManager.setVipLevel(0); @@ -76,7 +77,8 @@ public class UserManager { playerManager.setGem(9999); playerManager.setChargeGem(666); playerManager.updateGuidePoint(1,1); - playerManager.setCreateTime(TimeUtils.now()); + playerManager.setCreateTime(now); + playerManager.setLoginTime(now); SPlayerLevelConfig sPlayerLevelConfig = SPlayerLevelConfig.getsPlayerLevelConfigMap().get(1); playerManager.setMaxStamina(sPlayerLevelConfig.getMaxEnergy()); ItemUtil.drop(user,gameSetting.getBornItem());