同步360test分支修改

script/module/zhuanpan/ZhuanpanLogic.lua

@@ -1522,7 +1522,13 @@ local TB_DESKTOP_REWARD      = {{118, 5}}     -- 添加桌面奖励（仅1次）
 
 -- 渠道校验：仅 hanman.pf == "tbminiapp" 的玩家可参与
 local function isTbMiniApp(human)
+<<<<<<< HEAD
 	return human.pf == "tbminiapp"
+=======
+	-- return human.pf_info and human.pf_info.pf == "tbminiapp"
+
+	return human.pf_info and human.pf_info.pf == "tbMiniGame"
+>>>>>>> origin/360test
 end
 
 -- 淘宝小程序桌面活动查询