miduo_client/Assets/ManagedResources/Atlas/TianShuMiJuan/ArtFont
jiaoyangna 8291a48e73 Merge branch 'china_dev_merge' into xma_dev_b_merge
# Conflicts:
#	Assets/ManagedResources/Atlas/DyAct_Activity7/ArtFont.meta
#	Assets/ManagedResources/Atlas/FifteenDayGiftAtlas.meta
#	Assets/ManagedResources/Atlas/FifteenDayGiftAtlas/ArtFont.meta
#	Assets/ManagedResources/Atlas/NiuQiChongTianAtlas/ArtFont.meta
#	Assets/ManagedResources/Atlas/SupremeHeroAtlas/ArtFont.meta
#	Assets/ManagedResources/Icon/ChengHao.meta
#	Assets/ManagedResources/Icon/ZuoQi.meta
#	Assets/ManagedResources/Prefabs/UI/View/FetterItem.prefab
#	Assets/ManagedResources/~Lua/Logic/Network.lua
#	Assets/ManagedResources/~Lua/Modules/Carbon/CarbonTypePanelV2.lua
#	Assets/ManagedResources/~Lua/Modules/Common/MoneyUtil.lua
#	Assets/ManagedResources/~Lua/Modules/DailyRecharge/DailyRechargePanel.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/ShengYiTianJiang.lua
#	Assets/ManagedResources/~Lua/Modules/FuXingGaoZhao/FuXingGaoZhaoPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Guild/CarDelay/GuildCarDelayMainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Guild/DeathPos/DeathPosPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Guild/GuildInfoPopup.lua
#	Assets/ManagedResources/~Lua/Modules/HandBook/HandBookHeroInfoPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Map/MapManager.lua
#	Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGift.lua
#	Assets/ManagedResources/~Lua/Modules/Recharge/View/GiftPre.lua
#	Assets/ManagedResources/~Lua/Modules/Recharge/View/GiftView.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/TalismanUpStarListPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Setting/SettingPlayerRide.lua
#	Assets/ManagedResources/~Lua/View/FetterItem.lua
#	Assets/ManagedResources/~Lua/View/ItemView.lua
2021-04-09 12:24:01 +08:00
..
t_tianshumijuan_anniu_zh.png 灵兽秘卷修改 2021-03-31 18:00:44 +08:00
t_tianshumijuan_anniu_zh.png.meta meta提交 2021-04-07 11:23:03 +08:00
t_tianshumijuan_hunyingpian_zi_zh.png 天书秘卷 图片提交 2021-04-07 11:11:44 +08:00
t_tianshumijuan_hunyingpian_zi_zh.png.meta Merge branch 'china_dev_merge' into xma_dev_b_merge 2021-04-09 12:24:01 +08:00
t_tianshumijuan_lingshoupian_zi_zh.png 天书秘卷 图片提交 2021-04-07 11:11:44 +08:00
t_tianshumijuan_lingshoupian_zi_zh.png.meta Merge branch 'china_dev_merge' into xma_dev_b_merge 2021-04-09 12:24:01 +08:00
t_tianshumijuan_shenjiangpian_zi_zh.png 天书秘卷 图片提交 2021-04-07 11:11:44 +08:00
t_tianshumijuan_shenjiangpian_zi_zh.png.meta Merge branch 'china_dev_merge' into xma_dev_b_merge 2021-04-09 12:24:01 +08:00
t_tianshumijuan_yijihuo_zh.png 天书秘卷 2021-03-19 14:37:24 +08:00
t_tianshumijuan_yijihuo_zh.png.meta meta提交 2021-04-07 11:23:03 +08:00
t_tianshumijuan_zhujiemiananniu_2_zh.png 【本地化】资源名修正 2021-04-08 18:29:09 +08:00
t_tianshumijuan_zhujiemiananniu_2_zh.png.meta 【本地化】资源名修正 2021-04-08 18:29:09 +08:00
t_tianshumijuan_zhujiemiananniu_zh.png 【本地化】资源名修正 2021-04-08 18:29:09 +08:00
t_tianshumijuan_zhujiemiananniu_zh.png.meta 【本地化】资源名修正 2021-04-08 18:29:09 +08:00