Merge branch 'cn/develop' into cn/player

熊润斐
2 parents 5e88c3c0 7fe1158c
Showing 2 changed files with 8 additions and 8 deletions Show diff stats
src/actions/GmAction.lua
src/csvdata
@@ -1029,9 +1029,9 @@ end
 table.insert(helpDes, {"清讨伐电台", "clear_radio", "id"})
 function _M.clear_radio(role, pms)
-	local id = pms.pm1
+	local id = tonumber(pms.pm1)
 	local radioTask = role:getProperty("radioTask")
-    if id == 0 then
+    if id ~= 0 then
         radioTask[id] = nil
     else
         radioTask = {}
@@ -1044,9 +1044,9 @@ end
 table.insert(helpDes, {"清代理拾荒", "clear_adv_hang", "id"})
 function _M.clear_adv_hang(role, pms)
-	local id = pms.pm1
+	local id = tonumber(pms.pm1)
 	local task = role:getProperty("advHang")
-    if id == 0 then
+    if id ~= 0 then
         task[id] = nil
     else
         task = {}
@@ -1058,10 +1058,10 @@ function _M.clear_adv_hang(role, pms)
 end
 table.insert(helpDes, {"清海港贸易", "clear_sea", "id"})
-function _M.clear_radio(role, pms)
-	local id = pms.pm1
+function _M.clear_sea(role, pms)
+	local id = tonumber(pms.pm1)
 	local task = role:getProperty("seaport")
-    if id == 0 then
+    if id ~= 0 then
         task.collect[id] = nil
     else
         task.collect = {}
-Subproject commit 7e360667871839f748175e801bbb1ff39ba802ac
+Subproject commit 8f6460b1bc144989ece2f2caaf5c225ae434ac38