From 1c827a3a23693ec64d3cd33ef4781a83af90c0a8 Mon Sep 17 00:00:00 2001 From: gaoxin Date: Fri, 14 Jan 2022 16:02:10 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=85=B3=E5=8D=A1=E3=80=91=E6=9C=89?= =?UTF-8?q?=E5=8F=AF=E6=8C=91=E6=88=98=E5=85=B3=E5=8D=A1=E6=97=B6=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E5=B0=8F=E6=89=8B=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Materials/UI_Effect_TouXiang_FightBtn.mat | 2 +- .../UI/Fight/FightPointPassMainPanel.prefab | 130 +++++++++++++++++- .../Modules/Fight/FightPointPassMainPanel.lua | 5 + 3 files changed, 134 insertions(+), 3 deletions(-) diff --git a/Assets/ManagedResources/EffectResUI/TianGongXunBao/Materials/UI_Effect_TouXiang_FightBtn.mat b/Assets/ManagedResources/EffectResUI/TianGongXunBao/Materials/UI_Effect_TouXiang_FightBtn.mat index c1be88bb51..34bfafd93e 100644 --- a/Assets/ManagedResources/EffectResUI/TianGongXunBao/Materials/UI_Effect_TouXiang_FightBtn.mat +++ b/Assets/ManagedResources/EffectResUI/TianGongXunBao/Materials/UI_Effect_TouXiang_FightBtn.mat @@ -34,4 +34,4 @@ Material: - _Stencil: 0 m_Colors: - _MainColor: {r: 1, g: 1, b: 1, a: 0} - - _TintColor: {r: 1, g: 1, b: 1, a: 1} + - _TintColor: {r: 0.9811321, g: 0.9020048, b: 0.36561054, a: 0.45882353} diff --git a/Assets/ManagedResources/Prefabs/UI/Fight/FightPointPassMainPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Fight/FightPointPassMainPanel.prefab index 3b102256ab..c5f48f222c 100644 --- a/Assets/ManagedResources/Prefabs/UI/Fight/FightPointPassMainPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Fight/FightPointPassMainPanel.prefab @@ -21058,7 +21058,7 @@ RectTransform: - {fileID: 2047898567573916233} - {fileID: 8635743836815067626} m_Father: {fileID: 3829532297210306968} - m_RootOrder: 4 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -42536,7 +42536,7 @@ RectTransform: m_Children: - {fileID: 5374976552370438436} m_Father: {fileID: 3829532297210306968} - m_RootOrder: 5 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -144543,6 +144543,7 @@ RectTransform: - {fileID: 7828900952075963866} - {fileID: 5204423984622933357} - {fileID: 6591256859250515825} + - {fileID: 7759392491232237277} - {fileID: 2039730614} - {fileID: 2835335463341580670} m_Father: {fileID: 7718967529276036518} @@ -146312,6 +146313,131 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!1001 &536767011877295405 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 3829532297210306968} + m_Modifications: + - target: {fileID: 4044842431821162333, guid: 53b44f029897fbe44b680b2fd498f643, + type: 3} + propertyPath: m_Name + value: GuideEffect + objectReference: {fileID: 0} + - target: {fileID: 7844176110645609456, guid: 53b44f029897fbe44b680b2fd498f643, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7844176110645609456, guid: 53b44f029897fbe44b680b2fd498f643, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7844176110645609456, guid: 53b44f029897fbe44b680b2fd498f643, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7844176110645609456, guid: 53b44f029897fbe44b680b2fd498f643, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7844176110645609456, guid: 53b44f029897fbe44b680b2fd498f643, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7844176110645609456, guid: 53b44f029897fbe44b680b2fd498f643, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7844176110645609456, guid: 53b44f029897fbe44b680b2fd498f643, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7844176110645609456, guid: 53b44f029897fbe44b680b2fd498f643, + type: 3} + propertyPath: m_RootOrder + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 7844176110645609456, guid: 53b44f029897fbe44b680b2fd498f643, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7844176110645609456, guid: 53b44f029897fbe44b680b2fd498f643, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7844176110645609456, guid: 53b44f029897fbe44b680b2fd498f643, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7844176110645609456, guid: 53b44f029897fbe44b680b2fd498f643, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7844176110645609456, guid: 53b44f029897fbe44b680b2fd498f643, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -15 + objectReference: {fileID: 0} + - target: {fileID: 7844176110645609456, guid: 53b44f029897fbe44b680b2fd498f643, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7844176110645609456, guid: 53b44f029897fbe44b680b2fd498f643, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7844176110645609456, guid: 53b44f029897fbe44b680b2fd498f643, + type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7844176110645609456, guid: 53b44f029897fbe44b680b2fd498f643, + type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7844176110645609456, guid: 53b44f029897fbe44b680b2fd498f643, + type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7844176110645609456, guid: 53b44f029897fbe44b680b2fd498f643, + type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7844176110645609456, guid: 53b44f029897fbe44b680b2fd498f643, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7844176110645609456, guid: 53b44f029897fbe44b680b2fd498f643, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 53b44f029897fbe44b680b2fd498f643, type: 3} +--- !u!224 &7759392491232237277 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 7844176110645609456, guid: 53b44f029897fbe44b680b2fd498f643, + type: 3} + m_PrefabInstance: {fileID: 536767011877295405} + m_PrefabAsset: {fileID: 0} --- !u!1001 &8971074634032498639 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassMainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassMainPanel.lua index 8efa5342dd..780b2a0b2e 100644 --- a/Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassMainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassMainPanel.lua @@ -102,6 +102,7 @@ function FightPointPassMainPanel:InitComponent() this.btnFight = Util.GetGameObject(self.gameObject, "Bg/btnDown/btnFight") this.fightText = Util.GetGameObject(this.btnFight, "Text"):GetComponent("Text") this.fightSaoGuang = Util.GetGameObject(this.btnFight, "saoguang") + this.fightGuideEffect = Util.GetGameObject(this.btnFight, "GuideEffect") LanguageFontSizeFilter(this.fightText, 50) -- 你要变强 this.btnGetForce = Util.GetGameObject(self.gameObject, "Bg/btnDown/btnIWantMilk") @@ -677,11 +678,14 @@ end function this.SetFightBtnText() this.fightLock:SetActive(false) this.fightSaoGuang:SetActive(true) + -- 没在主线引导种就显示小手 + this.fightGuideEffect:SetActive(not GuideManager.IsInMainGuide()) local isPass = FightPointPassManager.IsCanFight(FightPointPassManager.curOpenFight) if not isCounting then if not isPass then this.fightLock:SetActive(true) this.fightSaoGuang:SetActive(false) + this.fightGuideEffect:SetActive(false) this.lockText.text = FightPointPassManager.GetBtnText() else this.fightText.text = FightPointPassManager.GetBtnText() @@ -743,6 +747,7 @@ function FightPointPassMainPanel:OnSortingOrderChange() Util.AddParticleSortLayer(this.pgEffect, self.sortingOrder - orginLayer) Util.AddParticleSortLayer(this.UI_Effect_MuBiaoJiangLi, self.sortingOrder - orginLayer) Util.SetParticleSortLayer(this.fightSaoGuang, self.sortingOrder + 1) + Util.SetParticleSortLayer(this.fightGuideEffect, self.sortingOrder + 2) fightMap:OnSortingOrderChange(self.sortingOrder) orginLayer = self.sortingOrder