Merge branch 'online_1121' of http://60.1.1.230/backend/jieling_server into online_1121

zhangshanxue 2019-12-08 11:42:04 +08:00
commit dbc049a621
1 changed files with 10 additions and 4 deletions

View File

@ -595,6 +595,7 @@ public class FriendLogic {
takeTimes++;
rewardStr = reward.toString();
}else{
int i=0;
for (Integer friend : friends) {
if (!haveRewardMap.containsKey(friend)) {
continue;
@ -602,9 +603,11 @@ public class FriendLogic {
if (haveRewardMap.containsKey(friend) && haveRewardMap.get(friend) != 1) {
continue;
}
check = playerInfoManager.check(STableManager.getFigureConfig(CommonStaticConfig.class).getGameSetting().getMaxEnergyGet(), 1);
if(!check){
break;
if(i++>0){
check = playerInfoManager.check(STableManager.getFigureConfig(CommonStaticConfig.class).getGameSetting().getMaxEnergyGet(), 1);
if(!check){
break;
}
}
playerInfoManager.updateVipPrivilage(STableManager.getFigureConfig(CommonStaticConfig.class).getGameSetting().getMaxEnergyGet(),1);
friendManager.updateHaveRewardMap(friend,2);
@ -612,7 +615,10 @@ public class FriendLogic {
receieveFriends.add(friend);
takeTimes++;
}
rewardStr = reward.toString().substring(0,reward.toString().length()-1);
if(reward.length()!=0){
rewardStr = reward.toString().substring(0,reward.toString().length()-1);
}
}
if (StringUtil.isEmpty(rewardStr)){