back_recharge
jiahuiwen 2019-04-01 11:27:27 +08:00
commit 51da0e539f
3 changed files with 24 additions and 20 deletions

View File

@ -252,8 +252,8 @@ int mut,int#int,1
101218 101307
101219 101308
101220 101309#101310
101221 101311
101222 101312#101313#101319
101221 101311#101318
101222 101312#101313
101223 101314
101224 101315
101225 101316

View File

@ -13,6 +13,7 @@ import com.ljsd.jieling.logic.dao.TeamPosHeroInfo;
import com.ljsd.jieling.logic.dao.UserManager;
import com.ljsd.jieling.logic.dao.root.User;
import com.ljsd.jieling.logic.fight.CheckFight;
import com.ljsd.jieling.logic.hero.HeroAttributeEnum;
import com.ljsd.jieling.logic.hero.HeroLogic;
import com.ljsd.jieling.network.session.ISession;
import com.ljsd.jieling.protocols.CommonProto;
@ -163,8 +164,9 @@ public class MapLogic {
if (hero == null) {
break;
}
hero.setCurHp(HeroLogic.getInstance().calHeroAttribute(hero, GlobalsDef.HP_TYPE));
hero.setSpeed(HeroLogic.getInstance().calHeroAttribute(hero, GlobalsDef.SPEED_TYPE));
Map<Integer, Integer> heroAttributeMap = HeroLogic.getInstance().calHeroFinalAttribute(user, hero);
hero.setCurHp(heroAttributeMap.get(HeroAttributeEnum.Hp.getPropertyId()));
hero.setSpeed(heroAttributeMap.get(HeroAttributeEnum.Speed.getPropertyId()));
totalStep += HeroLogic.getInstance().calHeroAttribute(hero, GlobalsDef.ACTION_POWER_RORMULA_TYPE);
heroes.add(heroInfo.getHeroId());
}

View File

@ -1,5 +1,6 @@
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 java.io.*;
@ -374,22 +375,23 @@ public class ExcelUtils {
}
case Cell.CELL_TYPE_FORMULA: {
//判断cell是否为日期格式
if (DateUtil.isCellDateFormatted(cell)) {
//转换为日期格式YYYY-mm-dd
cellValue = cell.getDateCellValue();
} else {
//数字
cellValue = String.valueOf(cell.getNumericCellValue());
if (cellType != null && cellType.toString().equals("float")){
}else{
if (cellType.toString().equals("string")){
cellValue = "";
}else{
cellValue = (int) cell.getNumericCellValue();
}
}
}
cellValue = ((XSSFCell) cell).getRawValue();
// if (DateUtil.isCellDateFormatted(cell)) {
// //转换为日期格式YYYY-mm-dd
// cellValue = cell.getDateCellValue();
// } else {
// //数字
// cellValue = String.valueOf(cell.getNumericCellValue());
// if (cellType != null && cellType.toString().equals("float")){
//
// }else{
// if (cellType.toString().equals("string")){
// cellValue = "";
// }else{
// cellValue = (int) cell.getNumericCellValue();
// }
// }
// }
break;
}
case Cell.CELL_TYPE_BOOLEAN:{