|
|
@@ -441,10 +441,12 @@ function dismissUnion(human)
|
|
|
if union.curCnt > 1 then
|
|
|
return Broadcast.sendErr(human, Lang.UNION_HAS_MEMBER)
|
|
|
end
|
|
|
- local warState = UnionWarLogic.getState()
|
|
|
- if warState > UnionWarLogic.STATE1 then -- 公会战期间
|
|
|
- return Broadcast.sendErr(human, Lang.UNION_IS_WARRING)
|
|
|
- end
|
|
|
+
|
|
|
+ -- 当前公会战功能未开放, 直接屏蔽,后续开启公会战时再处理
|
|
|
+ -- local warState = UnionWarLogic.getState()
|
|
|
+ -- if warState > UnionWarLogic.STATE1 then -- 公会战期间
|
|
|
+ -- return Broadcast.sendErr(human, Lang.UNION_IS_WARRING)
|
|
|
+ -- end
|
|
|
|
|
|
UnionDBLogic.delUnion(union._id)
|
|
|
onLeaveUnion(union._id, human.db._id, nil, MailDefine.MAIL_ID_UNION_DISMISS)
|