From 750f4afaef7fbda3e91ccf88454a7847c9eec958 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Mon, 11 Oct 2021 15:15:34 +0800 Subject: [PATCH] =?UTF-8?q?ID1010436=E3=80=91=20=E3=80=90=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E3=80=91=E5=A5=BD=E6=84=9F=E5=BA=A6=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E9=80=9A=E7=94=A8=E7=A4=BC=E7=89=A9=20=E5=8F=8A=E7=95=8C?= =?UTF-8?q?=E9=9D=A2=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Likability/HeroLikeAbilityPanel.lua | 32 ++++++++++++++++--- 1 file changed, 28 insertions(+), 4 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Likability/HeroLikeAbilityPanel.lua b/Assets/ManagedResources/~Lua/Modules/Likability/HeroLikeAbilityPanel.lua index c7279bb387..0337772b99 100644 --- a/Assets/ManagedResources/~Lua/Modules/Likability/HeroLikeAbilityPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Likability/HeroLikeAbilityPanel.lua @@ -75,9 +75,15 @@ function HeroLikeAbilityPanel:InitComponent() FixedUpdateBeat:Add(self.OnUpdate, self)--长按方法注册 self.itemList = {} self.itemListNum = {} + + self.proGrid2Pos = self.grid:GetComponent("RectTransform").anchoredPosition end function HeroLikeAbilityPanel:OnPointerDown1(go, data) + if self.isGiving then + PopupTipPanel.ShowTip("正在赠送中") + return + end self.effect.gameObject:SetActive(false) self.num = 0 self.numCount = 0 @@ -314,8 +320,8 @@ function HeroLikeAbilityPanel:UpdateItemList(isChange) self.itemList[i].pre.name = "itemPre"..i self.itemList[i].go = SubUIManager.Open(SubUIConfig.ItemView,self.itemList[i].pre.transform) self.itemList[i].go.frameBtn:GetComponent("Button").enabled = false - self.itemList[i].data = items[i] end + self.itemList[i].data = items[i] self.itemList[i].pre.gameObject:SetActive(true) self.itemList[i].go:OnOpen(false,{items[i].id,items[i].num},1,false,false,false,self.sortingOrder) if items[i].num < 1 then @@ -342,20 +348,36 @@ function HeroLikeAbilityPanel:UpdateItemList(isChange) end if newid < 1 then self.select.gameObject:SetActive(false) + if curselectId == 0 then + self.grid:GetComponent("RectTransform").anchoredPosition = self.proGrid2Pos + end elseif curselectId ~= newid and (not self.itemListNum[curselectId] or self.itemListNum[curselectId] < 1) and not isChange then curselectId = newid - self:SetSelectKuang(par) + local curIndx = 0 + for i = 1,#self.itemList do + if self.itemList[i] and self.itemList[i].data and self.itemList[i].data.id == curselectId then + curIndx = i + break + end + end + self:SetSelectKuang(par,true,curIndx) elseif self.itemListNum[curselectId] and self.itemListNum[curselectId] > 0 then for i = 1,#self.itemList do if self.itemList[i] and self.itemList[i].data and self.itemList[i].data.id == curselectId then - self:SetSelectKuang(self.itemList[i].pre) + self:SetSelectKuang(self.itemList[i].pre,true,i) break end end end end -function HeroLikeAbilityPanel:SetSelectKuang(par) +function HeroLikeAbilityPanel:SetSelectKuang(par,isMove,index) + if isMove then + local pos = self.grid:GetComponent("RectTransform").anchoredPosition + pos.y = self.proGrid2Pos.y + (math.ceil(index/4) - 1) * (150 + 2.36) + self.grid:GetComponent("RectTransform").anchoredPosition = pos + end + Util.SetGray(self.select,false) self.select.gameObject:SetActive(true) self.select.transform:SetParent(par.transform) self.select.transform.localPosition = Vector3.New(-7.5,3.5) @@ -518,6 +540,8 @@ function HeroLikeAbilityPanel:OnDestroy() FixedUpdateBeat:Remove(self.OnUpdate, self) self.itemListNum = {} self.itemList = {} + + self.grid:GetComponent("RectTransform").anchoredPosition = self.proGrid2Pos end return HeroLikeAbilityPanel \ No newline at end of file