From becc82c4257164ad42be43bfdd8b72ee22582803 Mon Sep 17 00:00:00 2001 From: lvxinran Date: Sat, 17 Apr 2021 14:22:29 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E4=B8=80=E4=BB=B6=E8=B4=AD=E4=B9=B0?= =?UTF-8?q?=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/core/GlobalsDef.java | 1 - .../main/java/com/ljsd/jieling/logic/store/BuyGoodsLogic.java | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/core/GlobalsDef.java b/serverlogic/src/main/java/com/ljsd/jieling/core/GlobalsDef.java index 2a898f88d..f6f88b3fc 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/core/GlobalsDef.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/core/GlobalsDef.java @@ -109,6 +109,5 @@ public interface GlobalsDef { //特殊商店id int DAILY_GOODS_FAST_ID = 1004;//每日礼包一键购买的礼包ID - int[] DAILY_RECHARGE_IDS = new int[]{1001, 1002, 1003};//所有每日礼包,用来在一键购买每日礼包之后,把所有每日礼包设置为购买过的状态 } 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 e1af070bf..c1a2ef0cf 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 @@ -363,7 +363,8 @@ public class BuyGoodsLogic { if (goodsId == GlobalsDef.DAILY_GOODS_FAST_ID) { //每日礼包一键购买之后,把所有单个的每日礼包的购买次数加一 - for (int gId : GlobalsDef.DAILY_RECHARGE_IDS) { + int[] fastGoods = SSpecialConfig.getOnceArrayValue(SSpecialConfig.YIJIANGOUMAI); + for (int gId : fastGoods) { rechargeInfo.updateBuyGoodsTimes(gId,1); } } From 1b4a0f6386a215be98c2305612089aaaf6379715 Mon Sep 17 00:00:00 2001 From: lvxinran Date: Sat, 17 Apr 2021 17:39:25 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E4=B8=80=E9=94=AE=E8=B4=AD=E4=B9=B0?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tablemanager/src/main/java/config/SSpecialConfig.java | 1 + 1 file changed, 1 insertion(+) diff --git a/tablemanager/src/main/java/config/SSpecialConfig.java b/tablemanager/src/main/java/config/SSpecialConfig.java index 558b9568e..6fb54c0f5 100644 --- a/tablemanager/src/main/java/config/SSpecialConfig.java +++ b/tablemanager/src/main/java/config/SSpecialConfig.java @@ -99,6 +99,7 @@ public class SSpecialConfig implements BaseConfig { public static final String SHEN_ZHUANG = "ShenZhuang";//神装礼包推送等级 public static final String FU_XING = "FuXing";//福星高照可购买天数和可领取天数 public static final String FU_XING_STORE = "FuXingStore";//福星高照购买解锁奖励 + public static final String YIJIANGOUMAI = "YiJianGouMai";//一件购买 @Override public void init() throws Exception { From 0f43fb38886885ce61e6d67929065d46612052e0 Mon Sep 17 00:00:00 2001 From: lvxinran Date: Sat, 17 Apr 2021 18:01:30 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E6=8E=89=E8=90=BD=E7=BB=84=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ljsd/jieling/globals/GlobalItemType.java | 3 ++- .../java/com/ljsd/jieling/util/ItemUtil.java | 27 +++++++++++++++++++ 2 files changed, 29 insertions(+), 1 deletion(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/globals/GlobalItemType.java b/serverlogic/src/main/java/com/ljsd/jieling/globals/GlobalItemType.java index eb8c78fa0..424077846 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/globals/GlobalItemType.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/globals/GlobalItemType.java @@ -6,7 +6,7 @@ public interface GlobalItemType { int WEIGHT_DROP = 2; //随机掉落 int SUCCESSIVELY_RANDOM = 3; // 依次随机 int SELETEONE = 4; //n 选1 - + int NO_REPEATED_FIX_COUNT = 5;//按照物品在组内的占比出(不可重复) // 物品类型 int GEM = 3; // 钻石Id(充值获得) int ITEM = 0; //道具 @@ -32,6 +32,7 @@ public interface GlobalItemType { int SELECTSecretBox=20; // 自选宝箱(前端要区分) int SpecialMonster=21; // 灵兽 int SpecialMonsterItem=22; // 灵兽碎片 + int HeroUpItem = 25;//进阶狗粮 //物品使用类型 int NO_USE = 0 ; //不使用 int RANDOM_USE = 1; // 随机使用 diff --git a/serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java b/serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java index 20a93a930..cfe4db2de 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java @@ -414,6 +414,9 @@ public class ItemUtil { case GlobalItemType.SUCCESSIVELY_RANDOM: getSuccessivelyRandmoMap(user,sRewardGroup,rewards,weights,itemObj,dropRatio); break; + case GlobalItemType.NO_REPEATED_FIX_COUNT: + getFixRandomMap(user,sRewardGroup.getRewardMaxNum(),rewards,weights,itemObj,dropRatio); + break; default: break; } @@ -457,6 +460,29 @@ public class ItemUtil { getMap(sRewardItem.getItemId(),itemNum, itemObj,dropRatio); } } + private static void getFixRandomMap(User user,int randomItemNum ,String[] rewardArr,String[] weightArr,ItemMap itemObj,float dropRatio)throws ErrorCodeException { + + if(rewardArr.length!=weightArr.length||randomItemNum>rewardArr.length){ + throw new ErrorCodeException(ErrorCode.SERVER_SELF_DEFINE); + } + int[][] randomArray = new int[rewardArr.length][]; + for(int i = 0 ; i Date: Mon, 19 Apr 2021 15:28:05 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E6=80=AA=E7=89=A9=E4=BC=A0=E6=98=9F?= =?UTF-8?q?=E7=BA=A7=E7=BB=99=E5=89=8D=E7=AB=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/ljsd/jieling/util/CBean2Proto.java | 1 + tablemanager/src/main/java/config/SMonsterConfig.java | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java b/serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java index a21f41c1f..aab69d6dd 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java @@ -384,6 +384,7 @@ public class CBean2Proto { monsterBuilder.setUnitSkillIds(monsterSkillList.toString()); monsterBuilder.setUnitId(String.valueOf(sMonsterConfig.getId())); monsterBuilder.setSkinId(sMonsterConfig.getSkinId()); + monsterBuilder.setStar(sMonsterConfig.getStar()); return monsterBuilder; } diff --git a/tablemanager/src/main/java/config/SMonsterConfig.java b/tablemanager/src/main/java/config/SMonsterConfig.java index a2ebd0980..bb588bf47 100644 --- a/tablemanager/src/main/java/config/SMonsterConfig.java +++ b/tablemanager/src/main/java/config/SMonsterConfig.java @@ -60,6 +60,8 @@ public class SMonsterConfig implements BaseConfig { private int skinId; + private int star; + @Override @@ -183,4 +185,8 @@ public class SMonsterConfig implements BaseConfig { public int getSkinId() { return skinId; } + + public int getStar() { + return star; + } } \ No newline at end of file From 5648d6392ec098a3a8a5bd2480119b4ddbc80e6d Mon Sep 17 00:00:00 2001 From: duhui Date: Mon, 19 Apr 2021 16:48:00 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E5=A4=A7=E9=97=B9=E5=A4=A9=E5=AE=AB,?= =?UTF-8?q?=E6=8B=9B=E5=8B=9F=E6=98=9F=E7=BA=A7=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ljsd/jieling/logic/hero/HeroLogic.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 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 91b42e349..413007f0c 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 @@ -1238,7 +1238,7 @@ public class HeroLogic{ // 聚合::根据openlevel倒序,输出list List collect = rankUpConfigs.stream().sorted(Comparator.comparing(SCHeroRankUpConfig::getOpenLevel).reversed()).collect(Collectors.toList()); for(SCHeroRankUpConfig scHeroRankUpConfig : collect){ - if (heroLevel >= scHeroRankUpConfig.getOpenLevel()){ + if (heroLevel > scHeroRankUpConfig.getOpenLevel()){ if (scHeroRankUpConfig.getOpenStar() > 10){ continue; } @@ -1265,7 +1265,7 @@ public class HeroLogic{ // 聚合:根据openlevel倒叙排序,输出成list List collect = rankUpConfigs.stream().sorted(Comparator.comparing(SCHeroRankUpConfig::getOpenLevel).reversed()).collect(Collectors.toList()); for(SCHeroRankUpConfig scHeroRankUpConfig : collect){ - if (heroLevel >= scHeroRankUpConfig.getLimitLevel()){ + if (heroLevel > scHeroRankUpConfig.getLimitLevel()){ return scHeroRankUpConfig.getId(); } } @@ -1292,9 +1292,11 @@ public class HeroLogic{ // 聚合::根据openlevel倒序,输出list List collect = rankUpStar.stream().sorted(Comparator.comparing(SCHeroRankUpConfig::getOpenLevel).reversed()).collect(Collectors.toList()); for(SCHeroRankUpConfig val : collect){ - if (heroLevel >= val.getOpenLevel()){ + if (heroLevel > val.getOpenLevel()){ + // 计算星级需要+1操作 + int result = val.getOpenStar()+1; // 机器人生成星级,最高10星 - return val.getOpenStar()>10?10:val.getOpenStar(); + return result>10?10:result; } } } @@ -1306,7 +1308,7 @@ public class HeroLogic{ // 聚合:根据openlevel倒叙排序,输出成list List collect = rankUpBreak.stream().sorted(Comparator.comparing(SCHeroRankUpConfig::getOpenLevel).reversed()).collect(Collectors.toList()); for(SCHeroRankUpConfig val : collect){ - if (heroLevel >= val.getLimitLevel()){ + if (heroLevel > val.getLimitLevel()){ return val.getOpenStar()>10?10:val.getOpenStar(); } } From 59a2dfa11a24a7c24bc77a6a9a77e0c28dcf2a2f Mon Sep 17 00:00:00 2001 From: lvxinran Date: Tue, 20 Apr 2021 10:25:38 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E5=85=AC=E4=BC=9A=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E6=8E=92=E8=A1=8C=E6=A6=9C=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../logic/rank/rankImpl/CarDealyGuildRank.java | 8 -------- .../rank/rankImpl/DeathPathEveryGuildRank.java | 15 +-------------- .../rank/rankImpl/DeathPathTotalGuildRank.java | 10 +--------- .../logic/rank/rankImpl/GuildSheJiScoreRank.java | 6 +----- 4 files changed, 3 insertions(+), 36 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/CarDealyGuildRank.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/CarDealyGuildRank.java index 206cf0309..ddd65640b 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/CarDealyGuildRank.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/CarDealyGuildRank.java @@ -27,10 +27,6 @@ public class CarDealyGuildRank extends AbstractRank{ @Override protected void getOptional(int index, ZSetOperations.TypedTuple data, PlayerInfoProto.RankResponse.Builder builder) throws Exception { - User everyUser = UserManager.getUser(Integer.parseInt(data.getValue()), true); - if (everyUser == null){ - return; - } String value = data.getValue(); int guildId = Integer.parseInt(value); GuildInfo guildInfo = GuilidManager.guildInfoMap.get(guildId); @@ -46,10 +42,6 @@ public class CarDealyGuildRank extends AbstractRank{ CommonProto.UserRank everyRank = CommonProto.UserRank.newBuilder() .setGuildName(familyName) .setRankInfo(everyRankInfo) - .setSex(everyUser.getPlayerInfoManager().getSex()) - .setUserSkin(everyUser.getPlayerInfoManager().getUserSkin()) - .setUserTitle(everyUser.getPlayerInfoManager().getUserTitle()) - .setUserMount(everyUser.getPlayerInfoManager().getUserMount()) .build(); builder.addRanks(everyRank); } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/DeathPathEveryGuildRank.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/DeathPathEveryGuildRank.java index d162341f0..949cbff9d 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/DeathPathEveryGuildRank.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/DeathPathEveryGuildRank.java @@ -22,15 +22,6 @@ public class DeathPathEveryGuildRank extends AbstractRank { protected void getOptional(int index, ZSetOperations.TypedTuple data, PlayerInfoProto.RankResponse.Builder builder) { GuildInfo guildInfo = GuilidManager.guildInfoMap.get(Integer.parseInt(data.getValue())); - User everyUser = null; - try{ - everyUser = UserManager.getUser(Integer.parseInt(data.getValue()), true); - if (everyUser == null){ - return; - } - }catch(Exception e){ - e.printStackTrace(); - } CommonProto.RankInfo.Builder everyRankInfo = CommonProto.RankInfo.newBuilder() .setRank(index) .setParam1(getParam1(data.getScore())) @@ -39,11 +30,7 @@ public class DeathPathEveryGuildRank extends AbstractRank { CommonProto.UserRank.Builder everyRank = CommonProto.UserRank.newBuilder() .setUid(guildInfo.getId()) .setGuildName(guildInfo.getName()) - .setRankInfo(everyRankInfo) - .setSex(everyUser.getPlayerInfoManager().getSex()) - .setUserSkin(everyUser.getPlayerInfoManager().getUserSkin()) - .setUserTitle(everyUser.getPlayerInfoManager().getUserTitle()) - .setUserMount(everyUser.getPlayerInfoManager().getUserMount()); + .setRankInfo(everyRankInfo); builder.addRanks(everyRank); } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/DeathPathTotalGuildRank.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/DeathPathTotalGuildRank.java index 3b0890cab..aca685928 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/DeathPathTotalGuildRank.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/DeathPathTotalGuildRank.java @@ -40,10 +40,6 @@ public class DeathPathTotalGuildRank extends AbstractRank{ } protected void getOptional(int index, ZSetOperations.TypedTuple data, PlayerInfoProto.RankResponse.Builder builder) throws Exception { - User everyUser = UserManager.getUser(Integer.parseInt(data.getValue()), true); - if (everyUser == null){ - return; - } GuildInfo guildInfo = GuilidManager.guildInfoMap.get(Integer.parseInt(data.getValue())); DeathChallengeCount countInfo = RedisUtil.getInstence().get(RedisKey.DEATH_PATH_TOTAL_CHALLENGE_COUNT, String.valueOf(guildInfo.getId()), DeathChallengeCount.class); CommonProto.RankInfo.Builder everyRankInfo = CommonProto.RankInfo.newBuilder() @@ -54,11 +50,7 @@ public class DeathPathTotalGuildRank extends AbstractRank{ CommonProto.UserRank.Builder everyRank = CommonProto.UserRank.newBuilder() .setUid(guildInfo.getId()) .setGuildName(guildInfo.getName()) - .setRankInfo(everyRankInfo) - .setSex(everyUser.getPlayerInfoManager().getSex()) - .setUserSkin(everyUser.getPlayerInfoManager().getUserSkin()) - .setUserTitle(everyUser.getPlayerInfoManager().getUserTitle()) - .setUserMount(everyUser.getPlayerInfoManager().getUserMount()); + .setRankInfo(everyRankInfo); builder.addRanks(everyRank); } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/GuildSheJiScoreRank.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/GuildSheJiScoreRank.java index a85d738ea..b4e80dfea 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/GuildSheJiScoreRank.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/GuildSheJiScoreRank.java @@ -46,11 +46,7 @@ public class GuildSheJiScoreRank extends AbstractRank { .setUid(user.getId()) .setLevel(user.getPlayerInfoManager().getLevel()) .setGuildName(guildInfo.getName()) - .setRankInfo(everyRankInfo) - .setSex(user.getPlayerInfoManager().getSex()) - .setUserSkin(user.getPlayerInfoManager().getUserSkin()) - .setUserTitle(user.getPlayerInfoManager().getUserTitle()) - .setUserMount(user.getPlayerInfoManager().getUserMount()); + .setRankInfo(everyRankInfo); builder.addRanks(everyRank); }