From 2e2a0d6edd3aee7a2efaf0f89efbe5d67628ea72 Mon Sep 17 00:00:00 2001
From: jiaoyangna <3046463818@qq.com>
Date: Mon, 27 Sep 2021 20:26:45 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A1=83=E5=BF=83=E4=BD=8D=E7=BD=AE=E4=BF=AE?=
=?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../~Lua/Modules/Likability/LikeAbilityPanel.lua | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
diff --git a/Assets/ManagedResources/~Lua/Modules/Likability/LikeAbilityPanel.lua b/Assets/ManagedResources/~Lua/Modules/Likability/LikeAbilityPanel.lua
index 7e111b6d86..b45aeff056 100644
--- a/Assets/ManagedResources/~Lua/Modules/Likability/LikeAbilityPanel.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Likability/LikeAbilityPanel.lua
@@ -4,7 +4,11 @@ LikeAbilityPanel = Inherit(BasePanel)
--特权--橙色
--总好感度属性: --黄色
--+500 --绿色
-local pos = {["h_haogandu_1"] = Vector3.zero,["h_haogandu_2"] = Vector3.zero,["h_haogandu_3"] = Vector3.New(-16.15,0,0) }
+local pos = {
+ ["h_haogandu_1"] = {mask = Vector3.zero,icon = Vector3.New(-3.4,0,0)} ,
+ ["h_haogandu_2"] = {mask = Vector3.zero,icon = Vector3.New(-3.4,0,0)} ,
+ ["h_haogandu_3"] = {mask = Vector3.New(-16.15,0,0),icon = Vector3.New(-18.84,0,0)} ,
+}
local sortOrder = 0
local tabs = {}
local tabsImg = {"z_icon_01_zh", "r_hero_huo 1_zh", "r_hero_feng 1_zh", "r_hero_shui 1_zh", "r_hero_dadi 1_zh"}
@@ -33,8 +37,9 @@ function LikeAbilityPanel:InitComponent()
--h_haogandu_1 h_haogandu_2 h_haogandu_3
self.likeabilitymask = Util.GetGameObject(self.likeabilityDi.transform, "mask"):GetComponent("Image")
--self.likeabilitymask.fillAmount
- self.lv = Util.GetGameObject(self.likeabilityBtn, "lv"):GetComponent("Text")
- self.progress = Util.GetGameObject(self.likeabilityBtn, "progress"):GetComponent("Text")
+ self.icon = Util.GetGameObject(self.likeabilityBtn, "icon")
+ self.lv = Util.GetGameObject(self.likeabilityBtn, "icon/lv"):GetComponent("Text")
+ self.progress = Util.GetGameObject(self.likeabilityBtn, "icon/progress"):GetComponent("Text")
self.pro = Util.GetGameObject(self.transform, "di/pro")
self.proContent = Util.GetGameObject(self.pro, "content")
self.proGrid = Util.GetGameObject(self.transform, "di/proScroll")
@@ -100,7 +105,8 @@ function LikeAbilityPanel:UpdateTopLayoutPanel()
local num,lv,totalNum = LikabilityManager.GetTotalHeroLikeLv(-1)
local config = ConfigManager.GetConfigDataByDoubleKey(ConfigName.LikeAbility,"Type",1,"Level",lv)
self.likeabilityDi.sprite = self.spLoader:LoadSprite(config.Bg)
- self.likeabilitymask.transform.localPosition = pos[config.Bg]
+ self.likeabilitymask.transform.localPosition = pos[config.Bg].mask
+ self.icon.transform.localPosition = pos[config.Bg].icon
self.lv.text = lv
if LikabilityManager.CheckIsMaxLv(-1) then
self.likeabilitymask.fillAmount = 1