Merge branch 'master_test_hw' into master_test_hw_i18n

lvxinran 2021-01-09 00:00:16 +08:00
commit 41066efe5a
4 changed files with 9 additions and 32 deletions

View File

@ -2043,33 +2043,9 @@ public class MapLogic {
User user = UserManager.getUser(uid);
MapInfoProto.getAllLevelDifficultyInfosResponse.Builder builder = MapInfoProto.getAllLevelDifficultyInfosResponse.newBuilder();
MapManager mapManager = user.getMapManager();
Map<Integer, CrossInfo> crossInfoMap = mapManager.getCrossInfoMap();
for (Map.Entry<Integer, CrossInfo> entry : crossInfoMap.entrySet()) {
CommonProto.MapInfo mapInfo = CommonProto.MapInfo
.newBuilder()
.setMapId(entry.getKey())
.setLeastTime(entry.getValue().getLeastTime())
.addAllStars(entry.getValue().getStars())
.build();
builder.addMapInfos(mapInfo);
}
int starReward = mapManager.getStarReward();
SChallengeStarBox sChallengeStarBox = STableManager.getConfig(SChallengeStarBox.class).get(starReward);
if(sChallengeStarBox == null ){
builder.setStarNum(0);
}else{
builder.setStarNum(sChallengeStarBox.getStarNum());
}
//登录时检测是否需要重置
checkTrialReset(user);
builder.addAllPlayedGenMapId(mapManager.getPlayGenMaps());
builder.setKillCount(mapManager.getTrialInfo().getKillCount());
builder.addAllTrialRewardInfo(mapManager.getTrialInfo().getTowerReceivedReward());
for(Map.Entry<Integer,Integer> entry:mapManager.getDifficultyOptions().entrySet()){
MapInfoProto.DifficultMapOption.Builder difficultMapOption = MapInfoProto.DifficultMapOption.newBuilder();
difficultMapOption.setId(entry.getKey());
difficultMapOption.setMapdifficulty(entry.getValue());
builder.addDifficultMapOptions(difficultMapOption);
}
MessageUtil.sendMessage(iSession, 1, msgId, builder.build(), true);
}

View File

@ -55,7 +55,8 @@ public class DefaultEmptyActivity extends AbstractActivity{
MailLogic.getInstance().sendMail(user.getId(),title,content,mailReward,(int)(System.currentTimeMillis()/1000), Global.MAIL_EFFECTIVE_TIME);
}*/
}
}else if(sGlobalActivity.getType() == ActivityType.EXCHANGEANDDROP){
}else if(sGlobalActivity.getType() == ActivityType.EXCHANGEANDDROP || sGlobalActivity.getType() == ActivityType.NEW_GENERAL_ATTACK){
// 限时兑换和新将来袭活动结束会清空道具
int shopId = sGlobalActivity.getShopId()[0];
SStoreConfig sStoreConfig = SStoreConfig.getSstoreConfigBuyStore().get(shopId).get(0);
int removeItemId = sStoreConfig.getCost()[0][0];

View File

@ -259,7 +259,7 @@ public class FriendLogic {
continue;
}
if (friends1.size() >= maxFriends){
if(inviteUidsList.size()>1){
if(inviteUidsList.size()==1){
throw new ErrorCodeException(ErrorCode.FRIENDS_SIDE_MAX);
}else{
continue;

View File

@ -25,10 +25,10 @@ public enum RankEnum {
GUILD_RED_PACKAGE_RANK(13,RedisKey.GUILD_RED_PACKAGE_RANK,GuildRedPackageRank::new,false),//param1红包总价格 param2无 param3:无
CAR_DEALY_RANK(14,RedisKey.CAR_DEALY_RANK,CarDealyRank::new,false),//param1伤害 param2无 param3:无
CAR_DEALY_GUILD_RANK(19,RedisKey.CAR_DEALY_GUILD_RANK,CarDealyGuildRank::new,false),//param1伤害 param2无 param3:无
DEATH_PATH_EVERY_PERSON_RANK(15,RedisKey.DEATH_PATH_EVERY_PERSON_RANK,DeathPathEveryPersonRank::new,true),//param1当前阵玩家伤害 param2无 param3:无
DEATH_PATH_EVERY_GUILD_RANK(16,RedisKey.DEATH_PATH_EVERY_GUILD_RANK, DeathPathEveryGuildRank::new,true),//param1当前阵公会伤害 param2当前工会挑战人数 param3:无
DEATH_PATH_TOTAL_PERSON_RANK(17,RedisKey.DEATH_PATH_TOTAL_PERSON_RANK,DeathPathTotalPersonRank::new,true),//param1玩家总伤害 param2无 param3:无
DEATH_PATH_TOTAL_GUILD_RANK(18,RedisKey.DEATH_PATH_TOTAL_GUILD_RANK,DeathPathTotalGuildRank::new,true),//param1工会总伤害 param2无 param3:无
DEATH_PATH_EVERY_PERSON_RANK(15,RedisKey.DEATH_PATH_EVERY_PERSON_RANK,DeathPathEveryPersonRank::new,false),//param1当前阵玩家伤害 param2无 param3:无
DEATH_PATH_EVERY_GUILD_RANK(16,RedisKey.DEATH_PATH_EVERY_GUILD_RANK, DeathPathEveryGuildRank::new,false),//param1当前阵公会伤害 param2当前工会挑战人数 param3:无
DEATH_PATH_TOTAL_PERSON_RANK(17,RedisKey.DEATH_PATH_TOTAL_PERSON_RANK,DeathPathTotalPersonRank::new,false),//param1玩家总伤害 param2无 param3:无
DEATH_PATH_TOTAL_GUILD_RANK(18,RedisKey.DEATH_PATH_TOTAL_GUILD_RANK,DeathPathTotalGuildRank::new,false),//param1工会总伤害 param2无 param3:无
GUILD_FORCE_RANK(20,RedisKey.GUILD_FORCE_RANK,GuildForceRank::new,false),//param1公会总战力 param2无 param3:无
//达人排行榜
EXPERT_RANK(21,RedisKey.EXPERT_RANK,GoldRank::new,false),//param1活动进度 param2无 param3:无