玉虚bug修改,天天零点一折任务刷新bug修改

master_zzxx
grimm 2024-07-05 10:54:10 +08:00
parent 4d9808c9f4
commit 5e068e2b29
4 changed files with 20 additions and 13 deletions

View File

@ -1,4 +1,4 @@
{ {
"version":"6", "version":"5",
"tables":"EquipConfig|RechargeCommodityConfig|GlobalSystemConfig" "tables":""
} }

View File

@ -1,7 +1,5 @@
{ {
"version":"8", "version":"5",
"classes": [ "classes": [
{"name":"MissionEventDistributor.class","fullName":"com.ljsd.jieling.logic.mission.event.MissionEventDistributor"},
{"name":"EveryDayDiscountType.class","fullName":"com.ljsd.jieling.logic.mission.main.EveryDayDiscountType"}
] ]
} }

View File

@ -365,6 +365,9 @@ public class CrossYuxulundaoChallengeHandler extends BaseHandler<ArenaInfoProto.
arenaRecord.setHeadFrame(csPlayer.getHeadFrame());//头像框 arenaRecord.setHeadFrame(csPlayer.getHeadFrame());//头像框
arenaRecord.setPracticeLevel(csPlayer.getPracticeLevel()); arenaRecord.setPracticeLevel(csPlayer.getPracticeLevel());
arenaRecord.setServerName(defServerName); arenaRecord.setServerName(defServerName);
List<Long> yxldMyForce = arenaRecord.getYxldMyForce();
List<Long> yxldDefForce = arenaRecord.getYxldDefForce();
for (int i = 0; i < 3; i++) { for (int i = 0; i < 3; i++) {
//编队为空 判输赢 //编队为空 判输赢
if (!updateResult(myUser,i, myteamId, defTeamId, result, csPlayer, arenaRecord)) { if (!updateResult(myUser,i, myteamId, defTeamId, result, csPlayer, arenaRecord)) {
@ -376,11 +379,11 @@ public class CrossYuxulundaoChallengeHandler extends BaseHandler<ArenaInfoProto.
//根据战力判断先后手 //根据战力判断先后手
long myforce = 0,defforce = 0; long myforce = 0,defforce = 0;
if(arenaRecord.getYxldMyForce().get(i)!=null){ if (yxldMyForce != null && yxldMyForce.size() > i && yxldMyForce.get(i) != null){
myforce =arenaRecord.getYxldMyForce().get(i); myforce = yxldMyForce.get(i);
} }
if(arenaRecord.getYxldDefForce().get(i)!=null){ if(yxldDefForce != null && yxldDefForce.size() > i && yxldDefForce.get(i) != null){
defforce = arenaRecord.getYxldDefForce().get(i); defforce = yxldDefForce.get(i);
} }
FightResult fightResult = GetWorldArenaChallengeRequestHandler.getFightForPVP(myUser.getId(), FightResult fightResult = GetWorldArenaChallengeRequestHandler.getFightForPVP(myUser.getId(),
fightTeamInfo, defteamInfo, FightUtil.getFightSeed(), myforce<defforce,FightType.CrossYuxulundaoFight); fightTeamInfo, defteamInfo, FightUtil.getFightSeed(), myforce<defforce,FightType.CrossYuxulundaoFight);
@ -414,6 +417,10 @@ public class CrossYuxulundaoChallengeHandler extends BaseHandler<ArenaInfoProto.
public static boolean updateResult(User user,int i, int[] myteamId, int[] defTeamId, int[] result, CSPlayer csPlayer, ArenaRecord arenaRecord) { public static boolean updateResult(User user,int i, int[] myteamId, int[] defTeamId, int[] result, CSPlayer csPlayer, ArenaRecord arenaRecord) {
//没有队伍时候 直接断定对方赢 //没有队伍时候 直接断定对方赢
Map<Integer, List<TeamPosHeroInfo>> teamPosForHero = user.getTeamPosManager().getTeamPosForHero(); Map<Integer, List<TeamPosHeroInfo>> teamPosForHero = user.getTeamPosManager().getTeamPosForHero();
CSPlayer player = CrossServiceLogic.getPlayerByRedis(csPlayer.getUserId());
if (player == null) {
return true;
}
if(!teamPosForHero.containsKey(myteamId[i]) || teamPosForHero.get(myteamId[i]).isEmpty()){ if(!teamPosForHero.containsKey(myteamId[i]) || teamPosForHero.get(myteamId[i]).isEmpty()){
result[i] = 0; result[i] = 0;
CommonProto.FightTeamInfo defteamInfo = FightUtil.makeCrossPersonData(csPlayer, defTeamId[i], arenaRecord); CommonProto.FightTeamInfo defteamInfo = FightUtil.makeCrossPersonData(csPlayer, defTeamId[i], arenaRecord);
@ -429,10 +436,6 @@ public class CrossYuxulundaoChallengeHandler extends BaseHandler<ArenaInfoProto.
if (i == 2) { if (i == 2) {
arenaRecord.setYxldFightData3(snapRecord); arenaRecord.setYxldFightData3(snapRecord);
} }
CSPlayer player = CrossServiceLogic.getPlayerByRedis(csPlayer.getUserId());
if (player == null) {
return false;
}
arenaRecord.getYxldDefForce().add(player.getYuxuForce()); arenaRecord.getYxldDefForce().add(player.getYuxuForce());
return false; return false;
} }

View File

@ -30,6 +30,7 @@ import com.ljsd.jieling.logic.fight.CombatLogic;
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.mission.GameEvent;
import com.ljsd.jieling.logic.mission.MissionType; import com.ljsd.jieling.logic.mission.MissionType;
import com.ljsd.jieling.logic.mission.event.MissionEventDistributor;
import com.ljsd.jieling.logic.player.PlayerLogic; import com.ljsd.jieling.logic.player.PlayerLogic;
import com.ljsd.jieling.logic.store.newRechargeInfo.NewRechargeInfo; import com.ljsd.jieling.logic.store.newRechargeInfo.NewRechargeInfo;
import com.ljsd.jieling.logic.store.newRechargeInfo.PushRechargeType; import com.ljsd.jieling.logic.store.newRechargeInfo.PushRechargeType;
@ -187,6 +188,7 @@ public class BuyGoodsNewLogic {
* @param list * @param list
*/ */
private static void rechargeHandler(User user, String orderId, int giftId, int amount, List<int[][]> list) throws Exception { private static void rechargeHandler(User user, String orderId, int giftId, int amount, List<int[][]> list) throws Exception {
MissionEventDistributor.requestStart();
// 其他礼包活动 // 其他礼包活动
Poster.getPoster().dispatchEvent(new SuperBoxEvent(user.getId(),giftId,1,1)); Poster.getPoster().dispatchEvent(new SuperBoxEvent(user.getId(),giftId,1,1));
// 天天零点1折购买消耗 // 天天零点1折购买消耗
@ -236,6 +238,10 @@ public class BuyGoodsNewLogic {
// 天天任务 // 天天任务
user.getUserMissionManager().onGameEvent(user, GameEvent.EVERY_DAY_UPDATE, MissionType.RECHARGE_ACCUMULATIVE_NUM, amount); user.getUserMissionManager().onGameEvent(user, GameEvent.EVERY_DAY_UPDATE, MissionType.RECHARGE_ACCUMULATIVE_NUM, amount);
} }
ISession session = OnlineUserManager.getSessionByUid(user.getId());
if (session != null){
MissionEventDistributor.requestEnd(session,true);
}
} }
/** /**