miduo_client/Assets/ManagedResources/Icon/ChengHao.meta

17 lines
438 B
Plaintext
Raw Normal View History

2021-03-24 18:16:30 +08:00
fileFormatVersion: 2
Merge branch 'china_dev_merge' into xma_dev_b_merge # Conflicts: # Assets/ManagedResources/Atlas/DyAct_Activity7/ArtFont.meta # Assets/ManagedResources/Atlas/FifteenDayGiftAtlas.meta # Assets/ManagedResources/Atlas/FifteenDayGiftAtlas/ArtFont.meta # Assets/ManagedResources/Atlas/NiuQiChongTianAtlas/ArtFont.meta # Assets/ManagedResources/Atlas/SupremeHeroAtlas/ArtFont.meta # Assets/ManagedResources/Icon/ChengHao.meta # Assets/ManagedResources/Icon/ZuoQi.meta # Assets/ManagedResources/Prefabs/UI/View/FetterItem.prefab # Assets/ManagedResources/~Lua/Logic/Network.lua # Assets/ManagedResources/~Lua/Modules/Carbon/CarbonTypePanelV2.lua # Assets/ManagedResources/~Lua/Modules/Common/MoneyUtil.lua # Assets/ManagedResources/~Lua/Modules/DailyRecharge/DailyRechargePanel.lua # Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua # Assets/ManagedResources/~Lua/Modules/DynamicActivity/ShengYiTianJiang.lua # Assets/ManagedResources/~Lua/Modules/FuXingGaoZhao/FuXingGaoZhaoPanel.lua # Assets/ManagedResources/~Lua/Modules/Guild/CarDelay/GuildCarDelayMainPanel.lua # Assets/ManagedResources/~Lua/Modules/Guild/DeathPos/DeathPosPanel.lua # Assets/ManagedResources/~Lua/Modules/Guild/GuildInfoPopup.lua # Assets/ManagedResources/~Lua/Modules/HandBook/HandBookHeroInfoPanel.lua # Assets/ManagedResources/~Lua/Modules/Map/MapManager.lua # Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGift.lua # Assets/ManagedResources/~Lua/Modules/Recharge/View/GiftPre.lua # Assets/ManagedResources/~Lua/Modules/Recharge/View/GiftView.lua # Assets/ManagedResources/~Lua/Modules/RoleInfo/TalismanUpStarListPanel.lua # Assets/ManagedResources/~Lua/Modules/Setting/SettingPlayerRide.lua # Assets/ManagedResources/~Lua/View/FetterItem.lua # Assets/ManagedResources/~Lua/View/ItemView.lua
2021-04-09 12:24:01 +08:00
<<<<<<< HEAD
<<<<<<< HEAD:Assets/ManagedResources/Icon/ChengHao.meta
2021-04-07 11:23:03 +08:00
guid: c436b4990cad80040bd99af80b3ff8e4
Merge branch 'china_dev_merge' into xma_dev_b_merge # Conflicts: # Assets/ManagedResources/Atlas/DyAct_Activity7/ArtFont.meta # Assets/ManagedResources/Atlas/FifteenDayGiftAtlas.meta # Assets/ManagedResources/Atlas/FifteenDayGiftAtlas/ArtFont.meta # Assets/ManagedResources/Atlas/NiuQiChongTianAtlas/ArtFont.meta # Assets/ManagedResources/Atlas/SupremeHeroAtlas/ArtFont.meta # Assets/ManagedResources/Icon/ChengHao.meta # Assets/ManagedResources/Icon/ZuoQi.meta # Assets/ManagedResources/Prefabs/UI/View/FetterItem.prefab # Assets/ManagedResources/~Lua/Logic/Network.lua # Assets/ManagedResources/~Lua/Modules/Carbon/CarbonTypePanelV2.lua # Assets/ManagedResources/~Lua/Modules/Common/MoneyUtil.lua # Assets/ManagedResources/~Lua/Modules/DailyRecharge/DailyRechargePanel.lua # Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua # Assets/ManagedResources/~Lua/Modules/DynamicActivity/ShengYiTianJiang.lua # Assets/ManagedResources/~Lua/Modules/FuXingGaoZhao/FuXingGaoZhaoPanel.lua # Assets/ManagedResources/~Lua/Modules/Guild/CarDelay/GuildCarDelayMainPanel.lua # Assets/ManagedResources/~Lua/Modules/Guild/DeathPos/DeathPosPanel.lua # Assets/ManagedResources/~Lua/Modules/Guild/GuildInfoPopup.lua # Assets/ManagedResources/~Lua/Modules/HandBook/HandBookHeroInfoPanel.lua # Assets/ManagedResources/~Lua/Modules/Map/MapManager.lua # Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGift.lua # Assets/ManagedResources/~Lua/Modules/Recharge/View/GiftPre.lua # Assets/ManagedResources/~Lua/Modules/Recharge/View/GiftView.lua # Assets/ManagedResources/~Lua/Modules/RoleInfo/TalismanUpStarListPanel.lua # Assets/ManagedResources/~Lua/Modules/Setting/SettingPlayerRide.lua # Assets/ManagedResources/~Lua/View/FetterItem.lua # Assets/ManagedResources/~Lua/View/ItemView.lua
2021-04-09 12:24:01 +08:00
=======
guid: b370a61a63a7bf24381433ffdd939b4b
>>>>>>> china_dev_merge:Assets/ManagedResources/Atlas/FifteenDayGiftAtlas.meta
=======
guid: d39cbbfd58eddf545a179ed416347069
Merge branch 'china_dev_merge' into xma_dev_b_merge # Conflicts: # Assets/ManagedResources/Atlas/DyAct_Activity7/ArtFont.meta # Assets/ManagedResources/Atlas/FifteenDayGiftAtlas.meta # Assets/ManagedResources/Atlas/FifteenDayGiftAtlas/ArtFont.meta # Assets/ManagedResources/Atlas/NiuQiChongTianAtlas/ArtFont.meta # Assets/ManagedResources/Atlas/SupremeHeroAtlas/ArtFont.meta # Assets/ManagedResources/Icon/ChengHao.meta # Assets/ManagedResources/Icon/ZuoQi.meta # Assets/ManagedResources/Prefabs/UI/View/FetterItem.prefab # Assets/ManagedResources/~Lua/Logic/Network.lua # Assets/ManagedResources/~Lua/Modules/Carbon/CarbonTypePanelV2.lua # Assets/ManagedResources/~Lua/Modules/Common/MoneyUtil.lua # Assets/ManagedResources/~Lua/Modules/DailyRecharge/DailyRechargePanel.lua # Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua # Assets/ManagedResources/~Lua/Modules/DynamicActivity/ShengYiTianJiang.lua # Assets/ManagedResources/~Lua/Modules/FuXingGaoZhao/FuXingGaoZhaoPanel.lua # Assets/ManagedResources/~Lua/Modules/Guild/CarDelay/GuildCarDelayMainPanel.lua # Assets/ManagedResources/~Lua/Modules/Guild/DeathPos/DeathPosPanel.lua # Assets/ManagedResources/~Lua/Modules/Guild/GuildInfoPopup.lua # Assets/ManagedResources/~Lua/Modules/HandBook/HandBookHeroInfoPanel.lua # Assets/ManagedResources/~Lua/Modules/Map/MapManager.lua # Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGift.lua # Assets/ManagedResources/~Lua/Modules/Recharge/View/GiftPre.lua # Assets/ManagedResources/~Lua/Modules/Recharge/View/GiftView.lua # Assets/ManagedResources/~Lua/Modules/RoleInfo/TalismanUpStarListPanel.lua # Assets/ManagedResources/~Lua/Modules/Setting/SettingPlayerRide.lua # Assets/ManagedResources/~Lua/View/FetterItem.lua # Assets/ManagedResources/~Lua/View/ItemView.lua
2021-04-09 12:24:01 +08:00
>>>>>>> china_dev_merge
2021-03-24 18:16:30 +08:00
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant: