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 203e784f3..b26a3065b 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 @@ -11,7 +11,7 @@ public enum ActivityTypeEnum { ONLINEREWARD(ActivityType.OnlineReward, OnlineRewardActivity::new), SEVENLOGIN(ActivityType.SevenLogin, SevenLoginActivity::new), CHAPTERREWARD(ActivityType.ChapterReward, ChapterRewardActivity::new), - FIRSTRECHARGE(ActivityType.RechargeTotal, FirstRechargeActivity::new), + FIRSTRECHARGE(ActivityType.RechargeTotal, RechargeTotalActivity::new), // RECHARGETOTAL(ActivityType.RechargeTotal, RechargeTotalActivity::new), GROWTHFUND(ActivityType.GrowthFund, GrowthFundActivity::new), BLESSACTIVITY(ActivityType.BLESSACTIVITY, BlessActivity::new), diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/UserManager.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/UserManager.java index 2e0575c79..cc0d92115 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/UserManager.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/UserManager.java @@ -90,11 +90,11 @@ public class UserManager { private static User registerUser(int uid,String openId,String channel,int pid,int gid,String platform,String ip,String channle_id,String bundle_id) throws Exception { User user = new User(uid); + ReportUtil.onReportEvent(user, ReportEventEnum.CREATE_ROLE.getType());//先发送注册事件 UserManager.addUser(user); initPlayer(user,openId,channel,pid,gid,platform,ip,channle_id,bundle_id); MongoUtil.getInstence().getMyMongoTemplate().save(user); PlayerLogic.getInstance().sendTestWelfareMail(user,1,1); - ReportUtil.onReportEvent(user, ReportEventEnum.CREATE_ROLE.getType()); return user; } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/family/DeathPathLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/family/DeathPathLogic.java index 933b01c67..3b2510787 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/family/DeathPathLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/family/DeathPathLogic.java @@ -301,7 +301,7 @@ public class DeathPathLogic { User user = UserManager.getUser(uid); int guildId = user.getPlayerInfoManager().getGuildId(); SGuildWarConfig config = STableManager.getConfig(SGuildWarConfig.class).get(pathId); - PVEFightEvent pveFightEvent = new PVEFightEvent(user.getId(), GlobalsDef.DEATH_PATH_TEAM, 1000, "", GameFightType.DeathPathChallenge, config.getMonsterId(), 3); + PVEFightEvent pveFightEvent = new PVEFightEvent(user.getId(), GlobalsDef.DEATH_PATH_TEAM, SGuildSetting.sGuildSetting.getWarTime(), "", GameFightType.DeathPathChallenge, config.getMonsterId(), 3); FightResult fightResult = FightDispatcher.dispatcher(pveFightEvent); int damage = fightResult.getCheckResult()[1]; CommonProto.FightData fightData = CommonProto.FightData.newBuilder() diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/IRank.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/IRank.java index fa053a70f..5cbee1ae6 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/IRank.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/IRank.java @@ -13,7 +13,7 @@ public interface IRank { void addRank(int uid,String rkey,double... data); - int getParam1(Double data); + long getParam1(Double data); int getParam2(Double data); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/AbstractRank.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/AbstractRank.java index ecc36fd4d..cdf866e10 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/AbstractRank.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/AbstractRank.java @@ -161,7 +161,7 @@ public abstract class AbstractRank implements IRank { * @param score * @return */ - public abstract int[] getDataByScore(Double score); + public abstract long[] getDataByScore(Double score); /** * 子类需重写此方法来获得向Redis里添加的数据,根据需要的参数进行组合 @@ -187,19 +187,19 @@ public abstract class AbstractRank implements IRank { } } @Override - public int getParam1(Double data) { + public long getParam1(Double data) { return getDataByScore(data).length>0?getDataByScore(data)[0]:0; } @Override public int getParam2(Double data) { - return getDataByScore(data).length>1?getDataByScore(data)[1]:0; + return getDataByScore(data).length>1?(int)(getDataByScore(data)[1]):0; } @Override public int getParam3(Double data) { - return getDataByScore(data).length>2?getDataByScore(data)[2]:0; + return getDataByScore(data).length>2?(int)(getDataByScore(data)[2]):0; } public double getScoreById(int uid,String rkey){ 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 56e7f3235..82bac8cec 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 @@ -16,8 +16,8 @@ public class CarDealyGuildRank extends AbstractRank{ } @Override - public int[] getDataByScore(Double score) { - return new int[]{(int) (score.longValue()/1000),(int) (score.longValue()%1000)}; + public long[] getDataByScore(Double score) { + return new long[]{(int) (score.longValue()/1000),(int) (score.longValue()%1000)}; } @Override diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/CarDealyRank.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/CarDealyRank.java index fc7dec688..8365cc760 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/CarDealyRank.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/CarDealyRank.java @@ -14,8 +14,8 @@ public class CarDealyRank extends AbstractRank{ } @Override - public int[] getDataByScore(Double score) { - return new int[]{score.intValue()}; + public long[] getDataByScore(Double score) { + return new long[]{score.intValue()}; } @Override 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 ef0af8d4b..b2e73fffd 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 @@ -34,8 +34,8 @@ public class DeathPathEveryGuildRank extends AbstractRank { } @Override - public int[] getDataByScore(Double score) { - return new int[]{(int)(score/1000),(int)(score%1000)}; + public long[] getDataByScore(Double score) { + return new long[]{(long)(score/1000),(int)(score%1000)}; } public double getScore(double... data) { diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/DeathPathEveryPersonRank.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/DeathPathEveryPersonRank.java index 532f07ca3..d53ac2a12 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/DeathPathEveryPersonRank.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/DeathPathEveryPersonRank.java @@ -14,8 +14,8 @@ public class DeathPathEveryPersonRank extends AbstractRank { } @Override - public int[] getDataByScore(Double score) { - return new int[]{score.intValue()}; + public long[] getDataByScore(Double score) { + return new long[]{score.longValue()}; } @Override 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 3ffb9368b..e9668b689 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 @@ -23,9 +23,9 @@ public class DeathPathTotalGuildRank extends AbstractRank{ } @Override - public int[] getDataByScore(Double score) { + public long[] getDataByScore(Double score) { BigDecimal bigDecimal = new BigDecimal(score.toString()).subtract(new BigDecimal(score.intValue())).multiply(new BigDecimal(String.valueOf(Math.pow(10,15)))); - return new int[]{bigDecimal.intValue(),score.intValue()}; + return new long[]{bigDecimal.longValue(),score.intValue()}; } @Override @@ -38,7 +38,7 @@ public class DeathPathTotalGuildRank extends AbstractRank{ return decimal.doubleValue(); } - protected void getOptional(int index, ZSetOperations.TypedTuple data, PlayerInfoProto.RankResponse.Builder builder) throws Exception { + protected void getOptional(int index, ZSetOperations.TypedTuple data, PlayerInfoProto.RankResponse.Builder builder) throws Exception { GuildInfo guildInfo = GuilidManager.guildInfoMap.get(Integer.parseInt(data.getValue())); DeathChallengeCount countInfo = RedisUtil.getInstence().get(RedisKey.DEATH_PAHT_TOTAL_CHALLENGE_COUNT, String.valueOf(guildInfo.getId()), DeathChallengeCount.class); CommonProto.RankInfo.Builder everyRankInfo = CommonProto.RankInfo.newBuilder() diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/DeathPathTotalPersonRank.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/DeathPathTotalPersonRank.java index 1adc51bd2..88fc4d33a 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/DeathPathTotalPersonRank.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/DeathPathTotalPersonRank.java @@ -14,8 +14,8 @@ public class DeathPathTotalPersonRank extends AbstractRank { } @Override - public int[] getDataByScore(Double score) { - return new int[]{score.intValue()}; + public long[] getDataByScore(Double score) { + return new long[]{score.longValue()}; } @Override diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/ForceCurrRank.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/ForceCurrRank.java index f5e458fda..bc470229a 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/ForceCurrRank.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/ForceCurrRank.java @@ -37,8 +37,8 @@ public class ForceCurrRank extends AbstractRank implements IEventHandler{ private static ScheduledThreadPoolExecutor executor; @Override - public int[] getDataByScore(Double score) { - return new int[]{score.intValue()}; + public long[] getDataByScore(Double score) { + return new long[]{score.intValue()}; } @Override diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/ForceRank.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/ForceRank.java index 159492fbb..06b0e40ee 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/ForceRank.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/ForceRank.java @@ -13,8 +13,8 @@ public class ForceRank extends AbstractRank { } @Override - public int[] getDataByScore(Double score) { - return new int[]{score.intValue()}; + public long[] getDataByScore(Double score) { + return new long[]{score.intValue()}; } @Override diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/GoldRank.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/GoldRank.java index d9667a2a4..856163738 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/GoldRank.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/GoldRank.java @@ -15,8 +15,8 @@ public class GoldRank extends AbstractRank { } @Override - public int[] getDataByScore(Double score) { - return new int[]{score.intValue()}; + public long[] getDataByScore(Double score) { + return new long[]{score.intValue()}; } @Override diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/GuildBossRank.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/GuildBossRank.java index 1979d2c2d..bd48b9459 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/GuildBossRank.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/GuildBossRank.java @@ -10,8 +10,8 @@ public class GuildBossRank extends AbstractRank{ } @Override - public int[] getDataByScore(Double score) { - return new int[]{score.intValue()}; + public long[] getDataByScore(Double score) { + return new long[]{score.intValue()}; } @Override diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/GuildForceRank.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/GuildForceRank.java index 183442992..bc95e2ba2 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/GuildForceRank.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/GuildForceRank.java @@ -25,8 +25,8 @@ public class GuildForceRank extends AbstractRank { } @Override - public int[] getDataByScore(Double score) { - return new int[]{score.intValue()}; + public long[] getDataByScore(Double score) { + return new long[]{score.intValue()}; } @Override diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/GuildRedPackageRank.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/GuildRedPackageRank.java index 5fe65ea79..3d244f421 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/GuildRedPackageRank.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/GuildRedPackageRank.java @@ -22,8 +22,8 @@ public class GuildRedPackageRank extends AbstractRank { } @Override - public int[] getDataByScore(Double score) { - return new int[]{score.intValue()}; + public long[] getDataByScore(Double score) { + return new long[]{score.intValue()}; } @Override diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/MainLevelRank.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/MainLevelRank.java index 901e2ef61..1b6634bd2 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/MainLevelRank.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/MainLevelRank.java @@ -22,9 +22,9 @@ public class MainLevelRank extends AbstractRank { } @Override - public int[] getDataByScore(Double score) { + public long[] getDataByScore(Double score) { int i = score.intValue(); - return new int[]{i%10_000_000}; + return new long[]{i%10_000_000}; } @Override diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/MonsterAttackRank.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/MonsterAttackRank.java index d491406bd..a7239bfc9 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/MonsterAttackRank.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/MonsterAttackRank.java @@ -13,8 +13,8 @@ public class MonsterAttackRank extends AbstractRank{ } @Override - public int[] getDataByScore(Double score) { - return new int[]{score.intValue()}; + public long[] getDataByScore(Double score) { + return new long[]{score.intValue()}; } @Override diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/RandomCardPerfectRank.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/RandomCardPerfectRank.java index 96b1c4d1e..64a1ecded 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/RandomCardPerfectRank.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/RandomCardPerfectRank.java @@ -70,8 +70,8 @@ public class RandomCardPerfectRank extends AbstractRank { builder.addRanks(everyRank); } @Override - public int[] getDataByScore(Double score) { - return new int[]{score.intValue()}; + public long[] getDataByScore(Double score) { + return new long[]{score.intValue()}; } @Override diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/RandomCardRank.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/RandomCardRank.java index 47c896226..83352cd72 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/RandomCardRank.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/RandomCardRank.java @@ -13,8 +13,8 @@ public class RandomCardRank extends AbstractRank { } @Override - public int[] getDataByScore(Double score) { - return new int[]{score.intValue()}; + public long[] getDataByScore(Double score) { + return new long[]{score.intValue()}; } @Override diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/TowerRank.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/TowerRank.java index 915f2b2c0..fcfc72fed 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/TowerRank.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/TowerRank.java @@ -21,8 +21,8 @@ public class TowerRank extends AbstractRank { } @Override - public int[] getDataByScore(Double score) { - int[] array = new int [2]; + public long[] getDataByScore(Double score) { + long[] array = new long [2]; int scoreInt = score.intValue(); array[0] = scoreInt/3601; array[1] =3600-scoreInt%3601;