点金排行提交
parent
f25e6a5980
commit
4bcac2e1d8
|
@ -265,7 +265,6 @@ public class RedisKey {
|
||||||
|
|
||||||
public final static String USER_LEVEL_GUILD_INFO = "USER_LEVEL_GUILD_INFO"; //车迟玩法挑战记录
|
public final static String USER_LEVEL_GUILD_INFO = "USER_LEVEL_GUILD_INFO"; //车迟玩法挑战记录
|
||||||
|
|
||||||
public final static String GOLD_RANK = "GOLD_RANK";//点金排行
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -7,6 +7,7 @@ import com.ljsd.jieling.protocols.MessageTypeProto;
|
||||||
import com.ljsd.jieling.protocols.PlayerInfoProto;
|
import com.ljsd.jieling.protocols.PlayerInfoProto;
|
||||||
import org.springframework.stereotype.Component;
|
import org.springframework.stereotype.Component;
|
||||||
|
|
||||||
|
@Deprecated //统一排行榜接口,废弃原来排行榜
|
||||||
@Component
|
@Component
|
||||||
public class ExpertRankHandler extends BaseHandler {
|
public class ExpertRankHandler extends BaseHandler {
|
||||||
@Override
|
@Override
|
||||||
|
|
|
@ -114,11 +114,4 @@ class BuyGoldActivity extends AbstractActivity {
|
||||||
ISession sessionByUid = OnlineUserManager.getSessionByUid(user.getId());
|
ISession sessionByUid = OnlineUserManager.getSessionByUid(user.getId());
|
||||||
MessageUtil.sendIndicationMessage(sessionByUid, 1, MessageTypeProto.MessageType.PRIVILLEGE_ADD_INDICATION_VALUE, indication.build(), true);
|
MessageUtil.sendIndicationMessage(sessionByUid, 1, MessageTypeProto.MessageType.PRIVILLEGE_ADD_INDICATION_VALUE, indication.build(), true);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public void update(User user, int count) {
|
|
||||||
super.update(user, count);
|
|
||||||
AbstractRank rank = RankContext.getRankEnum(RankEnum.GOLD_RANK.getType());
|
|
||||||
rank.addRank(user.getId(),String.valueOf(id),count);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -9,6 +9,9 @@ import com.ljsd.jieling.jbean.ActivityProgressInfo;
|
||||||
import com.ljsd.jieling.logic.dao.UserManager;
|
import com.ljsd.jieling.logic.dao.UserManager;
|
||||||
import com.ljsd.jieling.logic.dao.root.User;
|
import com.ljsd.jieling.logic.dao.root.User;
|
||||||
import com.ljsd.jieling.logic.mail.MailLogic;
|
import com.ljsd.jieling.logic.mail.MailLogic;
|
||||||
|
import com.ljsd.jieling.logic.rank.RankContext;
|
||||||
|
import com.ljsd.jieling.logic.rank.RankEnum;
|
||||||
|
import com.ljsd.jieling.logic.rank.rankImpl.AbstractRank;
|
||||||
import com.ljsd.jieling.network.session.ISession;
|
import com.ljsd.jieling.network.session.ISession;
|
||||||
import com.ljsd.jieling.util.ItemUtil;
|
import com.ljsd.jieling.util.ItemUtil;
|
||||||
import util.TimeUtils;
|
import util.TimeUtils;
|
||||||
|
@ -27,8 +30,9 @@ class ExpectRankActivity extends AbstractActivity {
|
||||||
void updateProgressWithUser(User user, ActivityMission activityMission, int count) {
|
void updateProgressWithUser(User user, ActivityMission activityMission, int count) {
|
||||||
activityMission.setV(count + activityMission.getV());
|
activityMission.setV(count + activityMission.getV());
|
||||||
if(SGlobalActivity.getsGlobalActivityMap().get(id).getOpenRanking()==1){
|
if(SGlobalActivity.getsGlobalActivityMap().get(id).getOpenRanking()==1){
|
||||||
String key = RedisKey.getKey(RedisKey.EXPERT_RANK, String.valueOf(id), false);
|
// String key = RedisKey.getKey(RedisKey.EXPERT_RANK, String.valueOf(id), false);
|
||||||
RedisUtil.getInstence().zsetAddOne(key, String.valueOf(user.getId()), activityMission.getV());
|
// RedisUtil.getInstence().zsetAddOne(key, String.valueOf(user.getId()), activityMission.getV());
|
||||||
|
RankContext.getRankEnum(RankEnum.EXPERT_RANK.getType()).addRank(user.getId(),String.valueOf(id),activityMission.getV());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -83,7 +87,9 @@ class ExpectRankActivity extends AbstractActivity {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
Set<ZSetOperations.TypedTuple<String>> rankInfo = RedisUtil.getInstence().getZsetreverseRangeWithScores(RedisKey.EXPERT_RANK, Integer.toString(id), 0, (maxRank==-1?0:maxRank) - 1);
|
// Set<ZSetOperations.TypedTuple<String>> rankInfo = RedisUtil.getInstence().getZsetreverseRangeWithScores(RedisKey.EXPERT_RANK, Integer.toString(id), 0, (maxRank==-1?0:maxRank) - 1);
|
||||||
|
AbstractRank expertRank = RankContext.getRankEnum(RankEnum.EXPERT_RANK.getType());
|
||||||
|
Set<ZSetOperations.TypedTuple<String>> rankInfo = expertRank.getRankByKey(String.valueOf(id), 0, -1);
|
||||||
int rank = 1;
|
int rank = 1;
|
||||||
int nowTime = (int) (TimeUtils.now() / 1000);
|
int nowTime = (int) (TimeUtils.now() / 1000);
|
||||||
for (ZSetOperations.TypedTuple<String> item : rankInfo) {
|
for (ZSetOperations.TypedTuple<String> item : rankInfo) {
|
||||||
|
|
|
@ -29,7 +29,7 @@ public enum RankEnum {
|
||||||
DEATH_PATH_TOTAL_PERSON_RANK(17,RedisKey.DEATH_PATH_TOTAL_PERSON_RANK,DeathPathTotalPersonRank::new),//param1:玩家总伤害 param2:无 param3:无
|
DEATH_PATH_TOTAL_PERSON_RANK(17,RedisKey.DEATH_PATH_TOTAL_PERSON_RANK,DeathPathTotalPersonRank::new),//param1:玩家总伤害 param2:无 param3:无
|
||||||
DEATH_PATH_TOTAL_GUILD_RANK(18,RedisKey.DEATH_PATH_TOTAL_GUILD_RANK,DeathPathTotalGuildRank::new),//param1:工会总伤害 param2:无 param3:无
|
DEATH_PATH_TOTAL_GUILD_RANK(18,RedisKey.DEATH_PATH_TOTAL_GUILD_RANK,DeathPathTotalGuildRank::new),//param1:工会总伤害 param2:无 param3:无
|
||||||
GUILD_FORCE_RANK(20,RedisKey.GUILD_FORCE_RANK,GuildForceRank::new),//param1:公会总战力 param2:无 param3:无
|
GUILD_FORCE_RANK(20,RedisKey.GUILD_FORCE_RANK,GuildForceRank::new),//param1:公会总战力 param2:无 param3:无
|
||||||
GOLD_RANK(21,RedisKey.GOLD_RANK,GoldRank::new);//param1:点金次数 param2:无 param3:无
|
EXPERT_RANK(21,RedisKey.EXPERT_RANK,GoldRank::new);//param1:活动进度 param2:无 param3:无
|
||||||
|
|
||||||
private int type;
|
private int type;
|
||||||
private String redisKey;
|
private String redisKey;
|
||||||
|
|
|
@ -44,6 +44,7 @@ public class RankLogic {
|
||||||
public final static RankLogic instance = new RankLogic();
|
public final static RankLogic instance = new RankLogic();
|
||||||
}
|
}
|
||||||
public void getRank(ISession session, int type, int activityId,MessageTypeProto.MessageType messageType) throws Exception {
|
public void getRank(ISession session, int type, int activityId,MessageTypeProto.MessageType messageType) throws Exception {
|
||||||
|
LOGGER.info("获取排行榜信息type={},activityId={}",type,activityId);
|
||||||
int page = 1;
|
int page = 1;
|
||||||
String rkey = "";
|
String rkey = "";
|
||||||
if(activityId != 0){
|
if(activityId != 0){
|
||||||
|
|
Loading…
Reference in New Issue