diff --git a/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon_dengfengzaoji_zh.png b/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon_dengfengzaoji_zh.png index de9a86f0fa..b7854004b3 100644 Binary files a/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon_dengfengzaoji_zh.png and b/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon_dengfengzaoji_zh.png differ diff --git a/Assets/ManagedResources/Prefabs/UI/Recruit/SingleRecruitPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Recruit/SingleRecruitPanel.prefab index 3768f0a36a..d2807a72ce 100644 --- a/Assets/ManagedResources/Prefabs/UI/Recruit/SingleRecruitPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Recruit/SingleRecruitPanel.prefab @@ -255655,6 +255655,7 @@ GameObject: - component: {fileID: 2473743150135751695} - component: {fileID: 5830598276207552205} - component: {fileID: 1084146396283711813} + - component: {fileID: 8791010640348964465} m_Layer: 5 m_Name: posQuality m_TagString: Untagged @@ -255738,6 +255739,48 @@ MonoBehaviour: m_FlexibleWidth: -1 m_FlexibleHeight: -1 m_LayoutPriority: 1 +--- !u!114 &8791010640348964465 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5696048352838328926} + 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: 0 + 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: 5830598276207552205} + 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 &5779875340601305572 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGiftNew.lua b/Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGiftNew.lua index 08a28828dd..2298f87533 100644 --- a/Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGiftNew.lua +++ b/Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGiftNew.lua @@ -140,7 +140,7 @@ function EveryDayGiftNew:RefreshData(none,isTop,isAni) --特殊处理部分 Log("actType:"..tostring(self.actType)) - if self.actType == FUNCTION_OPEN_TYPE.MeiRiLiBao then + if self.actType == ActivityTypeDef.MeiRiLiBao then self.Button:SetActive(true) --每日礼 self:RefreshFreeData() diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoLayout.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoLayout.lua index 3e8f5524af..db9dcaee56 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoLayout.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoLayout.lua @@ -117,6 +117,7 @@ function RoleInfoLayout:InitComponent() this.hognmengbeiTip = Util.GetGameObject(this.gongmingText,"hognmengbeiTip") this.lvUpGo=Util.GetGameObject(self.gameObject,"lvUpGo") this.lvUpGoImage=Util.GetGameObject(self.gameObject,"lvUpGo/Image") + this.lvUpGoImage:SetActive(false) for i = 1, 5 do lvUpShowProList[i]=Util.GetGameObject(this.lvUpGo.transform,"proPreParent/proPre"..i) @@ -896,11 +897,11 @@ function RoleInfoLayout:DeleteLvUpMaterials() --Log("刷新英雄库里单个英雄数据 "..curHeroData.dynamicId.." "..curHeroData.lv.." "..curHeroData.star.." "..curHeroData.breakId.." "..curHeroData.upStarId) --刷新英雄库里单个英雄数据 if isHeroUpTuPo and upTuPoRankUpConfig and curHeroData.lv == upTuPoRankUpConfig.LimitLevel then - this.lvUpGoImage:SetActive(false) + -- this.lvUpGoImage:SetActive(false) -- 突破音效 PlaySoundWithoutClick(SoundConfig.Sound_Breach) else - this.lvUpGoImage:SetActive(true) + -- this.lvUpGoImage:SetActive(true) -- 升级音效 PlaySoundWithoutClick(SoundConfig.Sound_Upgrade) end