diff --git a/Assets/ManagedResources/~Lua/Modules/Expert/PatFaceManager.lua b/Assets/ManagedResources/~Lua/Modules/Expert/PatFaceManager.lua index b2d4e1ee19..7a44e9bd24 100644 --- a/Assets/ManagedResources/~Lua/Modules/Expert/PatFaceManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Expert/PatFaceManager.lua @@ -67,14 +67,23 @@ function this.GetFrontPatFaceAllDataTabs() end --检测所有拍脸 function this.GetPatFaceAllDataTabs() + local curAllDatas = {} local backData = this.GetBackPatFaceDaqta() + -- LogGreen("backData "..#backData) local FrontData = this.GetFrontPatFaceAllDataTabs() - if FrontData and #FrontData > 0 then - for i = 1, #FrontData do - table.insert(backData,FrontData[i]) + -- LogGreen("FrontData "..#FrontData) + if backData and #backData > 0 then + for i = 1, #backData do + table.insert(curAllDatas,backData[i]) end end - return backData + if FrontData and #FrontData > 0 then + for i = 1, #FrontData do + table.insert(curAllDatas,FrontData[i]) + end + end + -- LogGreen("curAllDatas "..#curAllDatas) + return curAllDatas end function this.PatFaceSpecialMonitorOpenRules(v,patFaceAllData,type,starUpGiftNum) --1等级 2关卡 3特劝等级 4功能开启时 5活动开启时 6公会战状态 7条件触发(事件)