diff --git a/fightmanager/src/main/java/com/ljsd/fight/FightType.java b/fightmanager/src/main/java/com/ljsd/fight/FightType.java index 8cc0f2746..6420eb762 100644 --- a/fightmanager/src/main/java/com/ljsd/fight/FightType.java +++ b/fightmanager/src/main/java/com/ljsd/fight/FightType.java @@ -9,6 +9,7 @@ public enum FightType { GuildFight(6), // 公会站 BloodyFight(7), // 血战 MonterFight(8), // 兽潮 + TOPFight(9), // 巅峰赛 ; diff --git a/serverlogic/src/main/java/com/ljsd/MyBeanListener.java b/serverlogic/src/main/java/com/ljsd/MyBeanListener.java new file mode 100644 index 000000000..d3b1e0faf --- /dev/null +++ b/serverlogic/src/main/java/com/ljsd/MyBeanListener.java @@ -0,0 +1,4 @@ +package com.ljsd; + +public class MyBeanListener { +} diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/championship/ChampionshipLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/championship/ChampionshipLogic.java index 3b7033651..0ad063dcc 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/championship/ChampionshipLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/championship/ChampionshipLogic.java @@ -54,9 +54,9 @@ public class ChampionshipLogic { private static Map gameFightTypeMap = new HashMap<>(); static { - gameFightTypeMap.put(0,GameFightType.ArenaPersonFight); - gameFightTypeMap.put(1,GameFightType.ArenaRobotFight); - gameFightTypeMap.put(2,GameFightType.Arena2RobotFight); + gameFightTypeMap.put(0,GameFightType.TOPArenaPersonFight); + gameFightTypeMap.put(1,GameFightType.TOPArenaRobotFight); + gameFightTypeMap.put(2,GameFightType.TOPArena2RobotFight); } public static void viewFinalInfo(ISession iSession, int type) throws Exception { diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/fight/GameFightType.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/fight/GameFightType.java index 3124ad2dd..1763d7588 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/fight/GameFightType.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/fight/GameFightType.java @@ -29,7 +29,10 @@ public enum GameFightType { ArenaPersonFight(FightType.ArenaFight,new PVPFightHandler(),null), ArenaRobotFight(FightType.ArenaFight,new PVPFightHandler(),null), - Arena2RobotFight(FightType.ArenaFight,new PVPFightHandler(),null), + + TOPArenaPersonFight(FightType.TOPFight,new PVPFightHandler(),null), + TOPArenaRobotFight(FightType.TOPFight,new PVPFightHandler(),null), + TOPArena2RobotFight(FightType.TOPFight,new PVPFightHandler(),null), MonterFight(FightType.MonterFight,new DefaultWithoutHandFightHandler(),null), diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/MissionLoigc.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/MissionLoigc.java index eb58e4b32..d542451a7 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/MissionLoigc.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/MissionLoigc.java @@ -39,7 +39,7 @@ public class MissionLoigc { getDailyMission(user,missionList); getVipMission(user,missionList); getCopyMission(user,missionList); - getTreasureMission(user,missionList,ActivityType.TREASURE); + // getTreasureMission(user,missionList,ActivityType.TREASURE); getTreasureMission(user,missionList,ActivityType.SERVERHAPPY); getBeginnerMisssion(user,missionList); getBloodyMisison(user,missionList); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/player/PlayerLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/player/PlayerLogic.java index 6ab17ff81..df8b3e643 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/player/PlayerLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/player/PlayerLogic.java @@ -426,6 +426,8 @@ public class PlayerLogic { } } mailReward = ItemUtil.getMailReward(rewards); + }else if( type == GiftGoodsType.FOUND){ + mailReward = ItemUtil.getMailReward(SLuxuryFund.getByFoundIdAndDay(goodsInfo.getKey(),days).getreward()); }else{ int theIndexByTarget = MathUtils.getTheIndexByTarget(sRechargeCommodityConfig.getPlayerLevel(), level); int[][] extraReward = sRechargeCommodityConfig.getExtraReward()[theIndexByTarget]; @@ -447,6 +449,11 @@ public class PlayerLogic { } + + private String getRewardOfDay(int goodsId,int days){ + return ""; + } + public CommonProto.TeamOneInfo.Builder getUserTeamOneInfo(int uid,int teamId) throws Exception { User user = UserManager.getUser(uid); PlayerManager playerManager = user.getPlayerInfoManager(); 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 0c43c3eb4..19b20f394 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 @@ -312,6 +312,15 @@ public class BuyGoodsLogic { } + public static boolean isHadBought( Map buyGoodsTimes,int giftGoodsType){ + for(SRechargeCommodityConfig sRechargeCommodityConfig : SRechargeCommodityConfig.rechargeCommodityConfigMap.values()){ + if(sRechargeCommodityConfig.getType() == giftGoodsType && buyGoodsTimes.containsKey(sRechargeCommodityConfig.getId())){ + return true; + } + } + return false; + } + public static boolean getGoodsBagInfo(int uid,List giftGoodsInfoList,boolean needClear) throws Exception { User user = UserManager.getUser(uid); RechargeInfo rechargeInfo = user.getPlayerInfoManager().getRechargeInfo(); @@ -326,6 +335,7 @@ public class BuyGoodsLogic { if(needClear){ rechargeInfo.clearCacheSendId(); } + boolean ishadbouthtLuxuryMonthCard = isHadBought(buyGoodsTimes,GiftGoodsType.LUXURYMONTHCARD); for(SRechargeCommodityConfig sRechargeCommodityConfig :SRechargeCommodityConfig.rechargeCommodityConfigMap.values()){ int limit = sRechargeCommodityConfig.getLimit(); int goodsId = sRechargeCommodityConfig.getId(); @@ -345,6 +355,11 @@ public class BuyGoodsLogic { if(sRechargeCommodityConfig.getType() == 4 && rechargeInfo.getHadBuyFound() !=0){ continue; } + + if(sRechargeCommodityConfig.getType() == GiftGoodsType.FOUND && !ishadbouthtLuxuryMonthCard){ + continue; + } + int[] discountType = sRechargeCommodityConfig.getDiscountType(); int time = sRechargeCommodityConfig.getTime(); long startTime=0; diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/store/GiftGoodsType.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/store/GiftGoodsType.java index be468da12..06720dc03 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/store/GiftGoodsType.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/store/GiftGoodsType.java @@ -8,4 +8,5 @@ public interface GiftGoodsType { int DIRECTBAG=5; //5直购礼包 int LUXURYMONTHCARD =6;//6豪华月卡 int WEEKCARD = 7; //周卡 + int FOUND = 8; //豪华基金 } diff --git a/tablemanager/src/main/java/config/SLuxuryFund.java b/tablemanager/src/main/java/config/SLuxuryFund.java new file mode 100644 index 000000000..ac10e9b2a --- /dev/null +++ b/tablemanager/src/main/java/config/SLuxuryFund.java @@ -0,0 +1,56 @@ +package config; + +import manager.STableManager; +import manager.Table; + +import java.util.HashMap; +import java.util.Map; + +@Table(name ="LuxuryFund") +public class SLuxuryFund implements BaseConfig { + + private int id; + + private int type; + + private int day; + + private int[][] reward; + + private static Map sLuxuryFundByFoundAndDay; + + + + @Override + public void init() throws Exception { + Map config = STableManager.getConfig(SLuxuryFund.class); + Map sLuxuryFundByFoundAndDayTmp = new HashMap<>(); + config.values().forEach(sLuxuryFund->{ + sLuxuryFundByFoundAndDayTmp.put(sLuxuryFund.getType()*100 + sLuxuryFund.getDay(),sLuxuryFund); + }); + sLuxuryFundByFoundAndDay = sLuxuryFundByFoundAndDayTmp; + } + + public static SLuxuryFund getByFoundIdAndDay(int foundId,int day){ + return sLuxuryFundByFoundAndDay.get(foundId*100+day); + } + + + public int getId() { + return id; + } + + public int getType() { + return type; + } + + public int getDay() { + return day; + } + + public int[][] getreward() { + return reward; + } + + +} \ No newline at end of file