parent
59f9bf9f70
commit
032ce3646d
|
@ -34,8 +34,8 @@ public class WeekCardHandler extends BaseHandler<ActivityProto.WeekCardRewardReq
|
|||
|
||||
@Override
|
||||
public void processWithProto(ISession session, ActivityProto.WeekCardRewardRequest proto) throws Exception{
|
||||
|
||||
User user = UserManager.getUser(session.getUid());
|
||||
return;
|
||||
/*User user = UserManager.getUser(session.getUid());
|
||||
int weekId = proto.getId();
|
||||
Map<Integer, WeekCardInfo> weekCard = user.getPlayerInfoManager().getWeekCard();
|
||||
ActivityProto.WeekCardRewardResponse.Builder res = ActivityProto.WeekCardRewardResponse.newBuilder();
|
||||
|
@ -71,6 +71,6 @@ public class WeekCardHandler extends BaseHandler<ActivityProto.WeekCardRewardReq
|
|||
singleWeekCard.setLeaveGetRewardDays(TimeUtils.getDayOfWeek());
|
||||
user.getPlayerInfoManager().setWeekCard(weekCard);
|
||||
MessageUtil.sendMessage(session, 1, MessageTypeProto.MessageType.WeekCardRewardResponse.getNumber(), res.build(), true);
|
||||
|
||||
*/
|
||||
}
|
||||
}
|
||||
|
|
|
@ -34,58 +34,15 @@ public class WeekCardInfoHandler extends BaseHandler<ActivityProto.WeekCardInfo
|
|||
*/
|
||||
@Override
|
||||
public void processWithProto(ISession session, ActivityProto.WeekCardInfoRequest proto) throws Exception{
|
||||
|
||||
User user = UserManager.getUser(session.getUid());
|
||||
return;
|
||||
/*User user = UserManager.getUser(session.getUid());
|
||||
int[] weekType = WeekCardLogic.getInstance().getWeekCardType(user);
|
||||
if(weekType == null){
|
||||
return;
|
||||
}
|
||||
ActivityProto.WeekCardInfoResponse.Builder res = ActivityProto.WeekCardInfoResponse.newBuilder();
|
||||
List<CommonProto.WeekCard> weekCardList = WeekCardLogic.getInstance().initAllWeekCardInfo(user);
|
||||
/*long time= user.getPlayerInfoManager().getWeekCardTimeFirst();
|
||||
if(!TimeUtils.isSameWeek(time ,TimeUtils.now())){
|
||||
user.getPlayerInfoManager().setWeekCardTimeFirstLevel(user.getPlayerInfoManager().getLevel());
|
||||
user.getPlayerInfoManager().setWeekCardTimeFirst(TimeUtils.now());
|
||||
}
|
||||
int [] weekCardType = WeekCardLogic.getInstance().getWeekCardType(user);
|
||||
Map<Integer, WeekCardInfo> weekCard = user.getPlayerInfoManager().getWeekCard();
|
||||
Map<Integer,SWeekcardRotationConfig> config = STableManager.getConfig(SWeekcardRotationConfig.class);
|
||||
boolean isSaveToDb =false;
|
||||
for(int i= 0;i<weekCardType.length;i++){
|
||||
if(config.containsKey(weekCardType[i])){
|
||||
CommonProto.WeekCard.Builder weekCardProto = CommonProto.WeekCard.newBuilder();
|
||||
//周卡是否存在 判断是否过期
|
||||
if(!weekCard.containsKey(weekCardType[i])){
|
||||
weekCard.put(weekCardType[i],new WeekCardInfo(weekCardType[i],false,0,0));
|
||||
isSaveToDb = true;
|
||||
}
|
||||
WeekCardInfo singleWeekCard = weekCard.get(weekCardType[i]);
|
||||
if(singleWeekCard.isBuy()){
|
||||
//买过周卡
|
||||
if(!TimeUtils.isSameWeek(singleWeekCard.getBugTime() ,TimeUtils.now())){
|
||||
//周卡已经过期
|
||||
singleWeekCard.setBuy(false);
|
||||
singleWeekCard.setLeaveGetRewardDays(0);
|
||||
isSaveToDb = true;
|
||||
}
|
||||
}
|
||||
weekCardProto.setId(singleWeekCard.getId());
|
||||
weekCardProto.setIsBuy(singleWeekCard.isBuy());
|
||||
if(singleWeekCard.isBuy()){
|
||||
weekCardProto.setLeaveGetRewardDays(TimeUtils.getDayOfWeek()-singleWeekCard.getLeaveGetRewardDays());
|
||||
}else{
|
||||
weekCardProto.setLeaveGetRewardDays(singleWeekCard.getLeaveGetRewardDays());
|
||||
}
|
||||
|
||||
res.addAllWeekCardInfo(weekCardProto);
|
||||
}
|
||||
}
|
||||
if(isSaveToDb){
|
||||
user.getPlayerInfoManager().setWeekCard(weekCard);
|
||||
}*/
|
||||
res.addAllAllWeekCardInfo(weekCardList);
|
||||
MessageUtil.sendMessage(session, 1, MessageTypeProto.MessageType.WeekCardInfoResponse.getNumber(), res.build(), true);
|
||||
|
||||
|
||||
MessageUtil.sendMessage(session, 1, MessageTypeProto.MessageType.WeekCardInfoResponse.getNumber(), res.build(), true);*/
|
||||
}
|
||||
}
|
||||
|
|
|
@ -123,6 +123,8 @@ public class CrossYuxulundaoChallengeHandler extends BaseHandler<ArenaInfoProto.
|
|||
}
|
||||
long winCount = Arrays.stream(result).boxed().filter(n -> n == 1).count();
|
||||
|
||||
//换一批
|
||||
CrossYuxulundaoLogic.getInstance().matchRivals(user);
|
||||
List<ArenaEnemy> enemyList = arenaManager.getCrossYuxulundaoEnemies();
|
||||
enemyList.forEach(n -> res.addArenaEnemys(CrossYuxulundaoLogic.getInstance().getMatchRivalInfo(n.getEnemyId(), 0)));
|
||||
CSPlayer myQuery = CrossServiceLogic.getPlayerByRedis(user.getId());
|
||||
|
@ -337,8 +339,17 @@ public class CrossYuxulundaoChallengeHandler extends BaseHandler<ArenaInfoProto.
|
|||
CommonProto.FightTeamInfo fightTeamInfo = FightUtil.makePersonFightData(myUser, myteamId[i], null, null);
|
||||
//对手 修行等级 区服名称 战斗类行 积分变化情况
|
||||
CommonProto.FightTeamInfo defteamInfo = FightUtil.makeCrossPersonData(csPlayer, defTeamId[i], arenaRecord, crossArenaManager);
|
||||
|
||||
//根据战力判断先后手
|
||||
int myforce = 0,defforce = 0;
|
||||
if(arenaRecord.getYxldMyForce().get(i)!=null){
|
||||
myforce =arenaRecord.getYxldMyForce().get(i);
|
||||
}
|
||||
if(arenaRecord.getYxldDefForce().get(i)!=null){
|
||||
defforce = arenaRecord.getYxldDefForce().get(i);
|
||||
}
|
||||
FightResult fightResult = GetWorldArenaChallengeRequestHandler.getFightForPVP(myUser.getId(), defUserUid,
|
||||
fightTeamInfo, defteamInfo, FightUtil.getFightSeed(), true);
|
||||
fightTeamInfo, defteamInfo, FightUtil.getFightSeed(), myforce<defforce);
|
||||
int seed = fightResult.getSeed();
|
||||
CommonProto.FightData build = CommonProto.FightData.newBuilder()
|
||||
.setFightMaxTime(SArenaSetting.getSArenaSetting().getMostTime())
|
||||
|
|
|
@ -402,8 +402,8 @@ public class BuyGoodsNewLogic {
|
|||
}
|
||||
//周卡
|
||||
if(type==GiftGoodsType.WEEKCARD){
|
||||
WeekCardLogic.getInstance().buyWeekCard(user,config.getId());
|
||||
WeekCardLogic.getInstance().sendWeekCardInitInfo(session);
|
||||
//WeekCardLogic.getInstance().buyWeekCard(user,config.getId());
|
||||
//WeekCardLogic.getInstance().sendWeekCardInitInfo(session);
|
||||
}
|
||||
if(drop!=null&&session!=null){
|
||||
PlayerInfoProto.DirectBuyIndication build = PlayerInfoProto.DirectBuyIndication.newBuilder().setDrop(drop).build();
|
||||
|
|
|
@ -284,15 +284,15 @@ public class MinuteTask extends Thread {
|
|||
}
|
||||
}
|
||||
|
||||
//每周日23.50执行
|
||||
//每周日23.30执行
|
||||
public void everySundaySpecialClockTask() throws Exception {
|
||||
Calendar calendar = Calendar.getInstance();
|
||||
int hour = calendar.get(Calendar.HOUR_OF_DAY);
|
||||
int minute = calendar.get(Calendar.MINUTE);
|
||||
int w = calendar.get(Calendar.DAY_OF_WEEK) - 1;
|
||||
if(w == 0 &&hour == 23 && minute ==50){
|
||||
if(w == 0 &&hour == 23 && minute ==30){
|
||||
LOGGER.info("everySundaySpecialClockTask yuxulundao send reward start ...");
|
||||
//玉虚论道23.50分执行
|
||||
//玉虚论道23.30分执行
|
||||
CrossYuxulundaoLogic.getInstance().sendReward();
|
||||
LOGGER.info("everySundaySpecialClockTask yuxulundao send reward end ...");
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue