Merge branch 'master_test_gn' into master_test_gn_zf
commit
b6bc55bf4e
|
@ -66,6 +66,7 @@ public enum FunctionIdEnum {
|
|||
Pokemon(79,null,MessageTypeProto.MessageType.POKEMON_COMONPENT_LEVELUP_REQUEST_VALUE,MessageTypeProto.MessageType.POKEMON_ADVANCED_REQUEST_VALUE),
|
||||
World_Arena(82,new WorldArenaFunction()),
|
||||
HongMeng(86,null),
|
||||
WeekGood(9091,null),
|
||||
;
|
||||
|
||||
private int functionType;
|
||||
|
|
|
@ -4,18 +4,19 @@ import com.ljsd.jieling.handler.BaseHandler;
|
|||
import com.ljsd.jieling.logic.family.GuildLogic;
|
||||
import com.ljsd.jieling.netty.cocdex.PacketNetData;
|
||||
import com.ljsd.jieling.network.session.ISession;
|
||||
import rpc.protocols.Family;
|
||||
import rpc.protocols.MessageTypeProto;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
@Component
|
||||
public class FamilyRecommandHandler extends BaseHandler {
|
||||
public class FamilyRecommandHandler extends BaseHandler<Family.FamilyRecommandRequest> {
|
||||
@Override
|
||||
public MessageTypeProto.MessageType getMessageCode() {
|
||||
return MessageTypeProto.MessageType.FAMILY_RECOMEND_REQUEST;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void process(ISession iSession, PacketNetData netData) throws Exception {
|
||||
GuildLogic.recommendFamily(iSession);
|
||||
public void processWithProto(ISession session, Family.FamilyRecommandRequest proto) throws Exception {
|
||||
GuildLogic.recommendFamily(session,proto);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -197,7 +197,9 @@ public class StartHardStageRequestHandler extends BaseHandler<PlayerInfoProto.Ha
|
|||
}
|
||||
}
|
||||
//参与奖励
|
||||
user.getUserMissionManager().onGameEvent(user, GameEvent.HARSTAGE_PARTICIPATION_REWARD,1);
|
||||
if(nodeConfig.getStageType()!= 2){
|
||||
user.getUserMissionManager().onGameEvent(user, GameEvent.HARSTAGE_PARTICIPATION_REWARD,1);
|
||||
}
|
||||
//排行榜章节
|
||||
int hardStageId = SHardStage.getStageIdByChapterAndSection(user.getHardStageManager().getCurChapter(), user.getHardStageManager().getCurNode());
|
||||
Poster.getPoster().dispatchEvent(new ShanHeSheJiTuStarEvent(iSession.getUid(), 1, hardStageId));
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
package com.ljsd.jieling.logic.family;
|
||||
|
||||
import com.google.common.collect.Lists;
|
||||
import com.google.protobuf.GeneratedMessage;
|
||||
import com.google.protobuf.Message;
|
||||
import com.ljsd.GameApplication;
|
||||
|
@ -235,10 +236,10 @@ public class GuildLogic {
|
|||
* @param session
|
||||
* @throws Exception
|
||||
*/
|
||||
public static void recommendFamily(ISession session) throws Exception {
|
||||
public static void recommendFamily(ISession session,Family.FamilyRecommandRequest proto) throws Exception {
|
||||
int uid = session.getUid();
|
||||
User user = UserManager.getUser(uid);
|
||||
int msgId = MessageTypeProto.MessageType.FAMILY_RECOMEND_RESPONSE_VALUE;
|
||||
|
||||
Collection<GuildInfo> guildInfos = GuilidManager.recommandGuild(user);
|
||||
Family.FamilyRecommandResponse.Builder builder = Family.FamilyRecommandResponse.newBuilder();
|
||||
Map<Integer, GuildApply> applyGuildInfos = GuilidManager.getApplyGuildInfos(uid, 1);
|
||||
|
@ -255,18 +256,20 @@ public class GuildLogic {
|
|||
|
||||
}
|
||||
}
|
||||
//工会临时改成推荐20个 下个版本改成分页
|
||||
int i = 0;
|
||||
for(GuildInfo guildInfo : guildInfos){
|
||||
if(i >= 20){
|
||||
break;
|
||||
|
||||
int page = proto.getPage();
|
||||
List<List<GuildInfo>> partition = Lists.partition(new ArrayList<>(guildInfos), 10);
|
||||
// 防止超出下标
|
||||
if (page <= partition.size()){
|
||||
for(GuildInfo guildInfo : partition.get(page-1)){
|
||||
builder.addFamilyRecomandInfo(Family.FamilyRecomandInfo.newBuilder().
|
||||
setFamilyBaseInfo(CBean2Proto.getFamilyBaseInfo(guildInfo))
|
||||
.setIsApply(applyGuildInfos.containsKey(guildInfo.getId())?1:0)
|
||||
.build());
|
||||
}
|
||||
builder.addFamilyRecomandInfo(Family.FamilyRecomandInfo.newBuilder().
|
||||
setFamilyBaseInfo(CBean2Proto.getFamilyBaseInfo(guildInfo))
|
||||
.setIsApply(applyGuildInfos.containsKey(guildInfo.getId())?1:0)
|
||||
.build());
|
||||
i++;
|
||||
}
|
||||
// 返回信息
|
||||
int msgId = MessageTypeProto.MessageType.FAMILY_RECOMEND_RESPONSE_VALUE;
|
||||
MessageUtil.sendMessage(session,1,msgId,builder.build(),true);
|
||||
}
|
||||
|
||||
|
|
|
@ -939,6 +939,7 @@ public class ItemLogic {
|
|||
throw new ErrorCodeException(ErrorCode.ITEM_NOT_ENOUGH);
|
||||
}
|
||||
progress.setProgrss(progress.getProgrss()-1);
|
||||
user.getActivityManager().getActivityMissionMap().put(activityId,misson);
|
||||
CommonProto.Drop.Builder drop = ItemUtil.drop(user,new int[][]{{config.getGoalItems()[0][0],config.getGoalItems()[0][1]}},BIReason.EQUIP_UPLEVEL_REWARD);
|
||||
response.setResult(true);
|
||||
response.setDrop(drop);
|
||||
|
|
|
@ -76,24 +76,12 @@ public class CrossArenaRank extends AbstractRank {
|
|||
builder.addRanks(everyRank);
|
||||
}else{
|
||||
ArenaOfUser query = CrossServiceLogic.getInstance().query(Integer.valueOf(data.getValue()));
|
||||
String serverName = CrossDeathPathLogic.getInstance().getServerNameByDeathPath(query.getPlayerManager().getServerId());
|
||||
CommonProto.RankInfo.Builder everyRankInfo = CommonProto.RankInfo.newBuilder()
|
||||
.setRank(index)
|
||||
.setParam1(query.getHeroManager().getTotalForce())
|
||||
.setParam2(getParam2(data.getScore()))
|
||||
.setParam3(getParam3(data.getScore()));
|
||||
CommonProto.UserRank.Builder everyRank = CommonProto.UserRank.newBuilder()
|
||||
.setUid(query.getId())
|
||||
.setUserName(query.getPlayerManager().getName())
|
||||
.setLevel(query.getPlayerManager().getLevel())
|
||||
.setUserTitle(query.getPlayerManager().getUserTitle())
|
||||
.setUserSkin(80012)
|
||||
.setUserMount(query.getPlayerManager().getUserMount())
|
||||
.setRankInfo(everyRankInfo)
|
||||
.setForce(query.getHeroManager().getTotalForce())
|
||||
.setPracticeLevel(query.getPlayerManager().getPracticeLevel())
|
||||
.setServerName(serverName)
|
||||
.setSex(0);
|
||||
CommonProto.UserRank.Builder everyRank = getCrossOneUserRank(query,everyRankInfo);
|
||||
builder.addRanks(everyRank);
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue