miduo_client/Assets/ManagedResources/Atlas/VipAtlas
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
..
ArtFont 【社稷大典/灵兽】特效资源重新整理 2020-11-01 17:00:39 +08:00
ArtFont.meta 内网测试 0.15.14 2020-06-18 20:39:29 +08:00
r_mihe_biaoti002_png.png 内网 0.15.15 2020-07-10 18:20:58 +08:00
r_mihe_biaoti002_png.png.meta 资源压缩方式修改,苹果资源压缩方式添加, 2020-08-14 17:29:06 +08:00
r_tequan_biaotiao.png 提交 2020-05-09 13:31:21 +08:00
r_tequan_biaotiao.png.meta 资源压缩方式修改,苹果资源压缩方式添加, 2020-08-14 17:29:06 +08:00
r_tequan_juan_gan.png 提交 2020-05-09 13:31:21 +08:00
r_tequan_juan_gan.png.meta 资源压缩方式修改,苹果资源压缩方式添加, 2020-08-14 17:29:06 +08:00
r_tequan_juan_jindutiao01.png 提交 2020-05-09 13:31:21 +08:00
r_tequan_juan_jindutiao01.png.meta 资源压缩方式修改,苹果资源压缩方式添加, 2020-08-14 17:29:06 +08:00
r_tequan_juan_jindutiao02.png 提交 2020-05-09 13:31:21 +08:00
r_tequan_juan_jindutiao02.png.meta 资源压缩方式修改,苹果资源压缩方式添加, 2020-08-14 17:29:06 +08:00
r_tequan_juan_tequanbiandi.png 提交 2020-05-09 13:31:21 +08:00
r_tequan_juan_tequanbiandi.png.meta 资源压缩方式修改,苹果资源压缩方式添加, 2020-08-14 17:29:06 +08:00
r_tequan_juan_youhong.png 提交 2020-05-09 13:31:21 +08:00
r_tequan_juan_youhong.png.meta 资源压缩方式修改,苹果资源压缩方式添加, 2020-08-14 17:29:06 +08:00
r_tequan_juan_zuohong.png 提交 2020-05-09 13:31:21 +08:00
r_tequan_juan_zuohong.png.meta 资源压缩方式修改,苹果资源压缩方式添加, 2020-08-14 17:29:06 +08:00
r_tequan_mudidi.png 提交 2020-05-09 13:31:21 +08:00
r_tequan_mudidi.png.meta 资源压缩方式修改,苹果资源压缩方式添加, 2020-08-14 17:29:06 +08:00
r_tequan_muhengshang.png 提交 2020-05-09 13:31:21 +08:00
r_tequan_muhengshang.png.meta 资源压缩方式修改,苹果资源压缩方式添加, 2020-08-14 17:29:06 +08:00
r_tequan_muhengxia.png 提交 2020-05-09 13:31:21 +08:00
r_tequan_muhengxia.png.meta 资源压缩方式修改,苹果资源压缩方式添加, 2020-08-14 17:29:06 +08:00
r_tequan_muhengzhong01.png 提交 2020-05-09 13:31:21 +08:00
r_tequan_muhengzhong01.png.meta 资源压缩方式修改,苹果资源压缩方式添加, 2020-08-14 17:29:06 +08:00
r_tequan_mutui.png 提交 2020-05-09 13:31:21 +08:00
r_tequan_mutui.png.meta 资源压缩方式修改,苹果资源压缩方式添加, 2020-08-14 17:29:06 +08:00
r_tequan_te_anniu01.png 提交 2020-05-09 13:31:21 +08:00
r_tequan_te_anniu01.png.meta 资源压缩方式修改,苹果资源压缩方式添加, 2020-08-14 17:29:06 +08:00
r_tequan_te_anniu02.png 提交 2020-05-09 13:31:21 +08:00
r_tequan_te_anniu02.png.meta 资源压缩方式修改,苹果资源压缩方式添加, 2020-08-14 17:29:06 +08:00
r_tequan_te_anniuditiao.png 提交 2020-05-09 13:31:21 +08:00
r_tequan_te_anniuditiao.png.meta 资源压缩方式修改,苹果资源压缩方式添加, 2020-08-14 17:29:06 +08:00
r_tequan_te_anniuditiaoyou.png 提交 2020-05-09 13:31:21 +08:00
r_tequan_te_anniuditiaoyou.png.meta 资源压缩方式修改,苹果资源压缩方式添加, 2020-08-14 17:29:06 +08:00
r_tequan_te_anniuhei.png 提交 2020-05-09 13:31:21 +08:00
r_tequan_te_anniuhei.png.meta 资源压缩方式修改,苹果资源压缩方式添加, 2020-08-14 17:29:06 +08:00
r_tequan_yuekadi_03.png 提交 2020-05-09 13:31:21 +08:00
r_tequan_yuekadi_03.png.meta 资源压缩方式修改,苹果资源压缩方式添加, 2020-08-14 17:29:06 +08:00
r_zjm_tequan_png.png 提交 2020-05-09 13:31:21 +08:00
r_zjm_tequan_png.png.meta 资源压缩方式修改,苹果资源压缩方式添加, 2020-08-14 17:29:06 +08:00
t_tequan_henlan.png 寻宝文字提示修改,特权界面资源替换 2020-07-06 17:01:50 +08:00
t_tequan_henlan.png.meta 资源压缩方式修改,苹果资源压缩方式添加, 2020-08-14 17:29:06 +08:00
t_tequan_henlan01.png 寻宝文字提示修改,特权界面资源替换 2020-07-06 17:01:50 +08:00
t_tequan_henlan01.png.meta 资源压缩方式修改,苹果资源压缩方式添加, 2020-08-14 17:29:06 +08:00
t_tequan_henlan02.png 寻宝文字提示修改,特权界面资源替换 2020-07-06 17:01:50 +08:00
t_tequan_henlan02.png.meta 资源压缩方式修改,苹果资源压缩方式添加, 2020-08-14 17:29:06 +08:00
t_tequan_icon.png 六月三号开发提交 2020-06-03 19:09:01 +08:00
t_tequan_icon.png.meta 资源压缩方式修改,苹果资源压缩方式添加, 2020-08-14 17:29:06 +08:00
t_tequan_jindutia001.png 外网包 0.16.1 2020-05-25 19:16:23 +08:00
t_tequan_jindutia001.png.meta 资源压缩方式修改,苹果资源压缩方式添加, 2020-08-14 17:29:06 +08:00
t_tequan_jindutia002.png 提交 2020-05-09 13:31:21 +08:00
t_tequan_jindutia002.png.meta 资源压缩方式修改,苹果资源压缩方式添加, 2020-08-14 17:29:06 +08:00