Commit Graph

3 Commits

Author SHA1 Message Date
e68031d5b5 add 2024-10-24 09:23:47 +08:00
f6b3a3986d Merge branch 'main' of http://192.168.2.19:3000/hyskai/_xiaofang
# Conflicts:
#	xiaofang/Assets/Scenes/firetest.unity
#	xiaofang/Assets/Script/Item/Fire.cs
#	xiaofang/Assets/Script/npc/DiStributionbox.cs
2024-10-23 20:58:35 +08:00
hyskai
8e99a48e22 add 2024-10-22 17:31:48 +08:00