miduo_client/Assets
zhangqiang e1b223e83f Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
# Conflicts:
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Data/ConfigData.lua
#	data_execl/base_data/ItemConfig.xlsx
#	data_execl/base_data/MonsterConfig.xlsx
#	data_execl/base_data/PrivilegeTypeConfig.xlsx
#	data_execl/base_data/RewardGroup.xlsx
#	data_execl/base_data/RewardItemConfig.xlsx
#	data_execl/base_data/SpecialConfig.xlsx
#	data_execl/base_data/StoreConfig.xlsx
#	data_execl/base_data/UIConfig.xlsx
2020-08-22 13:59:35 +08:00
..
AssetBundles-Browser-master 资源加密添加,防止使用工具获得资源 2020-08-13 19:30:16 +08:00
CRC 测试热更0.15.25、svn逻辑同步 2020-07-03 11:52:23 +08:00
LuaFramework 符号错误 2020-08-15 15:21:56 +08:00
ManagedResources Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-22 13:59:35 +08:00
Plugins 删除无用的sdk资源,bugly添加缺少的文件 2020-08-11 14:04:05 +08:00
Resources 内网测试 0.16.1 2020-07-25 15:13:59 +08:00
Scripts 公会副本提交 2020-08-21 15:52:49 +08:00
Source 添加打点数据类型 2020-07-27 16:41:38 +08:00
Spine 删除Spine UI对象时,释放模型资源 2020-08-05 21:20:13 +08:00
StreamingAssets 资源提交, 2020-08-14 17:35:18 +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
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