From 12e75f690e7a2a0e02a60b42bcfe4fd15fa89b43 Mon Sep 17 00:00:00 2001 From: wangyuan Date: Fri, 29 Mar 2019 15:47:49 +0800 Subject: [PATCH 1/3] fix --- .../ljsd/jieling/handler/map/MapLogic.java | 42 ++++++++----------- 1 file changed, 17 insertions(+), 25 deletions(-) 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 6b2dc4814..7ea61446d 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 @@ -552,7 +552,7 @@ public class MapLogic { 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); + updateMapMission(mapManager,EventType.updateEvent,cell == null ? 0 : cell.getEventId(),0); MessageUtil.sendMessage(session, 1, messageType.getNumber(), eventUpdateResponse.build(), true); } @@ -998,20 +998,23 @@ public class MapLogic { } } } - if(logic == MapMissionType.DIGGER_EVENT.getMissionTypeValue()){ - MapPointConfig mapPointConfig = MapPointConfig.getScMapEventMap().get(eventId); - if(mapPointConfig!=null&&mapPointConfig.getStyle() == 2){ - if(missionValue Date: Fri, 29 Mar 2019 15:54:32 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=8E=A2=E7=B4=A2=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- conf/server/AccomplishmentConfig.txt | 127 ++++++++++++------ conf/server/EventPointConfig.txt | 8 +- conf/server/MonsterGroup.txt | 54 +++++--- conf/server/OptionConfig.txt | 126 ++++++++--------- .../ljsd/jieling/handler/map/MapLogic.java | 3 +- 5 files changed, 189 insertions(+), 129 deletions(-) diff --git a/conf/server/AccomplishmentConfig.txt b/conf/server/AccomplishmentConfig.txt index 1afd405f5..d3296c1bf 100644 --- a/conf/server/AccomplishmentConfig.txt +++ b/conf/server/AccomplishmentConfig.txt @@ -1,45 +1,86 @@ id MapId Logic Values Score int int int mut,int#int,1 int -1 101 1 101009#1 11 -2 101 1 101016#1 20 -3 101 3 0#1 5 -4 101 3 0#2 5 -5 101 3 0#3 5 -6 101 3 0#4 5 -7 101 3 0#5 5 -8 101 3 0#6 5 -9 101 3 0#7 5 -10 101 3 0#8 5 -11 101 3 0#9 5 -12 101 3 0#10 5 -13 101 3 0#11 5 -14 101 5 0#1 1 -15 101 5 0#2 1 -16 101 5 0#3 1 -17 101 5 0#4 1 -18 101 5 0#5 1 -19 101 6 0#50 3 -20 101 6 0#75 3 -21 101 6 0#100 3 -22 102 1 102015#1 6 -23 102 1 102017#1 6 -24 102 1 102018#1 6 -25 102 1 102019#1 2 -26 102 1 102020#1 2 -27 102 1 102021#1 2 -28 102 1 102022#1 6 -29 102 1 102023#1 6 -30 102 1 102024#1 6 -31 102 1 102025#1 6 -32 102 1 102026#1 6 -33 102 1 102028#1 6 -34 102 2 0#1 6 -35 102 1 102032#1 4 -36 102 1 102033#1 4 -37 102 7 0#1 8 -38 102 5 0#5 3 -39 102 5 0#10 3 -40 102 5 0#15 3 -41 102 3 0#20 3 -42 102 3 0#30 3 -43 102 3 0#50 3 +1 101 1 101064#1 4 +2 101 1 101026#1 8 +3 101 1 101142#1 4 +4 101 1 101046#1 8 +5 101 1 101061#1 8 +6 101 1 101100#1 8 +7 101 1 101126#1 8 +8 101 1 101222#1 6 +9 101 1 101224#1 6 +10 101 7 0#1 10 +11 101 5 0#1 4 +12 101 5 0#3 4 +13 101 5 0#5 4 +14 101 3 0#10 3 +15 101 3 0#20 3 +16 101 3 0#30 3 +17 101 6 0#50 3 +18 101 6 0#75 3 +19 101 6 0#100 3 +20 102 1 102016#1 6 +21 102 1 102028#1 6 +22 102 1 102137#1 7 +23 102 1 102036#1 2 +24 102 1 102039#1 2 +25 102 1 102042#1 2 +26 102 1 102061#1 7 +27 102 1 102172#1 7 +28 102 1 102077#1 7 +29 102 1 102105#1 7 +30 102 1 102026#1 7 +31 102 2 0#1 6 +32 102 1 102165#1 4 +33 102 1 102167#1 4 +34 102 7 0#1 8 +35 102 5 0#5 3 +36 102 5 0#10 3 +37 102 5 0#15 3 +38 102 3 0#20 3 +39 102 3 0#30 3 +40 102 3 0#50 3 +41 103 1 103017#1 3 +42 103 1 103018#1 3 +43 103 1 103020#1 6 +44 103 1 103021#1 6 +45 103 1 103022#1 6 +46 103 1 103023#1 6 +47 103 1 103030#1 6 +48 103 1 101017#1 6 +49 103 1 101023#1 6 +50 103 1 101024#1 6 +51 103 1 103028#1 4 +52 103 1 103029#1 4 +53 103 7 0#1 10 +54 103 5 0#5 3 +55 103 5 0#10 3 +56 103 5 0#20 3 +57 103 3 0#20 3 +58 103 3 0#30 3 +59 103 3 0#50 3 +60 103 8 0 10 +61 104 1 104021#1 6 +62 104 1 104023#1 6 +63 104 1 104024#1 6 +64 104 1 104026#1 6 +65 104 1 104022#1 4 +66 104 1 104025#1 4 +67 104 1 104027#1 4 +68 104 1 104028#1 4 +69 104 1 104029#1 4 +70 104 1 104004#1 4 +71 104 1 104030#1 4 +72 104 1 104019#1 4 +73 104 1 104020#1 4 +74 104 1 0 4 +75 104 1 0 4 +76 104 1 0 4 +77 104 7 0 4 +78 104 7 0 6 +79 104 7 0 4 +80 104 7 0 6 +81 104 5 0#10 3 +82 104 5 0#20 3 +83 104 3 0#20 3 +0 0 3 0#40 3 diff --git a/conf/server/EventPointConfig.txt b/conf/server/EventPointConfig.txt index 3858c3247..e14bddcbb 100644 --- a/conf/server/EventPointConfig.txt +++ b/conf/server/EventPointConfig.txt @@ -256,9 +256,9 @@ int mut,int#int,1 101222 101312#101313 101223 101314 101224 101315 -102001 10101 -102002 10102 -102003 10104 +102001 10201 +102002 10202 +102003 10204 102004 102001#102002 102005 102003#102004 102006 102005#102006 @@ -363,7 +363,7 @@ int mut,int#int,1 102105 102156 102106 102157 102107 102158 -102108 10103 +102108 10203 102109 102159#102160 102110 102161#102162 102111 102163 diff --git a/conf/server/MonsterGroup.txt b/conf/server/MonsterGroup.txt index 75396fa28..6509656c2 100644 --- a/conf/server/MonsterGroup.txt +++ b/conf/server/MonsterGroup.txt @@ -72,26 +72,44 @@ int mut,int#int,2 mut,int#int,1 string 11004 122#125#128 11004#21004 11005 122 11005#21005 11006 131 11006#21006 +101011 1#2#3 100001#102001#101001 +101021 4#5#6 100002#101001#102002 +101071 11#1#3 100003#101001#101001#102002#102002 +101012 1#2#3 100002#101001#102002 +102011 16#17#18 100012#101005#102008#102008 +102012 16#17#18 100002#102001 +102013 16#17#18 100002#102002#101001 +102014 16#17#18 100003#102002#101001#101001 +102021 20#16#18 100004#101002#102002#102002 +102031 23#16#18 100005#101003#102003#102002 +103011 25#26#27 100002#101001#102003 +103031 32#25#27 100004#102005#101001 +103032 32#25#27 100004#102005#101001#101001 +103041 32#28#30 100004#101001#101001#102003 +103051 32 100004#101001#101001#102003 +103052 32 100004 +103053 32 100005#100002 +103054 32 100006#100002 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 +1010002 1005#1006#1007 100001#100002#102002 +1010003 1008#1009#1010 100001#100002#102002 +1010004 1011#1012#1013 100003#101001#102002 +1010005 1014#1016 100005#101002#102003 +1010006 1014#1015#1016 100005#101002#102003 +1010007 1017 100006#101006#101001#102004 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 +1020002 1021#1022#1023 100003#101001#102002 +1020003 1024#1025#1026 100003#101001#102002 +1020004 1027#1028#1029 100004#101001#101001#102002#102001 +1020005 1030#1031#1032 100002#102001 +1020006 1033#1034#1035 100004#101002#102002 +1020007 1036#1037#1038 100002#102001#101001 +1020008 1039#1040#1041 100004#102001#102002#101002 +1020009 1042 100006#102004#101004 +1030001 1043#1044#1045 100004#102003 +1030002 1046#1047#1048 100004#102003 +1030003 1052#1049#1051 100009#100004#102010#101004#101001 +1030004 1053 100015#102011#102005#101005 1040001 1054#1055#1056 10404#20404 1040002 1057#1058#1059 10404#20404 1040003 1060#1061#1062 10405#20405 diff --git a/conf/server/OptionConfig.txt b/conf/server/OptionConfig.txt index 155a52dc3..413e9aa00 100644 --- a/conf/server/OptionConfig.txt +++ b/conf/server/OptionConfig.txt @@ -41,13 +41,13 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2 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 100001#102001 1 101009 +101008 0 1 101011 null 1 101009 101009 0 0 null null 4 null -101010 0 1 10101 100001#102001#101001 1 101010 +101010 0 1 101011 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 100002#101001#102002 1 101013 +101014 0 1 101011 null 1 101013 101015 0 0 null null 4 null 101016 1 2 1503#1 1002 1 101014 101017 0 0 null null 1 101014 @@ -55,11 +55,11 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2 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 100002#101001#102002 1 101018 +101022 0 1 101021 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 100003#101001#101001#102002#102002 1 101021 +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 @@ -76,9 +76,9 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2 101040 0 0 null null 0 null 101041 0 0 null null 0 null 101042 0 0 null null 0 null -101043 0 1 1010002 100001#100002#102002 1 101036 +101043 0 1 1010002 null 1 101036 101044 0 0 null null 4 null -101045 0 1 1010002 100001#100002#102002 1 101037 +101045 0 1 1010002 null 1 101037 101046 0 0 null null 4 null 101047 0 0 null null 0 null 101048 0 0 null null 0 null @@ -89,13 +89,13 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2 101053 0 0 null null 0 null 101054 0 6 2 100002#100004#101005#102002 1 101041 101055 0 0 null null 4 null -101056 0 1 1010003 100001#100002#102002 1 101044 +101056 0 1 1010003 null 1 101044 101057 0 0 null null 4 null 101058 0 0 null null 0 null 101059 0 0 null null 0 null 101060 0 0 null null 0 null 101061 0 0 null null 0 null -101062 0 1 1010003 100001#100002#102002 5 101045 +101062 0 1 1010003 null 5 101045 101063 0 0 null null 4 null 101064 0 0 null null 5 101046 101065 0 17 2#101009|101#13#6#101012|101#12#12#101011 null 4 null @@ -104,7 +104,7 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2 101068 0 0 null null 0 null 101069 0 0 null null 1 101051 101070 0 0 null null 4 null -101071 0 1 10101 100002#101001#102002 1 101053 +101071 0 1 101012 null 1 101053 101072 0 0 null null 4 null 101073 0 0 null null 0 null 101074 0 0 null null 0 null @@ -112,7 +112,7 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2 101076 0 0 null 102001 1 101055 101077 0 0 null null 4 null 101078 0 0 null null 0 null -101079 0 1 10101 100002#101001#102002 1 101056 +101079 0 1 101012 null 1 101056 101080 0 0 null null 4 null 101081 0 0 null null 1 101059 101082 0 0 null null 4 null @@ -121,8 +121,8 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2 101085 0 0 null null 0 null 101086 0 0 null null 0 null 101087 0 0 null null 0 null -101088 0 1 10101 100002#101001#102002 1 101060 -101089 0 1 10102 100003#101001#101001#102002#102002 1 101061 +101088 0 1 101012 null 1 101060 +101089 0 1 101021 null 1 101061 101090 0 0 null null 4 null 101091 0 0 null null 0 null 101092 0 0 null null 0 null @@ -156,15 +156,15 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2 101120 0 0 null null 0 null 101121 0 0 null null 0 null 101122 0 0 null null 0 null -101123 0 1 1010004 100003#101001#102002 1 101087 -101124 0 1 1010005 100005#101002#102003 1 101089 +101123 0 1 1010004 null 1 101087 +101124 0 1 1010005 null 1 101089 101125 0 0 null null 0 null -101126 0 1 1010006 100005#101002#102003 1 101090 +101126 0 1 1010006 null 1 101090 101127 0 0 null null 1 101093 101128 0 6 2 null 3 101091#101092|1#10103 101129 0 0 null null 1 101093 101130 0 0 null null 1 101093 -101131 0 1 1010007 100006#101006#101001#102004 5 101095 +101131 0 1 1010007 null 5 101095 0 0 0 null null 0 null 101133 0 0 null null 1 101098 0 0 0 null null 0 null @@ -245,7 +245,7 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2 101209 0 0 null null 4 null 101210 0 0 null null 4 null 101211 0 0 null null 0 null -101212 0 1 10303 100004#102005#101001 1 101159 +101212 0 1 10303 null 1 101159 101213 0 0 null null 4 null 101214 0 0 null null 0 null 101215 0 0 null null 0 null @@ -411,12 +411,12 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2 102060 3 0 null null 1 102046 102061 0 0 null null 4 null 102062 0 0 null null 1 102047 -102063 0 1 1020002 100003#101001#102002 1 102048 +102063 0 1 1020002 null 1 102048 102064 0 0 null null 4 null -102065 0 1 1020002 100003#101001#102002 1 102049 +102065 0 1 1020002 null 1 102049 102066 0 0 null null 4 null 102067 0 0 null null 1 102050 -102068 0 1 1020003 100003#101001#102002 1 102051 +102068 0 1 1020003 null 1 102051 102069 0 0 null null 4 null 102070 0 0 null 10102 1 102052 102071 0 0 null null 4 null @@ -427,7 +427,7 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2 102076 0 0 null null 1 102054#102055|1#8 102077 0 0 null null 1 102056 102078 0 0 null null 1 102056 -102079 0 1 1020004 100004#101001#101001#102002#102001 1 102057 +102079 0 1 1020004 null 1 102057 102080 0 0 null null 4 null 102081 9 6 2 null 5 102058 102082 0 0 null null 4 null @@ -443,24 +443,24 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2 102092 0 0 null null 4 null 102093 0 0 null null 1 102066 102094 0 0 null null 1 102067 -102095 0 1 1020005 100002#102001 1 102068 +102095 0 1 1020005 null 1 102068 102096 0 0 null null 4 null -102097 0 1 1020005 100002#102001 1 102069 +102097 0 1 1020005 null 1 102069 102098 0 0 null null 4 null -102099 0 1 1020005 100002#102001 1 102070 +102099 0 1 1020005 null 1 102070 102100 0 0 null null 4 null 102101 0 6 2 10102 1 102071 102102 0 6 2 null 1 102072 102103 0 0 null null 4 null 102104 0 1 1020005 null 1 102073 102105 0 0 null 102002 1 102073 -102106 0 1 1020006 100002#102001 3 102074#102081|1#5 +102106 0 1 1020006 null 3 102074#102081|1#5 102107 0 0 null null 4 null -102108 0 1 1020005 100002#102001 1 102075 +102108 0 1 1020005 null 1 102075 102109 0 0 null null 4 null 102110 1 2 1503#1 null 1 102076 102111 0 0 null null 4 null -102112 0 1 1020006 100004#100002#101002#101001#102002#102002 1 102077 +102112 0 1 1020006 null 1 102077 102113 0 0 null null 4 null 102114 0 0 null 10102 6 102078 102115 0 0 null null 4 null @@ -474,23 +474,23 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2 102123 0 0 null null 0 null 102124 0 0 null null 1 102085 102125 0 0 null null 4 null -102126 0 1 1020007 100002#102001 1 102086 +102126 0 1 1020007 null 1 102086 102127 0 0 null null 4 null -102128 0 1 1020007 100002#102001 1 102089 +102128 0 1 1020007 null 1 102089 102129 0 0 null null 4 null 102130 0 0 null null 0 null 102131 0 0 null null 0 null 102132 0 0 null null 0 null 102133 0 0 null null 0 null -102134 0 1 1020007 100002#102001#101001 1 102090 +102134 0 1 1020007 null 1 102090 102135 0 0 null null 4 null -102136 0 1 1020007 100002#102001#101001 1 102091 +102136 0 1 1020007 null 1 102091 102137 0 0 null null 4 null -102138 0 1 1020008 100004#102001#102002#101002 1 102092 +102138 0 1 1020008 null 1 102092 102139 0 0 null null 4 null -102140 0 1 1020008 100004#102001#102002#101002 1 102093 +102140 0 1 1020008 null 1 102093 102141 0 0 null null 4 null -102142 0 1 1020009 100006#102004#101004 1 102094 +102142 0 1 1020009 null 1 102094 102143 0 0 null null 4 null 102144 0 0 null 10102 5 102095 102145 0 0 null null 4 null @@ -550,11 +550,11 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2 102199 0 0 null null 4 null 102200 0 0 null null 1 102139 102201 0 0 null null 4 null -102202 0 1 10101 100012#101005#102008#102008 1 102140 +102202 0 1 102011 null 1 102140 102203 0 0 null null 4 null 102204 0 0 null null 1 102142 102205 0 0 null null 4 null -102206 0 1 10101 100002#102001 5 102143 +102206 0 1 102012 null 5 102143 102207 0 0 null null 4 null 102208 0 0 null null 5 102144 102209 0 6 2 null 3 102145#102168|1#3 @@ -562,12 +562,12 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2 102211 0 0 null null 1 102146 102212 0 0 null null 1 102147 102213 0 0 null null 1 102148 -102214 0 1 10101 100002#102001 1 102148 -102215 0 1 10101 100002#102001 1 102149 -102216 0 1 10101 100002#102001 1 102150 -102217 0 1 10104 100004#101002#102002#102002 1 102151 +102214 0 1 102012 null 1 102148 +102215 0 1 102012 null 1 102149 +102216 0 1 102012 null 1 102150 +102217 0 1 102021 null 1 102151 102218 0 6 2 null 1 102152 -102219 0 1 10107 100005#101003#102003#102002 1 102153 +102219 0 1 102031 null 1 102153 102220 0 0 null null 5 102169 102221 0 0 null null 0 null 102222 0 0 null null 0 null @@ -583,16 +583,16 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2 102232 0 0 null null 0 null 102233 0 0 null null 1 102157 102234 0 0 null null 4 null -102235 0 1 10102 100002#102002#101001 1 102158 +102235 0 1 102013 null 1 102158 102236 0 0 null null 4 null -102237 0 1 10102 100002#102002#101001 1 102159 +102237 0 1 102013 null 1 102159 102238 0 0 null null 4 null 102239 0 0 null null 1 102160 102240 0 0 null null 4 null 102241 0 0 null 102002#102001 1 102161 102242 0 0 null null 1 102161 102243 0 0 null null 4 null -102244 0 1 10102 100003#102002#101001#101001 1 102162 +102244 0 1 102014 null 1 102162 102245 0 0 null null 4 null 102246 0 0 null null 4 null 102247 0 26 4 null 4 null @@ -639,7 +639,7 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2 103030 0 0 null null 5 103025 103031 0 0 null null 5 103026 103032 0 0 null null 5 103027 -103033 0 1 1030004 100015#102011#102005#101005 5 103028 +103033 0 1 1030004 null 5 103028 103034 0 0 null null 4 null 103035 0 0 null null 1 103033 103036 0 0 null null 0 null @@ -657,7 +657,7 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2 103048 0 15 103018 null 4 null 103049 0 0 null null 1 103043 103050 0 0 null null 4 null -103051 0 1 1030001 100004#102003 1 103044 +103051 0 1 1030001 null 1 103044 103052 0 0 null null 4 null 103053 0 0 null null 1 103048 103054 2 0 null null 1 103048 @@ -666,7 +666,7 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2 103057 0 0 null null 0 null 103058 0 0 null null 0 null 103059 0 0 null null 0 null -103060 0 1 1030001 100004#102003 1 103049 +103060 0 1 1030001 null 1 103049 103061 0 0 null null 4 null 103062 0 0 null null 5 103050 103063 0 0 null null 5 103051 @@ -675,9 +675,9 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2 103066 0 0 null null 0 null 103067 0 0 null null 0 null 103068 0 0 null null 1 103055 -103069 0 1 1030002 100004#102003 1 103056 -103070 0 1 1030002 100004#102003 1 103057 -103071 0 1 1030003 100009#100004#102010#101004#101001 5 103058 +103069 0 1 1030002 null 1 103056 +103070 0 1 1030002 null 1 103057 +103071 0 1 1030003 null 5 103058 103072 0 0 null null 1 103059 103073 0 0 null null 1 103060 103074 0 0 null null 1 103061 @@ -720,13 +720,13 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2 103111 0 0 null null 6 103086 103112 0 0 null null 1 103090 103113 0 0 null null 4 null -103114 0 1 10301 100002#101001#102003 1 103091 +103114 0 1 103011 null 1 103091 103115 0 0 null null 4 null 103116 0 0 null null 1 103092 103117 0 0 null null 4 null -103118 0 1 10301 100002#101001#102003 1 103093 +103118 0 1 103011 null 1 103093 103119 0 0 null null 4 null -103120 0 1 10301 100002#101001#102003 1 103094 +103120 0 1 103011 null 1 103094 103121 0 0 null null 4 null 103122 1 2 1503#1 1004#1204#1304#1404 4 null 103123 0 0 null null 4 null @@ -746,7 +746,7 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2 103137 0 0 null null 4 null 103138 0 0 null null 1 103103 103139 0 0 null null 4 null -103140 0 1 10301 100002#102003#101001 1 103104 +103140 0 1 103011 null 1 103104 103141 0 0 null null 4 null 103142 0 0 null null 1 103107 103143 0 0 null null 1 103107 @@ -759,16 +759,16 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2 103150 0 0 null null 0 null 103151 0 0 null null 0 null 103152 0 0 null null 0 null -103153 0 1 10303 100004#102005#101001#101001 1 103108 +103153 0 1 103032 null 1 103108 103154 0 0 null null 4 null -103155 0 1 10303 100004#102005#101001#101001 1 103109 +103155 0 1 103032 null 1 103109 103156 0 0 null null 4 null 103157 0 0 null 10102 4 null 103158 0 0 null null 1 103111 103159 0 0 null null 4 null 103160 0 0 null null 3 103112#103124|1#3 103161 0 0 null null 4 null -103162 0 1 10305 100004#101001#101001#102003 1 103113 +103162 0 1 103051 null 1 103113 103163 0 0 null null 4 null 103164 0 0 null null 1 103114 103165 0 0 null null 4 null @@ -776,7 +776,7 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2 103167 0 0 null null 4 null 103168 0 6 2 10102 1 103116 103169 0 0 null null 4 null -103170 0 1 10304 100004#101001#101001#102003 1 103117 +103170 0 1 103041 null 1 103117 103171 0 0 null null 4 null 103172 0 0 null null 3 103118#103119|1#2 103173 0 0 null null 1 103119 @@ -788,7 +788,7 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2 103179 0 0 null null 4 null 103180 0 0 null null 1 103122 103181 0 0 null null 4 null -103182 0 1 10304 100004#101001#101001#102003 1 103123 +103182 0 1 103041 null 1 103123 103183 0 0 null null 4 null 103184 0 0 null null 4 null 103185 0 0 null null 4 null @@ -801,15 +801,15 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2 103192 0 0 null null 4 null 103193 0 0 null null 1 103131 103194 0 0 null null 4 null -103195 0 1 10305 100004 1 103132 +103195 0 1 103052 null 1 103132 103196 0 0 null null 4 null 103197 0 0 null null 1 103133 103198 0 0 null null 1 103133 -103199 0 1 10305 100005#100002 1 103134 +103199 0 1 103053 null 1 103134 103200 0 0 null null 4 null 103201 0 0 null null 1 103135 103202 0 0 null null 1 103135 -103203 0 1 10305 100006#100002 1 103136 +103203 0 1 103054 null 1 103136 103204 0 0 null null 4 null 103205 0 0 null 100003#102010 4 null 104001 1 2 1503#1#104005 1004#1104#1204#1304 4 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 f49e9f06d..5b2d1a8ea 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 @@ -524,6 +524,7 @@ public class MapLogic { else if (cell != null && nextEventId != 0) { cell.setEventId(nextEventId); mapManager.addOrUpdateCell(mapManager.getCurXY(), cell); + updateMapMission(mapManager,EventType.updateEvent, cell.getEventId(),0); } if (behaviorType == EventType.dun && eventUpdateResponse.getMissionCount() > 0) { for (CommonProto.Mission missionProto : eventUpdateResponse.getMissionList()) { @@ -560,7 +561,6 @@ public class MapLogic { // 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,cell == null ? 0 : cell.getEventId(),0); MessageUtil.sendMessage(session, 1, messageType.getNumber(), eventUpdateResponse.build(), true); } @@ -933,6 +933,7 @@ public class MapLogic { if (cell != null) { cell.setEventId(nextEventId); user.getMapManager().addOrUpdateCell(triggerXY, cell); + updateMapMission(user.getMapManager(),EventType.updateEvent,cell.getEventId(),0); } } updateMapMission(user.getMapManager(),EventType.fightEvent,0,monsterGroupId); From 74d7139b5e2173e23bc66548de53270a3ef185cd Mon Sep 17 00:00:00 2001 From: wangyuan Date: Fri, 29 Mar 2019 18:06:25 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BA=8B=E4=BB=B6?= =?UTF-8?q?=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/ljsd/jieling/handler/map/MapLogic.java | 1 + 1 file changed, 1 insertion(+) 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 5b2d1a8ea..5a937858d 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 @@ -525,6 +525,7 @@ public class MapLogic { cell.setEventId(nextEventId); mapManager.addOrUpdateCell(mapManager.getCurXY(), cell); updateMapMission(mapManager,EventType.updateEvent, cell.getEventId(),0); + updateMapMission(mapManager,EventType.updateEvent, pointId,0); } if (behaviorType == EventType.dun && eventUpdateResponse.getMissionCount() > 0) { for (CommonProto.Mission missionProto : eventUpdateResponse.getMissionList()) {