修复bug:进入新公会挑战次数前端不显示
parent
f9679361a2
commit
7e26aa7c17
|
@ -9,6 +9,7 @@ import com.ljsd.jieling.logic.OnlineUserManager;
|
|||
import com.ljsd.jieling.logic.dao.GuildMyInfo;
|
||||
import com.ljsd.jieling.logic.dao.GuilidManager;
|
||||
import com.ljsd.jieling.logic.dao.UserManager;
|
||||
import com.ljsd.jieling.logic.dao.VipInfo;
|
||||
import com.ljsd.jieling.logic.dao.root.GuildInfo;
|
||||
import com.ljsd.jieling.logic.dao.root.User;
|
||||
import com.ljsd.jieling.logic.fight.*;
|
||||
|
@ -37,6 +38,7 @@ import org.springframework.data.redis.core.ZSetOperations;
|
|||
import rpc.protocols.CommonProto;
|
||||
import rpc.protocols.Family;
|
||||
import rpc.protocols.MessageTypeProto;
|
||||
import rpc.protocols.PlayerInfoProto;
|
||||
import util.TimeUtils;
|
||||
|
||||
import java.util.ArrayList;
|
||||
|
@ -385,6 +387,21 @@ public class GuildChallengeLogic {
|
|||
StoreLogic.getInstance().sendStoreUpdateIndication(user.getId(),user.getStoreManager().getStoreInfoMap().get(7));
|
||||
}
|
||||
|
||||
/**
|
||||
* 推送公会副本特权信息
|
||||
* @param user 用户
|
||||
*/
|
||||
public void sendGuildChallengeVipMessage(User user){
|
||||
PlayerInfoProto.PrivilegeIndication.Builder indication = PlayerInfoProto.PrivilegeIndication.newBuilder();
|
||||
VipInfo vipInfo = user.getPlayerInfoManager().getVipInfo().get(3011);
|
||||
indication.addInfos(CommonProto.Privilege.newBuilder().setId(3011).setUsedTimes(vipInfo.getCount()).setEffectTime(vipInfo.getEffectTime()).build());
|
||||
VipInfo vipInfo2 = user.getPlayerInfoManager().getVipInfo().get(3012);
|
||||
indication.addInfos(CommonProto.Privilege.newBuilder().setId(3012).setUsedTimes(vipInfo2.getCount()).setEffectTime(vipInfo2.getEffectTime()).build());
|
||||
ISession session = OnlineUserManager.getSessionByUid(user.getId());
|
||||
MessageUtil.sendIndicationMessage(session, 1, MessageTypeProto.MessageType.PRIVILLEGE_ADD_INDICATION_VALUE, indication.build(), true);
|
||||
StoreLogic.getInstance().sendStoreUpdateIndication(user.getId(),user.getStoreManager().getStoreInfoMap().get(7));
|
||||
}
|
||||
|
||||
/**
|
||||
* 购买buff
|
||||
*/
|
||||
|
|
|
@ -383,6 +383,8 @@ public class GuildLogic {
|
|||
Family.FamilyJoinResponse response = Family.FamilyJoinResponse.newBuilder().setFamilyJoinIndicaion(build).build();
|
||||
CrossServiceLogic.getInstance().saveBasicPlayerToRedis(user);//加入公会
|
||||
MessageUtil.sendMessage(session,1,msgId,response,true);
|
||||
// 推送特权
|
||||
GuildChallengeLogic.getInstance().sendGuildChallengeVipMessage(user);
|
||||
}
|
||||
|
||||
|
||||
|
@ -1239,7 +1241,7 @@ public class GuildLogic {
|
|||
|
||||
public static void sendWelfareRedPacketInfoIndication(User user){
|
||||
Map<Integer,Integer> redPacketsMap = user.getPlayerInfoManager().getWelfareRedPackets();
|
||||
if(redPacketsMap.size() == 0){//初始化
|
||||
if(redPacketsMap.isEmpty()){//初始化
|
||||
initWelfareRedPacketInfo(user);
|
||||
}
|
||||
PlayerInfoProto.WelfareRedPacketPush.Builder build = PlayerInfoProto.WelfareRedPacketPush.newBuilder();
|
||||
|
@ -1596,7 +1598,7 @@ public class GuildLogic {
|
|||
list.add(drop);
|
||||
guildMyInfo.putGuidHelpHadTakeInfo(entry.getKey(),entry.getValue());
|
||||
}
|
||||
if(list.size()==0){
|
||||
if(list.isEmpty()){
|
||||
return;
|
||||
}
|
||||
|
||||
|
@ -1682,7 +1684,7 @@ public class GuildLogic {
|
|||
@SuppressWarnings("SuspiciousMethodCalls")
|
||||
private static void exploreActivity(User user, GuildInfo guildInfo){
|
||||
Set<Integer> openActivityIdsByType = ActivityLogic.getInstance().getOpenActivityIdsByType(user, ActivityTypeEnum.EXPLORE_EXPECT_ACTIVITY.getType(), false);
|
||||
if(openActivityIdsByType.size()!= 0){
|
||||
if(!openActivityIdsByType.isEmpty()){
|
||||
ActivityMission activityMission = user.getActivityManager().getActivityMissionMap().get(openActivityIdsByType.toArray()[0]);
|
||||
if(guildInfo!=null){
|
||||
activityMission.setV(0);
|
||||
|
|
Loading…
Reference in New Issue