diff --git a/conf/server/AreaConfig.txt b/conf/server/AreaConfig.txt index f82d2105c..458106fe7 100644 --- a/conf/server/AreaConfig.txt +++ b/conf/server/AreaConfig.txt @@ -3,5 +3,5 @@ int string mut,float#float,1 1 无名之森 101 2 河口平原 102#103 3 御水之都 104#105#108 -4 御水之都废墟 109 +4 御水废墟 109 5 血色沼泽 106#107#110 diff --git a/conf/server/EventPointConfig.txt b/conf/server/EventPointConfig.txt index ad3763643..5547b1977 100644 --- a/conf/server/EventPointConfig.txt +++ b/conf/server/EventPointConfig.txt @@ -662,12 +662,12 @@ int mut,int#int,1 104072 104100 104073 104101 104074 null -104075 null -104076 null -104077 null -104078 null -104079 null -104080 null +104075 104103#104104 +104076 104105#104106 +104077 104107#104108 +104078 104109#104110 +104079 104111#104112 +104080 104113 104081 null 104082 null 104083 null @@ -702,9 +702,9 @@ int mut,int#int,1 104110 104148 104111 104149 104112 null -104113 null -104114 null -104115 null +104113 104151#104152 +104114 104153 +104115 104154 104116 null 104117 null 104118 null diff --git a/conf/server/MapPointConfig.txt b/conf/server/MapPointConfig.txt index e91d9f15e..8bfe3d41d 100644 --- a/conf/server/MapPointConfig.txt +++ b/conf/server/MapPointConfig.txt @@ -4,8 +4,8 @@ int int int int int int int 100002 5 3 2 0 100002 0 100003 5 3 1 0 100019 0 100004 5 3 1 0 100010 0 -100005 5 2 2 0 0 0 -100006 5 2 2 0 0 0 +100005 5 2 2 0 100014 0 +100006 5 2 2 0 100015 0 0 0 0 0 0 0 0 101001 1 2 1 0 101001 0 101002 1 2 1 0 101002 0 @@ -166,7 +166,7 @@ int int int int int int int 104044 5 0 0 0 0 0 104045 5 0 0 0 0 0 104046 5 0 0 0 0 0 -104047 5 0 0 0 0 0 +104047 5 2 2 0 0 0 104048 5 0 0 0 0 0 104049 5 0 0 0 0 0 104050 5 0 0 0 0 0 diff --git a/conf/server/MissionEventsConfig.txt b/conf/server/MissionEventsConfig.txt index 0d4cdeaff..ebe8a0ad5 100644 --- a/conf/server/MissionEventsConfig.txt +++ b/conf/server/MissionEventsConfig.txt @@ -6,7 +6,7 @@ int int int int 3 1 3 2002 503 1 6 2025 4 1 3 2003 -5 1 3 2004 +5 1 5 2004 6 1 3 2005 7 1 2 2006 8 1 2 2007 diff --git a/conf/server/MonsterGroup.txt b/conf/server/MonsterGroup.txt index 6509656c2..30bc358ed 100644 --- a/conf/server/MonsterGroup.txt +++ b/conf/server/MonsterGroup.txt @@ -143,3 +143,4 @@ int mut,int#int,2 mut,int#int,1 string 1090001 1134#1135#1136 10906#20906 1090002 1137#1138#1139 10906#20906 1090003 1140 10907#20907 +111111 1002#1003|1003#1004|1004#1002 10104#20104 diff --git a/conf/server/OptionAddCondition.txt b/conf/server/OptionAddCondition.txt index 8a7ef4e2a..bc783da6a 100644 --- a/conf/server/OptionAddCondition.txt +++ b/conf/server/OptionAddCondition.txt @@ -32,8 +32,8 @@ int int mut,int#int,2 10301 3 0#2#1200 10302 3 1#2#900 10303 1 1#103020#103094 -10401 6 1#5#4 -10402 6 0#5#4 +10401 6 0#5#3 +10402 6 1#5#3 10501 6 1#6#4 10502 6 0#6#4 10601 6 1#7#3 diff --git a/conf/server/OptionConfig.txt b/conf/server/OptionConfig.txt index b726c91ea..d5f77a9e0 100644 --- a/conf/server/OptionConfig.txt +++ b/conf/server/OptionConfig.txt @@ -342,10 +342,10 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2 101306 0 0 null null 1 null 101307 0 0 null null 1 null 101308 0 26 3 null 4 null -101309 0 0 null null 3 101221#101227|1#10108 +101309 0 8 1 null 3 101221#101227|1#10108 101310 0 0 null null 4 null 101311 0 9 502 null 4 null -101312 0 0 null null 1 101223 +101312 0 8 2 null 1 101223 101313 0 0 null null 4 null 101314 0 0 null null 4 null 101315 0 15 101035 1003#1103#1203#1303 4 null @@ -573,7 +573,7 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2 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 +102209 0 6 2 null 1 102145 102210 0 0 null null 4 null 102211 0 0 null null 1 102146 102212 0 0 null null 1 102147 @@ -839,23 +839,23 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2 103212 10303 0 null null 1 103144 103213 0 0 null null 4 null 103214 0 0 null null 1 103086 -104001 1 2 1503#1#104005 1004#1104#1204#1304 4 null +104001 1 30 1503#1#104005 1004#1104#1204#1304 4 null 104002 0 0 null null 4 null -104003 1 2 1503#1#104006 1004#1104#1204#1304 4 null +104003 1 30 1503#1#104006 1004#1104#1204#1304 4 null 104004 0 0 null null 4 null -104005 1 2 1503#1#104007 1004#1104#1204#1304 4 null +104005 1 30 1503#1#104007 1004#1104#1204#1304 4 null 104006 0 0 null null 4 null -104007 1 2 1503#1#104008 1004#1104#1204#1304 4 null +104007 1 30 1503#1#104008 1004#1104#1204#1304 4 null 104008 0 0 null null 4 null -104009 1 2 1503#1#104009 1004#1104#1204#1304 4 null +104009 1 30 1503#1#104009 1004#1104#1204#1304 4 null 104010 0 0 null null 4 null -104011 1 2 1503#1#104010 1004#1104#1204#1304 4 null +104011 1 30 1503#1#104010 1004#1104#1204#1304 4 null 104012 0 0 null null 4 null -104013 1 2 1503#1#104011 1004#1104#1204#1304 4 null +104013 1 30 1503#1#104011 1004#1104#1204#1304 4 null 104014 0 0 null null 4 null -104015 1 2 1503#1#104012 1004#1104#1204#1304 4 null +104015 1 30 1503#1#104012 1004#1104#1204#1304 4 null 104016 0 0 null null 4 null -104017 0 0 null null 4 null +104017 0 5 0 null 4 null 104018 0 0 null null 4 null 104019 0 0 null null 4 null 104020 0 0 null null 4 null @@ -863,7 +863,7 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2 104022 0 0 null null 4 null 104023 0 0 null null 5 104019 104024 0 0 null null 5 104020 -104025 0 0 null 10102 5 104021 +104025 0 0 null 100001 5 104021 104026 0 0 null null 1 104022 104027 0 0 null null 4 null 104028 0 1 1040001 null 1 104023 @@ -883,14 +883,14 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2 104042 0 1 1040001 null 1 104030 104043 0 0 null null 4 null 104044 0 0 null null 5 104031 -104045 0 24 104023#104032 10102 4 null +104045 0 24 104023#104032 100001 4 null 104046 0 0 null null 1 104033 104047 0 0 null null 4 null 104048 0 0 null null 1 104034 104049 0 0 null null 4 null 104050 0 1 1040002 null 1 104035 104051 0 0 null null 4 null -104052 0 0 null 10102 1 104036 +104052 0 0 null 100001 1 104036 104053 0 1 1040002 null 1 104038 104054 0 0 null null 4 null 104055 0 0 null null 0 null @@ -898,7 +898,7 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2 104057 0 0 null null 1 104039 104058 0 0 null null 4 null 104059 0 0 null null 1 104040 -104060 0 24 104024#104048 10102 1 104041 +104060 0 24 104023#104048 100001 1 104041 104061 0 0 null null 4 null 104062 0 9 5 null 4 null 104063 0 0 null null 0 null @@ -938,20 +938,20 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2 104097 0 0 null null 1 104070 104098 0 0 null null 1 104071 104099 0 1 1040005 null 5 104072 -104100 0 24 104026#104091 null 5 104073 +104100 0 0 null null 5 104073 104101 0 9 5 null 4 null 104102 0 0 null null 0 null -104103 0 0 null null 0 null -104104 0 0 null null 0 null -104105 0 0 null null 0 null -104106 0 0 null null 0 null -104107 0 0 null null 0 null -104108 0 0 null null 0 null -104109 0 0 null null 0 null -104110 0 0 null null 0 null -104111 0 0 null null 0 null -104112 0 0 null null 0 null -104113 0 0 null null 0 null +104103 0 0 null null 1 104076 +104104 0 0 null null 4 null +104105 0 0 null null 1 104077 +104106 0 0 null null 4 null +104107 0 0 null null 1 104078 +104108 0 0 null null 4 null +104109 0 0 null null 1 104079 +104110 0 0 null null 4 null +104111 0 0 null null 1 104080 +104112 0 0 null null 4 null +104113 0 0 null null 4 null 104114 0 0 null null 0 null 104115 0 0 null null 0 null 104116 0 0 null null 0 null @@ -986,13 +986,13 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2 104145 0 0 null null 0 null 104146 0 0 null null 0 null 104147 0 0 null null 1 104110 -104148 0 27 6 null 1 104119 +104148 0 27 6 null 1 104111 104149 0 9 5 null 4 null 104150 0 0 null null 0 null -104151 0 0 null null 0 null -104152 0 0 null null 0 null -104153 0 0 null null 0 null -104154 0 0 null null 0 null +104151 0 0 null null 3 104115#104114|1#10401 +104152 0 0 null null 4 null +104153 0 0 null null 4 null +104154 0 25 5#104026#104091 null 4 null 104155 0 0 null null 0 null 104156 0 0 null null 0 null 104157 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 9de217458..fc54fd0a2 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 @@ -120,7 +120,7 @@ public class MapLogic { if (energy < scMapConfig.getEnergyConfused()) { LOGGER.info("enterMap() uid=>{} energy=>{} need=>{} energy not enough ", uid, energy, scMapConfig.getEnergyConfused()); - MessageUtil.sendErrorResponse(iSession, 0, messageType.getNumber(), "行动力不足!"); + MessageUtil.sendErrorResponse(iSession, 0, messageType.getNumber(), "精力不足!"); return; } String error = initTeamInfo(teamId, uid, user, mapManager); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/EatBuffBehavior.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/EatBuffBehavior.java index 2a375c11f..232d0eb13 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/EatBuffBehavior.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/EatBuffBehavior.java @@ -16,11 +16,7 @@ public class EatBuffBehavior extends BaseBehavior { @Override public boolean process(User user, int[][] behaviorTypeValues, MapInfoProto.EventUpdateResponse.Builder eventUpdateResponse) throws Exception { - boolean isEnough = ItemUtil.itemCost(user, behaviorTypeValues); - if (!isEnough) { - return isEnough; - } CombatLogic.getInstance().bufferAddByEatFoodOrEventTrigger(user.getMapManager(), behaviorTypeValues[0][0]); - return isEnough; + return true; } } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/fight/CombatLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/fight/CombatLogic.java index 933c8a9f0..bd8671bc3 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/fight/CombatLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/fight/CombatLogic.java @@ -330,7 +330,7 @@ public class CombatLogic { int type = sFoodsConfig.getType(); int target = sFoodsConfig.getTarget(); int[][] effectParas = sFoodsConfig.getEffectPara(); - if(type == GlobalsDef.FOOD_ADDITION_EXPLORE_TYPE && target == GlobalsDef.FOOD_EAT_AFFECT_PERSON){ + if(type == GlobalsDef.FOOD_ADDITION_EXPLORE_TYPE && target == GlobalsDef.FOOD_EAT_AFFECT_TEAM){ for(int[] effectPara : effectParas){ if(effectPara[0] == GlobalsDef.EXPLORE_MAP_ACTION_POWER_RORMULA_TYPE){ mapManager.setTotalStep(mapManager.getTotalStep() + effectPara[1]);