Merge branch 'cn/develop' into cn/publish/preview

jiyue
2 parents 24dbed0f 27acaa11
Showing 1 changed file with 1 additions and 1 deletions Show diff stats
src/actions/RadioAction.lua
@@ -137,7 +137,7 @@ function _M.startQuestRpc(agent, data)
  
     else
         --活动 同时只能有一个存在
-        if actids[config.activity_ctrl_id] >= 1 then
+        if (actids[config.activity_ctrl_id] or 0) >= 1 then
             return 5
         end
     end