diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index 72dba604e9..3d4d9d4b33 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -97,13 +97,13 @@ Hero_Profession_Type = { } --品质框背景图片定义 QualityBgDef = { - [1] = "r_characterbg_gray", - [2] = "r_characterbg_green", - [3] = "r_characterbg_blue", - [4] = "r_characterbg_purple", - [5] = "r_characterbg_goden", - [6] = "r_characterbg_gules", - [7] = "t_tongyong_topkaung" + [1] = "UI_hz_beibao_pinjise_06_2", + [2] = "UI_hz_beibao_pinjise_lvse", + [3] = "UI_hz_beibao_pinjise_qingse", + [4] = "UI_hz_beibao_pinjise_zise", + [5] = "UI_hz_beibao_pinjise_chengse", + [6] = "UI_hz_beibao_pinjise_hongse", + [7] = "UI_hz_beibao_pinjise_huangse" } --Hero大卡前面遮罩 GetHeroCardQuantityImage = { @@ -1356,8 +1356,8 @@ NPCPosType = { YaoHunFrame = { --[6] = "r_tongyong_yaohunkuang002", --[7] = "r_tongyong_yaohunkuang001", - [6] = "r_characterbg_gules", - [7] = "t_tongyong_topkaung", + [6] = "UI_hz_beibao_pinjise_hongse", + [7] = "UI_hz_beibao_pinjise_huangse", } --特权任务状态 VipTaskStatusDef = { diff --git a/Assets/ManagedResources/~Lua/Common/functions.lua b/Assets/ManagedResources/~Lua/Common/functions.lua index 573ffe63d5..c404263b1b 100644 --- a/Assets/ManagedResources/~Lua/Common/functions.lua +++ b/Assets/ManagedResources/~Lua/Common/functions.lua @@ -1180,19 +1180,19 @@ end function GetBgByHeroNatural(id) if id == 1 then - return "r_characterbg_goden" + return "UI_hz_beibao_pinjise_chengse" elseif id == 2 then - return "r_characterbg_goden" + return "UI_hz_beibao_pinjise_chengse" elseif id == 3 then - return "r_characterbg_goden" + return "UI_hz_beibao_pinjise_chengse" elseif id == 4 then - return "r_characterbg_goden" + return "UI_hz_beibao_pinjise_chengse" elseif id == 5 then - return "r_characterbg_gules" + return "UI_hz_beibao_pinjise_hongse" elseif id == 6 then - return "t_tongyong_topkaung" + return "UI_hz_beibao_pinjise_huangse" elseif id == 7 then - return "t_tongyong_topkaung" + return "UI_hz_beibao_pinjise_huangse" end end @@ -1217,25 +1217,25 @@ function GetQuantityImageByquality(quality,star) return "UI_hz_beibao_pinjise_06_2" end -- if star == 1 then - -- return "r_characterbg_gray" + -- return "UI_hz_beibao_pinjise_06_2" -- elseif star == 2 then - -- return "r_characterbg_green" + -- return "UI_hz_beibao_pinjise_lvse" -- elseif star == 3 then - -- return "r_characterbg_blue" + -- return "UI_hz_beibao_pinjise_qingse" -- elseif star == 4 then - -- return "r_characterbg_purple" + -- return "UI_hz_beibao_pinjise_zise" -- elseif star == 5 then - -- return "r_characterbg_goden" + -- return "UI_hz_beibao_pinjise_chengse" -- elseif star >= 6 and star <=10 then - -- return "r_characterbg_gules" + -- return "UI_hz_beibao_pinjise_hongse" -- elseif star == 11 then - -- return "t_tongyong_topkaung" + -- return "UI_hz_beibao_pinjise_huangse" -- end else if quality == 0 or quality == 1 then @@ -1256,25 +1256,25 @@ function GetQuantityImageByquality(quality,star) return "UI_hz_beibao_pinjise_06_1" end -- if quality == 0 or quality == 1 then - -- return "r_characterbg_gray" + -- return "UI_hz_beibao_pinjise_06_2" -- elseif quality == 2 then - -- return "r_characterbg_green" + -- return "UI_hz_beibao_pinjise_lvse" -- elseif quality == 3 then - -- return "r_characterbg_blue" + -- return "UI_hz_beibao_pinjise_qingse" -- elseif quality == 4 then - -- return "r_characterbg_purple" + -- return "UI_hz_beibao_pinjise_zise" -- elseif quality == 5 then - -- return "r_characterbg_goden" + -- return "UI_hz_beibao_pinjise_chengse" -- elseif quality == 6 then - -- return "r_characterbg_gules" + -- return "UI_hz_beibao_pinjise_hongse" -- elseif quality == 7 then - -- return "t_tongyong_topkaung" + -- return "UI_hz_beibao_pinjise_huangse" -- elseif quality >= 8 then -- end end @@ -1346,54 +1346,54 @@ end function GetHeroQuantityImageByquality(quality,star) if star and star>0 then--and star > 5 if star == 1 then - return "r_characterbg_gray" + return "UI_hz_beibao_pinjise_06_2" elseif star == 2 then - return "r_characterbg_green" + return "UI_hz_beibao_pinjise_lvse" elseif star == 3 then - return "r_characterbg_blue" + return "UI_hz_beibao_pinjise_qingse" elseif star == 4 then - return "r_characterbg_purple" + return "UI_hz_beibao_pinjise_zise" elseif star == 5 then - return "r_characterbg_goden" + return "UI_hz_beibao_pinjise_chengse" elseif star >= 6 and star <=10 then - return "r_characterbg_gules" + return "UI_hz_beibao_pinjise_hongse" elseif star == 11 then - return "t_tongyong_topkaung" + return "UI_hz_beibao_pinjise_huangse" else - return "r_characterbg_lanjin" + return "UI_hz_beibao_pinjise_06_3" end else if quality == 0 or quality == 1 then - return "r_characterbg_gray" + return "UI_hz_beibao_pinjise_06_2" elseif quality == 2 then - return "r_characterbg_green" + return "UI_hz_beibao_pinjise_lvse" elseif quality == 3 then - return "r_characterbg_blue" + return "UI_hz_beibao_pinjise_qingse" elseif quality == 4 then - return "r_characterbg_purple" + return "UI_hz_beibao_pinjise_zise" elseif quality == 5 then - return "r_characterbg_goden" + return "UI_hz_beibao_pinjise_chengse" elseif quality == 6 then - return "r_characterbg_gules" + return "UI_hz_beibao_pinjise_hongse" elseif quality >= 7 then - return "t_tongyong_topkaung" + return "UI_hz_beibao_pinjise_huangse" end end end function GetHeroQuantityImageByHeroNatural(quality) if quality == 0 or quality == 1 then - return "r_characterbg_gray" + return "UI_hz_beibao_pinjise_06_2" elseif quality == 2 then - return "r_characterbg_green" + return "UI_hz_beibao_pinjise_lvse" elseif quality == 3 then - return "r_characterbg_blue" + return "UI_hz_beibao_pinjise_qingse" elseif quality == 4 then - return "r_characterbg_goden" + return "UI_hz_beibao_pinjise_chengse" elseif quality == 5 then - return "r_characterbg_gules" + return "UI_hz_beibao_pinjise_hongse" elseif quality >= 6 then - return "t_tongyong_topkaung" + return "UI_hz_beibao_pinjise_huangse" end end diff --git a/Assets/ManagedResources/~Lua/Modules/Guild/CarDelay/GuildCarDelayLootPopup.lua b/Assets/ManagedResources/~Lua/Modules/Guild/CarDelay/GuildCarDelayLootPopup.lua index a0d7af81ac..ced9eabb46 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guild/CarDelay/GuildCarDelayLootPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guild/CarDelay/GuildCarDelayLootPopup.lua @@ -126,7 +126,7 @@ function this.SingleInfoDataShow(go,data) for i = 1,6 do curHeroGoList[i] = Util.GetGameObject(go, "Demons/heroPro ("..i..")") Util.GetGameObject(curHeroGoList[i], "hero"):SetActive(false) - Util.GetGameObject(curHeroGoList[i], "frame"):GetComponent("Image").sprite = this.spLoader:LoadSprite("r_characterbg_gray") + Util.GetGameObject(curHeroGoList[i], "frame"):GetComponent("Image").sprite = this.spLoader:LoadSprite("UI_hz_beibao_pinjise_06_2") end -- --LogGreen(" #data.teamInfo ".. #data.teamInfo) for i = 1, #data.teamInfo do diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_ChooseUpHero.lua b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_ChooseUpHero.lua index 2fa23a10a6..a986100058 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_ChooseUpHero.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_ChooseUpHero.lua @@ -162,7 +162,7 @@ function this.SingleHeroDataShow(go,_heroData,_index) -- icon.sprite = this.spLoader:LoadSprite(artResourcesConfig[heroData.Icon].Name) -- proIcon.sprite = this.spLoader:LoadSprite(GetProStrImageByProNum(heroData.PropertyName)) -- SetHeroStars(this.spLoader, starGrid, heroData.Star,1,nil,-15) - -- frame.sprite = this.spLoader:LoadSprite("t_tongyong_topkaung") + -- frame.sprite = this.spLoader:LoadSprite("UI_hz_beibao_pinjise_huangse") -- numText.gameObject:SetActive(false) -- else name.text = SubString2(GetLanguageStrById(heroData.Name),8) diff --git a/Assets/ManagedResources/~Lua/Modules/WorkShop/WorkShopMainPanel.lua b/Assets/ManagedResources/~Lua/Modules/WorkShop/WorkShopMainPanel.lua index 12705fbb04..145418467f 100644 --- a/Assets/ManagedResources/~Lua/Modules/WorkShop/WorkShopMainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/WorkShop/WorkShopMainPanel.lua @@ -561,7 +561,7 @@ function this.UpdateEquipPosHeroData(_type, _equipData) end end) this.equipMaterialsIcon:SetActive(false) - --this.equipMaterialsFrame:GetComponent("Image").sprite = this.spLoader:LoadSprite("r_characterbg_goden") + --this.equipMaterialsFrame:GetComponent("Image").sprite = this.spLoader:LoadSprite("UI_hz_beibao_pinjise_chengse") Util.GetGameObject(this.equipMaterialsAddBtn, "add/add"):SetActive(true) this.equipMaterialsFrame:GetComponent("Image").sprite = this.spLoader:LoadSprite(_equipData.frame) selectDeleteEquipData=nil @@ -605,7 +605,7 @@ function this.UpdateEquipPosHeroData(_type, _equipData) UIManager.ClosePanel(UIName.WorkShopEquipReforgePreviewPanel) end this.isSelectEquip = 2 - this.equipFrame:GetComponent("Image").sprite = this.spLoader:LoadSprite("r_characterbg_goden") + this.equipFrame:GetComponent("Image").sprite = this.spLoader:LoadSprite("UI_hz_beibao_pinjise_chengse") this.equipIcon:SetActive(false) Util.GetGameObject(this.equipAddBtn, "add/add"):SetActive(true) --this.equipFrame= @@ -620,7 +620,7 @@ function this.UpdateEquipPosHeroData(_type, _equipData) if selectEquipData ~=nil then this.equipMaterialsFrame:GetComponent("Image").sprite = this.spLoader:LoadSprite(selectEquipData.frame) else - this.equipMaterialsFrame:GetComponent("Image").sprite = this.spLoader:LoadSprite("r_characterbg_goden") + this.equipMaterialsFrame:GetComponent("Image").sprite = this.spLoader:LoadSprite("UI_hz_beibao_pinjise_chengse") end Util.GetGameObject(this.equipMaterialsAddBtn, "add/add"):SetActive(true) --this.equipMaterialsFrame= @@ -662,7 +662,7 @@ function this.UpdateEquipPosHeroData(_type, _equipData) if selectEquipData ~=nil then this.equipMaterialsFrame:GetComponent("Image").sprite = this.spLoader:LoadSprite(selectEquipData.frame) else - this.equipMaterialsFrame:GetComponent("Image").sprite = this.spLoader:LoadSprite("r_characterbg_goden") + this.equipMaterialsFrame:GetComponent("Image").sprite = this.spLoader:LoadSprite("UI_hz_beibao_pinjise_chengse") end Util.GetGameObject(this.equipMaterialsAddBtn, "add/add"):SetActive(true) --this.equipMaterialsFrame:GetComponent("Image").sprite = this.spLoader:LoadSprite(selectEquipData.frame)