From 6c9252f157d4cff143cdeaf8725cf4279ccbb224 Mon Sep 17 00:00:00 2001 From: jiahuiwen <1024696487@qq.com> Date: Sat, 2 Mar 2019 18:27:56 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9C=B0=E5=9B=BE=E6=88=98=E6=96=97=E5=BC=80?= =?UTF-8?q?=E6=88=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- conf/server/MapConfig.txt | 16 +- conf/server/MapPointConfig.txt | 344 +++++++----- conf/server/Map_101.txt | 69 ++- conf/server/Map_102.txt | 66 ++- conf/server/Map_103.txt | 110 ++-- conf/server/OptionAddCondition.txt | 19 +- conf/server/OptionConfig.txt | 529 +++++++++++++++--- .../ljsd/jieling/config/SMonsterConfig.java | 7 +- .../jieling/handler/GetPlayerInfoHandler.java | 2 +- .../handler/map/MapEnterRequestHandler.java | 4 +- .../ljsd/jieling/handler/map/MapLogic.java | 75 +-- .../handler/map/behavior/FightBehavior.java | 47 +- .../com/ljsd/jieling/util/CBean2Proto.java | 7 +- .../com/ljsd/jieling/util/MonsterUtil.java | 11 +- 14 files changed, 866 insertions(+), 440 deletions(-) diff --git a/conf/server/MapConfig.txt b/conf/server/MapConfig.txt index de32fc7a2..5d87b2335 100644 --- a/conf/server/MapConfig.txt +++ b/conf/server/MapConfig.txt @@ -1,12 +1,12 @@ Id Info Size MoveConfused EnergyConfused OpenRule int string mut,int#int,1 int int string -101 战乱荒林 20#30 1 10 -102 林渊深处 10#20 2 10 -103 三途津 15#20 2 20 +101 战乱荒林 15#20 1 10 +102 三途津 15#20 2 10 +103 风见原野 40#20 2 20 104 青龙门 20#15 2 20 -105 风见原野 20#20 2 20 -106 荒芜丘陵 10#20 2 20 -107 观澜港 15#20 2 20 -108 白叶渡 20#20 2 20 +105 中心枢纽 10#20 2 20 +106 观澜港 15#20 2 20 +107 毁灭之城 30#40 2 20 +108 白叶渡 20#30 2 20 109 荆棘流域 30#30 2 20 -110 中心枢纽 10#20 2 20 +110 寒水溶洞 15#20 2 20 diff --git a/conf/server/MapPointConfig.txt b/conf/server/MapPointConfig.txt index fd591eab5..5528b3139 100644 --- a/conf/server/MapPointConfig.txt +++ b/conf/server/MapPointConfig.txt @@ -2,146 +2,206 @@ Id Style Refresh TriggerRules ExploreValues InitialEventId int int int int int int 101001 1 2 1 0 101001 101002 1 2 1 0 101002 +101026 1 2 1 0 101150 +101014 1 2 1 0 101066 +101027 1 2 1 0 101151 +101028 1 2 1 0 101152 +101025 1 2 2 0 101133 101003 1 2 1 0 101003 -101004 2 3 1 0 101004 -101005 3 2 1 0 101005 -101006 4 2 1 0 101006 -101007 5 3 1 0 101007 -101008 5 4 1 0 101032 -101009 5 3 1 0 101007 -101010 5 3 1 0 101007 -101011 5 3 1 0 101065 -101013 8 2 1 0 0 -101014 5 1 2 0 101067 -101015 5 3 2 0 101069 -101016 5 3 2 0 101071 -101017 5 3 2 0 101073 -101018 5 3 2 0 101074 -101019 5 3 2 0 101076 -101020 5 3 2 0 101078 -101021 5 3 2 0 101079 -101022 5 3 2 0 101081 -101023 5 3 2 0 101083 -0 0 0 0 0 0 -0 0 0 0 0 0 -0 0 0 0 0 0 -0 0 0 0 0 0 -0 0 0 0 0 0 -0 0 0 0 0 0 -0 0 0 0 0 0 -0 0 0 0 0 0 -0 0 0 0 0 0 -0 0 0 0 0 0 -0 0 0 0 0 0 -0 0 0 0 0 0 -0 0 0 0 0 0 -0 0 0 0 0 0 -0 0 0 0 0 0 -0 0 0 0 0 0 -0 0 0 0 0 0 -0 0 0 0 0 0 -0 0 0 0 0 0 -0 0 0 0 0 0 -0 0 0 0 0 0 -0 0 0 0 0 0 -0 0 0 0 0 0 -0 0 0 0 0 0 -0 0 0 0 0 0 -0 0 0 0 0 0 -0 0 0 0 0 0 -0 0 0 0 0 0 -0 0 0 0 0 0 -0 0 0 0 0 0 -0 0 0 0 0 0 -0 0 0 0 0 0 -0 0 0 0 0 0 -0 0 0 0 0 0 -0 0 0 0 0 0 -0 0 0 0 0 0 -0 0 0 0 0 0 -0 0 0 0 0 0 -0 0 0 0 0 0 -0 0 0 0 0 0 -0 0 0 0 0 0 -0 0 0 0 0 0 -0 0 0 0 0 0 -0 0 0 0 0 0 -0 0 0 0 0 0 -0 0 0 0 0 0 -0 0 0 0 0 0 -0 0 0 0 0 0 -0 0 0 0 0 0 -0 0 0 0 0 0 -0 0 0 0 0 0 -0 0 0 0 0 0 -0 0 0 0 0 0 -0 0 0 0 0 0 -0 0 0 0 0 0 -0 0 0 0 0 0 -0 0 0 0 0 0 -0 0 0 0 0 0 -0 0 0 0 0 0 -0 0 0 0 0 0 -0 0 0 0 0 0 -0 0 0 0 0 0 -0 0 0 0 0 0 -0 0 0 0 0 0 -0 0 0 0 0 0 -0 0 0 0 0 0 -0 0 0 0 0 0 -0 0 0 0 0 0 -0 0 0 0 0 0 -0 0 0 0 0 0 -0 0 0 0 0 0 -0 0 0 0 0 0 -0 0 0 0 0 0 -0 0 0 0 0 0 -0 0 0 0 0 0 -0 0 0 0 0 0 -0 0 0 0 0 0 -0 0 0 0 0 0 -0 0 0 0 0 0 -0 0 0 0 0 0 -0 0 0 0 0 0 -0 0 0 0 0 0 -0 0 0 0 0 0 -0 0 0 0 0 0 -0 0 0 0 0 0 -0 0 0 0 0 0 -0 0 0 0 0 0 -0 0 0 0 0 0 -0 0 0 0 0 0 -0 0 0 0 0 0 -0 0 0 0 0 0 -0 0 0 0 0 0 -0 0 0 0 0 0 -0 0 0 0 0 0 -0 0 0 0 0 0 -0 0 0 0 0 0 -0 0 0 0 0 0 -0 0 0 0 0 0 -0 0 0 0 0 0 -0 0 0 0 0 0 -0 0 0 0 0 0 -0 0 0 0 0 0 -0 0 0 0 0 0 -0 0 0 0 0 0 -0 0 0 0 0 0 -0 0 0 0 0 0 -0 0 0 0 0 0 -0 0 0 0 0 0 -0 0 0 0 0 0 -0 0 0 0 0 0 -0 0 0 0 0 0 -0 0 0 0 0 0 -0 0 0 0 0 0 -0 0 0 0 0 0 -0 0 0 0 0 0 -0 0 0 0 0 0 -0 0 0 0 0 0 -0 0 0 0 0 0 -0 0 0 0 0 0 -0 0 0 0 0 0 -0 0 0 0 0 0 -0 0 0 0 0 0 -0 0 0 0 0 0 +101004 2 2 2 0 101004 +101019 2 2 2 0 101127 +101020 2 2 2 0 101128 +101022 2 2 2 0 101130 +101015 2 3 2 0 101135 +101021 2 3 2 0 101129 +101005 3 2 2 0 101005 +101006 0 0 0 0 0 +101007 5 3 2 0 101153 +101008 5 4 2 0 101006 +101009 5 3 2 0 101031 +101010 5 3 2 0 101050 +101011 5 3 2 0 101064 +101012 5 3 2 0 101065 +101013 8 2 0 0 0 +101016 5 3 2 0 101067 +101017 5 3 2 0 101113 +101018 5 3 2 0 101114 +101023 5 3 2 0 101131 +101024 5 3 2 0 101132 +0 0 0 0 0 0 +102001 1 2 1 0 102001 +102002 1 2 1 0 102002 +102027 1 2 1 0 102108 +102003 1 2 1 0 102003 +102004 2 2 2 0 102004 +102005 2 2 2 0 102005 +102006 2 2 2 0 102006 +102007 2 2 2 0 102007 +102008 2 2 2 0 102008 +102009 2 1 2 0 102009 +102010 2 1 2 0 102010 +102011 5 3 2 0 102011 +102012 3 2 2 0 102013 +102013 4 2 2 0 102014 +102014 8 0 0 0 0 +102015 5 3 1 0 102015 +102016 5 3 2 0 102017 +102017 5 3 2 0 102020 +102018 5 3 2 0 102034 +102019 5 3 2 0 102035 +102020 5 3 2 0 102038 +102021 5 3 2 0 102041 +102022 5 3 2 0 102044 +102023 5 3 2 0 102106 +102024 5 4 2 0 102066 +102025 5 3 2 0 102084 +102026 5 3 2 0 102107 +0 0 0 0 0 0 +103001 1 2 1 0 103001 +103024 1 2 1 0 103070 +103002 1 2 1 0 103002 +103025 1 2 1 0 103071 +103003 1 2 1 0 103003 +103004 2 2 2 0 103004 +103005 2 2 2 0 103005 +103006 2 2 2 0 103006 +103007 2 2 2 0 103007 +103009 2 2 2 0 103009 +103010 2 2 2 0 103010 +103008 2 1 2 0 103008 +103011 3 2 2 0 103011 +103012 4 2 2 0 103012 +103013 5 3 2 0 103013 +103014 7 3 2 0 103015 +103015 7 3 2 0 103016 +103016 8 0 0 0 0 +103017 5 3 2 0 103017 +103018 5 3 2 0 103018 +103019 5 2 2 0 103068 +103020 5 3 2 0 103065 +103021 5 3 2 0 103042 +103022 5 3 2 0 103066 +103023 5 3 2 0 103067 +0 0 0 0 0 0 +104001 1 2 1 0 104001 +104002 1 2 1 0 104002 +104003 1 2 1 0 104003 +104004 1 3 1 0 104004 +104005 2 2 2 0 104005 +104006 2 2 2 0 104006 +104007 2 2 2 0 104007 +104008 2 2 2 0 104008 +104009 2 2 2 0 104009 +104010 2 2 2 0 104010 +104011 2 2 2 0 104011 +104012 2 1 2 0 104012 +104013 3 2 2 0 104013 +104014 4 2 2 0 104014 +104015 1 3 1 0 104015 +104016 7 3 2 0 104016 +104017 8 0 0 0 0 +104018 5 3 2 0 0 +104019 5 3 2 0 0 +104020 5 3 2 0 0 +104021 5 3 2 0 104016 +104022 5 3 2 0 0 +104023 5 3 2 0 104032 +104024 5 3 2 0 104048 +104025 5 3 2 0 0 +104026 5 3 2 0 104091 +104027 5 3 2 0 0 +104028 5 3 2 0 0 +104029 5 3 2 0 0 +104030 5 3 2 0 0 +0 0 0 0 0 0 +105001 1 2 1 0 105001 +105002 1 2 1 0 105002 +105003 1 2 1 0 105003 +105004 1 3 1 0 105004 +105005 2 2 2 0 105005 +105006 2 2 2 0 105006 +105007 2 2 2 0 105007 +105008 2 2 2 0 105008 +105009 2 2 2 0 105009 +105010 2 2 2 0 105010 +105011 2 2 2 0 105011 +105012 2 1 2 0 105012 +105013 3 2 2 0 105013 +105014 4 2 2 0 105014 +105015 5 3 2 0 105015 +105016 5 3 2 0 105016 +105017 5 3 2 0 105017 +105018 5 3 2 0 105018 +105019 5 3 2 0 105019 +105020 7 3 2 0 105079 +105021 7 3 2 0 105080 +105022 8 0 0 0 0 +105023 5 3 2 0 105020 +105024 5 3 2 0 105034 +105025 5 3 2 0 105037 +105026 5 3 2 0 105040 +105027 5 3 2 0 105043 +105028 5 3 2 0 105046 +105029 5 3 2 0 105049 +105030 5 3 2 0 105052 +105031 5 3 2 0 105055 +105032 5 3 2 0 105059 +105033 5 3 2 0 105081 +105034 5 3 2 0 105082 +105035 5 3 2 0 105083 +0 0 0 0 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 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/Map_101.txt b/conf/server/Map_101.txt index 1974e612d..828427021 100644 --- a/conf/server/Map_101.txt +++ b/conf/server/Map_101.txt @@ -1,31 +1,38 @@ -id Event Groups -int int mut,int#int,2 -1 101010 11#25 -2 101011 14#10 -3 101014 17#24 -4 101001 3#18|3#19 -5 101004 8#25|9#25|9#26 -6 101008 16#15 -7 101009 20#14 -8 101004 1#11|2#11|1#12|2#12|5#17|6#17|6#18 -9 101001 14#20|15#20|14#21|15#21 -10 101005 20#30 -11 101007 6#5 -12 101002 8#3|9#3|8#4|7#5|7#6 -13 101001 8#11|9#11|8#12|9#12 -14 101004 14#26|15#26|15#27 -15 101001 1#6|2#6|1#7|2#7 -16 101001 2#14|3#14|2#15|3#15 -17 101002 6#1|5#2|6#2 -18 101001 14#5|15#5|14#6|15#6 -19 101004 11#6|12#6|12#7 -20 101002 5#7|6#7|5#8|6#8 -21 101001 7#18|8#18|8#19 -22 101001 19#26|20#26|19#27|20#27 -23 101002 19#3|20#3|19#4|20#4 -24 101003 17#6|18#7 -25 101002 4#10|4#11 -26 101002 17#11|18#11|17#12|18#12 -27 101002 6#13|6#14 -28 101002 13#13|14#13|13#14|14#14 -29 101002 18#18|19#18|18#19|19#19 +id Event Groups isMustAppear +int int mut,int#int,2 int +1 101009 15#9 0 +2 101008 6#12 0 +3 101007 7#15 0 +4 101028 8#16|8#17|9#17|8#18 0 +5 101027 4#7|4#8|5#8|4#9 0 +6 101005 15#20 0 +7 101026 2#6|2#7|3#7|2#8|2#9 0 +8 101003 7#13 0 +9 101004 8#2|9#2|10#2 0 +10 101025 12#10|11#11|12#11|11#12 0 +11 101020 6#7|7#7|6#8 0 +12 101001 13#16|12#17|14#17|12#18|14#18 0 +13 101002 5#12|5#13|5#14|5#15|4#16 0 +14 101019 3#2|2#3|3#3 0 +15 101010 2#20 0 +16 101019 13#6|14#7|13#8|9#14|10#14|9#15 0 +17 101018 9#7 0 +18 101017 1#1 0 +19 101002 4#2|5#2|4#3|5#3|4#4 0 +20 101016 6#1 0 +21 101026 14#10|13#11|13#12|14#12 0 +22 101001 7#16|6#17|7#18|7#19 0 +23 101015 13#14|14#15|15#15 0 +24 101014 10#3|10#4|9#5|11#5 0 +25 101014 11#15|12#15|11#16|11#17 0 +26 101026 7#2|7#3|7#4|8#4|8#5 0 +27 101001 13#2|14#2|13#3|14#3|14#4 0 +28 101024 3#5 0 +29 101001 10#16|10#17|9#18|9#19 0 +30 101023 12#3 0 +31 101002 3#17|2#18|2#19|3#19|4#19 0 +32 101026 10#7|10#8|10#9|11#9 0 +33 101022 5#18|6#18|6#19 0 +34 101021 1#14|1#15|2#15|1#16|2#16|1#17|2#17|1#18 0 +35 101020 2#11|3#11|3#12 0 +36 101002 8#10|7#11|8#11|9#12 0 diff --git a/conf/server/Map_102.txt b/conf/server/Map_102.txt index 94c2a0989..499b10d16 100644 --- a/conf/server/Map_102.txt +++ b/conf/server/Map_102.txt @@ -1,27 +1,39 @@ -id Event Groups -int int mut,int#int,2 -1 101010 9#11 -2 102009 4#5|5#5|4#6|5#6 -3 102006 8#12|9#12|8#13|9#13 -4 102005 5#17|6#17|5#18|6#18 -5 102008 1#8|2#8|1#9|2#9 -6 102007 1#14|2#14|1#15|2#15 -7 101011 5#9 -8 101012 4#15 -9 102004 3#1|1#2|4#2 -10 102003 9#6|10#6|9#7|10#7 -11 102003 3#7|4#7|3#8|4#8 -12 102003 2#10|3#10|2#11|3#11 -13 102003 5#12|6#12|5#13|6#13 -14 102003 9#14|10#14|9#15|10#15 -15 101008 2#2 -16 101009 7#16 -17 101005 2#20 -18 101007 10#1 -19 101002 1#5|2#5|1#6|2#6 -20 101001 6#7|7#7|6#8|7#8 -21 101001 2#17|3#17|2#18|3#18 -22 101002 4#3|5#3|4#4|5#4 -23 101002 7#4|8#4|7#5|8#5 -24 101002 9#17|10#17|9#18|10#18 -25 101002 6#19|7#19|6#20|7#20 +id Event Groups isMustAppear +int int mut,int#int,2 int +1 102011 5#17 0 +2 102012 1#5 0 +3 102013 14#20 0 +4 102005 5#6|3#7|4#7|5#7|4#8 0 +5 102010 1#14|2#14|2#15|3#15|2#16 0 +6 102002 11#18|12#18|11#19|12#19|13#19|11#20 0 +7 102001 10#18|9#19|10#19|8#20|9#20 0 +8 102001 2#6|1#7|2#7|1#8|1#9|2#9 0 +9 102007 2#1|2#2|1#3|2#3|2#4 0 +10 102006 10#1|11#1|10#2|11#2|10#3 0 +11 102005 14#1|14#2|15#2|14#3|15#4 0 +12 102004 13#17|14#17|15#17|13#18|14#18 0 +13 102026 14#14 0 +14 102027 13#12|12#13|13#13|12#14|12#15|12#16 0 +15 102009 5#18|6#18|4#19|5#19|4#20 0 +16 102008 7#5|8#5|9#5|8#6|8#7 0 +17 102022 15#3 0 +18 102023 8#3 0 +19 102001 7#8|8#8|6#9|7#9|7#10|6#11 0 +20 102024 9#10 0 +21 102002 14#10|14#11|15#11|14#12|14#13 0 +22 102025 7#19 0 +23 102003 9#13 0 +24 102002 11#7|12#7|11#8|12#8|10#9|11#9 0 +25 102001 4#2|5#2|6#2|7#2|5#3|5#4 0 +26 102020 11#14 0 +27 102021 15#10 0 +28 102001 13#2|12#3|13#3|13#4|14#4|14#5 0 +29 102002 7#16|6#17|7#17|7#18|8#18 0 +30 102019 12#20 0 +31 102001 4#11|3#12|4#12|2#13|3#13|4#13 0 +32 102004 9#15|10#15|9#16|10#16|9#17 0 +33 102014 8#1|8#2|9#2|9#3|9#4|10#4|10#5|10#7|9#8|10#8|14#8|15#8|8#9|9#9|12#9|13#9|14#9|8#10|11#10|12#10|7#11|8#11|9#11|10#11|11#11|7#12|5#13|6#13|7#13|5#15|4#16|5#16|3#17|4#17|2#18|3#18|2#19|1#20|2#20 1 +34 102015 5#14 0 +35 102016 6#14 0 +36 102017 2#11 0 +37 102018 8#12 0 diff --git a/conf/server/Map_103.txt b/conf/server/Map_103.txt index ad8411b5c..e1ee09e6a 100644 --- a/conf/server/Map_103.txt +++ b/conf/server/Map_103.txt @@ -1,77 +1,33 @@ -id Event Groups -int int mut,int#int,2 -1 103011 14#20 -2 103002 7#8|7#9 -3 101013 7#11 -4 101013 7#12 -5 101013 6#13 -6 101013 7#13 -7 103018 8#12 -8 103019 12#20 -9 101013 10#8 -10 103002 2#6|3#6|2#7|3#7 -11 101004 11#9 -12 103001 1#1|2#1|1#2|2#2 -13 103001 6#14|6#15 -14 101013 9#9 -15 101013 8#10 -16 101013 5#13 -17 101013 5#16 -18 101013 11#10 -19 101013 8#11 -20 101013 10#11 -21 101013 4#17 -22 101013 3#18 -23 103001 9#12|10#12|9#13|10#13 -24 103002 6#1|7#1|6#2|7#2 -25 101004 14#13|15#13 -26 103001 11#19|12#19|11#20 -27 101004 5#6|5#7|4#8|5#8 -28 103002 11#7|12#7|11#8|12#8 -29 103002 12#14|13#14|12#15|13#15 -30 103002 2#15|2#16 -31 101010 7#19 -32 101013 2#20 -33 101013 2#19 -34 101013 2#18 -35 101013 14#9 -36 101013 13#9 -37 101013 12#9 -38 101013 14#8 -39 101013 15#8 -40 101013 8#2 -41 101011 14#14 -42 101012 2#11 -43 101013 8#1 -44 101013 9#2 -45 101013 9#3 -46 101013 9#4 -47 101013 10#4 -48 101013 10#5 -49 101013 10#7 -50 103021 6#4|15#10 -51 103001 12#4|13#4|12#5|13#5 -52 103002 3#3|3#4 -53 103020 11#14 -54 101004 5#18|5#19 -55 103022 5#14 -56 101013 9#8 -57 101013 11#11 -58 101013 8#9 -59 101013 5#15 -60 101013 12#10 -61 101013 9#11 -62 101013 4#16 -63 101013 3#17 -64 101008 8#3 -65 101009 9#10 -66 101013 1#20 -67 101004 10#1|11#1|12#1|13#1 -68 103002 9#17|9#18 -69 101005 1#5 -70 103001 14#17|14#18 -71 101007 15#3 -72 103001 6#5|7#5|6#6|7#6 -73 103002 12#11|12#12 -74 101004 1#13|1#14 -75 103002 3#11|4#11|3#12|4#12 +id Event Groups isMustAppear +int int mut,int#int,2 int +1 103001 1#6 0 +2 103001 13#10|12#11|13#11|14#11|13#12|13#13 0 +3 103022 8#15 0 +4 103021 12#1 0 +5 103024 2#5|2#6|3#6|2#7|2#8 0 +6 103002 7#4|8#4|6#5|7#5|8#5|7#6 0 +7 103023 3#15 0 +8 103003 8#6 0 +9 103025 1#1|2#1|3#1|2#2|3#2 0 +10 103004 8#2|9#2|10#2|8#3|10#3 0 +11 103016 1#3|2#3|3#3|3#4|3#5|4#5|4#6|5#6|5#7|5#8|4#9|5#9|6#9|4#11|5#11|6#11|1#12|3#12|4#12|5#12|6#12|7#12|8#12|4#13|5#13|6#13|8#13|9#13|11#13|5#14|11#14|12#14|13#14|14#14|5#15|14#15|15#15 1 +12 103017 12#13 0 +13 103018 5#10 0 +14 103001 15#1 0 +15 103024 12#7|10#8|11#8|12#8|11#9 0 +16 103008 6#7|7#7|6#8|7#8 0 +17 103002 2#13|1#14|2#14|3#14|4#14|2#15 0 +18 103025 8#14|9#14|10#14|9#15|10#15|11#15 0 +19 103024 11#2|11#3|11#4|12#4|10#5|11#5 0 +20 103010 10#9|9#10|10#10|9#11 0 +21 103013 13#6 0 +22 103024 6#1|4#2|5#2|6#2|7#2 0 +23 103001 15#6|14#7|15#7|15#8|15#9 0 +24 103015 6#15 0 +25 103014 1#2 0 +26 103005 5#3|4#4|5#4|5#5 0 +27 103006 14#12|15#12|15#13 0 +28 103008 3#7|4#7|3#8|4#8 0 +29 103009 13#2|14#2|13#3|14#3 0 +30 103002 1#9|1#10|2#10|2#11|3#11 0 +31 103024 7#9|8#9|9#9|7#10|8#10|8#11 0 diff --git a/conf/server/OptionAddCondition.txt b/conf/server/OptionAddCondition.txt index f6449f5b6..42b90c77f 100644 --- a/conf/server/OptionAddCondition.txt +++ b/conf/server/OptionAddCondition.txt @@ -1,14 +1,11 @@ Id Type Values int int mut,int#int,2 1 2 1503#1 -2 1 101008#101061 -3 4 2#3 -0 0 null -0 0 null -0 0 null -0 0 null -0 0 null -0 0 null -0 0 null -0 0 null -0 0 null +2 3 1#5#3 +3 3 1#2#3 +4 1 1 +5 1 102022 +6 2 1503#1 +7 3 1#3#3 +8 3 1#4#3 +9 3 1#2#3 diff --git a/conf/server/OptionConfig.txt b/conf/server/OptionConfig.txt index 0c182cc07..ca85ab1cf 100644 --- a/conf/server/OptionConfig.txt +++ b/conf/server/OptionConfig.txt @@ -1,90 +1,463 @@ Id AddConditionID BehaviorType BehaviorTypeValues Reward JumpType JumpTypeValues int int int mut,int#int,2 int int mut,int#int,2 -101001 1 2 1503#1 0 4 null +101001 1 2 1503#1 10102 4 null 101002 0 0 null 0 4 null -101003 0 5 0 0 4 null +101003 0 5 0 0 8 101145#101150|1#4 101004 0 0 null 0 4 null -101005 0 5 102 0 4 null +101005 0 0 null 0 5 101007 101006 0 0 null 0 4 null -101007 0 0 null 0 1 101008 -101008 0 0 null 0 4 null -101009 0 0 null 0 1 101009 -101010 0 0 null 0 4 null -101011 0 0 null 0 1 101010 -101012 0 0 null 0 4 null -101013 0 0 null 0 1 101011 -101014 0 0 null 0 1 101012 -101015 0 0 null 0 1 101013 -101016 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 +101016 1 2 1503#1 10102 1 101014 101017 0 0 null 0 1 101014 -101018 0 0 null 0 3 101015#101031|1#2 -101019 0 0 null 0 4 null +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 0 null 0 1 101018 -101023 0 0 null 0 5 101019 -101024 0 0 null 0 1 101020 -101025 0 0 null 0 1 101021 -101026 0 0 null 0 1 101022 -101027 0 0 null 0 5 101023 -101028 0 0 null 0 5 101024 -101029 0 0 null 0 1 101025 -101030 0 0 null 0 1 101026 -101031 0 0 null 0 5 101027 -101032 0 0 null 0 1 101028 -101033 0 0 null 0 1 101029 -101034 0 0 null 0 1 101030 -101035 0 11 1#1#101#1010#101011 0 4 null -101036 0 0 null 0 6 101014 -101037 0 0 null 0 1 101033 -101038 0 0 null 0 4 null -101039 0 0 null 0 1 101034 -101040 0 0 null 0 4 null -101041 0 0 null 0 1 101035 -101042 0 0 null 0 4 null -101043 0 0 null 0 1 101036 +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 0 null 0 1 101037 +101045 0 1 10102 0 1 101037 101046 0 0 null 0 4 null -101047 0 0 null 0 1 101038 -101048 0 0 null 0 1 101039 -101049 0 0 null 0 1 101040 +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 0 0 null 0 1 101041 -101052 0 0 null 0 1 101042 -101053 0 0 null 0 1 101043 -101054 0 0 null 0 1 101044 -101055 0 0 null 0 1 101045 -101056 0 0 null 0 1 101046 -101057 0 0 null 0 1 101047 -101058 0 0 null 0 1 101048 -101059 0 0 null 0 1 101049 -101060 0 0 null 0 1 101050 -101061 0 0 null 0 1 101051 -101062 0 0 null 0 1 101052 -101063 0 0 null 0 1 101053 -101064 0 0 null 0 1 101054 -101065 0 0 null 0 1 101055 -101066 0 0 null 0 1 101056 -101067 0 0 null 0 1 101057 -101068 0 0 null 0 1 101058 -101069 0 0 null 0 1 101059 -101070 0 0 null 0 1 101060 -101071 0 0 null 0 6 101061 -101072 0 0 null 0 1 101062 -101073 0 0 null 0 1 101063 -101074 0 0 null 0 1 101064 -101075 0 0 null 0 6 101061 -101076 0 1 10101 0 1 101086 -101077 0 9 1 0 4 null -101078 0 7 2#3#101084#101015#101016#101017#101018#101019#101020#101021#101022#101023 0 1 101068 -101079 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 +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 11 1#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 10101 0 1 101070 -101082 0 9 2 10101 4 null -101083 0 9 2 10101 4 null -101084 0 1 10101 0 1 101072 -101085 0 9 2 10101 4 null -101086 0 9 2 10101 4 null -101087 0 14 1001#1500#2 10101 1 101085 -101088 0 0 null 0 4 null +101081 0 1 10103 0 1 101057 +101082 0 0 null 0 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 1 10104 0 4 null +101097 0 0 null 0 4 null +101098 0 1 10105 0 5 101137 +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 0 null 0 4 null +101151 0 0 null 0 4 null +101152 0 0 null 0 1 101116 +101153 0 0 null 0 4 null +101154 0 1 10102 0 1 101117 +101155 0 0 null 0 4 null +101156 0 1 10102 0 1 101118 +101157 0 0 null 0 4 null +101158 0 0 null 10102 1 101119 +101159 0 0 null 0 4 null +101160 0 1 10105 0 1 101120 +101161 0 0 null 0 4 null +101162 0 0 null 0 1 101121 +101163 0 1 10101 0 1 101122 +101164 0 0 null 0 4 null +101165 0 0 null 0 1 101123 +101166 0 0 null 0 4 null +101167 0 1 10101 0 1 101124 +101168 0 0 null 0 4 null +101169 0 1 10102 0 1 101125 +101170 0 0 null 0 4 null +101171 0 1 10103 0 1 101126 +101172 0 0 null 0 4 null +101173 0 1 10103 0 1 101127 +101174 0 0 null 0 4 null +101175 0 0 null 0 4 null +101176 1 2 1503#1 10102 4 null +101177 0 0 null 0 4 null +101178 1 2 1503#1 10102 4 null +101179 0 0 null 0 4 null +101180 1 2 1503#1 10103 4 null +101181 0 0 null 0 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 +101186 1 2 1503#1 10102 4 null +101187 0 0 null 0 4 null +101188 0 0 null 0 1 101138 +101189 0 0 null 0 1 101139 +101190 0 0 null 0 1 101140 +101191 0 0 null 0 1 101141 +101192 0 0 null 0 1 101142 +101193 0 0 null 0 1 101143 +101194 0 0 null 0 1 101144 +101195 0 9 1 0 4 null +101196 0 0 null 0 5 101146 +101197 0 0 null 0 5 101147 +101198 0 0 null 0 1 101148 +101199 0 0 null 0 1 101149 +101200 0 0 null 0 4 null +101201 0 0 null 0 4 null +101202 0 0 null 0 5 101067 +101203 0 0 null 0 4 null +101204 0 0 null 0 5 101155 +101205 0 0 null 0 4 null +101206 0 0 null 0 5 101156 +101207 0 0 null 0 5 101157 +101208 0 0 null 0 5 101158 +101209 0 0 null 0 5 101159 +101210 0 0 null 0 1 101160 +101211 0 0 null 0 1 101161 +101212 0 0 null 0 1 101162 +101213 0 0 null 0 1 101163 +101214 0 0 null 0 1 101164 +101215 0 0 null 0 1 101165 +101216 0 0 null 0 4 null +102001 1 2 1503#1 10102 4 null +102002 0 0 null 0 4 null +102003 1 2 1503#1 10102 4 null +102004 0 0 null 0 4 null +102005 1 2 1503#1 10102 4 null +102006 0 0 null 0 4 null +102007 1 2 1503#1 10102 4 null +102008 0 0 null 0 4 null +102009 1 2 1503#1 10102 4 null +102010 0 0 null 0 4 null +102011 1 2 1503#1 10102 4 null +102012 0 0 null 0 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 +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 +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 +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 +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 +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 +103001 1 2 1503#1 10102 4 null +103002 0 0 null 0 4 null +103003 1 2 1503#1 10102 4 null +103004 0 0 null 0 4 null +103005 1 2 1503#1 10102 4 null +103006 0 0 null 0 4 null +103007 1 2 1503#1 10102 4 null +103008 0 0 null 0 4 null +103009 1 2 1503#1 10102 4 null +103010 0 0 null 0 4 null +103011 1 2 1503#1 10102 4 null +103012 0 0 null 0 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 +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 diff --git a/serverlogic/src/main/java/com/ljsd/jieling/config/SMonsterConfig.java b/serverlogic/src/main/java/com/ljsd/jieling/config/SMonsterConfig.java index 421c7d28e..6040c2727 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/config/SMonsterConfig.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/config/SMonsterConfig.java @@ -2,6 +2,7 @@ package com.ljsd.jieling.config; import com.ljsd.jieling.logic.STableManager; import com.ljsd.jieling.logic.Table; +import com.ljsd.jieling.protocols.CommonProto; import com.ljsd.jieling.protocols.FightInfoProto; import com.ljsd.jieling.util.CBean2Proto; @@ -12,7 +13,7 @@ import java.util.concurrent.ConcurrentHashMap; @Table(name ="MonsterConfig") public class SMonsterConfig implements BaseConfig { private static Map sMonsterConfigMap; - private static Map monsterMap; + private static Map monsterMap; private int id; private int monsterId; @@ -55,14 +56,14 @@ public class SMonsterConfig implements BaseConfig { return sMonsterConfigMap; } - public static Map getMonsterMap() { + public static Map getMonsterMap() { return monsterMap; } @Override public void init() throws Exception { sMonsterConfigMap = STableManager.getConfig(SMonsterConfig.class); - Map monsterMapVo = new ConcurrentHashMap<>(); + Map monsterMapVo = new ConcurrentHashMap<>(); for (Map.Entry entry :sMonsterConfigMap.entrySet()){ SMonsterConfig sMonsterConfig = entry.getValue(); if (!monsterMapVo.containsKey(sMonsterConfig.getId())){ diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/GetPlayerInfoHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/GetPlayerInfoHandler.java index fa2eef86b..64706a19e 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/GetPlayerInfoHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/GetPlayerInfoHandler.java @@ -39,7 +39,7 @@ public class GetPlayerInfoHandler extends BaseHandler{ User user = UserManager.getUserForLogin(userId); - CommonProto.Player player = CBean2Proto.getPlayer(userId, user.getPlayerInfoManager()); + CommonProto.Player player = CBean2Proto.getPlayer(userId, user.getPlayerInfoManager(), user.getMapManager().getCurMapId()); PlayerInfoProto.GetPlayerInfoResponse getPlayerInfoResponse = PlayerInfoProto.GetPlayerInfoResponse.newBuilder() diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapEnterRequestHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapEnterRequestHandler.java index 9f89c6580..544cdd686 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapEnterRequestHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapEnterRequestHandler.java @@ -20,7 +20,7 @@ public class MapEnterRequestHandler extends BaseHandler{ public void process(ISession iSession, PacketNetData netData) throws Exception { byte[] message = netData.parseClientProtoNetData(); MapInfoProto.MapEnterRequest mapEnterRequest = MapInfoProto.MapEnterRequest.parseFrom(message); - List heroInfosList = mapEnterRequest.getHeroInfosList(); - MapLogic.getInstance().enterMap(iSession, mapEnterRequest.getMapId(), heroInfosList, MessageTypeProto.MessageType.MAP_ENTER_RESPONSE); + int teamId = mapEnterRequest.getTeamId(); + MapLogic.getInstance().enterMap(iSession, mapEnterRequest.getMapId(), teamId, MessageTypeProto.MessageType.MAP_ENTER_RESPONSE); } } 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 4f14de44b..c309bf1e8 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 @@ -7,6 +7,7 @@ import com.ljsd.jieling.db.redis.RedisUtil; import com.ljsd.jieling.handler.map.behavior.BaseBehavior; import com.ljsd.jieling.handler.mission.Mission; import com.ljsd.jieling.logic.dao.Hero; +import com.ljsd.jieling.logic.dao.TeamPosHeroInfo; import com.ljsd.jieling.logic.dao.User; import com.ljsd.jieling.logic.dao.UserManager; import com.ljsd.jieling.logic.hero.HeroLogic; @@ -14,7 +15,10 @@ import com.ljsd.jieling.network.session.ISession; import com.ljsd.jieling.protocols.CommonProto; import com.ljsd.jieling.protocols.MapInfoProto; import com.ljsd.jieling.protocols.MessageTypeProto; -import com.ljsd.jieling.util.*; +import com.ljsd.jieling.util.CellUtil; +import com.ljsd.jieling.util.ItemUtil; +import com.ljsd.jieling.util.MathUtils; +import com.ljsd.jieling.util.MessageUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.context.ConfigurableApplicationContext; @@ -56,27 +60,29 @@ public class MapLogic { * * @param mapId */ - public void enterMap(ISession iSession, int mapId, List heroInfosList, MessageTypeProto.MessageType messageType) throws Exception { + public void enterMap(ISession iSession, int mapId, int teamId, MessageTypeProto.MessageType messageType) throws Exception { int uid = iSession.getUid(); User user = UserManager.getUser(uid); - MapManager mapManager = user.getMapManager(); - if (mapManager.getCurMapId() == 0) { -// if (heroInfosList == null || heroInfosList.isEmpty()) { -// return; -// } - Set heroes = new HashSet<>(heroInfosList.size()); - for (MapInfoProto.HeroInfo heroInfo : heroInfosList) { - Hero hero = user.getHeroManager().getHero(heroInfo.getHeroId()); - if (hero == null) { - return; - } - hero.setCurHp(HeroLogic.getInstance().calHeroAttribute(hero, GlobalsDef.HP_TYPE)); - heroes.add(heroInfo.getHeroId()); - } - if (heroes.size() != heroInfosList.size()) { + List teamPosHeroInfos = user.getTeamPosManager().getTeamPosForHero().get(teamId); + if (teamPosHeroInfos == null || teamPosHeroInfos.isEmpty()) { + MessageUtil.sendErrorResponse(iSession, 0, messageType.getNumber(), "阵容不存在"); + return; + } + Set heroes = new HashSet<>(teamPosHeroInfos.size()); + for (TeamPosHeroInfo heroInfo : teamPosHeroInfos) { + Hero hero = user.getHeroManager().getHero(heroInfo.getHeroId()); + if (hero == null) { return; } - mapManager.setHeroes(heroes); + hero.setCurHp(HeroLogic.getInstance().calHeroAttribute(hero, GlobalsDef.HP_TYPE)); + heroes.add(heroInfo.getHeroId()); + } + if (heroes.size() != teamPosHeroInfos.size()) { + return; + } + MapManager mapManager = user.getMapManager(); + mapManager.setHeroes(heroes); + if (mapManager.getCurMapId() == 0) { user.getPlayerInfoManager().setMapId(mapId); mapManager.setCurMapId(mapId); initMap(mapManager, user); @@ -188,39 +194,6 @@ public class MapLogic { mapManager.setTypeEight(spicelMap); } - /** - * 战斗开始 - */ - public List fightStart(int uid, int bigEventId, User user){ - String key = RedisKey.getKey(RedisKey.FIGHT, Integer.toString(uid) + RedisKey.UNDERLINE_LINE + Integer.toString(bigEventId), false); - RedisUtil.getInstence().set(key, Integer.toString(uid), RedisKey.EXPIRE_TIME); - Set heroes = user.getMapManager().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 = HeroLogic.getInstance().calHeroAttribute(hero, GlobalsDef.HP_TYPE); - 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); - } - return heroFightInfos; - } - /** * 战斗结束 */ 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 50087d647..ad01bdbff 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 @@ -1,10 +1,26 @@ 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.EventType; +import com.ljsd.jieling.handler.map.MapManager; +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.FightInfoProto; import com.ljsd.jieling.protocols.MapInfoProto; +import com.ljsd.jieling.util.CBean2Proto; +import com.ljsd.jieling.util.MessageUtil; +import com.ljsd.jieling.util.MonsterUtil; import org.springframework.stereotype.Component; +import java.util.ArrayList; +import java.util.List; +import java.util.Set; + @Component public class FightBehavior extends BaseBehavior { @Override @@ -14,7 +30,36 @@ public class FightBehavior extends BaseBehavior { @Override public boolean process(User user, int[][] behaviorTypeValues, MapInfoProto.EventUpdateResponse.Builder eventUpdateResponse) throws Exception { -// heroFightInfos = fightStart(uid, bigEventId, user); + 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); return true; } } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java b/serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java index dca7a069d..d2112d219 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java @@ -15,7 +15,7 @@ import java.util.concurrent.CopyOnWriteArrayList; public class CBean2Proto { - public static CommonProto.Player getPlayer(int uid, PlayerManager playerManager) { + public static CommonProto.Player getPlayer(int uid, PlayerManager playerManager, int mapId) { CommonProto.Player player = CommonProto.Player .newBuilder() .setUid(uid) @@ -25,6 +25,7 @@ public class CBean2Proto { .setVipLevel(playerManager.getVipLevel()) .setFamilyId(playerManager.getFamilyId()) .setHead(playerManager.getHead()) + .setCurMapId(mapId == 0 ? 101 : mapId) .build(); return player; } @@ -122,7 +123,7 @@ public class CBean2Proto { .addAllPokemoncomonpent(pokemoncomonpentList) .build(); } - public static FightInfoProto.Monster getMonster(SMonsterConfig sMonsterConfig) { + public static CommonProto.Monster getMonster(SMonsterConfig sMonsterConfig) { List monsterPropertyList = new CopyOnWriteArrayList<>(); List monsterSkillList = new CopyOnWriteArrayList<>(); //火风水地光暗 int[] damageBonusFactor = sMonsterConfig.getDamageBonusFactor(); @@ -153,7 +154,7 @@ public class CBean2Proto { monsterPropertyList.add(damageBonusFactor[5]); //暗系伤害加成系数 monsterPropertyList.add(damageReduceFactor[5]); //暗系伤害减免系数 - FightInfoProto.Monster.Builder monsterBuilder = FightInfoProto.Monster.newBuilder(); + CommonProto.Monster.Builder monsterBuilder = CommonProto.Monster.newBuilder(); monsterBuilder.addAllMonsterProperty(monsterPropertyList); monsterBuilder.addAllMonsterSkill(monsterSkillList); monsterBuilder.setMonsterId(String.valueOf(sMonsterConfig.getId())); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/util/MonsterUtil.java b/serverlogic/src/main/java/com/ljsd/jieling/util/MonsterUtil.java index d3e5367d9..d71416dab 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/util/MonsterUtil.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/util/MonsterUtil.java @@ -2,6 +2,7 @@ package com.ljsd.jieling.util; import com.ljsd.jieling.config.SMonsterConfig; import com.ljsd.jieling.config.SMonsterGroup; +import com.ljsd.jieling.protocols.CommonProto; import com.ljsd.jieling.protocols.FightInfoProto; import java.util.List; @@ -10,11 +11,11 @@ import java.util.concurrent.CopyOnWriteArrayList; public class MonsterUtil { - public static List getMonsterByGroup(int groupId){ + public static List getMonsterByGroup(int groupId){ SMonsterGroup sMonsterGroup = SMonsterGroup.getsMonsterGroupMap().get(groupId); int[][] groupIds = sMonsterGroup.getContents(); - List monsterList = new CopyOnWriteArrayList<>(); - Map monsterMap = SMonsterConfig.getMonsterMap(); + List monsterList = new CopyOnWriteArrayList<>(); + Map monsterMap = SMonsterConfig.getMonsterMap(); for (int[] monsterIds : groupIds){ for (int monsterId: monsterIds){ monsterList.add(monsterMap.get(monsterId)); @@ -24,12 +25,12 @@ public class MonsterUtil { } public static List getMonsterSkillById(int monsterId){ - FightInfoProto.Monster monster = SMonsterConfig.getMonsterMap().get(monsterId); + CommonProto.Monster monster = SMonsterConfig.getMonsterMap().get(monsterId); return monster.getMonsterSkillList(); } public static List getMonsterPropertyById(int monsterId){ - FightInfoProto.Monster monster = SMonsterConfig.getMonsterMap().get(monsterId); + CommonProto.Monster monster = SMonsterConfig.getMonsterMap().get(monsterId); return monster.getMonsterPropertyList(); } }