diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua index feba0994a2..21b96f3a83 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua @@ -358,7 +358,9 @@ function this.GetLeftRewardData() for i = 1, #finalCardDatas do if finalCardDatas[i].rewardId and finalCardDatas[i].rewardId ~= 0 and finalCardDatas[i].rewardId ~= actData.selectId then -- LogYellow("i:"..i.." rewardId:"..tostring(finalCardDatas[i].rewardId) .." progress"..tonumber(data[finalCardDatas[i].rewardId].progress)) - data[finalCardDatas[i].rewardId].progress = data[finalCardDatas[i].rewardId].progress - 1 + if data[finalCardDatas[i].rewardId] then + data[finalCardDatas[i].rewardId].progress = data[finalCardDatas[i].rewardId].progress - 1 + end end end return data diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/YiJingBaoKu.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/YiJingBaoKu.lua index e9686f18f6..30cef86f55 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/YiJingBaoKu.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/YiJingBaoKu.lua @@ -191,22 +191,26 @@ function YiJingBaoKu:Refresh() end function YiJingBaoKu:SetCardData() + LogError("#self.ActData.finalCardDatas=="..#self.ActData.finalCardDatas) + LogError("#self._itemsList[i]=="..#self._itemsList) for i = 1, #self.ActData.finalCardDatas do local v = self.ActData.finalCardDatas[i] --LogError("v.Id=="..v.Id) if v.rewardId ~= 0 then - local item = self._itemsList[i] - local cFront = Util.GetGameObject(item, "front") - cFront:SetActive(true) - local cBack = Util.GetGameObject(item, "back") - if not self.itemViewList[i] then - self.itemViewList[i] = SubUIManager.Open(SubUIConfig.ItemView,cFront.transform) + if self._itemsList[i] then + local item = self._itemsList[i] + local cFront = Util.GetGameObject(item, "front") + cFront:SetActive(true) + local cBack = Util.GetGameObject(item, "back") + if not self.itemViewList[i] then + self.itemViewList[i] = SubUIManager.Open(SubUIConfig.ItemView,cFront.transform) + end + self.itemViewList[i]:OnOpen(false, v.reward, 1.1, false, false, false, sortingOrder) + self.itemViewList[i].transform.localPosition = Vector2.New(-73.5,78.5) + cFront:GetComponent("RectTransform").rotation = Quaternion.Euler(Vector3.New(0, 0, 0)) + cBack:GetComponent("RectTransform").rotation = Quaternion.Euler(Vector3.New(0, 90, 0)) + self.itemViewList[i].gameObject:SetActive(true) end - self.itemViewList[i]:OnOpen(false, v.reward, 1.1, false, false, false, sortingOrder) - self.itemViewList[i].transform.localPosition = Vector2.New(-73.5,78.5) - cFront:GetComponent("RectTransform").rotation = Quaternion.Euler(Vector3.New(0, 0, 0)) - cBack:GetComponent("RectTransform").rotation = Quaternion.Euler(Vector3.New(0, 90, 0)) - self.itemViewList[i].gameObject:SetActive(true) else table.insert(gridList,v.Id) end