限时抽卡

lvxinran 2019-12-13 08:06:58 +08:00
parent d3e04b3ec1
commit 867f81836a
4 changed files with 32 additions and 2 deletions

View File

@ -34,6 +34,8 @@ import util.MathUtils;
import util.TimeUtils;
import java.util.*;
import java.util.function.Function;
import java.util.stream.Collectors;
import java.util.stream.Stream;
/**
@ -1151,5 +1153,25 @@ public class ActivityLogic {
return objects.length>0;
}
}
public void getNextActivityId(User user) throws Exception {
List<SGlobalActivity> sGlobalActivities = SGlobalActivity.sGlobalActivityMapByType.get(ActivityType.LIMIT_RANDOM_CARD);
if(sGlobalActivities.isEmpty()){
return;
}
Function<SGlobalActivity,Integer> function = v->(int)ToolsUtil.getTimeLong(v.getStartTimeLong(),v.getEndTimeLong(),v.getTime(),user.getPlayerInfoManager().getCreateTime(),1);
Stream<SGlobalActivity> stream = sGlobalActivities.stream().sorted(Comparator.comparing(function))
.filter(v->ToolsUtil.getTimeLong(v.getStartTimeLong(), v.getEndTimeLong(), v.getTime(), user.getPlayerInfoManager().getCreateTime(), 1) > TimeUtils.now());
List<SGlobalActivity> collect = stream.collect(Collectors.toList());
if(collect.isEmpty()){
return;
}
int id = collect.get(0).getId();
SGlobalActivity sGlobalActivity = SGlobalActivity.getsGlobalActivityMap().get(id);
if(sGlobalActivity==null){
throw new ErrorCodeException(ErrorCode.SERVER_SELF_DEFINE);
}
long startTime = ToolsUtil.getTimeLong(sGlobalActivity.getStartTimeLong(),sGlobalActivity.getEndTimeLong(),sGlobalActivity.getTime(),user.getPlayerInfoManager().getCreateTime(),1);
}
}

View File

@ -37,12 +37,14 @@ public class LimitRandomCardActivity extends AbstractActivity {
if(! (event instanceof RandomCardEvent) ){
return;
}
RandomCardEvent cardEvent =(RandomCardEvent) event;
if(cardEvent.getType()!=3){
return;
}
AbstractRank randomRank= RankContext.getRankEnum(RankEnum.RANDOM_CARD_RANK.getType());
int scoreById = Double.valueOf(randomRank.getScoreById(((RandomCardEvent) event).getUid())).intValue();
int scoreById = Double.valueOf(randomRank.getScoreById(((RandomCardEvent) event).getUid())).intValue();
if(scoreById==-1){
scoreById=0;
}

View File

@ -101,7 +101,6 @@ public abstract class AbstractRank implements IRank {
.setHeadFrame(everyUser.getPlayerInfoManager().getHeadFrame())
.setLevel(everyUser.getPlayerInfoManager().getLevel())
.setRankInfo(everyRankInfo)
.setGuildName(GuilidManager.guildInfoMap.get(everyUser.getPlayerInfoManager().getGuildId()).getName())
.build();
builder.addRanks(everyRank);
}

View File

@ -3,6 +3,7 @@ package com.ljsd.jieling.logic.rank.rankImpl;
import com.google.gson.Gson;
import com.ljsd.jieling.db.redis.RedisKey;
import com.ljsd.jieling.db.redis.RedisUtil;
import com.ljsd.jieling.logic.dao.GuilidManager;
import com.ljsd.jieling.logic.dao.UserManager;
import com.ljsd.jieling.logic.dao.root.User;
import com.ljsd.jieling.logic.rank.rankKey.RandomCardSpecialKey;
@ -46,6 +47,11 @@ public class RandomCardPerfectRank extends AbstractRank {
.setParam2(randomCardSpecialKey.getHeroId())
.setParam3(0)
.build();
int guildId = everyUser.getPlayerInfoManager().getGuildId();
String familyName = "";
if(guildId!=0){
familyName = GuilidManager.guildInfoMap.get(guildId).getName();
}
CommonProto.UserRank everyRank = CommonProto.UserRank.newBuilder()
.setUid(everyUser.getId())
.setUserName(everyUser.getPlayerInfoManager().getNickName())
@ -53,6 +59,7 @@ public class RandomCardPerfectRank extends AbstractRank {
.setHeadFrame(everyUser.getPlayerInfoManager().getHeadFrame())
.setLevel(everyUser.getPlayerInfoManager().getLevel())
.setRankInfo(everyRankInfo)
.setGuildName(familyName)
.build();
builder.addRanks(everyRank);
}