PineappleTech/DefendNJ
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main' into main_ZYT

Browse Source 
# Conflicts:
#	Assets/Plugins/Android/AndroidManifest.xml
#	Assets/_DefendNJ/Scenes/Zhejiang_Shaoxing_Shengzhou_WuyueGuangchang.unity
#	Assets/_DefendNJ/Scripts/Manager/GameManager.cs
#	ProjectSettings/ProjectSettings.asset
This commit is contained in:
ZYT
2025-10-21 10:45:08 +08:00
parent 45bab0e1e5 7bc3335044
commit 9305d26f25
8 changed files with 236 additions and 289 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
Assets/_DefendNJ/Scripts/Player.cs
View File

@@ -127,25 +127,10 @@ public class Player : NetworkRoomPlayer,IDamagable
Vector3 directionFormHit=(transform.position-_sender.position).normalized;
float angle = Vector3.Angle(forward, directionFormHit);
int index = Random.Range(0, 4);
TrueGearEffectManager.Ins.OnHit(angle > 90,index,false);
if(TrueGearEffectManager.Ins!=null)
TrueGearEffectManager.Ins.OnHit(angle > 90,index,false);
}
#endif
// if (currentHp <= 0 && IsAlive)
// {
// IsAlive = false;
// isDie = true;
// GameLocal.Ins.DieUI.SetActive(true);
// GameManager.Ins.PlaySound2DRPC("1.35");
// MonoSingleton<CoroutineTaskManager>.Instance.WaitSecondTodo(() =>
// {
// IsAlive = true;
// isDie = false;
// GameLocal.Ins.DieUI.SetActive(false);
// currentHp = maxHp;
// EventDispatcher.TriggerEvent("HpChange", currentHp, maxHp);
// time = 0f;
// }, 5f, this);
// }
if (currentHp > 0)
{
GameLocal.Ins.HitUI.SetActive(true);