Go to file

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