ZYT 1b00cf8ff5 Merge remote-tracking branch 'origin/main' into Ljh ...

# Conflicts:
#	ProjectSettings/EditorBuildSettings.asset
#	ProjectSettings/ProjectSettings.asset

2025-11-28 13:38:50 +08:00

..

Animation

…

Audios

fix：最后调整，对受击音效 场地 特效调整

2025-11-27 10:17:16 +08:00

Fonts

fix：最后调整，对受击音效 场地 特效调整

2025-11-27 10:17:16 +08:00

Materials

…

Prefabs

fix：修复一下从机激光武器没伤害问题

2025-11-27 17:57:33 +08:00

Resources

fix：修复主机和从机分数不匹配问题

2025-11-28 13:37:07 +08:00

Scenes

Merge remote-tracking branch 'origin/main' into Ljh

2025-11-28 13:38:50 +08:00

Scripts

fix：修复主机和从机分数不匹配问题

2025-11-28 13:37:07 +08:00

Shaders

…

Textures

fix：最后调整，对受击音效 场地 特效调整

2025-11-27 10:17:16 +08:00

Animation.meta

…

Audios.meta

…

Fonts.meta

…

Lighting Settings.lighting

…

Lighting Settings.lighting.meta

…

Materials.meta

…

Prefabs.meta

…

Resources.meta

…

Scenes.meta

…

Scripts.meta

…

Shaders.meta

…

Textures.meta

…

Universal Render Pipeline Asset_Renderer.asset

…

Universal Render Pipeline Asset_Renderer.asset.meta

…

Universal Render Pipeline Asset.asset

…

Universal Render Pipeline Asset.asset.meta

…

UniversalRenderPipelineGlobalSettings.asset

…

UniversalRenderPipelineGlobalSettings.asset.meta

…