diff --git a/bloodybattle/src/main/java/com/ljsd/BattleServerApplication.java b/bloodybattle/src/main/java/com/ljsd/BattleServerApplication.java index 176284373..0b3a60626 100644 --- a/bloodybattle/src/main/java/com/ljsd/BattleServerApplication.java +++ b/bloodybattle/src/main/java/com/ljsd/BattleServerApplication.java @@ -7,7 +7,6 @@ import com.ljsd.battle.statics.MessageBoxUtils; import com.ljsd.jieling.config.json.CoreSettings; import com.ljsd.jieling.db.redis.RedisKey; import com.ljsd.jieling.db.redis.RedisUtil; -import com.ljsd.jieling.logic.STableManager; import com.ljsd.jieling.logic.fight.CheckFight; import com.ljsd.jieling.netty.server.NettyGameServer; import com.ljsd.jieling.network.NettyProperties; @@ -19,6 +18,7 @@ import com.ljsd.jieling.thrift.pool.ThriftPoolUtils; import com.ljsd.network.server.BloodyProtocolsManager; import com.ljsd.network.server.BloodyRetrySendIndicationThread; import com.ljsd.network.session.ISession; +import manager.STableManager; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.boot.SpringApplication; diff --git a/bloodybattle/src/main/java/com/ljsd/battle/actor/SceneActor.java b/bloodybattle/src/main/java/com/ljsd/battle/actor/SceneActor.java index 9f3a71740..a1eada68e 100644 --- a/bloodybattle/src/main/java/com/ljsd/battle/actor/SceneActor.java +++ b/bloodybattle/src/main/java/com/ljsd/battle/actor/SceneActor.java @@ -7,8 +7,7 @@ import com.ljsd.battle.room.SceneManager; import com.ljsd.battle.statics.AnalysisEventType; import com.ljsd.battle.statics.AnalysisSourceData; import com.ljsd.battle.statics.MessageBoxUtils; -import com.ljsd.jieling.config.SBloodyBattleSetting; -import com.ljsd.jieling.logic.hero.HeroLogic; +import config.SBloodyBattleSetting; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/bloodybattle/src/main/java/com/ljsd/battle/manager/BattleManager.java b/bloodybattle/src/main/java/com/ljsd/battle/manager/BattleManager.java index 06c38ce9b..ffeb53f02 100644 --- a/bloodybattle/src/main/java/com/ljsd/battle/manager/BattleManager.java +++ b/bloodybattle/src/main/java/com/ljsd/battle/manager/BattleManager.java @@ -12,10 +12,7 @@ import com.ljsd.battle.util.HeroLogic; import com.ljsd.battle.vo.FamilyHeroInfo; import com.ljsd.battle.vo.HeroAttributeEnum; import com.ljsd.battle.vo.UserBloodySnpInfo; -import com.ljsd.jieling.config.SArenaSetting; -import com.ljsd.jieling.config.SBloodyBattleSetting; -import com.ljsd.jieling.config.SFoodsConfig; -import com.ljsd.jieling.config.SPropertyConfig; +import config.*; import com.ljsd.jieling.globals.Global; import com.ljsd.jieling.handler.map.behavior.BehaviorUtil; import com.ljsd.jieling.logic.fight.CheckFight; @@ -24,6 +21,7 @@ import com.ljsd.jieling.logic.fight.FightType; import com.ljsd.jieling.protocols.CommonProto; import com.ljsd.jieling.util.FightDataUtil; import com.ljsd.jieling.util.MonsterUtil; +import manager.STableManager; import org.luaj.vm2.LuaValue; import java.util.*; @@ -166,7 +164,7 @@ public class BattleManager { public static Map eatBuffer(int uid,int foodId,int optionalParm){ SBloodyBattleSetting sBloodyBattleSetting = SBloodyBattleSetting.sBloodyBattleSetting; Map debuffMap = sBloodyBattleSetting.getDebuffMap(); - SFoodsConfig sFoodsConfig = SFoodsConfig.getsFoodsConfigByFoodId(foodId); + SFoodsConfig sFoodsConfig = STableManager.getConfig(SFoodsConfig.class).get(foodId); int target = sFoodsConfig.getTarget(); Map result = new HashMap<>(1); if(target == 1){ diff --git a/bloodybattle/src/main/java/com/ljsd/battle/room/BeanToProto.java b/bloodybattle/src/main/java/com/ljsd/battle/room/BeanToProto.java index 5900f48ac..4ff385436 100644 --- a/bloodybattle/src/main/java/com/ljsd/battle/room/BeanToProto.java +++ b/bloodybattle/src/main/java/com/ljsd/battle/room/BeanToProto.java @@ -7,7 +7,7 @@ import com.ljsd.battle.vo.UserBloodySnpInfo; import com.ljsd.battle.actor.*; import com.ljsd.battle.vo.FamilyHeroInfo; import com.ljsd.battle.vo.HeroAttributeEnum; -import com.ljsd.jieling.config.SBloodyBattleSetting; +import config.SBloodyBattleSetting; import com.ljsd.jieling.protocols.CommonProto; import com.ljsd.jieling.protocols.RoomProto; diff --git a/bloodybattle/src/main/java/com/ljsd/battle/statics/BattleAnalysisProcessor.java b/bloodybattle/src/main/java/com/ljsd/battle/statics/BattleAnalysisProcessor.java index 15258ac57..76433e184 100644 --- a/bloodybattle/src/main/java/com/ljsd/battle/statics/BattleAnalysisProcessor.java +++ b/bloodybattle/src/main/java/com/ljsd/battle/statics/BattleAnalysisProcessor.java @@ -3,7 +3,7 @@ package com.ljsd.battle.statics; import com.ljsd.battle.manager.BattleManager; import com.ljsd.battle.vo.UserBloodySnpInfo; import com.ljsd.battle.actor.Scene; -import com.ljsd.jieling.config.SBloodyMessagesConfig; +import config.SBloodyMessagesConfig; import java.text.MessageFormat; diff --git a/bloodybattle/src/main/java/com/ljsd/battle/statics/DiggerAnalysisProcessor.java b/bloodybattle/src/main/java/com/ljsd/battle/statics/DiggerAnalysisProcessor.java index 5f74c6723..420c52d16 100644 --- a/bloodybattle/src/main/java/com/ljsd/battle/statics/DiggerAnalysisProcessor.java +++ b/bloodybattle/src/main/java/com/ljsd/battle/statics/DiggerAnalysisProcessor.java @@ -3,7 +3,7 @@ package com.ljsd.battle.statics; import com.ljsd.battle.manager.BattleManager; import com.ljsd.battle.vo.UserBloodySnpInfo; import com.ljsd.battle.actor.Scene; -import com.ljsd.jieling.config.SBloodyMessagesConfig; +import config.SBloodyMessagesConfig; import java.text.MessageFormat; diff --git a/bloodybattle/src/main/java/com/ljsd/battle/statics/MineralNumsAnalysisProcessor.java b/bloodybattle/src/main/java/com/ljsd/battle/statics/MineralNumsAnalysisProcessor.java index 690073993..3d99b9008 100644 --- a/bloodybattle/src/main/java/com/ljsd/battle/statics/MineralNumsAnalysisProcessor.java +++ b/bloodybattle/src/main/java/com/ljsd/battle/statics/MineralNumsAnalysisProcessor.java @@ -2,7 +2,7 @@ package com.ljsd.battle.statics; import com.ljsd.battle.actor.Scene; -import com.ljsd.jieling.config.SBloodyBattleSetting; +import config.SBloodyBattleSetting; public class MineralNumsAnalysisProcessor implements AnalysisProcessor{ @Override diff --git a/bloodybattle/src/main/java/com/ljsd/battle/util/HeroLogic.java b/bloodybattle/src/main/java/com/ljsd/battle/util/HeroLogic.java index b44c970a9..79c5422f9 100644 --- a/bloodybattle/src/main/java/com/ljsd/battle/util/HeroLogic.java +++ b/bloodybattle/src/main/java/com/ljsd/battle/util/HeroLogic.java @@ -2,9 +2,9 @@ package com.ljsd.battle.util; import com.ljsd.battle.vo.FamilyHeroInfo; import com.ljsd.battle.vo.HeroAttributeEnum; -import com.ljsd.jieling.config.SCHero; -import com.ljsd.jieling.config.SFoodsConfig; -import com.ljsd.jieling.config.SPropertyConfig; +import config.SCHero; +import config.SFoodsConfig; +import config.SPropertyConfig; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/test/src/main/java/ExcelUtils.java b/test/src/main/java/ExcelUtils.java index 13b6eeccb..511f22f23 100644 --- a/test/src/main/java/ExcelUtils.java +++ b/test/src/main/java/ExcelUtils.java @@ -1,51 +1,38 @@ -import com.ljsd.common.mogodb.LjsdMongoTemplate; -import com.ljsd.jieling.config.SEquipConfig; -import com.ljsd.jieling.logic.STableManager; -import com.ljsd.jieling.logic.dao.Equip; -import com.ljsd.jieling.logic.dao.root.User; -import com.mongodb.MongoClientURI; import org.apache.poi.hssf.usermodel.HSSFWorkbook; import org.apache.poi.ss.usermodel.*; import org.apache.poi.xssf.usermodel.XSSFCell; import org.apache.poi.xssf.usermodel.XSSFWorkbook; -import org.springframework.data.mongodb.core.MongoTemplate; -import org.springframework.data.mongodb.core.SimpleMongoDbFactory; -import org.springframework.data.mongodb.core.convert.DefaultDbRefResolver; -import org.springframework.data.mongodb.core.convert.DefaultMongoTypeMapper; -import org.springframework.data.mongodb.core.convert.MappingMongoConverter; -import org.springframework.data.mongodb.core.mapping.MongoMappingContext; import java.io.*; -import java.net.UnknownHostException; import java.util.*; public class ExcelUtils { private static boolean isWrite = true; - //private static String excelPath ="E:/work2/data_execl/base_data/"; //excel 文件 - private static String excelPath ="E:/work2/data_execl/Map_data/"; //excel 文件 + private static String excelPath ="D:/excel/0.94/data_execl/base_data/"; //excel 文件 + // private static String excelPath ="D:/excel/0.94/data_execl/Map_data/"; //excel 文件 private static String path = "conf/server/"; private static Set oldFileNames = new HashSet<>(); - private static String javaFilePath = "serverlogic/src/main/java/com/ljsd/jieling/config/"; + private static String javaFilePath = "tablemanager/src/main/java/config/"; public static void main(String[] args) throws IOException { File oldfile = new File(path); String[] list = oldfile.list(); oldFileNames.addAll(Arrays.asList(list)); readExcelData(); - //只加载新文件 -// Set newFileNames = new HashSet<>(); -// File newfile = new File(path); -// String[] newList = newfile.list(); -// newFileNames.addAll(Arrays.asList(newList)); -// newFileNames.removeAll(oldFileNames); -// if(!newFileNames.isEmpty()){ -// for(String newFileName : newFileNames){ -// String finalNewFileName = newFileName.replaceAll(".txt", ""); -// genJavaFile(finalNewFileName); -// } -// -// } - +// //只加载新文件 +//// Set newFileNames = new HashSet<>(); +//// File newfile = new File(path); +//// String[] newList = newfile.list(); +//// newFileNames.addAll(Arrays.asList(newList)); +//// newFileNames.removeAll(oldFileNames); +//// if(!newFileNames.isEmpty()){ +//// for(String newFileName : newFileNames){ +//// String finalNewFileName = newFileName.replaceAll(".txt", ""); +//// genJavaFile(finalNewFileName); +//// } +//// +//// } +// genJavaFile("DialRewardSetting"); } public static void genJavaFile(String fileName){ @@ -54,7 +41,7 @@ public class ExcelUtils { File file = new File("conf/server/"+fileName +".txt"); StringBuffer stringBuffer = new StringBuffer("package com.ljsd.jieling.config;\n" + "\n" + - "import com.ljsd.jieling.logic.STableManager;\n" + + "import manager.STableManager;\n" + "import com.ljsd.jieling.logic.Table;\n" + "\n" + "import java.util.Map;\n" +