From f18b93b235817f234dcc4ab5649a48b02b869be3 Mon Sep 17 00:00:00 2001 From: "DESKTOP-SAJ6RKV\\Administrator" Date: Thu, 29 May 2025 16:43:56 +0800 Subject: [PATCH] =?UTF-8?q?=E7=82=B9=E8=B5=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Assets/AssetRaw/UI/UIGameBattle.prefab | 229 +++++++++++------- .../ZQDN/FX/Shaders/Shader Graphs_nao.mat | 2 +- .../HotFix/GameLogic/Actor/ActorHItem.cs | 10 +- .../HotFix/GameLogic/UI/UIPlayerAddNumItem.cs | 60 +++++ .../GameLogic/UI/UIPlayerAddNumItem.cs.meta | 11 + 5 files changed, 214 insertions(+), 98 deletions(-) create mode 100644 UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UIPlayerAddNumItem.cs create mode 100644 UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UIPlayerAddNumItem.cs.meta diff --git a/UnityProject/Assets/AssetRaw/UI/UIGameBattle.prefab b/UnityProject/Assets/AssetRaw/UI/UIGameBattle.prefab index dc4c9101..ed34c4c6 100644 --- a/UnityProject/Assets/AssetRaw/UI/UIGameBattle.prefab +++ b/UnityProject/Assets/AssetRaw/UI/UIGameBattle.prefab @@ -5612,7 +5612,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &9171262180880956483 RectTransform: m_ObjectHideFlags: 0 @@ -36394,6 +36394,140 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &2850501689597349616 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3000817103932849290} + - component: {fileID: 1487515691843360137} + - component: {fileID: 8924575970750067794} + m_Layer: 5 + m_Name: m_tmp_addNum + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3000817103932849290 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2850501689597349616} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 3600857068495130212} + 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.000045776367, y: -0.00007247925} + m_SizeDelta: {x: 52.1644, y: 31} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1487515691843360137 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2850501689597349616} + m_CullTransparentMesh: 1 +--- !u!114 &8924575970750067794 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2850501689597349616} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: +1 + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 22.24 + m_fontSizeBase: 22.24 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!1 &2880550020423972645 GameObject: m_ObjectHideFlags: 0 @@ -51953,7 +52087,6 @@ GameObject: m_Component: - component: {fileID: 3600857068495130212} - component: {fileID: 658461650971245635} - - component: {fileID: 4406288740564388502} m_Layer: 5 m_Name: m_itemAddNum m_TagString: Untagged @@ -51972,7 +52105,8 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: -26.6} m_LocalScale: {x: 1.6666665, y: 1.6666665, z: 1.6666665} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 3000817103932849290} m_Father: {fileID: 9171262180880956483} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -51988,95 +52122,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5019063949487602446} m_CullTransparentMesh: 1 ---- !u!114 &4406288740564388502 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5019063949487602446} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_text: +1 - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 22.24 - m_fontSizeBase: 22.24 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 72 - m_fontStyle: 0 - m_HorizontalAlignment: 2 - m_VerticalAlignment: 512 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!1 &5046560702088191477 GameObject: m_ObjectHideFlags: 0 diff --git a/UnityProject/Assets/AssetRaw/ZQDN/FX/Shaders/Shader Graphs_nao.mat b/UnityProject/Assets/AssetRaw/ZQDN/FX/Shaders/Shader Graphs_nao.mat index 6cc84cc2..6d76ecac 100644 --- a/UnityProject/Assets/AssetRaw/ZQDN/FX/Shaders/Shader Graphs_nao.mat +++ b/UnityProject/Assets/AssetRaw/ZQDN/FX/Shaders/Shader Graphs_nao.mat @@ -41,7 +41,7 @@ Material: m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: - - _Alpha: 1 + - _Alpha: 0.60134923 - _Light: 1 - _QueueControl: 0 - _QueueOffset: 0 diff --git a/UnityProject/Assets/GameScripts/HotFix/GameLogic/Actor/ActorHItem.cs b/UnityProject/Assets/GameScripts/HotFix/GameLogic/Actor/ActorHItem.cs index a9637057..890498e5 100644 --- a/UnityProject/Assets/GameScripts/HotFix/GameLogic/Actor/ActorHItem.cs +++ b/UnityProject/Assets/GameScripts/HotFix/GameLogic/Actor/ActorHItem.cs @@ -288,12 +288,9 @@ namespace GameLogic actorHItem.gameObject.SetActive(true); actorHItem.transform.DOLocalMoveX(0, 4f).OnComplete(async () => { - // 显示一下脑袋 - //m_rectNao.GetComponent().material.SetFloat("_Alpha", 1); - // 显示一下脑袋 var naoMat = m_rectNao.GetComponent().material; - //naoMat.SetFloat("_Alpha", 1); + m_rectNao.gameObject.SetActive(true); // _Alpha 0~1 闪烁3次 int flashCount = 3; @@ -318,8 +315,11 @@ namespace GameLogic () => naoMat.GetFloat("_Alpha"), x => naoMat.SetFloat("_Alpha", x), 1f, 0.18f - ).SetEase(Ease.OutQuad)); + ).SetEase(Ease.OutQuad)).OnComplete(() => { m_rectNao.gameObject.SetActive(false); }); + UIPlayerAddNumItem actorHItem = CreateWidgetByPrefab + (m_itemAddNum, m_rectNao, true); + //actorHItem.OnInit(data); await UniTask.Delay(2000); diff --git a/UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UIPlayerAddNumItem.cs b/UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UIPlayerAddNumItem.cs new file mode 100644 index 00000000..c409a97f --- /dev/null +++ b/UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UIPlayerAddNumItem.cs @@ -0,0 +1,60 @@ +using UnityEngine; +using UnityEngine.UI; +using TEngine; +using TMPro; +using DG.Tweening; +using Cysharp.Threading.Tasks; + +namespace GameLogic +{ + [Window(UILayer.UI)] + class UIPlayerAddNumItem : UIWidget + { + #region űɵĴ + private TextMeshProUGUI m_tmp_addNum; + protected override void ScriptGenerator() + { + m_tmp_addNum = FindChildComponent("m_tmp_addNum"); + } + #endregion + + #region ¼ + #endregion + + + protected override void OnCreate() + { + base.OnCreate(); + + // ʵĴСı仯Ҵд0-1͸仯 + if (m_tmp_addNum != null) + { + // ʼź͸ + m_tmp_addNum.transform.localScale = Vector3.one * 0.2f; + var color = m_tmp_addNum.color; + color.a = 0f; + m_tmp_addNum.color = color; + + // ŵ1͸1 + float duration = 0.35f; + m_tmp_addNum.transform.DOScale(Vector3.one, duration).SetEase(Ease.OutBack); + DOTween.To( + () => m_tmp_addNum.color.a, + a => + { + var c = m_tmp_addNum.color; + c.a = a; + m_tmp_addNum.color = c; + }, + 1f, duration + ).SetEase(Ease.OutQuad).OnComplete(async () => + { + await UniTask.Delay(1000); + Destroy(); + }); + } + } + + + } +} diff --git a/UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UIPlayerAddNumItem.cs.meta b/UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UIPlayerAddNumItem.cs.meta new file mode 100644 index 00000000..cebe0147 --- /dev/null +++ b/UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UIPlayerAddNumItem.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: cd1185449af0918429ca26762c0793b6 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: