From a5ade7d53b7fddd7d925ddabdd939359d7f6f4dd Mon Sep 17 00:00:00 2001 From: mashiyu Date: Tue, 12 Mar 2019 17:01:40 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- luafight/BattleMain.lua | 13 +++++----- .../netty/handler/GameMessageHandler.java | 2 +- .../main/java/com/ljsd/GameApplication.java | 4 +++ .../ljsd/jieling/logic/fight/CheckFight.java | 26 ++++++++++++------- .../network/server/ProtocolsManager.java | 4 +-- .../ljsd/jieling/thread/ThreadManager.java | 9 ++++++- 6 files changed, 38 insertions(+), 20 deletions(-) diff --git a/luafight/BattleMain.lua b/luafight/BattleMain.lua index 89f33c1de..8b391fba3 100644 --- a/luafight/BattleMain.lua +++ b/luafight/BattleMain.lua @@ -381,11 +381,11 @@ function BattleMain.Execute(seed, fightData, optionData) resultList.result = BattleLogic.Result -- print ----------------------------------------- - for i=1, #resultList do - print("hp:"..resultList[i]) - end - print("最终运行帧数:"..BattleLogic.CurFrame()) - print("result:"..BattleLogic.Result) + --for i=1, #resultList do + -- print("hp:"..resultList[i]) + --end + --print("最终运行帧数:"..BattleLogic.CurFrame()) + --print("result:"..BattleLogic.Result) return resultList @@ -405,7 +405,8 @@ function BattleMain.Execute(seed, fightData, optionData) end return { result = -1 } end -BattleMain.Execute(932590676, test_fight_data, optionData) + +--BattleMain.Execute(932590676, test_fight_data, optionData) return BattleMain --> hp:2084 diff --git a/netty/src/main/java/com/ljsd/jieling/netty/handler/GameMessageHandler.java b/netty/src/main/java/com/ljsd/jieling/netty/handler/GameMessageHandler.java index af6749ed2..337c9a11a 100644 --- a/netty/src/main/java/com/ljsd/jieling/netty/handler/GameMessageHandler.java +++ b/netty/src/main/java/com/ljsd/jieling/netty/handler/GameMessageHandler.java @@ -59,7 +59,7 @@ public class GameMessageHandler extends SimpleChannelInbo @Override protected void channelRead0(ChannelHandlerContext ctx, Object msg) throws Exception { - LOGGER.info("receive msg ..."); +// LOGGER.info("receive msg ..."); protocols.processMessage(this.session, msg); } diff --git a/serverlogic/src/main/java/com/ljsd/GameApplication.java b/serverlogic/src/main/java/com/ljsd/GameApplication.java index 10c171abf..020b68e18 100644 --- a/serverlogic/src/main/java/com/ljsd/GameApplication.java +++ b/serverlogic/src/main/java/com/ljsd/GameApplication.java @@ -9,6 +9,7 @@ import com.ljsd.jieling.handler.BaseHandler; import com.ljsd.jieling.handler.map.MapLogic; import com.ljsd.jieling.logic.STableManager; import com.ljsd.jieling.logic.dao.MailingSystemManager; +import com.ljsd.jieling.logic.fight.CheckFight; import com.ljsd.jieling.netty.server.NettyGameServer; import com.ljsd.jieling.network.NettyProperties; import com.ljsd.jieling.network.NettyServerAutoConfiguration; @@ -79,6 +80,9 @@ public class GameApplication { threadManager.init(configurableApplicationContext); MapLogic.getInstance().init(configurableApplicationContext); + // 加载lua文件 + CheckFight.getInstance().init("luafight\\BattleMain.lua"); + final NettyServerAutoConfiguration netServerConfig = configurableApplicationContext.getBean(NettyServerAutoConfiguration.class); NettyProperties properties = netServerConfig.getNettyProperties(); //todo 设置开服时间 diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/fight/CheckFight.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/fight/CheckFight.java index 083c2565f..65bf1a8e4 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/fight/CheckFight.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/fight/CheckFight.java @@ -13,10 +13,9 @@ public class CheckFight { private static final Logger LOGGER = Logger.getLogger("CheckFightLog"); + private LuaValue transCoderObj; - private Globals globals; - - private String luaFileName = null; +// private String luaFileName = null; private CheckFight(){} @@ -30,13 +29,14 @@ public class CheckFight { public void init(String path){ + String luaFileName = null; try { luaFileName = getPath(path); } catch (IOException e) { e.printStackTrace(); } - globals = JsePlatform.standardGlobals(); - + Globals globals = JsePlatform.standardGlobals(); + transCoderObj = globals.loadfile(luaFileName).call(); } @@ -65,18 +65,24 @@ public class CheckFight { } - public int[] checkFight(int seed, LuaValue fightData, LuaValue optionData){ - LuaValue transCoderObj = globals.loadfile(luaFileName).call(); + /** + * 单线程执行每次用时50ms,目前支持并发100以内,再大用线程池异步处理 + * @param seed + * @param fightData + * @param optionData + * @return {战斗结果,单位1剩余血量,单位2剩余血量,单位3剩余血量,单位4剩余血量,单位5剩余血量} + */ + public synchronized int[] checkFight(int seed, LuaValue fightData, LuaValue optionData){ LuaValue func = transCoderObj.get(LuaValue.valueOf("Execute")); - LuaValue result = func.call(LuaValue.valueOf(932590676),fightData,optionData); + LuaValue result = func.call(LuaValue.valueOf(seed),fightData,optionData); int status = result.get("result").toint(); int[] resultCache = new int[6]; resultCache[0]=status; - LOGGER.info("result : "+ status); + LOGGER.info(" lua check test fight result : "+ status); if (status==1){ for (int i = 1; i <= result.length(); i++) { resultCache[i] = result.rawget(i).toint(); - LOGGER.info(i+" --> 单位剩余血量 : "+ resultCache[i]); +// LOGGER.info(i+" --> 单位剩余血量 : "+ resultCache[i]); } } return resultCache; diff --git a/serverlogic/src/main/java/com/ljsd/jieling/network/server/ProtocolsManager.java b/serverlogic/src/main/java/com/ljsd/jieling/network/server/ProtocolsManager.java index a75d1b9a6..5ee820a1a 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/network/server/ProtocolsManager.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/network/server/ProtocolsManager.java @@ -274,8 +274,8 @@ public class ProtocolsManager implements ProtocolsAbstract { @Override public void readIdel(GameSession gameSession) { // TODO -// final ISession session = (ISession) gameSession; -// readIdea(session); + final ISession session = (ISession) gameSession; + readIdea(session); } public BaseHandler getHandler(MessageTypeProto.MessageType messageType) { diff --git a/serverlogic/src/main/java/com/ljsd/jieling/thread/ThreadManager.java b/serverlogic/src/main/java/com/ljsd/jieling/thread/ThreadManager.java index 070793f86..8c18f7e66 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/thread/ThreadManager.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/thread/ThreadManager.java @@ -20,6 +20,10 @@ public class ThreadManager { private ScheduledThreadPoolExecutor scheduledExecutor; //管理task + public void init() { + scheduledExecutor = new ScheduledThreadPoolExecutor(16, new ScheduleThreadFactory()); + } + public void init(ConfigurableApplicationContext configurableApplicationContext) { platConfigureTask = configurableApplicationContext.getBean(PlatConfigureTask.class); @@ -55,7 +59,7 @@ public class ThreadManager { public void go() { - scheduledExecutor = new ScheduledThreadPoolExecutor(8, new ScheduleThreadFactory()); + scheduledExecutor = new ScheduledThreadPoolExecutor(16, new ScheduleThreadFactory()); // testTask 已秒为单位 延迟10s, 间隔30s为周期执行 scheduledExecutor.scheduleAtFixedRate(platConfigureTask, 10, PlatConfigureTask.SLEEP_INTEVAL_TIME, TimeUnit.SECONDS); @@ -63,4 +67,7 @@ public class ThreadManager { LOGGER.info("All Task running ..."); } + public ScheduledThreadPoolExecutor getScheduledExecutor() { + return scheduledExecutor; + } } From e4b65bc7aad9b7623cd454e5a313d7df4dae2b46 Mon Sep 17 00:00:00 2001 From: wangyuan Date: Tue, 12 Mar 2019 18:59:14 +0800 Subject: [PATCH 2/4] change mongo --- .../java/com/ljsd/common/mogodb/BeanUtil.java | 412 ------------------ .../ljsd/common/mogodb/LjsdMongoTemplate.java | 35 +- .../ljsd/common/mogodb/MongoUpdateCache.java | 13 +- conf/server/DifferDemonsConfig.txt | 49 +-- .../jieling/logic/dao/WorkShopController.java | 3 +- 5 files changed, 15 insertions(+), 497 deletions(-) delete mode 100644 common/src/main/java/com/ljsd/common/mogodb/BeanUtil.java diff --git a/common/src/main/java/com/ljsd/common/mogodb/BeanUtil.java b/common/src/main/java/com/ljsd/common/mogodb/BeanUtil.java deleted file mode 100644 index b1800fdcd..000000000 --- a/common/src/main/java/com/ljsd/common/mogodb/BeanUtil.java +++ /dev/null @@ -1,412 +0,0 @@ -package com.ljsd.common.mogodb; - - -import com.mongodb.BasicDBList; -import com.mongodb.BasicDBObject; -import com.mongodb.DBObject; -import sun.reflect.generics.reflectiveObjects.ParameterizedTypeImpl; - -import java.lang.reflect.*; -import java.util.*; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.CopyOnWriteArrayList; - -public class BeanUtil { - private static Map, Field[]> fieldMap = new ConcurrentHashMap<>(); - //是否是byte[] - private static boolean isByteArray(Object obj){ - return obj instanceof byte[]; - } - //是否是数组 - private static boolean isArray(Object obj){ - if(isByteArray(obj)){ - return false; - } - return obj.getClass().isArray(); - } - //将数组对象转为DBObject - private static DBObject array2DBObject(Object obj) throws IllegalAccessException { - Object[] arr = (Object[]) obj; - BasicDBList dbList = new BasicDBList(); - for(int i=0; i map = (Map) obj; - DBObject dbObject = new BasicDBObject(); - for (Map.Entry entry : map.entrySet()) { - Object dbObject1 = bean2DBObject(entry.getValue()); - dbObject.put(entry.getKey().toString(), dbObject1); - } - return dbObject; - } - //是否是集合对象 - private static boolean isSet(Object obj){ - return obj instanceof Set; - } - //将集合对象转为DBObject - private static DBObject set2DBObject(Object obj) throws IllegalAccessException { - Set set = (Set) obj; - BasicDBList dbList = new BasicDBList(); - for(Object val: set){ - Object dbObject = bean2DBObject(val); - dbList.add(dbObject); - } - return dbList; - } - - private static boolean isBaseType(T param){ - if (param instanceof Integer) {//判断变量的类型 - return true; - } else if (param instanceof String) { - return true; - } else if (param instanceof Double) { - return true; - } else if (param instanceof Float) { - return true; - } else if (param instanceof Long) { - return true; - } else if (param instanceof Boolean) { - return true; - } else if (param instanceof Date) { - return true; - } else if (param instanceof Byte) { - return true; - } - return false; - } - private static Field[] getFields(Class clazz){ - Field[] fields = fieldMap.get(clazz); - if(fields == null) { - fields = clazz.getDeclaredFields(); - fieldMap.put(clazz, fields); - } - return fields; - } - public static Object bean2DBObject(T bean) throws IllegalArgumentException, - IllegalAccessException { - if (bean == null) { - return null; - } - if(isBaseType(bean)){ - return bean; - } - DBObject dbObject = new BasicDBObject(); - if (isMap(bean)) { - return map2DBObject(bean); - } else if (isSet(bean)) { - return set2DBObject(bean); - } else if (isArray(bean)) { - return array2DBObject(bean); - } else if (isList(bean)) { - return list2DBObject(bean); - } else if (isByteArray(bean)) { - return dbObject; - } - - // 获取对象对应类中的所有属性域 - Class clazz = bean.getClass(); - while(clazz != null) { - Field[] fields = getFields(clazz); - - for (Field field : fields) { - // 获取属性名 - String varName = field.getName(); - if(varName.startsWith("_")){ - continue; - } else if(varName.equals("root")){ - continue; - } else if (varName.equals("id")) { - varName = "_id"; - } - // 修改访问控制权限 - boolean accessFlag = field.isAccessible(); - if (!accessFlag) { - field.setAccessible(true); - } - Object param = field.get(bean); - if (param == null) { - continue; - } - if (isBaseType(param)) { - dbObject.put(varName, param); - } else { - DBObject rdbObject = (DBObject) bean2DBObject(param); - dbObject.put(varName, rdbObject); - } - // 恢复访问控制权限 - field.setAccessible(accessFlag); - } - - clazz = clazz.getSuperclass(); - } - return dbObject; - } - - //从基础类型中取得值 - private static Object getBaseObj(Object object, Class clazz){ - if(clazz == String.class){ - return object; - } - if(clazz == int.class){ - return object; - } - if(clazz == long.class){ - return object; - } - if( clazz.equals(float.class)){ - return ((Double)object).floatValue(); - } - if(clazz == double.class){ - return object; - } - if(clazz == byte.class){ - return ((Integer)object).byteValue(); - } - if(clazz == boolean.class){ - return object; - } - if(clazz == Integer.class){ - return object; - } - if(clazz == Long.class){ - return object; - } - if( clazz.equals(Float.class)){ - return ((Double)object).floatValue(); - } - if(clazz == Double.class){ - return object; - } - if(clazz == Byte.class){ - return object; - } - if(clazz == Boolean.class){ - return object; - } - return null; - - } - - //是否是map对象 - private static boolean isMap(Class clazz){ - if( clazz == Map.class){ - return true; - } - return false; - } - //取得key对应的值 - private static Object getKey(String key, Class clazz){ - if(clazz == Integer.class){ - return Integer.valueOf(key); - } - if(clazz == Long.class){ - return Long.valueOf(key); - } - return key; - } - //将DBObject转为map - private static Map dbObject2Map(DBObject dbObject, Field field) throws Exception { - ParameterizedType pt = (ParameterizedType) field.getGenericType(); - Type[] types = pt.getActualTypeArguments(); - - Map map = new HashMap(); - BasicDBObject dbObj = (BasicDBObject)dbObject; - for (Map.Entry entry : dbObj.entrySet()) { - Type type = types[1]; - if(type.getClass()== ParameterizedTypeImpl.class){ - Class actualTypeArgument = (Class) (((ParameterizedTypeImpl) type).getActualTypeArguments()[0]); - - ArrayList objects = new ArrayList<>(); - BasicDBList values = (BasicDBList)entry.getValue(); - Iterator iterator = values.iterator(); - while (iterator.hasNext()){ - Object next = iterator.next(); - Object obj = getObj(next,actualTypeArgument); - objects.add(obj); - } - Object key = getKey(entry.getKey(), (Class)types[0]); - map.put(key,objects); - }else{ - Object obj = getObj(entry.getValue(), (Class)type); -// Object value = ((Class)types[1]).newInstance(); -// Object obj = dbObject2Bean((DBObject) entry.getValue(), value, root); - Object key = getKey(entry.getKey(), (Class)types[0]); - map.put(key, obj); - } - - - } - return map; - } - //是否是集合对象 - private static boolean isSet(Class clazz){ - if(clazz == Set.class){ - return true; - } - return false; - } - //将dbobj转为普通对象 - private static Object getObj(Object dbobj, Class clazz) throws Exception { - Object obj = getBaseObj(dbobj, clazz); - if(obj == null){ - Constructor constructor = clazz.getDeclaredConstructor(); - boolean isAccessible = constructor.isAccessible(); - constructor.setAccessible(true); - obj = constructor.newInstance(); - constructor.setAccessible(isAccessible); - dbObject2Bean((DBObject) dbobj, obj); - } - return obj; - } - //将DBObject转为set - private static Set dbObject2Set(DBObject dbObject, Field field) throws Exception { - ParameterizedType pt = (ParameterizedType) field.getGenericType(); - Type[] types = pt.getActualTypeArguments(); - Set set = ConcurrentHashMap. newKeySet(); - BasicDBList dbList = (BasicDBList)dbObject; - for (Object dbobj : dbList) { - Object obj = getObj(dbobj, (Class)types[0]); - set.add(obj); - } - return set; - } - //是否是byte[] - private static boolean isByteArray(Class clazz){ - return clazz == byte[].class; - } - //是否是数组 - private static boolean isArray(Class clazz){ - if(isByteArray(clazz)){ - return false; - } - return clazz.isArray(); - } - //将DBObject转换为数组 - private static Object[] dbObject2Array(DBObject dbObject, Class clazz) throws Exception { - BasicDBList basicDBList = (BasicDBList)dbObject; - Object[] objs = (Object[])Array.newInstance(clazz.getComponentType(), basicDBList.size()); - for(int i=0; i clazz){ - if(clazz == List.class){ - return true; - } - if(clazz == ArrayList.class){ - return true; - } - if(clazz == CopyOnWriteArrayList.class){ - return true; - } - return false; - } - //将DBObject转为list - private static List dbObject2List(DBObject dbObject, Field field) throws Exception { - ParameterizedType pt = (ParameterizedType) field.getGenericType(); - Type[] types = pt.getActualTypeArguments(); - List list = new CopyOnWriteArrayList(); - BasicDBList dbList = (BasicDBList)dbObject; - for (Object dbobj : dbList) { - Object obj = getObj(dbobj, (Class)types[0]); - list.add(obj); - } - return list; - } - //DBObject转换为Bean对象 - public static Object dbObject2Bean(DBObject dbObject, Object bean) throws Exception { - if (bean == null) { - return null; - } - Class clazz = bean.getClass(); - while (clazz != null) { - Field[] fields = getFields(clazz); - for (Field field : fields) { - String varName = field.getName(); - Object object = null; - if (varName.equals("id")) { - object = dbObject.get("_id"); - } -// else if(varName.equals("_root")){ -// ((MongoBase)bean).setRoot((MongoRoot) root); -// continue; -// } -// else if(varName.equals("bsave")){ -// ((MongoRoot)bean).setBsave(true); -// continue; -// } - else { - object = dbObject.get(varName); - } - if (object == null) { - continue; - } - boolean accessFlag = field.isAccessible(); - if (!accessFlag) { - field.setAccessible(true); - } - - //System.out.println("varName=" + varName); - Class fieldClazz = field.getType(); - Object obj = getBaseObj(object, fieldClazz); - if (obj != null) { - field.set(bean, obj); - } else if (isMap(fieldClazz)) { - obj = dbObject2Map((DBObject) object, field); - } else if (isSet(fieldClazz)) { - obj = dbObject2Set((DBObject) object, field); - } else if (isArray(fieldClazz)) { - obj = dbObject2Array((DBObject) object, fieldClazz); - } else if (isList(fieldClazz)) { - obj = dbObject2List((DBObject) object, field); - } else if (isByteArray(fieldClazz)) { - obj = object; - } else { - obj = fieldClazz.newInstance(); - obj = dbObject2Bean((DBObject) object, obj); - } - field.set(bean, obj); - // 恢复访问控制权限 - field.setAccessible(accessFlag); - } - clazz = clazz.getSuperclass(); - } - return bean; - } - - public static T dbObject2Bean(DBObject dbObject, Class clazz) throws Exception { - if(dbObject == null){ - return null; - } - T bean = clazz.newInstance(); - dbObject2Bean(dbObject, bean); - return bean; - } -} diff --git a/common/src/main/java/com/ljsd/common/mogodb/LjsdMongoTemplate.java b/common/src/main/java/com/ljsd/common/mogodb/LjsdMongoTemplate.java index b2e6aace1..3187a49c7 100644 --- a/common/src/main/java/com/ljsd/common/mogodb/LjsdMongoTemplate.java +++ b/common/src/main/java/com/ljsd/common/mogodb/LjsdMongoTemplate.java @@ -34,19 +34,14 @@ public class LjsdMongoTemplate { } public List findAll(String collectionName, Class clazz) throws Exception { - DBCollection coll = mongoTemplate.getCollection(collectionName); - DBCursor dbCursor = coll.find(); - List list= new ArrayList<>(dbCursor.count()); - for (Iterator it = dbCursor.iterator(); it.hasNext(); ) { - list.add(BeanUtil.dbObject2Bean(it.next(), clazz)); - } - return list; + return mongoTemplate.findAll(clazz,collectionName); } public T findById(String collectionName, String id, Class clazz) throws Exception { - DBCollection coll = mongoTemplate.getCollection(collectionName); + return mongoTemplate.findById(id,clazz,collectionName); + /* DBCollection coll = mongoTemplate.getCollection(collectionName); DBObject doc = coll.findOne(id); - return BeanUtil.dbObject2Bean(doc, clazz); + return BeanUtil.dbObject2Bean(doc, clazz);*/ } public T findById(int id, Class clazz) throws Exception { @@ -104,26 +99,4 @@ public class LjsdMongoTemplate { public Object convertToMongoType(Object obj){ return this.mongoTemplate.getConverter().convertToMongoType(obj); } - - public void dynamicChangeTheMongoRoot(Object obj,MongoRoot mongoRoot) throws Exception { - Class clazz = obj.getClass(); - while (clazz != null && clazz != Object.class && clazz != MongoRoot.class) { - if(clazz == MongoBase.class){ - Field root = clazz.getDeclaredField("_root"); - root.setAccessible(true); - root.set(obj, new WeakReference<>(mongoRoot)); - return; - } - Field[] declaredFields = clazz.getDeclaredFields(); - for (Field tmpField : declaredFields){ - Class type = tmpField.getType(); - if(!MongoBase.class.isAssignableFrom(type)){ - continue; - } - tmpField.setAccessible(true); - dynamicChangeTheMongoRoot(tmpField.get(obj),mongoRoot); - } - clazz = clazz.getSuperclass(); - } - } } \ No newline at end of file diff --git a/common/src/main/java/com/ljsd/common/mogodb/MongoUpdateCache.java b/common/src/main/java/com/ljsd/common/mogodb/MongoUpdateCache.java index eee8e1905..615b52e64 100644 --- a/common/src/main/java/com/ljsd/common/mogodb/MongoUpdateCache.java +++ b/common/src/main/java/com/ljsd/common/mogodb/MongoUpdateCache.java @@ -34,12 +34,15 @@ public class MongoUpdateCache { while (it.hasNext()) { Map.Entry entry = it.next(); String key1 = entry.getKey(); - if (fullKey.contains(key1)) { - return; - } - if (key1.contains(fullKey)) { - it.remove(); + if(!fullKey.equals(key1)){ + if (fullKey.contains(key1)) { + return; + } + if (key1.contains(fullKey)) { + it.remove(); + } } + } } UpdateRequest request = new UpdateRequest(fullKey, value, opCode, mongoBase); diff --git a/conf/server/DifferDemonsConfig.txt b/conf/server/DifferDemonsConfig.txt index a177b23a0..f6b489127 100644 --- a/conf/server/DifferDemonsConfig.txt +++ b/conf/server/DifferDemonsConfig.txt @@ -8,51 +8,4 @@ int mut,int#int,2 mut,int#int,1 6 null 6017#6018#6019#6020 7 null 6021#6022#6023#6024 8 null 6025#6026#6027#6028 -9 null 6029#6030#6031#6032 -0 null null -0 null null -0 null null -0 null null -0 null null -0 null null -0 null null -0 null null -0 null null -0 null null -0 null null -0 null null -0 null null -0 null null -0 null null -0 null null -0 null null -0 null null -0 null null -0 null null -0 null null -0 null null -0 null null -0 null null -0 null null -0 null null -0 null null -0 null null -0 null null -0 null null -0 null null -0 null null -0 null null -0 null null -0 null null -0 null null -0 null null -0 null null -0 null null -0 null null -0 null null -0 null null -0 null null -0 null null -0 null null -0 null null -0 null null +9 null 6029#6030#6031#6032 \ No newline at end of file diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/WorkShopController.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/WorkShopController.java index f8516155a..9212babb9 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/WorkShopController.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/WorkShopController.java @@ -4,6 +4,7 @@ import com.ljsd.common.mogodb.MongoBase; import com.ljsd.jieling.config.SWorkShopSetting; import com.ljsd.jieling.db.mongo.MongoKey; import com.ljsd.jieling.logic.dao.root.MailingSystem; +import com.ljsd.jieling.logic.dao.root.User; import com.ljsd.jieling.util.MathUtils; import java.util.ArrayList; @@ -22,7 +23,7 @@ public class WorkShopController extends MongoBase { private int cookExp; public WorkShopController(){ - this.setRootCollection(MailingSystem._COLLECTION_NAME); + this.setRootCollection(User._COLLECTION_NAME); this.openBlueStateMap = new HashMap<>(); From a45aae40e2bcfdf93792704a3457210e96dc9167 Mon Sep 17 00:00:00 2001 From: gaojie Date: Tue, 12 Mar 2019 20:10:46 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=B3=A8=E9=87=8A=E4=B8=B4=E6=97=B6?= =?UTF-8?q?=E8=83=8C=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/ljsd/jieling/util/ItemUtil.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java b/serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java index 67248f108..3765594e7 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java @@ -86,11 +86,11 @@ public class ItemUtil { selectDrop(sRewardGroup,itemMap,cardMap,equipMap,randomMap,dropRatio); } useRandomItem(user,randomMap); - if (isMapping == 1) { - addItemToTemporaryBag(user,itemMap,dropBuilder); - } else { - addItem(user,itemMap,dropBuilder); - } +// if (isMapping == 1) { +// addItemToTemporaryBag(user,itemMap,dropBuilder); +// } else { +// } + addItem(user,itemMap,dropBuilder); addCard(user,cardMap,dropBuilder); addEquip(user,equipMap,dropBuilder); return dropBuilder; From c84096239693cde15c3ac99b0d5dffdfa12a7fac Mon Sep 17 00:00:00 2001 From: wangyuan Date: Wed, 13 Mar 2019 10:59:58 +0800 Subject: [PATCH 4/4] fix unload equip --- serverlogic/src/main/java/com/ljsd/jieling/logic/dao/Hero.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/Hero.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/Hero.java index 27460ca9a..67f552341 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/Hero.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/Hero.java @@ -155,7 +155,7 @@ public class Hero extends MongoBase { public void removeEquip(int position){ String value = this.equipByPositionMap.get(position); if (value!=null){ - removeString("equipByPositionMap." + position); + removeString(getMongoKey()+".equipByPositionMap." + position); this.equipByPositionMap.remove(position); } }