miduo_client/Assets/ManagedResources/~Lua/Modules/Guild
xiejun 6ced2b0507 Merge branch 'dev_oneDis' into onepiece_demo
# Conflicts:
#	AssetBundles/version.txt
#	Assets/ManagedResources/Prefabs/UI/FightLevel/FightLevelChapterPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/ItemView/ItemView.prefab
#	Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab
#	Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Effect.lua
#	Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/TalismanInfoPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Practice/PracticeManager.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleTalismanPanelV2.lua
2023-08-29 17:58:24 +08:00
..
Aid 新预制体已经公会和活动ui 2023-08-28 11:34:43 +08:00
Boss
CarDelay 新预制体已经公会和活动ui 2023-08-28 11:34:43 +08:00
DeathPos [飞升]=======飞升代码逻辑提交 2022-01-05 18:17:44 +08:00
RedPacketView 【优化】设置物品显示的方法改为通用方法 2021-11-26 14:27:24 +08:00
Skill Merge branch 'dev_oneDis' into onepiece_demo 2023-08-29 17:58:24 +08:00
Transcript [公会boss]=====刷新次数修改 2022-05-24 15:12:44 +08:00
View
Aid.meta
Boss.meta
CarDelay.meta
DeathPos.meta
GuildChangePopup.lua
GuildChangePopup.lua.meta
GuildCreatePopup.lua
GuildCreatePopup.lua.meta
GuildFetePopup.lua
GuildFetePopup.lua.meta
GuildFightAttackInfoPopup.lua
GuildFightAttackInfoPopup.lua.meta
GuildFightAttackLogPopup.lua
GuildFightAttackLogPopup.lua.meta
GuildFightAttackTipPopup.lua
GuildFightAttackTipPopup.lua.meta
GuildFightDefendInfoPopup.lua
GuildFightDefendInfoPopup.lua.meta
GuildFightManager.lua 【公会战】不再请求公会战数据 2021-10-21 11:10:55 +08:00
GuildFightManager.lua.meta
GuildFightMatchSuccessPopup.lua
GuildFightMatchSuccessPopup.lua.meta
GuildFightMatchingPopup.lua
GuildFightMatchingPopup.lua.meta
GuildFightPopup.lua
GuildFightPopup.lua.meta
GuildFightResultPopup.lua
GuildFightResultPopup.lua.meta
GuildFindPopup.lua 【弹窗优化】公会、公告、服务器列表】英雄信息 2021-10-22 13:53:10 +08:00
GuildFindPopup.lua.meta
GuildGetStarPopup.lua
GuildGetStarPopup.lua.meta
GuildInfoPopup.lua Merge branch 'dev_oneDis' into onepiece_demo 2023-08-29 17:58:24 +08:00
GuildInfoPopup.lua.meta
GuildLogoPopup.lua
GuildLogoPopup.lua.meta
GuildMainCityPanel.lua Merge branch 'dev_oneDis' into onepiece_demo 2023-08-29 17:58:24 +08:00
GuildMainCityPanel.lua.meta
GuildManager.lua [连冲返利]=====报错修改,名称敏感字符提示修改 2022-06-21 14:40:48 +08:00
GuildManager.lua.meta
GuildMemberInfoPopup.lua 【飞升】===========神魂后星级显示修改 2022-01-10 15:11:30 +08:00
GuildMemberInfoPopup.lua.meta
MyGuildManager.lua [连冲返利]=====报错修改,名称敏感字符提示修改 2022-06-21 14:40:48 +08:00
MyGuildManager.lua.meta
RedPacketView.meta
Skill.meta
Transcript.meta
View.meta