miduo_client/Assets/ManagedResources/~Lua
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
..
.idea 提交 2020-05-09 13:31:21 +08:00
3rd 提交 2020-05-09 13:31:21 +08:00
BadWords 提交 2020-05-09 13:31:21 +08:00
Base 【sploader】翻译资源加载优化 2021-04-22 17:54:03 +08:00
Common Merge branch 'china/dev-c' into china/ios 2021-05-19 14:12:37 +08:00
Config 【逍遥游】功能合并到local分支 2020-10-19 20:37:53 +08:00
Data 【添加音效】 2021-05-18 14:24:09 +08:00
Extends 提交 2020-05-09 13:31:21 +08:00
Framework Merge branch 'china/dev-c' into china/ios 2021-05-19 14:12:37 +08:00
Logic Merge branch 'china/dev-c' into china/ios 2021-05-19 14:12:37 +08:00
Message 【山河社稷图】是否通关 2021-05-18 16:51:43 +08:00
Modules Merge branch 'china/dev-c' into china/ios 2021-05-19 14:12:37 +08:00
System 提交 2020-05-09 13:31:21 +08:00
UITools 提交 2020-05-09 13:31:21 +08:00
UnityEngine 提交 2020-05-09 13:31:21 +08:00
View Merge branch 'china/dev-c' into china/ios 2021-05-19 14:12:37 +08:00
cjson 提交 2020-05-09 13:31:21 +08:00
jit 提交 2020-05-09 13:31:21 +08:00
lpeg 提交 2020-05-09 13:31:21 +08:00
misc 【配置】兼容老包 2021-03-10 14:56:53 +08:00
protobuf 提交 2020-05-09 13:31:21 +08:00
socket 提交 2020-05-09 13:31:21 +08:00
3rd.meta 提交 2020-05-09 13:31:21 +08:00
BadWords.meta 提交 2020-05-09 13:31:21 +08:00
Base.meta 提交 2020-05-09 13:31:21 +08:00
Common.meta 提交 2020-05-09 13:31:21 +08:00
Config.meta 误删恢复 2020-07-04 15:34:30 +08:00
Data.meta 提交 2020-05-09 13:31:21 +08:00
Extends.meta 提交 2020-05-09 13:31:21 +08:00
Framework.meta 提交 2020-05-09 13:31:21 +08:00
Logic.meta 提交 2020-05-09 13:31:21 +08:00
Main.lua 提交 2020-05-09 13:31:21 +08:00
Main.lua.meta 提交 2020-05-09 13:31:21 +08:00
Message.meta 提交 2020-05-09 13:31:21 +08:00
Modules.meta 提交 2020-05-09 13:31:21 +08:00
PreLoad.lua 【本地化】代码本地化提交 2021-01-26 17:08:39 +08:00
PreLoad.lua.meta 提交 2020-05-09 13:31:21 +08:00
System.meta 提交 2020-05-09 13:31:21 +08:00
UITools.meta 提交 2020-05-09 13:31:21 +08:00
UnityEngine.meta 提交 2020-05-09 13:31:21 +08:00
View.meta 提交 2020-05-09 13:31:21 +08:00
cjson.meta 提交 2020-05-09 13:31:21 +08:00
class.lua 提交 2020-05-09 13:31:21 +08:00
class.lua.meta 提交 2020-05-09 13:31:21 +08:00
event.lua 提交 2020-05-09 13:31:21 +08:00
event.lua.meta 提交 2020-05-09 13:31:21 +08:00
eventlib.lua 提交 2020-05-09 13:31:21 +08:00
eventlib.lua.meta 提交 2020-05-09 13:31:21 +08:00
events.lua 提交 2020-05-09 13:31:21 +08:00
events.lua.meta 提交 2020-05-09 13:31:21 +08:00
jit.meta 提交 2020-05-09 13:31:21 +08:00
list.lua 提交 2020-05-09 13:31:21 +08:00
list.lua.meta 提交 2020-05-09 13:31:21 +08:00
lpeg.meta 提交 2020-05-09 13:31:21 +08:00
ltn12.lua 提交 2020-05-09 13:31:21 +08:00
ltn12.lua.meta 提交 2020-05-09 13:31:21 +08:00
mime.lua 提交 2020-05-09 13:31:21 +08:00
mime.lua.meta 提交 2020-05-09 13:31:21 +08:00
misc.meta 提交 2020-05-09 13:31:21 +08:00
protobuf.meta 提交 2020-05-09 13:31:21 +08:00
slot.lua 提交 2020-05-09 13:31:21 +08:00
slot.lua.meta 提交 2020-05-09 13:31:21 +08:00
socket.lua 提交 2020-05-09 13:31:21 +08:00
socket.lua.meta 提交 2020-05-09 13:31:21 +08:00
socket.meta 提交 2020-05-09 13:31:21 +08:00
tolua.lua 提交 2020-05-09 13:31:21 +08:00
tolua.lua.meta 提交 2020-05-09 13:31:21 +08:00
typeof.lua 提交 2020-05-09 13:31:21 +08:00
typeof.lua.meta 提交 2020-05-09 13:31:21 +08:00