root
/
miduo_server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

force + fix month card mission

back_recharge
wangyuan 2020-04-20 18:22:39 +08:00
parent 6ecd4fb2ff
commit e66fef396d
4 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java
View File

@ -1743,7 +1743,7 @@ public class MapLogic {
if (hero == null) {
continue;
}
heroForces += HeroLogic.getInstance().calHeoForce(user, hero);
heroForces += HeroLogic.getInstance().calHeoForce(user, hero,mapManager.getTeamId());
crossInfo.getHeroIds().add(hero.getTemplateId());
}

4
serverlogic/src/main/java/com/ljsd/jieling/handler/vip/MonthTakeDailyHandler.java
View File

@ -4,6 +4,9 @@ import com.ljsd.jieling.exception.ErrorCode;
import com.ljsd.jieling.exception.ErrorCodeException;
import com.ljsd.jieling.globals.BIReason;
import com.ljsd.jieling.handler.BaseHandler;
import com.ljsd.jieling.logic.activity.event.NewWelfareEvent;
import com.ljsd.jieling.logic.activity.event.NewWelfareTypeEnum;
import com.ljsd.jieling.logic.activity.event.Poster;
import com.ljsd.jieling.logic.dao.UserManager;
import com.ljsd.jieling.logic.dao.root.User;
import com.ljsd.jieling.network.session.ISession;
@ -42,6 +45,7 @@ public class MonthTakeDailyHandler extends BaseHandler <PlayerInfoProto.TakeMoth
user.getPlayerInfoManager().addMonthCardDailyTake(proto.getType());
CommonProto.Drop.Builder drop = ItemUtil.drop(user, config.getBaseReward(), BIReason.TAKE_VIP_DAILY_REWARD);
PlayerInfoProto.TakeMothDilyResponse build = PlayerInfoProto.TakeMothDilyResponse.newBuilder().setDrop(drop).build();
Poster.getPoster().dispatchEvent(new NewWelfareEvent(user, NewWelfareTypeEnum.RECHARGE_BUY.getType(),proto.getType()));
MessageUtil.sendMessage(iSession, 1,MessageTypeProto.MessageType.MONTHCARD_TAKE_DAILY_RESPONSE_VALUE, build, true);
}
}

7
serverlogic/src/main/java/com/ljsd/jieling/logic/fight/CombatLogic.java
View File

@ -753,18 +753,19 @@ public class CombatLogic {
}
Map<String, Hero> heroMap = user.getHeroManager().getHeroMap();
List<TeamPosHeroInfo> teamPosHeroInfos = user.getTeamPosManager().getTeamPosForHero().get(teamId);
List<Integer> passiveTeamskillEffect = new ArrayList<>();
for(TeamPosHeroInfo teamPosHeroInfo :teamPosHeroInfos){
Hero hero = heroMap.get(teamPosHeroInfo.getHeroId());
List<Integer> heroSkillListTmp = HeroLogic.getInstance().getHeroSkillList(user, hero);
heroSkillListTmp.forEach(skill->{
SPassiveSkillLogicConfig config = SPassiveSkillLogicConfig.getConfig(skill);
if(config!=null &&config.getEffectiveRange()!=1 && config.getType()==94){
passiveskillEffect.add(config.getId());
passiveTeamskillEffect.add(config.getId());
}
});
}
user.getTeamPosManager().updatePassSkillTeamPos(teamId,passiveskillEffect);
user.getTeamPosManager().updatePassSkillTeamPos(teamId,passiveTeamskillEffect);
passiveskillEffect.addAll(passiveTeamskillEffect);
}else{
heroSkillList.forEach(skill->{
SPassiveSkillLogicConfig config = SPassiveSkillLogicConfig.getConfig(skill);

19
serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java
View File

@ -1314,9 +1314,6 @@ public class HeroLogic{
int tempStar = hero.getEspecialEquipLevel();
Map<Integer, Map<Integer, SEquipTalismana>> equipTalismanaMap = SEquipTalismana.equipTalismanaStarMap;
SEquipTalismana equipTali = equipTalismanaMap.get(equipTempId).get(tempStar);
Arrays.stream(equipTali.getProperty()).forEach(e->{
System.out.println("----------" + e[0] +"----" +e[1] );
});
combinedAttribute(equipTali.getProperty(),heroAllAttribute);
}
@ -1449,7 +1446,7 @@ public class HeroLogic{
for(Map.Entry<Integer,Integer> item : propertyPercentMap.entrySet()){
Integer propertyId = item.getKey();
Integer propertyValue = heroAllAttribute.get(propertyId);
heroAllAttribute.put(propertyId,propertyValue+BigDecimal.valueOf(propertyValue/10000f).multiply(BigDecimal.valueOf(item.getValue())).intValue());
heroAllAttribute.put(propertyId,BigDecimal.valueOf(propertyValue).multiply(BigDecimal.valueOf(1+item.getValue()/10000f)).intValue());
}
Integer maxHp = heroAllAttribute.get(HeroAttributeEnum.Hp.getPropertyId());
Integer curHp = heroAllAttribute.get(HeroAttributeEnum.CurHP.getPropertyId());
@ -1479,9 +1476,9 @@ public class HeroLogic{
}
public int calHeoForce(User user, Hero hero){
public int calHeoForce(User user, Hero hero,int teamId){
Map<Integer, Integer> heroAllAttribute;
heroAllAttribute = calHeroNotBufferAttribute(user, hero,true,0);
heroAllAttribute = calHeroNotBufferAttribute(user, hero,true,teamId);
//战力保存
int force = calForce(heroAllAttribute);
return force + heroAllAttribute.get(HeroAttributeEnum.EquipForce.getPropertyId());
@ -1849,7 +1846,7 @@ public class HeroLogic{
if (hero == null) {
continue;
}
totalForce +=calHeoForce(targetUser, hero);
totalForce +=calHeoForce(targetUser, hero,teamId);
}
return totalForce;
}
@ -1982,13 +1979,13 @@ public class HeroLogic{
public String getEcoForce11A(User user){
StringBuilder append = new StringBuilder().append("[");
append.append(calAllPokenmonForce(user));
getTeamForceForUpload(append, user.getTeamPosManager().getTeamPosForHero().get(1),user);
getTeamForceForUpload(append, user.getTeamPosManager().getTeamPosForHero().get( GlobalsDef.TEAM_ARENA_DEFENSE),user);
getTeamForceForUpload(append, user.getTeamPosManager().getTeamPosForHero().get(1),user,1);
getTeamForceForUpload(append, user.getTeamPosManager().getTeamPosForHero().get( GlobalsDef.TEAM_ARENA_DEFENSE),user, GlobalsDef.TEAM_ARENA_DEFENSE);
append.append("]");
return append.toString();
}
public void getTeamForceForUpload( StringBuilder append, List<TeamPosHeroInfo> teamPosHeroInfoList,User user){
public void getTeamForceForUpload( StringBuilder append, List<TeamPosHeroInfo> teamPosHeroInfoList,User user,int teamID){
if(teamPosHeroInfoList != null &&!teamPosHeroInfoList.isEmpty()){
HeroManager heroManager = user.getHeroManager();
Map<String, Hero> heroMap = heroManager.getHeroMap();
@ -1996,7 +1993,7 @@ public class HeroLogic{
for(TeamPosHeroInfo teamPosHeroInfo: teamPosHeroInfoList){
String heroId = teamPosHeroInfo.getHeroId();
Hero hero = heroMap.get(heroId);
heroPosMap.put(teamPosHeroInfo.getPosition(),calHeoForce(user,hero));
heroPosMap.put(teamPosHeroInfo.getPosition(),calHeoForce(user,hero,teamID));
}
for(int i=1;i<6;i++){
Integer force = heroPosMap.get(i);