diff --git a/Configs/GameConfig/Datas/GiftConfig.xlsx b/Configs/GameConfig/Datas/GiftConfig.xlsx index abb09aa1..58e4e4bf 100644 Binary files a/Configs/GameConfig/Datas/GiftConfig.xlsx and b/Configs/GameConfig/Datas/GiftConfig.xlsx differ diff --git a/UnityProject/Assets/AssetArt/Atlas/UIRaw_Atlas_设置.spriteatlas b/UnityProject/Assets/AssetArt/Atlas/UIRaw_Atlas_设置.spriteatlas index 4da6d913..40c23fcf 100644 --- a/UnityProject/Assets/AssetArt/Atlas/UIRaw_Atlas_设置.spriteatlas +++ b/UnityProject/Assets/AssetArt/Atlas/UIRaw_Atlas_设置.spriteatlas @@ -78,6 +78,8 @@ SpriteAtlas: - {fileID: 21300000, guid: 90ff6c24e99837a429943af61460803d, type: 3} - {fileID: 21300000, guid: 38379376f62f30f499fd7ac3492d2927, type: 3} - {fileID: 21300000, guid: 8388756f67ab8f34e987e4a66d675c3d, type: 3} + - {fileID: 21300000, guid: ae7f8a6032a00f44b99ba0cf2411c29c, type: 3} + - {fileID: 21300000, guid: 8b4f678eb7503c84f8c90d64a665fdfd, type: 3} - {fileID: 21300000, guid: 2cdf6cf0c55426d46942d97e835267c3, type: 3} bindAsDefault: 1 isAtlasV2: 0 diff --git a/UnityProject/Assets/AssetRaw/Configs/bytes/giftconfig_tbgiftconfig.bytes b/UnityProject/Assets/AssetRaw/Configs/bytes/giftconfig_tbgiftconfig.bytes index 8f4b7d0b..0e95b62c 100644 Binary files a/UnityProject/Assets/AssetRaw/Configs/bytes/giftconfig_tbgiftconfig.bytes and b/UnityProject/Assets/AssetRaw/Configs/bytes/giftconfig_tbgiftconfig.bytes differ 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 00000000..a30996bf Binary files /dev/null and b/UnityProject/Assets/AssetRaw/UIRaw/Atlas/设置/xz_G.png differ diff --git a/UnityProject/Assets/AssetRaw/UIRaw/Atlas/设置/xz_G.png.meta b/UnityProject/Assets/AssetRaw/UIRaw/Atlas/设置/xz_G.png.meta new file mode 100644 index 00000000..98cadc61 --- /dev/null +++ b/UnityProject/Assets/AssetRaw/UIRaw/Atlas/设置/xz_G.png.meta @@ -0,0 +1,114 @@ +fileFormatVersion: 2 +guid: ae7f8a6032a00f44b99ba0cf2411c29c +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/AssetRaw/UIRaw/Atlas/设置/xz_k.png b/UnityProject/Assets/AssetRaw/UIRaw/Atlas/设置/xz_k.png new file mode 100644 index 00000000..5430c8c6 Binary files /dev/null and b/UnityProject/Assets/AssetRaw/UIRaw/Atlas/设置/xz_k.png differ 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) =>