sk-client/Assets/ManagedResources
zhangjiannan 86ae7572a4 Merge remote-tracking branch 'remotes/origin/Branch_oumei' into Branch_DNA
# Conflicts:
#	BuildABs/IOS/files.unity3d
#	BuildABs/IOS/lz4/iconsprite/item.unity3d
#	BuildABs/IOS/lz4/iconsprite/powerskill.unity3d
#	BuildABs/IOS/lzma/luabytes.unity3d
#	BuildABs/IOS/lzma/resconfigs.unity3d
2025-11-19 14:56:04 +08:00
..
ArtFont_en
ArtFont_jp
ArtFont_kr
ArtFont_tw
ArtFont_vn
ArtFont_zh
Atlas 1 2025-09-02 15:58:24 +08:00
Audio
Configs
EditorConfigs
EffectResUI
Font
IconSprite 礼物图标 2025-08-22 17:12:49 +08:00
LuaBytes
Prefabs Merge remote-tracking branch 'remotes/origin/Branch_oumei' into Branch_DNA 2025-11-19 14:56:04 +08:00
PublicArtRes
RTexture
ResConfigs
Spine
SplashPanel
Texture
UpdatePanel
Video
~Lua Merge remote-tracking branch 'remotes/origin/Branch_oumei' into Branch_DNA 2025-11-19 14:56:04 +08:00
ArtFont_en.meta
ArtFont_jp.meta
ArtFont_kr.meta
ArtFont_tw.meta
ArtFont_vn.meta
ArtFont_zh.meta
Atlas.meta
Audio.meta
Configs.meta
EditorConfigs.meta
EffectResUI.meta
Font.meta
IconSprite.meta
LuaBytes.meta
Prefabs.meta
PublicArtRes.meta
RTexture.meta
ResConfigs.meta
Spine.meta
SplashPanel.meta
Texture.meta
UpdatePanel.meta
Video.meta
~Lua.meta