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

..

Audio

fix：恢复以前sdk，调整每个boss在眼镜里的效果

2026-01-28 11:10:59 +08:00

Fonts

add：章鱼boss添加章鱼头，调整章鱼贴图 添加消散机制

2026-01-08 15:08:38 +08:00

Matrials

fix：删除无用资源

2026-01-05 11:00:50 +08:00

Models

add：调整各个boss死亡，添加死亡骑士boss

2026-01-22 17:07:43 +08:00

Prefabs

Merge remote-tracking branch 'origin/main'

2026-02-09 11:18:06 +08:00

Resources

添加枚举46至78的场景

2026-02-09 11:12:09 +08:00

Scenes

Merge remote-tracking branch 'origin/main'

2026-02-09 11:18:06 +08:00

Scripts

Merge remote-tracking branch 'origin/main'

2026-02-09 11:18:06 +08:00

Shader

fix：删除无用资源

2026-01-05 11:00:50 +08:00

Textures

fix：调整boss参数

2026-01-28 18:42:44 +08:00

Audio.meta

add：完善章鱼boss行为 调整触手脚本和造成伤害部分

2026-01-06 18:50:31 +08:00

Fonts.meta

add：章鱼boss添加章鱼头，调整章鱼贴图 添加消散机制

2026-01-08 15:08:38 +08:00

Matrials.meta

fix：删除无用资源

2026-01-05 11:00:50 +08:00

Models.meta

fix：删除无用资源

2026-01-05 11:00:50 +08:00

Prefabs.meta

fix：删除无用资源

2026-01-05 11:00:50 +08:00

Resources.meta

fix：删除无用资源

2026-01-05 11:00:50 +08:00

Scenes.meta

fix：删除无用资源

2026-01-05 11:00:50 +08:00

Scripts.meta

fix：删除无用资源

2026-01-05 11:00:50 +08:00

Shader.meta

fix：删除无用资源

2026-01-05 11:00:50 +08:00

Textures.meta

fix：删除无用资源

2026-01-05 11:00:50 +08:00