Commit Graph

12 Commits

Author SHA1 Message Date
ZYT
6edf05d423 修改河南开封室内场景 2026-03-30 14:54:03 +08:00
ZYT
e736095ba2 添加甘肃定西安定万达广场场景 2026-03-04 10:11:18 +08:00
ZYT
d08a6ee5bb Merge remote-tracking branch 'origin/main' into Luo
# Conflicts:
#	Assets/DC/临沧市临翔区恒基广场(一楼场景)地形.prefab.meta
#	Assets/DC/临沧市临翔区恒基广场(地下场景)地形.prefab.meta
#	Assets/DC/场地/永顺县新天地商场.fbx.meta
#	Assets/DC/新疆伊犁地形.prefab.meta
#	Assets/DC/湖南省衡阳市东洲岛旅游景点地形.prefab.meta
#	Assets/Plugins/Android/AndroidManifest.xml
#	Assets/StreamingAssets/build_info
#	Assets/_FutureMen2/Prefabs/Enemys/DeathKnightBoss/DeathKnightBoss.prefab
#	Assets/_FutureMen2/Prefabs/Enemys/DeathKnightBoss/DeathKnightPhantom.prefab
#	Assets/_FutureMen2/Prefabs/Enemys/FrogBoss/FrogBoss.prefab
#	Assets/_FutureMen2/Prefabs/Enemys/OctopusBoss/OctopusBoss.prefab
#	Assets/_FutureMen2/Prefabs/Enemys/TortoiseBoss/TortoiseBoss.prefab
#	Assets/_FutureMen2/Prefabs/Enemys/TortoiseBoss/TortoiseSkillEx.prefab
#	Assets/_FutureMen2/Scenes/Anhui_Suzhou_Yueshan_Guchengshangyejie.unity.meta
#	Assets/_FutureMen2/Scenes/Anhui_Wuhu_Guanwei.unity.meta
#	Assets/_FutureMen2/Scenes/Company1Floor.unity
#	Assets/_FutureMen2/Scenes/Gansu_Jinchang_Jinchuan_Shijiguangchang.unity.meta
#	Assets/_FutureMen2/Scenes/Guangdong_shenzheng_Guangming_Shijiguangchang.unity.meta
#	Assets/_FutureMen2/Scenes/Henan_Shangqiu_Juyang_WuyueGuangchang.unity.meta
#	Assets/_FutureMen2/Scenes/Hunan_Hengyang_Zhuhui_Dongzhoudao.unity.meta
#	Assets/_FutureMen2/Scenes/Xinjiang_Yili_Yining_Wanrong.unity.meta
#	Assets/_FutureMen2/Scenes/Yunnan_Lincang_Linxiang_Hengji.unity.meta
#	Assets/_FutureMen2/Scripts/Manager/GameManager.cs
#	Assets/_FutureMen2/Scripts/UI/PlayerUI.cs
#	ProjectSettings/EditorBuildSettings.asset
#	ProjectSettings/ProjectSettings.asset
2026-02-09 11:12:13 +08:00
ZYT
16dbaae99f 添加湖南衡阳东洲岛,云南恒基,新疆伊犁场景 2026-02-09 09:53:33 +08:00
bzx
4c0c237ce9 fix:所有游戏布置 2026-02-02 10:48:19 +08:00
bzx
384a71048d fix:优化各个boss细节 2026-01-29 19:09:02 +08:00
bzx
2545986005 fix:调整boss参数 2026-01-28 18:42:44 +08:00
bzx
e9dc7cd79c fix:恢复以前sdk,调整每个boss在眼镜里的效果 2026-01-28 11:10:59 +08:00
bzx
395badc600 add:功能迭代,sdk更新,枪械添加升级子弹 2026-01-26 17:04:46 +08:00
bzx
aa5e103dd4 add:添加数值表配置 调整章鱼boss碰撞 和触手碰撞问题,添加触手动画 2026-01-08 13:46:27 +08:00
bzx
d51c80e5e5 add:完善章鱼boss行为 调整触手脚本和造成伤害部分 2026-01-06 18:50:31 +08:00
bzx
45a1d352f9 fix:删除无用资源 2026-01-05 11:00:50 +08:00