diff --git a/Assets/ManagedResources/~Lua/Modules/GodPrint/GodPrintPopUp.lua b/Assets/ManagedResources/~Lua/Modules/GodPrint/GodPrintPopUp.lua index 25f5a3a755..17e6e91686 100644 --- a/Assets/ManagedResources/~Lua/Modules/GodPrint/GodPrintPopUp.lua +++ b/Assets/ManagedResources/~Lua/Modules/GodPrint/GodPrintPopUp.lua @@ -280,37 +280,59 @@ function GodPrintPopUp:RefreshShow(type) if heroData then local tian={} local di={} + local printList={} for i = 1, #heroData.godPrintList do local id=heroData.godPrintList[i].equipId - if equipConfig[id].SuiteID<=8 and equipConfig[soulId].SuiteID<=8 then - --LogError("equipConfig[id].SuiteID1=="..equipConfig[id].SuiteID1) - table.insert(tian,equipConfig[id].SuiteID1) - elseif equipConfig[id].SuiteID>8 and equipConfig[soulId].SuiteID>8 then - --LogError("equipConfig[id].SuiteID1=="..equipConfig[id].SuiteID1) - table.insert(di,equipConfig[id].SuiteID1) + -- if equipConfig[id].SuiteID<=8 and equipConfig[soulId].SuiteID<=8 then + -- --LogError("equipConfig[id].SuiteID1=="..equipConfig[id].SuiteID1) + -- table.insert(tian,equipConfig[id].SuiteID1) + -- elseif equipConfig[id].SuiteID>8 and equipConfig[soulId].SuiteID>8 then + -- --LogError("equipConfig[id].SuiteID1=="..equipConfig[id].SuiteID1) + -- table.insert(di,equipConfig[id].SuiteID1) + -- end + if equipConfig[id].ShenYinType==equipConfig[soulId].ShenYinType then + if printList[equipConfig[id].ShenYinType] then + printList[equipConfig[id].ShenYinType][1]=printList[equipConfig[id].ShenYinType][1]+1 + if equipConfig[id].SuiteID1 < printList[equipConfig[id].ShenYinType][2] then + printList[equipConfig[id].ShenYinType][2]=equipConfig[id].SuiteID1 + end + else + printList[equipConfig[id].ShenYinType]={} + printList[equipConfig[id].ShenYinType][1]=1 + printList[equipConfig[id].ShenYinType][2]=equipConfig[id].SuiteID1 + end end + end + for key, value in pairs(printList) do + LogError("key====="..key.." value=="..value[1].." id=="..value[2]) + if value[1] == 4 then + isEnough=true + suiteId=value[2] + LogError("1111111111111111") + end + end --LogError("tian len=="..#tian) -- LogError("di len=="..#di) - if equipConfig[soulId].SuiteID<=8 then - if #tian==4 then - isEnough=true - table.sort(tian,function(a,b) - return a