fxi map & serven happy

back_recharge
wangyuan 2019-07-31 10:29:23 +08:00
parent 0ab956e693
commit 84c70e7b10
6 changed files with 42 additions and 10 deletions

View File

@ -1032,7 +1032,9 @@ public class MapLogic {
if (resultCode == -1) {
MessageUtil.sendErrorResponse(session, 0, messageType.getNumber(), "战斗异常!");
return;
} else if (resultCode == 0) {
}
mapManager.setLastFightResult(resultCode);
if (resultCode == 0) {
// 失败需要等待n秒后复活所有英雄
int dieCount = user.getMapManager().getDieCount();
dieCount++;
@ -1104,7 +1106,6 @@ public class MapLogic {
}
fastFightResponse.setEssenceValue(mapManager.getEssenceValue());
mapManager.setLastFightResult(resultCode);
// LOGGER.info("endFight() uid=>{},nextEventId=>{}", uid, nextEventId);
MapMissionManager.updateMapMission(user, EventType.fightEvent, groupId, checkResult[1]);
// LOGGER.info("endFight() uid=>{} sMonsterGroup.getRewardgroup()=>{} misson=>{} eventDrop=>{}, missionDrop=>{}", uid, sMonsterGroup.getRewardgroup(), fastFightResponse.getMission(), fastFightResponse.getEnventDrop(), fastFightResponse.getMissionDrop());
@ -1239,7 +1240,9 @@ public class MapLogic {
if (resultCode == -1) {
MessageUtil.sendErrorResponse(session, 0, messageType.getNumber(), "战斗异常!");
return;
} else if (resultCode == 0) {
}
mapManager.setLastFightResult(resultCode);
if (resultCode == 0) {
// 失败需要等待n秒后复活所有英雄
int dieCount = user.getMapManager().getDieCount();
dieCount++;
@ -1297,7 +1300,6 @@ public class MapLogic {
fightEndResponse.setResult(resultCode);
fightEndResponse.addAllRemainHpList(remainHp);
fightEndResponse.build();
mapManager.setLastFightResult(resultCode);
if (sOptionConfig != null) {
int behaviorType = sOptionConfig.getBehaviorType();

View File

@ -386,6 +386,10 @@ public class ActivityLogic {
for(Map.Entry<Integer,ActivityMission> activityState : activityMissionMap.entrySet()){
Integer activityId = activityState.getKey();
ActivityMission activityMission = activityState.getValue();
//todo 活动未初始化成功
if(activityMission == null){
continue;
}
int activityStatus = activityMission.getActivityState();
if(SGlobalActivity.getsGlobalActivityMap().get(activityId).getType()!=7&&activityStatus != ActivityType.OPEN_STATE){
continue;

View File

@ -24,4 +24,6 @@ public interface ActivityType {
int GrowthFund =6; //成长基金
int BLESSACTIVITY = 7;
int TREASURE =8; //孙龙的宝藏
int SERVERHAPPY =10; //七日狂欢
}

View File

@ -7,12 +7,8 @@ import com.ljsd.jieling.config.SVipLevelConfig;
import com.ljsd.jieling.logic.dao.root.User;
import com.ljsd.jieling.logic.mission.*;
import com.ljsd.jieling.logic.mission.event.MissionEventDistributor;
import com.ljsd.jieling.logic.mission.main.DailyMissionIdsType;
import com.ljsd.jieling.logic.mission.main.MissionStateChangeInfo;
import com.ljsd.jieling.logic.mission.main.TreasureMissionType;
import com.ljsd.jieling.logic.mission.main.VipMissionIdsType;
import com.ljsd.jieling.logic.mission.main.*;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.Set;
@ -22,10 +18,12 @@ public class UserMissionManager extends MongoBase {
private VipMissionIdsType vipMissionIdsType=new VipMissionIdsType();
private DailyMissionIdsType dailyMissionIdsType=new DailyMissionIdsType();
private TreasureMissionType treasureMissionIdsType=new TreasureMissionType();
private ServerHappyMissionType serverHappyMissionType=new ServerHappyMissionType();
//数据累加项
private CumulationData cumulationData = new CumulationData();
private CumulationData dailyCumulationData = new CumulationData();
private CumulationData treasureCumulationData = new CumulationData();
private CumulationData serverHappyCumulationData = new CumulationData();
public void openMission(User user,GameEvent event,Map<GameMisionType, List<MissionStateChangeInfo>> missionTypeEnumListMap, Object... parm){
switch (event){

View File

@ -0,0 +1,23 @@
package com.ljsd.jieling.logic.mission.main;
import com.ljsd.jieling.logic.dao.CumulationData;
import com.ljsd.jieling.logic.dao.root.User;
import java.util.List;
public class ServerHappyMissionType extends AbstractMissionType {
@Override
public void openMission(User user, int missionId, List<MissionStateChangeInfo> missionTypeEnumList) {
}
@Override
public int[][] reward(int missionId) {
return new int[0][];
}
@Override
public void calCumulationDataResult(User user, CumulationData.Result result, List<MissionStateChangeInfo> missionStateChangeInfos, CumulationData cumulationData) {
}
}

View File

@ -342,7 +342,10 @@ public class StoreLogic {
int nums = buyTimes+itemNum;
int totalCost = 0;
for(;buyTimes<nums;buyTimes++){
int costNum = (int) (Math.ceil(Math.pow(ints[0], 3)) *buyTimes) + (int) (Math.ceil(Math.pow(ints[1], 2)) *buyTimes) +(int) (Math.ceil(Math.pow(ints[2], 1)) *buyTimes) + ints[3];
int costNum=0;
if(premiumType == 1){
costNum = (int) (Math.ceil(Math.pow(ints[0], 3)) *buyTimes) + (int) (Math.ceil(Math.pow(ints[1], 2)) *buyTimes) +(int) (Math.ceil(Math.pow(ints[2], 1)) *buyTimes) + ints[3];
}
if (premiumType == 2){
if (buyTimes < ints.length){
costNum = ints[buyTimes];