miduo_client/Assets/ManagedResources/~Lua/Modules/HandBook
gaoxin f7676f2c93 Merge branch 'master_xma_local' into master_develop
# Conflicts:
#	Assets/ManagedResources/EffectResSkill/Effect_c_dhdj_00042_s1/Materials/Effect_c_swk_00015_s1_attack_PG_014.mat.meta
#	Assets/ManagedResources/EffectResSkill/Effect_c_dhdj_00042_s1/Prefab/Effect_c_dhdj_00042_s1_attack_PG_01.prefab
#	Assets/ManagedResources/EffectResSkill/Effect_c_dhdj_00042_s1/Prefab/Effect_c_dhdj_00042_s1_attack_PG_02.prefab
#	Assets/ManagedResources/EffectResSkill/Effect_c_dhdj_00042_s1/Prefab/Effect_c_dhdj_00042_s1_attack_PG_03.prefab
#	Assets/ManagedResources/EffectResSkill/Effect_c_dhdj_00042_s1/Texture/H_shandian_82.tga.meta
#	Assets/ManagedResources/EffectResSkill/Effect_c_swk_00015_s1/Materials/Effect_c_swk_00015_s1_attack_PG_014.mat.meta
#	Assets/ManagedResources/EffectResSkill/Effect_c_swk_00015_s1/Materials/Effect_c_swk_00015_s1_attack_PG_014_mat.mat.meta
#	Assets/ManagedResources/EffectResSkill/Effect_c_swk_00015_s1/Texture/H_shandian_82.tga.meta
#	Assets/ManagedResources/EffectResSkill/Effect_c_swk_00015_s1/Texture/H_shandian_82_tga.tga.meta
2020-11-17 18:38:24 +08:00
..
HandBookEquipInfoPanel.lua 二次弹窗关闭音效 2020-09-15 16:52:12 +08:00
HandBookEquipInfoPanel.lua.meta
HandBookHeroAndEquipListPanel.lua Merge branch '0功能/神将觉醒' into master_develop 2020-11-11 11:38:43 +08:00
HandBookHeroAndEquipListPanel.lua.meta
HandBookHeroInfoPanel.lua 【觉醒】 图鉴未开觉醒功能点进去报错修复提交 2020-11-16 21:00:23 +08:00
HandBookHeroInfoPanel.lua.meta
HandBookMainPanel.lua 中文表导出提交 2020-08-25 15:46:38 +08:00
HandBookMainPanel.lua.meta
HandBookTalismanInfoPanel.lua 中文表导出提交 2020-08-25 15:46:38 +08:00
HandBookTalismanInfoPanel.lua.meta