miduo_client/Assets/ManagedResources/~Lua/Modules/DynamicActivity
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
..
ActivityDetail.lua 【翻译文字导出】 2021-05-11 17:03:09 +08:00
ActivityDetail.lua.meta 限时商市 珍奇宝阁 2020-08-21 11:23:46 +08:00
ActivityMainPanel.lua Merge branch 'china/dev-c' into china/ios 2021-05-19 14:12:37 +08:00
ActivityMainPanel.lua.meta 成长礼包,每日礼包修改提交 2021-03-29 15:16:32 +08:00
DynamicActivityManager.lua Merge branch 'china/dev-c' into china/ios 2021-05-19 14:12:37 +08:00
DynamicActivityManager.lua.meta 【社稷大典】提交5 2020-10-24 18:49:32 +08:00
DynamicActivityPanel.lua Merge branch 'china/dev-c' into china/ios 2021-05-19 14:12:37 +08:00
DynamicActivityPanel.lua.meta 限时召唤 乾坤宝盒 页面整合 2020-07-28 09:48:02 +08:00
DynamicTaskPage.lua Merge branch 'china/dev-c' into china/ios 2021-05-19 14:12:37 +08:00
DynamicTaskPage.lua.meta 勇冠三军,叱咤风云活动添加 2020-09-27 16:09:55 +08:00
LeiJiChongZhiPage.lua Merge branch 'china/dev-c' into china/ios 2021-05-19 14:12:37 +08:00
LeiJiChongZhiPage.lua.meta 限时商市 珍奇宝阁 2020-08-21 11:23:46 +08:00
LingShouBaoGe.lua Merge branch 'china/dev-c' into china/ios 2021-05-19 14:12:37 +08:00
LingShouBaoGe.lua.meta 【灵兽抽卡】 开坑 2020-11-10 11:34:19 +08:00
LingShouBaoGeOneResultPanel.lua 【ios】图片回收 2021-04-21 13:12:04 +08:00
LingShouBaoGeOneResultPanel.lua.meta 【灵兽宝阁】抽卡逻辑完善了 2020-11-11 16:53:04 +08:00
LingShouBaoGeTenResultPanel.lua Merge branch 'china/dev-c' into china/ios 2021-05-19 14:12:37 +08:00
LingShouBaoGeTenResultPanel.lua.meta 【灵兽宝阁】抽卡逻辑完善了 2020-11-11 16:53:04 +08:00
LingShowTeHui.lua Merge branch 'china/dev-c' into china/ios 2021-05-19 14:12:37 +08:00
LingShowTeHui.lua.meta [灵兽特惠] 提交 2020-11-12 11:31:33 +08:00
QianKunBox.lua Merge branch 'china/dev-c' into china/ios 2021-05-19 14:12:37 +08:00
QianKunBox.lua.meta 限时商市 珍奇宝阁 2020-08-21 11:23:46 +08:00
QianKunBoxBuyOnePanel.lua 【ios】图片回收 2021-04-21 13:12:04 +08:00
QianKunBoxBuyOnePanel.lua.meta 限时商市 珍奇宝阁 2020-08-21 11:23:46 +08:00
QianKunBoxBuyTenPanel.lua 【ios】图片回收 2021-04-21 13:12:04 +08:00
QianKunBoxBuyTenPanel.lua.meta 限时商市 珍奇宝阁 2020-08-21 11:23:46 +08:00
RewardPreview.lua 【ios】spLoader产生bug修复 2021-04-21 15:09:03 +08:00
RewardPreview.lua.meta 限时商市 珍奇宝阁 2020-08-21 11:23:46 +08:00
SheJiDaDian.lua Merge branch 'china/dev-c' into china/ios 2021-05-19 14:12:37 +08:00
SheJiDaDian.lua.meta 【社稷大典】提交 2020-10-24 18:20:43 +08:00
ShengXingYouLi.lua 【ios】图片回收 2021-04-21 13:12:04 +08:00
ShengXingYouLi.lua.meta 【升星有礼】完成 2020-12-21 15:41:31 +08:00
ShengYiTianJiang.lua Merge branch 'china/dev-c' into china/ios 2021-05-19 14:12:37 +08:00
ShengYiTianJiang.lua.meta 皮肤提交 2020-11-06 20:36:38 +08:00
TimeLimitedCall.lua Merge branch 'china/dev-c' into china/ios 2021-05-19 14:12:37 +08:00
TimeLimitedCall.lua.meta 限时商市 珍奇宝阁 2020-08-21 11:23:46 +08:00
XianShiShangShi.lua 【ios】图片回收 2021-04-21 13:12:04 +08:00
XianShiShangShi.lua.meta 限时商市 珍奇宝阁 2020-08-21 11:23:46 +08:00
XiangYaoDuoBao.lua Merge branch 'china/dev-c' into china/ios 2021-05-19 14:12:37 +08:00
XiangYaoDuoBao.lua.meta 【降妖夺宝】开坑 2020-12-21 17:13:05 +08:00
XinJiangLaiXi.lua Merge branch 'china/dev-c' into china/ios 2021-05-19 14:12:37 +08:00
XinJiangLaiXi.lua.meta 【新将来袭】开坑 2020-12-01 13:51:13 +08:00
YiJingBaoKu.lua Merge branch 'china/dev-c' into china/ios 2021-05-19 14:12:37 +08:00
YiJingBaoKu.lua.meta 【易经宝库】开坑 搭界面 和做动画 2020-11-02 18:05:24 +08:00
ZhenQiYiBaoPage.lua Merge branch 'china/dev-c' into china/ios 2021-05-19 14:12:37 +08:00
ZhenQiYiBaoPage.lua.meta 限时商市 珍奇宝阁 2020-08-21 11:23:46 +08:00