miduo_client/Assets/ManagedResources/~Lua/Modules/Guild
zhangjiannan 19484d6b62 Merge remote-tracking branch 'remotes/origin/onepiece_bt' into TCX_LongZhu
# Conflicts:
#	Assets/ManagedResources/Icon/Haizeiskill.meta
#	Assets/ManagedResources/Icons/luofu_huobi_1.png
#	Assets/ManagedResources/Icons/luofu_huobi_1.png.meta
#	Assets/ManagedResources/Icons/luofu_huobi_2.png
#	Assets/ManagedResources/Icons/luofu_huobi_2.png.meta
#	Assets/ManagedResources/Icons/luofu_huobi_3.png
#	Assets/ManagedResources/Icons/luofu_huobi_3.png.meta
#	Assets/ManagedResources/Icons/luofu_huobi_4.png
#	Assets/ManagedResources/Icons/luofu_huobi_4.png.meta
#	Assets/ManagedResources/Prefabs/UI/Formation/FormationPanelV2.prefab
#	Assets/ManagedResources/Prefabs/UI/GMPanel/GMShuaChongTeQuan.prefab
#	Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
#	Assets/ManagedResources/Prefabs/UI/GodsWay/GodsWayTowerPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/NewActivity/EveryDayGiftNew.prefab
#	Assets/ManagedResources/Prefabs/UI/QiJieShiLian/QiJieShiLianPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/Ranking/RankingListMainPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/Recruit/RecruitMainPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/UppperMonthCardView/UppperMonthCard.prefab
#	Assets/ManagedResources/Prefabs/UI/XunBaoMiZong/XunBaoMiZongPanel.prefab
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Common/Language.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/EnemyView.lua
#	Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua
#	Assets/ManagedResources/~Lua/Modules/Operating/UppperMonthCard.lua
2024-10-11 16:36:50 +08:00
..
Aid 聊天公会援助修改 2024-05-22 18:07:09 +08:00
Boss
CarDelay 优化页面 2024-09-18 13:22:59 +08:00
DeathPos 十绝阵 2024-05-30 18:18:12 +08:00
RedPacketView
Skill 战斗力修改 2024-07-18 15:14:23 +08:00
Transcript
View
Aid.meta
Boss.meta
CarDelay.meta
DeathPos.meta
GuildChangePopup.lua
GuildChangePopup.lua.meta
GuildCreatePopup.lua 聊天修改 公会不能修改宣言 2024-07-19 10:33:54 +08:00
GuildCreatePopup.lua.meta
GuildFetePopup.lua 公会祭祀修改提交 2024-01-17 11:14:38 +08:00
GuildFetePopup.lua.meta
GuildFightAttackInfoPopup.lua 屏蔽公会信息详情界面 2024-01-19 14:34:50 +08:00
GuildFightAttackInfoPopup.lua.meta
GuildFightAttackLogPopup.lua
GuildFightAttackLogPopup.lua.meta
GuildFightAttackTipPopup.lua
GuildFightAttackTipPopup.lua.meta
GuildFightDefendInfoPopup.lua 屏蔽公会信息详情界面 2024-01-19 14:34:50 +08:00
GuildFightDefendInfoPopup.lua.meta
GuildFightManager.lua
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
GuildFindPopup.lua.meta
GuildGetStarPopup.lua
GuildGetStarPopup.lua.meta
GuildInfoPopup.lua 公会成员详情界面修改 2024-01-30 15:08:38 +08:00
GuildInfoPopup.lua.meta
GuildLogoPopup.lua
GuildLogoPopup.lua.meta
GuildMainCityPanel.lua
GuildMainCityPanel.lua.meta
GuildManager.lua
GuildManager.lua.meta
GuildMemberInfoPopup.lua 公会成员详情界面修改 2024-01-30 15:08:38 +08:00
GuildMemberInfoPopup.lua.meta
MyGuildManager.lua
MyGuildManager.lua.meta
RedPacketView.meta
Skill.meta
Transcript.meta
View.meta