diff --git a/UnityProject/Assets/AssetRaw/DLL/GameLogic.dll.bytes b/UnityProject/Assets/AssetRaw/DLL/GameLogic.dll.bytes index f9c50dcb..894f1589 100644 Binary files a/UnityProject/Assets/AssetRaw/DLL/GameLogic.dll.bytes and b/UnityProject/Assets/AssetRaw/DLL/GameLogic.dll.bytes differ diff --git a/UnityProject/Assets/AssetRaw/Fonts/SourceHanSansCN-Bold test SDF 2.asset b/UnityProject/Assets/AssetRaw/Fonts/SourceHanSansCN-Bold test SDF 2.asset index 50c70855..571fd4f0 100644 --- a/UnityProject/Assets/AssetRaw/Fonts/SourceHanSansCN-Bold test SDF 2.asset +++ b/UnityProject/Assets/AssetRaw/Fonts/SourceHanSansCN-Bold test SDF 2.asset @@ -164299,7 +164299,7 @@ Material: - _OutlineSoftness: 0 - _OutlineUVSpeedX: 0 - _OutlineUVSpeedY: 0 - - _OutlineWidth: 0.04 + - _OutlineWidth: 0.05 - _PerspectiveFilter: 0.875 - _Reflectivity: 10 - _ScaleRatioA: 0.8333333 diff --git a/UnityProject/Assets/AssetRaw/UI/GiftItem.prefab b/UnityProject/Assets/AssetRaw/UI/GiftItem.prefab index 72d98347..10073abd 100644 --- a/UnityProject/Assets/AssetRaw/UI/GiftItem.prefab +++ b/UnityProject/Assets/AssetRaw/UI/GiftItem.prefab @@ -34841,7 +34841,7 @@ MonoBehaviour: m_GiftName: {fileID: 4498083401356541153} m_InfoTex: {fileID: 2874010131932181680} m_NumTex: {fileID: 1816369889891508950} - m_tmpTeamName: {fileID: 3204217026467600319} + m_tmpTeamName: {fileID: 5906141819516901986} m_HeadIcon: {fileID: 2011421134320649736} m_GiftIcon: {fileID: 2335167136819988394} --- !u!1 &5934200575477332767 @@ -45318,9 +45318,10 @@ GameObject: m_Component: - component: {fileID: 856792957527317083} - component: {fileID: 954154817142719255} - - component: {fileID: 3204217026467600319} - component: {fileID: 5635233568398073976} - component: {fileID: 5732155632805487244} + - component: {fileID: 5906141819516901986} + - component: {fileID: 4710055511729962580} m_Layer: 5 m_Name: m_tmpTeamName m_TagString: Untagged @@ -45337,14 +45338,14 @@ RectTransform: m_GameObject: {fileID: 7571786204945842617} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 4.5, y: 4.5, z: 4.5} + m_LocalScale: {x: 1.0389197, y: 1.0389197, z: 1.0389197} m_ConstrainProportionsScale: 1 m_Children: [] m_Father: {fileID: 7624285183303651507} 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: -197.3, y: 14.5} + m_AnchoredPosition: {x: -188.5, y: 14.5} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &954154817142719255 @@ -45355,95 +45356,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7571786204945842617} m_CullTransparentMesh: 1 ---- !u!114 &3204217026467600319 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7571786204945842617} - 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: "\u674E" - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 7352697a7890e9149a3665d661f8589c, type: 2} - m_sharedMaterial: {fileID: 287740055413847867, guid: 7352697a7890e9149a3665d661f8589c, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4284415862 - m_fontColor: {r: 0.4627451, g: 1, b: 0.36862746, 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: 16 - m_fontSizeBase: 16 - 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!223 &5635233568398073976 Canvas: m_ObjectHideFlags: 0 @@ -45488,6 +45400,55 @@ Animator: m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorStateOnDisable: 0 m_WriteDefaultValuesOnDisable: 0 +--- !u!114 &5906141819516901986 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7571786204945842617} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.4627451, g: 1, b: 0.36862746, 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_FontData: + m_Font: {fileID: 12800000, guid: f8cafd7c799783241bc6430e405df799, type: 3} + m_FontSize: 85 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 126 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u674E" +--- !u!114 &4710055511729962580 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7571786204945842617} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 0, g: 0, b: 0, a: 1} + m_EffectDistance: {x: 2, y: -2} + m_UseGraphicAlpha: 1 --- !u!1 &7926389245939234333 GameObject: m_ObjectHideFlags: 0 diff --git a/UnityProject/Assets/GameScripts/HotFix/GameLogic/Actor/ActorHItem.cs b/UnityProject/Assets/GameScripts/HotFix/GameLogic/Actor/ActorHItem.cs index 5a024845..b95fa23f 100644 --- a/UnityProject/Assets/GameScripts/HotFix/GameLogic/Actor/ActorHItem.cs +++ b/UnityProject/Assets/GameScripts/HotFix/GameLogic/Actor/ActorHItem.cs @@ -313,53 +313,58 @@ namespace GameLogic if (buff.m_Id == 5) { // 龙卷风特效特殊处理 + int count = buff.num >= 20 ? 20 : buff.num; - - for (int j = 0; j < 5; j++) + for (int i = 0; i < count; i++) { - // 生成特效 - var eGo = GameModule.Resource.LoadGameObject(giftConfig.EffectName); - eGo.transform.SetParent(GetRect().transform); - eGo.transform.localPosition = new Vector3(1500, 0, 0); - eGo.transform.localScale = Vector3.one; - - // 动画异步执行，不阻塞主流程 - eGo.transform.DOLocalMoveX(0, 1.5f).OnComplete(() => + for (int j = 0; j < 5; j++) { - // 生成新爆点 - var eGoBoom = GameModule.Resource.LoadGameObject("LJF_Boom"); - eGoBoom.transform.SetParent(m_rectCar.transform); - eGoBoom.transform.localPosition = new Vector3(0, 0, 0); - eGoBoom.transform.localScale = Vector3.one; - eGoBoom.gameObject.SetActive(true); + // 生成特效 + var eGo = GameModule.Resource.LoadGameObject(giftConfig.EffectName); + eGo.transform.SetParent(GetRect().transform); + eGo.transform.localPosition = new Vector3(1500, 0, 0); + eGo.transform.localScale = Vector3.one; - eGoBoom.transform.DOLocalMoveX(0, 3f).OnComplete(async () => + // 动画异步执行，不阻塞主流程 + eGo.transform.DOLocalMoveX(0, 1.5f).OnComplete(() => { - // 特效播放完毕后销毁 - GameObject.Destroy(eGoBoom); + // 生成新爆点 + var eGoBoom = GameModule.Resource.LoadGameObject("LJF_Boom"); + eGoBoom.transform.SetParent(m_rectCar.transform); + eGoBoom.transform.localPosition = new Vector3(0, 0, 0); + eGoBoom.transform.localScale = Vector3.one; + eGoBoom.gameObject.SetActive(true); + + eGoBoom.transform.DOLocalMoveX(0, 3f).OnComplete(async () => + { + // 特效播放完毕后销毁 + GameObject.Destroy(eGoBoom); + }); + + SetCurrenFill(); + + // 直接扣 + m_AllPush += (int)buff.addPower / 5; + + if (m_AllPush <= 0) + { + m_AllPush = 0; + } + + GameObject.Destroy(eGo); }); - SetCurrenFill(); - // 直接扣 - m_AllPush += (int)buff.addPower / 5; - - if (m_AllPush <= 0) - { - m_AllPush = 0; - } - - GameObject.Destroy(eGo); - }); - - - // 严格每500ms生成一个特效 - await UniTask.Delay(500); + // 严格每500ms生成一个特效 + await UniTask.Delay(500); + } } + + return; } else if (buff.m_Id == 1) diff --git a/UnityProject/Assets/GameScripts/HotFix/GameLogic/Actor/Buff/Buff.cs b/UnityProject/Assets/GameScripts/HotFix/GameLogic/Actor/Buff/Buff.cs index d4bdc6bc..ba0881c1 100644 --- a/UnityProject/Assets/GameScripts/HotFix/GameLogic/Actor/Buff/Buff.cs +++ b/UnityProject/Assets/GameScripts/HotFix/GameLogic/Actor/Buff/Buff.cs @@ -14,6 +14,7 @@ public class Buff public int addScale = 0; public GameObject m_EffectGo; + public int num; public void OnInit(int id, float value, int timerLen, int addScale, int num) { m_Id = id; @@ -28,6 +29,7 @@ public class Buff m_AllTimer = timerLen; } + this.num = num; } } \ No newline at end of file diff --git a/UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UIGiftItem.cs b/UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UIGiftItem.cs index dfff1b74..8ae18342 100644 --- a/UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UIGiftItem.cs +++ b/UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UIGiftItem.cs @@ -17,7 +17,7 @@ namespace GameLogic public TextMeshProUGUI m_GiftName; public TextMeshProUGUI m_InfoTex; public TextMeshProUGUI m_NumTex; - public TextMeshProUGUI m_tmpTeamName; + public Text m_tmpTeamName; public RawImage m_HeadIcon; public Image m_GiftIcon; //public Image m_Group;