Merge branch 'master' of 60.1.1.230:backend/jieling_server
commit
f7f54df716
|
@ -311,6 +311,7 @@ public class GuildFightLogic {
|
||||||
.setName(enemyInfo.getName())
|
.setName(enemyInfo.getName())
|
||||||
.setPictureId(1)
|
.setPictureId(1)
|
||||||
.setTotalStar(redisUtil.getMapEntry(RedisKey.FAMILY_FIGHT_TOTAL_STAR,"",String.valueOf(enemyFamily),Integer.class))
|
.setTotalStar(redisUtil.getMapEntry(RedisKey.FAMILY_FIGHT_TOTAL_STAR,"",String.valueOf(enemyFamily),Integer.class))
|
||||||
|
.setMyTotalStar(redisUtil.getMapEntry(RedisKey.FAMILY_FIGHT_TOTAL_STAR,"",String.valueOf(guildInfo.getId()),Integer.class))
|
||||||
.build();
|
.build();
|
||||||
GuildLogic.sendIndicationToMember(guildInfo, MessageTypeProto.MessageType.FAMILY_FIGHT_MATCHING_SUCCESS_INDICATION, familyInfo);
|
GuildLogic.sendIndicationToMember(guildInfo, MessageTypeProto.MessageType.FAMILY_FIGHT_MATCHING_SUCCESS_INDICATION, familyInfo);
|
||||||
}
|
}
|
||||||
|
@ -501,7 +502,14 @@ public class GuildFightLogic {
|
||||||
.setJoinType(1);
|
.setJoinType(1);
|
||||||
if (enemyFamily != -1) {
|
if (enemyFamily != -1) {
|
||||||
GuildInfo guildInfo = GuilidManager.guildInfoMap.get(enemyFamily);
|
GuildInfo guildInfo = GuilidManager.guildInfoMap.get(enemyFamily);
|
||||||
Family.EnemyFamily familyInfo = Family.EnemyFamily.newBuilder().setId(guildInfo.getId()).setLevel(guildInfo.getLevel()).setName(guildInfo.getName()).setPictureId(1).build();
|
Family.EnemyFamily familyInfo = Family.EnemyFamily.newBuilder()
|
||||||
|
.setId(guildInfo.getId())
|
||||||
|
.setLevel(guildInfo.getLevel())
|
||||||
|
.setName(guildInfo.getName())
|
||||||
|
.setPictureId(1)
|
||||||
|
.setTotalStar(redisUtil.getMapEntry(RedisKey.FAMILY_FIGHT_TOTAL_STAR,"",String.valueOf(enemyFamily),Integer.class))
|
||||||
|
.setMyTotalStar(redisUtil.getMapEntry(RedisKey.FAMILY_FIGHT_TOTAL_STAR,"",String.valueOf(guildInfo.getId()),Integer.class))
|
||||||
|
.build();
|
||||||
response.setEnemy(familyInfo);
|
response.setEnemy(familyInfo);
|
||||||
}else{
|
}else{
|
||||||
if(status!=0&&status!=1){
|
if(status!=0&&status!=1){
|
||||||
|
|
Loading…
Reference in New Issue