parent
abc5909014
commit
d69827a119
|
|
@ -262,6 +262,7 @@ function this.GetBaoKuData()
|
||||||
local curFinalPool = 0
|
local curFinalPool = 0
|
||||||
|
|
||||||
local ActInfo = ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.YiJingBaoKu)--活动数据
|
local ActInfo = ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.YiJingBaoKu)--活动数据
|
||||||
|
LogError("ActInfo.activityId=="..ActInfo.activityId)
|
||||||
local BlessingConfigNew = ConfigManager.GetConfigDataByKey(ConfigName.BlessingConfigNew,"ActivityId",ActInfo.activityId)
|
local BlessingConfigNew = ConfigManager.GetConfigDataByKey(ConfigName.BlessingConfigNew,"ActivityId",ActInfo.activityId)
|
||||||
local RewardAllConfig = ConfigManager.GetConfig(ConfigName.BlessingRewardPoolNew)
|
local RewardAllConfig = ConfigManager.GetConfig(ConfigName.BlessingRewardPoolNew)
|
||||||
--领取过的35条数据
|
--领取过的35条数据
|
||||||
|
|
@ -289,6 +290,7 @@ function this.GetBaoKuData()
|
||||||
local v = ActInfo.mission[i]
|
local v = ActInfo.mission[i]
|
||||||
if v.missionId == 100 then
|
if v.missionId == 100 then
|
||||||
actData.curLevel = v.progress
|
actData.curLevel = v.progress
|
||||||
|
LogError("v.progress=="..v.progress)
|
||||||
curBasicPool = tonumber(BasicPoolId[v.progress])
|
curBasicPool = tonumber(BasicPoolId[v.progress])
|
||||||
actData.poolId = curBasicPool
|
actData.poolId = curBasicPool
|
||||||
curFinalPool = BlessingConfigNew.FinalPoolId
|
curFinalPool = BlessingConfigNew.FinalPoolId
|
||||||
|
|
@ -302,6 +304,7 @@ function this.GetBaoKuData()
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
LogError("curBasicPool=="..curBasicPool)
|
||||||
--初始的坑的35条数据
|
--初始的坑的35条数据
|
||||||
local RewardConfig = ConfigManager.GetAllConfigsDataByKey(ConfigName.BlessingRewardPoolNew,"PoolId",curBasicPool)
|
local RewardConfig = ConfigManager.GetAllConfigsDataByKey(ConfigName.BlessingRewardPoolNew,"PoolId",curBasicPool)
|
||||||
local index = 1
|
local index = 1
|
||||||
|
|
@ -913,12 +916,13 @@ end
|
||||||
|
|
||||||
--寻宝迷踪红点检测
|
--寻宝迷踪红点检测
|
||||||
function this.XunBaoMiZongRedCheck()
|
function this.XunBaoMiZongRedCheck()
|
||||||
|
|
||||||
|
local actData = CommonActPageManager.GetData(ActivityTypeDef.XunBaoMiZong)
|
||||||
|
if not actData then return false end
|
||||||
local state=PlayerPrefs.GetInt(PlayerManager.uid.."XunBaoMiZong_zqbg")
|
local state=PlayerPrefs.GetInt(PlayerManager.uid.."XunBaoMiZong_zqbg")
|
||||||
if state==0 then
|
if state==0 then
|
||||||
return true
|
return true
|
||||||
end
|
end
|
||||||
local actData = CommonActPageManager.GetData(ActivityTypeDef.XunBaoMiZong)
|
|
||||||
if not actData then return false end
|
|
||||||
local configData = ConfigManager.GetConfigDataByKey(ConfigName.LotterySetting,"ActivityId",actData.activityId)
|
local configData = ConfigManager.GetConfigDataByKey(ConfigName.LotterySetting,"ActivityId",actData.activityId)
|
||||||
local itemNum = configData.CostItem[1]
|
local itemNum = configData.CostItem[1]
|
||||||
if BagManager.GetTotalItemNum(itemNum[1]) >= itemNum[2] then
|
if BagManager.GetTotalItemNum(itemNum[1]) >= itemNum[2] then
|
||||||
|
|
|
||||||
|
|
@ -821,30 +821,48 @@ end
|
||||||
|
|
||||||
--红点检测(云游商人)
|
--红点检测(云游商人)
|
||||||
function this.CheckSingleRed(data)
|
function this.CheckSingleRed(data)
|
||||||
|
--return false
|
||||||
|
local NeedCost = ConfigManager.GetConfigData(ConfigName.ComposeBook,data.otherData.needItems[1]).NeedCost
|
||||||
|
local NeedItems = ConfigManager.GetConfigData(ConfigName.ComposeBook,data.otherData.needItems[1]).NeedItems
|
||||||
|
local ComposeBook = ConfigManager.GetConfig(ConfigName.ComposeBook)
|
||||||
|
if data.progress > 0 then
|
||||||
|
local costNum=NeedCost[1][2]
|
||||||
|
if BagManager.GetTotalItemNum(NeedCost[1][1]) >= NeedCost[1][2] then
|
||||||
|
-- local list = BagManager.GetBagItemDataByItemType(ItemBaseType.Equip)
|
||||||
|
-- local EquipedEquipList = HeroManager.GetEquipedEquipList()
|
||||||
|
-- for i = 1, #data.otherData.needItems do
|
||||||
|
-- for j = 1, #list do
|
||||||
|
-- if ComposeBook[data.otherData.needItems[i]].NeedItems[1][1] == list[j].itemConfig.Id then
|
||||||
|
-- return true
|
||||||
|
-- end
|
||||||
|
-- end
|
||||||
|
-- end
|
||||||
|
-- for i = 1, #data.otherData.needItems do
|
||||||
|
-- for j = 1, #EquipedEquipList do
|
||||||
|
-- if ComposeBook[data.otherData.needItems[i]].NeedItems[1][1] == EquipedEquipList[j] then
|
||||||
|
-- return true
|
||||||
|
-- end
|
||||||
|
-- end
|
||||||
|
-- end
|
||||||
|
-- local isEnough=true
|
||||||
|
-- for i = 1, #NeedItems do
|
||||||
|
-- LogError("11111111111111")
|
||||||
|
-- if NeedItems[i][1]==NeedCost[1][1] then
|
||||||
|
-- if BagManager.GetTotalItemNum(NeedItems[i][1]) < NeedItems[i][2]+costNum then
|
||||||
|
-- isEnough=false
|
||||||
|
-- end
|
||||||
|
-- else
|
||||||
|
-- if BagManager.GetTotalItemNum(NeedItems[i][1]) < NeedItems[i][2] then
|
||||||
|
-- isEnough=false
|
||||||
|
-- end
|
||||||
|
-- end
|
||||||
|
|
||||||
|
-- end
|
||||||
|
-- return isEnough
|
||||||
|
return false
|
||||||
|
end
|
||||||
|
end
|
||||||
return false
|
return false
|
||||||
-- local NeedCost = ConfigManager.GetConfigData(ConfigName.ComposeBook,data.otherData.needItems[1]).NeedCost
|
|
||||||
-- local ComposeBook = ConfigManager.GetConfig(ConfigName.ComposeBook)
|
|
||||||
-- if data.progress > 0 then
|
|
||||||
-- if BagManager.GetTotalItemNum(NeedCost[1][1]) >= NeedCost[1][2] then
|
|
||||||
-- local list = BagManager.GetBagItemDataByItemType(ItemBaseType.Equip)
|
|
||||||
-- local EquipedEquipList = HeroManager.GetEquipedEquipList()
|
|
||||||
-- for i = 1, #data.otherData.needItems do
|
|
||||||
-- for j = 1, #list do
|
|
||||||
-- if ComposeBook[data.otherData.needItems[i]].NeedItems[1][1] == list[j].itemConfig.Id then
|
|
||||||
-- return true
|
|
||||||
-- end
|
|
||||||
-- end
|
|
||||||
-- end
|
|
||||||
-- for i = 1, #data.otherData.needItems do
|
|
||||||
-- for j = 1, #EquipedEquipList do
|
|
||||||
-- if ComposeBook[data.otherData.needItems[i]].NeedItems[1][1] == EquipedEquipList[j] then
|
|
||||||
-- return true
|
|
||||||
-- end
|
|
||||||
-- end
|
|
||||||
-- end
|
|
||||||
-- end
|
|
||||||
-- end
|
|
||||||
-- return false
|
|
||||||
end
|
end
|
||||||
|
|
||||||
--新三界降魔红点检测
|
--新三界降魔红点检测
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue