miduo_client/Assets/ManagedResources
jiaoyangna 106a7f7763 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
# Conflicts:
#	Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_EquipSingleSell.lua
2020-07-11 16:25:30 +08:00
..
Atlas 宝囊 2020-07-10 17:55:11 +08:00
Audio 技能名称音效添加 2020-07-11 15:42:56 +08:00
BG 宝囊 2020-07-10 17:55:11 +08:00
Configs 提交 2020-05-09 13:31:21 +08:00
DynamicAtlas 法宝资源 2020-07-10 16:50:00 +08:00
EditorConfigs 测试服热更0.15.6提交 2020-06-05 16:16:22 +08:00
Effects 部分技能配置 2020-07-08 10:34:41 +08:00
Fonts 测试服热更0.15.6提交 2020-06-05 16:16:22 +08:00
Icons 法宝资源 2020-07-10 16:50:00 +08:00
Prefabs 分解提交 2020-07-11 16:21:15 +08:00
PublicArtRes Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-08 21:19:49 +08:00
RTexture 测试服热更0.15.6提交 2020-06-05 16:16:22 +08:00
ResConfigs 【特权】白片 2020-07-10 18:34:38 +08:00
Spine 删除meta文件 2020-07-02 17:58:34 +08:00
SplashPanel 提交 2020-05-09 13:31:21 +08:00
UpdatePanel 外网 0.16.10 内网 0.15.23 2020-06-28 17:48:49 +08:00
~Lua Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-11 16:25:30 +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
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
Effects.meta 提交 2020-05-09 13:31:21 +08:00
Fonts.meta 提交 2020-05-09 13:31:21 +08:00
Icons.meta 提交 2020-05-09 13:31:21 +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