From e9b57014bf1dec73f592d172239dcfa243f9e588 Mon Sep 17 00:00:00 2001 From: wangyuan Date: Tue, 26 Mar 2019 11:46:00 +0800 Subject: [PATCH] fix --- .../jieling/config/SAccomplishmentBox.java | 59 +++++++++++++++ .../jieling/config/SAccomplishmentConfig.java | 72 +++++++++++++++++++ .../ljsd/jieling/handler/map/MapLogic.java | 2 +- 3 files changed, 132 insertions(+), 1 deletion(-) create mode 100644 serverlogic/src/main/java/com/ljsd/jieling/config/SAccomplishmentBox.java create mode 100644 serverlogic/src/main/java/com/ljsd/jieling/config/SAccomplishmentConfig.java diff --git a/serverlogic/src/main/java/com/ljsd/jieling/config/SAccomplishmentBox.java b/serverlogic/src/main/java/com/ljsd/jieling/config/SAccomplishmentBox.java new file mode 100644 index 000000000..3104ea063 --- /dev/null +++ b/serverlogic/src/main/java/com/ljsd/jieling/config/SAccomplishmentBox.java @@ -0,0 +1,59 @@ +package com.ljsd.jieling.config; + +import com.ljsd.jieling.logic.STableManager; +import com.ljsd.jieling.logic.Table; + +import java.util.HashMap; +import java.util.Map; + +@Table(name ="AccomplishmentBox") +public class SAccomplishmentBox implements BaseConfig { + + private int id; + + private int total; + + private int[][] box; + + private Map boxMap; + private static Map sAccomplishmentBoxMap; + + + @Override + public void init() throws Exception { + Map config = STableManager.getConfig(SAccomplishmentBox.class); + for(SAccomplishmentBox sAccomplishmentBox : config.values()){ + int[][] box = sAccomplishmentBox.getBox(); + Map boxMapTmp = new HashMap<>(); + for(int [] boxItem : box){ + boxMapTmp.put(boxItem[0],boxItem[1]); + } + sAccomplishmentBox.setBoxMap(boxMapTmp); + } + sAccomplishmentBoxMap = config; + } + + public static SAccomplishmentBox getsAccomplishmentBoxByMapId( int mapId ) { + return sAccomplishmentBoxMap.get(mapId); + } + + public int getid() { + return id; + } + + public int getTotal() { + return total; + } + + public int[][] getBox() { + return box; + } + + public Map getBoxMap() { + return boxMap; + } + + public void setBoxMap(Map boxMap) { + this.boxMap = boxMap; + } +} \ No newline at end of file diff --git a/serverlogic/src/main/java/com/ljsd/jieling/config/SAccomplishmentConfig.java b/serverlogic/src/main/java/com/ljsd/jieling/config/SAccomplishmentConfig.java new file mode 100644 index 000000000..80bb47063 --- /dev/null +++ b/serverlogic/src/main/java/com/ljsd/jieling/config/SAccomplishmentConfig.java @@ -0,0 +1,72 @@ +package com.ljsd.jieling.config; + +import com.ljsd.jieling.logic.STableManager; +import com.ljsd.jieling.logic.Table; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +@Table(name ="AccomplishmentConfig") +public class SAccomplishmentConfig implements BaseConfig { + + private int id; + + private int mapId; + + private int logic; + + private int[] values; + + private int score; + + private static Map> sAccomplishmentConfigByMapIdMap; + + private static Map sAccomplishmentConfigByIdMap; + + @Override + public void init() throws Exception { + Map config = STableManager.getConfig(SAccomplishmentConfig.class); + Map> sAccomplishmentConfigByMapIdMapTmp = new HashMap<>(); + for(SAccomplishmentConfig sAccomplishmentConfig : config.values()){ + int mapId = sAccomplishmentConfig.getMapId(); + if(!sAccomplishmentConfigByMapIdMapTmp.containsKey(mapId)){ + sAccomplishmentConfigByMapIdMapTmp.put(mapId,new ArrayList<>()); + } + sAccomplishmentConfigByMapIdMapTmp.get(mapId).add(sAccomplishmentConfig); + } + sAccomplishmentConfigByMapIdMap = sAccomplishmentConfigByMapIdMapTmp; + sAccomplishmentConfigByIdMap = config; + } + + public static List getsAccomplishmentConfigByMapId(int mapId) { + return sAccomplishmentConfigByMapIdMap.get(mapId); + } + + public static SAccomplishmentConfig getsAccomplishmentConfigByIdMap(int id) { + return sAccomplishmentConfigByIdMap.get(id); + } + + public int getId() { + return id; + } + + public int getMapId() { + return mapId; + } + + public int getLogic() { + return logic; + } + + public int[] getValues() { + return values; + } + + public int getScore() { + return score; + } + + +} \ No newline at end of file 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 63d9cefa0..e0db2e14b 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 @@ -925,7 +925,7 @@ public class MapLogic { MapManager mapManager = user.getMapManager(); Map allMapMissionProgress = mapManager.getAllMissionProgress(); if(allMapMissionProgress == null || allMapMissionProgress.isEmpty()){ - MessageUtil.sendErrorResponse(session,0, MessageTypeProto.MessageType.GET_ALL_MAP_ACCOMPLISH_RESPONSE_VALUE,""); + MessageUtil.sendMessage(session,1, MessageTypeProto.MessageType.GET_ALL_MAP_ACCOMPLISH_RESPONSE_VALUE,null,true); return; } List mapAccomplishInfos = new ArrayList<>(allMapMissionProgress.size());