From 73c2a26f8b1d6208ded28d8e92dac89d9c50a416 Mon Sep 17 00:00:00 2001 From: "DESKTOP-SAJ6RKV\\Administrator" Date: Wed, 7 May 2025 20:33:41 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=E8=AE=BE=E7=BD=AE=E7=95=8C?= =?UTF-8?q?=E9=9D=A2=E3=80=82=E5=A4=84=E7=90=86=E4=BB=99=E5=A5=B3=E6=A3=92?= =?UTF-8?q?=E6=95=88=E6=9E=9C=E3=80=82=E5=BC=80=E5=A7=8B=E9=80=90=E4=B8=AA?= =?UTF-8?q?=E9=AA=8C=E8=AF=81=E7=A4=BC=E7=89=A9=E6=95=88=E6=9E=9C=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Configs/GameConfig/Datas/GiftConfig.xlsx | Bin 11632 -> 11669 bytes .../Atlas/UIRaw_Atlas_设置.spriteatlas | 2 + .../bytes/giftconfig_tbgiftconfig.bytes | Bin 1037 -> 947 bytes .../AssetRaw/Effects/Liwu/SlowDown.prefab | 2 +- .../Assets/AssetRaw/UI/UISettingForm.prefab | 16 +-- .../Assets/AssetRaw/UIRaw/Atlas/设置/xz_G.png | Bin 0 -> 2832 bytes .../AssetRaw/UIRaw/Atlas/设置/xz_G.png.meta | 114 ++++++++++++++++++ .../Assets/AssetRaw/UIRaw/Atlas/设置/xz_k.png | Bin 0 -> 229 bytes .../AssetRaw/UIRaw/Atlas/设置/xz_k.png.meta | 114 ++++++++++++++++++ .../HotFix/GameLogic/Actor/ActorHItem.cs | 22 +++- .../GameLogic/Manager/DataGameSceneManager.cs | 74 +++++------- 11 files changed, 292 insertions(+), 52 deletions(-) create mode 100644 UnityProject/Assets/AssetRaw/UIRaw/Atlas/设置/xz_G.png create mode 100644 UnityProject/Assets/AssetRaw/UIRaw/Atlas/设置/xz_G.png.meta create mode 100644 UnityProject/Assets/AssetRaw/UIRaw/Atlas/设置/xz_k.png create mode 100644 UnityProject/Assets/AssetRaw/UIRaw/Atlas/设置/xz_k.png.meta diff --git a/Configs/GameConfig/Datas/GiftConfig.xlsx b/Configs/GameConfig/Datas/GiftConfig.xlsx index abb09aa169da906b49b137ad3fb11294f226a115..58e4e4bf23086c0e62afc820adb853207cc8129a 100644 GIT binary patch delta 3903 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 delta 3839 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 diff --git a/UnityProject/Assets/AssetRaw/Effects/Liwu/SlowDown.prefab b/UnityProject/Assets/AssetRaw/Effects/Liwu/SlowDown.prefab index ca0b6e70..e523b19e 100644 --- a/UnityProject/Assets/AssetRaw/Effects/Liwu/SlowDown.prefab +++ b/UnityProject/Assets/AssetRaw/Effects/Liwu/SlowDown.prefab @@ -9816,7 +9816,7 @@ RectTransform: m_GameObject: {fileID: 5540680257325863388} 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_LocalScale: {x: 0, y: 0, z: 0} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 5016387794097707279} diff --git a/UnityProject/Assets/AssetRaw/UI/UISettingForm.prefab b/UnityProject/Assets/AssetRaw/UI/UISettingForm.prefab index 41486d35..4f181740 100644 --- a/UnityProject/Assets/AssetRaw/UI/UISettingForm.prefab +++ b/UnityProject/Assets/AssetRaw/UI/UISettingForm.prefab @@ -301,7 +301,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 23.1, y: -31} - m_SizeDelta: {x: 30, y: 31} + m_SizeDelta: {x: 58, y: 54} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8739395860610228757 CanvasRenderer: @@ -331,7 +331,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 0cd3a86ab5af61940a4ef89efba998be, type: 3} + m_Sprite: {fileID: 21300000, guid: 8b4f678eb7503c84f8c90d64a665fdfd, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -536,7 +536,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 26, y: 21} + m_SizeDelta: {x: 84, y: 63} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1675534082403396542 CanvasRenderer: @@ -566,7 +566,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 3612d55d115756e48b6c4ba8ba278d74, type: 3} + m_Sprite: {fileID: 21300000, guid: ae7f8a6032a00f44b99ba0cf2411c29c, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1171,7 +1171,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 26, y: 21} + m_SizeDelta: {x: 84, y: 63} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3505148106962050770 CanvasRenderer: @@ -1201,7 +1201,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 3612d55d115756e48b6c4ba8ba278d74, type: 3} + m_Sprite: {fileID: 21300000, guid: ae7f8a6032a00f44b99ba0cf2411c29c, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1448,7 +1448,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 23.1, y: -31} - m_SizeDelta: {x: 30, y: 31} + m_SizeDelta: {x: 58, y: 54} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6995287902266689318 CanvasRenderer: @@ -1478,7 +1478,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 0cd3a86ab5af61940a4ef89efba998be, type: 3} + m_Sprite: {fileID: 21300000, guid: 8b4f678eb7503c84f8c90d64a665fdfd, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/UnityProject/Assets/AssetRaw/UIRaw/Atlas/设置/xz_G.png b/UnityProject/Assets/AssetRaw/UIRaw/Atlas/设置/xz_G.png new file mode 100644 index 0000000000000000000000000000000000000000..a30996bffafccb13afb332bad1fbac5481c633e0 GIT binary patch literal 2832 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 literal 0 HcmV?d00001 diff --git a/UnityProject/Assets/AssetRaw/UIRaw/Atlas/设置/xz_k.png.meta b/UnityProject/Assets/AssetRaw/UIRaw/Atlas/设置/xz_k.png.meta new file mode 100644 index 00000000..77c55d77 --- /dev/null +++ b/UnityProject/Assets/AssetRaw/UIRaw/Atlas/设置/xz_k.png.meta @@ -0,0 +1,114 @@ +fileFormatVersion: 2 +guid: 8b4f678eb7503c84f8c90d64a665fdfd +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 0 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/GameScripts/HotFix/GameLogic/Actor/ActorHItem.cs b/UnityProject/Assets/GameScripts/HotFix/GameLogic/Actor/ActorHItem.cs index 5e5fd16b..02f174fd 100644 --- a/UnityProject/Assets/GameScripts/HotFix/GameLogic/Actor/ActorHItem.cs +++ b/UnityProject/Assets/GameScripts/HotFix/GameLogic/Actor/ActorHItem.cs @@ -123,7 +123,22 @@ namespace GameLogic foreach (var buff in m_tempBuffList) { Log.Debug("移除Buff列表:" + buff.m_Id); - GameObject.Destroy(buff.m_EffectGo); + if (buff.m_EffectGo != null) + { + GameObject.Destroy(buff.m_EffectGo); + } + + // 红仙女棒的特殊处理 + if (buff.m_Id == 2) + { + // 二次判断Buff列表是否还有此类型的Buff + if (item.Value.Find(x => x.m_Id == 2) == null) + { + // 如果没有,则关闭材质球的开关 + m_imgValue.material.SetFloat("_UseOneEM", 0); + } + } + item.Value.Remove(buff); } } @@ -167,6 +182,11 @@ namespace GameLogic LoadEffectGo(giftConfig, buff); } } + else if (buff.m_Id == 2) + { + // 红仙女棒的加速效果特殊处理，因为这个效果并不是加载特效，而是材质球上的材质开关 + m_imgValue.material.SetFloat("_UseOneEM", 1); + } else { // 加载常规特效 diff --git a/UnityProject/Assets/GameScripts/HotFix/GameLogic/Manager/DataGameSceneManager.cs b/UnityProject/Assets/GameScripts/HotFix/GameLogic/Manager/DataGameSceneManager.cs index fdfe894c..c214e69e 100644 --- a/UnityProject/Assets/GameScripts/HotFix/GameLogic/Manager/DataGameSceneManager.cs +++ b/UnityProject/Assets/GameScripts/HotFix/GameLogic/Manager/DataGameSceneManager.cs @@ -321,40 +321,6 @@ namespace GameLogic } - //// 这里看看要不要怎么改 - //Buff buff = new Buff(); - //buff.OnInit(giftConfig.Id, giftConfig.AddPower * num, giftConfig.TimerLen, giftConfig.AddGiftScore, num); - - //// 减速Buff的处理 - //if (buff.addPower < 0) - //{ - // // 特殊针对Id来处理效果吧. - // if (buff.m_Id == 5) - // { - // // 龙卷风效果 - // // 随机挑取十个目标,除开自己 - // NlywGiftFunc(); - // } - //} - //else - //{ - // var actor = GetTeamActor(unitPlayerData.teamId); - // if (actor != null) - // { - // actor.AddBuff(buff, unitPlayerData); - // } - // else - // { - // Log.Error("没有找到自己对应的阵营:{0}", unitPlayerData.teamId); - // } - //} - - // if (giftConfig.Id != 1) - // { - // // 发送玩家送礼事件 - // GameEvent.Send(EventConts.AddGiftMessage, unitPlayerData, giftConfig, num); - // } - // 整个Buff系统看看如何重构一下，部分礼物效果并不好实现 if (giftConfig.Id == 1) { @@ -370,9 +336,6 @@ namespace GameLogic return; } - // 这里是有两个Buff，一个是增加永久推力 - // 一个是增加临时推力 - // 生成一个Buff添加.并没有特殊效果 actor.AddBuff(new Buff() { @@ -392,8 +355,32 @@ namespace GameLogic return; } - // 这里是有两个Buff，一个是增加永久推力 - // 一个是增加临时推力 + List m_TempList = new List(); + + foreach (var item in m_DicTeamList) + { + if (item.Value != actor) + { + m_TempList.Add(item.Value); + } + } + + // 随机取三个阵营,扔减速Buff,并且排除自己 + for (int i = 0; i < 3; i++) + { + if (m_TempList.Count <= 0) + { + break; + } + int index = UnityEngine.Random.Range(0, m_TempList.Count); + var item = m_TempList[index]; + m_TempList.RemoveAt(index); + // 添加减速Buff + Buff m_Buff1 = new Buff(); + m_Buff1.OnInit(giftConfig.Id, giftConfig.AddPower * num, giftConfig.TimerLen, giftConfig.AddGiftScore, num); + item.AddBuff(m_Buff1, unitPlayerData, giftConfig); + + } // 生成一个Buff添加.并没有特殊效果 actor.AddBuff(new Buff() @@ -414,9 +401,6 @@ namespace GameLogic return; } - // 这里是有两个Buff，一个是增加永久推力 - // 一个是增加临时推力 - // 生成一个Buff添加.并没有特殊效果 actor.AddBuff(new Buff() { @@ -453,6 +437,12 @@ namespace GameLogic } + if (giftConfig.Id != 1) + { + // 发送玩家送礼事件 + GameEvent.Send(EventConts.AddGiftMessage, unitPlayerData, giftConfig, num); + } + // 每次积分变动 m_TeamSortList.Sort((a, b) =>