back_recharge
zhangshanxue 2019-10-30 10:46:58 +08:00
commit f93bfc4ea3
8 changed files with 74 additions and 41 deletions

View File

@ -279,7 +279,7 @@ function BattleUtil.CalDamage(atkRole, defRole, damageType, baseFactor, ignoreDe
atkEle == 3 and defEle == 1 or atkEle == 3 and defEle == 1 or
atkEle == 5 and defEle == 6 or atkEle == 5 and defEle == 6 or
atkEle == 6 and defEle == 5 atkEle == 6 and defEle == 5
baseDamage = restrain and floor(max(baseDamage*1.5, 0.1*attack)) or floor(max(baseDamage, 0.1*attack)) baseDamage = restrain and floor(max(baseDamage*1.25, 0.1*attack)) or floor(max(baseDamage, 0.1*attack))
for i=1, atkRole.exCalDmgList.size do for i=1, atkRole.exCalDmgList.size do
local func = atkRole.exCalDmgList.buffer[i] local func = atkRole.exCalDmgList.buffer[i]

View File

@ -113,7 +113,6 @@ public class GameApplication {
CoreLogic.getInstance().checkCoreCdk(); CoreLogic.getInstance().checkCoreCdk();
ThriftPoolUtils.getInstance().initContext(configurableApplicationContext); ThriftPoolUtils.getInstance().initContext(configurableApplicationContext);
GlobalDataManaager.getInstance().whenServerStart(configurableApplicationContext); GlobalDataManaager.getInstance().whenServerStart(configurableApplicationContext);
HeroLogic.getInstance().afterSet();
URL resource = HeroLogic.class.getClassLoader().getResource("mingan.txt"); URL resource = HeroLogic.class.getClassLoader().getResource("mingan.txt");
if(resource!=null){ if(resource!=null){
LOGGER.info(resource.getFile()); LOGGER.info(resource.getFile());

View File

@ -0,0 +1,47 @@
package com.ljsd.jieling.config.clazzStaticCfg;
import com.ljsd.jieling.logic.hero.HeroLogic;
import config.SArenaRobotConfig;
import config.SWorkShopTechnology;
import manager.AbstractClassStaticConfig;
import manager.STableManager;
import manager.Table;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
public class SArenaRobotStaticConfig extends AbstractClassStaticConfig {
@Override
public void registConfigs(Set<String> registConfigs) {
registConfigs.add(SArenaRobotConfig.class.getAnnotation(Table.class).name());
}
@Override
public void figureConfigs() {
Map<Integer, SArenaRobotConfig> integerSArenaRobotConfigMap = SArenaRobotConfig.getsArenaRobotConfigMap();
for(SArenaRobotConfig sArenaRobotConfig : integerSArenaRobotConfigMap.values()){
List<Integer> heroList = sArenaRobotConfig.getHeroList();
int heroLevel = sArenaRobotConfig.getRobotLevel();
Map<Integer,Integer> starHeroMap = new HashMap<>();
for(Integer heroTid :heroList){
int heroBreakId = HeroLogic.getInstance().calRobotStarByLevel(heroTid, heroLevel,starHeroMap);
sArenaRobotConfig.setBreakId(heroBreakId);
sArenaRobotConfig.setStarOfHeroMap(starHeroMap);
}
sArenaRobotConfig.setTotalForce(HeroLogic.getInstance().calRobotTotalForce(sArenaRobotConfig));
}
int[][] returnMaterials = STableManager.getFigureConfig(CommonStaticConfig.class).getGameSetting().getReturnMaterials();
Map<Integer, Map<Integer, SWorkShopTechnology>> sWorkTechMapByTechIdAndLevel = STableManager.getFigureConfig(CommonStaticConfig.class).getsWorkTechMapByTechIdAndLevelTmp();
for(Map<Integer, SWorkShopTechnology> item : sWorkTechMapByTechIdAndLevel.values()){
for(SWorkShopTechnology sWorkShopTechnology:item.values()){
if(sWorkShopTechnology.getWillReturn() == null){
continue;
}
HeroLogic.getInstance().calPercent(returnMaterials,sWorkShopTechnology.getWillReturn());
}
}
}
}

View File

@ -170,8 +170,11 @@ public class UserMissionManager extends MongoBase {
break; break;
case DAILY_MISSION_REWARD:{ case DAILY_MISSION_REWARD:{
dailyMissionIdsType.rewardMission((int)parm[0], missionTypeEnumListMap.get(GameMisionType.DAILYMISSION)); dailyMissionIdsType.rewardMission((int)parm[0], missionTypeEnumListMap.get(GameMisionType.DAILYMISSION));
calCumulationDataResult(user,MissionType.FINSIH_DAYILY_TIMES,missionTypeEnumListMap,(int)parm[0]); if(!missionTypeEnumListMap.get(GameMisionType.DAILYMISSION).isEmpty()){
updateString("dailyMissionIdsType",dailyMissionIdsType); calCumulationDataResult(user,MissionType.FINSIH_DAYILY_TIMES,missionTypeEnumListMap,(int)parm[0]);
updateString("dailyMissionIdsType",dailyMissionIdsType);
}
} }
break; break;
case TREASURE_MISSION_REWARD:{ case TREASURE_MISSION_REWARD:{

View File

@ -153,12 +153,15 @@ public class GuildLogic {
Map<Integer, GuildApply> applyGuildInfos = GuilidManager.getApplyGuildInfos(uid, 1); Map<Integer, GuildApply> applyGuildInfos = GuilidManager.getApplyGuildInfos(uid, 1);
int now =(int)(System.currentTimeMillis()/1000); int now =(int)(System.currentTimeMillis()/1000);
if(applyGuildInfos.size()>0){ if(applyGuildInfos.size()>0){
for(Map.Entry<Integer, GuildApply> applyEntry:applyGuildInfos.entrySet()){ Iterator<Map.Entry<Integer, GuildApply>> iterator = applyGuildInfos.entrySet().iterator();
GuildApply guildApply = applyEntry.getValue(); while (iterator.hasNext()){
Map.Entry<Integer, GuildApply> next = iterator.next();
GuildApply guildApply = next.getValue();
if(now - guildApply.getCreateTime() > SGuildSetting.sGuildSetting.getApplyReserve()){ if(now - guildApply.getCreateTime() > SGuildSetting.sGuildSetting.getApplyReserve()){
GuilidManager.removeOneApplyGuildInfos(guildApply.getGuildId(),guildApply.getId()); GuilidManager.removeOneApplyGuildInfos(guildApply.getGuildId(),guildApply.getId());
continue; iterator.remove();
} }
} }
} }
for(GuildInfo guildInfo : guildInfos){ for(GuildInfo guildInfo : guildInfos){
@ -284,9 +287,6 @@ public class GuildLogic {
} }
RedisUtil.getInstence().expire(RedisKey.getKey(RedisKey.FAMILY_JOIN,String.valueOf(uid),false), TimeUtils.DAY); RedisUtil.getInstence().expire(RedisKey.getKey(RedisKey.FAMILY_JOIN,String.valueOf(uid),false), TimeUtils.DAY);
addGuildLog(guildInfo.getId(),GuildDef.Log.JOIN,user.getPlayerInfoManager().getNickName()); addGuildLog(guildInfo.getId(),GuildDef.Log.JOIN,user.getPlayerInfoManager().getNickName());
PlayerInfoCache cache = RedisUtil.getInstence().getMapEntry(RedisKey.PLAYER_INFO_CACHE, "", String.valueOf(uid), PlayerInfoCache.class);
cache.setGuildPosition(GlobalsDef.MEMBER);
RedisUtil.getInstence().putMapEntry(RedisKey.PLAYER_INFO_CACHE,"",String.valueOf(uid),cache);
Family.FamilyJoinIndicaion build = Family.FamilyJoinIndicaion.newBuilder().setFamilyBaseInfo(CBean2Proto.getFamilyBaseInfo(guildInfo)).setFamilyUserInfo(CBean2Proto.getFamilyUserInfo(user, GlobalsDef.MEMBER)).build(); Family.FamilyJoinIndicaion build = Family.FamilyJoinIndicaion.newBuilder().setFamilyBaseInfo(CBean2Proto.getFamilyBaseInfo(guildInfo)).setFamilyUserInfo(CBean2Proto.getFamilyUserInfo(user, GlobalsDef.MEMBER)).build();
Family.FamilyJoinResponse response = Family.FamilyJoinResponse.newBuilder().setFamilyJoinIndicaion(build).build(); Family.FamilyJoinResponse response = Family.FamilyJoinResponse.newBuilder().setFamilyJoinIndicaion(build).build();
MessageUtil.sendMessage(session,1,msgId,response,true); MessageUtil.sendMessage(session,1,msgId,response,true);
@ -499,6 +499,9 @@ public class GuildLogic {
} }
guildInfo.addMembers(GlobalsDef.MEMBER,applyId); guildInfo.addMembers(GlobalsDef.MEMBER,applyId);
targetUser.getPlayerInfoManager().setGuildId(guildInfo.getId()); targetUser.getPlayerInfoManager().setGuildId(guildInfo.getId());
PlayerInfoCache cache = RedisUtil.getInstence().getMapEntry(RedisKey.PLAYER_INFO_CACHE, "", String.valueOf(applyId), PlayerInfoCache.class);
cache.setGuildPosition(GlobalsDef.MEMBER);
RedisUtil.getInstence().putMapEntry(RedisKey.PLAYER_INFO_CACHE,"",String.valueOf(applyId),cache);
}catch (Exception e){ }catch (Exception e){
LOGGER.error("the exception={}",e); LOGGER.error("the exception={}",e);
}finally { }finally {

View File

@ -1819,33 +1819,6 @@ public class HeroLogic {
return totalForce; return totalForce;
} }
public void afterSet() {
Map<Integer, SArenaRobotConfig> integerSArenaRobotConfigMap = SArenaRobotConfig.getsArenaRobotConfigMap();
for(SArenaRobotConfig sArenaRobotConfig : integerSArenaRobotConfigMap.values()){
List<Integer> heroList = sArenaRobotConfig.getHeroList();
int heroLevel = sArenaRobotConfig.getRobotLevel();
Map<Integer,Integer> starHeroMap = new HashMap<>();
for(Integer heroTid :heroList){
int heroBreakId = calRobotStarByLevel(heroTid, heroLevel,starHeroMap);
sArenaRobotConfig.setBreakId(heroBreakId);
sArenaRobotConfig.setStarOfHeroMap(starHeroMap);
}
sArenaRobotConfig.setTotalForce(calRobotTotalForce(sArenaRobotConfig));
}
int[][] returnMaterials = STableManager.getFigureConfig(CommonStaticConfig.class).getGameSetting().getReturnMaterials();
Map<Integer, Map<Integer, SWorkShopTechnology>> sWorkTechMapByTechIdAndLevel = STableManager.getFigureConfig(CommonStaticConfig.class).getsWorkTechMapByTechIdAndLevelTmp();
for(Map<Integer, SWorkShopTechnology> item : sWorkTechMapByTechIdAndLevel.values()){
for(SWorkShopTechnology sWorkShopTechnology:item.values()){
if(sWorkShopTechnology.getWillReturn() == null){
continue;
}
calPercent(returnMaterials,sWorkShopTechnology.getWillReturn());
}
}
}
public void calPercent(int[][] otherAttriMap,Map<Integer,Integer> heroAttributeMap){ public void calPercent(int[][] otherAttriMap,Map<Integer,Integer> heroAttributeMap){
for(int[] item : otherAttriMap){ for(int[] item : otherAttriMap){
int propertyId = item[0]; int propertyId = item[0];

View File

@ -34,14 +34,14 @@ public class SDifferDemonsComonpentsConfig implements BaseConfig {
for(SDifferDemonsComonpentsConfig sDifferDemonsComonpentsConfig : config.values()){ for(SDifferDemonsComonpentsConfig sDifferDemonsComonpentsConfig : config.values()){
int comonpentsId = sDifferDemonsComonpentsConfig.getComonpentsId(); int comonpentsId = sDifferDemonsComonpentsConfig.getComonpentsId();
int stage = sDifferDemonsComonpentsConfig.getStage(); int stage = sDifferDemonsComonpentsConfig.getStage();
if(!sDifferDemonsComonpentsConfigTmp.containsKey(comonpentsId)){ if(!sDifferDemonsComonpentsConfigTmp.containsKey(comonpentsId)){
sDifferDemonsComonpentsConfigTmp.put(comonpentsId,new HashMap<>()); sDifferDemonsComonpentsConfigTmp.put(comonpentsId,new HashMap<>());
extraAddMapTmp.put(comonpentsId,new HashMap<>()); extraAddMapTmp.put(comonpentsId,new HashMap<>());
} }
int[][] extraAdd = sDifferDemonsComonpentsConfig.getExtraAdd(); int[][] extraAdd = sDifferDemonsComonpentsConfig.getExtraAdd();
Map<Integer, Map<Integer, Integer>> extraMapTmpInfo = extraAddMapTmp.get(comonpentsId);
HashMap<Integer, Map<Integer, Integer>> extraCopyMapHashMap = new HashMap<>(extraMapTmpInfo);
if(extraAdd!=null&&extraAdd.length>0){ if(extraAdd!=null&&extraAdd.length>0){
Map<Integer, Map<Integer, Integer>> extraMapTmpInfo = extraAddMapTmp.get(comonpentsId);
for(int [] extraItem : extraAdd){ for(int [] extraItem : extraAdd){
int profession = extraItem[0]; int profession = extraItem[0];
int propertyId = extraItem[1]; int propertyId = extraItem[1];
@ -49,10 +49,18 @@ public class SDifferDemonsComonpentsConfig implements BaseConfig {
if(!extraMapTmpInfo.containsKey(profession)){ if(!extraMapTmpInfo.containsKey(profession)){
extraMapTmpInfo.put(profession,new HashMap<>()); extraMapTmpInfo.put(profession,new HashMap<>());
} }
if(extraMapTmpInfo.get(profession).containsKey(propertyId)){
propertyValue+=extraMapTmpInfo.get(profession).get(propertyId);
}
extraCopyMapHashMap.put(profession,new HashMap<>());
extraMapTmpInfo.put(profession,new HashMap<>());
extraCopyMapHashMap.get(profession).put(propertyId,propertyValue);
extraMapTmpInfo.get(profession).put(propertyId,propertyValue); extraMapTmpInfo.get(profession).put(propertyId,propertyValue);
} }
sDifferDemonsComonpentsConfig.setExtraAddMap(new HashMap<>(extraMapTmpInfo));
} }
sDifferDemonsComonpentsConfig.setExtraAddMap(extraCopyMapHashMap);
sDifferDemonsComonpentsConfigTmp.get(comonpentsId).put(stage,sDifferDemonsComonpentsConfig); sDifferDemonsComonpentsConfigTmp.get(comonpentsId).put(stage,sDifferDemonsComonpentsConfig);
} }

View File

@ -367,7 +367,7 @@ public class ExcelUtils {
//判断cell类型 //判断cell类型
switch (cell.getCellType()) { switch (cell.getCellType()) {
case Cell.CELL_TYPE_NUMERIC: { case Cell.CELL_TYPE_NUMERIC: {
if (cellType != null && cellType.toString().equals("float")){ if (cellType != null && cellType.toString().contains("float")){
cellValue = cell.getNumericCellValue(); cellValue = cell.getNumericCellValue();
}else{ }else{
cellValue = (int) cell.getNumericCellValue(); cellValue = (int) cell.getNumericCellValue();