diff --git a/Assets/ManagedResources/Prefabs/UI/Likability/LikeAbilityPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Likability/LikeAbilityPanel.prefab
index 42d31db78f..405ca473a1 100644
--- a/Assets/ManagedResources/Prefabs/UI/Likability/LikeAbilityPanel.prefab
+++ b/Assets/ManagedResources/Prefabs/UI/Likability/LikeAbilityPanel.prefab
@@ -286,6 +286,7 @@ GameObject:
- component: {fileID: 1005476532}
- component: {fileID: 1005476534}
- component: {fileID: 1005476533}
+ - component: {fileID: 8624747641742157482}
m_Layer: 5
m_Name: dibg
m_TagString: Untagged
@@ -352,6 +353,48 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
+--- !u!114 &8624747641742157482
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1005476531}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Navigation:
+ m_Mode: 3
+ m_SelectOnUp: {fileID: 0}
+ m_SelectOnDown: {fileID: 0}
+ m_SelectOnLeft: {fileID: 0}
+ m_SelectOnRight: {fileID: 0}
+ m_Transition: 1
+ m_Colors:
+ m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+ m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+ m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+ m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+ m_ColorMultiplier: 1
+ m_FadeDuration: 0.1
+ m_SpriteState:
+ m_HighlightedSprite: {fileID: 0}
+ m_PressedSprite: {fileID: 0}
+ m_DisabledSprite: {fileID: 0}
+ m_AnimationTriggers:
+ m_NormalTrigger: Normal
+ m_HighlightedTrigger: Highlighted
+ m_PressedTrigger: Pressed
+ m_DisabledTrigger: Disabled
+ m_Interactable: 1
+ m_TargetGraphic: {fileID: 1005476533}
+ m_OnClick:
+ m_PersistentCalls:
+ m_Calls: []
+ m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
+ Culture=neutral, PublicKeyToken=null
--- !u!1 &1655664874
GameObject:
m_ObjectHideFlags: 0
diff --git a/Assets/ManagedResources/~Lua/Modules/Likability/HeroLikeAbilityPanel.lua b/Assets/ManagedResources/~Lua/Modules/Likability/HeroLikeAbilityPanel.lua
index c2dfc71447..5529e42a81 100644
--- a/Assets/ManagedResources/~Lua/Modules/Likability/HeroLikeAbilityPanel.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Likability/HeroLikeAbilityPanel.lua
@@ -182,6 +182,32 @@ function HeroLikeAbilityPanel:BindEvent()
Util.AddClick(self.lookBtn, function()
UIManager.OpenPanel(UIName.RoleLikeabilityPopup,curHeroData)
end)
+
+ --查看
+ Util.AddClick(self.giveBtn, function()
+ self.num = 0
+ self.numCount = 0
+ LogGreen(curselectId)
+
+ if LikabilityManager.CheckIsMaxLv(curHeroData.Id) then
+ PopupTipPanel.ShowTip("神将好感度最达最佳,无需更多赠予~")
+ return
+ end
+ if LikabilityManager.GetRemainTimes() < 1 then
+ PopupTipPanel.ShowTip("今日赠予次数已用尽~")
+ return
+ end
+ if not curselectId or not self.itemListNum[curselectId] then
+ PopupTipPanel.ShowTip("礼物数量不足,无法赠予~")
+ return
+ end
+ if self.itemListNum[curselectId] < 1 then
+ PopupTipPanel.ShowTip("礼物数量不足,无法赠予~")
+ return
+ end
+ self.isShortPress = true
+ self:Refresh(true)
+ end)
end
--添加事件监听(用于子类重写)
function HeroLikeAbilityPanel:AddListener()
diff --git a/Assets/ManagedResources/~Lua/Modules/Likability/LikabilityManager.lua b/Assets/ManagedResources/~Lua/Modules/Likability/LikabilityManager.lua
index e06a086901..0ede472f96 100644
--- a/Assets/ManagedResources/~Lua/Modules/Likability/LikabilityManager.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Likability/LikabilityManager.lua
@@ -426,10 +426,11 @@ function this.SetProvalue(prolist,proType,tag,nextLv,indexType,_color)
str1 = str1.." "..string.format("(下级额外 +%s)",color1,pro1[k])
end
end
-
else
- local config = ConfigManager.GetConfigDataByKey(ConfigName.PrivilegeTypeConfig,"PrivilegeType",k)
- str1 = string.format(config.Name,string.format("+%s",_color,GetPropertyFormatStrOne(config.IfFloat, v)))
+ local config = ConfigManager.TryGetConfigDataByKey(ConfigName.PrivilegeTypeConfig,"PrivilegeType",k)
+ if config then
+ str1 = string.format(config.Name,string.format("+%s",_color,GetPropertyFormatStrOne(config.IfFloat, v)))
+ end
end
table.insert(newProList,str1)
end