Merge branch 'project0.95' of http://60.1.1.230/backend/jieling_server into project0.95

back_recharge
lvxinran 2020-03-18 17:41:29 +08:00
commit 287720f7d4
4 changed files with 17 additions and 3 deletions

View File

@ -144,7 +144,11 @@ public class ExpeditionLogic {
}
}
//移除已经删除的hero
Set<String> removeId = heroHP.keySet().stream().filter(k -> !heroMap.keySet().contains(k)).collect(Collectors.toSet());
Set<String> removeId = heroHP.keySet().stream().filter(k -> {
if(!heroMap.keySet().contains(k))
return true;
return heroMap.get(k).getLevel()<20;
}).collect(Collectors.toSet());
removeId.forEach(heroHP::remove);
Set<CommonProto.ExpeditionSimpleHeroInfo> heroInfoSet = new HashSet<>();
for (Map.Entry<String, Double> entry : heroHP.entrySet()) {
@ -214,7 +218,7 @@ public class ExpeditionLogic {
}
int minFoce = sExpeditionSetting.getMatchForce()[0];
int manFoce = sExpeditionSetting.getMatchForce()[1];
int standerFoce = (int) (user.getPlayerInfoManager().getMaxForce() * (minFoce / 10000f) + nodeInfo.getLay() / size * (manFoce - minFoce));
int standerFoce = (int) (user.getPlayerInfoManager().getMaxForce() * ((minFoce / 10000f) + ((float) nodeInfo.getLay()) / size * ((float) (manFoce - minFoce)/10000f)));
float randomForce = (standerFoce * ((sExpeditionSetting.getMatchForceRange()[0] + (int) (Math.random() * (sExpeditionSetting.getMatchForceRange()[1] - sExpeditionSetting.getMatchForceRange()[0]))) / 10000f));
if(nodeInfo.getType()==NODETYPE_ADVANCE){

View File

@ -1184,8 +1184,8 @@ public class GuildFightLogic {
continue;
}
ZSetOperations.TypedTuple<String> next = bossHurtRankInfo.iterator().next();
String content = SErrorCodeEerverConfig.getI18NMessage("guildboss_daily_reward_txt",new String[]{UserManager.getUser(Integer.parseInt(next.getValue())).getPlayerInfoManager().getNickName()});
int maxHurt =next.getScore().intValue();
String content = SErrorCodeEerverConfig.getI18NMessage("guildboss_daily_reward_txt",new String[]{UserManager.getUser(Integer.parseInt(next.getValue())).getPlayerInfoManager().getNickName(),Integer.toString(maxHurt)});
int[][] mineReward = new int[bossReward.length][];
int j=0;
for(int i=0;i<bossReward.length;i++){

View File

@ -273,6 +273,13 @@ public class PlayerLogic {
ActivityLogic.getInstance().updateActivityMissionProgress(user, ActivityType.FORCESTANDARD,teamForce);
}
if(teamId == GlobalsDef.TEAM_ARENA_DEFENSE){
//更新竞技场防御编队战力
String key = RedisKey.getKey(RedisKey.AREDEF_TEAM_FORCE_RANK, "", false);
RedisUtil.getInstence().zsetAddOne(key, String.valueOf(user.getId()), teamForce);
}
}
MessageUtil.sendMessage(iSession,1, MessageTypeProto.MessageType.USER_FORCE_CHANGE_RESPONSE_VALUE,null,true);

View File

@ -18,6 +18,7 @@ import com.ljsd.jieling.logic.dao.PlayerManager;
import com.ljsd.jieling.logic.dao.UserManager;
import com.ljsd.jieling.logic.dao.root.User;
import com.ljsd.jieling.logic.family.GuildLogic;
import com.ljsd.jieling.logic.mission.event.MissionEventDistributor;
import com.ljsd.jieling.logic.store.StoreLogic;
import com.ljsd.jieling.netty.cocdex.PacketNetData;
import com.ljsd.jieling.netty.handler.GameMessageHandler;
@ -224,6 +225,7 @@ public class SessionManager implements INetSession<ISession>, INetReceived<ISess
MessageUtil.sendHeartBeat(session);
User userInMem = UserManager.getUserInMem(session.getUid());
if(userInMem!=null){
MissionEventDistributor.requestStart();
ActivityLogic.getInstance().updateActivityMissionProgress(userInMem, ActivityType.OnlineReward,0);
try {
StoreLogic.checkStoreRefresh(userInMem,userInMem.getStoreManager().getStoreInfoMap());
@ -237,6 +239,7 @@ public class SessionManager implements INetSession<ISession>, INetReceived<ISess
MapLogic.getInstance().endLessClear(session);
}
MongoUtil.getLjsdMongoTemplate().lastUpdate();
MissionEventDistributor.requestEnd(session,true);
} catch (Exception e) {
LOGGER.error("the uid={} processFlush wrong ,e={}",session.getUid(),e);
}