diff --git a/Assets/ManagedResources/Audio/Skill/monster/Audio_m_hyjl_0002_skeff_tap_attacked.mp3 b/Assets/ManagedResources/Audio/Skill/monster/Audio_m_hyjl_0002_skeff_tap_attacked.mp3 index 7c6049adaa..9986d35418 100644 Binary files a/Assets/ManagedResources/Audio/Skill/monster/Audio_m_hyjl_0002_skeff_tap_attacked.mp3 and b/Assets/ManagedResources/Audio/Skill/monster/Audio_m_hyjl_0002_skeff_tap_attacked.mp3 differ diff --git a/Assets/ManagedResources/Audio/UI/special/UI_029.mp3 b/Assets/ManagedResources/Audio/UI/special/UI_029.mp3 index 80e83e5d9f..cef7ecb91c 100644 Binary files a/Assets/ManagedResources/Audio/UI/special/UI_029.mp3 and b/Assets/ManagedResources/Audio/UI/special/UI_029.mp3 differ diff --git a/Assets/ManagedResources/Audio/UI/special/UI_029_02.mp3 b/Assets/ManagedResources/Audio/UI/special/UI_029_02.mp3 index d0c5491d64..4b599fcf76 100644 Binary files a/Assets/ManagedResources/Audio/UI/special/UI_029_02.mp3 and b/Assets/ManagedResources/Audio/UI/special/UI_029_02.mp3 differ diff --git a/Assets/ManagedResources/~Lua/Modules/Guild/CarDelay/GuildCarDelayFindBossPopup.lua b/Assets/ManagedResources/~Lua/Modules/Guild/CarDelay/GuildCarDelayFindBossPopup.lua index f2430fbfbd..9a2bd6c271 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guild/CarDelay/GuildCarDelayFindBossPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guild/CarDelay/GuildCarDelayFindBossPopup.lua @@ -75,6 +75,7 @@ function this.SetCardSingleData(go,monsterId,_pos) local curPos=roleConfig[heroConfig.Id].offset liveNodes[_pos] = poolManager:LoadLive(liveNames[_pos], live.transform, Vector3.one * _scale, Vector3.New(curPos[1],curPos[2],0)) liveNodes[_pos]:GetComponent("SkeletonGraphic").raycastTarget=false + liveNodes[_pos]:GetComponent("RectTransform").sizeDelta = Vector2.New(500, 500) end --界面关闭时调用(用于子类重写) function GuildCarDelayFindBossPopup:OnClose() diff --git a/Assets/ManagedResources/~Lua/View/ItemView.lua b/Assets/ManagedResources/~Lua/View/ItemView.lua index 24ce783acf..17712f406b 100644 --- a/Assets/ManagedResources/~Lua/View/ItemView.lua +++ b/Assets/ManagedResources/~Lua/View/ItemView.lua @@ -196,6 +196,21 @@ function ItemView:GetRewardShow(_itemData, effectLayer) Util.AddOnceClick(self.frameBtn, function() UIManager.OpenPanel(UIName.RewardItemSingleShowPopup, _itemData.backData.itemId,nil,self.isRewardItemPop) end) + elseif _itemData.configData.ItemType == ItemType.Equip then + --装备 + self.num:SetActive(_itemData.num > 1) + self.num:GetComponent("Text").text = _itemData.num + self.name:GetComponent("Text").text = _itemData.configData.Name + self.starGrid:SetActive(true) + EquipManager.SetEquipStarShow(self.starGrid, _itemData.configData.Id) + Util.AddOnceClick(self.frameBtn, function() + UIManager.OpenPanel(UIName.RewardEquipSingleShowPopup, _itemData.backData,nil,self.isRewardItemPop) + end) + if effectLayer > 0 then + self.UI_Effect_Kuang_JinSe:SetActive(_itemData.configData.Quantity == 5 or _itemData.configData.Quantity == 4) + self.UI_Effect_Kuang_HongSe:SetActive(_itemData.configData.Quantity == 6) + self.UI_effect_WuCai_Kuang:SetActive(_itemData.configData.Quantity == 7) + end elseif _itemData.configData.ItemType == ItemType.Blueprint then local lanTuData = WorkShopManager.GetLanTuIsOpenLock(_itemData.backData.itemId) if lanTuData then @@ -223,7 +238,8 @@ function ItemView:GetRewardShow(_itemData, effectLayer) self.num:SetActive(_itemData.num > 1) self.num:GetComponent("Text").text = _itemData.num self.name:GetComponent("Text").text = _itemData.configData.Name - EquipManager.SetEquipStarShow(self.starGrid,_itemData.configData.Id) + self.starGrid:SetActive(true) + EquipManager.SetEquipStarShow(self.starGrid, _itemData.configData.Id) Util.AddOnceClick(self.frameBtn, function() --Log("self.isRewardItemPop "..tostring(self.isRewardItemPop)) UIManager.OpenPanel(UIName.RewardEquipSingleShowPopup, _itemData.backData,nil,self.isRewardItemPop) @@ -380,6 +396,7 @@ function ItemView:NoGetRewardShow(_reward, effectLayer, isShowAddImage) self.num:GetComponent("Text").text = PrintWanNum(itemNum and itemNum or 0) self.frame.sprite = Util.LoadSprite(GetQuantityImageByquality(itemConfig[itemSId].Quantity)) self.icon.sprite = Util.LoadSprite(GetResourcePath(itemConfig[itemSId].ResourceID)) + self.starGrid:SetActive(true) EquipManager.SetEquipStarShow(self.starGrid,itemSId) if effectLayer > 0 then self.UI_Effect_Kuang_JinSe:SetActive(itemDataConFig.Quantity == 5 or itemDataConFig.Quantity == 4)