back_recharge
lvxinran 2019-10-14 05:22:38 +08:00
commit 759488f99f
9 changed files with 30 additions and 46 deletions

View File

@ -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;

View File

@ -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;

View File

@ -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<Integer,Integer> eatBuffer(int uid,int foodId,int optionalParm){
SBloodyBattleSetting sBloodyBattleSetting = SBloodyBattleSetting.sBloodyBattleSetting;
Map<Integer, int[]> debuffMap = sBloodyBattleSetting.getDebuffMap();
SFoodsConfig sFoodsConfig = SFoodsConfig.getsFoodsConfigByFoodId(foodId);
SFoodsConfig sFoodsConfig = STableManager.getConfig(SFoodsConfig.class).get(foodId);
int target = sFoodsConfig.getTarget();
Map<Integer,Integer> result = new HashMap<>(1);
if(target == 1){

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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

View File

@ -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;

View File

@ -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<String> 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<String> 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<String> 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" +