Merge branch 'develop' into feature/UI更新&安卓适配

This commit is contained in:
2026-07-02 19:32:13 +08:00
52 changed files with 2139 additions and 1832 deletions
+3
View File
@@ -34,6 +34,9 @@ GraphicsSettings:
- {fileID: 10753, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 10770, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 10783, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 4800000, guid: 6652ed847ed1bc641bd702f03c650adf, type: 3}
- {fileID: 4800000, guid: 9f7b2ef66c2842c496327822f79da521, type: 3}
- {fileID: 4800000, guid: f7f1f0a7430f4f44fa1d7af89e1e013f, type: 3}
m_PreloadedShaders: []
m_PreloadShadersBatchTimeLimit: -1
m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}