miduo_client/Assets
JLIOSM1 d680e5a507 Merge commit 'fb5b009ec8abd5dbb8dd9658f0e8ded91c409fbb' into china/ios
# Conflicts:
#	Assets/ManagedResources/~Lua/Modules/FightLevel/FightLevelTrialPanel.lua.meta
#	Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_ChooseUpSoul.lua.meta
#	Assets/ManagedResources/~Lua/Modules/Recruit/ElementDrawCardPanelNew.lua.meta
#	Assets/StreamingAssets/Res/PackConfig.txt
#	Assets/StreamingAssets/Res/_ReadMe.md
#	Assets/StreamingAssets/Res/dl_ui_effect_bg.png
#	Assets/StreamingAssets/Res/dl_ui_effect_bg.png.meta
#	Assets/StreamingAssets/Res/dl_ui_effect_mingzi_zh.png
#	Assets/StreamingAssets/Res/dl_ui_effect_mingzi_zh.png.meta
#	Assets/StreamingAssets/Res/loading1.png
#	Assets/StreamingAssets/Res/loading1.png.meta
#	Assets/StreamingAssets/Res/loading2.png
#	Assets/StreamingAssets/Res/loading2.png.meta
#	Assets/StreamingAssets/Res/loading3.png
#	Assets/StreamingAssets/Res/loading3.png.meta
#	Assets/StreamingAssets/Res/loading4.png
#	Assets/StreamingAssets/Res/loading4.png.meta
#	Assets/StreamingAssets/Res/loading5.png
#	Assets/StreamingAssets/Res/loading5.png.meta
#	Assets/StreamingAssets/Res/loading6.png
#	Assets/StreamingAssets/Res/loading6.png.meta
#	Assets/StreamingAssets/Res/loading_caohua.png.meta
#	Assets/StreamingAssets/Res/loading_xipu.png.meta
#	Assets/StreamingAssets/Res/login_caohua.png.meta
#	Assets/StreamingAssets/Res/login_video.mp4.meta
#	Assets/StreamingAssets/Res/login_xipu.png.meta
2021-07-21 17:15:36 +08:00
..
AssetBundles-Browser-master 海外相关修改合并 2020-08-22 16:19:50 +08:00
CRC 测试热更0.15.25、svn逻辑同步 2020-07-03 11:52:23 +08:00
Editor 【包配置】添加游心专服和内网包的打包配置 2021-07-16 15:54:53 +08:00
LuaFramework Revert "bat鎵瑰鐞嗚嚜鍔ㄦ帹閫?2021/07/19,14:09:40" 2021-07-19 14:10:11 +08:00
ManagedResources Merge commit 'fb5b009ec8abd5dbb8dd9658f0e8ded91c409fbb' into china/ios 2021-07-21 17:15:36 +08:00
Plugins 【Android】删除对某特殊sdk的配置 2021-07-09 11:58:35 +08:00
Resources 【IOS】修改翻译文件 2021-07-13 18:20:56 +08:00
Scripts Merge commit 'fb5b009ec8abd5dbb8dd9658f0e8ded91c409fbb' into china/ios 2021-07-21 17:15:36 +08:00
Source 【Android】打开网页功能 2021-06-23 19:39:46 +08:00
Spine 删除Spine UI对象时,释放模型资源 2020-08-05 21:20:13 +08:00
StreamingAssets Merge commit 'fb5b009ec8abd5dbb8dd9658f0e8ded91c409fbb' into china/ios 2021-07-21 17:15:36 +08:00
ToLua 提交 2020-05-09 12:51:21 +08:00
AssetBundles-Browser-master.meta 提交 2020-05-09 13:31:21 +08:00
CRC.meta 提交 2020-05-09 13:31:21 +08:00
Editor.meta 皮肤资源提交 2020-11-04 12:02:57 +08:00
LuaDeepProfilerSettings.asset 提交 2020-05-09 13:31:21 +08:00
LuaDeepProfilerSettings.asset.meta 提交 2020-05-09 13:31:21 +08:00
LuaFramework.meta 提交 2020-05-09 13:31:21 +08:00
ManagedResources.meta 提交 2020-05-09 13:31:21 +08:00
Plugins.meta 提交 2020-05-09 13:31:21 +08:00
Resources.meta 提交 2020-05-09 13:31:21 +08:00
Scripts.meta 提交 2020-05-09 13:31:21 +08:00
Source.meta 提交 2020-05-09 13:31:21 +08:00
Spine.meta 提交 2020-05-09 13:31:21 +08:00
StreamingAssets.meta 提交 2020-05-09 13:31:21 +08:00
ToLua.meta 提交 2020-05-09 13:31:21 +08:00