From 7d41aeec3a19c0a26b4c9619f4004c66387b8c5c Mon Sep 17 00:00:00 2001 From: mengchengzhen <13682025901@163.com> Date: Fri, 30 Apr 2021 01:44:11 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E6=96=B0=E7=A4=BC=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jieling/logic/store/BuyGoodsNewLogic.java | 34 ++++++++++++++++--- .../newRechargeInfo/NewRechargeInfo.java | 24 ++++++++++++- .../bean/ReceiveWelfareBag.java | 1 + 3 files changed, 53 insertions(+), 6 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsNewLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsNewLogic.java index 27ac98cd9..21991e019 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsNewLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsNewLogic.java @@ -67,6 +67,7 @@ public class BuyGoodsNewLogic { * 登录刷新礼包 */ public static boolean refreshWelfareState(User user) throws Exception { + dailyRefresh(user); sendDailyMailReward(user); boolean needChange = false; List pAddList = new ArrayList<>(); @@ -668,8 +669,16 @@ public class BuyGoodsNewLogic { PlayerInfoProto.AllGiftGoodsIndication goodsBuild = PlayerInfoProto.AllGiftGoodsIndication.newBuilder().addAllGiftGoodsInfo(goodsBagInfo).build(); MessageUtil.sendIndicationMessage(session, 1, MessageTypeProto.MessageType.ALL_GIFTGOODS_INDICATION_VALUE, goodsBuild, true); if(popup != 0){ - PlayerInfoProto.PushWelfareResponse pushWelfareResponse = PlayerInfoProto.PushWelfareResponse.newBuilder().addId(popup).build(); - MessageUtil.sendIndicationMessage(session, 1, MessageTypeProto.MessageType.PUSH_WELFARE_RESPONSE.getNumber(), pushWelfareResponse, true); + if(popup == 21 || popup == 400 || popup == 401 || popup == 402 ){ + if(info.getTEMP_LIMIT()>0){ + info.setTEMP_LIMIT(info.getTEMP_LIMIT() - 1); + PlayerInfoProto.PushWelfareResponse pushWelfareResponse = PlayerInfoProto.PushWelfareResponse.newBuilder().addId(popup).build(); + MessageUtil.sendIndicationMessage(session, 1, MessageTypeProto.MessageType.PUSH_WELFARE_RESPONSE.getNumber(), pushWelfareResponse, true); + } + }else{ + PlayerInfoProto.PushWelfareResponse pushWelfareResponse = PlayerInfoProto.PushWelfareResponse.newBuilder().addId(popup).build(); + MessageUtil.sendIndicationMessage(session, 1, MessageTypeProto.MessageType.PUSH_WELFARE_RESPONSE.getNumber(), pushWelfareResponse, true); + } } } @@ -709,9 +718,15 @@ public class BuyGoodsNewLogic { List list = new ArrayList<>(); NewRechargeInfo info = user.getPlayerInfoManager().getNewRechargeInfo(); for(AbstractWelfareBag bag : info.getTimeLimitBagList()){ - CommonProto.GoodsTypeDuration goodsTypeDuration = CommonProto.GoodsTypeDuration.newBuilder() - .setGoodsType(bag.getModId()).setEndTime((int)(bag.getEndTime()/1000)).build(); - list.add(goodsTypeDuration); + if(bag.getType() == RechargeType.receive.getType()){ + CommonProto.GoodsTypeDuration goodsTypeDuration = CommonProto.GoodsTypeDuration.newBuilder() + .setGoodsType(bag.getModId()).setEndTime((int)((bag.getStartTime() + bag.getContinueDays() * TimeUtils.DAY)/1000)).build(); + list.add(goodsTypeDuration); + }else{ + CommonProto.GoodsTypeDuration goodsTypeDuration = CommonProto.GoodsTypeDuration.newBuilder() + .setGoodsType(bag.getModId()).setEndTime((int)(bag.getEndTime()/1000)).build(); + list.add(goodsTypeDuration); + } } return list; } @@ -776,4 +791,13 @@ public class BuyGoodsNewLogic { MailLogic.getInstance().sendMail(uid,title,content,reward,nowTime, Global.MAIL_EFFECTIVE_TIME); } } + + public static void dailyRefresh(User user){ + NewRechargeInfo info = user.getPlayerInfoManager().getNewRechargeInfo(); + if(TimeUtils.differentDays(info.getLastRefreshTime(),System.currentTimeMillis())<1){ + return; + } + info.setLastRefreshTime(System.currentTimeMillis()); + info.setTEMP_LIMIT(2); + } } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/store/newRechargeInfo/NewRechargeInfo.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/store/newRechargeInfo/NewRechargeInfo.java index c3c4a1c61..fa935ffd4 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/store/newRechargeInfo/NewRechargeInfo.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/store/newRechargeInfo/NewRechargeInfo.java @@ -29,6 +29,9 @@ public class NewRechargeInfo extends MongoBase { private int towerLost; //记录爬塔失败次数 private long nextPushTime; //上次推送时间 + private long lastRefreshTime; + private int TEMP_LIMIT = 2;//临时五星成长礼每天最多两次 + public boolean checkOneGoodsIsOverTimeByPrivilege(int privilegeId){ for(AbstractWelfareBag bag : perpetualMap.values()){ @@ -55,7 +58,8 @@ public class NewRechargeInfo extends MongoBase { } } for(AbstractWelfareBag bag : receiveMap.values()){ - if(bag.isOpen() && bag.getEndTime() > 0){ + bag = (ReceiveWelfareBag)bag; + if(((ReceiveWelfareBag) bag).isBought()){ list.add(bag); } } @@ -253,4 +257,22 @@ public class NewRechargeInfo extends MongoBase { this.nextPushTime = nextPushTime; updateString("nextPushTime",nextPushTime); } + + public int getTEMP_LIMIT() { + return TEMP_LIMIT; + } + + public void setTEMP_LIMIT(int TEMP_LIMIT) { + this.TEMP_LIMIT = TEMP_LIMIT; + updateString("TEMP_LIMIT",TEMP_LIMIT); + } + + public long getLastRefreshTime() { + return lastRefreshTime; + } + + public void setLastRefreshTime(long lastRefreshTime) { + this.lastRefreshTime = lastRefreshTime; + updateString("lastRefreshTime",lastRefreshTime); + } } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/store/newRechargeInfo/bean/ReceiveWelfareBag.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/store/newRechargeInfo/bean/ReceiveWelfareBag.java index 686476876..f932c5a5f 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/store/newRechargeInfo/bean/ReceiveWelfareBag.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/store/newRechargeInfo/bean/ReceiveWelfareBag.java @@ -64,6 +64,7 @@ public class ReceiveWelfareBag extends AbstractWelfareBag { } } setBought(true); + setStartTime(TimeUtils.getTodayZero()); if(getEndTime()!=0){ setEndTime(TimeUtils.getTodayZero() + getContinueDays() * TimeUtils.DAY); } From 832a767b778dd7a6af3ecc79b9e40da15182b02f Mon Sep 17 00:00:00 2001 From: lvxinran Date: Sat, 1 May 2021 01:19:59 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E6=88=98=E6=96=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- luafight/BattleMain.lua | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/luafight/BattleMain.lua b/luafight/BattleMain.lua index 03333c40e..7c0a12ad4 100644 --- a/luafight/BattleMain.lua +++ b/luafight/BattleMain.lua @@ -27,7 +27,7 @@ require("Modules.Battle.Logic.SkillManager") require("Modules.Battle.Logic.OutDataManager") require("Modules.Battle.Logic.BattleLogManager") require("Modules.Battle.Logic.Monster.MonsterManager") - +require "Modules/Battle/Data/ConfigData" local BattleMain = {} local BattleLogic = BattleLogic @@ -282,4 +282,12 @@ function BattleMain.Execute(args, fightData, optionData) return { result = -1 } end +function BattleMain.TestExcute(data, seed, battleType, round, uid) + if type(data) == "string" then + data = loadstring("return "..data)() + end + local resultList = BattleMain.Execute({seed = seed, type = battleType, maxRound = round}, data, {uid = uid}) + print(PrintTable(resultList)) +end + return BattleMain \ No newline at end of file From 32aed0a1b2003e5654a4d94b62435b031a3205ca Mon Sep 17 00:00:00 2001 From: lvxinran Date: Sat, 1 May 2021 04:31:13 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E6=8A=A5=E7=A9=BA=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/ljsd/jieling/logic/dao/PlayerManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/PlayerManager.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/PlayerManager.java index 32437ec97..65036a3d1 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/PlayerManager.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/PlayerManager.java @@ -74,7 +74,7 @@ public class PlayerManager extends MongoBase { private Set reds = new CopyOnWriteArraySet<>(); // private RechargeInfo rechargeInfo; - private NewRechargeInfo newRechargeInfo; + private NewRechargeInfo newRechargeInfo = new NewRechargeInfo(); private Map monthCard = new HashMap<>();//月卡信息 private Set monthCardDailyTake = new HashSet<>(); From aa086627e4249f6b05a8d1b5c05bd3bfb5a2821f Mon Sep 17 00:00:00 2001 From: mengchengzhen <13682025901@163.com> Date: Mon, 31 May 2021 02:58:35 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E6=96=B0=E7=A4=BC=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../store/newRechargeInfo/bean/ReceiveWelfareBag.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/store/newRechargeInfo/bean/ReceiveWelfareBag.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/store/newRechargeInfo/bean/ReceiveWelfareBag.java index f932c5a5f..bde2d5c4a 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/store/newRechargeInfo/bean/ReceiveWelfareBag.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/store/newRechargeInfo/bean/ReceiveWelfareBag.java @@ -45,7 +45,7 @@ public class ReceiveWelfareBag extends AbstractWelfareBag { } } } - if(getDailyUpdate()>0 && getEndTime() != 0){ + if(getDailyUpdate()>0){ setRefreshTime(getStartTime() + getDailyUpdate() * TimeUtils.DAY); } } @@ -65,12 +65,21 @@ public class ReceiveWelfareBag extends AbstractWelfareBag { } setBought(true); setStartTime(TimeUtils.getTodayZero()); + if(getDailyUpdate()>0){ + setRefreshTime(getStartTime() + getDailyUpdate() * TimeUtils.DAY); + } if(getEndTime()!=0){ setEndTime(TimeUtils.getTodayZero() + getContinueDays() * TimeUtils.DAY); } return true; } + @Override + public void refresh(){ + super.refresh(); + setStartTime(System.currentTimeMillis()); + } + private boolean bought ; public boolean isBought() { From d3bef4391481b947bb33d04847c510bf0d4fd3bf Mon Sep 17 00:00:00 2001 From: "DESKTOP-98AVA47\\Administrator" Date: Sun, 31 Oct 2021 01:04:06 +0700 Subject: [PATCH 5/5] =?UTF-8?q?=E5=88=A4=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ljsd/jieling/logic/store/BuyGoodsNewLogic.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsNewLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsNewLogic.java index 21991e019..8b47c0a39 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsNewLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsNewLogic.java @@ -782,6 +782,9 @@ public class BuyGoodsNewLogic { int nowTime = (int)(System.currentTimeMillis()/1000); for(int i = 1;i<=cDay;i++){ SLuxuryFund fund = SLuxuryFund.getByFoundIdAndDay(type,startDay+i); + if(fund==null){ + continue; + } SRechargeCommodityNewConfig config = SRechargeCommodityNewConfig.getConfigById(type); String reward = ItemUtil.getMailReward(fund.getreward()); String title = SErrorCodeEerverConfig.getI18NMessage("recharge_"+config.getType()+"_daily_title");