diff --git a/conf/server/EventPointConfig.txt b/conf/server/EventPointConfig.txt index eef5aa283..9d1c413f4 100644 --- a/conf/server/EventPointConfig.txt +++ b/conf/server/EventPointConfig.txt @@ -1,5 +1,23 @@ Id Option int mut,int#int,1 +100001 100001#100002 +100002 100003#100004 +100003 100005 +100004 100006 +100005 100007 +100006 100008 +100007 100009 +100008 100010 +100009 100011 +100010 100012 +100011 100013 +100012 100014 +100013 100015 +100014 100016 +100015 100017 +100016 100018 +100017 100019 +100018 100020 101001 10101 101002 10102 101003 10110 @@ -153,17 +171,6 @@ int mut,int#int,1 101151 10105 101152 10106 101153 101204#101205 -101154 101206 -101155 101207 -101156 101208 -101157 101209 -101158 101210 -101159 101211 -101160 101212 -101161 101213 -101162 101214 -101163 101215 -101164 101216 102001 10201 102002 10202 102003 10204 @@ -289,8 +296,8 @@ int mut,int#int,1 103015 10101 103016 10101 103017 103022 -103018 103024#103025 -103019 103023 +103018 103023 +103019 103024#103025 103020 103026 103021 103027 103022 103028 @@ -343,3 +350,226 @@ int mut,int#int,1 103069 103084#103085#103086#103087 103070 10302 103071 10304 +104001 10401 +104002 10403 +104003 10407 +104004 10408 +104005 104001#104002 +104006 104003#104004 +104007 104005#104006 +104008 104007#104008 +104009 104009#104010 +104010 104011#104012 +104011 104013#104014 +104012 104015#104016 +104013 104017#104018 +104014 104019#104020 +104015 10409 +104016 null +104017 104021#104022 +104018 104023 +104019 104024 +104020 104025 +104021 104026#104027 +104022 104028#104029 +104023 104030#104031 +104024 104032#104033#104034 +104025 104035 +104026 104036#104037 +104027 104038#104039 +104028 104040#104041 +104029 104042#104043 +104030 104044 +104031 104045 +104032 104046#104047 +104135 104167 +104033 104048#104049 +104034 104050#104051 +104035 104052 +104036 104053#104054 +104037 104055#104056 +104038 104057#104058 +104039 104059 +104040 104060#104061 +104041 104062 +104042 104063#104064 +104043 104065#104066 +104044 104067 +104045 104068 +104046 104069#104070 +104047 104071 +104048 104072 +104049 104073 +104050 104074#104075 +104051 104076#104077 +104052 104078#104079 +104053 104080 +104054 104081#104082 +104055 104083 +104056 104084 +104057 104085 +104058 104086 +104059 104087 +104060 104088 +104061 104089 +104062 104090 +104063 104091 +104064 104092 +104065 104093 +104066 104094 +104067 104095 +104068 104096 +104069 104097 +104070 104098 +104071 104099 +104072 104100 +104073 104101 +104074 104102 +104075 104103 +104076 104104 +104077 104105 +104078 104106 +104079 104107 +104080 104108 +104081 104109 +104082 104110 +104083 104111 +104084 104112 +104085 104113 +104086 104114 +104087 104115 +104088 104116 +104089 104117 +104090 104118 +104091 104119#104120 +104136 104168 +104092 104121#104122 +104093 104123#104124 +104094 104125#104126 +104122 104158 +104095 104127 +104096 104128 +104097 104129 +104098 104130#104131#104132 +104099 104133 +104100 104134 +104101 104135 +104102 104136 +104103 104137 +104104 104138#104139 +104105 104140#104141 +104106 104142#104143 +104107 104144 +104108 104145#104146 +104109 104147 +104110 104148 +104111 104149 +104112 104150 +104113 104151 +104114 104152 +104115 104153 +104116 104154 +104117 104155 +104118 104156 +104119 104157 +104120 10402 +104121 10404 +104122 10405 +104123 10406 +104124 104158 +104125 104159 +104126 104160 +104127 104161 +104128 104162 +104129 104163 +104130 104164 +104131 104165 +104132 104166 +104133 null +104134 null +104135 10409 +104136 10409 +105001 10501 +105002 10502 +105003 10503 +105004 10504 +105005 105001#105002 +105006 105003#105004 +105007 105005#105006 +105008 105007#105008 +105009 105009#105010 +105010 105011#105012 +105011 105013#105014 +105012 105015#105016 +105013 105017#105018 +105014 105019#105020 +105015 105021#105022 +105016 105023#105024 +105017 105025#105026 +105018 105027#105028 +105019 105029#105030 +105020 105031#105032 +105021 105033 +105022 105034 +105023 105035 +105024 105036 +105025 105037 +105026 105038 +105027 105039 +105028 105040 +105029 105041 +105030 105042#105043 +105031 105044 +105032 105045 +105033 105046 +105034 105047#105048#105049 +105035 105050 +105036 105051 +105037 105052#105053#105054 +105038 105055 +105039 105056 +105040 105057#105058#105059 +105041 105060 +105042 105061 +105043 105062#105063#105064 +105044 105065 +105045 105066 +105046 105067#105068#105069 +105047 105070 +105048 105071 +105049 105072#105073#105074 +105050 105075 +105051 105076 +105052 105077#105078#105079 +105053 105080 +105054 105081 +105055 105082#105083 +105056 105084#105085 +105057 105086#105087 +105058 105088#105089 +105059 105090#105091 +105060 105092#105093 +105061 105094#105095 +105062 105096#105097 +105063 105098#105099 +105064 105100#105101#105102 +105065 105103#105104 +105066 105105#105106 +105067 105107 +105068 105108 +105069 105109#105110 +105070 105111 +105071 105112 +105072 105113 +105073 105114 +105074 105115 +105075 105116 +105076 105117 +105077 105118 +105078 105119 +105079 null +105080 null +105081 105120 +105082 105121 +105083 105122 +105084 105123 diff --git a/conf/server/GameSetting.txt b/conf/server/GameSetting.txt index 3ca421cc7..4e99277ad 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 int mut,int#int,2 mut,float#float,1 int int mut,int#int,1 mut,int#int,1 int int int mut,int#int,1 -1 4#100|14#100|10001#1|10002#1|10004#1|10007#1|10008#1|10012#1|10013#1|10019#1 0#0#0.3164#0 100 2 0#0#1#0 70#100 999 9999 1 05#09 +1 4#100|14#100|10001#1 0#0#0.3164#0 100 2 0#0#1#0 70#100 999 9999 1 05#09 diff --git a/conf/server/MapPointConfig.txt b/conf/server/MapPointConfig.txt index 9be96ff16..c09d2f796 100644 --- a/conf/server/MapPointConfig.txt +++ b/conf/server/MapPointConfig.txt @@ -1,6 +1,6 @@ Id Style Refresh TriggerRules ExploreValues InitialEventId int int int int int int -100001 3 3 2 0 100001 +100001 4 3 2 0 100001 100002 5 3 2 0 100002 0 0 0 0 0 0 101001 1 2 1 0 101001 @@ -26,7 +26,7 @@ int int int int int int 101011 5 3 2 0 101064 101012 5 3 2 0 101065 101013 8 2 0 0 0 -101016 5 3 2 0 101067 +101016 5 3 2 0 101149 101017 5 3 2 0 101113 101018 5 3 2 0 101114 101023 5 3 2 0 101131 @@ -112,19 +112,18 @@ int int int int int int 104018 5 3 2 0 104124 104019 5 3 2 0 104125 104020 5 3 2 0 104126 -104021 5 3 2 0 104016 +104021 5 3 2 0 104017 104022 5 3 2 0 104127 -104023 5 3 2 0 104032 +104023 5 3 2 0 104135 104024 5 3 2 0 104048 104025 5 3 2 0 104128 -104026 5 3 2 0 104091 +104026 5 3 2 0 104136 104027 5 3 2 0 104129 104028 5 3 2 0 104130 104029 5 3 2 0 104131 104030 5 3 2 0 104132 -104035 1 2 1 0 104133 -104036 1 2 1 0 104134 -104037 1 2 1 0 104135 +104036 1 2 1 0 104135 +104037 1 2 1 0 104136 0 0 0 0 0 0 105001 1 2 1 0 105001 105002 1 2 1 0 105002 @@ -162,69 +161,58 @@ int int int int int int 105034 5 3 2 0 105082 105035 5 3 2 0 105083 0 0 0 0 0 0 -106001 1 2 1 0 106001 -106002 1 2 1 0 106002 -106003 1 2 1 0 106003 -106004 2 2 2 0 106004 -106005 2 2 2 0 106005 -106006 2 2 2 0 106006 -106007 2 2 2 0 106007 -106008 2 2 2 0 106008 -106009 2 2 2 0 106009 -106010 2 2 2 0 106010 -106011 2 1 2 0 106011 -106012 3 2 2 0 106012 -106013 4 2 2 0 106013 -106014 9 2 2 0 106014 -106015 5 2 2 0 106015 -106016 9 2 2 0 106016 -106017 5 2 2 0 106017 -106018 8 0 0 0 0 -106019 5 3 2 0 106018 -106020 5 3 2 0 106019 -106021 5 3 2 0 106037 -106022 5 3 2 0 106055 -106023 5 3 2 0 106056 -106024 9 3 1 0 106070 -106025 1 2 1 0 0 -106026 1 2 1 0 0 -106027 1 2 1 0 0 -106028 1 2 1 0 0 -106029 1 2 1 0 0 +106001 1 2 1 0 0 +106002 1 2 1 0 0 +106003 1 2 1 0 0 +106004 2 2 2 0 0 +106005 2 2 2 0 0 +106006 2 2 2 0 0 +106007 2 2 2 0 0 +106008 2 2 2 0 0 +106009 2 2 2 0 0 +106010 2 2 2 0 0 +106011 2 1 2 0 0 +106012 3 2 2 0 0 +106013 4 2 2 0 0 +106014 5 3 1 0 0 +106015 5 3 2 0 0 +106016 5 3 1 0 0 +106017 5 3 2 0 0 +106018 5 3 1 0 0 +106019 5 3 2 0 0 +106020 8 0 0 0 0 +106021 5 3 2 0 0 +106022 5 3 2 0 0 +106023 5 3 2 0 0 +106024 5 3 2 0 0 +106025 5 3 2 0 0 +106026 9 3 1 0 0 0 0 0 0 0 0 -107001 1 2 1 0 107001 -107002 1 2 1 0 107002 -107003 1 2 1 0 107003 -107004 1 3 1 0 107004 -107005 2 2 2 0 107005 -107006 2 2 2 0 107006 -107007 2 2 2 0 107007 -107008 2 2 2 0 107008 -107009 2 2 2 0 107009 -107010 2 2 2 0 107010 -107011 2 2 2 0 107011 -107012 2 1 2 0 107012 -107013 3 2 2 0 107013 -107014 4 2 2 0 107014 -107015 5 3 1 0 107015 -107016 5 3 2 0 107016 -107017 5 3 1 0 107018 -107018 5 3 2 0 107019 -107019 5 3 1 0 107021 -107020 5 3 2 0 107022 -107021 8 0 0 0 0 -107022 5 3 2 0 107024 -107023 5 3 2 0 107035 -107024 5 3 2 0 107055 -107025 5 3 2 0 107056 -107026 5 3 2 0 107057 -107027 5 3 2 0 107058 -107028 5 3 2 0 107059 -107029 5 3 2 0 107060 -107030 5 3 2 0 107061 -107031 1 2 1 0 107062 -107032 1 2 1 0 107063 -107033 1 2 1 0 107064 -107034 1 2 1 0 107065 -107035 1 2 1 0 107066 -107036 1 3 1 0 107067 +107001 1 2 1 0 0 +107002 1 2 1 0 0 +107003 1 2 1 0 0 +107004 1 3 1 0 0 +107005 2 2 2 0 0 +107006 2 2 2 0 0 +107007 2 2 2 0 0 +107008 2 2 2 0 0 +107009 2 2 2 0 0 +107010 2 2 2 0 0 +107011 2 2 2 0 0 +107012 2 1 2 0 0 +107013 3 2 2 0 0 +107014 4 2 2 0 0 +107015 9 2 2 0 0 +107016 5 2 2 0 0 +107017 9 2 2 0 0 +107018 5 2 2 0 0 +107019 8 0 0 0 0 +107020 5 3 2 0 0 +107021 5 3 2 0 0 +107022 5 3 2 0 0 +107023 5 3 2 0 0 +107024 5 3 2 0 0 +107025 5 3 2 0 0 +107026 5 3 2 0 0 +107027 5 3 2 0 0 +107028 5 3 2 0 0 diff --git a/conf/server/MissionEventsConfig.txt b/conf/server/MissionEventsConfig.txt index 651ef47a5..b5cf4d804 100644 --- a/conf/server/MissionEventsConfig.txt +++ b/conf/server/MissionEventsConfig.txt @@ -1,6 +1,8 @@ Id Type MissionNum Reward OpenRules int int int int mut,int#int,1 -1 1 4 0 null -2 2 4 0 null -0 0 0 0 null -0 0 0 0 null +1 1 2 0 null +2 1 4 10102 null +3 1 3 0 null +4 1 3 0 null +5 1 4 0 null +6 1 4 0 null diff --git a/conf/server/MonsterConfig.txt b/conf/server/MonsterConfig.txt index 953cddb63..7726c3f29 100644 --- a/conf/server/MonsterConfig.txt +++ b/conf/server/MonsterConfig.txt @@ -1,29 +1,29 @@ Id MonsterId Type Profession Quality Level Hp Attack PhysicalDefence MagicDefence Speed Hit Dodge CritFactor CritDamageFactor DamageBonusFactor DamageReduceFactor SkillList PassiveSkillList int int int int int int int int int int int float float float float mut,int#int,1 mut,int#int,1 mut,int#int,1 mut,int#int,2 -1 1 2 0 1 5 965 260 152 152 180 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null -2 1 2 0 1 5 965 260 152 152 60 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null -3 1 2 0 1 5 965 260 152 152 5 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null -4 2 3 0 1 5 965 260 152 152 180 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null -5 2 3 0 1 5 965 260 152 152 60 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null -6 2 3 0 1 5 965 260 152 152 5 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null -7 3 2 0 1 5 965 260 152 152 180 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null -8 3 2 0 1 5 1931 520 305 305 60 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null -9 3 2 0 1 5 1931 520 305 305 5 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null -10 4 3 0 2 5 5794 1045 610 610 180 0.3 0.3 0.2 1.5 0#0#0#0#0#1 0#0#0#0#0#1 20001 null -11 4 3 0 2 5 5794 1045 610 610 60 0.3 0.3 0.2 1.5 0#0#0#0#0#1 0#0#0#0#0#1 20001 null -12 4 3 0 2 5 5794 1045 610 610 5 0.3 0.3 0.2 1.5 0#0#0#0#0#1 0#0#0#0#0#1 20001 null -13 5 2 0 1 5 2173 520 305 305 180 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -14 5 2 0 1 5 2173 520 305 305 60 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -15 5 2 0 1 5 2173 520 305 305 5 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -16 6 2 0 1 5 1931 520 305 305 180 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -17 6 2 0 1 5 1931 520 305 305 60 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -18 6 2 0 1 5 1931 520 305 305 5 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -19 7 1 0 1 5 6519 1560 915 915 180 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -20 7 1 0 1 5 6519 1560 915 915 60 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -21 7 1 0 1 5 6519 1560 915 915 5 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -22 8 2 0 2 5 8692 1567 915 915 180 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -23 8 2 0 2 5 8692 1567 915 915 60 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -24 8 2 0 2 5 8692 1567 915 915 5 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null +1 1 2 0 1 0 193 260 61 61 120 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null +2 1 2 0 1 0 193 260 61 61 40 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null +3 1 2 0 1 0 193 260 61 61 3 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null +4 2 3 0 1 0 193 260 61 61 120 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null +5 2 3 0 1 0 193 260 61 61 40 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null +6 2 3 0 1 0 193 260 61 61 3 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null +7 3 2 0 1 0 193 260 61 61 120 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null +8 3 2 0 1 0 193 260 61 61 40 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null +9 3 2 0 1 0 193 260 61 61 3 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null +10 4 3 0 2 0 1448 522 305 305 120 0.3 0.3 0.2 1.5 0#0#0#0#0#1 0#0#0#0#0#1 20001 null +11 4 3 0 2 0 1448 522 305 305 40 0.3 0.3 0.2 1.5 0#0#0#0#0#1 0#0#0#0#0#1 20001 null +12 4 3 0 2 0 1448 522 305 305 3 0.3 0.3 0.2 1.5 0#0#0#0#0#1 0#0#0#0#0#1 20001 null +13 5 2 0 1 0 193 260 61 61 120 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null +14 5 2 0 1 0 193 260 61 61 40 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null +15 5 2 0 1 0 193 260 61 61 3 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null +16 6 2 0 1 0 1931 520 305 305 120 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null +17 6 2 0 1 0 1931 520 305 305 40 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null +18 6 2 0 1 0 1931 520 305 305 3 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null +19 7 1 0 1 0 6519 1560 915 915 120 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null +20 7 1 0 1 0 6519 1560 915 915 40 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null +21 7 1 0 1 0 6519 1560 915 915 3 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null +22 8 2 0 2 0 8692 1567 915 915 120 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null +23 8 2 0 2 0 8692 1567 915 915 40 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null +24 8 2 0 2 0 8692 1567 915 915 3 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null 25 9 3 0 1 5 9657 2601 1526 1526 180 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null 26 9 3 0 1 5 9657 2601 1526 1526 60 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null 27 9 3 0 1 5 9657 2601 1526 1526 5 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null diff --git a/conf/server/MonsterGroup.txt b/conf/server/MonsterGroup.txt index 16030515d..e8d00e4f2 100644 --- a/conf/server/MonsterGroup.txt +++ b/conf/server/MonsterGroup.txt @@ -1,65 +1,71 @@ Id Contents Rewardgroup int mut,int#int,2 mut,int#int,1 -10101 1#2#3 null -10102 4#5#6 null -10103 7#8#9 null -10104 14#1#3 null -10105 14#4#6 null -10106 14#7#9 null -10107 11#1#3 null -10108 11#4#6 null -10109 11#7#9 null -10110 11 null -10201 16#17#18 null -10202 20#16#18 null -10203 23#16#18 null -10204 23 null -10205 23#19#21 null -10301 25#26#27 null -10302 28#29#30 null -10303 32#25#27 null -10304 32#28#30 null -10305 32 null -10401 34#35#36 null -10402 37#38#39 null -10403 41#34#36 null -10404 41#37#39 null -10405 44#34#36 null -10406 44#37#39 null -10407 44 null -10408 43#45#40#42 null -10501 46#48 null -10502 46#47#48 null -10503 50#46#48 null -10504 50 null -10505 49#51 null -10601 55#56#57 null -10602 53#55#57 null -10603 59#55#57 null -10604 59 null -10605 59#52#54 null -10701 70#71#72 null -10702 79#80#81 null -10703 65#71#80 null -10704 62#71#80 null -10705 77#71#80 null -10706 68 null -10707 77#62#65 null -10708 77 null -10709 74 null -10801 82#83#84 null -10802 88#89#90 null -10803 94#95#96 null -10804 86#89#95 null -10805 97#99 null -10806 92#85#87 null -10807 97#98#99 null -10808 92 null -10809 91#93#85#87 null -10901 106#107#108 null -10902 109#110#111 null -10903 104#109#111 null -10904 101#106#108 null -10905 113#101#104 null -10906 113 null -10907 116 null +10101 1#2#3 10101 +10102 4#5#6 10102 +10103 7#8#9 10103 +10104 14#1#3 10104 +10105 14#4#6 10105 +10106 14#7#9 10106 +10107 11#1#3 10107 +10108 11#4#6 10108 +10109 11#7#9 10109 +10110 11 10110 +10201 16#17#18 10201 +10202 20#16#18 10202 +10203 23#16#18 10203 +10204 23 10204 +10205 23#19#21 10205 +10301 25#26#27 10301 +10302 28#29#30 10302 +10303 32#25#27 10303 +10304 32#28#30 10304 +10305 32 10305 +10401 34#35#36 10401 +10402 37#38#39 10402 +10403 41#34#36 10403 +10404 41#37#39 10404 +10405 44#34#36 10405 +10406 44#37#39 10406 +10407 44 10407 +10408 43#45#40#42 10408 +10501 46#48 10501 +10502 46#47#48 10502 +10503 50#46#48 10503 +10504 50 10504 +10505 49#51 10505 +10601 55#56#57 10601 +10602 53#55#57 10602 +10603 59#55#57 10603 +10604 59 10604 +10605 59#52#54 10605 +10701 70#71#72 10701 +10702 79#80#81 10702 +10703 65#71#80 10703 +10704 62#71#80 10704 +10705 77#71#80 10705 +10706 68 10706 +10707 77#62#65 10707 +10708 77 10708 +10709 74 10709 +10801 82#83#84 10801 +10802 88#89#90 10802 +10803 94#95#96 10803 +10804 86#89#95 10804 +10805 97#99 10805 +10806 92#85#87 10806 +10807 97#98#99 10807 +10808 92 10808 +10809 91#93#85#87 10809 +10901 106#107#108 10901 +10902 109#110#111 10902 +10903 104#109#111 10903 +10904 101#106#108 10904 +10905 113#101#104 10905 +10906 113 10906 +10907 116 10907 +11001 124#125#126 11001 +11002 127#128#129 11002 +11003 119#125#128 11003 +11004 122#125#128 11004 +11005 122 11005 +11006 131 11006 diff --git a/conf/server/OptionAddCondition.txt b/conf/server/OptionAddCondition.txt index 1eb83f247..3ca0fd4b3 100644 --- a/conf/server/OptionAddCondition.txt +++ b/conf/server/OptionAddCondition.txt @@ -4,9 +4,11 @@ int int mut,int#int,2 2 3 1#5#3 3 3 1#2#3 4 1 1#101016#101112 -5 1 102022 +5 1 1#102022#102065 6 2 1503#1 7 3 1#3#3 8 3 1#4#3 9 3 1#2#3 10 4 2#2 +11 4 6#1 +12 2 1503#1 diff --git a/conf/server/OptionConfig.txt b/conf/server/OptionConfig.txt index 25e68e81c..d4e4fac7b 100644 --- a/conf/server/OptionConfig.txt +++ b/conf/server/OptionConfig.txt @@ -1,472 +1,763 @@ Id AddConditionID BehaviorType BehaviorTypeValues Reward JumpType JumpTypeValues -int int int mut,int#int,2 int int mut,int#int,2 -100001 0 13 1 0 4 null -100002 0 0 null 0 4 null -100003 0 11 1#100#0804#100001 0 5 100003 -100004 0 0 null 0 4 null -100005 0 0 null 0 5 100004 -100006 0 0 null 0 5 100005 -100007 0 0 null 0 5 100006 -100008 0 0 null 0 5 100007 -100009 0 0 null 0 1 100008 -100010 0 0 null 0 1 100009 -100011 0 0 null 0 1 100010 -100012 0 0 null 0 1 100011 -100013 0 0 null 0 1 100012 -100014 0 0 null 0 1 100013 -100015 0 1 10101 0 1 100014 -100016 0 0 null 0 5 100015 -100017 0 0 null 0 5 100016 -100018 0 0 null 0 5 100017 -100019 0 0 null 0 5 100018 -100020 0 15 100002 0 4 null +int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2 +100001 0 19 1#101#20#29 null 4 null +100002 0 0 null null 4 null +100003 0 11 1|100#8#4#100001 null 5 100003 +100004 0 0 null null 4 null +100005 0 0 null null 1 100004 +100006 0 0 null null 6 100005 +100007 0 0 null null 5 100006 +100008 0 0 null null 5 100007 +100009 0 0 null null 1 100008 +100010 0 0 null null 1 100009 +100011 0 0 null null 1 100010 +100012 0 0 null null 1 100011 +100013 0 0 null null 1 100012 +100014 0 0 null null 1 100013 +100015 0 1 10101 null 1 100014 +100016 0 0 null null 5 100015 +100017 0 0 null null 5 100016 +100018 0 0 null null 5 100017 +100019 0 0 null null 5 100018 +100020 0 15 100002 null 4 null 101001 1 2 1503#1 10102 4 null -101002 0 0 null 0 4 null -101003 0 5 0 0 4 null -101004 0 0 null 0 4 null -101005 0 0 null 0 5 101007 -101006 0 0 null 0 4 null -101007 0 0 null 0 5 101008 -101008 0 1 10101 0 1 101009 -101009 0 0 null 0 4 null -101010 0 1 10101 0 1 101010 -101011 0 0 null 0 4 null -101012 0 0 null 0 1 101011 -101013 0 0 null 0 1 101012 -101014 0 1 10101 0 1 101013 -101015 0 0 null 0 4 null +101002 0 0 null null 4 null +101003 0 5 0 null 4 null +101004 0 0 null null 4 null +101005 0 0 null null 5 101007 +101006 0 0 null null 4 null +101007 0 0 null null 5 101008 +101008 0 1 10101 null 1 101009 +101009 0 0 null null 4 null +101010 0 1 10101 null 1 101010 +101011 0 0 null null 4 null +101012 0 0 null null 1 101011 +101013 0 0 null null 1 101012 +101014 0 1 10101 null 1 101013 +101015 0 0 null null 4 null 101016 1 2 1503#1 10102 1 101014 -101017 0 0 null 0 1 101014 -101018 0 0 null 0 4 null -101019 0 0 null 0 1 101015 -101020 0 0 null 0 1 101016 -101021 0 0 null 0 1 101017 -101022 0 1 10102 0 1 101018 -101023 0 0 null 0 4 null -101024 0 0 null 0 1 101019 -101025 0 0 null 0 1 101020 -101026 0 1 10107 0 1 101021 -101027 0 0 null 0 4 null -101028 0 0 null 0 1 101022 -101029 0 0 null 0 1 101023 -101030 0 0 null 0 1 101024 -101031 0 0 null 0 1 101025 -101032 0 0 null 0 1 101026 -101033 0 0 null 0 6 101027 -101034 0 0 null 0 1 101028 -101035 0 0 null 0 1 101029 -101036 0 0 null 0 1 101030 -101037 0 0 null 0 6 101027 -101038 0 0 null 0 5 101032 -101039 0 0 null 0 4 null -101040 0 0 null 0 1 101033 -101041 0 0 null 0 1 101034 -101042 0 0 null 0 5 101035 -101043 0 1 10101 0 1 101036 -101044 0 0 null 0 4 null -101045 0 1 10102 0 1 101037 -101046 0 0 null 0 4 null -101047 0 1 10101 0 1 101038 -101048 0 0 null 0 4 null -101049 2 0 null 0 1 101039 -101050 0 0 null 0 4 null -101051 2 1 10103 0 1 101040 -101052 0 1 10102 0 1 101040 -101053 0 0 null 0 4 null +101017 0 0 null null 1 101014 +101018 0 0 null null 4 null +101019 0 0 null null 1 101015 +101020 0 0 null null 1 101016 +101021 0 0 null null 1 101017 +101022 0 1 10102 null 1 101018 +101023 0 0 null null 4 null +101024 0 0 null null 1 101019 +101025 0 0 null null 1 101020 +101026 0 1 10107 null 1 101021 +101027 0 0 null null 4 null +101028 0 0 null null 1 101022 +101029 0 0 null null 1 101023 +101030 0 0 null null 1 101024 +101031 0 0 null null 1 101025 +101032 0 0 null null 1 101026 +101033 0 0 null null 6 101027 +101034 0 0 null null 1 101028 +101035 0 0 null null 1 101029 +101036 0 0 null null 1 101030 +101037 0 0 null null 6 101027 +101038 0 0 null null 5 101032 +101039 0 0 null null 4 null +101040 0 0 null null 1 101033 +101041 0 0 null null 1 101034 +101042 0 0 null null 5 101035 +101043 0 1 10101 null 1 101036 +101044 0 0 null null 4 null +101045 0 1 10102 null 1 101037 +101046 0 0 null null 4 null +101047 0 1 10101 null 1 101038 +101048 0 0 null null 4 null +101049 2 0 null null 1 101039 +101050 0 0 null null 4 null +101051 2 1 10103 null 1 101040 +101052 0 1 10102 null 1 101040 +101053 0 0 null null 4 null 101054 0 0 null 10102 1 101041 -101055 0 0 null 0 4 null -101056 0 1 10101 0 1 101042 -101057 0 0 null 0 4 null -101058 0 0 null 0 1 101043 -101059 0 0 null 0 1 101043 -101060 0 1 10104 0 1 101044 -101061 0 0 null 0 4 null -101062 0 1 10103 0 5 101045 -101063 0 0 null 0 4 null -101064 0 0 null 0 1 101046 -101065 0 0 null 0 5 101047 -101066 0 0 null 0 5 101048 -101067 0 0 null 0 1 101049 -101068 0 17 1#101009#101#1318#101011#101#1213#101012 0 4 null -101069 0 0 null 0 1 101051 -101070 0 0 null 0 4 null -101071 0 1 10101 0 1 101052 -101072 0 0 null 0 4 null -101073 0 1 10102 0 1 101053 -101074 0 0 null 0 4 null -101075 3 0 null 0 1 101054 -101076 0 0 null 0 1 101054 -101077 0 0 null 0 4 null -101078 0 0 null 0 1 101055 -101079 0 1 10101 0 1 101056 -101080 0 0 null 0 4 null -101081 0 1 10103 0 1 101057 -101082 0 0 null 0 4 null +101055 0 0 null null 4 null +101056 0 1 10101 null 1 101042 +101057 0 0 null null 4 null +101058 0 0 null null 1 101043 +101059 0 0 null null 1 101043 +101060 0 1 10104 null 1 101044 +101061 0 0 null null 4 null +101062 0 1 10103 null 5 101045 +101063 0 0 null null 4 null +101064 0 0 null null 1 101046 +101065 0 0 null null 5 101047 +101066 0 0 null null 5 101048 +101067 0 0 null null 1 101049 +101068 0 17 1#101011|101#13#18#101012|101#12#13#101009 null 4 null +101069 0 0 null null 1 101051 +101070 0 0 null null 4 null +101071 0 1 10101 null 1 101052 +101072 0 0 null null 4 null +101073 0 1 10102 null 1 101053 +101074 0 0 null null 4 null +101075 3 0 null null 1 101054 +101076 0 0 null null 1 101054 +101077 0 0 null null 4 null +101078 0 0 null null 1 101055 +101079 0 1 10101 null 1 101056 +101080 0 0 null null 4 null +101081 0 1 10103 null 1 101057 +101082 0 0 null null 4 null 101083 0 0 null 10102 1 101058 101084 0 0 null 10102 1 101058 -101085 0 0 null 0 4 null -101086 0 1 10103 0 1 101059 -101087 0 0 null 0 4 null -101088 0 0 null 0 1 101060 -101089 0 0 null 0 1 101061 -101090 0 0 null 0 4 null -101091 3 0 null 0 1 101062 -101092 0 0 null 0 4 null -101093 0 1 10104 0 1 101063 -101094 0 0 null 0 4 null -101095 0 0 null 0 4 null -101096 0 18 10104#101011 0 4 null -101097 0 0 null 0 4 null -101098 0 1 10105 0 5 101135 -101099 0 0 null 0 4 null -101100 0 0 null 0 5 101068 -101101 0 0 null 0 4 null -101102 0 0 null 0 1 101069 -101103 0 0 null 0 1 101070 -101104 0 0 null 0 1 101071 -101105 0 0 null 0 1 101072 -101106 0 0 null 0 5 101073 -101107 0 1 10104 0 1 101074 -101108 2 1 10106 0 1 101074 -101109 0 0 null 0 4 null -101110 0 0 null 0 1 101075 -101111 0 0 null 0 1 101076 -101112 0 0 null 0 4 null -101113 0 0 null 0 5 101077 -101114 0 0 null 0 1 101078 -101115 0 0 null 0 5 101079 -101116 0 0 null 0 5 101080 -101117 0 0 null 0 5 101081 -101118 0 0 null 0 5 101082 -101119 0 0 null 0 5 101083 -101120 0 0 null 0 5 101084 -101121 0 0 null 0 5 101085 -101122 0 0 null 0 5 101086 -101123 0 1 10102 0 1 101087 -101124 0 1 10107 0 1 101088 -101125 0 1 10108 0 1 101089 -101126 0 1 10109 0 1 101090 -101127 0 0 null 0 1 101091 -101128 3 0 null 0 1 101091 -101129 0 1 10105 0 5 101092 -101130 0 0 null 0 5 101093 -101131 0 1 10110 0 5 101094 -101132 0 0 null 0 1 101095 -101133 0 0 null 0 1 101096 -101134 0 1 10110 0 1 101097 -101135 0 0 null 0 1 101098 -101136 0 0 null 0 1 101099 -101137 0 0 null 0 1 101100 -101138 0 0 null 0 1 101101 -101139 0 0 null 0 1 101102 -101140 0 0 null 0 1 101103 -101141 0 0 null 0 1 101104 -101142 0 0 null 0 1 101105 -101143 0 0 null 0 1 101106 -101144 0 0 null 0 1 101107 -101145 0 0 null 0 1 101108 -101146 0 0 null 0 1 101109 -101147 0 0 null 0 1 101110 -101148 0 0 null 0 1 101111 -101149 0 0 null 0 1 101112 -101150 0 11 2#101#0104#101 0 4 null -101151 0 0 null 0 4 null -101152 0 0 null 0 1 101115 -101153 0 0 null 0 4 null -101154 0 1 10102 0 1 101116 -101155 0 0 null 0 4 null -101156 0 1 10102 0 1 101117 -101157 0 0 null 0 4 null +101085 0 0 null null 4 null +101086 0 1 10103 null 1 101059 +101087 0 0 null null 4 null +101088 0 0 null null 1 101060 +101089 0 0 null null 1 101061 +101090 0 0 null null 4 null +101091 3 0 null null 1 101062 +101092 0 0 null null 4 null +101093 0 1 10104 null 1 101063 +101094 0 0 null null 4 null +101095 0 0 null null 4 null +101096 0 18 10104#101011 null 4 null +101097 0 0 null null 4 null +101098 0 1 10105 null 5 101135 +101099 0 0 null null 4 null +101100 0 0 null null 5 101068 +101101 0 0 null null 4 null +101102 0 0 null null 1 101069 +101103 0 0 null null 1 101070 +101104 0 0 null null 1 101071 +101105 0 0 null null 1 101072 +101106 0 0 null null 5 101073 +101107 0 1 10104 null 1 101074 +101108 2 1 10106 null 1 101074 +101109 0 0 null null 4 null +101110 0 0 null null 1 101075 +101111 0 0 null null 1 101076 +101112 0 0 null null 4 null +101113 0 0 null null 5 101077 +101114 0 0 null null 1 101078 +101115 0 0 null null 5 101079 +101116 0 0 null null 5 101080 +101117 0 0 null null 5 101081 +101118 0 0 null null 5 101082 +101119 0 0 null null 5 101083 +101120 0 0 null null 5 101084 +101121 0 0 null null 5 101085 +101122 0 0 null null 5 101086 +101123 0 1 10102 null 1 101087 +101124 0 1 10107 null 1 101088 +101125 0 1 10108 null 1 101089 +101126 0 1 10109 null 1 101090 +101127 0 0 null null 1 101091 +101128 3 0 null null 1 101091 +101129 0 1 10105 null 5 101092 +101130 0 0 null null 5 101093 +101131 0 1 10110 null 5 101094 +101132 0 0 null null 1 101095 +101133 0 0 null null 1 101096 +101134 0 1 10110 null 1 101097 +101135 0 0 null null 1 101098 +101136 0 0 null null 1 101099 +101137 0 0 null null 1 101100 +101138 0 0 null null 1 101101 +101139 0 0 null null 1 101102 +101140 0 0 null null 1 101103 +101141 0 0 null null 1 101104 +101142 0 0 null null 1 101105 +101143 0 0 null null 1 101106 +101144 0 0 null null 1 101107 +101145 0 0 null null 1 101108 +101146 0 0 null null 1 101109 +101147 0 0 null null 1 101110 +101148 0 0 null null 1 101111 +101149 0 0 null null 1 101112 +101150 0 11 2|101#1#4#101006 null 4 null +101151 0 0 null null 4 null +101152 0 0 null null 1 101115 +101153 0 0 null null 4 null +101154 0 1 10102 null 1 101116 +101155 0 0 null null 4 null +101156 0 1 10102 null 1 101117 +101157 0 0 null null 4 null 101158 0 0 null 10102 1 101118 -101159 0 0 null 0 4 null -101160 0 1 10105 0 1 101119 -101161 0 0 null 0 4 null -101162 0 0 null 0 1 101120 -101163 0 1 10101 0 1 101121 -101164 0 0 null 0 4 null -101165 0 0 null 0 1 101122 -101166 0 0 null 0 4 null -101167 0 1 10101 0 1 101123 -101168 0 0 null 0 4 null -101169 0 1 10102 0 1 101124 -101170 0 0 null 0 4 null -101171 0 1 10103 0 1 101125 -101172 0 0 null 0 4 null -101173 0 1 10103 0 1 101126 -101174 0 0 null 0 4 null -101175 0 0 null 0 4 null +101159 0 0 null null 4 null +101160 0 1 10105 null 1 101119 +101161 0 0 null null 4 null +101162 0 0 null null 1 101120 +101163 0 1 10101 null 1 101121 +101164 0 0 null null 4 null +101165 0 0 null null 1 101122 +101166 0 0 null null 4 null +101167 0 1 10101 null 1 101123 +101168 0 0 null null 4 null +101169 0 1 10102 null 1 101124 +101170 0 0 null null 4 null +101171 0 1 10103 null 1 101125 +101172 0 0 null null 4 null +101173 0 1 10103 null 1 101126 +101174 0 0 null null 4 null +101175 0 0 null null 4 null 101176 1 2 1503#1 10102 4 null -101177 0 0 null 0 4 null +101177 0 0 null null 4 null 101178 1 2 1503#1 10102 4 null -101179 0 0 null 0 4 null +101179 0 0 null null 4 null 101180 1 2 1503#1 10103 4 null -101181 0 0 null 0 4 null +101181 0 0 null null 4 null 101182 1 2 1503#1 10102 4 null -101183 0 0 null 0 4 null -101184 0 0 null 0 4 null -101185 0 0 null 0 4 null +101183 0 0 null null 4 null +101184 0 0 null null 4 null +101185 0 0 null null 4 null 101186 1 2 1503#1 10102 4 null -101187 0 0 null 0 4 null -101188 0 0 null 0 1 101136 -101189 0 0 null 0 1 101137 -101190 0 0 null 0 1 101138 -101191 0 0 null 0 1 101139 -101192 0 0 null 0 1 101140 -101193 0 0 null 0 1 101141 -101194 0 0 null 0 1 101142 -101195 0 15 101012 0 4 null -101196 0 0 null 0 5 101144 -101197 0 0 null 0 5 101146 -101198 0 0 null 0 1 101147 -101199 0 0 null 0 1 101148 -101200 0 0 null 0 4 null -101201 0 0 null 0 4 null -101202 10 0 null 0 5 101067 -101203 0 0 null 0 4 null -101204 0 19 2#102#0205 0 4 null -101205 0 0 null 0 4 null +101187 0 0 null null 4 null +101188 0 0 null null 1 101136 +101189 0 0 null null 1 101137 +101190 0 0 null null 1 101138 +101191 0 0 null null 1 101139 +101192 0 0 null null 1 101140 +101193 0 0 null null 1 101141 +101194 0 0 null null 1 101142 +101195 0 15 101012 null 4 null +101196 0 0 null null 5 101144 +101197 0 0 null null 5 101146 +101198 0 0 null null 1 101147 +101199 0 0 null null 1 101148 +101200 0 0 null null 4 null +101201 0 0 null null 4 null +101202 10 0 null null 5 101067 +101203 0 0 null null 4 null +101204 0 19 2#102#2#5 null 4 null +101205 0 0 null null 4 null 102001 1 2 1503#1 10102 4 null -102002 0 0 null 0 4 null +102002 0 0 null null 4 null 102003 1 2 1503#1 10102 4 null -102004 0 0 null 0 4 null +102004 0 0 null null 4 null 102005 1 2 1503#1 10102 4 null -102006 0 0 null 0 4 null +102006 0 0 null null 4 null 102007 1 2 1503#1 10102 4 null -102008 0 0 null 0 4 null +102008 0 0 null null 4 null 102009 1 2 1503#1 10102 4 null -102010 0 0 null 0 4 null +102010 0 0 null null 4 null 102011 1 2 1503#1 10102 4 null -102012 0 0 null 0 4 null +102012 0 0 null null 4 null 102013 1 2 1503#1 10102 4 null -102014 0 0 null 0 4 null -102015 0 1 10204 0 1 102012 -102016 0 0 null 0 4 null +102014 0 0 null null 4 null +102015 0 1 10204 null 1 102012 +102016 0 0 null null 4 null 102017 0 0 null 10102 4 null 102018 0 0 null 10102 4 null 102019 0 0 null 10102 4 null -102020 0 5 0 0 4 null -102021 0 0 null 0 4 null -102022 0 5 null 0 4 null -102023 0 0 null 0 4 null -102024 6 16 1503#1#102015 0 1 102016 -102025 0 0 null 0 4 null -102026 0 0 null 0 4 null -102027 0 0 null 0 1 102018 -102028 0 0 null 0 1 102019 -102029 0 0 null 0 4 null -102030 0 0 null 0 5 102021 -102031 0 0 null 0 4 null -102032 0 0 null 0 1 102022 -102033 0 0 null 0 1 102023 -102034 0 0 null 0 1 102024 -102035 0 0 null 0 1 102025 -102036 0 0 null 0 1 102026 -102037 0 0 null 0 1 102027 -102038 0 0 null 0 1 102028 -102039 0 0 null 0 1 102029 -102040 0 0 null 0 1 102030 -102041 0 0 null 0 1 102031 -102042 0 0 null 0 1 102032 -102043 0 0 null 0 1 102033 -102044 0 0 null 0 4 null -102045 0 0 null 0 4 null -102046 0 0 null 0 5 102036 -102047 0 0 null 0 5 102037 -102048 0 1 10201 0 4 null -102049 0 0 null 0 4 null -102050 0 0 null 0 5 102039 -102051 0 0 null 0 5 102040 -102052 0 1 10201 0 4 null -102053 0 0 null 0 4 null -102054 0 0 null 0 5 102042 -102055 0 0 null 0 5 102043 -102056 0 1 10202 0 4 null -102057 0 0 null 0 4 null -102058 0 0 null 0 1 102045 -102059 0 0 null 0 4 null -102060 3 0 null 0 1 102046 -102061 0 0 null 0 4 null -102062 0 0 null 0 1 102047 -102063 0 1 10201 0 1 102048 -102064 0 0 null 0 4 null -102065 0 1 10201 0 1 102049 -102066 0 0 null 0 4 null -102067 0 1 10201 0 1 102050 -102068 0 0 null 0 4 null -102069 0 0 null 0 1 102051 -102070 0 1 10202 0 1 102052 -102071 0 0 null 0 4 null +102020 0 5 0 null 4 null +102021 0 0 null null 4 null +102022 0 19 3#103#19#2 null 4 null +102023 0 0 null null 4 null +102024 6 16 1503#1#102015 null 1 102016 +102025 0 0 null null 4 null +102026 0 0 null null 4 null +102027 0 0 null null 1 102018 +102028 0 0 null null 1 102019 +102029 0 21 3#102016|102019#102037|102020#102040|102021#102043|102025#102105 null 4 null +102030 0 0 null null 5 102021 +102031 0 0 null null 4 null +102032 0 0 null null 1 102022 +102033 0 0 null null 1 102023 +102034 0 0 null null 1 102024 +102035 0 0 null null 1 102025 +102036 0 0 null null 1 102026 +102037 0 0 null null 1 102027 +102038 0 0 null null 1 102028 +102039 0 0 null null 1 102029 +102040 0 0 null null 1 102030 +102041 0 0 null null 1 102031 +102042 0 0 null null 1 102032 +102043 0 0 null null 1 102033 +102044 0 0 null null 4 null +102045 0 0 null null 4 null +102046 0 0 null null 5 102036 +102047 0 0 null null 5 102037 +102048 0 18 10201#102019 null 4 null +102049 0 0 null null 4 null +102050 0 0 null null 5 102039 +102051 0 0 null null 5 102040 +102052 0 18 10201#102020 null 4 null +102053 0 0 null null 4 null +102054 0 0 null null 5 102042 +102055 0 0 null null 5 102043 +102056 0 18 10201#102021 null 4 null +102057 0 0 null null 4 null +102058 0 0 null null 1 102045 +102059 0 0 null null 4 null +102060 3 0 null null 1 102046 +102061 0 0 null null 4 null +102062 0 0 null null 1 102047 +102063 0 1 10201 null 1 102048 +102064 0 0 null null 4 null +102065 0 1 10201 null 1 102049 +102066 0 0 null null 4 null +102067 0 1 10201 null 1 102050 +102068 0 0 null null 4 null +102069 0 0 null null 1 102051 +102070 0 1 10202 null 1 102052 +102071 0 0 null null 4 null 102072 0 0 null 10102 1 102053 -102073 0 0 null 0 4 null -102074 0 0 null 0 1 102054 -102075 0 0 null 0 1 102054 -102076 0 0 null 0 4 null -102077 7 0 null 0 1 102055 -102078 8 0 null 0 1 102055 -102079 0 1 10202 0 1 102056 -102080 0 0 null 0 4 null -102081 9 0 null 0 5 102057 -102082 0 0 null 0 4 null -102083 0 0 null 0 1 102058 -102084 0 0 null 0 1 102059 -102085 0 0 null 0 1 102060 -102086 0 0 null 0 1 102061 -102087 0 0 null 0 1 102062 -102088 0 0 null 0 1 102063 -102089 0 0 null 0 1 102064 -102090 0 0 null 0 1 102065 -102091 0 0 null 0 4 null -102092 0 0 null 0 1 102067 -102093 0 0 null 0 4 null -102094 0 0 null 0 1 102068 -102095 0 0 null 0 4 null -102096 0 0 null 0 1 102069 -102097 0 0 null 0 1 102070 -102098 0 0 null 0 1 102071 -102099 0 1 10201 0 1 102072 -102100 0 0 null 0 4 null -102101 0 1 10201 0 1 102073 -102102 0 0 null 0 4 null -102103 0 1 10201 0 1 102074 -102104 0 0 null 0 4 null +102073 0 0 null null 4 null +102074 0 0 null null 1 102054 +102075 0 0 null null 1 102054 +102076 0 0 null null 4 null +102077 7 0 null null 1 102055 +102078 8 0 null null 1 102055 +102079 0 1 10202 null 1 102056 +102080 0 0 null null 4 null +102081 9 0 null null 5 102057 +102082 0 0 null null 4 null +102083 0 0 null null 1 102058 +102084 0 0 null null 1 102059 +102085 0 0 null null 1 102060 +102086 0 0 null null 1 102061 +102087 0 0 null null 1 102062 +102088 0 0 null null 1 102063 +102089 0 0 null null 1 102064 +102090 0 0 null null 1 102065 +102091 0 15 102022 null 4 null +102092 0 0 null null 1 102067 +102093 0 0 null null 4 null +102094 0 0 null null 1 102068 +102095 0 0 null null 4 null +102096 0 0 null null 1 102069 +102097 0 0 null null 1 102070 +102098 0 0 null null 1 102071 +102099 0 1 10201 null 1 102072 +102100 0 0 null null 4 null +102101 0 1 10201 null 1 102073 +102102 0 0 null null 4 null +102103 0 1 10201 null 1 102074 +102104 0 0 null null 4 null 102105 0 1 10203 10102 1 102075 102106 0 0 null 10102 1 102075 -102107 0 0 null 0 4 null -102108 0 1 10203 0 3 102076#102077|1#5 -102109 0 0 null 0 3 102076#102077|1#5 -102110 0 0 null 0 4 null -102111 0 1 10202 0 1 102078 -102112 0 0 null 0 4 null -102113 0 0 null 0 6 102075 -102114 1 2 1503#1 0 1 102079 -102115 0 0 null 0 1 102079 -102116 0 0 null 0 4 null -102117 0 1 10202 0 1 102080 -102118 0 0 null 0 4 null +102107 0 0 null null 4 null +102108 0 1 10203 null 3 102076#102077|1#5 +102109 0 0 null null 3 102076#102077|1#5 +102110 0 0 null null 4 null +102111 0 1 10202 null 1 102078 +102112 0 0 null null 4 null +102113 0 0 null null 6 102075 +102114 1 2 1503#1 null 1 102079 +102115 0 0 null null 1 102079 +102116 0 0 null null 4 null +102117 0 1 10202 null 1 102080 +102118 0 0 null null 4 null 102119 0 0 null 10102 6 102081 -102120 0 0 null 0 4 null -102121 0 0 null 0 1 102082 -102122 0 0 null 0 1 102083 -102123 0 0 null 0 6 102081 -102124 0 0 null 0 1 102085 -102125 0 0 null 0 4 null -102126 0 1 10201 0 1 102086 -102127 0 0 null 0 4 null -102128 0 1 10201 0 1 102087 -102129 0 0 null 0 4 null -102130 0 1 10201 0 1 102088 -102131 0 0 null 0 4 null -102132 0 1 10201 0 1 102089 -102133 0 0 null 0 4 null -102134 0 1 10202 0 1 102090 -102135 0 0 null 0 4 null -102136 0 1 10202 0 1 102091 -102137 0 0 null 0 4 null -102138 0 1 10203 0 1 102092 -102139 0 0 null 0 4 null -102140 0 1 10203 0 1 102093 -102141 0 0 null 0 4 null -102142 0 1 10205 0 1 102094 -102143 0 0 null 0 4 null +102120 0 0 null null 4 null +102121 0 0 null null 1 102082 +102122 0 0 null null 1 102083 +102123 0 0 null null 6 102081 +102124 0 0 null null 1 102085 +102125 0 0 null null 4 null +102126 0 1 10201 null 1 102086 +102127 0 0 null null 4 null +102128 0 1 10201 null 1 102087 +102129 0 0 null null 4 null +102130 0 1 10201 null 1 102088 +102131 0 0 null null 4 null +102132 0 1 10201 null 1 102089 +102133 0 0 null null 4 null +102134 0 1 10202 null 1 102090 +102135 0 0 null null 4 null +102136 0 1 10202 null 1 102091 +102137 0 0 null null 4 null +102138 0 1 10203 null 1 102092 +102139 0 0 null null 4 null +102140 0 1 10203 null 1 102093 +102141 0 0 null null 4 null +102142 0 1 10205 null 1 102094 +102143 0 0 null null 4 null 102144 0 0 null 10102 5 102095 -102145 0 0 null 0 4 null -102146 0 0 null 0 1 102096 -102147 0 0 null 0 1 102097 -102148 0 0 null 0 1 102098 -102149 0 0 null 0 1 102099 -102150 0 0 null 0 1 102100 -102151 0 0 null 0 1 102101 -102152 0 0 null 0 1 102102 -102153 0 0 null 0 1 102103 -102154 0 0 null 0 1 102104 -102155 0 0 null 0 1 102105 -102156 0 0 null 0 4 null -102157 0 0 null 0 4 null -102158 0 0 null 0 4 null +102145 0 0 null null 4 null +102146 0 0 null null 1 102096 +102147 0 0 null null 1 102097 +102148 0 0 null null 1 102098 +102149 0 0 null null 1 102099 +102150 0 0 null null 1 102100 +102151 0 0 null null 1 102101 +102152 0 0 null null 1 102102 +102153 0 0 null null 1 102103 +102154 0 0 null null 1 102104 +102155 0 0 null null 1 102105 +102156 0 15 102025 null 4 null +102157 0 0 null null 4 null +102158 0 0 null null 4 null 103001 1 2 1503#1 10102 4 null -103002 0 0 null 0 4 null +103002 0 0 null null 4 null 103003 1 2 1503#1 10102 4 null -103004 0 0 null 0 4 null +103004 0 0 null null 4 null 103005 1 2 1503#1 10102 4 null -103006 0 0 null 0 4 null +103006 0 0 null null 4 null 103007 1 2 1503#1 10102 4 null -103008 0 0 null 0 4 null +103008 0 0 null null 4 null 103009 1 2 1503#1 10102 4 null -103010 0 0 null 0 4 null +103010 0 0 null null 4 null 103011 1 2 1503#1 10102 4 null -103012 0 0 null 0 4 null +103012 0 0 null null 4 null 103013 1 2 1503#1 10102 4 null -103014 0 0 null 0 4 null -103015 0 5 0 0 4 null -103016 0 0 null 0 4 null -103017 0 0 null 0 4 null -103018 0 0 null 0 4 null -103019 0 1 10301 0 1 103014 -103020 0 0 null 0 4 null -103021 0 0 null 0 4 null -103022 0 0 null 0 4 null -103023 0 0 null 0 4 null -103024 0 0 null 0 3 103019#103020|1#1 -103025 0 0 null 0 4 null -103026 0 0 null 0 1 103021 -103027 0 0 null 0 1 103022 -103028 0 0 null 0 1 103023 -103029 0 0 null 0 1 103024 -103030 0 0 null 0 5 103025 -103031 0 0 null 0 5 103026 -103032 0 0 null 0 5 103027 -103033 0 1 10302 0 5 103028 -103034 0 0 null 0 4 null -103035 0 0 null 0 1 103029 -103036 0 0 null 0 1 103030 -103037 0 0 null 0 1 103031 -103038 0 0 null 0 1 103032 -103039 0 0 null 0 1 103033 -103040 0 0 null 0 1 103034 -103041 0 0 null 0 1 103035 -103042 0 0 null 0 1 103036 -103043 0 0 null 0 1 103037 -103044 0 0 null 0 1 103038 -103045 0 0 null 0 1 103039 -103046 0 0 null 0 1 103040 -103047 0 0 null 0 1 103041 -103048 0 0 null 0 4 null -103049 0 0 null 0 1 103043 -103050 0 0 null 0 4 null -103051 0 1 10301 0 1 103044 -103052 0 0 null 0 4 null -103053 0 1 10301 0 1 103045 -103054 0 0 null 0 4 null -103055 0 0 null 0 1 103046 -103056 0 0 null 0 4 null -103057 0 0 null 0 1 103047 -103058 2 0 null 0 1 103047 -103059 0 0 null 0 4 null -103060 0 1 10302 0 1 103048 -103061 0 0 null 0 4 null -103062 0 0 null 0 1 103049 -103063 2 0 null 0 1 103050 -103064 0 0 null 0 4 null -103065 0 0 null 0 1 103051 -103066 0 1 10303 0 1 103052 -103067 0 1 10304 0 1 103053 -103068 0 1 10304 0 5 103054 -103069 0 0 null 0 1 103055 -103070 0 0 null 0 1 103056 -103071 0 0 null 0 1 103057 -103072 0 0 null 0 1 103058 -103073 0 0 null 0 1 103059 -103074 0 0 null 0 1 103060 -103075 0 0 null 0 1 103061 -103076 0 0 null 0 1 103062 -103077 0 0 null 0 1 103063 -103078 0 0 null 0 1 103064 -103079 0 0 null 0 4 null -103080 0 0 null 0 4 null -103081 0 0 null 0 4 null -103082 0 0 null 0 4 null -103083 0 0 null 0 5 103069 +103014 0 0 null null 4 null +103015 0 5 0 null 4 null +103016 0 0 null null 4 null +103017 0 19 4#104#2#3 null 4 null +103018 0 0 null null 4 null +103019 0 1 10301 null 1 103014 +103020 0 0 null null 4 null +103021 0 0 null null 4 null +103022 0 0 null null 4 null +103023 0 0 null null 4 null +103024 0 0 null null 3 103019#103020|1#1 +103025 0 0 null null 4 null +103026 0 0 null null 1 103021 +103027 0 0 null null 1 103022 +103028 0 0 null null 1 103023 +103029 0 0 null null 1 103024 +103030 0 0 null null 5 103025 +103031 0 0 null null 5 103026 +103032 0 0 null null 5 103027 +103033 0 1 10302 null 5 103028 +103034 0 0 null null 4 null +103035 0 0 null null 1 103029 +103036 0 0 null null 1 103030 +103037 0 0 null null 1 103031 +103038 0 0 null null 1 103032 +103039 0 0 null null 1 103033 +103040 0 0 null null 1 103034 +103041 0 0 null null 1 103035 +103042 0 0 null null 1 103036 +103043 0 0 null null 1 103037 +103044 0 0 null null 1 103038 +103045 0 0 null null 1 103039 +103046 0 0 null null 1 103040 +103047 0 0 null null 1 103041 +103048 0 11 4|103#13#15#103012 null 4 null +103049 0 0 null null 1 103043 +103050 0 0 null null 4 null +103051 0 1 10301 null 1 103044 +103052 0 0 null null 4 null +103053 0 1 10301 null 1 103045 +103054 0 0 null null 4 null +103055 0 0 null null 1 103046 +103056 0 0 null null 4 null +103057 0 0 null null 1 103047 +103058 2 0 null null 1 103047 +103059 0 0 null null 4 null +103060 0 1 10302 null 1 103048 +103061 0 0 null null 4 null +103062 0 0 null null 1 103049 +103063 2 0 null null 1 103050 +103064 0 0 null null 4 null +103065 0 0 null null 1 103051 +103066 0 1 10303 null 1 103052 +103067 0 1 10304 null 1 103053 +103068 0 1 10304 null 5 103054 +103069 0 0 null null 1 103055 +103070 0 0 null null 1 103056 +103071 0 0 null null 1 103057 +103072 0 0 null null 1 103058 +103073 0 0 null null 1 103059 +103074 0 0 null null 1 103060 +103075 0 0 null null 1 103061 +103076 0 0 null null 1 103062 +103077 0 0 null null 1 103063 +103078 0 0 null null 1 103064 +103079 0 9 4 null 11 103018#103019 +103080 0 0 null null 4 null +103081 0 0 null null 4 null +103082 0 0 null null 4 null +103083 0 0 null null 5 103069 103084 0 0 null 10101 4 null 103085 0 0 null 10101 4 null 103086 0 0 null 10101 4 null 103087 0 0 null 10101 4 null +104001 1 2 1503#1 10102 4 null +104002 0 0 null null 4 null +104003 1 2 1503#1 10102 4 null +104004 0 0 null null 4 null +104005 1 2 1503#1 10102 4 null +104006 0 0 null null 4 null +104007 1 2 1503#1 10102 4 null +104008 0 0 null null 4 null +104009 1 2 1503#1 10102 4 null +104010 0 0 null null 4 null +104011 1 2 1503#1 10102 4 null +104012 0 0 null null 4 null +104013 1 2 1503#1 10102 4 null +104014 0 0 null null 4 null +104015 1 2 1503#1 10102 4 null +104016 0 0 null null 4 null +104017 0 5 0 null 4 null +104018 0 0 null null 4 null +104019 0 19 5#105#14#4 null 4 null +104020 0 0 null null 4 null +104021 0 0 null null 1 104017 +104022 0 0 null null 4 null +104023 0 0 null null 5 104018 +104024 0 0 null null 1 104019 +104025 0 0 null 10102 5 104020 +104026 0 0 null null 1 104021 +104027 0 0 null null 4 null +104028 0 1 10401 null 1 104022 +104029 0 0 null null 4 null +104030 0 1 10401 null 1 104023 +104031 0 0 null null 4 null +104032 0 0 null null 1 104024 +104033 0 1 10402 null 1 104025 +104034 0 0 null null 4 null +104035 0 0 null null 1 104026 +104036 0 0 null null 1 104027 +104037 0 0 null null 4 null +104038 0 1 10402 null 1 104028 +104039 0 0 null null 4 null +104040 0 1 10401 null 1 104029 +104041 0 0 null null 4 null +104042 0 1 10402 null 1 104030 +104043 0 0 null null 4 null +104044 0 0 null null 5 104031 +104045 0 0 null 10102 11 104023#104032 +104046 0 0 null null 1 104033 +104047 0 0 null null 4 null +104048 0 0 null null 1 104034 +104049 0 0 null null 4 null +104050 0 1 10401 null 1 104035 +104051 0 0 null null 4 null +104052 0 0 null 10102 1 104036 +104053 0 1 10402 null 1 104037 +104054 0 0 null null 4 null +104055 0 1 10401 null 1 104038 +104056 0 0 null null 4 null +104057 0 1 10403 null 1 104039 +104058 0 0 null null 4 null +104059 0 0 null null 1 104040 +104060 0 0 null null 1 104041 +104061 0 0 null null 4 null +104062 0 0 null null 1 104042 +104063 0 0 null null 1 104043 +104064 0 0 null null 4 null +104065 0 0 null null 1 104044 +104066 0 0 null null 4 null +104067 0 0 null null 1 104045 +104068 0 0 null null 1 104046 +104069 0 0 null 10102 1 104047 +104070 0 0 null null 11 104024#104048 +104071 0 0 null null 4 null +104072 0 0 null null 1 104050 +104073 0 0 null null 4 null +104074 0 2 1503#1 null 1 104051 +104075 0 0 null null 4 null +104076 0 0 null null 1 104052 +104077 0 0 null null 4 null +104078 0 1 10403 null 1 104053 +104079 0 0 null null 4 null +104080 0 0 null null 1 104054 +104081 3 0 null null 1 104055 +104082 0 0 null null 1 104055 +104083 0 0 null null 5 104056 +104084 0 0 null null 1 104057 +104085 0 0 null null 1 104058 +104086 0 0 null null 1 104059 +104087 0 1 10405 null 5 104060 +104088 0 0 null null 5 104061 +104089 0 0 null null 5 104062 +104090 0 0 null null 5 104063 +104091 0 0 null null 1 104064 +104092 0 0 null null 1 104065 +104093 0 0 null null 1 104066 +104094 0 0 null null 1 104067 +104095 0 0 null null 1 104068 +104096 0 0 null null 1 104069 +104097 0 0 null 10102 5 104070 +104098 0 1 10403 10102 1 104071 +104099 0 1 10404 null 1 104072 +104100 0 0 null null 1 104073 +104101 0 0 null null 5 104074 +104102 0 0 null null 5 104075 +104103 0 0 null null 5 104076 +104104 0 0 null null 1 104077 +104105 0 0 null null 1 104078 +104106 0 1 10406 null 1 104079 +104107 0 0 null null 1 104080 +104108 0 0 null null 1 104081 +104109 0 0 null null 1 104082 +104110 0 0 null null 1 104083 +104111 0 0 null null 1 104084 +104112 0 0 null null 1 104085 +104113 0 0 null null 1 104086 +104114 0 0 null null 1 104087 +104115 0 0 null null 1 104088 +104116 0 0 null null 1 104089 +104117 0 0 null null 1 104090 +104118 0 0 null null 11 104026#104091 +104119 0 0 null null 1 104092 +104120 0 0 null null 4 null +104121 0 1 10403 null 1 104093 +104122 0 0 null null 4 null +104123 0 1 10403 null 1 104094 +104124 0 0 null null 4 null +104125 3 0 null null 3 104095#104122|1#3 +104126 0 0 null null 4 null +104127 0 0 null null 1 104096 +104128 0 0 null null 1 104097 +104129 0 0 null null 1 104098 +104130 0 0 null null 1 104099 +104131 0 0 null null 1 104101 +104132 0 0 null null 1 104104 +104133 0 0 null null 1 104100 +104134 0 0 null null 1 104098 +104135 0 0 null null 1 104102 +104136 0 0 null null 1 104103 +104137 0 0 null null 1 104098 +104138 0 0 null null 1 104105 +104139 0 0 null null 4 null +104140 0 0 null null 1 104106 +104141 0 0 null null 4 null +104142 0 0 null null 1 104107 +104143 0 0 null null 4 null +104144 0 0 null null 1 104108 +104145 0 0 null 10102 5 104109 +104146 0 0 null null 4 null +104147 0 0 null null 1 104110 +104148 0 0 null null 1 104111 +104149 0 0 null null 1 104112 +104150 0 0 null null 1 104113 +104151 0 0 null null 1 104114 +104152 0 0 null null 1 104115 +104153 0 0 null null 1 104116 +104154 0 0 null null 1 104117 +104155 0 0 null null 1 104118 +104156 0 11 5|104#40#3#104014 null 1 104119 +104157 0 15 104026 null 4 null +104158 0 0 null null 4 null +104159 0 0 null null 4 null +104160 0 0 null null 4 null +104161 0 0 null null 4 null +104162 0 0 null null 4 null +104163 0 0 null null 4 null +104164 0 0 null null 4 null +104165 0 0 null null 4 null +104166 0 0 null null 4 null +104167 0 0 null null 4 null +104168 0 0 null null 4 null +105001 1 2 1503#1 10102 4 null +105002 0 0 null null 4 null +105003 1 2 1503#1 10102 4 null +105004 0 0 null null 4 null +105005 1 2 1503#1 10102 4 null +105006 0 0 null null 4 null +105007 1 2 1503#1 10102 4 null +105008 0 0 null null 4 null +105009 1 2 1503#1 10102 4 null +105010 0 0 null null 4 null +105011 1 2 1503#1 10102 4 null +105012 0 0 null null 4 null +105013 1 2 1503#1 10102 4 null +105014 0 0 null null 4 null +105015 1 2 1503#1 10102 4 null +105016 0 0 null null 4 null +105017 0 5 0 null 4 null +105018 0 0 null null 4 null +105019 0 19 6#106#6#17 null 4 null +105020 0 0 null null 4 null +105021 3 0 null 10102 4 null +105022 0 0 null null 4 null +105023 3 0 null 10102 4 null +105024 0 0 null null 4 null +105025 3 0 null 10102 4 null +105026 0 0 null null 4 null +105027 3 0 null 10102 4 null +105028 0 0 null null 4 null +105029 1 1 10505 null 4 null +105030 0 0 null null 4 null +105031 0 0 null null 5 105020 +105032 0 0 null null 4 null +105033 0 0 null null 5 105021 +105034 0 0 null null 5 105022 +105035 0 0 null null 1 105023 +105036 0 0 null null 1 105024 +105037 0 0 null null 1 105025 +105038 0 0 null null 1 105026 +105039 0 0 null null 1 105027 +105040 0 0 null null 1 105028 +105041 0 0 null null 5 105029 +105042 0 0 null null 5 105030 +105043 0 0 null null 5 105030 +105044 0 0 null null 1 105031 +105045 0 0 null null 1 105032 +105046 0 21 6#105023|105025#105039|105027#105045|105030#105054|105031#105057 null 4 null +105047 0 0 null null 1 105034 +105048 11 0 null null 1 105035 +105049 0 0 null null 4 null +105050 0 0 null null 4 null +105051 0 1 10502 null 4 null +105052 0 0 null null 1 105037 +105053 11 0 null null 1 105038 +105054 0 0 null null 4 null +105055 0 0 null null 4 null +105056 0 1 10502 null 4 null +105057 0 0 null null 1 105040 +105058 11 0 null null 1 105041 +105059 0 0 null null 4 null +105060 0 0 null null 4 null +105061 0 1 10502 null 4 null +105062 0 0 null null 1 105043 +105063 11 0 null null 1 105044 +105064 0 0 null null 4 null +105065 0 0 null null 4 null +105066 0 1 10502 null 4 null +105067 0 0 null null 1 105046 +105068 11 0 null null 1 105047 +105069 0 0 null null 4 null +105070 0 0 null null 4 null +105071 0 1 10502 null 4 null +105072 0 0 null null 1 105049 +105073 11 0 null null 1 105050 +105074 0 0 null null 4 null +105075 0 0 null null 4 null +105076 0 1 10502 null 4 null +105077 0 0 null null 1 105052 +105078 11 0 null null 1 105053 +105079 0 0 null null 4 null +105080 0 0 null null 4 null +105081 0 1 10502 null 4 null +105082 0 0 null null 1 105055 +105083 0 0 null null 4 null +105084 11 0 null null 1 105056 +105085 0 0 null null 4 null +105086 0 1 10502 null 1 105057 +105087 0 0 null null 4 null +105088 0 0 null null 4 null +105089 0 0 null null 4 null +105090 0 0 null null 3 105059#105084|1#12 +105091 0 0 null null 4 null +105092 0 1 10501 null 1 105060 +105093 0 0 null null 4 null +105094 0 0 null 10102 1 105061 +105095 0 0 null null 4 null +105096 0 1 10503 null 1 105062 +105097 0 0 null null 4 null +105098 0 1 10501 null 1 105063 +105099 0 0 null null 4 null +105100 0 1 10502 null 1 105064 +105101 0 0 null null 1 105064 +105102 0 0 null null 4 null +105103 0 1 10502 null 1 105065 +105104 0 0 null null 4 null +105105 3 0 null null 1 105066 +105106 0 0 null null 4 null +105107 0 0 null null 1 105067 +105108 0 0 null null 1 105068 +105109 0 0 null null 1 105069 +105110 0 0 null null 4 null +105111 0 0 null null 5 105070 +105112 0 0 null null 1 105071 +105113 0 0 null null 5 105072 +105114 0 0 null null 5 105073 +105115 0 0 null null 1 105074 +105116 0 0 null null 5 105075 +105117 0 0 null null 5 105076 +105118 0 11 6|105#3#20#105014 null 1 105077 +105119 0 15 105032 null 4 null +105120 0 0 null null 4 null +105121 0 0 null null 4 null +105122 0 0 null null 4 null +105123 0 0 null null 4 null diff --git a/serverlogic/src/main/java/com/ljsd/jieling/config/SOptionConfig.java b/serverlogic/src/main/java/com/ljsd/jieling/config/SOptionConfig.java index 0cd7462f4..3e24c4e11 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/config/SOptionConfig.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/config/SOptionConfig.java @@ -23,7 +23,7 @@ public class SOptionConfig implements BaseConfig{ private int[][] behaviorTypeValues; - private int reward; + private int[] reward; private int jumpType; @@ -47,7 +47,7 @@ public class SOptionConfig implements BaseConfig{ return behaviorTypeValues; } - public int getReward() { + public int[] getReward() { return reward; } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/EventType.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/EventType.java index 2012bafa2..96f2ea6a0 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/EventType.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/EventType.java @@ -45,6 +45,12 @@ public class EventType { * 行为参数:事件点id * 16 消耗道具并销毁事件点 * 行为参数:道具id#num#事件点id + * 17 完成任务往下推一步,摧毁指定事件点,开启新的事件点,完成所有事件点再推一步任务 + * 行为参数:任务id#事件点id#地图id#坐标id#事件点id#地图id#坐标id#摧毁事件点id + * 18 战斗并销毁指定事件点 + * 行为参数:怪物组id#事件点id + * 19 完成任务往下推一步,行动到某张地图某坐标点,不摧毁事件点 + * 行为参数:任务id#地图id#坐标(不输入地图id和坐标而输入0代表回主城) */ public static final int fight = 1; public static final int useItem = 2; @@ -60,4 +66,9 @@ public class EventType { public static final int useItemMission = 14; public static final int destroyPoint = 15; public static final int useItemAndDestroy = 16; + public static final int monitorMissionAndDestroyPoint = 17; + public static final int fightAndDestroyPoint = 18; + public static final int monitorMissionAndMove = 19; + public static final int destroyPointAnd = 20; + } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java index 371f2c368..eee102afa 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java @@ -67,6 +67,7 @@ public class MapLogic { MessageUtil.sendErrorResponse(iSession, 0, messageType.getNumber(), "阵容不存在"); return; } + int totalStep = 0; Set heroes = new HashSet<>(teamPosHeroInfos.size()); for (TeamPosHeroInfo heroInfo : teamPosHeroInfos) { Hero hero = user.getHeroManager().getHero(heroInfo.getHeroId()); @@ -75,10 +76,12 @@ public class MapLogic { } hero.setCurHp(HeroLogic.getInstance().calHeroAttribute(hero, GlobalsDef.HP_TYPE)); heroes.add(heroInfo.getHeroId()); + totalStep += HeroLogic.getInstance().calHeroAttribute(hero, GlobalsDef.ACTION_POWER_RORMULA_TYPE); } if (heroes.size() != teamPosHeroInfos.size()) { return; } + mapManager.setTotalStep(totalStep); mapManager.setHeroes(heroes); } if (mapManager.getCurMapId() == 0) { @@ -405,18 +408,19 @@ public class MapLogic { break; } } - if (behaviorType != EventType.jump && behaviorType != EventType.destroyMission) { + cell = mapManager.getMapInfo().get(mapManager.getCurXY()); + // 检测该事件点是否已被销毁 + if (cell != null) { cell.setEventId(nextPoint); mapManager.addOrUpdateCell(mapManager.getCurXY(), cell); } if (behaviorType == EventType.dun && eventUpdateResponse.getMission() != null) { Mission mission = user.getMissionManager().getDoingMissions().get(eventUpdateResponse.getMission().getItemId()); - if (mission != null) { + if (mission != null && cell != null) { mission.updateMapPoints(cell.getPointId(), cell.getEventId()); } } - int[] reward = {sOptionConfig.getReward()}; - CommonProto.Drop.Builder dropBuilder = ItemUtil.drop(user, reward, 1); + CommonProto.Drop.Builder dropBuilder = ItemUtil.drop(user, sOptionConfig.getReward(), 1); List eventBehaviorValuesList = new ArrayList<>(); for (int i = 0; i < sOptionConfig.getBehaviorTypeValues().length; i++) { CommonProto.EventBehaviorValues.Builder eventBehaviorValues = CommonProto.EventBehaviorValues @@ -436,8 +440,8 @@ public class MapLogic { if (dropBuilder != null) { eventUpdateResponse.setDrop(dropBuilder); } - LOGGER.info("updateEvent =====>success<====== xy=>{}, getPointId=>{} eventId={}, mission=>{}, nextPoint=>{}", mapManager.getCurXY(), cell.getPointId(), - cell.getEventId(), eventUpdateResponse.getMission(), nextPoint); + LOGGER.info("updateEvent =====>success<====== xy=>{}, getPointId=>{} eventId={}, mission=>{}, nextPoint=>{}", mapManager.getCurXY(), cell == null ? 0 : cell.getPointId(), + cell == null ? 0 : cell.getEventId(), eventUpdateResponse.getMission(), nextPoint); MessageUtil.sendMessage(session, 1, messageType.getNumber(), eventUpdateResponse.build(), true); } @@ -493,7 +497,7 @@ public class MapLogic { CommonProto.Mission openMission; StringBuilder state = null; String states = ""; - if (mission.getMissionInfos() != null) { + if (mission.getMissionInfos() != null && !mission.getMissionInfos().isEmpty()) { state = new StringBuilder(); for (Map.Entry cellEntry : mission.getMissionInfos().entrySet()) { state.append(cellEntry.getKey()); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapManager.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapManager.java index 208ceb065..cff99422a 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapManager.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapManager.java @@ -28,6 +28,8 @@ public class MapManager extends MongoBase { private Set walkCells; + private int totalStep; + private Map crossMapInfos = new ConcurrentHashMap<>(); public Map getMapInfo() { @@ -120,4 +122,13 @@ public class MapManager extends MongoBase { updateString( "maxMapId", maxMapId); this.maxMapId = maxMapId; } + + public int getTotalStep() { + return totalStep; + } + + public void setTotalStep(int totalStep) throws Exception { + updateString( "totalStep", totalStep); + this.totalStep = totalStep; + } } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/BehaviorUtil.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/BehaviorUtil.java new file mode 100644 index 000000000..1ff577af1 --- /dev/null +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/BehaviorUtil.java @@ -0,0 +1,95 @@ +package com.ljsd.jieling.handler.map.behavior; + +import com.ljsd.jieling.core.GlobalsDef; +import com.ljsd.jieling.db.redis.RedisKey; +import com.ljsd.jieling.db.redis.RedisUtil; +import com.ljsd.jieling.handler.map.Cell; +import com.ljsd.jieling.handler.map.MapLogic; +import com.ljsd.jieling.handler.map.MapManager; +import com.ljsd.jieling.handler.mission.Mission; +import com.ljsd.jieling.handler.mission.MissionLogic; +import com.ljsd.jieling.logic.dao.Hero; +import com.ljsd.jieling.logic.dao.User; +import com.ljsd.jieling.logic.hero.HeroLogic; +import com.ljsd.jieling.protocols.CommonProto; +import com.ljsd.jieling.protocols.MapInfoProto; +import com.ljsd.jieling.util.CBean2Proto; +import com.ljsd.jieling.util.MonsterUtil; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Set; + +public class BehaviorUtil { + + private static final Logger LOGGER = LoggerFactory.getLogger(BehaviorUtil.class); + /** + * 销毁事件点 + * @param user + * @throws Exception + */ + public static void distoryPoint(User user) throws Exception { + Map mapInfo = user.getMapManager().getMapInfo(); + mapInfo.remove(user.getMapManager().getCurXY()); + user.getMapManager().setMapInfo(mapInfo); + LOGGER.info("distoryPoint=========>{}", user.getMapManager().getCurXY()); + } + + /** + * 获取战斗数据 + * @param user + * @param behaviorTypeValues + * @param eventUpdateResponse + * @throws Exception + */ + public static void getFightInfo(User user, int[][] behaviorTypeValues, MapInfoProto.EventUpdateResponse.Builder eventUpdateResponse) throws Exception { + MapManager mapManager = user.getMapManager(); + String key = RedisKey.getKey(RedisKey.FIGHT, user.getId() + RedisKey.UNDERLINE_LINE + Integer.toString(behaviorTypeValues[0][0]), false); + RedisUtil.getInstence().set(key, user.getId(), RedisKey.EXPIRE_TIME); + Set heroes = mapManager.getHeroes(); + List heroFightInfos = new ArrayList<>(heroes.size()); + for (String heroId : heroes) { + Hero hero = user.getHeroManager().getHero(heroId); + if (hero == null || hero.getCurHp() == 0) { + continue; + } + float attack = HeroLogic.getInstance().calHeroAttribute(hero, GlobalsDef.ATTACK_TYPE); + float physicalDefence = HeroLogic.getInstance().calHeroAttribute(hero, GlobalsDef.PHYSICAL_DEFENCE_TYPE); + float magicDefence = HeroLogic.getInstance().calHeroAttribute(hero, GlobalsDef.MAGIC_DEFENCE_TYPE); + float hp = hero.getCurHp(); + float speed = HeroLogic.getInstance().calHeroAttribute(hero, GlobalsDef.SPEED_TYPE); + CommonProto.Hero heroProto = CBean2Proto.getHero(hero); + CommonProto.HeroFightInfo heroFightInfo = CommonProto.HeroFightInfo + .newBuilder() + .setAttack(attack) + .setPhysicalDefence(physicalDefence) + .setMagicDefence(magicDefence) + .setHp(hp) + .setSpeed(speed) + .setHero(heroProto) + .build(); + heroFightInfos.add(heroFightInfo); + } + eventUpdateResponse.addAllHeroFightInfos(heroFightInfos); + List monsterByGroup = MonsterUtil.getMonsterByGroup(behaviorTypeValues[0][0]); + eventUpdateResponse.addAllMonsterList(monsterByGroup); + } + + /** + * 更新任务 + */ + public static boolean updateMission(User user, int[][] behaviorTypeValues, MapInfoProto.EventUpdateResponse.Builder eventUpdateResponse) throws Exception{ + Map doingMissions = user.getMissionManager().getDoingMissions(); + Mission mission = doingMissions.get(behaviorTypeValues[0][0]); + if (mission == null) { + return false; + } + MissionLogic.getInstance().checkMission(mission, user); + CommonProto.Mission missionProto = MapLogic.getInstance().getMission(mission); + eventUpdateResponse.setMission(missionProto); + return true; + } +} diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/DestroyPointAndBehavior.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/DestroyPointAndBehavior.java new file mode 100644 index 000000000..f4e7d9429 --- /dev/null +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/DestroyPointAndBehavior.java @@ -0,0 +1,22 @@ +package com.ljsd.jieling.handler.map.behavior; + +import com.ljsd.jieling.handler.map.EventType; +import com.ljsd.jieling.logic.dao.User; +import com.ljsd.jieling.protocols.MapInfoProto; +import org.springframework.stereotype.Component; + +@Component +public class DestroyPointAndBehavior extends BaseBehavior { + @Override + public int getBehaviorType() { + return EventType.destroyPointAnd; + } + + @Override + public boolean process(User user, int[][] behaviorTypeValues, MapInfoProto.EventUpdateResponse.Builder eventUpdateResponse) throws Exception { + BehaviorUtil.distoryPoint(user); + // TODO 监视地图 + + return true; + } +} diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/DestroyPointBehavior.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/DestroyPointBehavior.java index ee810f178..ec37bf9eb 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/DestroyPointBehavior.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/DestroyPointBehavior.java @@ -17,9 +17,7 @@ public class DestroyPointBehavior extends BaseBehavior { @Override public boolean process(User user, int[][] behaviorTypeValues, MapInfoProto.EventUpdateResponse.Builder eventUpdateResponse) throws Exception { - Map mapInfo = user.getMapManager().getMapInfo(); - mapInfo.remove(user.getMapManager().getCurXY()); - user.getMapManager().setMapInfo(mapInfo); + BehaviorUtil.distoryPoint(user); return true; } } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/FightAndDestroyPointBehavior.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/FightAndDestroyPointBehavior.java new file mode 100644 index 000000000..c6261fd1b --- /dev/null +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/FightAndDestroyPointBehavior.java @@ -0,0 +1,21 @@ +package com.ljsd.jieling.handler.map.behavior; + +import com.ljsd.jieling.handler.map.EventType; +import com.ljsd.jieling.logic.dao.User; +import com.ljsd.jieling.protocols.MapInfoProto; +import org.springframework.stereotype.Component; + +@Component +public class FightAndDestroyPointBehavior extends BaseBehavior { + @Override + public int getBehaviorType() { + return EventType.fightAndDestroyPoint; + } + + @Override + public boolean process(User user, int[][] behaviorTypeValues, MapInfoProto.EventUpdateResponse.Builder eventUpdateResponse) throws Exception { + BehaviorUtil.getFightInfo(user, behaviorTypeValues, eventUpdateResponse); + BehaviorUtil.distoryPoint(user); + return false; + } +} diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/FightBehavior.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/FightBehavior.java index ad01bdbff..8fecfb794 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/FightBehavior.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/FightBehavior.java @@ -30,36 +30,7 @@ public class FightBehavior extends BaseBehavior { @Override public boolean process(User user, int[][] behaviorTypeValues, MapInfoProto.EventUpdateResponse.Builder eventUpdateResponse) throws Exception { - MapManager mapManager = user.getMapManager(); - String key = RedisKey.getKey(RedisKey.FIGHT, user.getId() + RedisKey.UNDERLINE_LINE + Integer.toString(behaviorTypeValues[0][0]), false); - RedisUtil.getInstence().set(key, user.getId(), RedisKey.EXPIRE_TIME); - Set heroes = mapManager.getHeroes(); - List heroFightInfos = new ArrayList<>(heroes.size()); - for (String heroId : heroes) { - Hero hero = user.getHeroManager().getHero(heroId); - if (hero == null || hero.getCurHp() == 0) { - continue; - } - float attack = HeroLogic.getInstance().calHeroAttribute(hero, GlobalsDef.ATTACK_TYPE); - float physicalDefence = HeroLogic.getInstance().calHeroAttribute(hero, GlobalsDef.PHYSICAL_DEFENCE_TYPE); - float magicDefence = HeroLogic.getInstance().calHeroAttribute(hero, GlobalsDef.MAGIC_DEFENCE_TYPE); - float hp = hero.getCurHp(); - float speed = HeroLogic.getInstance().calHeroAttribute(hero, GlobalsDef.SPEED_TYPE); - CommonProto.Hero heroProto = CBean2Proto.getHero(hero); - CommonProto.HeroFightInfo heroFightInfo = CommonProto.HeroFightInfo - .newBuilder() - .setAttack(attack) - .setPhysicalDefence(physicalDefence) - .setMagicDefence(magicDefence) - .setHp(hp) - .setSpeed(speed) - .setHero(heroProto) - .build(); - heroFightInfos.add(heroFightInfo); - } - eventUpdateResponse.addAllHeroFightInfos(heroFightInfos); - List monsterByGroup = MonsterUtil.getMonsterByGroup(behaviorTypeValues[0][0]); - eventUpdateResponse.addAllMonsterList(monsterByGroup); + BehaviorUtil.getFightInfo(user, behaviorTypeValues, eventUpdateResponse); return true; } } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/FinishMissionBehavior.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/FinishMissionBehavior.java index 1637705ce..31f20cc9d 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/FinishMissionBehavior.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/FinishMissionBehavior.java @@ -1,16 +1,10 @@ package com.ljsd.jieling.handler.map.behavior; import com.ljsd.jieling.handler.map.EventType; -import com.ljsd.jieling.handler.map.MapLogic; -import com.ljsd.jieling.handler.mission.Mission; -import com.ljsd.jieling.handler.mission.MissionLogic; import com.ljsd.jieling.logic.dao.User; -import com.ljsd.jieling.protocols.CommonProto; import com.ljsd.jieling.protocols.MapInfoProto; import org.springframework.stereotype.Component; -import java.util.Map; - @Component public class FinishMissionBehavior extends BaseBehavior { @Override @@ -20,14 +14,6 @@ public class FinishMissionBehavior extends BaseBehavior { @Override public boolean process(User user, int[][] behaviorTypeValues, MapInfoProto.EventUpdateResponse.Builder eventUpdateResponse) throws Exception { - Map doingMissions = user.getMissionManager().getDoingMissions(); - Mission mission = doingMissions.get(behaviorTypeValues[0][0]); - if (mission == null) { - return false; - } - MissionLogic.getInstance().checkMission(mission, user); - CommonProto.Mission missionProto = MapLogic.getInstance().getMission(mission); - eventUpdateResponse.setMission(missionProto); - return true; + return BehaviorUtil.updateMission(user, behaviorTypeValues, eventUpdateResponse); } } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/MonitorMissionAndDestroyPointBehavior.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/MonitorMissionAndDestroyPointBehavior.java new file mode 100644 index 000000000..7b58fc8a9 --- /dev/null +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/MonitorMissionAndDestroyPointBehavior.java @@ -0,0 +1,34 @@ +package com.ljsd.jieling.handler.map.behavior; + +import com.ljsd.jieling.config.MapPointConfig; +import com.ljsd.jieling.handler.map.Cell; +import com.ljsd.jieling.handler.map.EventType; +import com.ljsd.jieling.logic.dao.User; +import com.ljsd.jieling.protocols.MapInfoProto; +import com.ljsd.jieling.util.CellUtil; +import org.springframework.stereotype.Component; + +@Component +public class MonitorMissionAndDestroyPointBehavior extends BaseBehavior { + @Override + public int getBehaviorType() { + return EventType.monitorMissionAndDestroyPoint; + } + + @Override + public boolean process(User user, int[][] behaviorTypeValues, MapInfoProto.EventUpdateResponse.Builder eventUpdateResponse) throws Exception { + BehaviorUtil.updateMission(user, behaviorTypeValues, eventUpdateResponse); + // 销毁事件点 + BehaviorUtil.distoryPoint(user); + // 开新事件 + if (user.getMapManager().getCurMapId() == behaviorTypeValues[0][1]) { + int x = behaviorTypeValues[1][0]; + int y = behaviorTypeValues[1][1]; + int xy = CellUtil.xy2Pos(x, y); + MapPointConfig mapPointConfig = MapPointConfig.scMapEventMap.get(behaviorTypeValues[1][2]); + Cell cellValue = new Cell(xy, mapPointConfig.getInitialEventId(), mapPointConfig.getId()); + user.getMapManager().addOrUpdateCell(xy, cellValue); + } + return false; + } +} diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/MonitorMissionAndMoveBehavior.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/MonitorMissionAndMoveBehavior.java new file mode 100644 index 000000000..c84622ec0 --- /dev/null +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/MonitorMissionAndMoveBehavior.java @@ -0,0 +1,27 @@ +package com.ljsd.jieling.handler.map.behavior; + +import com.ljsd.jieling.handler.map.EventType; +import com.ljsd.jieling.logic.dao.User; +import com.ljsd.jieling.protocols.MapInfoProto; +import com.ljsd.jieling.util.CellUtil; +import org.springframework.stereotype.Component; + +@Component +public class MonitorMissionAndMoveBehavior extends BaseBehavior { + @Override + public int getBehaviorType() { + return EventType.monitorMissionAndMove; + } + + @Override + public boolean process(User user, int[][] behaviorTypeValues, MapInfoProto.EventUpdateResponse.Builder eventUpdateResponse) throws Exception { + BehaviorUtil.updateMission(user, behaviorTypeValues, eventUpdateResponse); + // 0的时候回城 + if (behaviorTypeValues[0][1] == 0) { + return false; + } + int xy = CellUtil.xy2Pos(behaviorTypeValues[0][2], behaviorTypeValues[0][3]); + user.getMapManager().setCurXY(xy); + return true; + } +} diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/OpenMissionBehavior.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/OpenMissionBehavior.java index 40579a733..1f5425fe6 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/OpenMissionBehavior.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/OpenMissionBehavior.java @@ -1,5 +1,7 @@ package com.ljsd.jieling.handler.map.behavior; +import com.ljsd.jieling.config.MapPointConfig; +import com.ljsd.jieling.handler.map.Cell; import com.ljsd.jieling.handler.map.EventType; import com.ljsd.jieling.handler.map.MapLogic; import com.ljsd.jieling.handler.mission.Mission; @@ -7,6 +9,7 @@ import com.ljsd.jieling.handler.mission.MissionLogic; import com.ljsd.jieling.logic.dao.User; import com.ljsd.jieling.protocols.CommonProto; import com.ljsd.jieling.protocols.MapInfoProto; +import com.ljsd.jieling.util.CellUtil; import org.springframework.stereotype.Component; import java.util.Map; @@ -28,8 +31,15 @@ public class OpenMissionBehavior extends BaseBehavior { MissionLogic.getInstance().checkMission(mission, user); CommonProto.Mission missionProto = MapLogic.getInstance().getMission(mission); eventUpdateResponse.setMission(missionProto); - // TODO 还要开新事件 - + // 开新事件 + if (user.getMapManager().getCurMapId() == behaviorTypeValues[1][0]) { + int x = behaviorTypeValues[1][1]; + int y = behaviorTypeValues[1][2]; + int xy = CellUtil.xy2Pos(x, y); + MapPointConfig mapPointConfig = MapPointConfig.scMapEventMap.get(behaviorTypeValues[1][3]); + Cell cellValue = new Cell(xy, mapPointConfig.getInitialEventId(), mapPointConfig.getId()); + user.getMapManager().addOrUpdateCell(xy, cellValue); + } return true; } } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/UseItemAndDestroyBehavior.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/UseItemAndDestroyBehavior.java index 53925d8f3..ea18d75f1 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/UseItemAndDestroyBehavior.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/UseItemAndDestroyBehavior.java @@ -22,9 +22,7 @@ public class UseItemAndDestroyBehavior extends BaseBehavior { if (!isEnough) { return isEnough; } - Map mapInfo = user.getMapManager().getMapInfo(); - mapInfo.remove(user.getMapManager().getCurXY()); - user.getMapManager().setMapInfo(mapInfo); + BehaviorUtil.distoryPoint(user); return true; } } 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 72db28dd2..49d705912 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 @@ -3,6 +3,7 @@ package com.ljsd.jieling.logic.dao; import com.ljsd.common.mogodb.LjsdMongoTemplate; import com.ljsd.jieling.config.SGameSetting; +import com.ljsd.jieling.config.SMissionEventsConfig; import com.ljsd.jieling.handler.map.MapManager; import com.ljsd.jieling.handler.mission.Mission; import com.ljsd.jieling.handler.mission.MissionManager; @@ -85,9 +86,11 @@ public class UserManager { SGameSetting gameSetting = SGameSetting.getGameSetting(); ItemUtil.drop(user,gameSetting.getBornItem()); MissionManager missionManager = user.getMissionManager(); + SMissionEventsConfig sMissionEventsConfig = SMissionEventsConfig.sMissionEventsConfigMap.get(1); Mission mission = new Mission(); mission.setMissionId(1); mission.setMissionStep(0); + mission.setMissionInfo("0#0#" + sMissionEventsConfig.getMissionNum()); missionManager.getDoingMissions().put(mission.getMissionId(), mission); MapManager mapManager = user.getMapManager(); //TODO