From 942338df7d908d990e3af3fbcfbee0e6efe3d2a8 Mon Sep 17 00:00:00 2001 From: duhui Date: Tue, 19 Oct 2021 18:25:02 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E5=85=BC=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ljsd/jieling/logic/activity/ActivityTypeEnum.java | 2 +- .../ljsd/jieling/logic/activity/RechargeSumActivity.java | 6 ++++++ tablemanager/src/main/java/config/SGlobalActivity.java | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityTypeEnum.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityTypeEnum.java index 4dfc20183..a96ea6d69 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityTypeEnum.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityTypeEnum.java @@ -66,7 +66,7 @@ public enum ActivityTypeEnum { DEMON_TREASURE(ActivityType.DEMON_TREASURE,LimitRandomSpecialMonsterActivity::new), NEW_GENERAL_ATTACK(ActivityType.NEW_GENERAL_ATTACK,DefaultEmptyActivity::new), GOOD_LUCK(ActivityType.GOOD_LUCK,DefaultEmptyActivity::new), - COW_FLY_SKY(ActivityType.COW_FLY_SKY,CowFlySkyActivity::new), + COW_FLY_SKY(ActivityType.COW_FLY_SKY,CowFlySkyActivity::new),//牛气冲天 FIFTEEN_LOGIN(ActivityType.FIFTEEN_LOGIN,FifteenActivity::new), LUCKY_GET(ActivityType.LUCKY_GET,LuckyGetActivity::new), EQUIP_UPLEVEL(ActivityType.EQUIP_UPLEVEL,EquipUpLevelActivity::new), diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/RechargeSumActivity.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/RechargeSumActivity.java index 1c79097eb..e200c4997 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/RechargeSumActivity.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/RechargeSumActivity.java @@ -1,5 +1,6 @@ package com.ljsd.jieling.logic.activity; +import com.ljsd.GameApplication; import com.ljsd.jieling.jbean.ActivityMission; import com.ljsd.jieling.jbean.ActivityProgressInfo; import com.ljsd.jieling.logic.OnlineUserManager; @@ -7,6 +8,7 @@ import com.ljsd.jieling.logic.dao.UserManager; import com.ljsd.jieling.logic.dao.root.User; import com.ljsd.jieling.network.session.ISession; import config.SActivityRewardConfig; +import config.SGlobalActivity; /** * Created by zsx on 2019/8/5 19:20 @@ -15,6 +17,10 @@ class RechargeSumActivity extends AbstractActivity { @Override public void onResume(User user) throws Exception { + boolean open = SGlobalActivity.checkActivityIfOpen(id, user.getPlayerInfoManager().getCreateTime(), GameApplication.serverConfig.getCacheOpenTime()); + if (!open){ + return; + } //补发前日未领取的奖 ISession sessionByUid = OnlineUserManager.getSessionByUid(user.getId()); takeAllReward(sessionByUid); diff --git a/tablemanager/src/main/java/config/SGlobalActivity.java b/tablemanager/src/main/java/config/SGlobalActivity.java index f18a16c31..49be08452 100644 --- a/tablemanager/src/main/java/config/SGlobalActivity.java +++ b/tablemanager/src/main/java/config/SGlobalActivity.java @@ -132,7 +132,7 @@ public class SGlobalActivity implements BaseConfig { case 4: // 在某某时间之后开服不会出现 long timeOpen4 = TimeUtils.stringToTimeLong(String.valueOf(ifOpen[1]), TimeUtils.ymdFormat); - if (value[1] != 0 && value[1] > timeOpen4){ + if (value[1] != 0 && value[1] >= timeOpen4){ return false; } break; From 3c95660505deb548c766f9b5a0a580cd38e11d4e Mon Sep 17 00:00:00 2001 From: xuexinpeng Date: Tue, 19 Oct 2021 19:09:43 +0800 Subject: [PATCH 2/2] =?UTF-8?q?yx=E7=A9=BA=E9=98=B5=E5=AE=B9=E6=8C=91?= =?UTF-8?q?=E6=88=98=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CrossYuxulundaoChallengeHandler.java | 28 ++++++++++++++----- .../logic/arena/CrossYuxulundaoLogic.java | 13 +++++++-- 2 files changed, 31 insertions(+), 10 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/crossServer/CrossYuxulundaoChallengeHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/crossServer/CrossYuxulundaoChallengeHandler.java index 328d17b28..16ba5176b 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/crossServer/CrossYuxulundaoChallengeHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/crossServer/CrossYuxulundaoChallengeHandler.java @@ -48,10 +48,7 @@ import rpc.protocols.CommonProto; import rpc.protocols.MessageTypeProto; import util.TimeUtils; -import java.util.Arrays; -import java.util.Calendar; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.stream.Collectors; public class CrossYuxulundaoChallengeHandler extends BaseHandler { @@ -326,7 +323,7 @@ public class CrossYuxulundaoChallengeHandler extends BaseHandler> teamPosForHero = user.getTeamPosManager().getTeamPosForHero(); + if(!teamPosForHero.containsKey(myteamId[i]) || teamPosForHero.get(myteamId[i]).size() == 0){ + result[i] = 0; + if (GameApplication.serverId == csPlayer.getServerId()) { + User defuser = UserManager.getUser(csPlayer.getUserId()); + int addforce = HeroLogic.getInstance().calTeamTotalForce(defuser, myteamId[i], false); + arenaRecord.getYxldDefForce().add(addforce); + }else{ + List teamPosHeroInfos = crossArenaManager.getTeams().getOrDefault(myteamId[i], new ArrayList<>()); + int addforcerpc = crossArenaManager.getTotalForceByTeam().get(myteamId[i]); + arenaRecord.getYxldDefForce().add(addforcerpc); + } + return false; + } + return true; + } + public static boolean updateResult(User user,int i, int[] myteamId, int[] defTeamId, int[] result){ //没有队伍时候 直接断定对方赢 Map> teamPosForHero = user.getTeamPosManager().getTeamPosForHero(); if(!teamPosForHero.containsKey(myteamId[i]) || teamPosForHero.get(myteamId[i]).size() == 0){ @@ -380,7 +395,6 @@ public class CrossYuxulundaoChallengeHandler extends BaseHandler result = null;// if (arenaRecord.getYxldResult() == null) { @@ -389,6 +395,7 @@ public class CrossYuxulundaoLogic { result = Arrays.stream(arenaRecord.getYxldResult()).boxed().collect(Collectors.toList()); } if(isSend){ + CSPlayer csPlayer = CrossServiceLogic.getPlayerByRedis(uid); CSPlayer defPlayer = CrossServiceLogic.getPlayerByRedis(arenaRecord.getDefUid()); String myServerName = CrossDeathPathLogic.getInstance().getServerNameByDeathPath(csPlayer.getServerId());