diff --git a/Assets/ManagedResources/Prefabs/UI/Guild/GuildFindPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Guild/GuildFindPopup.prefab index 3ac83499dc..8d9a88de3c 100644 --- a/Assets/ManagedResources/Prefabs/UI/Guild/GuildFindPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Guild/GuildFindPopup.prefab @@ -1358,7 +1358,7 @@ MonoBehaviour: m_Interactable: 1 m_TargetGraphic: {fileID: 4973507052864196998} m_TextComponent: {fileID: 4973507052864196998} - m_Placeholder: {fileID: 0} + m_Placeholder: {fileID: 4301306630120058772} m_ContentType: 0 m_InputType: 0 m_AsteriskChar: 42 diff --git a/Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset b/Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset index ec595a70cd..e9795a734f 100644 --- a/Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset +++ b/Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset @@ -11544,6 +11544,10 @@ MonoBehaviour: extension: .png resPathIndex: 72 resAbNameIndex: 38 + - resName: r_playerrumble_fangshoubianduianniu + extension: .png + resPathIndex: 72 + resAbNameIndex: 38 - resName: r_playerrumble_jiluanniu extension: .png resPathIndex: 72 @@ -13200,6 +13204,10 @@ MonoBehaviour: extension: .mp3 resPathIndex: 85 resAbNameIndex: 194 + - resName: Audio_c_ljgz_00032_attack_01 + extension: .mp3 + resPathIndex: 85 + resAbNameIndex: 194 - resName: Audio_c_lslz_00046_attack_01 extension: .mp3 resPathIndex: 85 @@ -13264,10 +13272,6 @@ MonoBehaviour: extension: .mp3 resPathIndex: 85 resAbNameIndex: 210 - - resName: Audio_c_mrzq_0010_skeff_slidesk_attacked - extension: .mp3 - resPathIndex: 85 - resAbNameIndex: 210 - resName: Audio_c_mz_00038_attack_01 extension: .mp3 resPathIndex: 85 diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua index 2ffe3198d6..b181b52918 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua @@ -166,7 +166,7 @@ function RewardItemSingleShowPopup:OnShow() this.frame:GetComponent("Image").sprite = Util.LoadSprite(GetQuantityImageByquality(itemConfigData.Quantity)) this.icon.sprite = Util.LoadSprite(GetResourcePath(itemConfigData.ResourceID)) end - this.armorType.text = Language[11594] + this.armorType.text = this.getType()--道具类型显示 --itemNu=BagManager.GetItemCountById(curWorkShopData.workShopData.OpenRules[2]) this.armorLanTuNum:SetActive(true) this.armorLanTuNum:GetComponent("Text").text = Language[11595] .. BagManager.GetItemCountById(itemSid) @@ -227,6 +227,24 @@ function RewardItemSingleShowPopup:OnShow() end end end + +--获取道具种类 +function this.getType() + local type = itemConfig[itemSid].ItemBaseType + if type == 1 then + return Language[11093].."特殊" + elseif type == 2 then + return Language[11093].."碎片" + elseif type == 4 then + return Language[11093].."装备" + elseif type == 5 then + return Language[11093].."宝物" + elseif type == 6 then + return Language[11093].."魂印" + elseif type == 7 then + return Language[11093].."材料" + end +end --为关卡跳转做的排序 function this.JumpSort(jumps) table.sort(jumps, function(a, b)