Browse Source

异界之战修改

gitxsm 5 months ago
parent
commit
9d0cf588ce

+ 1 - 1
script/common/Lang.lua

@@ -829,7 +829,7 @@ AB_UNION_NOT_TOPTWO = [[公会排名前二才能参加]]
 AB_NOT_TOPTWO_MANAGER = [[会长/副会长才能报名]]
 
 
-AB_CANNOT_OPERATION = [[参加了异界之战, 不能进行该操作]]
+AB_CANNOT_OPERATION = [[异界之战活动中,不能进行公会成员变化操作]]
 AB_NOT_OPEN_TIME = [[不在开启阶段]]
 AB_NOT_BATTLE_TIME = [[不在战斗阶段]]
 AB_UNION_NUM_EXCEED = [[参加公会数量超出]]

+ 6 - 6
script/module/anotherWorldBattle/AnotherWorldBattleCS.lua

@@ -701,6 +701,12 @@ function N2C_Get_State(msg)
         end
     end
 
+    local sourceServerId = msg.sourceServerId
+    local num = calcSvrUnionJoinNum(sourceServerId)
+    if num >= AnotherWorldBattleDefine.AB_SRV_UNION_MAX_NUM then
+        msgData.joinState = 2
+    end
+
     local joinUnionArr = AnotherWorldBattleDB.GetJoinUnionArr()
     for _, unionData in ipairs(joinUnionArr or {}) do
         if unionData.unionId == msg.myUnionId then
@@ -708,12 +714,6 @@ function N2C_Get_State(msg)
         end
     end
 
-    local sourceServerId = msg.sourceServerId
-    local num = calcSvrUnionJoinNum(sourceServerId)
-    if num >= AnotherWorldBattleDefine.AB_SRV_UNION_MAX_NUM then
-        msgData.joinState = 2
-    end
-
     local fd = MiddleManager.getFDBySvrIndex(sourceServerId)
     InnerMsg.sendMsg(fd, msgData)
 end