Merge branch 'master_huanxiang' into master_ob2

# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/logic/dao/UserMissionManager.java
#	serverlogic/src/main/java/com/ljsd/jieling/logic/mission/MissionLoigc.java
#	serverlogic/src/main/java/com/ljsd/jieling/logic/mission/event/DailyRefreshEventProcess.java
#	serverlogic/src/main/java/com/ljsd/jieling/logic/mission/event/MissionEventDistributor.java
master_ob2
PC-202302260912\Administrator 2023-07-31 14:06:18 +08:00
commit 61c38929f0
2 changed files with 2 additions and 8 deletions

View File

@ -289,16 +289,10 @@ public class PlayerLogic {
Map<Integer, Integer>rewardMap = user.getUserMissionManager().getVipMissionIdsType().getVipRewardMap();
for(int i = user.getPlayerInfoManager().getVipLevel();i>=1;i--){
if(!rewardMap.containsKey(i) && i!=0){
if(!rewardMap.containsKey(i)){
rewardMap.put(i,1);
}
}
/*if(!rewardMap.containsKey(playerInfoManager.getVipLevel())){
rewardMap.put(playerInfoManager.getVipLevel(),0);
}
if(rewardMap.get(playerInfoManager.getVipLevel())==0){
rewardMap.put(playerInfoManager.getVipLevel(),1);
}*/
user.getUserMissionManager().setVipMissionIdsType(user.getUserMissionManager().getVipMissionIdsType());
PlayerInfoProto.VipLevelStateResponse.Builder vipLevelStateResponse = PlayerInfoProto.VipLevelStateResponse.newBuilder();

View File

@ -60,7 +60,7 @@ public class SLotterySpecialConfig implements BaseConfig {
return lotterySpecialConfigMap.getOrDefault(type,null);
}
public static List<SLotterySpecialConfig> getLotteryListByDifferentType(int type) {
return lotteryDifferentConfigMap.getOrDefault(type,null);
return lotteryDifferentConfigMap.getOrDefault(type,new ArrayList<>());
}
public int getId() {