Cjw/Zqdn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

处理设置界面。处理仙女棒效果。开始逐个验证礼物效果问题

Browse Source
This commit is contained in:
DESKTOP-SAJ6RKV\Administrator 2025-05-07 20:33:41 +08:00
parent 8b8531e896
commit 73c2a26f8b
11 changed files with 292 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Configs/GameConfig/Datas/GiftConfig.xlsx
View File

Binary file not shown.

2
UnityProject/Assets/AssetArt/Atlas/UIRaw_Atlas_设置.spriteatlas
View File

@ -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

BIN
UnityProject/Assets/AssetRaw/Configs/bytes/giftconfig_tbgiftconfig.bytes
View File

Binary file not shown.

2
UnityProject/Assets/AssetRaw/Effects/Liwu/SlowDown.prefab
View File

@ -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}

16
UnityProject/Assets/AssetRaw/UI/UISettingForm.prefab
View File

@ -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

BIN
UnityProject/Assets/AssetRaw/UIRaw/Atlas/设置/xz_G.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.8 KiB

114
UnityProject/Assets/AssetRaw/UIRaw/Atlas/设置/xz_G.png.meta Normal file
View File

@ -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:

BIN
UnityProject/Assets/AssetRaw/UIRaw/Atlas/设置/xz_k.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 229 B

114
UnityProject/Assets/AssetRaw/UIRaw/Atlas/设置/xz_k.png.meta Normal file
View File

@ -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:

22
UnityProject/Assets/GameScripts/HotFix/GameLogic/Actor/ActorHItem.cs
View File

@ -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
{
// 加载常规特效

74
UnityProject/Assets/GameScripts/HotFix/GameLogic/Manager/DataGameSceneManager.cs
View File

@ -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<ActorHItem> m_TempList = new List<ActorHItem>();
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) =>