miduo_client/Assets/ManagedResources/~Lua/Modules/RoleInfo
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
..
EquipTreasureManager.lua
EquipTreasureManager.lua.meta
EquipTreasureResonancePanel.lua
EquipTreasureResonancePanel.lua.meta
EquipTreasureStrongPopup.lua
EquipTreasureStrongPopup.lua.meta
RoleAwakeLayout.lua 【觉醒】问题修改 2020-11-12 13:55:15 +08:00
RoleAwakeLayout.lua.meta 【觉醒】增加脚本 2020-11-09 11:13:53 +08:00
RoleAwakeSuccessPanel.lua 【觉醒】 觉醒成功界面显示bug 2020-11-13 10:11:41 +08:00
RoleAwakeSuccessPanel.lua.meta 【神将觉醒】 觉醒成功界面 2020-11-07 15:15:49 +08:00
RoleAwakeTalentPopup.lua 【觉醒】十一星的星级展示修改 2020-11-11 11:12:14 +08:00
RoleAwakeTalentPopup.lua.meta 【觉醒】 界面提交 2020-11-06 16:23:02 +08:00
RoleEquipChangePopup.lua
RoleEquipChangePopup.lua.meta
RoleEquipPanel.lua
RoleEquipPanel.lua.meta
RoleEquipTreasureChangePopup.lua
RoleEquipTreasureChangePopup.lua.meta
RoleInfoLayout.lua 【觉醒】 提示文字 2020-11-16 14:57:46 +08:00
RoleInfoLayout.lua.meta 神将界面结构修改 2020-11-03 15:17:48 +08:00
RoleInfoPanel.lua 【图鉴】 升星点亮图鉴 调整献祭坛预设 2020-11-17 10:57:16 +08:00
RoleInfoPanel.lua.meta 神将界面结构修改 2020-11-03 15:17:48 +08:00
RoleListPanel.lua 部分界面头像特效添加 2020-09-27 13:33:10 +08:00
RoleListPanel.lua.meta
RolePosInfoPopup.lua
RolePosInfoPopup.lua.meta
RoleProInfoPopup.lua
RoleProInfoPopup.lua.meta
RoleReturnListPanel.lua 【皮肤】修改皮肤显示 2020-11-04 16:51:45 +08:00
RoleReturnListPanel.lua.meta
RoleReturnPanel.lua
RoleReturnPanel.lua.meta
RoleSkinPanel.lua 皮肤修改 2020-11-10 10:23:55 +08:00
RoleSkinPanel.lua.meta 神将界面结构修改 2020-11-03 15:17:48 +08:00
RoleStoryLayout.lua 神将界面结构修改 2020-11-03 15:17:48 +08:00
RoleStoryLayout.lua.meta 神将界面结构修改 2020-11-03 15:17:48 +08:00
RoleTalentPopup.lua 【神将觉醒】 提交 2020-11-10 18:35:37 +08:00
RoleTalentPopup.lua.meta
RoleTalismanChangePopup.lua
RoleTalismanChangePopup.lua.meta
RoleTalismanPanelV2.lua 魂印,法宝,进阶界面修改皮肤立绘,添加皮肤活动界面的假战斗 2020-11-07 15:39:01 +08:00
RoleTalismanPanelV2.lua.meta
RoleUpLvBreakSuccessPanel.lua
RoleUpLvBreakSuccessPanel.lua.meta
RoleUpStarLayout.lua 不满足进阶条件,显示红点 2020-11-07 16:41:25 +08:00
RoleUpStarLayout.lua.meta 神将界面结构修改 2020-11-03 15:17:48 +08:00
RoleUpStarListPanel.lua 【觉醒】 觉醒添加图鉴 2020-11-09 20:05:51 +08:00
RoleUpStarListPanel.lua.meta
RoleUpStarSuccessPanel.lua 魂印,法宝,进阶界面修改皮肤立绘,添加皮肤活动界面的假战斗 2020-11-07 15:39:01 +08:00
RoleUpStarSuccessPanel.lua.meta
TalismanInfoPanel.lua
TalismanInfoPanel.lua.meta
TalismanUpStarListPanel.lua
TalismanUpStarListPanel.lua.meta
TalismanUpStarSuccessPanel.lua
TalismanUpStarSuccessPanel.lua.meta