yangyu 430919f07b Merge branch 'master' of https://git.joywaygames.cn/basegames/zeling_v2 ...

# Conflicts:
#	Assets/_Game/Scenes/Persistent.unity

2026-05-22 13:26:06 +08:00

..

Art

修改的文件：

2026-05-22 11:34:00 +08:00

Data

修改的文件：

2026-05-22 11:34:00 +08:00

Prefabs

优化 DiHun 武器和角色表单的属性，更新击打盒 ID 和颜色设置

2026-05-22 07:07:10 +08:00

Scenes

Merge branch 'master' of https://git.joywaygames.cn/basegames/zeling_v2

2026-05-22 13:26:06 +08:00

Scripts

fix: 修复 AttackState 动画结束后等待阶段的逻辑，确保播放新动画以避免重复触发事件

2026-05-22 13:12:16 +08:00

Settings

Merge branch 'master' of https://git.joywaygames.cn/basegames/zeling_v2

2026-05-22 13:26:06 +08:00

Shaders

摄像机区域的架构改动

2026-05-15 14:47:24 +08:00

UI Toolkit

摄像机区域的架构改动

2026-05-15 14:47:24 +08:00

Art.meta

摄像机区域的架构改动

2026-05-15 14:47:24 +08:00

Data.meta

摄像机区域的架构改动

2026-05-15 14:47:24 +08:00

Prefabs.meta

摄像机区域的架构改动

2026-05-15 14:47:24 +08:00

Scenes.meta

摄像机区域的架构改动

2026-05-15 14:47:24 +08:00

Scripts.meta

摄像机区域的架构改动

2026-05-15 14:47:24 +08:00

Settings.meta

摄像机区域的架构改动

2026-05-15 14:47:24 +08:00

Shaders.meta

摄像机区域的架构改动

2026-05-15 14:47:24 +08:00

UI Toolkit.meta

摄像机区域的架构改动

2026-05-15 14:47:24 +08:00