Merge branch 'master_test_gn' into master_test_gn_arena
commit
12a9fe7d7b
|
@ -16,6 +16,6 @@ public class PlayWithSbHandler extends BaseHandler<ArenaInfoProto.PlayWithSbRequ
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void processWithProto(ISession iSession, ArenaInfoProto.PlayWithSbRequest proto) throws Exception {
|
public void processWithProto(ISession iSession, ArenaInfoProto.PlayWithSbRequest proto) throws Exception {
|
||||||
ArenaLogic.getInstance().playWithSb(iSession,proto.getChallengeUid(),proto.getMyteamId());
|
ArenaLogic.getInstance().playWithSb(iSession,proto.getChallengeUid(),proto.getMyteamId(),proto.getCross());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -626,18 +626,27 @@ public class ArenaLogic {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public void playWithSb(ISession session,int challengeUid,int myteamId) throws Exception {
|
//0为本服 1为跨服
|
||||||
|
public void playWithSb(ISession session,int challengeUid,int myteamId,int cross) throws Exception {
|
||||||
User mine = UserManager.getUser(session.getUid());
|
User mine = UserManager.getUser(session.getUid());
|
||||||
User defUser = UserManager.getUser(challengeUid);
|
|
||||||
if(!defUser.getTeamPosManager().getTeamPosForHero().containsKey(1)){
|
|
||||||
throw new ErrorCodeException(ErrorCode.newDefineCode("对方未设置阵容"));
|
|
||||||
}
|
|
||||||
|
|
||||||
int myforce = HeroLogic.getInstance().calTeamTotalForce(mine, myteamId, false);
|
int myforce = HeroLogic.getInstance().calTeamTotalForce(mine, myteamId, false);
|
||||||
int deforce = HeroLogic.getInstance().calTeamTotalForce(defUser, 1, false);
|
|
||||||
CommonProto.FightTeamInfo fightTeamInfo = BehaviorUtil.getFightTeamInfo(mine,myteamId,true);
|
CommonProto.FightTeamInfo fightTeamInfo = BehaviorUtil.getFightTeamInfo(mine,myteamId,true);
|
||||||
CommonProto.FightTeamInfo deffightTeamInfo = BehaviorUtil.getFightTeamInfo(defUser,1,false);
|
CommonProto.FightTeamInfo deffightTeamInfo = null;
|
||||||
|
int deforce;
|
||||||
|
if(cross==0){
|
||||||
|
User defUser = UserManager.getUser(challengeUid);
|
||||||
|
if(!defUser.getTeamPosManager().getTeamPosForHero().containsKey(1)){
|
||||||
|
throw new ErrorCodeException(ErrorCode.newDefineCode("对方未设置阵容"));
|
||||||
|
}
|
||||||
|
deforce = HeroLogic.getInstance().calTeamTotalForce(defUser, 1, false);
|
||||||
|
deffightTeamInfo= BehaviorUtil.getFightTeamInfo(defUser,1,false);
|
||||||
|
|
||||||
|
}else{
|
||||||
|
//跨服切磋
|
||||||
|
ArenaOfUser user = CrossServiceLogic.getInstance().query(challengeUid);
|
||||||
|
deforce= user.getHeroManager().getTotalForce();
|
||||||
|
deffightTeamInfo = FightUtil.makeCrossPersonData(user);
|
||||||
|
}
|
||||||
if(myforce<deforce){
|
if(myforce<deforce){
|
||||||
deffightTeamInfo = CommonProto.FightTeamInfo.newBuilder().mergeFrom(deffightTeamInfo).setFirstCamp(1).build();
|
deffightTeamInfo = CommonProto.FightTeamInfo.newBuilder().mergeFrom(deffightTeamInfo).setFirstCamp(1).build();
|
||||||
}
|
}
|
||||||
|
|
|
@ -429,7 +429,6 @@ public class GuildLogic {
|
||||||
Integer position = memberEntry.getKey();
|
Integer position = memberEntry.getKey();
|
||||||
Set<Integer> value = memberEntry.getValue();
|
Set<Integer> value = memberEntry.getValue();
|
||||||
for(Integer uidTmp : value){
|
for(Integer uidTmp : value){
|
||||||
LOGGER.info("family有问题的uid:{}",uidTmp);
|
|
||||||
User userTmp = UserManager.getUser(uidTmp);
|
User userTmp = UserManager.getUser(uidTmp);
|
||||||
builder.addFamilyUserInfo(CBean2Proto.getFamilyUserInfo(userTmp,position));
|
builder.addFamilyUserInfo(CBean2Proto.getFamilyUserInfo(userTmp,position));
|
||||||
}
|
}
|
||||||
|
|
|
@ -76,7 +76,6 @@ public class FriendLogic {
|
||||||
List<Integer> friends = friendManager.getFriends();
|
List<Integer> friends = friendManager.getFriends();
|
||||||
List<CommonProto.Friend> friendList = new CopyOnWriteArrayList<>();
|
List<CommonProto.Friend> friendList = new CopyOnWriteArrayList<>();
|
||||||
for (Integer friendId :friends){
|
for (Integer friendId :friends){
|
||||||
LOGGER.info("有问题的Uid:{}",friendId);
|
|
||||||
CommonProto.Friend friend = CBean2Proto.getFriendInfo(friendId,friendManager);
|
CommonProto.Friend friend = CBean2Proto.getFriendInfo(friendId,friendManager);
|
||||||
friendList.add(friend);
|
friendList.add(friend);
|
||||||
}
|
}
|
||||||
|
|
|
@ -213,6 +213,9 @@ public class MissionLoigc {
|
||||||
int jadeMissionType = GameMisionType.JADE_DYNASTY_MISSION.getType();
|
int jadeMissionType = GameMisionType.JADE_DYNASTY_MISSION.getType();
|
||||||
for(Integer id:jadeDynastyMissionType.getDoingMissionIds()){
|
for(Integer id:jadeDynastyMissionType.getDoingMissionIds()){
|
||||||
SThemeActivityTaskConfig config = SThemeActivityTaskConfig.idTaskConfig.get(id);
|
SThemeActivityTaskConfig config = SThemeActivityTaskConfig.idTaskConfig.get(id);
|
||||||
|
if(config==null){
|
||||||
|
continue;
|
||||||
|
}
|
||||||
int progress = config.getTaskValue()[1][0];
|
int progress = config.getTaskValue()[1][0];
|
||||||
switch (config.getType()){
|
switch (config.getType()){
|
||||||
case 1:
|
case 1:
|
||||||
|
|
|
@ -140,7 +140,6 @@ public abstract class AbstractRank implements IRank {
|
||||||
}
|
}
|
||||||
|
|
||||||
protected void getOptional(int index,ZSetOperations.TypedTuple<String> data,PlayerInfoProto.RankResponse.Builder builder) throws Exception {
|
protected void getOptional(int index,ZSetOperations.TypedTuple<String> data,PlayerInfoProto.RankResponse.Builder builder) throws Exception {
|
||||||
LOGGER.info("获取排行榜信息===================玩家id:{}"+data.getValue());
|
|
||||||
User everyUser = UserManager.getUser(Integer.parseInt(data.getValue()), true);
|
User everyUser = UserManager.getUser(Integer.parseInt(data.getValue()), true);
|
||||||
if (everyUser == null){
|
if (everyUser == null){
|
||||||
return;
|
return;
|
||||||
|
|
Loading…
Reference in New Issue