PineappleTech/FutureMen2
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
39 Commits 4 Branches 0 Tags
main
Commit Graph

39 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ZYT
4cc4677f76 修改甘肃定西安定场景 2026-03-11 11:30:00 +08:00
ZYT
838c6da7ff 添加重庆雨中洪崖洞场景 2026-03-09 09:49:06 +08:00
ZYT
0ca564c59e 解决FrogBoss动画切换卡住问题 2026-03-05 14:20:06 +08:00
ZYT
e736095ba2 添加甘肃定西安定万达广场场景 2026-03-04 10:11:18 +08:00
ZYT
906a0641bc Merge remote-tracking branch 'origin/Huang' into Luo 
# Conflicts:
#	Assets/Plugins/Android/AndroidManifest.xml
#	Assets/StreamingAssets/build_info
#	Assets/_FutureMen2/Prefabs/Enemys/TortoiseBoss/TortoiseBoss.prefab
#	Assets/_FutureMen2/Scenes/Guangdong_shenzheng_Guangming_Shijiguangchang.unity
#	ProjectSettings/ProjectSettings.asset
 2026-02-13 09:44:36 +08:00
liyang
08c82a485d 修改HttpServer，进入速度加快 2026-02-11 15:55:56 +08:00
liyang
3a7b2d560a 添加宁夏银川万达广场室外场景 2026-02-09 14:35:12 +08:00
ZYT
ce4e8c0016 修改广东深圳场景 2026-02-09 14:24:39 +08:00
liyang
cdc7964835 Merge remote-tracking branch 'origin/main' 
# Conflicts:
#	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/Company1Floor.unity
#	Assets/_FutureMen2/Scripts/Manager/GameManager.cs
#	ProjectSettings/EditorBuildSettings.asset
#	ProjectSettings/ProjectSettings.asset
 2026-02-09 11:18:06 +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
liyang
9964e06fd1 添加枚举46至78的场景 2026-02-09 11:12:09 +08:00
bzx
2b41406a4c fix：禁用摇杆换枪，调整结束音效调用 2026-02-09 10:55:16 +08:00
ZYT
16dbaae99f 添加湖南衡阳东洲岛，云南恒基，新疆伊犁场景 2026-02-09 09:53:33 +08:00
bzx
255de36d64 add：打包各个场地 2026-02-02 15:18:53 +08:00
bzx
4c0c237ce9 fix：所有游戏布置 2026-02-02 10:48:19 +08:00
bzx
9d069cb1eb add：添加httpserver 调整出生点 2026-01-30 14:23:18 +08:00
bzx
c859df9fc2 add：添加石柱，调整第三个和第四个boss 2026-01-30 12:36:45 +08:00
bzx
384a71048d fix：优化各个boss细节 2026-01-29 19:09:02 +08:00
bzx
5ec04dade1 fix：每个boss调整 2026-01-29 17:34:43 +08:00
bzx
2545986005 fix：调整boss参数 2026-01-28 18:42:44 +08:00
bzx
56949b7153 fix：优化各个boss参数 2026-01-28 18:07:14 +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
eb824ed348 add：boss添加水晶盔甲 2026-01-22 17:55:37 +08:00
bzx
037e181055 add：调整各个boss死亡，添加死亡骑士boss 2026-01-22 17:07:43 +08:00
bzx
ddd2fb9072 add：添加死亡骑士boss资源 2026-01-19 11:04:02 +08:00
bzx
735dc24edc fix：调整青蛙boss整体流程 2026-01-14 14:18:01 +08:00
bzx
9b7b64bbb1 fix：调整青蛙boss吐蛋技能 2026-01-14 11:45:33 +08:00
bzx
66f428cbff add：青蛙boss添加三个技能和行为和脚本，添加小怪 2026-01-13 20:28:17 +08:00
bzx
a30eda185b fix：完成初版巨龟boss，添加大嘴boss脚本 2026-01-12 19:58:41 +08:00
bzx
b100ac1e87 fix：新增乌龟boss和相关资源 2026-01-09 13:47:15 +08:00
bzx
9bda4a05dd add：章鱼boss添加章鱼头，调整章鱼贴图 添加消散机制 2026-01-08 15:08:38 +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
c502b336dd fix：删除无用资源，添加a*路径，添加章鱼脚本和触手脚本，整理敌人行为树脚本 2026-01-06 16:00:19 +08:00
bzx
005d18c899 add:添加章鱼触手资源 2026-01-05 13:45:21 +08:00
bzx
45a1d352f9 fix：删除无用资源 2026-01-05 11:00:50 +08:00
bzx
53774953b7 init：初始化项目 2026-01-04 15:14:53 +08:00
baozhenxing
fa1af0be1f Initial commit 2026-01-04 05:41:52 +00:00