ZYT 6556b124f0 Merge remote-tracking branch 'origin/main' into main_ZYT ...

# Conflicts:
#	Assets/_DefendNJ/Scripts/GameLocal.cs
#	ProjectSettings/EditorBuildSettings.asset
#	ProjectSettings/ProjectSettings.asset

2025-09-29 21:33:27 +08:00

..

Animation

fix；删除无用资源

2025-09-05 15:44:54 +08:00

Audios

fix：音效补充 完善各个事件

2025-09-29 19:01:48 +08:00

Fonts

fix；删除无用资源

2025-09-05 15:44:54 +08:00

Materials

fix；删除无用资源

2025-09-05 15:44:54 +08:00

Prefabs

fix：调整为了

2025-09-29 20:45:07 +08:00

Resources

fix：隐藏体感服调用，调整刀的位置

2025-09-29 19:28:19 +08:00

Scenes

添加山东潍坊青州泰华城场景

2025-09-29 21:32:29 +08:00

Scripts

添加山东潍坊青州泰华城场景

2025-09-29 21:32:29 +08:00

Shaders

fix：数据表更新添加

2025-09-10 11:01:45 +08:00

Textures

fix：音效补充 完善各个事件

2025-09-29 19:01:48 +08:00

Animation.meta

fix；删除无用资源

2025-09-05 15:44:54 +08:00

Audios.meta

fix；删除无用资源

2025-09-05 15:44:54 +08:00

Fonts.meta

fix；删除无用资源

2025-09-05 15:44:54 +08:00

Lighting Settings.lighting

fix；删除无用资源

2025-09-05 15:44:54 +08:00

Lighting Settings.lighting.meta

fix；删除无用资源

2025-09-05 15:44:54 +08:00

Materials.meta

fix；删除无用资源

2025-09-05 15:44:54 +08:00

Prefabs.meta

fix；删除无用资源

2025-09-05 15:44:54 +08:00

Resources.meta

fix；删除无用资源

2025-09-05 15:44:54 +08:00

Scenes.meta

fix；删除无用资源

2025-09-05 15:44:54 +08:00

Scripts.meta

fix；删除无用资源

2025-09-05 15:44:54 +08:00

Shaders.meta

fix；删除无用资源

2025-09-05 15:44:54 +08:00

Textures.meta

fix；删除无用资源

2025-09-05 15:44:54 +08:00

Universal Render Pipeline Asset_Renderer.asset

fix：修改敌人流程，添加敌人枚举

2025-09-26 13:33:37 +08:00

Universal Render Pipeline Asset_Renderer.asset.meta

fix；删除无用资源

2025-09-05 15:44:54 +08:00

Universal Render Pipeline Asset.asset

fix；删除无用资源

2025-09-05 15:44:54 +08:00

Universal Render Pipeline Asset.asset.meta

fix；删除无用资源

2025-09-05 15:44:54 +08:00

UniversalRenderPipelineGlobalSettings.asset

fix；删除无用资源

2025-09-05 15:44:54 +08:00

UniversalRenderPipelineGlobalSettings.asset.meta

fix；删除无用资源

2025-09-05 15:44:54 +08:00