wulongxiao/_xiaofang
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of http://192.168.2.19:3000/hyskai/_xiaofang

Browse Source 
# Conflicts:
#	xiaofang/Assets/Scenes/firetest.unity
#	xiaofang/Assets/Script/Item/Fire.cs
#	xiaofang/Assets/Script/npc/DiStributionbox.cs
This commit is contained in:
shurongsen 2024-10-23 20:58:35 +08:00
commit f6b3a3986d
2 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
xiaofang/Assets/Scenes/firetest.unity.meta
View File

@ -1,7 +0,0 @@
fileFormatVersion: 2
guid: b6af5695de08b2b43a158499d37d3fbe
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

4
xiaofang/Assets/Script/Item/Firelive.cs
View File

@ -60,7 +60,8 @@ public class Firelive : MonoBehaviour
isBurning = true; isBurning = true;
// 初始在pos位置生成小火焰预制体 // 初始在pos位置生成小火焰预制体
currentFire = Instantiate(minfire, transform.position, Quaternion.identity); currentFire = Instantiate(minfire, transform.position, Quaternion.identity);
transform.GetComponent<Fire>().SetFire(currentFire);
} }
} }
@ -72,6 +73,7 @@ public class Firelive : MonoBehaviour
Destroy(currentFire); Destroy(currentFire);
currentFire=Instantiate(bigfire, transform.position, Quaternion.identity); currentFire=Instantiate(bigfire, transform.position, Quaternion.identity);
Canbig = false; Canbig = false;
transform.GetComponent<Fire>().SetFire(currentFire);
StartCoroutine(DelayedSpread()); StartCoroutine(DelayedSpread());
} }