大闹天宫和竞技场任务bug
parent
fbb219b779
commit
663cb39c77
|
@ -77,7 +77,6 @@ public class ReCoverExpeditionHeroRequestHandler extends BaseHandler<Expedition.
|
||||||
});
|
});
|
||||||
|
|
||||||
Expedition.ReCoverExpeditionHeroResponse.Builder build = Expedition.ReCoverExpeditionHeroResponse.newBuilder().addAllHeroInfo(set);
|
Expedition.ReCoverExpeditionHeroResponse.Builder build = Expedition.ReCoverExpeditionHeroResponse.newBuilder().addAllHeroInfo(set);
|
||||||
user.getUserMissionManager().onGameEvent(user, GameEvent.EXPEDITION_TIMES);
|
|
||||||
MessageUtil.sendMessage(iSession, 1, MessageTypeProto.MessageType.EXPEDITION_RECOVER_HERO_RESONSE_VALUE, build.build(), true);
|
MessageUtil.sendMessage(iSession, 1, MessageTypeProto.MessageType.EXPEDITION_RECOVER_HERO_RESONSE_VALUE, build.build(), true);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -122,7 +122,6 @@ public class ReliveExpeditionHeroRequest extends BaseHandler<Expedition.ReliveEx
|
||||||
|
|
||||||
Expedition.ReliveExpeditionHeroResponse build = Expedition.ReliveExpeditionHeroResponse.newBuilder()
|
Expedition.ReliveExpeditionHeroResponse build = Expedition.ReliveExpeditionHeroResponse.newBuilder()
|
||||||
.setHeroInfo(CommonProto.ExpeditionSimpleHeroInfo.newBuilder().setHeroId(heroId).setRemainHp(1d).build()).build();
|
.setHeroInfo(CommonProto.ExpeditionSimpleHeroInfo.newBuilder().setHeroId(heroId).setRemainHp(1d).build()).build();
|
||||||
user.getUserMissionManager().onGameEvent(user, GameEvent.EXPEDITION_TIMES);
|
|
||||||
MessageUtil.sendMessage(iSession, 1, MessageTypeProto.MessageType.EXPEDITION_RELIVE_HERO_RESONSE_VALUE, build, true);
|
MessageUtil.sendMessage(iSession, 1, MessageTypeProto.MessageType.EXPEDITION_RELIVE_HERO_RESONSE_VALUE, build, true);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -98,7 +98,6 @@ public class TakeHolyEquipRequest extends BaseHandler<Expedition.TakeHolyEquipRe
|
||||||
MessageUtil.sendIndicationMessage(iSession, 1, MessageTypeProto.MessageType.EXPEDITION_NOINFO_INDICATION_VALUE, builder.build(), true);
|
MessageUtil.sendIndicationMessage(iSession, 1, MessageTypeProto.MessageType.EXPEDITION_NOINFO_INDICATION_VALUE, builder.build(), true);
|
||||||
|
|
||||||
Expedition.TakeHolyEquipResponse.Builder build = Expedition.TakeHolyEquipResponse.newBuilder().setEquipId(expeditionItem.getId());
|
Expedition.TakeHolyEquipResponse.Builder build = Expedition.TakeHolyEquipResponse.newBuilder().setEquipId(expeditionItem.getId());
|
||||||
user.getUserMissionManager().onGameEvent(user, GameEvent.EXPEDITION_TIMES);
|
|
||||||
MessageUtil.sendMessage(iSession, 1, MessageTypeProto.MessageType.EXPEDITION_TAKE_HOLY_EQUIP_RESONSE_VALUE, build.build(), true);
|
MessageUtil.sendMessage(iSession, 1, MessageTypeProto.MessageType.EXPEDITION_TAKE_HOLY_EQUIP_RESONSE_VALUE, build.build(), true);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -54,6 +54,7 @@ public class GetArenaInfoHandler extends BaseHandler {
|
||||||
.setFailNums(arenaManager.getFailNums())
|
.setFailNums(arenaManager.getFailNums())
|
||||||
.setSuccessNums(arenaManager.getSuccessNums())
|
.setSuccessNums(arenaManager.getSuccessNums())
|
||||||
.setScore(score)
|
.setScore(score)
|
||||||
|
.addAllHadTakeBox(arenaManager.getHadTakeReward())
|
||||||
.addAllArenaEnemys(ArenaLogic.getInstance().getArenaEnemyList(arenaManager.getArenaEnemies()))
|
.addAllArenaEnemys(ArenaLogic.getInstance().getArenaEnemyList(arenaManager.getArenaEnemies()))
|
||||||
.build();
|
.build();
|
||||||
|
|
||||||
|
|
|
@ -120,6 +120,9 @@ public class CumulationData {
|
||||||
public int rechargeTotal; //累計充值
|
public int rechargeTotal; //累計充值
|
||||||
|
|
||||||
public int refreshMrTimes; //刷新迷宫寻宝次数
|
public int refreshMrTimes; //刷新迷宫寻宝次数
|
||||||
|
|
||||||
|
public int especialEquipMaxLeve; //法宝最高等级达到5
|
||||||
|
|
||||||
public Map<Integer,Integer> luckyWheelTimes = new HashMap<>(); //幸运探宝次数
|
public Map<Integer,Integer> luckyWheelTimes = new HashMap<>(); //幸运探宝次数
|
||||||
|
|
||||||
public int expeditinoTimes; // 猎妖之路次数
|
public int expeditinoTimes; // 猎妖之路次数
|
||||||
|
|
|
@ -20,6 +20,7 @@ import com.ljsd.jieling.logic.fight.specialparm.SpecialForTeamBuildEnum;
|
||||||
import com.ljsd.jieling.logic.hero.HeroAttributeEnum;
|
import com.ljsd.jieling.logic.hero.HeroAttributeEnum;
|
||||||
import com.ljsd.jieling.logic.hero.HeroLogic;
|
import com.ljsd.jieling.logic.hero.HeroLogic;
|
||||||
import com.ljsd.jieling.logic.mail.MailLogic;
|
import com.ljsd.jieling.logic.mail.MailLogic;
|
||||||
|
import com.ljsd.jieling.logic.mission.GameEvent;
|
||||||
import com.ljsd.jieling.logic.store.StoreLogic;
|
import com.ljsd.jieling.logic.store.StoreLogic;
|
||||||
import com.ljsd.jieling.network.session.ISession;
|
import com.ljsd.jieling.network.session.ISession;
|
||||||
import com.ljsd.jieling.protocols.CommonProto;
|
import com.ljsd.jieling.protocols.CommonProto;
|
||||||
|
@ -162,7 +163,7 @@ public class ExpeditionLogic {
|
||||||
/**
|
/**
|
||||||
* 初始化下一层
|
* 初始化下一层
|
||||||
*/
|
*/
|
||||||
public static Set<CommonProto.ExpeditionNodeInfo> openLay(User user, int curryLay, int passNode) {
|
public static Set<CommonProto.ExpeditionNodeInfo> openLay(User user, int curryLay, int passNode)throws Exception {
|
||||||
final int oldlay = curryLay;
|
final int oldlay = curryLay;
|
||||||
final int newlay = oldlay + 1;
|
final int newlay = oldlay + 1;
|
||||||
|
|
||||||
|
@ -204,6 +205,7 @@ public class ExpeditionLogic {
|
||||||
});
|
});
|
||||||
//updata lay
|
//updata lay
|
||||||
user.getExpeditionManager().setLay(newlay);
|
user.getExpeditionManager().setLay(newlay);
|
||||||
|
user.getUserMissionManager().onGameEvent(user, GameEvent.EXPEDITION_TIMES);
|
||||||
return nodeInfos;
|
return nodeInfos;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -763,7 +763,7 @@ public class MissionLoigc {
|
||||||
break;
|
break;
|
||||||
//todo
|
//todo
|
||||||
case SPECIAL_EQUIP_LEVEL_UP:
|
case SPECIAL_EQUIP_LEVEL_UP:
|
||||||
// count = cumulationData.friendApplyCount;
|
count = cumulationData.especialEquipMaxLeve;
|
||||||
break;
|
break;
|
||||||
case LUCKY_WHEELS_TIMES:
|
case LUCKY_WHEELS_TIMES:
|
||||||
if(missionSubType[0] == 0){
|
if(missionSubType[0] == 0){
|
||||||
|
|
|
@ -114,6 +114,7 @@ public class DataManagerDistributor {
|
||||||
judges.put(MissionType.REARGE_TOTAL,new RechargeTotalManger());
|
judges.put(MissionType.REARGE_TOTAL,new RechargeTotalManger());
|
||||||
judges.put(MissionType.FINISH_MISSING_ROOM,new FinishMissionRoomManager());
|
judges.put(MissionType.FINISH_MISSING_ROOM,new FinishMissionRoomManager());
|
||||||
judges.put(MissionType.REFRESH_MISSING_ROOM,new RefreshMissionRoomMamager());
|
judges.put(MissionType.REFRESH_MISSING_ROOM,new RefreshMissionRoomMamager());
|
||||||
|
judges.put(MissionType.SPECIAL_EQUIP_LEVEL_UP,new EspecialEquipLeveMamager());
|
||||||
judges.put(MissionType.LUCKY_WHEELS_TIMES,new LuckyWheelTimesManager());
|
judges.put(MissionType.LUCKY_WHEELS_TIMES,new LuckyWheelTimesManager());
|
||||||
judges.put(MissionType.FINISH_EXPEDITION_HERO_TIMES,new ExpeditionManager());
|
judges.put(MissionType.FINISH_EXPEDITION_HERO_TIMES,new ExpeditionManager());
|
||||||
judges.put(MissionType.LOGIN_TIMES,new LoginTimeManager());
|
judges.put(MissionType.LOGIN_TIMES,new LoginTimeManager());
|
||||||
|
|
|
@ -0,0 +1,14 @@
|
||||||
|
package com.ljsd.jieling.logic.mission.data;
|
||||||
|
|
||||||
|
import com.ljsd.jieling.logic.dao.CumulationData;
|
||||||
|
import com.ljsd.jieling.logic.mission.MissionType;
|
||||||
|
|
||||||
|
public class EspecialEquipLeveMamager implements BaseDataManager{
|
||||||
|
@Override
|
||||||
|
public CumulationData.Result updateData(CumulationData data, MissionType missionType, Object... parm) {
|
||||||
|
if((int)parm[0]>data.especialEquipMaxLeve){
|
||||||
|
data.especialEquipMaxLeve=(int)parm[0];
|
||||||
|
}
|
||||||
|
return new CumulationData.Result(missionType);
|
||||||
|
}
|
||||||
|
}
|
|
@ -15,6 +15,10 @@ public class EspecialStarManager implements BaseDataManager {
|
||||||
}else{
|
}else{
|
||||||
especialEquipStar.put(equipStar,1);
|
especialEquipStar.put(equipStar,1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if(equipStar>data.especialEquipMaxLeve){
|
||||||
|
data.especialEquipMaxLeve=equipStar;
|
||||||
|
}
|
||||||
return new CumulationData.Result(missionType);
|
return new CumulationData.Result(missionType);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -93,7 +93,7 @@ public class BuyGoodsLogic {
|
||||||
//check money
|
//check money
|
||||||
|
|
||||||
int realMoney =sRechargeCommodityConfig.getPrice();
|
int realMoney =sRechargeCommodityConfig.getPrice();
|
||||||
if(amount!=realMoney){
|
if(amount!=-999&&amount!=realMoney){
|
||||||
LOGGER.error("the uid={},the goodId={}, amount={},real={}", uid, goodsId, amount,realMoney);
|
LOGGER.error("the uid={},the goodId={}, amount={},real={}", uid, goodsId, amount,realMoney);
|
||||||
resultRes.setResultCode(0);
|
resultRes.setResultCode(0);
|
||||||
resultRes.setResultMsg("前后端金额不对"+amount+"realMoney = " + realMoney);
|
resultRes.setResultMsg("前后端金额不对"+amount+"realMoney = " + realMoney);
|
||||||
|
|
Loading…
Reference in New Issue