排行榜长度修改

lvxinran 2020-08-05 18:08:14 +08:00
parent 0f336e3bd1
commit cb38612620
22 changed files with 43 additions and 43 deletions

View File

@ -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),

View File

@ -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;
}

View File

@ -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()

View File

@ -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);

View File

@ -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){

View File

@ -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

View File

@ -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

View File

@ -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) {

View File

@ -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

View File

@ -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<String> data, PlayerInfoProto.RankResponse.Builder builder) throws Exception {
protected void getOptional(int index, ZSetOperations.TypedTuple<String> 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()

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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;