Merge branch 'master_test_gn' into master_prb_gn

back_recharge
xuexinpeng 2022-05-09 18:05:02 +08:00
commit 357a955689
6 changed files with 23 additions and 12 deletions

View File

@ -469,7 +469,7 @@ public class GMRequestHandler extends BaseHandler{
//通关山河社稷图特定关卡的之前所有关卡 //通关山河社稷图特定关卡的之前所有关卡
int id = prarm1; int id = prarm1;
HardStageLogic.test(cUser,id); HardStageLogic.test(cUser,id);
HardStageLogic.sendHardStageIndication(cUser); HardStageLogic.sendHardStageIndication(cUser,1);
break; break;
case GlobalGm.FOUR_SPIRITS: case GlobalGm.FOUR_SPIRITS:
//四灵试炼跳关 //四灵试炼跳关

View File

@ -3,6 +3,7 @@ package com.ljsd.jieling.handler.hardStage;
import com.ljsd.jieling.handler.BaseHandler; import com.ljsd.jieling.handler.BaseHandler;
import com.ljsd.jieling.logic.dao.UserManager; import com.ljsd.jieling.logic.dao.UserManager;
import com.ljsd.jieling.logic.dao.root.User; import com.ljsd.jieling.logic.dao.root.User;
import com.ljsd.jieling.logic.hardStage.HardStageChapter;
import com.ljsd.jieling.logic.hardStage.HardStageLogic; import com.ljsd.jieling.logic.hardStage.HardStageLogic;
import com.ljsd.jieling.network.session.ISession; import com.ljsd.jieling.network.session.ISession;
import com.ljsd.jieling.util.MessageUtil; import com.ljsd.jieling.util.MessageUtil;
@ -11,6 +12,9 @@ import rpc.protocols.CommonProto;
import rpc.protocols.MessageTypeProto; import rpc.protocols.MessageTypeProto;
import rpc.protocols.PlayerInfoProto; import rpc.protocols.PlayerInfoProto;
import java.util.Comparator;
import java.util.Map;
@Component @Component
public class HardStageInfoRequestHandler extends BaseHandler<PlayerInfoProto.HardStageRequest> { public class HardStageInfoRequestHandler extends BaseHandler<PlayerInfoProto.HardStageRequest> {
@ -21,11 +25,16 @@ public class HardStageInfoRequestHandler extends BaseHandler<PlayerInfoProto.Har
@Override @Override
public void processWithProto(ISession iSession, PlayerInfoProto.HardStageRequest proto) throws Exception { public void processWithProto(ISession iSession, PlayerInfoProto.HardStageRequest proto) throws Exception {
User user = UserManager.getUser(iSession.getUid()); User user = UserManager.getUser(iSession.getUid());
CommonProto.HardStageInfo.Builder info = HardStageLogic.getInfo(user); CommonProto.HardStageInfo.Builder info = HardStageLogic.getInfo(user,proto.getPage());
PlayerInfoProto.HardStageResponse.Builder response = PlayerInfoProto.HardStageResponse.newBuilder(); PlayerInfoProto.HardStageResponse.Builder response = PlayerInfoProto.HardStageResponse.newBuilder();
response.setInfo(info); response.setInfo(info);
response.setIsTake(user.getHardStageManager().isTakeReward()); response.setIsTake(user.getHardStageManager().isTakeReward());
Map<Integer, HardStageChapter> map = user.getHardStageManager().getChapterMap(user);
int maxChapter = map.keySet().stream().max(Comparator.comparing(Integer::intValue)).orElse(0);
int page = maxChapter%10 == 0? maxChapter/10:maxChapter/10+1;
response.setIsEnd(proto.getPage()>=page?1:0);
MessageUtil.sendMessage(iSession, 1, MessageTypeProto.MessageType.HARD_STAGE_INFO_RESPONSE.getNumber(), response.build(), true); MessageUtil.sendMessage(iSession, 1, MessageTypeProto.MessageType.HARD_STAGE_INFO_RESPONSE.getNumber(), response.build(), true);
} }
} }

View File

@ -59,6 +59,7 @@ public class StartHardStageRequestHandler extends BaseHandler<PlayerInfoProto.Ha
CommonProto.Drop.Builder drop = CommonProto.Drop.newBuilder(); CommonProto.Drop.Builder drop = CommonProto.Drop.newBuilder();
List<Integer> dropList = new ArrayList<Integer>(); List<Integer> dropList = new ArrayList<Integer>();
SHardStage nodeConfig = SHardStage.getConfigMap().get(nodeId); SHardStage nodeConfig = SHardStage.getConfigMap().get(nodeId);
int page = nodeConfig.getChapter()%10 == 0? nodeConfig.getChapter()/10:nodeConfig.getChapter()/10+1;
Map<Integer, HardStageChapter> chapterMap = user.getHardStageManager().getChapterMap(user); Map<Integer, HardStageChapter> chapterMap = user.getHardStageManager().getChapterMap(user);
if (!chapterMap.containsKey(nodeConfig.getChapter()) ||chapterMap.get(nodeConfig.getChapter()).getNode(nodeId) == null) { if (!chapterMap.containsKey(nodeConfig.getChapter()) ||chapterMap.get(nodeConfig.getChapter()).getNode(nodeId) == null) {
//上一个节点 //上一个节点
@ -244,7 +245,7 @@ public class StartHardStageRequestHandler extends BaseHandler<PlayerInfoProto.Ha
} }
MessageUtil.sendMessage(iSession, 1, MessageTypeProto.MessageType.HARD_STAGE_FIGHT_START_RESPONSE.getNumber(), fightStartResponse.build(), true); MessageUtil.sendMessage(iSession, 1, MessageTypeProto.MessageType.HARD_STAGE_FIGHT_START_RESPONSE.getNumber(), fightStartResponse.build(), true);
//更新消息 //更新消息
HardStageLogic.sendHardStageIndication(user); HardStageLogic.sendHardStageIndication(user,page);
//埋点数据 //埋点数据
ReportUtil.onReportEvent(user, ReportEventEnum.HARD_STAGE.getType(),logType ,logSectionId ,String.valueOf(logResult) ,logStarNum ); ReportUtil.onReportEvent(user, ReportEventEnum.HARD_STAGE.getType(),logType ,logSectionId ,String.valueOf(logResult) ,logStarNum );
} }

View File

@ -55,7 +55,7 @@ public class AiWanPlayerInfoUpload {
return; return;
} }
PlayerManager playerInfoManager = user.getPlayerInfoManager(); PlayerManager playerInfoManager = user.getPlayerInfoManager();
int force = HeroLogic.getInstance().calTeamTotalForce(user, TeamEnum.FORMATION_NORMAL.getTeamId(), false); int force = user.getTeamPosManager().getTeamForceMap().getOrDefault(TeamEnum.FORMATION_NORMAL.getTeamId(),0L).intValue();
int nowInt = TimeUtils.nowInt(); int nowInt = TimeUtils.nowInt();
SortedMap<String, Object> extMap = new TreeMap<>(); SortedMap<String, Object> extMap = new TreeMap<>();
extMap.put("power",force); extMap.put("power",force);

View File

@ -508,7 +508,7 @@ public class GlobalDataManaager implements IManager {
} }
// 山河社稷图 每日奖励领取状态设为false // 山河社稷图 每日奖励领取状态设为false
user.getHardStageManager().setTakeReward(false); user.getHardStageManager().setTakeReward(false);
HardStageLogic.sendHardStageIndication(user); HardStageLogic.sendHardStageIndication(user,1);
//刷新膜拜信息 //刷新膜拜信息
user.getPlayerInfoManager().setProudInfo(new HashSet<>()); user.getPlayerInfoManager().setProudInfo(new HashSet<>());
// 道具刷新 // 道具刷新

View File

@ -45,7 +45,7 @@ public class HardStageLogic {
/** /**
* *
*/ */
public static CommonProto.HardStageInfo.Builder getInfo(User user) throws Exception { public static CommonProto.HardStageInfo.Builder getInfo(User user,int page) throws Exception {
Map<Integer, HardStageChapter> map = user.getHardStageManager().getChapterMap(user); Map<Integer, HardStageChapter> map = user.getHardStageManager().getChapterMap(user);
CommonProto.HardStageInfo.Builder builder = CommonProto.HardStageInfo.newBuilder(); CommonProto.HardStageInfo.Builder builder = CommonProto.HardStageInfo.newBuilder();
int needSaveChapterId = 0; int needSaveChapterId = 0;
@ -73,8 +73,8 @@ public class HardStageLogic {
} }
} }
} }
int start = (page - 1) * 10, end = page * 10 ;
for (Map.Entry<Integer, HardStageChapter> entry : map.entrySet()) { for (Map.Entry<Integer, HardStageChapter> entry : map.entrySet().stream().filter(n->n.getKey()> start&&n.getKey()<=end).collect(Collectors.toList())) {
//章节信息 //章节信息
CommonProto.HardStageChapter.Builder chapterBuilder = CommonProto.HardStageChapter.newBuilder(); CommonProto.HardStageChapter.Builder chapterBuilder = CommonProto.HardStageChapter.newBuilder();
int starNums =0;//章节星星数检测 章节星星总数和所有小节的星星累加的总数 比较 int starNums =0;//章节星星数检测 章节星星总数和所有小节的星星累加的总数 比较
@ -303,7 +303,8 @@ public class HardStageLogic {
} }
} }
sendHardStageIndication(user); //int page = nodeConfig.getChapter()%10 == 0? nodeConfig.getChapter()/10:nodeConfig.getChapter()/10+1;
//sendHardStageIndication(user,page);
return star; return star;
} }
public static void updateChapterAndNodeLevel(User user, SHardStage nodeConfig ){ public static void updateChapterAndNodeLevel(User user, SHardStage nodeConfig ){
@ -352,8 +353,8 @@ public class HardStageLogic {
return false; return false;
} }
public static void sendHardStageIndication(User user) throws Exception { public static void sendHardStageIndication(User user,int page) throws Exception {
CommonProto.HardStageInfo.Builder info = getInfo(user); CommonProto.HardStageInfo.Builder info = getInfo(user,page);
PlayerInfoProto.HardStageResponse.Builder response = PlayerInfoProto.HardStageResponse.newBuilder(); PlayerInfoProto.HardStageResponse.Builder response = PlayerInfoProto.HardStageResponse.newBuilder();
response.setInfo(info); response.setInfo(info);
response.setIsTake(user.getHardStageManager().isTakeReward()); response.setIsTake(user.getHardStageManager().isTakeReward());
@ -393,7 +394,7 @@ public class HardStageLogic {
user.getHardStageManager().setNoOpenId(noOpenId); user.getHardStageManager().setNoOpenId(noOpenId);
needDel.clear(); needDel.clear();
} }
sendHardStageIndication(user); //sendHardStageIndication(user);
} }
/** /**