root
/
miduo_client
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
miduo_client/Assets/ManagedResources
History
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
..
Atlas Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-22 13:59:35 +08:00
Audio 音频更新 2020-08-18 16:23:57 +08:00
BG Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-22 13:59:35 +08:00
Configs 提交 2020-05-09 13:31:21 +08:00
DynamicAtlas 限时商市 珍奇宝阁 2020-08-21 11:23:46 +08:00
EditorConfigs 测试服热更0.15.6提交 2020-06-05 16:16:22 +08:00
Effects 资源压缩方式修改，苹果资源压缩方式添加， 2020-08-14 17:29:06 +08:00
Fonts 资源压缩方式修改，苹果资源压缩方式添加， 2020-08-14 17:29:06 +08:00
Icons 法宝新资源 2020-08-21 14:56:38 +08:00
Prefabs Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-22 13:59:35 +08:00
PublicArtRes 资源提交， 2020-08-14 17:35:18 +08:00
RTexture rendertexture优化修改 2020-07-30 14:00:55 +08:00
ResConfigs 破阵诛仙 通天教主替换资源 2020-08-22 10:20:41 +08:00
Spine live2d commit 2020-08-18 15:42:21 +08:00
SplashPanel 提交 2020-05-09 13:31:21 +08:00
UpdatePanel 修改Loading界面资源位置 2020-08-03 18:49:24 +08:00
~Lua Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-22 13:59:35 +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
LuaBytes.meta 删除无用的sdk资源，bugly添加缺少的文件 2020-08-11 14:04:05 +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