Merge branch 'online1.0'
commit
cf00d2c7de
|
|
@ -22,7 +22,7 @@ public class DunBehavior extends BaseBehavior {
|
|||
|
||||
@Override
|
||||
public boolean process(int optionId, User user, int[][] behaviorTypeValues, MapInfoProto.EventUpdateResponse.Builder eventUpdateResponse) throws Exception {
|
||||
int[] behaviorTypeValue = behaviorTypeValues[0];
|
||||
/* int[] behaviorTypeValue = behaviorTypeValues[0];
|
||||
int randomANums = behaviorTypeValue[0];
|
||||
int randomBNums = behaviorTypeValue[1];
|
||||
if(randomANums!=0 || randomBNums!=0){
|
||||
|
|
@ -39,6 +39,7 @@ public class DunBehavior extends BaseBehavior {
|
|||
BehaviorUtil.addBehaviorInfo(eventId,user.getMapManager(),pos);
|
||||
}
|
||||
}
|
||||
return true;
|
||||
return true;*/
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -265,10 +265,10 @@ public class CBean2Proto {
|
|||
if (friendManager != null){
|
||||
Map<Integer, Integer> giveMap =friendManager.getGiveMap();
|
||||
Map<Integer, Integer> haveRewardMap = friendManager.getHaveRewardMap();
|
||||
if (giveMap.size() != 0){
|
||||
if (giveMap.size() != 0 && giveMap.containsKey(friendId)){
|
||||
isGrive = giveMap.get(friendId);
|
||||
}
|
||||
if (haveRewardMap.size() != 0){
|
||||
if (haveRewardMap.size() != 0 && giveMap.containsKey(friendId)){
|
||||
haveReward = haveRewardMap.get(friendId) ==2?0:haveRewardMap.get(friendId);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue