From 4e449599209c69219e1b02a023553930a6fd2974 Mon Sep 17 00:00:00 2001 From: "DESKTOP-RH64908\\Administrator" <1545929779@qq.com> Date: Tue, 24 Dec 2024 16:34:23 +0800 Subject: [PATCH] 1 --- .../Prefabs/Battle/BattleSceneLogic.prefab | 12 ++++++------ .../Prefabs/UI/Fight/FightPointPassMainPanel.prefab | 4 ++-- .../Materials/SkeletonGraphicDefault.mat | 2 +- .../~Lua/Modules/Fight/FightPointPassMainPanel.lua | 4 ++++ .../~Lua/Modules/Fight/View/FightPointMapOnHook.lua | 7 ++++--- 5 files changed, 17 insertions(+), 12 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/Battle/BattleSceneLogic.prefab b/Assets/ManagedResources/Prefabs/Battle/BattleSceneLogic.prefab index 40c0878aff..eda4c1e000 100644 --- a/Assets/ManagedResources/Prefabs/Battle/BattleSceneLogic.prefab +++ b/Assets/ManagedResources/Prefabs/Battle/BattleSceneLogic.prefab @@ -312,7 +312,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchoredPosition: {x: -0.5, y: 0} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1347644479180454394 @@ -607,7 +607,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchoredPosition: {x: -0.5, y: 0} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &2941289483775644879 @@ -782,7 +782,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchoredPosition: {x: -0.5, y: 0} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &3324126768968419674 @@ -1458,7 +1458,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchoredPosition: {x: -0.5, y: 0} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &7421149421245160652 @@ -1563,7 +1563,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchoredPosition: {x: -0.5, y: 0} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &8378516243967797183 @@ -1703,6 +1703,6 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchoredPosition: {x: -0.5, y: 0} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} diff --git a/Assets/ManagedResources/Prefabs/UI/Fight/FightPointPassMainPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Fight/FightPointPassMainPanel.prefab index a03c337bef..4b3ec935eb 100644 --- a/Assets/ManagedResources/Prefabs/UI/Fight/FightPointPassMainPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Fight/FightPointPassMainPanel.prefab @@ -126439,10 +126439,10 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: tweenSequeue: - - initV3: {x: -85, y: 262, z: 0} + - initV3: {x: 316, y: 450, z: 0} initFloat: 0 isInit: 1 - changeV3: {x: -85, y: 306, z: 0} + changeV3: {x: 316, y: 420, z: 0} changeFloat: 0 duration: 1 delay: 0 diff --git a/Assets/ManagedResources/PublicArtRes/Materials/SkeletonGraphicDefault.mat b/Assets/ManagedResources/PublicArtRes/Materials/SkeletonGraphicDefault.mat index 45c996de74..01b331814a 100644 --- a/Assets/ManagedResources/PublicArtRes/Materials/SkeletonGraphicDefault.mat +++ b/Assets/ManagedResources/PublicArtRes/Materials/SkeletonGraphicDefault.mat @@ -91,7 +91,7 @@ Material: - _UseUIAlphaClip: 0 - _ZWrite: 1 m_Colors: - - _Color: {r: 0.078431375, g: 0.14509805, b: 1, a: 1} + - _Color: {r: 1, g: 0, b: 0, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _Flip: {r: 1, g: 1, b: 1, a: 1} - _RendererColor: {r: 1, g: 1, b: 1, a: 1} diff --git a/Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassMainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassMainPanel.lua index 0823f775ed..2e118e7d5e 100644 --- a/Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassMainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassMainPanel.lua @@ -111,6 +111,7 @@ function FightPointPassMainPanel:InitComponent() this.btnrewardDetail = Util.GetGameObject(self.gameObject, "Bg/btnRdDetail/click") + this.btnreward = Util.GetGameObject(self.gameObject, "Bg/getBoxReward/getBoxReward/btn") this.btnFight = Util.GetGameObject(self.gameObject, "Bg/btnDown/btnFight") this.fightText = Util.GetGameObject(this.btnFight, "Text"):GetComponent("Text") @@ -304,6 +305,9 @@ function FightPointPassMainPanel:BindEvent() UIManager.OpenPanel(UIName.FightAreaRewardPopup) end) + Util.AddClick(this.btnreward, function() + UIManager.OpenPanel(UIName.FightAreaRewardPopup) + end) -- 我要喝牛奶变强 Util.AddClick(this.btnGetForce, function() --UIManager.OpenPanel(UIName.GiveMePowerPanel) diff --git a/Assets/ManagedResources/~Lua/Modules/Fight/View/FightPointMapOnHook.lua b/Assets/ManagedResources/~Lua/Modules/Fight/View/FightPointMapOnHook.lua index d95fabad7d..235ec8e0e4 100644 --- a/Assets/ManagedResources/~Lua/Modules/Fight/View/FightPointMapOnHook.lua +++ b/Assets/ManagedResources/~Lua/Modules/Fight/View/FightPointMapOnHook.lua @@ -1457,8 +1457,8 @@ function this:OnceDamaged(livego, livenode, dmg, bCrit, combat, skill, isLeft, t if DoColor_Spine_Tweener[targetIndex] then DoColor_Spine_Tweener[targetIndex]:Kill() end - - DoColor_Spine_Tweener[targetIndex] = Util.DoColor_Spine(livenode:GetComponent(SpineComponentName), + --[[ + DoColor_Spine_Tweener[targetIndex] = Util.DoColor_Spine(livenode:GetComponent(SpineComponentName), Color.New(1, 0, 0, 1), 0.3):OnComplete( function() if not isPlay then @@ -1468,7 +1468,8 @@ function this:OnceDamaged(livego, livenode, dmg, bCrit, combat, skill, isLeft, t Color.New(1, 1, 1, 1), 0.1) end ) - + ]] + -- 播放受击动画 if isLastDamage and skill.Type == 2 then self:PlaySpineAnim(livenode:GetComponent(SpineComponentName), 0, RoleAnimationName.Hurt, false)