miduo_client/Assets/ManagedResources/~Lua/Modules
gaoxin 1b873eb38d Merge branch 'china/dev-c' into china/ios
# Conflicts:
#	Assets/ManagedResources/ArtFont_en/f_fuxinggaozhao_zida_en.png.meta
#	Assets/ManagedResources/ArtFont_en/n_niuqichongchong_banner_en.png.meta
#	Assets/ManagedResources/ArtFont_en/n_niuqichongchong_niuqizhi_en.png.meta
#	Assets/ManagedResources/ArtFont_en/q_qinlongmibao_banner1_en.png.meta
#	Assets/ManagedResources/ArtFont_en/r_fabao_guiyuan_en.png.meta
#	Assets/ManagedResources/ArtFont_en/sl_en.png.meta
#	Assets/ManagedResources/ArtFont_en/x_xianshizaohuan_wujiangyulan 1_en.png.meta
#	Assets/ManagedResources/ArtFont_vi/c_3_1_t9_vi.png.meta
#	Assets/ManagedResources/ArtFont_vi/c_3_2_t9_vi.png.meta
#	Assets/ManagedResources/ArtFont_vi/c_3_3_t9_vi.png.meta
#	Assets/ManagedResources/ArtFont_vi/c_3_4_t9_vi.png.meta
#	Assets/ManagedResources/ArtFont_vi/c_3_6_t9_vi.png.meta
#	Assets/ManagedResources/ArtFont_vi/c_3_7_t9_vi.png.meta
#	Assets/ManagedResources/ArtFont_vi/c_3_8_t9_vi.png.meta
#	Assets/ManagedResources/ArtFont_vi/c_3_9_t9_vi.png.meta
#	Assets/ManagedResources/ArtFont_vi/n_niuqichongchong_banner_vi.png.meta
#	Assets/ManagedResources/ArtFont_vi/n_niuqichongchong_niuqizhi_vi.png.meta
#	Assets/ManagedResources/ArtFont_vi/q_qinlongmibao_banner1_vi.png.meta
#	Assets/ManagedResources/ArtFont_vi/r_fabao_guiyuan_vi.png.meta
#	Assets/ManagedResources/ArtFont_vi/sl_vi.png.meta
#	Assets/ManagedResources/ArtFont_vi/t_tianshumijuan_zhujiemiananniu_2_vi.png.meta
#	Assets/ManagedResources/ArtFont_vi/t_tianshumijuan_zhujiemiananniu_vi.png.meta
#	Assets/ManagedResources/ArtFont_vi/w_wj_banner_vi.png.meta
#	Assets/ManagedResources/Atlas/BattleAtlas/r_zhandou_leiquehei_01.png.meta
#	Assets/ManagedResources/Atlas/DyAct_Activity7/timelimit_putishushen2.png.meta
#	Assets/ManagedResources/Atlas/DyAct_XiangYaoDuoBao/ArtFont/t_tongqiangtiebi_banner_zh.jpg.meta
#	Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/x_xianshizaohuan_wujiangyulan 1_zh.png.meta
#	Assets/ManagedResources/Atlas/DynamicActivityAtlas/QiKaiDeSheng/q_qikaidesheng_shenjiang2.png.meta
#	Assets/ManagedResources/Atlas/DynamicActivityAtlas/XiangLongFuHu/x_xianglongfuhu_shenjiang3.png.meta
#	Assets/ManagedResources/Atlas/DynamicActivityAtlas/YiShanDaoHai/y_yishandaohai_shenjiang2.png.meta
#	Assets/ManagedResources/Atlas/DynamicActivityAtlas/YongWangZhiQian/s_yongwangzhiqian_shenjiang2.png.meta
#	Assets/ManagedResources/Atlas/FirstRechargeAtlas/ArtFont/s_shouchong_100_zh.png.meta
#	Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-congzhi_zh.png.meta
#	Assets/ManagedResources/Atlas/SupremeHeroAtlas/b_baolishuchu_juesebanzi2.png.meta
#	Assets/ManagedResources/Atlas/SupremeHeroAtlas/b_baolishuchu_juesebanzi2_gouxuan.png.meta
#	Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/r_huodong_leijichengzhianniu_01_zh.png.meta
#	Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/r_huodong_leijichengzhianniu_zh.png.meta
#	Assets/ManagedResources/Atlas/TimeLimitSkinAtlas/ArtFont/sl_zh.png.meta
#	Assets/ManagedResources/BG/t_tapolingxiao_beijingtu.png.meta
#	Assets/ManagedResources/DynamicAtlas/b_bianhuanmoce_banner_zh.png
#	Assets/ManagedResources/DynamicAtlas/b_bowenduoshi_banner_zh.png
#	Assets/ManagedResources/DynamicAtlas/p_pozhengzhuxian_banner_zh.png
#	Assets/ManagedResources/DynamicAtlas/q_qikaidesheng_banner_zh.png
#	Assets/ManagedResources/DynamicAtlas/s_yongwangzhiqian_banner_zh.png
#	Assets/ManagedResources/DynamicAtlas/y_yishandaohai_banner_zh.png
#	Assets/ManagedResources/EffectResUI/Story/Texture/UI_fuzhou_02.png.meta
#	Assets/ManagedResources/EffectResUI/Story/Texture/dianjijiekai.png.meta
#	Assets/ManagedResources/EffectResUI/Story/Texture/star_png.png.meta
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Common/functions.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/Logic/BattleLogic.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/View/DamageResultPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/View/GuideBattlePanel.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/EnemyView.lua
#	Assets/ManagedResources/~Lua/Modules/Chat/ChatPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Chat/FriendChatPanel.lua
#	Assets/ManagedResources/~Lua/Modules/CompoundHero/view/CompoundHero_Compound.lua
#	Assets/ManagedResources/~Lua/Modules/DailyRecharge/DailyRechargePanel.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShouBaoGe.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShowTeHui.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBox.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/SheJiDaDian.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/ShengYiTianJiang.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitedCall.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/XiangYaoDuoBao.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/XinJiangLaiXi.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/YiJingBaoKu.lua
#	Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassMainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Fight/View/FightPointMapView.lua
#	Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua
#	Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralBigPopup.lua
#	Assets/ManagedResources/~Lua/Modules/HandBook/HandBookRoleInfoLayout.lua
#	Assets/ManagedResources/~Lua/Modules/Login/ServerListItem.lua
#	Assets/ManagedResources/~Lua/Modules/Login/ServerListSelectPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/SkillInfoPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGift.lua
#	Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_Pokemon.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleUpStarListPanel.lua
#	Assets/ManagedResources/~Lua/Modules/SecretBox/SecretBoxBuyOnePanel.lua
#	Assets/ManagedResources/~Lua/Modules/Shop/ShopBuyPopup.lua
#	Assets/ManagedResources/~Lua/Modules/SoulPrint/SoulPrintPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Vip/VipPanelV2.lua
#	Assets/ManagedResources/~Lua/View/PlayerInfoView.lua
2021-05-19 14:12:37 +08:00
..
Achievement 【ios】图片回收 2021-04-21 13:12:04 +08:00
ActivityGift Merge branch 'china/dev-c' into china/ios 2021-05-19 14:12:37 +08:00
Adventure Merge branch 'china/dev-c' into china/ios 2021-05-19 14:12:37 +08:00
Alien 【ios】图片回收 2021-04-21 13:12:04 +08:00
Arena Merge branch 'china/dev-c' into china/ios 2021-05-19 14:12:37 +08:00
ArenaTopMatch Merge branch 'china/dev-c' into china/ios 2021-05-19 14:12:37 +08:00
Bag Merge branch 'china/dev-c' into china/ios 2021-05-19 14:12:37 +08:00
Battle Merge branch 'china/dev-c' into china/ios 2021-05-19 14:12:37 +08:00
BindPhone 【ios】图片回收 2021-04-21 13:12:04 +08:00
Carbon Merge branch 'china/dev-c' into china/ios 2021-05-19 14:12:37 +08:00
Chat Merge branch 'china/dev-c' into china/ios 2021-05-19 14:12:37 +08:00
Common 【关闭log】 2021-04-23 14:08:27 +08:00
Compound Merge branch 'china/dev-c' into china/ios 2021-05-19 14:12:37 +08:00
CompoundHero Merge branch 'china/dev-c' into china/ios 2021-05-19 14:12:37 +08:00
DailyRecharge Merge branch 'china/dev-c' into china/ios 2021-05-19 14:12:37 +08:00
DataCenterService Merge branch 'china/dev-c' into china/ios 2021-05-19 14:12:37 +08:00
DemonSlayer Merge branch 'china/dev-c' into china/ios 2021-05-19 14:12:37 +08:00
DiffMonster 【内存】btview可能会导致重复卸载资源的问题 2021-04-22 13:40:04 +08:00
DynamicActivity Merge branch 'china/dev-c' into china/ios 2021-05-19 14:12:37 +08:00
EightDay Merge branch 'china/dev-c' into china/ios 2021-05-19 14:12:37 +08:00
EliteMonster 【ios】图片回收 2021-04-21 13:12:04 +08:00
Equip 【ios】图片回收 2021-04-21 13:12:04 +08:00
Expedition Merge branch 'china/dev-c' into china/ios 2021-05-19 14:12:37 +08:00
Expert Merge branch 'china/dev-c' into china/ios 2021-05-19 14:12:37 +08:00
FifteenDayGift Merge branch 'china/dev-c' into china/ios 2021-05-19 14:12:37 +08:00
Fight Merge branch 'china/dev-c' into china/ios 2021-05-19 14:12:37 +08:00
FightLevel 【山河社稷图】是否通关 2021-05-18 16:51:43 +08:00
FindFairy 【ios】图片回收 2021-04-21 13:12:04 +08:00
FindTreasure Merge branch 'china/dev-c' into china/ios 2021-05-19 14:12:37 +08:00
FirstRecharge Merge branch 'china/dev-c' into china/ios 2021-05-19 14:12:37 +08:00
FormFightMatch 【ios】图片回收 2021-04-21 13:12:04 +08:00
Formation Merge branch 'china/dev-c' into china/ios 2021-05-19 14:12:37 +08:00
FuXingGaoZhao Merge branch 'china/dev-c' into china/ios 2021-05-19 14:12:37 +08:00
GeneralPanel Merge branch 'china/dev-c' into china/ios 2021-05-19 14:12:37 +08:00
GlobalActTimeCtrl 【ios】lua文件格式修改 2021-04-20 13:58:00 +08:00
GoodFriend Merge branch 'china/dev-c' into china/ios 2021-05-19 14:12:37 +08:00
Guide Merge branch 'china/dev-c' into china/ios 2021-05-19 14:12:37 +08:00
Guild Merge branch 'china/dev-c' into china/ios 2021-05-19 14:12:37 +08:00
HandBook Merge branch 'china/dev-c' into china/ios 2021-05-19 14:12:37 +08:00
Harmony Merge branch 'china/dev-c' into china/ios 2021-05-19 14:12:37 +08:00
Hero Merge branch 'china/dev-c' into china/ios 2021-05-19 14:12:37 +08:00
Login Merge branch 'china/dev-c' into china/ios 2021-05-19 14:12:37 +08:00
LuckyCat 【ios】图片回收 2021-04-21 13:12:04 +08:00
LuckyTurnTable Merge branch 'china/dev-c' into china/ios 2021-05-19 14:12:37 +08:00
Mail Merge branch 'china/dev-c' into china/ios 2021-05-19 14:12:37 +08:00
Main Merge branch 'china/dev-c' into china/ios 2021-05-19 14:12:37 +08:00
Map Merge branch 'china/dev-c' into china/ios 2021-05-19 14:12:37 +08:00
MapFight 【ios】图片回收 2021-04-21 13:12:04 +08:00
Message Merge branch 'china/dev-c' into china/ios 2021-05-19 14:12:37 +08:00
Mission Merge branch 'china/dev-c' into china/ios 2021-05-19 14:12:37 +08:00
MonsterCamp Merge branch 'china/dev-c' into china/ios 2021-05-19 14:12:37 +08:00
Net Merge branch 'china/dev-c' into china/ios 2021-05-19 14:12:37 +08:00
NewActivity 活动结束报错修改 2021-05-14 13:21:01 +08:00
NiuQiChongTian 【ios】图片回收 2021-04-21 13:12:04 +08:00
NiuZhuanQianKun 【ios】图片回收 2021-04-21 13:12:04 +08:00
OnlineReward 【ios】图片回收 2021-04-21 13:12:04 +08:00
Operating Merge branch 'china/dev-c' into china/ios 2021-05-19 14:12:37 +08:00
Pay 【ios】lua文件格式修改 2021-04-20 13:58:00 +08:00
Player Merge branch 'china/dev-c' into china/ios 2021-05-19 14:12:37 +08:00
Pokemon Merge branch 'china/dev-c' into china/ios 2021-05-19 14:12:37 +08:00
Popup Merge branch 'china/dev-c' into china/ios 2021-05-19 14:12:37 +08:00
Power 【ios推荐】寻宝报错,白片修复 2021-04-23 10:01:42 +08:00
Practice 【修行】上方玩家名字颜色修改 2021-05-17 17:56:23 +08:00
Pray 【ios】图片回收 2021-04-21 13:12:04 +08:00
Questionnaire 【ios】图片回收 2021-04-21 13:12:04 +08:00
QuickPurchase 【ios】图片回收 2021-04-21 13:12:04 +08:00
Ranking Merge branch 'china/dev-c' into china/ios 2021-05-19 14:12:37 +08:00
Recharge Merge branch 'china/dev-c' into china/ios 2021-05-19 14:12:37 +08:00
Recruit Merge branch 'china/dev-c' into china/ios 2021-05-19 14:12:37 +08:00
RedPoint 【ios】lua文件格式修改 2021-04-20 13:58:00 +08:00
Resolve Merge branch 'china/dev-c' into china/ios 2021-05-19 14:12:37 +08:00
RewardBox Merge branch 'china/dev-c' into china/ios 2021-05-19 14:12:37 +08:00
RoleInfo Merge branch 'china/dev-c' into china/ios 2021-05-19 14:12:37 +08:00
SecretBox Merge branch 'china/dev-c' into china/ios 2021-05-19 14:12:37 +08:00
Setting Merge branch 'china/dev-c' into china/ios 2021-05-19 14:12:37 +08:00
SevenDayCarnival Merge branch 'china/dev-c' into china/ios 2021-05-19 14:12:37 +08:00
Shop Merge branch 'china/dev-c' into china/ios 2021-05-19 14:12:37 +08:00
SoulPrint Merge branch 'china/dev-c' into china/ios 2021-05-19 14:12:37 +08:00
SoulPrintAstrology 【ios】图片回收 2021-04-21 13:12:04 +08:00
Story Merge branch 'china/dev-c' into china/ios 2021-05-19 14:12:37 +08:00
TaSuiLingXiao 【翻译文字导出】 2021-05-11 17:03:09 +08:00
Task Merge branch 'china/dev-c' into china/ios 2021-05-19 14:12:37 +08:00
TianShuMiJuan 【ios】图片回收 2021-04-21 13:12:04 +08:00
TimeLimitSkin Merge branch 'china/dev-c' into china/ios 2021-05-19 14:12:37 +08:00
TreasureOfHeaven Merge branch 'china/dev-c' into china/ios 2021-05-19 14:12:37 +08:00
TreasureOfSomebody 【ios】图片回收 2021-04-21 13:12:04 +08:00
TreasureStore Merge branch 'china/dev-c' into china/ios 2021-05-19 14:12:37 +08:00
UIComponent 【ios】图片回收 2021-04-21 13:12:04 +08:00
UpGradePackage Merge branch 'china/dev-c' into china/ios 2021-05-19 14:12:37 +08:00
Update 【ios】图片回收 2021-04-21 13:12:04 +08:00
Vip Merge branch 'china/dev-c' into china/ios 2021-05-19 14:12:37 +08:00
WarPowerChange 【ios】图片回收 2021-04-21 13:12:04 +08:00
WorkShop 【ios】图片回收 2021-04-21 13:12:04 +08:00
XiaoYao Merge branch 'china/dev-c' into china/ios 2021-05-19 14:12:37 +08:00
ZhiZunHaoLi 【翻译文字导出】 2021-05-11 17:03:09 +08:00
Achievement.meta
ActivityGift.meta
Adventure.meta
Alien.meta
Arena.meta
ArenaTopMatch.meta
Bag.meta
Battle.meta
BindPhone.meta
Carbon.meta
Chat.meta
Common.meta
Compound.meta
CompoundHero.meta
DailyRecharge.meta
DataCenterService.meta
DemonSlayer.meta
DiffMonster.meta
DynamicActivity.meta
EightDay.meta
EliteMonster.meta
Equip.meta
Expedition.meta
Expert.meta
FifteenDayGift.meta 【十五日登陆】开坑 2021-03-31 15:02:04 +08:00
Fight.meta
FightLevel.meta 【山河社稷图】首提 2021-05-07 14:44:50 +08:00
FindFairy.meta
FindTreasure.meta
FirstRecharge.meta
FormFightMatch.meta
Formation.meta
FuXingGaoZhao.meta 【福星高照】提交 2021-03-29 09:52:53 +08:00
GeneralPanel.meta
GlobalActTimeCtrl.meta
GoodFriend.meta
Guide.meta
Guild.meta
HandBook.meta
Harmony.meta 【鸿蒙阵】 初版提交 2020-11-27 17:59:25 +08:00
Hero.meta
Login.meta
LuckyCat.meta
LuckyTurnTable.meta
Mail.meta
Main.meta
Map.meta
MapFight.meta
Message.meta
Mission.meta
MonsterCamp.meta
Net.meta
NewActivity.meta 【云游商人】提交 2021-04-16 14:58:40 +08:00
NiuQiChongTian.meta 【牛气冲天】提交 2021-03-19 15:16:49 +08:00
NiuZhuanQianKun.meta 【牛转乾坤】资源提交 2021-01-20 14:52:12 +08:00
OnlineReward.meta
Operating.meta
Pay.meta
Player.meta
Pokemon.meta
Popup.meta
Power.meta
Practice.meta 【修行】开坑 2021-05-11 15:09:25 +08:00
Pray.meta
Questionnaire.meta
QuickPurchase.meta
Ranking.meta
Recharge.meta
Recruit.meta
RedPoint.meta
Resolve.meta
RewardBox.meta
RoleInfo.meta
SecretBox.meta
Setting.meta
SevenDayCarnival.meta
Shop.meta
SoulPrint.meta
SoulPrintAstrology.meta
Story.meta
TaSuiLingXiao.meta 【踏碎凌霄】 2021-04-22 15:40:21 +08:00
Task.meta
TianShuMiJuan.meta 天书密卷 2021-03-16 17:37:32 +08:00
TimeLimitSkin.meta 【限时神装】开坑 2021-01-15 17:03:51 +08:00
TreasureOfHeaven.meta
TreasureOfSomebody.meta
TreasureStore.meta
UIComponent.meta
UpGradePackage.meta
Update.meta
Vip.meta
WarPowerChange.meta
WorkShop.meta
XiaoYao.meta
ZhiZunHaoLi.meta 【至尊豪礼】资源提交 2021-04-14 14:48:30 +08:00