miduo_client/Assets
ZhangBiao a0ef88e58d Merge branch 'china/dev' into 0活动开发聚集地/寻宝迷踪
# Conflicts:
#	Assets/ManagedResources/~Lua/Data/UIData.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/PlayerInfoProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
2021-08-12 14:56:26 +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-08-05 14:42:34 +08:00
LuaFramework 【网络通信】当后端发送未监听的推送消息也要回复 2021-08-02 15:56:28 +08:00
ManagedResources Merge branch 'china/dev' into 0活动开发聚集地/寻宝迷踪 2021-08-12 14:56:26 +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 branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-08-12 10:55:15 +08:00
Source 【Android】打开网页功能 2021-06-23 19:39:46 +08:00
Spine 删除Spine UI对象时,释放模型资源 2020-08-05 21:20:13 +08:00
StreamingAssets 【公告】公告分包配置参数,PackID将代替SubNoticeID,对外将不再提供SubNoticeID的配置 2021-08-05 14:41:19 +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