miduo_client/Assets/ManagedResources
jiaoyangna ab1a4ea627 Merge branch 'china/dev' into 0功能/silingshilian
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
2021-08-26 17:42:25 +08:00
..
ArtFont_en 【修行】meta提交 2021-05-19 20:43:16 +08:00
ArtFont_vi 【修行】meta提交 2021-05-19 20:43:16 +08:00
Atlas Merge branch 'china/dev' into 0功能/silingshilian 2021-08-26 17:42:25 +08:00
Audio 【音效】治疗音效恢复 2021-08-19 21:02:34 +08:00
BG Revert 回滚错误的合并 4f19f12612 2021-08-26 16:43:27 +08:00
BGNC 【资源】草花背景资源还原 2021-06-21 16:32:03 +08:00
Configs 提交 2020-05-09 13:31:21 +08:00
DynamicAtlas 太初秘卷修改提交 2021-08-12 11:02:21 +08:00
EditorConfigs 【添加无损压缩的文件夹】 2021-06-04 20:31:58 +08:00
EffectResSkill 【资源】重名资源修改 2021-08-26 17:02:29 +08:00
EffectResUI Merge branch 'china/dev' into 0功能/silingshilian 2021-08-26 17:42:25 +08:00
Effects Merge branch 'china/dev' into china/jumpserver 2021-07-27 11:26:30 +08:00
Fonts [战斗]=============减怒数字图片字修改提交,生成材质球文本文件修改提交 2021-07-03 18:52:28 +08:00
Icon Revert 回滚错误的合并 4f19f12612 2021-08-26 16:43:27 +08:00
Icons 【资源优化】整理废弃的冗余资源,减少包体大小 2021-07-27 17:13:18 +08:00
LuaBytes 【配置】保存一个luabytes文件防止buildconfig中luabytes文件丢失 2021-03-31 16:17:08 +08:00
Prefabs Merge branch 'china/dev' into 0功能/silingshilian 2021-08-26 17:42:25 +08:00
PublicArtRes 【战斗】=========复活,新灼烧特效预设提交 2021-08-25 14:37:10 +08:00
RTexture 【资源】循环引用资源优化 2021-06-10 22:53:11 +08:00
ResConfigs Revert 回滚错误的合并 4f19f12612 2021-08-26 16:43:27 +08:00
Spine 清理空文件夹 2021-07-29 11:28:30 +08:00
SplashPanel 【花屏】再次尝试修复花屏问题 2021-07-01 02:28:55 +08:00
UpdatePanel 【花屏】再次尝试修复花屏问题 2021-07-01 02:28:55 +08:00
~Lua Merge branch 'china/dev' into 0功能/silingshilian 2021-08-26 17:42:25 +08:00
ArtFont_en.meta 【本地化】资源提交 2021-01-26 17:56:55 +08:00
ArtFont_vi.meta 越南语图片提交 2021-02-18 17:21:14 +08:00
Atlas.meta 提交 2020-05-09 13:31:21 +08:00
Audio.meta 提交 2020-05-09 13:31:21 +08:00
BG.meta 提交 2020-05-09 13:31:21 +08:00
BGNC.meta 【meta】 2021-06-04 22:34:10 +08:00
Configs.meta 提交 2020-05-09 13:31:21 +08:00
DynamicAtlas.meta 提交 2020-05-09 13:31:21 +08:00
EditorConfigs.meta 提交 2020-05-09 13:31:21 +08:00
EffectResSkill.meta 【社稷大典/灵兽】特效资源重新整理 2020-11-01 17:00:39 +08:00
EffectResUI.meta 【逍遥游】删除旧骰子资源 2020-10-26 15:39:49 +08:00
Effects.meta 提交 2020-05-09 13:31:21 +08:00
Fonts.meta 提交 2020-05-09 13:31:21 +08:00
Icon.meta 【资源】部分资源位置修改,防止热更资源过大 2020-10-27 11:03:08 +08:00
Icons.meta 提交 2020-05-09 13:31:21 +08:00
LuaBytes.meta 【配置】保存一个luabytes文件防止buildconfig中luabytes文件丢失 2021-03-31 16:17:08 +08:00
Prefabs.meta 提交 2020-05-09 13:31:21 +08:00
PublicArtRes.meta 提交 2020-05-09 13:31:21 +08:00
RTexture.meta 六月三号开发提交 2020-06-03 19:09:01 +08:00
ResConfigs.meta 提交 2020-05-09 13:31:21 +08:00
Spine.meta 提交 2020-05-09 13:31:21 +08:00
SplashPanel.meta 提交 2020-05-09 13:31:21 +08:00
UpdatePanel.meta 提交 2020-05-09 13:31:21 +08:00
~Lua.meta 提交 2020-05-09 13:31:21 +08:00