From 6e413a712988314b0ce2bca57dbfd822d4632d1f Mon Sep 17 00:00:00 2001 From: jiahuiwen <1024696487@qq.com> Date: Thu, 28 Mar 2019 19:56:53 +0800 Subject: [PATCH] =?UTF-8?q?=E5=87=BA=E5=9C=B0=E5=9B=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- conf/server/EventPointConfig.txt | 2 +- conf/server/MissionEventsConfig.txt | 2 +- conf/server/MonsterConfig.txt | 248 +++++++++--------- conf/server/MonsterGroup.txt | 112 ++++---- conf/server/OptionAddCondition.txt | 10 +- conf/server/OptionConfig.txt | 7 +- .../ljsd/jieling/handler/map/MapLogic.java | 10 +- 7 files changed, 196 insertions(+), 195 deletions(-) diff --git a/conf/server/EventPointConfig.txt b/conf/server/EventPointConfig.txt index 2a2807d9a..3858c3247 100644 --- a/conf/server/EventPointConfig.txt +++ b/conf/server/EventPointConfig.txt @@ -255,7 +255,7 @@ int mut,int#int,1 101221 101311 101222 101312#101313 101223 101314 -101224 1001#1101#1201#1301 +101224 101315 102001 10101 102002 10102 102003 10104 diff --git a/conf/server/MissionEventsConfig.txt b/conf/server/MissionEventsConfig.txt index 8f46c5404..4587ed32e 100644 --- a/conf/server/MissionEventsConfig.txt +++ b/conf/server/MissionEventsConfig.txt @@ -2,7 +2,7 @@ Id Type MissionNum Reward int int int int 1 1 2 2000 2 1 4 2001 -3 1 5 2002 +3 1 6 2002 4 1 2 2003 5 1 3 2004 6 1 3 2005 diff --git a/conf/server/MonsterConfig.txt b/conf/server/MonsterConfig.txt index 4c14436af..66af2d451 100644 --- a/conf/server/MonsterConfig.txt +++ b/conf/server/MonsterConfig.txt @@ -9,133 +9,133 @@ int int int int int int int int int int int float float float float mut,int#int, 7 3 2 0 1 0 772 260 61 61 240 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20007 null 8 3 2 0 1 0 772 260 61 61 80 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20008 null 9 3 2 0 1 0 772 260 61 61 7 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20009 null -10 4 3 0 2 0 1448 522 305 305 240 0.3 0.3 0.2 1.5 0#0#0#0#0#1 0#0#0#0#0#1 20010 null -11 4 3 0 2 0 1448 522 305 305 80 0.3 0.3 0.2 1.5 0#0#0#0#0#1 0#0#0#0#0#1 20011 null -12 4 3 0 2 0 1448 522 305 305 7 0.3 0.3 0.2 1.5 0#0#0#0#0#1 0#0#0#0#0#1 20012 null -13 5 2 0 1 0 772 260 61 61 240 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20013 null -14 5 2 0 1 0 772 260 61 61 80 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20014 null -15 5 2 0 1 0 772 260 61 61 7 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20015 null -16 6 2 0 1 0 2005 90 50 50 240 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20016 null -17 6 2 0 1 0 2005 90 50 50 80 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20017 null -18 6 2 0 1 0 2005 90 50 50 7 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20018 null -19 7 1 0 1 0 6767 271 152 152 240 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20019 null -20 7 1 0 1 0 6767 271 152 152 80 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20020 null -21 7 1 0 1 0 6767 271 152 152 7 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20021 null -22 8 2 0 2 0 9023 277 152 152 240 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20022 null -23 8 2 0 2 0 9023 277 152 152 80 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20023 null -24 8 2 0 2 0 9023 277 152 152 7 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20024 null -25 9 3 0 1 5 10026 453 254 254 360 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20025 null -26 9 3 0 1 5 10026 453 254 254 120 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20026 null -27 9 3 0 1 5 10026 453 254 254 12 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20027 null -28 10 3 0 1 5 10026 453 254 254 360 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20028 null -29 10 3 0 1 5 10026 453 254 254 120 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20029 null -30 10 3 0 1 5 10026 453 254 254 12 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20030 null -31 11 3 0 2 5 30078 924 508 508 360 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20031 null -32 11 3 0 2 5 30078 924 508 508 120 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20032 null -33 11 3 0 2 5 30078 924 508 508 12 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20033 null -34 9 3 0 1 5 16041 725 406 406 360 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20034 null -35 9 3 0 1 5 16041 725 406 406 120 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20035 null -36 9 3 0 1 5 16041 725 406 406 12 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20036 null -37 13 3 0 1 88 20052 906 508 508 2352 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20037 null -38 13 3 0 1 88 20052 906 508 508 784 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20038 null -39 13 3 0 1 88 20052 906 508 508 78 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20039 null -40 7 1 0 1 88 23225 947 528 528 2352 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20040 null -41 7 1 0 1 88 23225 947 528 528 784 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20041 null -42 7 1 0 1 88 23225 947 528 528 78 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20042 null -43 11 3 0 2 96 33427 1072 576 576 2544 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20043 null -44 11 3 0 2 96 33427 1072 576 576 848 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20044 null -45 11 3 0 2 96 33427 1072 576 576 84 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20045 null -46 15 1 0 1 96 25070 1047 576 576 2544 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20046 null -47 15 1 0 1 96 25070 1047 576 576 848 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20047 null -48 15 1 0 1 96 25070 1047 576 576 84 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20048 null -49 16 1 0 2 100 33870 1108 582 582 2640 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20049 null -50 16 1 0 2 100 33870 1108 582 582 880 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20050 null -51 16 1 0 2 100 33870 1108 582 582 87 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20051 null -52 17 4 0 1 100 25403 1079 582 582 2640 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20052 null -53 17 4 0 1 100 25403 1079 582 582 880 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20053 null -54 17 4 0 1 100 25403 1079 582 582 87 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20054 null -55 18 4 0 1 100 23332 1107 603 603 2640 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20055 null -56 18 4 0 1 100 23332 1107 603 603 880 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20056 null -57 18 4 0 1 100 23332 1107 603 603 87 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20057 null -58 19 4 0 2 100 33394 1099 571 571 2640 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20058 null -59 19 4 0 2 100 33394 1099 571 571 880 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20059 null -60 19 4 0 2 100 33394 1099 571 571 87 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20060 null -61 20 2 0 1 100 25045 1068 571 571 2640 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -62 20 2 0 1 100 25045 1068 571 571 880 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -63 20 2 0 1 100 25045 1068 571 571 87 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -64 21 3 0 1 100 25045 1068 571 571 2640 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -65 21 3 0 1 100 25045 1068 571 571 880 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -66 21 3 0 1 100 25045 1068 571 571 87 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -67 22 4 0 1 108 39273 1382 753 753 2832 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -68 22 4 0 1 108 39273 1382 753 753 944 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -69 22 4 0 1 108 39273 1382 753 753 94 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -70 23 3 0 1 100 21828 1051 561 561 2640 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -71 23 3 0 1 100 21828 1051 561 561 880 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -72 23 3 0 1 100 21828 1051 561 561 87 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -73 24 2 0 2 108 58909 1488 753 753 2832 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -74 24 2 0 2 108 58909 1488 753 753 944 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -75 24 2 0 2 108 58909 1488 753 753 94 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -76 25 4 0 2 108 40586 1267 668 668 2832 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -77 25 4 0 2 108 40586 1267 668 668 944 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -78 25 4 0 2 108 40586 1267 668 668 94 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -79 26 2 0 1 100 21828 1051 561 561 2640 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -80 26 2 0 1 100 21828 1051 561 561 880 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -81 26 2 0 1 100 21828 1051 561 561 87 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -82 27 2 0 1 108 22697 1086 582 582 2832 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -83 27 2 0 1 108 22697 1086 582 582 944 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -84 27 2 0 1 108 22697 1086 582 582 94 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -85 28 4 0 1 108 30440 1234 668 668 2832 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -86 28 4 0 1 108 30440 1234 668 668 944 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -87 28 4 0 1 108 30440 1234 668 668 94 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -88 29 3 0 1 108 22697 1086 582 582 2832 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -89 29 3 0 1 108 22697 1086 582 582 944 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -90 29 3 0 1 108 22697 1086 582 582 94 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -91 30 4 0 2 108 47779 1435 764 764 2832 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -92 30 4 0 2 108 47779 1435 764 764 944 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -93 30 4 0 2 108 47779 1435 764 764 94 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -94 31 2 0 1 108 22697 1086 582 582 2832 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -95 31 2 0 1 108 22697 1086 582 582 944 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -96 31 2 0 1 108 22697 1086 582 582 94 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -97 32 1 0 1 108 30440 1234 668 668 2832 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -98 32 1 0 1 108 30440 1234 668 668 944 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -99 32 1 0 1 108 30440 1234 668 668 94 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -100 33 2 0 1 120 45502 1699 935 935 3120 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -101 33 2 0 1 120 45502 1699 935 935 1040 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -102 33 2 0 1 120 45502 1699 935 935 104 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -103 34 4 0 1 120 45502 1699 935 935 3120 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -104 34 4 0 1 120 45502 1699 935 935 1040 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -105 34 4 0 1 120 45502 1699 935 935 104 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -106 35 2 0 1 120 32287 1417 775 775 3120 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -107 35 2 0 1 120 32287 1417 775 775 1040 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -108 35 2 0 1 120 32287 1417 775 775 104 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -109 36 2 0 1 120 32287 1417 775 775 3120 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -110 36 2 0 1 120 32287 1417 775 775 1040 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -111 36 2 0 1 120 32287 1417 775 775 104 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -112 37 3 0 2 122 74681 2078 1126 1126 3168 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -113 37 3 0 2 122 74681 2078 1126 1126 1056 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -114 37 3 0 2 122 74681 2078 1126 1126 105 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -115 38 2 0 2 124 95567 2225 1156 1156 3216 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -116 38 2 0 2 124 95567 2225 1156 1156 1072 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -117 38 2 0 2 124 95567 2225 1156 1156 107 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -118 39 2 0 1 124 55715 2028 1120 1120 3216 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -119 39 2 0 1 124 55715 2028 1120 1120 1072 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -120 39 2 0 1 124 55715 2028 1120 1120 107 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -121 40 4 0 2 126 74098 2079 1117 1117 3264 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -122 40 4 0 2 126 74098 2079 1117 1117 1088 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -123 40 4 0 2 126 74098 2079 1117 1117 108 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -124 41 2 0 1 124 50969 2084 1156 1156 3216 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -125 41 2 0 1 124 50969 2084 1156 1156 1072 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -126 41 2 0 1 124 50969 2084 1156 1156 107 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -127 42 3 0 1 124 50969 2084 1156 1156 3216 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -128 42 3 0 1 124 50969 2084 1156 1156 1072 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -129 42 3 0 1 124 50969 2084 1156 1156 107 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -130 43 0 0 2 128 95097 2237 1150 1150 3312 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -131 43 0 0 2 128 95097 2237 1150 1150 1104 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null -132 43 0 0 2 128 95097 2237 1150 1150 110 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null +10 4 3 0 2 0 1448 522 305 305 240 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20010 null +11 4 3 0 2 0 1448 522 305 305 80 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20011 null +12 4 3 0 2 0 1448 522 305 305 7 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20012 null +13 5 2 0 1 0 772 260 61 61 240 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20013 null +14 5 2 0 1 0 772 260 61 61 80 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20014 null +15 5 2 0 1 0 772 260 61 61 7 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20015 null +16 6 2 0 1 0 2005 90 50 50 240 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20016 null +17 6 2 0 1 0 2005 90 50 50 80 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20017 null +18 6 2 0 1 0 2005 90 50 50 7 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20018 null +19 7 1 0 1 0 6767 271 152 152 240 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20019 null +20 7 1 0 1 0 6767 271 152 152 80 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20020 null +21 7 1 0 1 0 6767 271 152 152 7 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20021 null +22 8 2 0 2 0 9023 277 152 152 240 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20022 null +23 8 2 0 2 0 9023 277 152 152 80 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20023 null +24 8 2 0 2 0 9023 277 152 152 7 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20024 null +25 9 3 0 1 5 10026 453 254 254 360 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20025 null +26 9 3 0 1 5 10026 453 254 254 120 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20026 null +27 9 3 0 1 5 10026 453 254 254 12 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20027 null +28 10 3 0 1 5 10026 453 254 254 360 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20028 null +29 10 3 0 1 5 10026 453 254 254 120 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20029 null +30 10 3 0 1 5 10026 453 254 254 12 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20030 null +31 11 3 0 2 5 30078 924 508 508 360 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20031 null +32 11 3 0 2 5 30078 924 508 508 120 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20032 null +33 11 3 0 2 5 30078 924 508 508 12 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20033 null +34 9 3 0 1 5 16041 725 406 406 360 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20034 null +35 9 3 0 1 5 16041 725 406 406 120 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20035 null +36 9 3 0 1 5 16041 725 406 406 12 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20036 null +37 13 3 0 1 88 20052 906 508 508 2352 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20037 null +38 13 3 0 1 88 20052 906 508 508 784 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20038 null +39 13 3 0 1 88 20052 906 508 508 78 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20039 null +40 7 1 0 1 88 23225 947 528 528 2352 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20040 null +41 7 1 0 1 88 23225 947 528 528 784 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20041 null +42 7 1 0 1 88 23225 947 528 528 78 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20042 null +43 11 3 0 2 96 33427 1072 576 576 2544 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20043 null +44 11 3 0 2 96 33427 1072 576 576 848 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20044 null +45 11 3 0 2 96 33427 1072 576 576 84 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20045 null +46 15 1 0 1 96 25070 1047 576 576 2544 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20046 null +47 15 1 0 1 96 25070 1047 576 576 848 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20047 null +48 15 1 0 1 96 25070 1047 576 576 84 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20048 null +49 16 1 0 2 100 33870 1108 582 582 2640 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20049 null +50 16 1 0 2 100 33870 1108 582 582 880 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20050 null +51 16 1 0 2 100 33870 1108 582 582 87 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20051 null +52 17 4 0 1 100 25403 1079 582 582 2640 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20052 null +53 17 4 0 1 100 25403 1079 582 582 880 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20053 null +54 17 4 0 1 100 25403 1079 582 582 87 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20054 null +55 18 4 0 1 100 23332 1107 603 603 2640 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20055 null +56 18 4 0 1 100 23332 1107 603 603 880 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20056 null +57 18 4 0 1 100 23332 1107 603 603 87 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20057 null +58 19 4 0 2 100 33394 1099 571 571 2640 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20058 null +59 19 4 0 2 100 33394 1099 571 571 880 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20059 null +60 19 4 0 2 100 33394 1099 571 571 87 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20060 null +61 20 2 0 1 100 25045 1068 571 571 2640 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null +62 20 2 0 1 100 25045 1068 571 571 880 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null +63 20 2 0 1 100 25045 1068 571 571 87 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null +64 21 3 0 1 100 25045 1068 571 571 2640 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null +65 21 3 0 1 100 25045 1068 571 571 880 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null +66 21 3 0 1 100 25045 1068 571 571 87 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null +67 22 4 0 1 108 39273 1382 753 753 2832 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null +68 22 4 0 1 108 39273 1382 753 753 944 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null +69 22 4 0 1 108 39273 1382 753 753 94 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null +70 23 3 0 1 100 21828 1051 561 561 2640 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null +71 23 3 0 1 100 21828 1051 561 561 880 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null +72 23 3 0 1 100 21828 1051 561 561 87 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null +73 24 2 0 2 108 58909 1488 753 753 2832 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null +74 24 2 0 2 108 58909 1488 753 753 944 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null +75 24 2 0 2 108 58909 1488 753 753 94 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null +76 25 4 0 2 108 40586 1267 668 668 2832 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null +77 25 4 0 2 108 40586 1267 668 668 944 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null +78 25 4 0 2 108 40586 1267 668 668 94 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null +79 26 2 0 1 100 21828 1051 561 561 2640 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null +80 26 2 0 1 100 21828 1051 561 561 880 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null +81 26 2 0 1 100 21828 1051 561 561 87 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null +82 27 2 0 1 108 22697 1086 582 582 2832 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null +83 27 2 0 1 108 22697 1086 582 582 944 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null +84 27 2 0 1 108 22697 1086 582 582 94 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null +85 28 4 0 1 108 30440 1234 668 668 2832 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null +86 28 4 0 1 108 30440 1234 668 668 944 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null +87 28 4 0 1 108 30440 1234 668 668 94 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null +88 29 3 0 1 108 22697 1086 582 582 2832 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null +89 29 3 0 1 108 22697 1086 582 582 944 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null +90 29 3 0 1 108 22697 1086 582 582 94 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null +91 30 4 0 2 108 47779 1435 764 764 2832 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null +92 30 4 0 2 108 47779 1435 764 764 944 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null +93 30 4 0 2 108 47779 1435 764 764 94 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null +94 31 2 0 1 108 22697 1086 582 582 2832 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null +95 31 2 0 1 108 22697 1086 582 582 944 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null +96 31 2 0 1 108 22697 1086 582 582 94 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null +97 32 1 0 1 108 30440 1234 668 668 2832 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null +98 32 1 0 1 108 30440 1234 668 668 944 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null +99 32 1 0 1 108 30440 1234 668 668 94 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null +100 33 2 0 1 120 45502 1699 935 935 3120 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null +101 33 2 0 1 120 45502 1699 935 935 1040 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null +102 33 2 0 1 120 45502 1699 935 935 104 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null +103 34 4 0 1 120 45502 1699 935 935 3120 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null +104 34 4 0 1 120 45502 1699 935 935 1040 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null +105 34 4 0 1 120 45502 1699 935 935 104 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null +106 35 2 0 1 120 32287 1417 775 775 3120 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null +107 35 2 0 1 120 32287 1417 775 775 1040 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null +108 35 2 0 1 120 32287 1417 775 775 104 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null +109 36 2 0 1 120 32287 1417 775 775 3120 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null +110 36 2 0 1 120 32287 1417 775 775 1040 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null +111 36 2 0 1 120 32287 1417 775 775 104 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null +112 37 3 0 2 122 74681 2078 1126 1126 3168 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null +113 37 3 0 2 122 74681 2078 1126 1126 1056 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null +114 37 3 0 2 122 74681 2078 1126 1126 105 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null +115 38 2 0 2 124 95567 2225 1156 1156 3216 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null +116 38 2 0 2 124 95567 2225 1156 1156 1072 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null +117 38 2 0 2 124 95567 2225 1156 1156 107 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null +118 39 2 0 1 124 55715 2028 1120 1120 3216 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null +119 39 2 0 1 124 55715 2028 1120 1120 1072 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null +120 39 2 0 1 124 55715 2028 1120 1120 107 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null +121 40 4 0 2 126 74098 2079 1117 1117 3264 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null +122 40 4 0 2 126 74098 2079 1117 1117 1088 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null +123 40 4 0 2 126 74098 2079 1117 1117 108 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null +124 41 2 0 1 124 50969 2084 1156 1156 3216 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null +125 41 2 0 1 124 50969 2084 1156 1156 1072 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null +126 41 2 0 1 124 50969 2084 1156 1156 107 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null +127 42 3 0 1 124 50969 2084 1156 1156 3216 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null +128 42 3 0 1 124 50969 2084 1156 1156 1072 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null +129 42 3 0 1 124 50969 2084 1156 1156 107 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null +130 43 0 0 2 128 95097 2237 1150 1150 3312 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null +131 43 0 0 2 128 95097 2237 1150 1150 1104 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null +132 43 0 0 2 128 95097 2237 1150 1150 110 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null 133 1 2 0 1 0 2500 180 61 61 240 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null 134 1 2 0 1 0 2500 180 61 61 80 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20002 null 135 1 2 0 1 0 2500 180 61 61 7 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20003 null -136 5 2 0 1 0 2000 260 61 61 80 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20014 null +136 5 2 0 1 0 2000 260 61 61 80 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20014 null 137 3 2 0 1 0 2000 260 61 61 240 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20007 null 138 3 2 0 1 0 2000 260 61 61 7 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20009 null 1001 4 3 0 1 0 3000 180 61 61 240 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20010 null diff --git a/conf/server/MonsterGroup.txt b/conf/server/MonsterGroup.txt index 25b5bba92..75396fa28 100644 --- a/conf/server/MonsterGroup.txt +++ b/conf/server/MonsterGroup.txt @@ -11,7 +11,7 @@ int mut,int#int,2 mut,int#int,1 string 10108 11#4#6 10108#20108 10109 11#7#9 10109#20109 10110 11 10110#20110 -10111 136#137#138 10111#20111 +10111 136#137#138 10104#20104 10201 16#17#18 10201#20201 10202 20#16#18 10202#20202 10203 23#16#18 10203#20203 @@ -29,8 +29,8 @@ int mut,int#int,2 mut,int#int,1 string 10405 44#34#36 10405#20405 10406 44#37#39 10406#20406 10407 44 10407#20407 -10408 43#45 10408#20408 -10409 43#45#40#42 10409#20409 +10408 43#45 10409#20409 +10409 43#45#40#42 10408#20408 10501 46#48 10501#20501 10502 46#47#48 10502#20502 10503 50#46#48 10503#20503 @@ -72,56 +72,56 @@ int mut,int#int,2 mut,int#int,1 string 11004 122#125#128 11004#21004 11005 122 11005#21005 11006 131 11006#21006 -1010001 1002#1003#1004 1010001#1020001 -1010002 1005#1006#1007 1010002#1020002 -1010003 1008#1009#1010 1010003#1020003 -1010004 1011#1012#1013 1010004#1020004 -1010005 1014#1016 1010005#1020005 -1010006 1014#1015#1016 1010006#1020006 -1010007 1017 1010007#1020007 -1020001 1018#1019#1020 1020001#1030001 -1020002 1021#1022#1023 1020002#1030002 -1020003 1024#1025#1026 1020003#1030003 -1020004 1027#1028#1029 1020004#1030004 -1020005 1030#1031#1032 1020005#1030005 -1020006 1033#1034#1035 1020006#1030006 -1020007 1036#1037#1038 1020007#1030007 -1020008 1039#1040#1041 1020008#1030008 -1020009 1042 1020009#1030009 -1030001 1043#1044#1045 1030001#1040001 -1030002 1046#1047#1048 1030002#1040002 -1030003 1052#1049#1051 1030003#1040003 -1030004 1053 1030004#1040004 -1040001 1054#1055#1056 1040001#1050001 -1040002 1057#1058#1059 1040002#1050002 -1040003 1060#1061#1062 1040003#1050003 -1040004 1063 1040004#1050004 -1040005 1063#1064#1060#1062 1040005#1050005 -1040006 1065#1066#1067 1040006#1050006 -1050001 1069 1050001#1060001 -1050002 1071#1072#1073 1050002#1060002 -1050003 1075#1071#1073 1050003#1060003 -1050004 1078 1050004#1060004 -1050005 1080 1050005#1060005 -1050006 1081#1082 1050006#1060006 -1060001 1083#1084#1085 1060001#1070001 -1060002 1086#1087#1088 1060002#1070002 -1060003 1089#1090#1091 1060003#1070003 -1060004 1092 1060004#1070004 -1060005 1093#1094#1095 1060005#1070005 -1060006 1096#1097#1098 1060006#1070006 -1060007 1099#1101#1102#1104 1060007#1070007 -1070001 1108#1110#1105#1107 1070001#1080001 -1070002 1111 1070002#1080002 -1080001 1112#1114 1080001#1090001 -1080002 1115#1117 1080002#1090002 -1080003 1118#1120 1080003#1090003 -1080004 1121#1123 1080004#1090004 -1080005 1124#1126 1080005#1090005 -1080006 1127#1129 1080006#1090006 -1080007 1130#1131 1080007#1090007 -1080008 1132 1080008#1090008 -1080009 1133 1080009#1090009 -1090001 1134#1135#1136 1090001#1100001 -1090002 1137#1138#1139 1090002#1100002 -1090003 1140 1090003#1100003 +1010001 1002#1003#1004 10104#20104 +1010002 1005#1006#1007 10105#20105 +1010003 1008#1009#1010 10106#20106 +1010004 1011#1012#1013 10107#20107 +1010005 1014#1016 10107#20107 +1010006 1014#1015#1016 10107#20107 +1010007 1017 10110#20110 +1020001 1018#1019#1020 10201#20201 +1020002 1021#1022#1023 10201#20201 +1020003 1024#1025#1026 10201#20201 +1020004 1027#1028#1029 10201#20201 +1020005 1030#1031#1032 10201#20201 +1020006 1033#1034#1035 10202#20202 +1020007 1036#1037#1038 10203#20203 +1020008 1039#1040#1041 10204#20204 +1020009 1042 10205#20205 +1030001 1043#1044#1045 10302#20302 +1030002 1046#1047#1048 10303#20303 +1030003 1052#1049#1051 10304#20304 +1030004 1053 10305#20305 +1040001 1054#1055#1056 10404#20404 +1040002 1057#1058#1059 10404#20404 +1040003 1060#1061#1062 10405#20405 +1040004 1063 10406#20406 +1040005 1063#1064#1060#1062 10407#20407 +1040006 1065#1066#1067 10409#20409 +1050001 1069 10501#20501 +1050002 1071#1072#1073 10502#20502 +1050003 1075#1071#1073 10503#20503 +1050004 1078 10504#20504 +1050005 1080 10504#20504 +1050006 1081#1082 10504#20504 +1060001 1083#1084#1085 10601#20601 +1060002 1086#1087#1088 10601#20601 +1060003 1089#1090#1091 10601#20601 +1060004 1092 10602#20602 +1060005 1093#1094#1095 10603#20603 +1060006 1096#1097#1098 10604#20604 +1060007 1099#1101#1102#1104 10605#20605 +1070001 1108#1110#1105#1107 10708#20708 +1070002 1111 10709#20709 +1080001 1112#1114 10808#20808 +1080002 1115#1117 10808#20808 +1080003 1118#1120 10808#20808 +1080004 1121#1123 10808#20808 +1080005 1124#1126 10808#20808 +1080006 1127#1129 10808#20808 +1080007 1130#1131 10809#20809 +1080008 1132 10809#20809 +1080009 1133 10809#20809 +1090001 1134#1135#1136 10906#20906 +1090002 1137#1138#1139 10906#20906 +1090003 1140 10907#20907 diff --git a/conf/server/OptionAddCondition.txt b/conf/server/OptionAddCondition.txt index c63590d15..1752c790c 100644 --- a/conf/server/OptionAddCondition.txt +++ b/conf/server/OptionAddCondition.txt @@ -15,15 +15,15 @@ int int mut,int#int,2 13 4 3#1 14 4 6#1 15 4 9#1 -10101 3 1#5#100 -10102 3 1#2#100 -10103 3 1#2#200 +10101 3 1#5#300 +10102 3 1#2#650 +10103 3 1#2#500 10104 0 null 10105 0 null 10106 0 null 10107 0 null -10108 6 0#2#5 -10109 6 1#2#5 +10108 0 null +10109 6 0#2#1 10201 6 0#3#6 10202 6 1#3#6 10301 6 0#4#3 diff --git a/conf/server/OptionConfig.txt b/conf/server/OptionConfig.txt index 2aa8d614e..155a52dc3 100644 --- a/conf/server/OptionConfig.txt +++ b/conf/server/OptionConfig.txt @@ -71,7 +71,7 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2 101035 0 0 null null 1 101029 101036 0 0 null null 1 101030 101037 0 0 null null 6 101027 -101038 0 28 30 null 1 101035 +101038 10109 28 30 null 1 101035 101039 0 0 null null 4 null 101040 0 0 null null 0 null 101041 0 0 null null 0 null @@ -326,7 +326,7 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2 101290 0 0 null null 4 null 101291 3 0 null null 1 101205 101292 0 0 null null 4 null -101293 0 0 null 100002 1 101206 +101293 0 0 null null 1 101206 101294 0 0 null null 4 null 101295 0 0 null null 4 null 101296 0 0 null null 1 101208 @@ -348,6 +348,7 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2 101312 0 0 null null 1 101223 101313 0 0 null null 4 null 101314 0 0 null null 4 null +101315 0 6 2 1003#1103#1203#1303 4 null 102001 1 2 1503#1#102004 1002#1102#1202#1302 4 null 102002 0 0 null null 4 null 102003 1 2 1503#1#102005 1002#1102#1202#1302 4 null @@ -386,7 +387,7 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2 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 4 null +102039 0 9 3 null 4 null 102040 0 0 null null 0 null 102041 0 0 null null 0 null 102042 0 0 null null 0 null 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 587365555..48ef67acf 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 @@ -292,13 +292,13 @@ public class MapLogic { int moveConfused = scMapConfig.getMoveConfused(); if (moveConfused > 0) { int leftStep = mapManager.getTotalStep() - cells.size() * moveConfused; - if (leftStep <0) { + if (leftStep <= 0) { leftStep = 0; resetMapInfo(user, false); LOGGER.info("updateMap() uid=>{}, leftStep=>{}", uid, leftStep); mapManager.setTotalStep(leftStep); MapInfoProto.MapUpdateResponse mapUpdateResponse = MapInfoProto.MapUpdateResponse.newBuilder().build(); - MessageUtil.sendMessage(session, 0, messageType.getNumber(), mapUpdateResponse, true); + MessageUtil.sendMessage(session, 1, messageType.getNumber(), mapUpdateResponse, true); return true; } updateMapMission(mapManager,EventType.updateEvent,MapMissionType.CONSUME_ACTION_POWER_EVENT.getMissionTypeValue(),cells.size() * moveConfused); @@ -549,8 +549,8 @@ public class MapLogic { if (dropBuilder != null) { eventUpdateResponse.setDrop(dropBuilder); } -// LOGGER.info("updateEvent =====>success<====== xy=>{}, getPointId=>{} eventId={}, mission=>{}, nextEventId=>{}, eventBehaviorCommon=>{} {} sOptionConfig.getReward()=>{}", mapManager.getCurXY(), cell == null ? 0 : cell.getPointId(), -// cell == null ? 0 : cell.getEventId(), eventUpdateResponse.getMissionList(), nextEventId, eventBehaviorCommon,eventUpdateResponse.getDrop(), sOptionConfig.getReward()); + LOGGER.info("updateEvent =====>success<====== xy=>{}, getPointId=>{} eventId={}, mission=>{}, nextEventId=>{}, eventBehaviorCommon=>{} {} sOptionConfig.getReward()=>{}", mapManager.getCurXY(), cell == null ? 0 : cell.getPointId(), + cell == null ? 0 : cell.getEventId(), eventUpdateResponse.getMissionList(), nextEventId, eventBehaviorCommon,eventUpdateResponse.getDrop(), sOptionConfig.getReward()); saveRefreshInfo(pointId, mapManager, mapPointConfig, nextEventId); updateMapMission(mapManager,EventType.updateEvent,pointId,0); MessageUtil.sendMessage(session, 1, messageType.getNumber(), eventUpdateResponse.build(), true); @@ -916,7 +916,7 @@ public class MapLogic { BehaviorUtil.distoryApointXY(user, destoryXY); } updateMapMission(user.getMapManager(),EventType.fightEvent,0,monsterGroupId); -// LOGGER.info("endFight() uid=>{} sMonsterGroup.getRewardgroup()=>{} drop=>{}", uid, sMonsterGroup.getRewardgroup(), fightEndResponse.getDrop()); + LOGGER.info("endFight() uid=>{} sMonsterGroup.getRewardgroup()=>{} drop=>{}", uid, sMonsterGroup.getRewardgroup(), fightEndResponse.getDrop()); MessageUtil.sendMessage(session, 1, messageType.getNumber(), fightEndResponse.build(), true); }