From 5c237203c4527cb14530bc726400b7eee4f63492 Mon Sep 17 00:00:00 2001 From: "PC-202302260912\\Administrator" <1545929779@qq.com> Date: Mon, 22 Apr 2024 11:17:51 +0800 Subject: [PATCH] =?UTF-8?q?=E8=8B=B1=E9=9B=84=E6=8A=80=E8=83=BD=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Casting/TongYong_Casting_Shang.prefab | 47 ++++++++++++++----- .../Casting/TongYong_Casting_Xia.prefab | 47 ++++++++++++++----- .../Modules/Battle/View/Unit/SkillCaster.lua | 26 +++++++--- 3 files changed, 87 insertions(+), 33 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/Effect/Casting/TongYong_Casting_Shang.prefab b/Assets/ManagedResources/Prefabs/Effect/Casting/TongYong_Casting_Shang.prefab index 121b8f101b..152adab8c7 100644 --- a/Assets/ManagedResources/Prefabs/Effect/Casting/TongYong_Casting_Shang.prefab +++ b/Assets/ManagedResources/Prefabs/Effect/Casting/TongYong_Casting_Shang.prefab @@ -19487,7 +19487,8 @@ GameObject: m_Component: - component: {fileID: 6210025963956660393} - component: {fileID: 6210025963956660395} - - component: {fileID: 6210025963956660392} + - component: {fileID: 4430462388427827439} + - component: {fileID: 796276691613772488} m_Layer: 5 m_Name: MingZi m_TagString: Untagged @@ -19522,7 +19523,7 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6210025963956660390} m_CullTransparentMesh: 0 ---- !u!114 &6210025963956660392 +--- !u!114 &4430462388427827439 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -19531,26 +19532,46 @@ MonoBehaviour: m_GameObject: {fileID: 6210025963956660390} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 717135bcfefb4de4ea2a3891ba57cf59, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 + m_FontData: + m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3} + m_FontSize: 120 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 1 + m_MaxSize: 120 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: +--- !u!114 &796276691613772488 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6210025963956660390} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5} + m_EffectDistance: {x: 1, y: -1} + m_UseGraphicAlpha: 1 --- !u!1 &6210025963997851656 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/Prefabs/Effect/Casting/TongYong_Casting_Xia.prefab b/Assets/ManagedResources/Prefabs/Effect/Casting/TongYong_Casting_Xia.prefab index 72a01d6e58..be7c5e9e88 100644 --- a/Assets/ManagedResources/Prefabs/Effect/Casting/TongYong_Casting_Xia.prefab +++ b/Assets/ManagedResources/Prefabs/Effect/Casting/TongYong_Casting_Xia.prefab @@ -9495,7 +9495,7 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1562542636749713267} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.9999203, y: 0.9999203, z: 0.9999203} m_Children: @@ -42926,7 +42926,8 @@ GameObject: m_Component: - component: {fileID: 8054458067301812853} - component: {fileID: 290054207472753219} - - component: {fileID: 352228953634943702} + - component: {fileID: 3817091380129399062} + - component: {fileID: 8828069195720770377} m_Layer: 5 m_Name: MingZi m_TagString: Untagged @@ -42961,7 +42962,7 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6469775066446585333} m_CullTransparentMesh: 0 ---- !u!114 &352228953634943702 +--- !u!114 &3817091380129399062 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -42970,7 +42971,7 @@ MonoBehaviour: m_GameObject: {fileID: 6469775066446585333} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} @@ -42981,15 +42982,35 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 0015567be3431ae46a56fc5ec36246d7, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 + m_FontData: + m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3} + m_FontSize: 120 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 1 + m_MaxSize: 120 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: +--- !u!114 &8828069195720770377 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6469775066446585333} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5} + m_EffectDistance: {x: 1, y: -1} + m_UseGraphicAlpha: 1 --- !u!1 &8078758166106333886 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/SkillCaster.lua b/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/SkillCaster.lua index 14fe16d6d0..94193a1bab 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/SkillCaster.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/SkillCaster.lua @@ -2,7 +2,7 @@ local Bezier = require("Base.Bezier") local SkillLogicConfig = ConfigManager.GetConfig(ConfigName.SkillLogicConfig) local BuffEffectConfig = ConfigManager.GetConfig(ConfigName.BuffEffectConfig) - +local skillConfig=ConfigManager.GetConfig(ConfigName.SkillConfig) SkillCaster = {} function SkillCaster.New(unit, actionTime, soundTime, soundName, castingEfectNode, castingNameNode) @@ -114,13 +114,25 @@ function SkillCaster:PlaySkillCastingEffect(combat, skill, func) self.castingEfectNode:SetActive(true) -- 播放casting声音 SoundManager.PlaySound(SoundConfig.Sound_RoleCasting) - if combat.skillname and combat.skillname ~= "" then + --if combat.skillname and combat.skillname ~= "" then self.castingNameNode:SetActive(true) - self.castingNameNode:GetComponent("Image").sprite = self.spLoader:LoadSprite(combat.skillname) - self.castingNameNode:GetComponent("Image"):SetNativeSize() - else - self.castingNameNode:SetActive(false) - end + local name="" + if skillConfig[combat.Id] then + name=skillConfig[combat.Id].Name + end + -- LogError("name============================================="..name) + local nameTxt=self.castingNameNode:GetComponent("Text") + if nameTxt then + nameTxt.text=name + else + if combat.skillname and combat.skillname ~= "" then + self.castingNameNode:GetComponent("Image").sprite=self.spLoader:LoadSprite(combat.skillname) + self.castingNameNode:GetComponent("Image"):SetNativeSize() + else + self.castingNameNode:SetActive(false) + end + end + -- 技能名音效 if IS_PLAY_VOICE and combat.SkillNameVoice and GetCurLanguage() == 0 then SoundManager.PlaySound(combat.SkillNameVoice)