Merge branch 'master' of http://60.1.1.230/backend/jieling_server
commit
3f1300a0f6
|
@ -258,9 +258,9 @@ public class GuildFightLogic {
|
||||||
//匹配处理
|
//匹配处理
|
||||||
GuildInfo guildInfo = GuilidManager.guildInfoMap.get(gid);
|
GuildInfo guildInfo = GuilidManager.guildInfoMap.get(gid);
|
||||||
//todo 人数限制
|
//todo 人数限制
|
||||||
// if(guildInfo.getDefendInfo().size()<configMap.get(guildInfo.getLevel()).getDefendNum()){
|
if(guildInfo.getDefendInfo().size()<configMap.get(guildInfo.getLevel()).getDefendNum()){
|
||||||
// continue;
|
continue;
|
||||||
// }
|
}
|
||||||
int totalForce = 0;
|
int totalForce = 0;
|
||||||
for(Map.Entry<Integer, Set<Integer>> entry:guildInfo.getMembers().entrySet()){
|
for(Map.Entry<Integer, Set<Integer>> entry:guildInfo.getMembers().entrySet()){
|
||||||
for(Integer uid:entry.getValue()){
|
for(Integer uid:entry.getValue()){
|
||||||
|
|
|
@ -439,6 +439,7 @@ public class CBean2Proto {
|
||||||
.setOutTime(outTime)
|
.setOutTime(outTime)
|
||||||
.setFrame(user.getPlayerInfoManager().getHeadFrame())
|
.setFrame(user.getPlayerInfoManager().getHeadFrame())
|
||||||
.setTime(applyTime)
|
.setTime(applyTime)
|
||||||
|
.setHead(user.getPlayerInfoManager().getHead())
|
||||||
.build();
|
.build();
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue