diff --git a/conf/server/EventPointConfig.txt b/conf/server/EventPointConfig.txt index 91ddde6e0..497fd47a1 100644 --- a/conf/server/EventPointConfig.txt +++ b/conf/server/EventPointConfig.txt @@ -245,6 +245,8 @@ int mut,int#int,1 101211 101300 101212 101301 101213 101302 +101214 101303 +101215 101304 102001 10101 102002 10102 102003 10104 diff --git a/conf/server/ItemConfig.txt b/conf/server/ItemConfig.txt index c03c188b1..704026abf 100644 --- a/conf/server/ItemConfig.txt +++ b/conf/server/ItemConfig.txt @@ -387,58 +387,58 @@ int bool int int int bool mut,int#int,1 int int int int 10050 false 1 0 5 false null 0 0 0 0 10051 false 1 0 5 false null 0 0 0 0 10052 false 1 0 5 false null 0 0 0 0 -11001 true 2 5 5 false 14#1000 1 101 50 0 -11002 true 2 5 5 false 14#1001 1 102 50 0 -11003 true 2 5 5 false 14#1002 1 103 50 0 -11004 true 2 5 5 false 14#1003 1 104 50 0 -11005 true 2 5 5 false 14#1004 1 105 50 0 -11006 true 2 5 5 false 14#1005 1 106 50 0 -11007 true 2 5 5 false 14#1006 1 107 50 0 -11008 true 2 5 5 false 14#1007 1 108 50 0 -11009 true 2 5 5 false 14#1008 1 109 50 0 -11010 true 2 5 5 false 14#1009 1 110 50 0 -11011 true 2 5 5 false 14#1010 1 111 50 0 -11012 true 2 5 5 false 14#1011 1 112 50 0 -11013 true 2 5 5 false 14#1012 1 113 50 0 -11014 true 2 5 5 false 14#1013 1 114 50 0 -11015 true 2 5 5 false 14#1014 1 115 50 0 -11016 true 2 5 5 false 14#1015 1 116 50 0 -11017 true 2 5 5 false 14#1016 1 117 50 0 -11018 true 2 5 5 false 14#1017 1 118 50 0 -11019 true 2 5 5 false 14#1018 1 119 50 0 -11020 true 2 5 5 false 14#1019 1 120 50 0 -11021 true 2 5 5 false 14#1020 1 121 50 0 -11022 true 2 5 5 false 14#1021 1 122 50 0 -11023 true 2 5 5 false 14#1022 1 123 50 0 -11024 true 2 5 5 false 14#1023 1 124 40 0 -11025 true 2 5 5 false 14#1024 1 125 40 0 -11026 true 2 5 5 false 14#1025 1 126 40 0 -11027 true 2 5 5 false 14#1026 1 127 40 0 -11028 true 2 5 5 false 14#1027 1 128 40 0 -11029 true 2 5 5 false 14#1028 1 129 40 0 -11030 true 2 5 5 false 14#1029 1 130 40 0 -11031 true 2 5 5 false 14#1030 1 131 40 0 -11032 true 2 5 5 false 14#1031 1 132 40 0 -11033 true 2 5 5 false 14#1032 1 133 40 0 -11034 true 2 5 5 false 14#1033 1 134 40 0 -11035 true 2 5 5 false 14#1034 1 135 40 0 -11036 true 2 5 5 false 14#1035 1 136 40 0 -11037 true 2 5 5 false 14#1036 1 137 40 0 -11038 true 2 5 5 false 14#1037 1 138 40 0 -11039 true 2 5 5 false 14#1038 1 139 40 0 -11040 true 2 5 5 false 14#1039 1 140 40 0 -11041 true 2 5 5 false 14#1040 1 141 40 0 -11042 true 2 5 5 false 14#1041 1 142 40 0 -11043 true 2 5 5 false 14#1042 1 143 40 0 -11044 true 2 5 5 false 14#1043 1 144 40 0 -11045 true 2 5 5 false 14#1044 1 145 40 0 -11046 true 2 5 5 false 14#1045 1 146 40 0 -11047 true 2 5 5 false 14#1046 1 147 30 0 -11048 true 2 5 5 false 14#1047 1 148 30 0 -11049 true 2 5 5 false 14#1048 1 149 30 0 -11050 true 2 5 5 false 14#1049 1 150 30 0 -11051 true 2 5 5 false 14#1050 1 151 30 0 -11052 true 2 5 5 false 14#1051 1 152 30 0 +11001 true 2 5 5 false 14#1000 1 701 50 0 +11002 true 2 5 5 false 14#1001 1 702 50 0 +11003 true 2 5 5 false 14#1002 1 703 50 0 +11004 true 2 5 5 false 14#1003 1 704 50 0 +11005 true 2 5 5 false 14#1004 1 705 50 0 +11006 true 2 5 5 false 14#1005 1 706 50 0 +11007 true 2 5 5 false 14#1006 1 707 50 0 +11008 true 2 5 5 false 14#1007 1 708 50 0 +11009 true 2 5 5 false 14#1008 1 709 50 0 +11010 true 2 5 5 false 14#1009 1 710 50 0 +11011 true 2 5 5 false 14#1010 1 711 50 0 +11012 true 2 5 5 false 14#1011 1 712 50 0 +11013 true 2 5 5 false 14#1012 1 713 50 0 +11014 true 2 5 5 false 14#1013 1 714 50 0 +11015 true 2 5 5 false 14#1014 1 715 50 0 +11016 true 2 5 5 false 14#1015 1 716 50 0 +11017 true 2 5 5 false 14#1016 1 717 50 0 +11018 true 2 5 5 false 14#1017 1 718 50 0 +11019 true 2 5 5 false 14#1018 1 719 50 0 +11020 true 2 5 5 false 14#1019 1 720 50 0 +11021 true 2 5 5 false 14#1020 1 721 50 0 +11022 true 2 5 5 false 14#1021 1 722 50 0 +11023 true 2 5 5 false 14#1022 1 723 50 0 +11024 true 2 5 5 false 14#1023 1 724 40 0 +11025 true 2 5 5 false 14#1024 1 725 40 0 +11026 true 2 5 5 false 14#1025 1 726 40 0 +11027 true 2 5 5 false 14#1026 1 727 40 0 +11028 true 2 5 5 false 14#1027 1 728 40 0 +11029 true 2 5 5 false 14#1028 1 729 40 0 +11030 true 2 5 5 false 14#1029 1 730 40 0 +11031 true 2 5 5 false 14#1030 1 731 40 0 +11032 true 2 5 5 false 14#1031 1 732 40 0 +11033 true 2 5 5 false 14#1032 1 733 40 0 +11034 true 2 5 5 false 14#1033 1 734 40 0 +11035 true 2 5 5 false 14#1034 1 735 40 0 +11036 true 2 5 5 false 14#1035 1 736 40 0 +11037 true 2 5 5 false 14#1036 1 737 40 0 +11038 true 2 5 5 false 14#1037 1 738 40 0 +11039 true 2 5 5 false 14#1038 1 739 40 0 +11040 true 2 5 5 false 14#1039 1 740 40 0 +11041 true 2 5 5 false 14#1040 1 741 40 0 +11042 true 2 5 5 false 14#1041 1 742 40 0 +11043 true 2 5 5 false 14#1042 1 743 40 0 +11044 true 2 5 5 false 14#1043 1 744 40 0 +11045 true 2 5 5 false 14#1044 1 745 40 0 +11046 true 2 5 5 false 14#1045 1 746 40 0 +11047 true 2 5 5 false 14#1046 1 747 30 0 +11048 true 2 5 5 false 14#1047 1 748 30 0 +11049 true 2 5 5 false 14#1048 1 749 30 0 +11050 true 2 5 5 false 14#1049 1 750 30 0 +11051 true 2 5 5 false 14#1050 1 751 30 0 +11052 true 2 5 5 false 14#1051 1 752 30 0 12001 true 2 5 3 false null 1 501 30 0 12002 true 2 5 4 false null 1 502 40 0 12003 true 2 5 4 false null 1 503 40 0 @@ -450,4 +450,6 @@ int bool int int int bool mut,int#int,1 int int int int 12009 true 2 5 5 false null 1 509 50 0 12010 true 2 5 5 false null 1 510 50 0 12011 true 2 5 5 false null 1 511 50 0 +12012 true 2 5 5 false null 1 512 40 0 +12013 true 2 5 5 false null 1 513 50 0 400001 true 5 3 5 false 14#1000 1 2 1 0 diff --git a/conf/server/Map_102.txt b/conf/server/Map_102.txt index 25cb55457..86c28c382 100644 --- a/conf/server/Map_102.txt +++ b/conf/server/Map_102.txt @@ -33,6 +33,5 @@ int int mut,int#int,2 int 31 102004 9#15|10#15|9#16|10#16|9#17 0 32 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 33 102015 5#14 0 -34 102016 6#14 0 -35 102017 2#11 0 -36 102018 8#12 0 +34 102017 2#11 0 +35 102018 8#12 0 diff --git a/conf/server/OptionConfig.txt b/conf/server/OptionConfig.txt index 9ba0facb0..d69cd885e 100644 --- a/conf/server/OptionConfig.txt +++ b/conf/server/OptionConfig.txt @@ -36,7 +36,7 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2 100034 0 26 2 null 4 null 101001 1 2 1503#1 1001#1101#1201#1301 4 null 101002 0 0 null null 4 null -101003 0 5 0 null 4 null +101003 0 19 2#0 null 4 null 101004 0 0 null null 4 null 101005 0 0 null null 5 101007 101006 0 0 null null 4 null @@ -170,8 +170,8 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2 0 0 0 null null 0 null 0 0 0 null null 0 null 101136 0 0 null null 1 101099 -101137 0 0 null null 1 101100 -101138 0 17 2#101016|101#1#4#101006 null 4 null +101137 0 27 3 null 1 101100 +101138 0 9 2 null 4 null 101139 0 0 null null 0 null 101140 0 0 null null 0 null 101141 0 0 null null 0 null @@ -336,6 +336,8 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2 101300 0 0 null null 5 101212 101301 0 0 null null 1 101213 101302 0 0 null null 4 null +101303 0 0 null null 1 null +101304 0 26 3 null 4 null 102001 1 2 1503#1 1002#1102#1202#1302 4 null 102002 0 0 null null 4 null 102003 1 2 1503#1 1002#1102#1202#1302 4 null @@ -359,12 +361,12 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2 102021 0 0 null null 4 null 102022 0 19 3#103#19#2 null 4 null 102023 0 0 null null 4 null -102024 6 2 1503#1 null 1 102016 -102025 0 15 102015 null 4 null -102026 0 0 null null 4 null -102027 0 0 null null 1 102018 -102028 0 0 null null 1 102019 -102029 0 21 3#101016|101019#101037|101020#102040|101021#102043|101025#102105 null 4 null +102024 6 14 3|1503#1 null 1 102016 +102025 0 0 null null 4 null +102026 0 15 102015 null 4 null +102027 0 0 null null 0 null +102028 0 0 null null 0 null +102029 0 0 null null 0 null 102030 0 0 null null 5 102021 102031 0 0 null null 4 null 102032 0 0 null null 1 102022 @@ -491,7 +493,7 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2 102153 0 0 null null 1 102103 102154 0 0 null null 1 102104 102155 0 0 null null 1 102105 -102156 0 15 101025 null 4 null +102156 0 9 3 null 4 null 102157 0 0 null null 4 null 102158 0 0 null null 4 null 102159 0 1 10505 null 1 102109 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 f7177f7a9..67b70562c 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 @@ -66,6 +66,7 @@ public class MapLogic { public void enterMap(ISession iSession, int mapId, int teamId, MessageTypeProto.MessageType messageType) throws Exception { int uid = iSession.getUid(); User user = UserManager.getUser(uid); + int energy = user.getPlayerInfoManager().getEnergy(); MapManager mapManager = user.getMapManager(); if (teamId != 0) { List teamPosHeroInfos = user.getTeamPosManager().getTeamPosForHero().get(teamId); @@ -106,6 +107,14 @@ public class MapLogic { if (mapId > mapManager.getCurMapId()) { return; } + SCMapConfig scMapConfig = SCMapConfig.getsCMapSize().get(mapId); + if (energy < scMapConfig.getEnergyConfused()) { + LOGGER.info("enterMap() uid=>{} energy=>{} need=>{} energy not enough ", uid, energy, scMapConfig.getEnergyConfused()); + MessageUtil.sendErrorResponse(iSession, 0, messageType.getNumber(), ""); + return; + } + int leftEnergy = energy - scMapConfig.getEnergyConfused(); + user.getPlayerInfoManager().setEnergy(leftEnergy); if (mapId != mapManager.getCurMapId()) { initMap(mapManager, user); user.setMapManager(mapManager); @@ -417,7 +426,7 @@ public class MapLogic { if (mapPointConfig.getTriggerRules() == 1) { cell = mapManager.getMapInfo().get(mapManager.getTriggerXY()); } else { - cell = mapManager.getMapInfo().get(mapManager.getCurMapId()); + cell = mapManager.getMapInfo().get(mapManager.getCurXY()); } // 检测该事件点是否已被销毁 diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/MonitorMissionAndMoveBehavior.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/MonitorMissionAndMoveBehavior.java index ad5398681..c90a7db4c 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/MonitorMissionAndMoveBehavior.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/MonitorMissionAndMoveBehavior.java @@ -1,6 +1,7 @@ package com.ljsd.jieling.handler.map.behavior; import com.ljsd.jieling.handler.map.EventType; +import com.ljsd.jieling.handler.map.MapLogic; import com.ljsd.jieling.logic.dao.root.User; import com.ljsd.jieling.protocols.MapInfoProto; import com.ljsd.jieling.util.CellUtil; @@ -18,7 +19,8 @@ public class MonitorMissionAndMoveBehavior extends BaseBehavior { BehaviorUtil.updateMission(user, behaviorTypeValues[0][0], eventUpdateResponse); // 0的时候回城 if (behaviorTypeValues[0][1] == 0) { - return false; + MapLogic.getInstance().resetMapInfo(user, true); + return true; } int xy = CellUtil.xy2Pos(behaviorTypeValues[0][2], behaviorTypeValues[0][3]); user.getMapManager().setCurXY(xy); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/UseItemMissionBehavior.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/UseItemMissionBehavior.java index 24be4c17f..ec34f855a 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/UseItemMissionBehavior.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/UseItemMissionBehavior.java @@ -27,7 +27,11 @@ public class UseItemMissionBehavior extends BaseBehavior { if (mission == null) { return false; } - boolean checkCost = ItemUtil.itemCost(user, behaviorTypeValues); + int[][] userItem = new int[1][2]; + for (int i = 0; i < behaviorTypeValues[1].length; i++) { + userItem[0][i] = behaviorTypeValues[1][i]; + } + boolean checkCost = ItemUtil.itemCost(user, userItem); if (!checkCost || !mission.isOpen()) { return false; }