miduo_client/Assets/ManagedResources/~Lua/Modules/Guild
gaoxin 1c25e4e21a Merge branch 'master_xma_local' into master_develop
# Conflicts:
#	Assets/LuaFramework/Scenes/LogoHwRelease_IOS.unity.meta
#	Assets/LuaFramework/Scenes/LogoHwTest_IOS.unity.meta
#	Assets/LuaFramework/Scripts/Framework/App.cs
#	Assets/LuaFramework/Scripts/Manager/NetworkManager.cs
#	Assets/LuaFramework/Scripts/Network/SocketClient.cs
#	Assets/ManagedResources/Atlas/DemonSlayerAtlas.meta
#	Assets/ManagedResources/Atlas/DynamicActivityAtlas/YongWangZhiQian/s_yongwangzhiqian_banner.png.meta
#	Assets/ManagedResources/Atlas/DynamicActivityAtlas/YongWangZhiQian/s_yongwangzhiqian_icon1.png.meta
#	Assets/ManagedResources/Atlas/DynamicActivityAtlas/YongWangZhiQian/s_yongwangzhiqian_icon2.png.meta
#	Assets/ManagedResources/Atlas/DynamicActivityAtlas/YongWangZhiQian/s_yongwangzhiqian_shenjiang1.png.meta
#	Assets/ManagedResources/Atlas/DynamicActivityAtlas/YongWangZhiQian/s_yongwangzhiqian_shenjiang2.png.meta
#	Assets/ManagedResources/Atlas/DynamicActivityAtlas/YongWangZhiQian/s_yongwangzhiqian_shenjiang3.png.meta
#	Assets/ManagedResources/Atlas/DynamicActivityAtlas/YongWangZhiQian/s_yongwangzhiqian_zi.png.meta
#	Assets/ManagedResources/Atlas/VipAtlas/ArtFont/t_tequan_xiaoyao.png.meta
#	Assets/ManagedResources/Audio/UI/common/UI_shaizi.mp3
#	Assets/ManagedResources/DynamicAtlas/ArtFont/g_gonghui_banner.png.meta
#	Assets/ManagedResources/DynamicAtlas/ArtFont/r_daren_xubao1.png.meta
#	Assets/ManagedResources/DynamicAtlas/ArtFont/r_daren_xubao3.png.meta
#	Assets/ManagedResources/DynamicAtlas/Skill/l_ls_11.png.meta
#	Assets/ManagedResources/EffectResSkill.meta
#	Assets/ManagedResources/EffectResUI.meta
#	Assets/ManagedResources/EffectResUI/PokemonEgg/Prefab/Effect_Dan_changzhu.prefab
#	Assets/ManagedResources/Prefabs/Effect/HeadFrame/UI_Effect_TouXiang_BaiHu.prefab.meta
#	Assets/ManagedResources/Prefabs/Effect/HeadFrame/UI_Effect_TouXiang_Lanlong.prefab.meta
#	Assets/ManagedResources/Prefabs/Effect/HeadFrame/UI_Effect_TouXiang_QingLong.prefab.meta
#	Assets/ManagedResources/Prefabs/UI/Arena/ArenaMainPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/DemonSlayer.meta
#	Assets/ManagedResources/Prefabs/UI/DemonSlayer/DemonSlayerPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/DynamicActicity/DynamicActivityPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/Expert/ExpertPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/Fight/FightPointPassMainPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralRankRewardPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/Pokemon/PokemonSingleResultPanel.prefab.meta
#	Assets/ManagedResources/Prefabs/UI/Pokemon/PokemonSummonPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/Resolve/ResolvePanel.prefab
#	Assets/ManagedResources/Prefabs/UI/SecretBox/SecretBoxBuyOnePanel.prefab
#	Assets/ManagedResources/Prefabs/UI/XiaoYao/XiaoYaoMapPanel.prefab
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Common/Managers.lua
#	Assets/ManagedResources/~Lua/Common/functions.lua
#	Assets/ManagedResources/~Lua/Data/SoundData.lua
#	Assets/ManagedResources/~Lua/Data/UIData.lua
#	Assets/ManagedResources/~Lua/Logic/Network.lua
#	Assets/ManagedResources/~Lua/Message/ActivityProto_pb.lua.meta
#	Assets/ManagedResources/~Lua/Modules/ActivityGift/AllActivityManager.lua.meta
#	Assets/ManagedResources/~Lua/Modules/Bag/BagManager.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Effect.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Skill.lua.meta
#	Assets/ManagedResources/~Lua/Modules/Battle/Logic/Monster/MonsterSkill/MCondition.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/Logic/Role/RoleData.lua.meta
#	Assets/ManagedResources/~Lua/Modules/Battle/Logic/Role/Skill.lua.meta
#	Assets/ManagedResources/~Lua/Modules/Battle/Test/BattleSetView.lua.meta
#	Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/RoleView.lua.meta
#	Assets/ManagedResources/~Lua/Modules/Common/MoneyUtil.lua
#	Assets/ManagedResources/~Lua/Modules/DataCenterService/CustomEventManager.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/LeiJiChongZhiPage.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/PoZhenZhuXianPage.lua.meta
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/SheJiDaDian.lua
#	Assets/ManagedResources/~Lua/Modules/Expert/ExChange.lua
#	Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralRankRewardPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Guild/CarDelay/GuildCarDelayLootPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Guild/Transcript/GuildTranscriptManager.lua
#	Assets/ManagedResources/~Lua/Modules/Login/LoginManager.lua
#	Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Main/BattleData1.lua
#	Assets/ManagedResources/~Lua/Modules/Main/GMPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Message/LoadingPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Mission/MissionDailyPanel_QingLongSecretTreasure.lua
#	Assets/ManagedResources/~Lua/Modules/Mission/MissionDailyPanel_SecretTreasureTrail.lua
#	Assets/ManagedResources/~Lua/Modules/Mission/QinglongSerectTreasureManager.lua
#	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
#	Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua
#	Assets/ManagedResources/~Lua/Modules/Player/AutoRecoverManager.lua
#	Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonManager.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/RoleInfoPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_RecruitConfirm.lua
#	Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Recruit/ElementDrawCardPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_Pokemon.lua
#	Assets/ManagedResources/~Lua/Modules/Task/TaskManager.lua
#	Assets/ManagedResources/~Lua/Modules/TreasureStore/TreasureStorePopup.lua
#	Assets/ManagedResources/~Lua/Modules/Vip/VipPanelV2.lua
#	Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoEventPanel.lua
#	Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoLuckyBossPopup.lua
#	Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoManager.lua
#	Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoyaoHeroGetPopup.lua.meta
#	Assets/Scripts/Editor/ExcelTool/DataConfigMD5Record.asset
2020-11-04 16:18:35 +08:00
..
Aid 测试 2020-09-24 18:34:31 +08:00
Boss 头像特效添加 2020-09-27 16:58:10 +08:00
CarDelay Merge branch 'master_xma_local' into master_develop 2020-11-04 16:18:35 +08:00
DeathPos 添加动画 2020-09-18 13:43:52 +08:00
RedPacketView 部分界面头像特效添加 2020-09-27 13:33:10 +08:00
Skill 二次弹窗关闭音效 2020-09-15 16:52:12 +08:00
Transcript Merge branch 'master_xma_local' into master_develop 2020-11-04 16:18:35 +08:00
View 中文表导出提交 2020-08-25 15:46:38 +08:00
Aid.meta 测试版本 带热更 0.15.1 2020-05-15 16:52:35 +08:00
Boss.meta 提交 2020-05-09 13:31:21 +08:00
CarDelay.meta 提交 2020-05-09 13:31:21 +08:00
DeathPos.meta 提交 2020-05-09 13:31:21 +08:00
GuildChangePopup.lua 中文表导出提交 2020-08-25 15:46:38 +08:00
GuildChangePopup.lua.meta 提交 2020-05-09 13:31:21 +08:00
GuildCreatePopup.lua 中文表导出提交 2020-08-25 15:46:38 +08:00
GuildCreatePopup.lua.meta 提交 2020-05-09 13:31:21 +08:00
GuildFetePopup.lua 中文表导出提交 2020-08-25 15:46:38 +08:00
GuildFetePopup.lua.meta 提交 2020-05-09 13:31:21 +08:00
GuildFightAttackInfoPopup.lua 头像特效添加 2020-09-27 16:58:10 +08:00
GuildFightAttackInfoPopup.lua.meta 提交 2020-05-09 13:31:21 +08:00
GuildFightAttackLogPopup.lua 头像特效添加 2020-09-27 16:58:10 +08:00
GuildFightAttackLogPopup.lua.meta 提交 2020-05-09 13:31:21 +08:00
GuildFightAttackTipPopup.lua 头像特效添加 2020-09-27 16:58:10 +08:00
GuildFightAttackTipPopup.lua.meta 提交 2020-05-09 13:31:21 +08:00
GuildFightDefendInfoPopup.lua 头像特效添加 2020-09-27 16:58:10 +08:00
GuildFightDefendInfoPopup.lua.meta 提交 2020-05-09 13:31:21 +08:00
GuildFightManager.lua 中文表导出提交 2020-08-25 15:46:38 +08:00
GuildFightManager.lua.meta 提交 2020-05-09 13:31:21 +08:00
GuildFightMatchSuccessPopup.lua 中文表导出提交 2020-08-25 15:46:38 +08:00
GuildFightMatchSuccessPopup.lua.meta 提交 2020-05-09 13:31:21 +08:00
GuildFightMatchingPopup.lua 中文表导出提交 2020-08-25 15:46:38 +08:00
GuildFightMatchingPopup.lua.meta 提交 2020-05-09 13:31:21 +08:00
GuildFightPopup.lua 头像特效添加 2020-09-27 16:58:10 +08:00
GuildFightPopup.lua.meta 提交 2020-05-09 13:31:21 +08:00
GuildFightResultPopup.lua 头像特效添加 2020-09-27 16:58:10 +08:00
GuildFightResultPopup.lua.meta 提交 2020-05-09 13:31:21 +08:00
GuildFindPopup.lua 图鉴2460适配修改,【十绝阵】开启后没有显示主城入口,十绝阵活动结束后吗,入口显示0000不关闭,【青龙秘宝】活动描述和背景重叠 2020-09-14 15:31:33 +08:00
GuildFindPopup.lua.meta 提交 2020-05-09 13:31:21 +08:00
GuildGetStarPopup.lua 中文表导出提交 2020-08-25 15:46:38 +08:00
GuildGetStarPopup.lua.meta 提交 2020-05-09 13:31:21 +08:00
GuildInfoPopup.lua 部分界面头像特效添加 2020-09-27 13:33:10 +08:00
GuildInfoPopup.lua.meta 提交 2020-05-09 13:31:21 +08:00
GuildLogoPopup.lua 中文表导出提交 2020-08-25 15:46:38 +08:00
GuildLogoPopup.lua.meta 提交 2020-05-09 13:31:21 +08:00
GuildMainCityPanel.lua 【社稷大典】加完红点完事了 2020-10-24 16:18:57 +08:00
GuildMainCityPanel.lua.meta 提交 2020-05-09 13:31:21 +08:00
GuildManager.lua 中文表导出提交 2020-08-25 15:46:38 +08:00
GuildManager.lua.meta 提交 2020-05-09 13:31:21 +08:00
GuildMemberInfoPopup.lua 头像特效添加 2020-09-27 16:58:10 +08:00
GuildMemberInfoPopup.lua.meta 提交 2020-05-09 13:31:21 +08:00
MyGuildManager.lua 中文表导出提交 2020-08-25 15:46:38 +08:00
MyGuildManager.lua.meta 提交 2020-05-09 13:31:21 +08:00
RedPacketView.meta 提交 2020-05-09 13:31:21 +08:00
Skill.meta 提交 2020-05-09 13:31:21 +08:00
Transcript.meta 公会副本提交初始界面 2020-08-18 19:33:31 +08:00
View.meta 提交 2020-05-09 13:31:21 +08:00