powerfun-unity/Assets/Scripts/UI/Prefab/Device.meta

fileFormatVersion: 2
guid: 633debeb22d82eb4499126e20f36ba3a
folderAsset: yes
DefaultImporter:
  externalObjects: {}
  userData: 
  assetBundleName: 
  assetBundleVariant:
暂存 2021-03-26 16:36:31 +08:00			`fileFormatVersion: 2`
Merge remote-tracking branch 'origin/dev' into dev_lishuo # Conflicts: # Assets/Cyp/Prefab.meta # Assets/Mapbox/Core/Plugins/Android.meta # Assets/Mapbox/Core/Plugins/Mapbox.meta # Assets/Mapbox/Core/Plugins/Mapbox/MapboxAccounts.meta # Assets/Plugins/Circle/ImageWithRoundedCorners.cs # Assets/Resources/Images/Devices.meta # Assets/Resources/UI/Prefab/Item.meta # Assets/Scripts/Devices/Ant/LegacyPages.meta # Assets/Scripts/UI/Prefab/Item.meta # Assets/StreamingAssets.meta # ProjectSettings/EditorBuildSettings.asset 2021-04-01 14:09:23 +08:00			`guid: 633debeb22d82eb4499126e20f36ba3a`
暂存 2021-03-26 16:36:31 +08:00			`folderAsset: yes`
			`DefaultImporter:`
			`externalObjects: {}`
			`userData:`
			`assetBundleName:`
			`assetBundleVariant:`