Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
commit
0c8b8e5f71
|
@ -56,4 +56,15 @@ public class ExpeditionExpert extends ExpectRankActivity implements IEventHandle
|
|||
super(id);
|
||||
Poster.getPoster().listenEvent(this,EndExpeditionNodeEvent.class);
|
||||
}
|
||||
@Override
|
||||
boolean checkValue(ISession session, SActivityRewardConfig sActivityRewardConfig, ActivityProgressInfo activityProgressInfo) throws Exception {
|
||||
int[][] values = sActivityRewardConfig.getValues();
|
||||
User user = UserManager.getUser(session.getUid());
|
||||
Map<Integer, ActivityProgressInfo> value = user.getActivityManager().getActivityMissionMap().get(sActivityRewardConfig.getActivityId()).getActivityMissionMap();
|
||||
if (value.containsKey(sActivityRewardConfig.getId())&& value.get(sActivityRewardConfig.getId()).getProgrss()< values[1][0]) {
|
||||
// MessageUtil.sendErrorResponse(session, 0, rewardResponseValue, "time not");
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -64,6 +64,8 @@ public class GuildInfo extends MongoBase {
|
|||
private int nextChallengeMessageTime;
|
||||
private int guildSheJiScore;
|
||||
|
||||
private List<Integer> historyMember = new ArrayList<>();
|
||||
|
||||
public GuildInfo() {
|
||||
setRootCollection(_COLLECTION_NAME);
|
||||
}
|
||||
|
@ -332,4 +334,12 @@ public class GuildInfo extends MongoBase {
|
|||
updateString("guildSheJiScore",guildSheJiScore);
|
||||
this.guildSheJiScore = guildSheJiScore;
|
||||
}
|
||||
|
||||
public List<Integer> getHistoryMember() {
|
||||
return historyMember;
|
||||
}
|
||||
|
||||
public void updateHistoryMember() {
|
||||
updateString("historyMember",historyMember);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1717,6 +1717,12 @@ public class GuildLogic {
|
|||
User user = UserManager.getUser(id);
|
||||
if(user == null)
|
||||
continue;
|
||||
if(guildInfo.getHistoryMember().contains(user.getId())){
|
||||
return;
|
||||
}else{
|
||||
guildInfo.getHistoryMember().add(user.getId());
|
||||
guildInfo.updateHistoryMember();
|
||||
}
|
||||
Poster.getPoster().dispatchEvent(new WelfareRedPackEvent(user.getId(), WelfareRedPacketType.newfish_come.getType(),0));
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue