Merge branch 'master' of 60.1.1.230:backend/jieling_server
# Conflicts: # serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.javaback_recharge
commit
d1efc48e47
|
@ -644,7 +644,7 @@ local passivityList = {
|
||||||
local OnPassiveDamaging = function(damagingFunc)
|
local OnPassiveDamaging = function(damagingFunc)
|
||||||
damagingFunc(-f1)
|
damagingFunc(-f1)
|
||||||
end
|
end
|
||||||
role.Event:AddEvent(BattleEventName.PassiveBeDamaging, OnPassiveDamaging)
|
role.Event:AddEvent(BattleEventName.PassiveDamaging, OnPassiveDamaging)
|
||||||
end,
|
end,
|
||||||
|
|
||||||
--进入战斗[a]秒后,造成的伤害提升[b],持续[c]秒
|
--进入战斗[a]秒后,造成的伤害提升[b],持续[c]秒
|
||||||
|
|
|
@ -38,6 +38,7 @@ public enum FunctionIdEnum {
|
||||||
Endless(46),
|
Endless(46),
|
||||||
Blood(47),
|
Blood(47),
|
||||||
ToBeStronger(48),
|
ToBeStronger(48),
|
||||||
|
SoulEquip(52),
|
||||||
WorkShopTech(101),
|
WorkShopTech(101),
|
||||||
WorkShopCreateEquip(102),
|
WorkShopCreateEquip(102),
|
||||||
WorkShopCreateProtectEquip(103),
|
WorkShopCreateProtectEquip(103),
|
||||||
|
|
|
@ -278,6 +278,13 @@ public class HandlerLogicThread extends Thread{
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
case MessageTypeProto.MessageType.SOUL_RAND_EQUIP_REQUEST_VALUE:
|
||||||
|
case MessageTypeProto.MessageType.SOUL_FORCE_RAND_EQUIP_REQUEST_VALUE:
|
||||||
|
sGlobalSystemConfig = SGlobalSystemConfig.getsGlobalSystemConfigByFunctionId(FunctionIdEnum.SoulEquip);
|
||||||
|
if (checkOpen(user,sGlobalSystemConfig)) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
e.printStackTrace();
|
e.printStackTrace();
|
||||||
|
|
|
@ -12,6 +12,7 @@ import com.ljsd.jieling.handler.map.MapManager;
|
||||||
import com.ljsd.jieling.logic.GlobalDataManaager;
|
import com.ljsd.jieling.logic.GlobalDataManaager;
|
||||||
import com.ljsd.jieling.logic.activity.ActivityLogic;
|
import com.ljsd.jieling.logic.activity.ActivityLogic;
|
||||||
import com.ljsd.jieling.logic.dao.*;
|
import com.ljsd.jieling.logic.dao.*;
|
||||||
|
import com.ljsd.jieling.logic.dao.root.GlobalSystemControl;
|
||||||
import com.ljsd.jieling.logic.dao.root.User;
|
import com.ljsd.jieling.logic.dao.root.User;
|
||||||
import com.ljsd.jieling.logic.hotfix.DoFix;
|
import com.ljsd.jieling.logic.hotfix.DoFix;
|
||||||
import com.ljsd.jieling.logic.player.PlayerLogic;
|
import com.ljsd.jieling.logic.player.PlayerLogic;
|
||||||
|
@ -117,7 +118,8 @@ public class GetPlayerInfoHandler extends BaseHandler{
|
||||||
}
|
}
|
||||||
//问卷状态
|
//问卷状态
|
||||||
int questState =-1;
|
int questState =-1;
|
||||||
if(user.getQuestionManager().getQuestId()!=0){
|
GlobalSystemControl globalSystemControl = GlobalSystemControl.getGlobalSystemControl();
|
||||||
|
if(globalSystemControl.getQuestId()!=0 && user.getQuestionManager().getQuestId()!=0){
|
||||||
questState=user.getQuestionManager().getQuestState();
|
questState=user.getQuestionManager().getQuestState();
|
||||||
}
|
}
|
||||||
//图鉴信息
|
//图鉴信息
|
||||||
|
|
|
@ -1540,7 +1540,17 @@ public class MapLogic {
|
||||||
}
|
}
|
||||||
int teamId = mapManager.getTeamId();
|
int teamId = mapManager.getTeamId();
|
||||||
List<TeamPosHeroInfo> team = user.getTeamPosManager().getTeamPosForHero().get(teamId);
|
List<TeamPosHeroInfo> team = user.getTeamPosManager().getTeamPosForHero().get(teamId);
|
||||||
|
<<<<<<< HEAD
|
||||||
if(SChallengeConfig.sChallengeConfigs.get(mapManager.getCurMapId()).getType()==4){
|
if(SChallengeConfig.sChallengeConfigs.get(mapManager.getCurMapId()).getType()==4){
|
||||||
|
=======
|
||||||
|
for (TeamPosHeroInfo teamPosHeroInfo : team) {
|
||||||
|
Map<Integer, Integer> heroAttr = mapManager.getHeroAllAttributeMap().get(teamPosHeroInfo.getHeroId());
|
||||||
|
if(heroAttr!=null) {
|
||||||
|
mapManager.updateHeroOneAttribute(teamPosHeroInfo.getHeroId(), HeroAttributeEnum.CurHP.getPropertyId(), checkResult[teamPosHeroInfo.getPosition() + 1]);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if(SChallengeConfig.sChallengeConfigs.get(mapManager.getCurMapId()).getType()==4&&teamId==401){
|
||||||
|
>>>>>>> abd7ebd8754c1471b2b50e9478087bae40f0ad8f
|
||||||
mapManager.updateEndlessFightCount(mapManager.getEndlessMapInfo().getFightCount()+1);
|
mapManager.updateEndlessFightCount(mapManager.getEndlessMapInfo().getFightCount()+1);
|
||||||
Set<String> cacheRemove = new HashSet<>();
|
Set<String> cacheRemove = new HashSet<>();
|
||||||
for (int i = 0 ; i <team.size();i++) {
|
for (int i = 0 ; i <team.size();i++) {
|
||||||
|
|
|
@ -1459,7 +1459,7 @@ public class HeroLogic {
|
||||||
if(hero.getSoulEquipByPositionMap().containsKey(soulEquipPos.getPosition())){
|
if(hero.getSoulEquipByPositionMap().containsKey(soulEquipPos.getPosition())){
|
||||||
String id = hero.getSoulEquipByPositionMap().get(soulEquipPos.getPosition());
|
String id = hero.getSoulEquipByPositionMap().get(soulEquipPos.getPosition());
|
||||||
SoulEquip oldEquip = user.getEquipManager().getSoulEquipMap().get(id);
|
SoulEquip oldEquip = user.getEquipManager().getSoulEquipMap().get(id);
|
||||||
if(null!=oldEquip){
|
if (null != oldEquip && !oldEquip.getId().equals( soulEquipPos.getEquipId())) {
|
||||||
oldEquip.setHeroId("");
|
oldEquip.setHeroId("");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -85,7 +85,7 @@ public class QuestionLogic {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
last.add(entry.getValue());
|
last.add(entry.getValue());
|
||||||
remove.add(entry.getKey());
|
// remove.add(entry.getKey());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -125,14 +125,18 @@ public class QuestionLogic {
|
||||||
user.getQuestionManager().setQuestId(qid);
|
user.getQuestionManager().setQuestId(qid);
|
||||||
user.getQuestionManager().setQuestState(0);
|
user.getQuestionManager().setQuestState(0);
|
||||||
ISession sessionByUid = OnlineUserManager.getSessionByUid(user.getId());
|
ISession sessionByUid = OnlineUserManager.getSessionByUid(user.getId());
|
||||||
|
if(null ==sessionByUid){
|
||||||
|
return;
|
||||||
|
}
|
||||||
MessageUtil.sendIndicationMessage(sessionByUid, 1, MessageTypeProto.MessageType.QUESTION_INDICATION_VALUE, builder, true);
|
MessageUtil.sendIndicationMessage(sessionByUid, 1, MessageTypeProto.MessageType.QUESTION_INDICATION_VALUE, builder, true);
|
||||||
}
|
}
|
||||||
}, new ArrayList<>(OnlineUserManager.sessionMap.keySet()), 120);
|
}, new ArrayList<>(OnlineUserManager.sessionMap.keySet()), 120);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
}
|
||||||
if (isNeedUp) {
|
if (isNeedUp) {
|
||||||
MongoUtil.getInstence().getMyMongoTemplate().save(globalSystemControl);
|
MongoUtil.getInstence().getMyMongoTemplate().save(globalSystemControl);
|
||||||
}
|
}
|
||||||
}
|
|
||||||
//remove
|
//remove
|
||||||
for (Integer id:remove) {
|
for (Integer id:remove) {
|
||||||
RedisUtil.getInstence().removeMapEntrys(RedisKey.QUESTION_FROMBACK, "", String.valueOf(id));
|
RedisUtil.getInstence().removeMapEntrys(RedisKey.QUESTION_FROMBACK, "", String.valueOf(id));
|
||||||
|
|
Loading…
Reference in New Issue