Merge branch 'cn/develop' of 120.26.43.151:wasteland/server into cn/develop

zhangqijia
2 parents 76f0493d ae0d3358
Showing 4 changed files with 50 additions and 5 deletions Show diff stats
src/actions/GmAction.lua
src/actions/TowerAction.lua
src/csvdata
src/models/RoleTask.lua
@@ -1027,4 +1027,49 @@ function _M.savegenius(role, pms)
 	return "天赋点设置成功"
 end
  
+table.insert(helpDes, {"清讨伐电台", "clear_radio", "id"})
+function _M.clear_radio(role, pms)
+	local id = pms.pm1
+	local radioTask = role:getProperty("radioTask")
+    if id == 0 then
+        radioTask[id] = nil
+    else
+        radioTask = {}
+    end
+
+    role:updateProperty({field = "radioTask", value = radioTask})
+
+	return "成功"
+end
+
+table.insert(helpDes, {"清代理拾荒", "clear_adv_hang", "id"})
+function _M.clear_adv_hang(role, pms)
+	local id = pms.pm1
+	local task = role:getProperty("advHang")
+    if id == 0 then
+        task[id] = nil
+    else
+        task = {}
+    end
+
+    role:updateProperty({field = "advHang", value = task})
+
+	return "成功"
+end
+
+table.insert(helpDes, {"清海港贸易", "clear_sea", "id"})
+function _M.clear_radio(role, pms)
+	local id = pms.pm1
+	local task = role:getProperty("seaport")
+    if id == 0 then
+        task.collect[id] = nil
+    else
+        task.collect = {}
+    end
+
+    role:updateProperty({field = "seaport", value = task})
+
+	return "成功"
+end
+
 return _M
 \ No newline at end of file
@@ -114,9 +114,9 @@ function _M.endBattleRpc(agent, data)
  
 		curLevel = curLevel + 1
 		reward, change = role:award(rewardStr, {log = {desc = "towerBattle", int1 = id}})
-		if towerType == 0 then
-			role:checkTaskEnter("TowerPass", {level = towerInfo.l, type = towerType + 1})
-		end
+		--if towerType == 0 then
+        role:checkTaskEnter("TowerPass", {level = curLevel % 10000, type = towerType + 1})
+		--end
 	end
  
 	if towerType == 0 then
-Subproject commit bd13610bc236a8df4eede66365eb499ecd5b3c45
+Subproject commit 9aff702ee3155b22558066e653585574bc730791
@@ -810,7 +810,7 @@ function RoleTask.bind(Role)
 									calTask[id] = (calTask[id] or 0) + 1
 								end
 							elseif cfg.type == 13 then	-- 挑战电波塔主塔
-								if cfg.condition2 == param1 and param2 == 1 then
+								if cfg.condition2 <= param1 and param2 == 1 then
 									calTask[id] = (calTask[id] or 0) + 1
 								end
 							end