Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw
commit
72d408063d
|
@ -127,7 +127,7 @@ public class EndExpeditionBattleRequest extends BaseHandler<Expedition.EndExpedi
|
|||
|
||||
if (resultCode != 1) {
|
||||
|
||||
if (nodeInfo.getType() == ExpeditionLogic.NODETYPE_GREED||(expeditionManager.getExpeditionLeve()>2&&nodeInfo.getType() == ExpeditionLogic.NODETYPE_BOSS)) {
|
||||
if (nodeInfo.getType() == ExpeditionLogic.NODETYPE_GREED) {
|
||||
//贪婪节点只有1次战斗机会,若战斗失败后敌人将会逃走,玩家视为通过此节点
|
||||
//updata node
|
||||
Set<CommonProto.ExpeditionNodeInfo> nodeInfos = ExpeditionLogic.openLay(user,nodeInfo.getLay(),nodeId);
|
||||
|
|
|
@ -293,8 +293,14 @@ public class Hero extends MongoBase implements Comparable<Hero> {
|
|||
*/
|
||||
public int getBreakIdByHongMeng(HeroManager heroManager){
|
||||
// 英雄在共鸣池中
|
||||
if (heroManager.getResonances().values().contains(id) || heroManager.getHongmengGuards().values().contains(id)) {
|
||||
return HeroLogic.getInstance().calRobotBreaByLevel(templateId, getLevel(heroManager));
|
||||
if (heroManager.getHongmengTablet() > 0){
|
||||
if (heroManager.getResonances().values().contains(id) || heroManager.getHongmengGuards().values().contains(id)) {
|
||||
return HeroLogic.getInstance().calRobotBreaByLevel(templateId, getLevel(heroManager));
|
||||
}
|
||||
}else{
|
||||
if (heroManager.getResonances().values().contains(id)) {
|
||||
return HeroLogic.getInstance().calRobotBreaByLevel(templateId, getLevel(heroManager));
|
||||
}
|
||||
}
|
||||
return breakId;
|
||||
}
|
||||
|
|
|
@ -24,6 +24,7 @@ public class ExpetionSpecialProcessor implements SpecialBuildProcessor{
|
|||
private final int DAMAGE_INCREASE = 17;
|
||||
private final int HOLY_INCREASE = 35;
|
||||
private final int JUDGE_INCREASE = 43;
|
||||
private final int HOLY_QUALITY = 37;
|
||||
@Override
|
||||
public String getSpecialParm(User user) {
|
||||
Map<Integer, SExpeditionHolyConfig> config = STableManager.getConfig(SExpeditionHolyConfig.class);
|
||||
|
@ -32,6 +33,11 @@ public class ExpetionSpecialProcessor implements SpecialBuildProcessor{
|
|||
ExpeditionManager expeditionManager = user.getExpeditionManager();
|
||||
Set<ExpeditionItem> propertyItems = user.getExpeditionManager().getPropertyItems();
|
||||
propertyItems.forEach(e->{
|
||||
int type = config.get(e.getEquipId()).gettype();
|
||||
//掉落战利品
|
||||
if(type==2||type==3){
|
||||
cache.put(type,cache.getOrDefault(type,0)+1);
|
||||
}
|
||||
//夜明珠
|
||||
if(e.getEquipId() == HOLY_INCREASE){
|
||||
cache.put(e.getEquipId(),cache.getOrDefault(e.getEquipId(),0) + 1);
|
||||
|
@ -64,7 +70,6 @@ public class ExpetionSpecialProcessor implements SpecialBuildProcessor{
|
|||
result.append(item==null?0:item.getCountVictory());
|
||||
}
|
||||
//每使用一次判官笔
|
||||
expeditionManager.getEffectItems().get(JUDGE_INCREASE);
|
||||
SExpeditionHolyConfig con43 = expeditionManager.getEffectItems().get(JUDGE_INCREASE);
|
||||
if(con43 != null){
|
||||
if(result.length()>0){
|
||||
|
@ -74,6 +79,16 @@ public class ExpetionSpecialProcessor implements SpecialBuildProcessor{
|
|||
ExpeditionItem item = expeditionManager.getExpeditionItem(con43.getId());
|
||||
result.append(item==null?0:item.getJudgePen());
|
||||
}
|
||||
SExpeditionHolyConfig con37 = expeditionManager.getEffectItems().get(HOLY_QUALITY);
|
||||
if(con37 != null){
|
||||
if(result.length()>0){
|
||||
result.append("|");
|
||||
}
|
||||
result.append(con37.getPassiveSkillId()+"#");
|
||||
int num = cache.getOrDefault(2,0);
|
||||
num += cache.getOrDefault(3,0);
|
||||
result.append(num);
|
||||
}
|
||||
return result.toString();
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1295,7 +1295,7 @@ public class HeroLogic{
|
|||
for (int i = 0; i < list.size(); i++) {
|
||||
Map.Entry<Integer, SCHeroRankUpConfig> entry = list.get(i);
|
||||
SCHeroRankUpConfig value = entry.getValue();
|
||||
if (heroLevel >= value.getOpenLevel()){
|
||||
if (heroLevel >= value.getLimitLevel()){
|
||||
return value.getId();
|
||||
}
|
||||
|
||||
|
|
|
@ -9,6 +9,8 @@ import com.ljsd.jieling.db.redis.RedisUtil;
|
|||
import com.ljsd.jieling.exception.ErrorCode;
|
||||
import com.ljsd.jieling.handler.map.MapLogic;
|
||||
import com.ljsd.jieling.ktbeans.KtEventUtils;
|
||||
import com.ljsd.jieling.ktbeans.ReportEventEnum;
|
||||
import com.ljsd.jieling.ktbeans.ReportUtil;
|
||||
import com.ljsd.jieling.ktbeans.parmsBean.ParamEventBean;
|
||||
import com.ljsd.jieling.logic.GlobalDataManaager;
|
||||
import com.ljsd.jieling.logic.OnlineUserManager;
|
||||
|
@ -423,6 +425,8 @@ public class SessionManager implements INetSession<ISession>, INetReceived<ISess
|
|||
playerInfoManager.setOffLineTime(TimeUtils.now());
|
||||
long onlineTime = playerInfoManager.getOffLineTime() - session.getUserLoginTime();
|
||||
playerInfoManager.addOnlineTime(onlineTime);
|
||||
// 登出通知
|
||||
// ReportUtil.onReportEvent(user, ReportEventEnum.APP_LOGIN.getType());
|
||||
//更新在线时长
|
||||
ActivityLogic.getInstance().updateActivityMissionProgress(user, ActivityType.OnlineReward,(int)(onlineTime/TimeUtils.ONE_SECOND));
|
||||
MongoUtil.getInstence().lastUpdate();
|
||||
|
|
|
@ -59,8 +59,10 @@ public class SRobotSkill implements BaseConfig {
|
|||
builder.append(i).append("#");
|
||||
}
|
||||
// 被动技能
|
||||
for (int i : robotSkill.getPassiveSkill()[index]) {
|
||||
builder.append(i).append("#");
|
||||
if(robotSkill.getPassiveSkill().length>0){
|
||||
for (int i : robotSkill.getPassiveSkill()[index]) {
|
||||
builder.append(i).append("#");
|
||||
}
|
||||
}
|
||||
return builder.toString();
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue