Merge branch 'master' of 60.1.1.230:backend/jieling_server
commit
d0083ee1ee
|
@ -160,7 +160,9 @@ function BattleLogic.AddRole(roleData)
|
||||||
local data = rolePool:Get()
|
local data = rolePool:Get()
|
||||||
data:Init(curUid, roleData)
|
data:Init(curUid, roleData)
|
||||||
objList:Add(curUid, data)
|
objList:Add(curUid, data)
|
||||||
BattleLogic.Event:DispatchEvent(BattleEventName.AddRole, data)
|
if not data.isDead then
|
||||||
|
BattleLogic.Event:DispatchEvent(BattleEventName.AddRole, data)
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
function BattleLogic.InitAggro()
|
function BattleLogic.InitAggro()
|
||||||
|
|
|
@ -60,7 +60,7 @@ function RoleLogic:Init(uid, data)
|
||||||
Passivity[id](self, args)
|
Passivity[id](self, args)
|
||||||
end
|
end
|
||||||
|
|
||||||
self.isDead = false
|
self.isDead = self:GetRoleData(RoleDataName.Hp) == 0
|
||||||
self.Auto = true
|
self.Auto = true
|
||||||
self.IsDebug = false
|
self.IsDebug = false
|
||||||
self.enable = true
|
self.enable = true
|
||||||
|
|
|
@ -583,13 +583,31 @@ public class MapLogic {
|
||||||
// 3 角色属性
|
// 3 角色属性
|
||||||
case 3:{
|
case 3:{
|
||||||
int[][] values = sOptionAddConditions.getValues();
|
int[][] values = sOptionAddConditions.getValues();
|
||||||
|
int teamId = user.getMapManager().getTeamId();
|
||||||
|
List<TeamPosHeroInfo> teamPosHeroInfos = user.getTeamPosManager().getTeamPosForHero().get(teamId);
|
||||||
// 1: 全队 0: 最高
|
// 1: 全队 0: 最高
|
||||||
if (values[0][0] == 1) {
|
if (values[0][0] == 1) {
|
||||||
|
for (TeamPosHeroInfo teamPosHeroInfo : teamPosHeroInfos) {
|
||||||
} else {
|
Hero hero = user.getHeroManager().getHero(teamPosHeroInfo.getHeroId());
|
||||||
|
Map<Integer, Integer> map = HeroLogic.getInstance().calHeroAllAttribute(hero);
|
||||||
|
Integer integer = map.get(values[0][1]);
|
||||||
|
if (integer == null || integer < values[0][2]) {
|
||||||
|
return jumpTypeValues[0][1];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return jumpTypeValues[0][0];
|
||||||
|
} else if (values[0][0] == 0){
|
||||||
|
for (TeamPosHeroInfo teamPosHeroInfo : teamPosHeroInfos) {
|
||||||
|
Hero hero = user.getHeroManager().getHero(teamPosHeroInfo.getHeroId());
|
||||||
|
Map<Integer, Integer> map = HeroLogic.getInstance().calHeroAllAttribute(hero);
|
||||||
|
Integer integer = map.get(values[0][1]);
|
||||||
|
if (integer != null && integer >= values[0][2]) {
|
||||||
|
return jumpTypeValues[0][0];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return jumpTypeValues[0][1];
|
||||||
}
|
}
|
||||||
break;
|
return jumpTypeValues[0][1];
|
||||||
}
|
}
|
||||||
// 完成某个任务的第几步
|
// 完成某个任务的第几步
|
||||||
case 4:{
|
case 4:{
|
||||||
|
|
|
@ -90,7 +90,7 @@ public class BehaviorUtil {
|
||||||
CommonProto.FightData.Builder fightData = CommonProto.FightData.newBuilder();
|
CommonProto.FightData.Builder fightData = CommonProto.FightData.newBuilder();
|
||||||
for (TeamPosHeroInfo teamPosHeroInfo : teamPosHeroInfos) {
|
for (TeamPosHeroInfo teamPosHeroInfo : teamPosHeroInfos) {
|
||||||
Hero hero = user.getHeroManager().getHero(teamPosHeroInfo.getHeroId());
|
Hero hero = user.getHeroManager().getHero(teamPosHeroInfo.getHeroId());
|
||||||
if (hero == null || hero.getCurHp() == 0) {
|
if (hero == null) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
StringBuilder skillSb = new StringBuilder();
|
StringBuilder skillSb = new StringBuilder();
|
||||||
|
|
|
@ -190,7 +190,7 @@ public class FightDataUtil {
|
||||||
return skill;
|
return skill;
|
||||||
}
|
}
|
||||||
SSkillLogicVo sSkillLogicVo = SSkillLogicConfig.getsSkillLogicVo(Integer.valueOf(skillId));
|
SSkillLogicVo sSkillLogicVo = SSkillLogicConfig.getsSkillLogicVo(Integer.valueOf(skillId));
|
||||||
if (sSkillLogicVo != null) {
|
if (sSkillLogicVo != null && sSkillLogicVo.getSkillTargetVoList().size()>0) {
|
||||||
skill.rawset(1, LuaValue.valueOf(sSkillLogicVo.getCd()));
|
skill.rawset(1, LuaValue.valueOf(sSkillLogicVo.getCd()));
|
||||||
List<LuaValue> effectList = getEffect(sSkillLogicVo);
|
List<LuaValue> effectList = getEffect(sSkillLogicVo);
|
||||||
int size = effectList.size();
|
int size = effectList.size();
|
||||||
|
|
Loading…
Reference in New Issue