miduo_client/Assets/ManagedResources/~Lua/View
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
..
BtView.lua Merge branch 'china/dev-c' into china/ios 2021-05-19 14:12:37 +08:00
BtView.lua.meta 提交 2020-05-09 13:31:21 +08:00
ChatTipView.lua 【ios】图片回收 2021-04-21 13:12:04 +08:00
ChatTipView.lua.meta 提交 2020-05-09 13:31:21 +08:00
DragView.lua 【ios】图片回收 2021-04-21 13:12:04 +08:00
DragView.lua.meta 提交 2020-05-09 13:31:21 +08:00
ElementalResonanceView.lua 【内存优化】修复资源卸载时会错误卸载其他界面的问题 2021-04-21 22:45:37 +08:00
ElementalResonanceView.lua.meta 提交 2020-05-09 13:31:21 +08:00
FetterItem.lua 【ios】图片回收 2021-04-21 13:12:04 +08:00
FetterItem.lua.meta 天书秘卷 2021-03-19 14:37:24 +08:00
HarmonyView.lua 【ios】图片回收 2021-04-21 13:12:04 +08:00
HarmonyView.lua.meta 【鸿蒙阵】 初版提交 2020-11-27 17:59:25 +08:00
ItemView.lua Merge branch 'china/dev-c' into china/ios 2021-05-19 14:12:37 +08:00
ItemView.lua.meta 提交 2020-05-09 13:31:21 +08:00
JumpView.lua 【ios】图片回收 2021-04-21 13:12:04 +08:00
JumpView.lua.meta 提交 2020-05-09 13:31:21 +08:00
MoneyNumView.lua Merge branch 'china/dev-c' into china/ios 2021-05-19 14:12:37 +08:00
MoneyNumView.lua.meta 【金钱显示兼容】添加金钱显示组件,对积天豪礼,成长礼包,首充界面进行兼容性处理。 2021-04-06 22:30:21 +08:00
MonsterLiveView.lua 剧情提交 2021-04-27 22:21:46 +08:00
MonsterLiveView.lua.meta 剧情提交 2021-04-26 09:41:41 +08:00
NoteView.lua 【ios】图片回收 2021-04-21 13:12:04 +08:00
NoteView.lua.meta 提交 2020-05-09 13:31:21 +08:00
NumberView.lua 【ios】图片回收 2021-04-21 13:12:04 +08:00
NumberView.lua.meta 提交 2020-05-09 13:31:21 +08:00
PlayerHeadView.lua 【ios】图片回收 2021-04-21 13:12:04 +08:00
PlayerHeadView.lua.meta 提交 2020-05-09 13:31:21 +08:00
PlayerInfoView.lua Merge branch 'china/dev-c' into china/ios 2021-05-19 14:12:37 +08:00
PlayerInfoView.lua.meta 【特权优化】将界面顶部的特权等级移回 2021-03-30 18:10:39 +08:00
PlayerLiveView.lua Merge branch 'china/dev-c' into china/ios 2021-05-19 14:12:37 +08:00
PlayerLiveView.lua.meta 提交 2020-05-09 13:31:21 +08:00
RewardPanel.lua 【ios】图片回收 2021-04-21 13:12:04 +08:00
RewardPanel.lua.meta 签到 修改 2021-04-01 18:50:06 +08:00
RoleItemView.lua 【ios】图片回收 2021-04-21 13:12:04 +08:00
RoleItemView.lua.meta 提交 2020-05-09 13:31:21 +08:00
ScrollCycleView.lua Merge branch 'china/dev-c' into china/ios 2021-05-19 14:12:37 +08:00
ScrollCycleView.lua.meta 提交 2020-05-09 13:31:21 +08:00
ScrollFitterView.lua 【ios】图片回收 2021-04-21 13:12:04 +08:00
ScrollFitterView.lua.meta 提交 2020-05-09 13:31:21 +08:00
ShopItemView.lua 【ios】图片回收 2021-04-21 13:12:04 +08:00
ShopItemView.lua.meta 提交 2020-05-09 13:31:21 +08:00
ShopView.lua Merge branch 'china/dev-c' into china/ios 2021-05-19 14:12:37 +08:00
ShopView.lua.meta 提交 2020-05-09 13:31:21 +08:00
ShopViewNew.lua 修改add 为addOnce 2021-05-12 17:42:51 +08:00
ShopViewNew.lua.meta 主题活动修改提交 2021-05-12 17:41:19 +08:00
SingleFightPlayerView.lua 【添加音效】 2021-05-18 14:24:09 +08:00
SingleFightPlayerView.lua.meta 【挂机演示优化】挂机界面增加其他玩家 2021-04-15 15:51:24 +08:00
SingleStoryPlayerView.lua 剧情音效提交 2021-05-13 16:32:40 +08:00
SingleStoryPlayerView.lua.meta 剧情提交 2021-04-22 18:13:28 +08:00
UpView.lua Merge branch 'china/dev-c' into china/ios 2021-05-19 14:12:37 +08:00
UpView.lua.meta 提交 2020-05-09 13:31:21 +08:00