diff --git a/conf/server/ChallengeConfig.txt b/conf/server/ChallengeConfig.txt index 6d5cc33ba..988da763f 100644 --- a/conf/server/ChallengeConfig.txt +++ b/conf/server/ChallengeConfig.txt @@ -1,33 +1,33 @@ -Id OpenRule Time MapTime ReviveTime MostTime -int mut,int#int,2 int int mut,int#int,1 int -100 0#0 240 2147483647 0#0#0#10 600 -101 1051#0 120 600 0#0#0#10 300 -102 2051#0 180 600 0#0#0#10 300 -103 3051#0 180 600 0#0#0#10 300 -104 4051#0 240 600 0#0#0#10 300 -105 5051#0 240 900 0#0#0#10 300 -106 6051#0 240 900 0#0#0#10 300 -107 7051#0 240 900 0#0#0#10 300 -108 8051#0 240 1200 0#0#0#10 300 -109 9051#0 240 1200 0#0#0#10 300 -110 10051#0 240 1200 0#0#0#10 300 -111 11051#0 240 900 0#0#0#10 300 -112 12051#0 240 900 0#0#0#10 300 -113 13051#0 240 1200 0#0#0#10 300 -114 14051#0 240 1200 0#0#0#10 300 -115 15051#0 240 1200 0#0#0#10 300 -201 0#15 240 1200 0#0#0#10 300 -202 0#20 240 1200 0#0#0#10 300 -203 0#26 240 1200 0#0#0#10 300 -204 0#31 240 1200 0#0#0#10 300 -205 0#35 240 1200 0#0#0#10 300 -206 0#38 240 1200 0#0#0#10 300 -207 0#42 240 1200 0#0#0#10 300 -208 0#44 240 1200 0#0#0#10 300 -209 0#47 240 1200 0#0#0#10 300 -210 0#49 240 1200 0#0#0#10 300 -211 0#51 240 1200 0#0#0#10 300 -212 0#54 240 1200 0#0#0#10 300 -213 0#55 240 1200 0#0#0#10 300 -214 0#57 240 1200 0#0#0#10 300 -215 0#59 240 1200 0#0#0#10 300 +Id Type OpenRule Time MapTime ReviveTime MostTime +int int mut,int#int,2 int int mut,int#int,1 int +100 1 0#0 240 2147483647 0#0#0#10 600 +101 1 1051#0 120 600 0#0#0#10 300 +102 1 2051#0 180 600 0#0#0#10 300 +103 1 3051#0 180 600 0#0#0#10 300 +104 1 4051#0 240 600 0#0#0#10 300 +105 1 5051#0 240 900 0#0#0#10 300 +106 1 6051#0 240 900 0#0#0#10 300 +107 1 7051#0 240 900 0#0#0#10 300 +108 1 8051#0 240 1200 0#0#0#10 300 +109 1 9051#0 240 1200 0#0#0#10 300 +110 1 10051#0 240 1200 0#0#0#10 300 +111 1 11051#0 240 900 0#0#0#10 300 +112 1 12051#0 240 900 0#0#0#10 300 +113 1 13051#0 240 1200 0#0#0#10 300 +114 1 14051#0 240 1200 0#0#0#10 300 +115 1 15051#0 240 1200 0#0#0#10 300 +201 2 0#15 240 1200 0#0#0#10 300 +202 2 0#20 240 1200 0#0#0#10 300 +203 2 0#26 240 1200 0#0#0#10 300 +204 2 0#31 240 1200 0#0#0#10 300 +205 2 0#35 240 1200 0#0#0#10 300 +206 2 0#38 240 1200 0#0#0#10 300 +207 2 0#42 240 1200 0#0#0#10 300 +208 2 0#44 240 1200 0#0#0#10 300 +209 2 0#47 240 1200 0#0#0#10 300 +210 2 0#49 240 1200 0#0#0#10 300 +211 2 0#51 240 1200 0#0#0#10 300 +212 2 0#54 240 1200 0#0#0#10 300 +213 2 0#55 240 1200 0#0#0#10 300 +214 2 0#57 240 1200 0#0#0#10 300 +215 2 0#59 240 1200 0#0#0#10 300 diff --git a/conf/server/GameSetting.txt b/conf/server/GameSetting.txt index dc7723f6a..de048a097 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 DailyGift -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,1 -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 27#7 +Id BornItem SpeedFormula InitialEnergy EnergyRecoverSpeed ActionPowerRormula Speed HeroNumlimit EquipNumlimit WorldTalking BornPosition AdventureRefresh InvasionBossPrivilege InvasionBossTimesAdd AdventureOffline AdventureFastBattle AdventureFastBattlePrivilege AdventureBaseRewardPrivilege AdventureMineralPrivilege AdventureRunePrivilege NatureName ItemCompoundLimit HeroCompoundLimit EquipCompoundLimit DailyGift RecoveryTime HeroTimes +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,1 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 27#7 3600 5 diff --git a/conf/server/MonsterConfig.txt b/conf/server/MonsterConfig.txt index ef9f1aaa2..434376e18 100644 --- a/conf/server/MonsterConfig.txt +++ b/conf/server/MonsterConfig.txt @@ -222,9 +222,9 @@ int int int int int int int int int int int float float float float float float 1015122 42 1 0 1 0 1246 81 54 54 240 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 20257#20260 null 1015221 3 2 0 2 0 1687 102 54 54 400 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 20136#20139 null 1015222 4 3 0 2 0 1687 102 54 54 240 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 20011 null -1015331 5 1 0 3 0 1575 74 54 54 400 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 20013 null -1015332 5 1 0 3 0 1575 74 54 54 240 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 20014 null -1015333 5 1 0 3 0 1575 74 54 54 7 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 20015 null +1015331 5 1 0 3 0 1575 74 54 54 400 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 20142#20145 null +1015332 5 1 0 3 0 1575 74 54 54 240 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 20143#20146 null +1015333 5 1 0 3 0 1575 74 54 54 7 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 20144#20147 null 1021121 1 2 0 1 12 1339 141 73 73 880 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 20133 null 1021122 7 1 0 1 12 1339 141 73 73 17 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 20024 null 1022131 6 1 0 1 15 1984 88 91 91 1000 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 20148 null diff --git a/serverlogic/src/main/java/com/ljsd/jieling/config/SChallengeConfig.java b/serverlogic/src/main/java/com/ljsd/jieling/config/SChallengeConfig.java index 147e26dca..6eb90bf7c 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/config/SChallengeConfig.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/config/SChallengeConfig.java @@ -29,6 +29,8 @@ public class SChallengeConfig implements BaseConfig { private int mostTime; + private int type; + public int getId() { return id; } @@ -56,4 +58,8 @@ public class SChallengeConfig implements BaseConfig { public int getMostTime() { return mostTime; } + + public int getType() { + return type; + } }