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

Merge remote-tracking branch 'origin/L-jiahuan' into main_ZYT

Browse Source 
# Conflicts:
#	Assets/Resources/~$银河守护者-广西桂林恭城世纪鑫诚.xlsm.meta
#	Assets/Resources/~$银河守护者-江苏徐州丰县吾悦广场.xlsm.meta
#	Assets/Resources/银河守护者-辽宁鞍山立山大悦城.xlsm.meta
#	Assets/StreamingAssets/build_info
This commit is contained in:
ZYT
2025-09-28 18:15:27 +08:00
parent 4ce116ca53 155ebb1f14
commit bec512d3f8
15 changed files with 420 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Assets/Scripts/Enemy/Boss/Boss.cs
View File

@@ -258,7 +258,7 @@ public class Boss : Enemy
}
if (GameInit.Ins.gamePlace == GamePlace.Guangxi_Guilin_Gongcheng_Shijixincheng)
{
transform.DOMove(new Vector3(-7.28f, 3f, 11.31f), 4).OnComplete(() =>
transform.DOMove(new Vector3(-3.41f, 3f, 10.27f), 4).OnComplete(() =>
{
Both();
});

2
Assets/Scripts/Enemy/DropShip/DropShip.cs
View File

@@ -396,7 +396,7 @@ public class DropShip : Enemy
}
if (GameInit.Ins.gamePlace == GamePlace.Guangxi_Guilin_Gongcheng_Shijixincheng)
{
transform.DOMove(new Vector3(-13f, 5f, 17.51f), 4).OnComplete(() =>
transform.DOMove(new Vector3(-9.3f, 5f, 15.5f), 4).OnComplete(() =>
{
isAttack = true;
foreach (var item in tailGas)

2
Assets/Scripts/Enemy/Leviathan/Leviathan.cs
View File

@@ -240,7 +240,7 @@ public class Leviathan : Enemy
}
else if(GameInit.Ins.gamePlace == GamePlace.Guangxi_Guilin_Gongcheng_Shijixincheng)
{
transform.DOMove(new Vector3(-16.25f,-3.5f,22.84f),2).OnComplete(() =>
transform.DOMove(new Vector3(-4.2f,-3.5f,12.5f),2).OnComplete(() =>
{
Both();
});

2
Assets/Scripts/Enemy/MachineDragon/MachineDragon.cs
View File

@@ -232,7 +232,7 @@ public class MachineDragon : Enemy
}
else if(GameInit.Ins.gamePlace == GamePlace.Guangxi_Guilin_Gongcheng_Shijixincheng)
{
transform.DOMove(new Vector3(-7.76f,0f,11.4f), 4).OnComplete(() =>
transform.DOMove(new Vector3(-4.45f,0f,10.66f), 4).OnComplete(() =>
{
Both();
});