miduo_client/Assets/ManagedResources/~Lua/Modules/RoleInfo
jiaoyangna c22e26a5f5 Merge branch 'china/dev-c' into 0优化/无尽副本
# Conflicts:
#	Assets/ManagedResources/Atlas/FuXingGaoZhao/f_fuxinggaozhao_1888.png.meta
#	Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Data/ConfigData.lua
#	Assets/ManagedResources/~Lua/Data/UIData.lua
#	Assets/ManagedResources/~Lua/Logic/GameEvent.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/PlayerInfoProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua
#	Assets/ManagedResources/~Lua/Modules/Carbon/EndLessCarbonPanel.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua
#	Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralBigPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Map/MapPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Map/View/EndLessMapView.lua
#	Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua
#	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
#	Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_Onhook.lua
2021-05-24 13:53:28 +08:00
..
EquipTreasureData.lua Merge branch 'china/dev-c' into china/ios 2021-05-19 14:12:37 +08:00
EquipTreasureData.lua.meta 【鸿蒙阵】二次提交 2020-12-17 10:41:00 +08:00
EquipTreasureManager.lua Merge branch 'china/dev-c' into 0优化/无尽副本 2021-05-24 13:53:28 +08:00
EquipTreasureManager.lua.meta
EquipTreasureResonancePanel.lua 【ios】图片回收 2021-04-21 13:12:04 +08:00
EquipTreasureResonancePanel.lua.meta
EquipTreasureStrongPopup.lua 【ios】图片回收 2021-04-21 13:12:04 +08:00
EquipTreasureStrongPopup.lua.meta
RoleAwakeLayout.lua Merge branch 'china/dev-c' into china/ios 2021-05-19 14:12:37 +08:00
RoleAwakeLayout.lua.meta 【觉醒】增加脚本 2020-11-09 11:13:53 +08:00
RoleAwakeSuccessPanel.lua 【ios】图片回收 2021-04-21 13:12:04 +08:00
RoleAwakeSuccessPanel.lua.meta 【神将觉醒】 觉醒成功界面 2020-11-07 15:15:49 +08:00
RoleAwakeTalentPopup.lua 【ios】图片回收 2021-04-21 13:12:04 +08:00
RoleAwakeTalentPopup.lua.meta 【觉醒】 界面提交 2020-11-06 16:23:02 +08:00
RoleChooseListPanel.lua Merge branch 'china/dev-c' into china/ios 2021-05-19 14:12:37 +08:00
RoleChooseListPanel.lua.meta 【鸿蒙阵】二次提交 2020-12-17 10:41:00 +08:00
RoleEquipChangePopup.lua Merge branch 'china/dev-c' into china/ios 2021-05-19 14:12:37 +08:00
RoleEquipChangePopup.lua.meta
RoleEquipPanel.lua Merge branch 'china/dev-c' into china/ios 2021-05-19 14:12:37 +08:00
RoleEquipPanel.lua.meta
RoleEquipTreasureChangePopup.lua 【ios】图片回收 2021-04-21 13:12:04 +08:00
RoleEquipTreasureChangePopup.lua.meta
RoleInfoLayout.lua Merge branch 'china/dev-c' into china/ios 2021-05-19 14:12:37 +08:00
RoleInfoLayout.lua.meta 神将界面结构修改 2020-11-03 15:17:48 +08:00
RoleInfoPanel.lua 【修行】this.spLoader提交 2021-05-20 09:48:52 +08:00
RoleInfoPanel.lua.meta 神将界面结构修改 2020-11-03 15:17:48 +08:00
RoleListPanel.lua 【spLoader】处理一些白片问题 2021-04-22 18:26:48 +08:00
RoleListPanel.lua.meta
RolePosInfoPopup.lua 【ios】图片回收 2021-04-21 13:12:04 +08:00
RolePosInfoPopup.lua.meta
RoleProInfoPopup.lua Merge branch 'china/dev-c' into china/ios 2021-05-19 14:12:37 +08:00
RoleProInfoPopup.lua.meta
RoleReturnListPanel.lua 【ios】图片回收 2021-04-21 13:12:04 +08:00
RoleReturnListPanel.lua.meta
RoleReturnPanel.lua 【ios】图片回收 2021-04-21 13:12:04 +08:00
RoleReturnPanel.lua.meta
RoleSkinPanel.lua Merge branch 'china/dev-c' into china/ios 2021-05-19 14:12:37 +08:00
RoleSkinPanel.lua.meta 神将界面结构修改 2020-11-03 15:17:48 +08:00
RoleStoryLayout.lua Merge branch 'china/dev' into china/ios 2021-04-21 17:54:16 +08:00
RoleStoryLayout.lua.meta 神将界面结构修改 2020-11-03 15:17:48 +08:00
RoleTalentPopup.lua 【ios】图片回收 2021-04-21 13:12:04 +08:00
RoleTalentPopup.lua.meta
RoleTalismanChangePopup.lua 【ios】图片回收 2021-04-21 13:12:04 +08:00
RoleTalismanChangePopup.lua.meta
RoleTalismanPanelV2.lua 【ios】图片回收 2021-04-21 13:12:04 +08:00
RoleTalismanPanelV2.lua.meta
RoleUpLvBreakSuccessPanel.lua 【ios】图片回收 2021-04-21 13:12:04 +08:00
RoleUpLvBreakSuccessPanel.lua.meta
RoleUpStarLayout.lua Merge branch 'china/dev-c' into china/ios 2021-05-19 14:12:37 +08:00
RoleUpStarLayout.lua.meta 神将界面结构修改 2020-11-03 15:17:48 +08:00
RoleUpStarListPanel.lua 【内存优化】新内存内存优化修改 2021-05-19 15:06:02 +08:00
RoleUpStarListPanel.lua.meta
RoleUpStarSuccessPanel.lua 【ios】图片回收 2021-04-21 13:12:04 +08:00
RoleUpStarSuccessPanel.lua.meta
TalismanInfoPanel.lua 【ios】图片回收 2021-04-21 13:12:04 +08:00
TalismanInfoPanel.lua.meta
TalismanUpStarSuccessPanel.lua 【ios】图片回收 2021-04-21 13:12:04 +08:00
TalismanUpStarSuccessPanel.lua.meta