diff --git a/UnityProject/Assets/AssetRaw/ZQDN/FX/Maerials/Suanli.mat b/UnityProject/Assets/AssetRaw/ZQDN/FX/Maerials/Suanli.mat
index ed3f61b5..d04a1fef 100644
--- a/UnityProject/Assets/AssetRaw/ZQDN/FX/Maerials/Suanli.mat
+++ b/UnityProject/Assets/AssetRaw/ZQDN/FX/Maerials/Suanli.mat
@@ -115,6 +115,7 @@ Material:
- _Metallic: 0
- _OcclusionStrength: 1
- _Parallax: 0.005
+ - _Power: 1
- _QueueControl: 0
- _QueueOffset: 0
- _ReceiveShadows: 1
diff --git a/UnityProject/Assets/AssetRaw/ZQDN/FX/Maerials/Suanli02.mat b/UnityProject/Assets/AssetRaw/ZQDN/FX/Maerials/Suanli02.mat
index 93975cf4..a14c2504 100644
--- a/UnityProject/Assets/AssetRaw/ZQDN/FX/Maerials/Suanli02.mat
+++ b/UnityProject/Assets/AssetRaw/ZQDN/FX/Maerials/Suanli02.mat
@@ -115,6 +115,7 @@ Material:
- _Metallic: 0
- _OcclusionStrength: 1
- _Parallax: 0.005
+ - _Power: 1
- _QueueControl: 0
- _QueueOffset: 0
- _ReceiveShadows: 1
diff --git a/UnityProject/Assets/GameScripts/HotFix/GameLogic/Manager/DataGameSceneManager.cs b/UnityProject/Assets/GameScripts/HotFix/GameLogic/Manager/DataGameSceneManager.cs
index 78eafc6f..1851e48f 100644
--- a/UnityProject/Assets/GameScripts/HotFix/GameLogic/Manager/DataGameSceneManager.cs
+++ b/UnityProject/Assets/GameScripts/HotFix/GameLogic/Manager/DataGameSceneManager.cs
@@ -260,8 +260,7 @@ namespace GameLogic
///
public void OnGiftFunc(GiftConfig giftConfig, int num, UnitPlayerData unitPlayerData)
{
- Buff buff = new Buff();
- buff.OnInit(giftConfig.Id, giftConfig.AddPower * num, giftConfig.TimerLen, giftConfig.AddGiftScore, num);
+
// 增加礼物积分
unitPlayerData.m_Score += giftConfig.AddGiftScore * num;
@@ -321,105 +320,31 @@ namespace GameLogic
}
- // 特殊Buff处理
- if (buff.isZoneTimer)
+ // 这里看看要不要怎么改
+ Buff buff = new Buff();
+ buff.OnInit(giftConfig.Id, giftConfig.AddPower * num, giftConfig.TimerLen, giftConfig.AddGiftScore, num);
+
+ // 减速Buff的处理
+ if (buff.addPower < 0)
{
- // 冻结
- //// 除了我自己以外,都挂这个Buff
- //var d = GetTeamActors();
- //var actor = DataGameSceneManager.Instance.GetTeamActor(unitPlayerData.teamId);
- //foreach (var item in d)
- //{
- // if (item.Value != actor)
- // {
- // item.Value.AddBuff(buff, unitPlayerData);
- // }
- // else
- // {
- // item.Value.ShowGift5Emoji();
- // }
- //}
+ // 特殊针对Id来处理效果吧.
+ if (buff.m_Id == 5)
+ {
+ // 龙卷风效果
+ // 随机挑取十个目标,除开自己
+ NlywGiftFunc();
+ }
}
else
{
- // 减速Buff的处理
- if (buff.addPower < 0)
+ var actor = GetTeamActor(unitPlayerData.teamId);
+ if (actor != null)
{
- //// 获取加速最快的星球
- //var actors = GetAllRankUnityPlayerData();
- //actors.Sort((a, b) =>
- //{
- // // 减速加速最高的
- // // if (a.GetAddPush() > b.GetAddPush())
- // // {
- // // return -1;
- // // }
- // // else
- // // {
- // // return 1;
- // // }
- // if (a.GetPush() > b.GetPush())
- // {
- // return -1;
- // }
- // else
- // {
- // return 1;
- // }
- //});
- //var actor = DataGameSceneManager.Instance.GetTeamActor(unitPlayerData.teamId);
- //// 减速Buff不能给自己挂
- //if (actor != actors[0])
- //{
- // // 只减速一次
- // actors[0].AddAllPush(buff.addPower);
- // actors[0].AddBuff(buff, unitPlayerData);
- //}
- //else
- //{
- // // 往下依次找
- // for (int i = 1; i < actors.Count; i++)
- // {
- // // 只减速一次
- // actors[i].AddAllPush(buff.addPower);
- // actors[i].AddBuff(buff, unitPlayerData);
- // break;
- // }
- //}
-
-
- //var d = GetTeamActors();
- //var m_actor = DataGameSceneManager.Instance.GetTeamActor(unitPlayerData.teamId);
- //foreach (var item in d)
- //{
- // if (item.Value == actor)
- // {
- // // 自己身上增加总值
- // item.Value.AddAllPush(Math.Abs(buff.addPower) / 2);
-
- // if (buff.m_Id == 3)
- // {
- // item.Value.ShowGift2Emoji();
- // }
- // else
- // {
- // // 自己Actor播放表情
- // item.Value.ShowGift4Emoji();
- // }
- // }
- //}
+ actor.AddBuff(buff, unitPlayerData);
}
else
{
- var actor = GetTeamActor(unitPlayerData.teamId);
- if (actor != null)
- {
- actor.AddBuff(buff, unitPlayerData);
- }
- else
- {
- Log.Error("没有找到自己对应的阵营:{0}", unitPlayerData.teamId);
- }
+ Log.Error("没有找到自己对应的阵营:{0}", unitPlayerData.teamId);
}
}
@@ -444,6 +369,14 @@ namespace GameLogic
}
+ ///
+ /// 能力药丸礼物效果
+ ///
+ private void NlywGiftFunc()
+ {
+
+ }
+
///
/// 游戏结算
///
diff --git a/UnityProject/ProjectSettings/ProjectSettings.asset b/UnityProject/ProjectSettings/ProjectSettings.asset
index 29ca532e..6da5fc6a 100644
--- a/UnityProject/ProjectSettings/ProjectSettings.asset
+++ b/UnityProject/ProjectSettings/ProjectSettings.asset
@@ -140,7 +140,8 @@ PlayerSettings:
visionOSBundleVersion: 1.0
tvOSBundleVersion: 1.0
bundleVersion: 1.0
- preloadedAssets: []
+ preloadedAssets:
+ - {fileID: 11400000, guid: 1c9597b80a255244890e76a9f243910b, type: 2}
metroInputSource: 0
wsaTransparentSwapchain: 0
m_HolographicPauseOnTrackingLoss: 1