From 20f2fffb7161fd20f44226bec43eeece355dd57e Mon Sep 17 00:00:00 2001 From: lvxinran Date: Thu, 16 Jul 2020 16:31:53 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E8=8B=B1=E9=9B=84=E5=8D=87=E6=98=9F?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=8C=E8=BF=9B=E9=98=B6=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ljsd/jieling/logic/hero/HeroLogic.java | 40 +++++++++++++------ 1 file changed, 28 insertions(+), 12 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java index 217507430..a43b27233 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java @@ -866,7 +866,7 @@ public class HeroLogic{ //删除hero CommonProto.Drop.Builder baseBuilder = ItemLogic.getInstance().decomposeHero(session,new LinkedList<>(removeHeroIds),Collections.singleton(26),MessageTypeProto.MessageType.UP_HERO_STAR_RESPONSE_VALUE); // recyleHeroBySystem(user,removeHeroIds); - rankUpHeroExecute(targetHero,1,8); + rankUpHeroExecute(targetHero); Poster.getPoster().dispatchEvent(new HeroUpStarEvent(user.getId(),targetHero.getTemplateId(),targetHero.getStar())); if(targetHero.getStar()>=5&&targetHero.getStar()!=15){ if(SItem.getsItemMap().get(scHero.getId()).getQuantity()>=5) @@ -888,11 +888,19 @@ public class HeroLogic{ } ReportUtil.onReportEvent(user, ReportEventEnum.HERO_STRENGTHEN.getType(),String.valueOf(targetHero.getTemplateId()),String.valueOf(oldStar),String.valueOf(targetHero.getStar()),""); } - private void rankUpHeroExecute(Hero hero,int starCount,int unlockEspecialEquipStar) throws Exception { + private void rankUpHeroExecute(Hero hero)throws Exception { //是否解锁法宝 - if(hero.getStar()=unlockEspecialEquipStar){ - hero.updateEspecial(1); + SGameSetting gameSetting = STableManager.getFigureConfig(CommonStaticConfig.class).getGameSetting(); + int[][] equipTalismanaUnlock = gameSetting.getEquipTalismanaUnlock(); + for(int [] lockLimit:equipTalismanaUnlock){ + //英雄星级解锁 + if(lockLimit[0]==2) { + if (hero.getStar() < lockLimit[1] && hero.getStar() + 1 >= lockLimit[1]) { + hero.updateEspecial(1); + } + } } + hero.upStar( 1 ); } @@ -2341,23 +2349,31 @@ public class HeroLogic{ heroManager.removeHero(uid,heroId); int[][] returnMaterials = sHeroReturn.getRankupReturn(); + SHeroLevlConfig sHeroLevlConfig = SHeroLevlConfig.getsHeroLevlConfigMap().get(hero.getLevel()); + int[][] levelReturn = ItemLogic.getInstance().itemReturnPercent(sHeroLevlConfig.getSumConsume(), returnPercent); int returnHero = sHeroReturn.getHeroId(); //进阶材料返还乘万分比 - int[][] realReturnMaterials = new int[returnMaterials.length][]; - for(int i = 0 ; i returnItemMap = new HashMap<>(); + for(int i = 0 ; i entry:returnItemMap.entrySet()){ + resultDrop[index] = new int[]{entry.getKey(),entry.getValue()}; + index++; + } + CommonProto.Drop.Builder drop = ItemUtil.drop(user, resultDrop, BIReason.HERO_BACK_REWARD); CommonProto.Hero.Builder heroProto = drop.getHero(0).toBuilder(); String createHeroId = heroProto.getId(); heroProto.setStar(star); drop.setHero(0,heroProto.build()); Hero newHero = user.getHeroManager().getHeroMap().get(createHeroId); newHero.setStar(star); - SHeroLevlConfig sHeroLevlConfig = SHeroLevlConfig.getsHeroLevlConfigMap().get(hero.getLevel()); - int[][] levelUpReturn = sHeroLevlConfig.getSumConsume(); - ItemUtil.drop(user, ItemLogic.getInstance().itemReturnPercent(levelUpReturn,returnPercent),drop, BIReason.HERO_BACK_REWARD); HeroInfoProto.HeroReturnResponse build = HeroInfoProto.HeroReturnResponse.newBuilder().setDrop(drop).build(); MessageUtil.sendMessage(session,1,responseMsgId,build,true); From 10924a13a651028be14c31168895925376a15c9f Mon Sep 17 00:00:00 2001 From: lvxinran Date: Fri, 17 Jul 2020 11:54:33 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=88=98=E6=96=97=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- luafight/Modules/Battle/Logic/Base/Skill.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/luafight/Modules/Battle/Logic/Base/Skill.lua b/luafight/Modules/Battle/Logic/Base/Skill.lua index 9233ff7c5..fd90ae87c 100644 --- a/luafight/Modules/Battle/Logic/Base/Skill.lua +++ b/luafight/Modules/Battle/Logic/Base/Skill.lua @@ -230,7 +230,7 @@ end function Skill:GetDirectTargetsNoMiss() local list = {} for _, role in ipairs(self.effectTargets[1]) do - if self.CheckTargetIsHit(role) then + if self:CheckTargetIsHit(role) then table.insert(list, role) end end From 54a4a5499687bfb52d469a6e2b29832103642e4e Mon Sep 17 00:00:00 2001 From: lvxinran Date: Fri, 17 Jul 2020 11:55:07 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E9=A6=96=E5=86=B2=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ljsd/jieling/kefu/Cmd_changename.java | 2 +- .../jieling/logic/activity/ActivityType.java | 4 ++-- .../logic/activity/ActivityTypeEnum.java | 2 +- .../jieling/logic/store/BuyGoodsLogic.java | 18 +++++++++--------- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/kefu/Cmd_changename.java b/serverlogic/src/main/java/com/ljsd/jieling/kefu/Cmd_changename.java index 9322e7dc7..02d60de2b 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/kefu/Cmd_changename.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/kefu/Cmd_changename.java @@ -153,7 +153,7 @@ public class Cmd_changename extends GmRoleAbstract { //充值金额 rechargeInfo.setSaveAmt(hotRechargeMoney+saveAmt); //累计充值 - ActivityLogic.getInstance().updateActivityMissionProgress(user, ActivityType.RechargeTotal,rechargeInfo.getSaveAmt()); +// ActivityLogic.getInstance().updateActivityMissionProgress(user, ActivityType.RechargeTotal,rechargeInfo.getSaveAmt()); //限时累计充值 ActivityLogic.getInstance().updateActivityMissionProgress(user, ActivityType.RECHARGE_NUM,hotRechargeMoney); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityType.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityType.java index 80b3031de..fc47c97c7 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityType.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityType.java @@ -19,8 +19,8 @@ public interface ActivityType { int OnlineReward = 1; //在线奖励 int SevenLogin = 2; //七日登陆 int ChapterReward = 3; //章节奖励 - int FirstRecharge = 4; //首充 - int RechargeTotal = 5; //累计充值 + int FirstRecharge = 5; //首充 +// int RechargeTotal = 5; //累计充值 int GrowthFund = 6; //成长基金 int BLESSACTIVITY = 7;//云梦祈福 int TREASURE = 8; //戒灵秘宝(孙龙的宝藏) 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 a6d1698c4..7c9381e43 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 @@ -12,7 +12,7 @@ public enum ActivityTypeEnum { SEVENLOGIN(ActivityType.SevenLogin, SevenLoginActivity::new), CHAPTERREWARD(ActivityType.ChapterReward, ChapterRewardActivity::new), FIRSTRECHARGE(ActivityType.FirstRecharge, FirstRechargeActivity::new), - RECHARGETOTAL(ActivityType.RechargeTotal, RechargeTotalActivity::new), +// RECHARGETOTAL(ActivityType.RechargeTotal, RechargeTotalActivity::new), GROWTHFUND(ActivityType.GrowthFund, GrowthFundActivity::new), BLESSACTIVITY(ActivityType.BLESSACTIVITY, BlessActivity::new), TREASUREACTIVITY(ActivityType.TREASURE, TreasureActivity::new), diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsLogic.java index b2ec5dd6c..21e79bd05 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsLogic.java @@ -212,14 +212,14 @@ public class BuyGoodsLogic { } int firstInvest = sRechargeCommodityConfig.getFirstInvest(); int[][] reward=null; - if(rechargeInfo.getIsFirst()==0 && firstInvest == 1){ - ActivityLogic.getInstance().updateActivityMissionProgress(user, ActivityType.FirstRecharge,1); - SActivityRewardConfig sActivityRewardConfig = SActivityRewardConfig.getsActivityRewardConfigByActivityId(4).get(0); - rechargeInfo.setFirst(1); - String title = SErrorCodeEerverConfig.getI18NMessage("recharge_first_title"); - String content = SErrorCodeEerverConfig.getI18NMessage("recharge_first_txt"); - MailLogic.getInstance().sendMail(user.getId(),title,content,ItemUtil.getMailReward(sActivityRewardConfig.getReward()),nowTime, Global.MAIL_EFFECTIVE_TIME); - } +// if(rechargeInfo.getIsFirst()==0 && firstInvest == 1){ +// ActivityLogic.getInstance().updateActivityMissionProgress(user, ActivityType.FirstRecharge,1); +// SActivityRewardConfig sActivityRewardConfig = SActivityRewardConfig.getsActivityRewardConfigByActivityId(4).get(0); +// rechargeInfo.setFirst(1); +// String title = SErrorCodeEerverConfig.getI18NMessage("recharge_first_title"); +// String content = SErrorCodeEerverConfig.getI18NMessage("recharge_first_txt"); +// MailLogic.getInstance().sendMail(user.getId(),title,content,ItemUtil.getMailReward(sActivityRewardConfig.getReward()),nowTime, Global.MAIL_EFFECTIVE_TIME); +// } if(length>baseReward.length){ int[][] result = new int[length][]; @@ -261,7 +261,7 @@ public class BuyGoodsLogic { rechargeInfo.setSmonthSaveAmt(price+rechargeInfo.getSmonthSaveAmt()); //TODO 用事件分发 - ActivityLogic.getInstance().updateActivityMissionProgress(user, ActivityType.RechargeTotal,price); +// ActivityLogic.getInstance().updateActivityMissionProgress(user, ActivityType.RechargeTotal,price); ActivityLogic.getInstance().updateActivityMissionProgress(user, ActivityType.LUCKYCAT,price); ActivityLogic.getInstance().updateActivityMissionProgress(user, ActivityType.DAILY_RECHARGE,price); ActivityLogic.getInstance().updateActivityMissionProgress(user, ActivityType.RECHARGE_NUM,price);