diff --git a/Explorer/Assets/AddressableAssetsData/AssetGroups/Essentials.asset b/Explorer/Assets/AddressableAssetsData/AssetGroups/Essentials.asset index 106ad4a66c..e57f8a8736 100644 --- a/Explorer/Assets/AddressableAssetsData/AssetGroups/Essentials.asset +++ b/Explorer/Assets/AddressableAssetsData/AssetGroups/Essentials.asset @@ -1,105 +1,115 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: bbb281ee3bf0b054c82ac2347e9e782c, type: 3} - m_Name: Essentials - m_EditorClassIdentifier: - m_GroupName: Essentials - m_Data: - m_SerializedData: [] - m_GUID: 47f803e1e9c5079449bd106df98a0b7d - m_SerializeEntries: - - m_GUID: 654e496ed12f12e4f80243ab9f1d97c7 - m_Address: Character Camera - m_ReadOnly: 0 - m_SerializedLabels: [] - FlaggedDuringContentUpdateRestriction: 0 - - m_GUID: 0eecf14978c1aa74381023946dde5c78 - m_Address: Character Object - m_ReadOnly: 0 - m_SerializedLabels: [] - FlaggedDuringContentUpdateRestriction: 0 - - m_GUID: 35aa85d68d15435418848a03a2db81ec - m_Address: Inter-Regular SDF.asset - m_ReadOnly: 0 - m_SerializedLabels: [] - FlaggedDuringContentUpdateRestriction: 0 - - m_GUID: 96ae0a2159a39234f858ea23bdcc74ad - m_Address: Inter-SemiBold SDF.asset - m_ReadOnly: 0 - m_SerializedLabels: [] - FlaggedDuringContentUpdateRestriction: 0 - - m_GUID: 8f586378b4e144a9851e7b34d9b748ee - m_Address: LiberationSans SDF.asset - m_ReadOnly: 0 - m_SerializedLabels: [] - FlaggedDuringContentUpdateRestriction: 0 - - m_GUID: 2e498d1c8094910479dc3e1b768306a4 - m_Address: LiberationSans SDF - Fallback.asset - m_ReadOnly: 0 - m_SerializedLabels: [] - FlaggedDuringContentUpdateRestriction: 0 - - m_GUID: e8cf73ccd47a385498b71ec58534d03c - m_Address: Assets/DCL/AvatarRendering/AvatarShape/Assets/ComputeShaderSkinning.compute - m_ReadOnly: 0 - m_SerializedLabels: [] - FlaggedDuringContentUpdateRestriction: 0 - - m_GUID: 3efe8a48fc3905f47a0648abd6859394 - m_Address: MapCameraObject - m_ReadOnly: 0 - m_SerializedLabels: [] - FlaggedDuringContentUpdateRestriction: 0 - - m_GUID: b54d9d4189903c2438fa811308f14ceb - m_Address: MapConfiguration - m_ReadOnly: 0 - m_SerializedLabels: [] - FlaggedDuringContentUpdateRestriction: 0 - - m_GUID: 7e150ada146ad0749b39e65968780157 - m_Address: MapParcelHighlightMarker - m_ReadOnly: 0 - m_SerializedLabels: [] - FlaggedDuringContentUpdateRestriction: 0 - - m_GUID: 0ae66608be2735a4f96e0f1aa9b3a75b - m_Address: PlayerMarkerObject - m_ReadOnly: 0 - m_SerializedLabels: [] - FlaggedDuringContentUpdateRestriction: 0 - - m_GUID: f80a8f4fcad2b4246b66c94221314244 - m_Address: AtlasChunk - m_ReadOnly: 0 - m_SerializedLabels: [] - FlaggedDuringContentUpdateRestriction: 0 - - m_GUID: 04a7ffcd277754f7c91237894604f522 - m_Address: NftRarityBackgrounds - m_ReadOnly: 0 - m_SerializedLabels: [] - FlaggedDuringContentUpdateRestriction: 0 - - m_GUID: 7491e2fb7fd484d2b8aed984dfc7c6ab - m_Address: NftRarityColors - m_ReadOnly: 0 - m_SerializedLabels: [] - FlaggedDuringContentUpdateRestriction: 0 - - m_GUID: 4a2a7b610414b45c1b576946ce094877 - m_Address: NftCategoryIcons - m_ReadOnly: 0 - m_SerializedLabels: [] - FlaggedDuringContentUpdateRestriction: 0 - - m_GUID: 08d42937d0bc54b48baaa23c8c520175 - m_Address: Assets/DCL/AuthenticationScreenFlow/Assets/AuthenticationScreen.prefab - m_ReadOnly: 0 - m_SerializedLabels: [] - FlaggedDuringContentUpdateRestriction: 0 - m_ReadOnly: 0 - m_Settings: {fileID: 11400000, guid: fc8a9d2b539788c47a5b305639fa8b34, type: 2} - m_SchemaSet: - m_Schemas: - - {fileID: 11400000, guid: 9457e5517ec7d134d8c10bdce90c02c6, type: 2} - - {fileID: 11400000, guid: f1becbbb6af19b14bafe1985627ea5ea, type: 2} +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: bbb281ee3bf0b054c82ac2347e9e782c, type: 3} + m_Name: Essentials + m_EditorClassIdentifier: + m_GroupName: Essentials + m_Data: + m_SerializedData: [] + m_GUID: 47f803e1e9c5079449bd106df98a0b7d + m_SerializeEntries: + - m_GUID: 654e496ed12f12e4f80243ab9f1d97c7 + m_Address: Character Camera + m_ReadOnly: 0 + m_SerializedLabels: [] + FlaggedDuringContentUpdateRestriction: 0 + - m_GUID: 0eecf14978c1aa74381023946dde5c78 + m_Address: Character Object + m_ReadOnly: 0 + m_SerializedLabels: [] + FlaggedDuringContentUpdateRestriction: 0 + - m_GUID: 35aa85d68d15435418848a03a2db81ec + m_Address: Inter-Regular SDF.asset + m_ReadOnly: 0 + m_SerializedLabels: [] + FlaggedDuringContentUpdateRestriction: 0 + - m_GUID: 96ae0a2159a39234f858ea23bdcc74ad + m_Address: Inter-SemiBold SDF.asset + m_ReadOnly: 0 + m_SerializedLabels: [] + FlaggedDuringContentUpdateRestriction: 0 + - m_GUID: 8f586378b4e144a9851e7b34d9b748ee + m_Address: LiberationSans SDF.asset + m_ReadOnly: 0 + m_SerializedLabels: [] + FlaggedDuringContentUpdateRestriction: 0 + - m_GUID: 2e498d1c8094910479dc3e1b768306a4 + m_Address: LiberationSans SDF - Fallback.asset + m_ReadOnly: 0 + m_SerializedLabels: [] + FlaggedDuringContentUpdateRestriction: 0 + - m_GUID: e8cf73ccd47a385498b71ec58534d03c + m_Address: Assets/DCL/AvatarRendering/AvatarShape/Assets/ComputeShaderSkinning.compute + m_ReadOnly: 0 + m_SerializedLabels: [] + FlaggedDuringContentUpdateRestriction: 0 + - m_GUID: 3efe8a48fc3905f47a0648abd6859394 + m_Address: MapCameraObject + m_ReadOnly: 0 + m_SerializedLabels: [] + FlaggedDuringContentUpdateRestriction: 0 + - m_GUID: b54d9d4189903c2438fa811308f14ceb + m_Address: MapConfiguration + m_ReadOnly: 0 + m_SerializedLabels: [] + FlaggedDuringContentUpdateRestriction: 0 + - m_GUID: 7e150ada146ad0749b39e65968780157 + m_Address: MapParcelHighlightMarker + m_ReadOnly: 0 + m_SerializedLabels: [] + FlaggedDuringContentUpdateRestriction: 0 + - m_GUID: 0ae66608be2735a4f96e0f1aa9b3a75b + m_Address: PlayerMarkerObject + m_ReadOnly: 0 + m_SerializedLabels: [] + FlaggedDuringContentUpdateRestriction: 0 + - m_GUID: f80a8f4fcad2b4246b66c94221314244 + m_Address: AtlasChunk + m_ReadOnly: 0 + m_SerializedLabels: [] + FlaggedDuringContentUpdateRestriction: 0 + - m_GUID: 04a7ffcd277754f7c91237894604f522 + m_Address: NftRarityBackgrounds + m_ReadOnly: 0 + m_SerializedLabels: [] + FlaggedDuringContentUpdateRestriction: 0 + - m_GUID: 7491e2fb7fd484d2b8aed984dfc7c6ab + m_Address: NftRarityColors + m_ReadOnly: 0 + m_SerializedLabels: [] + FlaggedDuringContentUpdateRestriction: 0 + - m_GUID: 4a2a7b610414b45c1b576946ce094877 + m_Address: NftCategoryIcons + m_ReadOnly: 0 + m_SerializedLabels: [] + FlaggedDuringContentUpdateRestriction: 0 + - m_GUID: 08d42937d0bc54b48baaa23c8c520175 + m_Address: Assets/DCL/AuthenticationScreenFlow/Assets/AuthenticationScreen.prefab + m_ReadOnly: 0 + m_SerializedLabels: [] + FlaggedDuringContentUpdateRestriction: 0 + - m_GUID: 66f8f8427a5c4443e95b0d298addd639 + m_Address: NftInfoPanelRarityBackgrounds + m_ReadOnly: 0 + m_SerializedLabels: [] + FlaggedDuringContentUpdateRestriction: 0 + - m_GUID: aabac5666448b4345a76347f94ea32a4 + m_Address: BackpackItem + m_ReadOnly: 0 + m_SerializedLabels: [] + FlaggedDuringContentUpdateRestriction: 0 + m_ReadOnly: 0 + m_Settings: {fileID: 11400000, guid: fc8a9d2b539788c47a5b305639fa8b34, type: 2} + m_SchemaSet: + m_Schemas: + - {fileID: 11400000, guid: 9457e5517ec7d134d8c10bdce90c02c6, type: 2} + - {fileID: 11400000, guid: f1becbbb6af19b14bafe1985627ea5ea, type: 2} diff --git a/Explorer/Assets/AddressableAssetsData/ProfileDataSourceSettings.asset.meta b/Explorer/Assets/AddressableAssetsData/ProfileDataSourceSettings.asset.meta new file mode 100644 index 0000000000..761988bff9 --- /dev/null +++ b/Explorer/Assets/AddressableAssetsData/ProfileDataSourceSettings.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ebe2a662356314f05b03623e66ea7c24 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Explorer/Assets/DCL/AvatarRendering/Wearables/Components/IWearable.cs b/Explorer/Assets/DCL/AvatarRendering/Wearables/Components/IWearable.cs index 8c92ed924e..6dec3fae35 100644 --- a/Explorer/Assets/DCL/AvatarRendering/Wearables/Components/IWearable.cs +++ b/Explorer/Assets/DCL/AvatarRendering/Wearables/Components/IWearable.cs @@ -1,7 +1,9 @@ -using DCL.AvatarRendering.Wearables.Helpers; +using CommunicationData.URLHelpers; +using DCL.AvatarRendering.Wearables.Helpers; using ECS.StreamableLoading.Common.Components; using SceneRunner.Scene; using System.Collections.Generic; +using UnityEngine; namespace DCL.AvatarRendering.Wearables.Components { @@ -15,6 +17,7 @@ public interface IWearable StreamableLoadingResult? ManifestResult { get; set; } StreamableLoadingResult?[] WearableAssetResults { get; } StreamableLoadingResult WearableDTO { get; set; } + StreamableLoadingResult? WearableThumbnail { get; set; } string GetMainFileHash(BodyShape bodyShape); @@ -22,8 +25,18 @@ public interface IWearable string GetUrn(); + string GetName(); + string GetCategory(); + string GetDescription(); + + string GetCreator(); + + string GetRarity(); + + URLPath GetThumbnail(); + bool IsUnisex(); bool IsCompatibleWithBodyShape(string bodyShape); diff --git a/Explorer/Assets/DCL/AvatarRendering/Wearables/Components/Intentions/GetWearableByParamIntention.cs b/Explorer/Assets/DCL/AvatarRendering/Wearables/Components/Intentions/GetWearableByParamIntention.cs index 2269478938..76d8dda18d 100644 --- a/Explorer/Assets/DCL/AvatarRendering/Wearables/Components/Intentions/GetWearableByParamIntention.cs +++ b/Explorer/Assets/DCL/AvatarRendering/Wearables/Components/Intentions/GetWearableByParamIntention.cs @@ -14,13 +14,13 @@ public struct GetWearableByParamIntention : IEquatable Params; public string UserID; //Used for pooling public List Results; - public GetWearableByParamIntention((string, string)[] requestParams, string userID, List results) + public GetWearableByParamIntention(IReadOnlyList<(string, string)> requestParams, string userID, List results) { Params = requestParams; UserID = userID; diff --git a/Explorer/Assets/DCL/AvatarRendering/Wearables/Components/Wearable.cs b/Explorer/Assets/DCL/AvatarRendering/Wearables/Components/Wearable.cs index 33bae03019..d3b845256c 100644 --- a/Explorer/Assets/DCL/AvatarRendering/Wearables/Components/Wearable.cs +++ b/Explorer/Assets/DCL/AvatarRendering/Wearables/Components/Wearable.cs @@ -1,9 +1,11 @@ +using CommunicationData.URLHelpers; using DCL.AvatarRendering.Wearables.Helpers; using ECS.StreamableLoading.Common.Components; using SceneRunner.Scene; using System; using System.Collections.Generic; using System.Linq; +using UnityEngine; //Removed all references to EmoteData in WearableItem namespace DCL.AvatarRendering.Wearables.Components @@ -11,15 +13,38 @@ namespace DCL.AvatarRendering.Wearables.Components [Serializable] public class Wearable : IWearable { + private const string THUMBNAIL_DEFAULT_KEY = "thumbnail.png"; public StreamableLoadingResult? ManifestResult { get; set; } public StreamableLoadingResult?[] WearableAssetResults { get; private set; } = new StreamableLoadingResult?[BodyShape.COUNT]; public StreamableLoadingResult WearableDTO { get; set; } + + public StreamableLoadingResult? WearableThumbnail { get; set; } public bool IsLoading { get; set; } = true; + public URLPath GetThumbnail() + { + string thumbnailHash = WearableDTO.Asset.metadata.thumbnail; + + if (thumbnailHash == THUMBNAIL_DEFAULT_KEY) + thumbnailHash = GetContentHashByKey(THUMBNAIL_DEFAULT_KEY); + + return new URLPath(thumbnailHash); + } + + private string GetContentHashByKey(string key) + { + for (var i = 0; i < WearableDTO.Asset.content.Length; i++) + { + if (WearableDTO.Asset.content[i].file == key) + return WearableDTO.Asset.content[i].hash; + } + + return ""; + } + public string GetMainFileHash(BodyShape bodyShape) { var mainFileKey = ""; - var hashToReturn = ""; // The length of arrays is small, so O(N) complexity is fine // Avoid iterator allocations with "for" loop @@ -34,18 +59,7 @@ public string GetMainFileHash(BodyShape bodyShape) } } - for (var i = 0; i < WearableDTO.Asset.content.Length; i++) - { - WearableDTO.WearableContentDto wearableContentDto = WearableDTO.Asset.content[i]; - - if (wearableContentDto.file.Equals(mainFileKey)) - { - hashToReturn = wearableContentDto.hash; - break; - } - } - - return hashToReturn; + return GetContentHashByKey(mainFileKey); } public string GetHash() => @@ -54,9 +68,21 @@ public string GetHash() => public string GetUrn() => WearableDTO.Asset.metadata.id; + public string GetName() => + WearableDTO.Asset.metadata.name; + public string GetCategory() => WearableDTO.Asset.metadata.data.category; + public string GetDescription() => + WearableDTO.Asset.metadata.description; + + public string GetCreator() => + ""; + + public string GetRarity() => + WearableDTO.Asset.metadata.rarity ?? "common"; + public bool IsUnisex() => WearableDTO.Asset.metadata.data.representations.Length > 1; diff --git a/Explorer/Assets/DCL/AvatarRendering/Wearables/Helpers/WearableCatalog.cs b/Explorer/Assets/DCL/AvatarRendering/Wearables/Helpers/WearableCatalog.cs index 935b50650b..1bc0a429a7 100644 --- a/Explorer/Assets/DCL/AvatarRendering/Wearables/Helpers/WearableCatalog.cs +++ b/Explorer/Assets/DCL/AvatarRendering/Wearables/Helpers/WearableCatalog.cs @@ -22,6 +22,7 @@ public IWearable GetOrAddWearableByDTO(WearableDTO wearableDto, bool qualifiedFo { WearableDTO = new StreamableLoadingResult(wearableDto), IsLoading = false + }, qualifiedForUnloading); } @@ -30,6 +31,7 @@ public void AddEmptyWearable(string loadingIntentionPointer, bool qualifiedForUn AddWearable(loadingIntentionPointer, new Wearable(), qualifiedForUnloading); } + internal IWearable AddWearable(string loadingIntentionPointer, IWearable wearable, bool qualifiedForUnloading) { wearablesCache.Add(loadingIntentionPointer, wearable); diff --git a/Explorer/Assets/DCL/AvatarRendering/Wearables/Helpers/WearableComponentsUtils.cs b/Explorer/Assets/DCL/AvatarRendering/Wearables/Helpers/WearableComponentsUtils.cs index 9ee4b6813e..cb310c3a57 100644 --- a/Explorer/Assets/DCL/AvatarRendering/Wearables/Helpers/WearableComponentsUtils.cs +++ b/Explorer/Assets/DCL/AvatarRendering/Wearables/Helpers/WearableComponentsUtils.cs @@ -1,9 +1,16 @@ -using CommunicationData.URLHelpers; +using Arch.Core; +using CommunicationData.URLHelpers; using DCL.AvatarRendering.Wearables.Components; using DCL.AvatarRendering.Wearables.Components.Intentions; using DCL.Optimization.Pools; +using ECS; +using ECS.Prioritization.Components; +using ECS.StreamableLoading.Common.Components; +using ECS.StreamableLoading.Textures; using System.Buffers; using System.Collections.Generic; +using UnityEngine; +using Promise = ECS.StreamableLoading.Common.AssetPromise; namespace DCL.AvatarRendering.Wearables.Helpers { @@ -12,6 +19,9 @@ public static class WearableComponentsUtils internal static readonly ListObjectPool POINTERS_POOL = new (listInstanceDefaultCapacity: 10, defaultCapacity: 20); internal static readonly ArrayPool RESULTS_POOL = ArrayPool.Create(20, 20); + private static readonly URLBuilder URL_BUILDER = new (); + private static readonly Sprite DEFAULT_THUMBNAIL = Sprite.Create(Texture2D.grayTexture, new Rect(0, 0, 1, 1), new Vector2()); + public static GetWearablesByPointersIntention CreateGetWearablesByPointersIntention(BodyShape bodyShape, IReadOnlyCollection wearables) { List pointers = POINTERS_POOL.Get(); @@ -33,5 +43,28 @@ public static GetWearablesByPointersIntention CreateGetWearablesByPointersIntent IWearable[] results = RESULTS_POOL.Rent(pointers.Count); return new GetWearablesByPointersIntention(pointers, results, bodyShape); } + + public static void CreateWearableThumbnailPromise(IRealmData realmData, IWearable wearable, World world, IPartitionComponent partitionComponent) + { + URLPath thumbnailPath = wearable.GetThumbnail(); + + if (string.IsNullOrEmpty(thumbnailPath.Value)) + { + wearable.WearableThumbnail = new StreamableLoadingResult(DEFAULT_THUMBNAIL); + return; + } + + URL_BUILDER.Clear(); + URL_BUILDER.AppendDomain(realmData.Ipfs.ContentBaseUrl).AppendPath(thumbnailPath); + + var promise = Promise.Create(world, + new GetTextureIntention + { + CommonArguments = new CommonLoadingArguments(URL_BUILDER.Build()) + }, + partitionComponent); + + world.Create(wearable, promise, partitionComponent); + } } } diff --git a/Explorer/Assets/DCL/AvatarRendering/Wearables/Helpers/WearableDTO.cs b/Explorer/Assets/DCL/AvatarRendering/Wearables/Helpers/WearableDTO.cs index 2ab2e986f1..cb5321b5ca 100644 --- a/Explorer/Assets/DCL/AvatarRendering/Wearables/Helpers/WearableDTO.cs +++ b/Explorer/Assets/DCL/AvatarRendering/Wearables/Helpers/WearableDTO.cs @@ -31,6 +31,7 @@ public struct WearableMetadataDto //urn public string id; + public string name; public I18n[] i18n; public string thumbnail; @@ -55,6 +56,13 @@ public class Representation public string[] overrideReplaces; } + [Serializable] + public struct RepresentationContentsDto + { + public string key; + public string url; + } + [Serializable] public class DataDto { diff --git a/Explorer/Assets/DCL/AvatarRendering/Wearables/Helpers/WearablesConstants.cs b/Explorer/Assets/DCL/AvatarRendering/Wearables/Helpers/WearablesConstants.cs index e8a0ed224b..d7884dd205 100644 --- a/Explorer/Assets/DCL/AvatarRendering/Wearables/Helpers/WearablesConstants.cs +++ b/Explorer/Assets/DCL/AvatarRendering/Wearables/Helpers/WearablesConstants.cs @@ -9,7 +9,7 @@ namespace DCL.AvatarRendering.Wearables.Helpers public static class WearablesConstants { public const string EMPTY_DEFAULT_WEARABLE = "EMPTY_DEFAULT_WEARABLE"; - + //Used for hiding algorithm public static readonly IList CATEGORIES_PRIORITY = new List { diff --git a/Explorer/Assets/DCL/AvatarRendering/Wearables/Systems/LoadDefaultWearablesSystem.cs b/Explorer/Assets/DCL/AvatarRendering/Wearables/Systems/LoadDefaultWearablesSystem.cs index 0900dadd40..1113be1466 100644 --- a/Explorer/Assets/DCL/AvatarRendering/Wearables/Systems/LoadDefaultWearablesSystem.cs +++ b/Explorer/Assets/DCL/AvatarRendering/Wearables/Systems/LoadDefaultWearablesSystem.cs @@ -23,7 +23,7 @@ public partial class LoadDefaultWearablesSystem : BaseUnityLoopSystem private readonly WearablesDTOList defaultWearableDefinition; private readonly IWearableCatalog wearableCatalog; private readonly GameObject emptyDefaultWearable; - + internal LoadDefaultWearablesSystem(World world, WearablesDTOList defaultWearableDefinition, GameObject emptyDefaultWearable, IWearableCatalog wearableCatalog) : base(world) diff --git a/Explorer/Assets/DCL/AvatarRendering/Wearables/Systems/LoadWearablesByParamSystem.cs b/Explorer/Assets/DCL/AvatarRendering/Wearables/Systems/LoadWearablesByParamSystem.cs index 541486da7d..2314caac78 100644 --- a/Explorer/Assets/DCL/AvatarRendering/Wearables/Systems/LoadWearablesByParamSystem.cs +++ b/Explorer/Assets/DCL/AvatarRendering/Wearables/Systems/LoadWearablesByParamSystem.cs @@ -15,7 +15,9 @@ using ECS.StreamableLoading.Common.Components; using ECS.StreamableLoading.Common.Systems; using System; +using System.Collections.Generic; using System.Threading; +using UnityEngine; using Utility.Multithreading; namespace DCL.AvatarRendering.Wearables.Systems @@ -59,13 +61,15 @@ protected override async UniTask> FlowInter for (var i = 0; i < lambdaResponse.elements.Count; i++) { WearableDTO wearableDto = lambdaResponse.elements[i].entity; - intention.Results.Add(wearableCatalog.GetOrAddWearableByDTO(wearableDto)); - } + IWearable wearable = wearableCatalog.GetOrAddWearableByDTO(wearableDto); + WearableComponentsUtils.CreateWearableThumbnailPromise(realmData, wearable, World, partition); + intention.Results.Add(wearable); + } return new StreamableLoadingResult(intention.Results.ToArray()); } - private URLAddress BuildURL(string userID, (string paramName, string paramValue)[] urlEncodedParams) + private URLAddress BuildURL(string userID, IReadOnlyList<(string, string)> urlEncodedParams) { urlBuilder.Clear(); @@ -73,9 +77,9 @@ private URLAddress BuildURL(string userID, (string paramName, string paramValue) .AppendSubDirectory(URLSubdirectory.FromString(userID)) .AppendSubDirectory(wearablesSubdirectory); - if (urlEncodedParams.Length > 0) + if (urlEncodedParams.Count > 0) { - for (var i = 0; i < urlEncodedParams.Length; i++) + for (var i = 0; i < urlEncodedParams.Count; i++) urlBuilder.AppendParameter(urlEncodedParams[i]); } diff --git a/Explorer/Assets/DCL/AvatarRendering/Wearables/Systems/ResolveWearableByPointerSystem.cs b/Explorer/Assets/DCL/AvatarRendering/Wearables/Systems/ResolveWearableByPointerSystem.cs index 88e4f743b3..7345d876e3 100644 --- a/Explorer/Assets/DCL/AvatarRendering/Wearables/Systems/ResolveWearableByPointerSystem.cs +++ b/Explorer/Assets/DCL/AvatarRendering/Wearables/Systems/ResolveWearableByPointerSystem.cs @@ -122,7 +122,7 @@ private void ResolveWearablePromise([Data] bool defaultWearablesResolved, in Ent } [Query] - private void FinalizeWearableDTO([Data] bool defaultWearablesResolved, in Entity entity, ref AssetPromise promise, ref BodyShape bodyShape) + private void FinalizeWearableDTO([Data] bool defaultWearablesResolved, in Entity entity, ref AssetPromise promise, ref BodyShape bodyShape, ref IPartitionComponent partitionComponent) { if (promise.LoadingIntention.CancellationTokenSource.IsCancellationRequested) { @@ -146,10 +146,12 @@ private void FinalizeWearableDTO([Data] bool defaultWearablesResolved, in Entity { foreach (WearableDTO assetEntity in promiseResult.Asset.Value) { - //TODO: Download Thumbnail wearableCatalog.TryGetWearable(assetEntity.metadata.id, out IWearable component); + component.WearableDTO = new StreamableLoadingResult(assetEntity); component.IsLoading = false; + + WearableComponentsUtils.CreateWearableThumbnailPromise(realmData, component, World, partitionComponent); } } @@ -243,7 +245,7 @@ private void CreateMissingPointersPromise(List missingPointers, GetWeara new CommonLoadingArguments(realmData.Ipfs.EntitiesActiveEndpoint, cancellationTokenSource: intention.CancellationTokenSource)); var promise = AssetPromise.Create(World, wearableDtoByPointersIntention, partitionComponent); - World.Create(promise, intention.BodyShape); + World.Create(promise, intention.BodyShape, partitionComponent); } private void SetDefaultWearables(bool defaultWearablesLoaded, IWearable wearable, in BodyShape bodyShape) diff --git a/Explorer/Assets/DCL/AvatarRendering/Wearables/Systems/ResolveWearableThumbnailSystem.cs b/Explorer/Assets/DCL/AvatarRendering/Wearables/Systems/ResolveWearableThumbnailSystem.cs new file mode 100644 index 0000000000..2c4b6d82fd --- /dev/null +++ b/Explorer/Assets/DCL/AvatarRendering/Wearables/Systems/ResolveWearableThumbnailSystem.cs @@ -0,0 +1,44 @@ +using Arch.Core; +using Arch.System; +using Arch.SystemGroups; +using Arch.SystemGroups.DefaultSystemGroups; +using CommunicationData.URLHelpers; +using DCL.AvatarRendering.Wearables.Components; +using DCL.Diagnostics; +using ECS; +using ECS.Abstract; +using ECS.Prioritization.Components; +using ECS.StreamableLoading.Common.Components; +using ECS.StreamableLoading.Textures; +using UnityEngine; +using Utility; +using Promise = ECS.StreamableLoading.Common.AssetPromise; + + +namespace DCL.AvatarRendering.Wearables.Systems +{ + [UpdateInGroup(typeof(PresentationSystemGroup))] + [LogCategory(ReportCategory.WEARABLE)] + public partial class ResolveWearableThumbnailSystem : BaseUnityLoopSystem + { + + public ResolveWearableThumbnailSystem(World world) : base(world) { } + + protected override void Update(float t) + { + CompleteWearableThumbnailDownloadQuery(World); + } + + [Query] + private void CompleteWearableThumbnailDownload(in Entity entity, ref IWearable wearable, ref Promise promise) + { + if (promise.TryConsume(World, out var result)) + { + wearable.WearableThumbnail = + new StreamableLoadingResult( + Sprite.Create(result.Asset, new Rect(0, 0, result.Asset.width, result.Asset.height), VectorUtilities.OneHalf, 50, 0, SpriteMeshType.FullRect, Vector4.one, false)); + World.Destroy(entity); + } + } + } +} diff --git a/Explorer/Assets/DCL/AvatarRendering/Wearables/Systems/ResolveWearableThumbnailSystem.cs.meta b/Explorer/Assets/DCL/AvatarRendering/Wearables/Systems/ResolveWearableThumbnailSystem.cs.meta new file mode 100644 index 0000000000..02302d26a6 --- /dev/null +++ b/Explorer/Assets/DCL/AvatarRendering/Wearables/Systems/ResolveWearableThumbnailSystem.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: f03de7f4e26f42b9b668f2dba84e6365 +timeCreated: 1704209260 \ No newline at end of file diff --git a/Explorer/Assets/DCL/AvatarRendering/Wearables/Tests/ResolveWearableThumbnailSystemShould.cs b/Explorer/Assets/DCL/AvatarRendering/Wearables/Tests/ResolveWearableThumbnailSystemShould.cs new file mode 100644 index 0000000000..0eebe9c9d8 --- /dev/null +++ b/Explorer/Assets/DCL/AvatarRendering/Wearables/Tests/ResolveWearableThumbnailSystemShould.cs @@ -0,0 +1,77 @@ +using CommunicationData.URLHelpers; +using DCL.AvatarRendering.Wearables.Components; +using DCL.AvatarRendering.Wearables.Components.Intentions; +using DCL.AvatarRendering.Wearables.Helpers; +using DCL.AvatarRendering.Wearables.Systems; +using ECS; +using ECS.Prioritization.Components; +using ECS.StreamableLoading.Common.Components; +using ECS.StreamableLoading.Textures; +using ECS.TestSuite; +using Ipfs; +using NSubstitute; +using NUnit.Framework; +using SceneRunner.Scene; +using Promise = ECS.StreamableLoading.Common.AssetPromise; + +namespace DCL.AvatarRendering.Wearables.Tests +{ + [TestFixture] + public class ResolveWearableThumbnailSystemShould : UnitySystemTestBase + { + private StreamableLoadingResult mockedDefaultAB; + private readonly string defaultWearableUrn = "urn:decentraland:off-chain:base-avatars:green_hoodie"; + private readonly string unisexTestUrn = "urn:decentraland:off-chain:base-avatars:red_hoodie_unisex"; + private WearableCatalog wearableCatalog; + private RealmData realmData; + + [SetUp] + public void Setup() + { + wearableCatalog = new WearableCatalog(); + IWearable mockDefaultWearable = CreateMockWearable(defaultWearableUrn, false, true); + wearableCatalog.wearablesCache.Add(mockDefaultWearable.GetUrn(), mockDefaultWearable); + mockedDefaultAB = new StreamableLoadingResult(new WearableAsset(null, null, null)); + realmData = new RealmData(new IpfsRealm(URLDomain.EMPTY)); + system = new ResolveWearableThumbnailSystem(world); + } + + private IWearable CreateMockWearable(string urn, bool isUnisex, bool isDefaultWearable) + { + IWearable wearable = Substitute.For(); + wearable.GetUrn().Returns(urn); + wearable.IsUnisex().Returns(isUnisex); + wearable.GetCategory().Returns(WearablesConstants.Categories.UPPER_BODY); + wearable.GetThumbnail().Returns(new URLPath("bafybeie7lzqakerm4n4x7557g3va4sv7aeoniexlomdgjskuoubo6s3mku")); + + var assetBundleData + = new StreamableLoadingResult?[BodyShape.COUNT]; + + if (isDefaultWearable) + assetBundleData[BodyShape.MALE] = mockedDefaultAB; + + wearable.WearableAssetResults.Returns(assetBundleData); + return wearable; + } + + + [Test] + public void ResolveWearableThumbnail() + { + //Arrange + IWearable mockedWearable = CreateMockWearable(unisexTestUrn, false, true); + wearableCatalog.wearablesCache.Add(mockedWearable.GetUrn(), mockedWearable); + URLBuilder urlBuilder = new URLBuilder(); + urlBuilder.AppendDomain(realmData.Ipfs.ContentBaseUrl).AppendPath(mockedWearable.GetThumbnail()); + + Promise promise = Promise.Create(world, + new GetTextureIntention + { + CommonArguments = new CommonLoadingArguments(urlBuilder.Build()) + } + , PartitionComponent.TOP_PRIORITY); + system.Update(0); + } + + } +} diff --git a/Explorer/Assets/DCL/AvatarRendering/Wearables/Tests/ResolveWearableThumbnailSystemShould.cs.meta b/Explorer/Assets/DCL/AvatarRendering/Wearables/Tests/ResolveWearableThumbnailSystemShould.cs.meta new file mode 100644 index 0000000000..fd3bcd36d4 --- /dev/null +++ b/Explorer/Assets/DCL/AvatarRendering/Wearables/Tests/ResolveWearableThumbnailSystemShould.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 6c30cc736bd74f15a442234523893192 +timeCreated: 1704272075 \ No newline at end of file diff --git a/Explorer/Assets/DCL/Backpack/Assets/AvatarSlot.prefab b/Explorer/Assets/DCL/Backpack/Assets/AvatarSlot.prefab index 48f3f1d21d..ce54509fad 100644 --- a/Explorer/Assets/DCL/Backpack/Assets/AvatarSlot.prefab +++ b/Explorer/Assets/DCL/Backpack/Assets/AvatarSlot.prefab @@ -113,8 +113,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 14, y: -14} - m_SizeDelta: {x: 24, y: 24} + m_AnchoredPosition: {x: -0.000011444092, y: 0} + m_SizeDelta: {x: 26, y: 26} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8485199980452263055 CanvasRenderer: @@ -137,14 +137,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.98823535, g: 0.98823535, b: 0.98823535, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: f02af068e11cb4902a1a4faad10b890a, type: 3} + m_Sprite: {fileID: 21300000, guid: 12dd1efc4e826764f9b02be515a9a033, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -175,10 +175,10 @@ MonoBehaviour: m_SelectOnRight: {fileID: 0} m_Transition: 1 m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} - m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_NormalColor: {r: 0.9882353, g: 0.9882353, b: 0.9882353, a: 1} + m_HighlightedColor: {r: 0.9254902, g: 0.92156863, b: 0.92941177, a: 1} + m_PressedColor: {r: 0.9882353, g: 0.9882353, b: 0.9882353, a: 1} + m_SelectedColor: {r: 0.9882353, g: 0.9882353, b: 0.9882353, a: 1} m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} m_ColorMultiplier: 1 m_FadeDuration: 0.1 @@ -208,6 +208,7 @@ GameObject: m_Component: - component: {fileID: 1293558974214586411} - component: {fileID: 6383560706995901328} + - component: {fileID: 4005815773772601659} m_Layer: 5 m_Name: HideOverlay m_TagString: Untagged @@ -234,8 +235,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 31.5, y: -2.6} - m_SizeDelta: {x: 75.72, y: 75.72} + m_AnchoredPosition: {x: 57.1161, y: -28.2162} + m_SizeDelta: {x: 30, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6383560706995901328 CanvasRenderer: @@ -245,6 +246,36 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 390093675035885393} m_CullTransparentMesh: 1 +--- !u!114 &4005815773772601659 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 390093675035885393} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.30588236, g: 0.05490196, b: 0.47058824, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 12dd1efc4e826764f9b02be515a9a033, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 2.5 --- !u!1 &778022788925054171 GameObject: m_ObjectHideFlags: 0 @@ -322,6 +353,127 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 2.3 +--- !u!1 &824736697039245047 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7765297547782856987} + - component: {fileID: 3263831168268509455} + - component: {fileID: 6615436191762671025} + - component: {fileID: 7084822278327401295} + m_Layer: 5 + m_Name: NFTThumbnail + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7765297547782856987 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 824736697039245047} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 3382390140976046251} + m_RootOrder: -2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: -1.5000002} + m_SizeDelta: {x: 6.000001, y: 9} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3263831168268509455 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 824736697039245047} + m_CullTransparentMesh: 1 +--- !u!114 &6615436191762671025 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 824736697039245047} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1.3 +--- !u!114 &7084822278327401295 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 824736697039245047} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 6615436191762671025} + m_OnClick: + m_PersistentCalls: + m_Calls: [] --- !u!1 &1305929967901934283 GameObject: m_ObjectHideFlags: 0 @@ -364,7 +516,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 134, y: 78} + m_SizeDelta: {x: 138, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8481825554563465874 CanvasRenderer: @@ -392,7 +544,14 @@ MonoBehaviour: k__BackingField: {fileID: 1939663090140278769} k__BackingField: {fileID: 1565898462633254641} k__BackingField: {fileID: 974693733676106512} + k__BackingField: {fileID: 7015445653465098593} + k__BackingField: {fileID: 5111178573828489163} k__BackingField: {fileID: 3491566857406547017} + k__BackingField: + k__BackingField: {fileID: 6615436191762671025} + k__BackingField: {fileID: 2319109405909261016} + k__BackingField: {fileID: 2069050160429817371} + k__BackingField: {fileID: 7919142331980974852} --- !u!1 &1315728735672877397 GameObject: m_ObjectHideFlags: 0 @@ -430,8 +589,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -10, y: -10} - m_SizeDelta: {x: 26, y: 26} + m_AnchoredPosition: {x: -9.5, y: -10} + m_SizeDelta: {x: 22, y: 22} m_Pivot: {x: 1, y: 1} --- !u!222 &4744368589107562398 CanvasRenderer: @@ -454,14 +613,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.2627451, g: 0.2509804, b: 0.2901961, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: f02af068e11cb4902a1a4faad10b890a, type: 3} + m_Sprite: {fileID: 21300000, guid: 12dd1efc4e826764f9b02be515a9a033, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -470,7 +629,7 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 3 + m_PixelsPerUnitMultiplier: 3.2 --- !u!114 &974693733676106512 MonoBehaviour: m_ObjectHideFlags: 0 @@ -492,10 +651,10 @@ MonoBehaviour: m_SelectOnRight: {fileID: 0} m_Transition: 1 m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} - m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_NormalColor: {r: 0.2627451, g: 0.2509804, b: 0.2901961, a: 1} + m_HighlightedColor: {r: 0.08627451, g: 0.08235294, b: 0.09411765, a: 1} + m_PressedColor: {r: 0, g: 0, b: 0, a: 1} + m_SelectedColor: {r: 0.08627451, g: 0.08235294, b: 0.09411765, a: 1} m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} m_ColorMultiplier: 1 m_FadeDuration: 0.1 @@ -590,7 +749,7 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1.8 + m_PixelsPerUnitMultiplier: 1.5 --- !u!1 &1650696485948303869 GameObject: m_ObjectHideFlags: 0 @@ -812,7 +971,7 @@ MonoBehaviour: m_Color: {r: 0.08627451, g: 0.08235294, b: 0.09411765, a: 1} m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 + m_Maskable: 0 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] @@ -1124,7 +1283,7 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1.6 + m_PixelsPerUnitMultiplier: 1.8 --- !u!1 &3658228973755131293 GameObject: m_ObjectHideFlags: 0 @@ -1157,13 +1316,14 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 4746639940522126217} - m_Father: {fileID: 6566247396054434124} - m_RootOrder: -2 + - {fileID: 7765297547782856987} + m_Father: {fileID: 2983098332878684263} + m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: -10, y: -9.971291} + m_AnchoredPosition: {x: 0.010498047, y: -0.012939453} + m_SizeDelta: {x: -3.087472, y: -3.040369} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &820986312865856975 CanvasRenderer: @@ -1253,8 +1413,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 14, y: -14} - m_SizeDelta: {x: 24, y: 24} + m_AnchoredPosition: {x: -0.000011444092, y: 0} + m_SizeDelta: {x: 26, y: 26} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5781764464709001911 CanvasRenderer: @@ -1277,14 +1437,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.98823535, g: 0.98823535, b: 0.98823535, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: f02af068e11cb4902a1a4faad10b890a, type: 3} + m_Sprite: {fileID: 21300000, guid: 12dd1efc4e826764f9b02be515a9a033, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1315,10 +1475,10 @@ MonoBehaviour: m_SelectOnRight: {fileID: 0} m_Transition: 1 m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} - m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_NormalColor: {r: 0.9882353, g: 0.9882353, b: 0.9882353, a: 1} + m_HighlightedColor: {r: 0.9254902, g: 0.92156863, b: 0.92941177, a: 1} + m_PressedColor: {r: 0.9882353, g: 0.9882353, b: 0.9882353, a: 1} + m_SelectedColor: {r: 0.9882353, g: 0.9882353, b: 0.9882353, a: 1} m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} m_ColorMultiplier: 1 m_FadeDuration: 0.1 @@ -1374,8 +1534,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: -1.5000002} + m_SizeDelta: {x: 6.000001, y: 9} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &599312942287360366 CanvasRenderer: @@ -1405,7 +1565,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 0} + m_Sprite: {fileID: 21300000, guid: 936dcf8cb7310472086027dcbdae26d5, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1489,9 +1649,9 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 2056903441710214712} - - {fileID: 3382390140976046251} - - {fileID: 1620984950020681931} - {fileID: 2983098332878684263} + - {fileID: 442784723273006515} + - {fileID: 1620984950020681931} - {fileID: 8197210241556340483} m_Father: {fileID: 6643278822725274409} m_RootOrder: -2 @@ -1551,7 +1711,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: -16, y: -16} + m_SizeDelta: {x: -12, y: -12} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7334887853439023672 CanvasRenderer: @@ -1581,7 +1741,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: f49bfce399a8c41568bf017a951a357a, type: 3} + m_Sprite: {fileID: 21300000, guid: a4df2165befde144db1abdaf69cece34, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1657,7 +1817,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 84c790cbe3a484378906dc785b6c5995, type: 3} + m_Sprite: {fileID: 21300000, guid: f88ebb8cd1cd5487ca7c3f4d3e65e76a, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -1730,7 +1890,7 @@ MonoBehaviour: m_Color: {r: 0.08235294, g: 0.08235294, b: 0.09019608, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 + m_Maskable: 0 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] @@ -1832,7 +1992,7 @@ MonoBehaviour: m_Calls: [] m_text: Hidden by category m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontAsset: {fileID: 11400000, guid: 35aa85d68d15435418848a03a2db81ec, type: 2} m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} @@ -1857,8 +2017,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 15 - m_fontSizeBase: 15 + m_fontSize: 14 + m_fontSizeBase: 14 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -1896,7 +2056,7 @@ MonoBehaviour: m_margin: {x: 0, y: 0, z: 0, w: 0} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 + m_hasFontAssetChanged: 1 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!1 &7919142331980974852 @@ -1928,7 +2088,8 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 3382390140976046251} m_Father: {fileID: 6566247396054434124} m_RootOrder: -2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1958,7 +2119,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.98823535, g: 0.98823535, b: 0.98823535, a: 1} + m_Color: {r: 0.9882353, g: 0.9882353, b: 0.9882353, a: 1} m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -1974,7 +2135,7 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 2.3 + m_PixelsPerUnitMultiplier: 2.5 --- !u!1 &8505097591301026906 GameObject: m_ObjectHideFlags: 0 @@ -2043,7 +2204,7 @@ MonoBehaviour: m_Calls: [] m_text: CATEGORY m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontAsset: {fileID: 11400000, guid: 96ae0a2159a39234f858ea23bdcc74ad, type: 2} m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} @@ -2068,8 +2229,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 15 - m_fontSizeBase: 15 + m_fontSize: 14 + m_fontSizeBase: 14 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -2107,6 +2268,127 @@ MonoBehaviour: m_margin: {x: 0, y: 0, z: 0, w: 0} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 + m_hasFontAssetChanged: 1 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1001 &3218421203359929396 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 6566247396054434124} + m_Modifications: + - target: {fileID: 3066730706478737799, guid: 896b313ccb63b47999d8596c72449d6d, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3066730706478737799, guid: 896b313ccb63b47999d8596c72449d6d, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3066730706478737799, guid: 896b313ccb63b47999d8596c72449d6d, type: 3} + propertyPath: m_RootOrder + value: -1 + objectReference: {fileID: 0} + - target: {fileID: 3066730706478737799, guid: 896b313ccb63b47999d8596c72449d6d, type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3066730706478737799, guid: 896b313ccb63b47999d8596c72449d6d, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3066730706478737799, guid: 896b313ccb63b47999d8596c72449d6d, type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3066730706478737799, guid: 896b313ccb63b47999d8596c72449d6d, type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3066730706478737799, guid: 896b313ccb63b47999d8596c72449d6d, type: 3} + propertyPath: m_SizeDelta.x + value: 70.097 + objectReference: {fileID: 0} + - target: {fileID: 3066730706478737799, guid: 896b313ccb63b47999d8596c72449d6d, type: 3} + propertyPath: m_SizeDelta.y + value: 71.051 + objectReference: {fileID: 0} + - target: {fileID: 3066730706478737799, guid: 896b313ccb63b47999d8596c72449d6d, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3066730706478737799, guid: 896b313ccb63b47999d8596c72449d6d, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3066730706478737799, guid: 896b313ccb63b47999d8596c72449d6d, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3066730706478737799, guid: 896b313ccb63b47999d8596c72449d6d, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3066730706478737799, guid: 896b313ccb63b47999d8596c72449d6d, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3066730706478737799, guid: 896b313ccb63b47999d8596c72449d6d, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3066730706478737799, guid: 896b313ccb63b47999d8596c72449d6d, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3066730706478737799, guid: 896b313ccb63b47999d8596c72449d6d, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0.48934 + objectReference: {fileID: 0} + - target: {fileID: 3066730706478737799, guid: 896b313ccb63b47999d8596c72449d6d, type: 3} + propertyPath: m_AnchoredPosition.y + value: -38.992 + objectReference: {fileID: 0} + - target: {fileID: 3066730706478737799, guid: 896b313ccb63b47999d8596c72449d6d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3066730706478737799, guid: 896b313ccb63b47999d8596c72449d6d, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3066730706478737799, guid: 896b313ccb63b47999d8596c72449d6d, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6647536690506209645, guid: 896b313ccb63b47999d8596c72449d6d, type: 3} + propertyPath: m_Name + value: LoadingBright + objectReference: {fileID: 0} + - target: {fileID: 6647536690506209645, guid: 896b313ccb63b47999d8596c72449d6d, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 896b313ccb63b47999d8596c72449d6d, type: 3} +--- !u!224 &442784723273006515 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 3066730706478737799, guid: 896b313ccb63b47999d8596c72449d6d, type: 3} + m_PrefabInstance: {fileID: 3218421203359929396} + m_PrefabAsset: {fileID: 0} +--- !u!114 &2069050160429817371 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: -5756551260522624465, guid: 896b313ccb63b47999d8596c72449d6d, type: 3} + m_PrefabInstance: {fileID: 3218421203359929396} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ff6d72cd75e9740bf8a28557b12e70c6, type: 3} + m_Name: + m_EditorClassIdentifier: diff --git a/Explorer/Assets/DCL/Backpack/Assets/Backpack.prefab b/Explorer/Assets/DCL/Backpack/Assets/Backpack.prefab index bbc203ad72..0495ea77b6 100644 --- a/Explorer/Assets/DCL/Backpack/Assets/Backpack.prefab +++ b/Explorer/Assets/DCL/Backpack/Assets/Backpack.prefab @@ -30,13 +30,13 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 7207106866394599773} + m_Father: {fileID: 5109493994691160880} m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -512.1, y: 143} - m_SizeDelta: {x: 200, y: 1} + m_AnchoredPosition: {x: 30.9, y: 132} + m_SizeDelta: {x: 216, y: 1} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3163348768682933642 CanvasRenderer: @@ -59,7 +59,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0.4} + m_Color: {r: 1, g: 1, b: 1, a: 0.19607843} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -106,13 +106,13 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 7207106866394599773} + m_Father: {fileID: 5109493994691160880} m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -512.1, y: -42} - m_SizeDelta: {x: 200, y: 1} + m_AnchoredPosition: {x: 30.899988, y: -56} + m_SizeDelta: {x: 216, y: 1} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8770679734353294817 CanvasRenderer: @@ -135,7 +135,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0.4} + m_Color: {r: 1, g: 1, b: 1, a: 0.19607843} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -152,82 +152,6 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!1 &1326277238274032916 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5028930195645347647} - - component: {fileID: 8860639643537002656} - - component: {fileID: 8382312917075832917} - m_Layer: 5 - m_Name: Image - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &5028930195645347647 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1326277238274032916} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 3685390171852182346} - m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -129, y: 0} - m_SizeDelta: {x: 16, y: 16} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &8860639643537002656 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1326277238274032916} - m_CullTransparentMesh: 1 ---- !u!114 &8382312917075832917 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1326277238274032916} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 1ea292628725049eab0b4ed518d4c064, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 --- !u!1 &1464778006468667341 GameObject: m_ObjectHideFlags: 0 @@ -264,7 +188,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 110, y: 42} + m_SizeDelta: {x: 116, y: 42} m_Pivot: {x: 0, y: 0.5} --- !u!222 &7674203006641609899 CanvasRenderer: @@ -304,42 +228,6 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 2 ---- !u!1 &1719494727381856160 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4126512719806936591} - m_Layer: 5 - m_Name: Gropu1 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4126512719806936591 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1719494727381856160} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 7207106866394599773} - m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -540, y: 3} - m_SizeDelta: {x: 100, y: 100} - m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &2143363811017268547 GameObject: m_ObjectHideFlags: 0 @@ -366,7 +254,7 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2143363811017268547} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 @@ -377,8 +265,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: -731, y: -5.75} - m_SizeDelta: {x: 1403, y: 899.5} + m_AnchoredPosition: {x: -700.0122, y: -32} + m_SizeDelta: {x: 1363.9756, y: 900} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2076667261715248379 MonoBehaviour: @@ -442,6 +330,7 @@ GameObject: - component: {fileID: 5656981357848449945} - component: {fileID: 1740782094548131293} - component: {fileID: 5453977214822511893} + - component: {fileID: 5174804096811574221} m_Layer: 5 m_Name: Title m_TagString: Untagged @@ -467,7 +356,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} m_AnchoredPosition: {x: 25, y: 0} - m_SizeDelta: {x: 183.4841, y: 44} + m_SizeDelta: {x: 174.7789, y: 44} m_Pivot: {x: 0, y: 0.5} --- !u!222 &1740782094548131293 CanvasRenderer: @@ -566,6 +455,46 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!114 &5174804096811574221 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2594743766738303183} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 56eb0353ae6e5124bb35b17aff880f16, type: 3} + m_Name: + m_EditorClassIdentifier: + m_StringReference: + m_TableReference: + m_TableCollectionName: GUID:fa6d78a0e08f14179b202ccca9720bb9 + m_TableEntryReference: + m_KeyId: 23119123067166720 + m_Key: + m_FallbackState: 0 + m_WaitForCompletion: 0 + m_LocalVariables: [] + m_FormatArguments: [] + m_UpdateString: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 5453977214822511893} + m_TargetAssemblyTypeName: TMPro.TMP_Text, Unity.TextMeshPro + m_MethodName: set_text + m_Mode: 0 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 1 + references: + version: 2 + RefIds: [] --- !u!1 &2723043980555199245 GameObject: m_ObjectHideFlags: 0 @@ -633,7 +562,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_Sprite: {fileID: 21300000, guid: f8f0424e373e74b0f8952ce08c7f2f19, type: 3} - m_Type: 0 + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -670,13 +599,33 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 5608088598935378507} + - {fileID: 1660366043433891224} + - {fileID: 5801096774213738982} + - {fileID: 6417347532980402235} + - {fileID: 6649852878769707890} + - {fileID: 309903098441082364} + - {fileID: 8781600119855098254} + - {fileID: 2708884085500109849} + - {fileID: 1582493558911051053} + - {fileID: 5468854766558674440} + - {fileID: 5458638904956629031} + - {fileID: 4323855567392285974} + - {fileID: 1641176141026208536} + - {fileID: 6583173963574740253} + - {fileID: 7078848863363856336} + - {fileID: 367958614319848689} + - {fileID: 207600343503609941} + - {fileID: 3447424575006216351} + - {fileID: 7934138973036554881} + - {fileID: 8891725588225632312} m_Father: {fileID: 7207106866394599773} m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -540, y: 3} + m_AnchoredPosition: {x: -517, y: 3} m_SizeDelta: {x: 286, y: 794} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5108826376269335388 @@ -716,40 +665,17 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 8016999325524894007} - - {fileID: 5668916703579838269} - {fileID: 5109493994691160880} - - {fileID: 4126512719806936591} - - {fileID: 5801096774213738982} - - {fileID: 6417347532980402235} - - {fileID: 6649852878769707890} - - {fileID: 309903098441082364} - - {fileID: 8781600119855098254} - - {fileID: 2708884085500109849} - - {fileID: 5608088598935378507} - - {fileID: 313271876531389319} - - {fileID: 1582493558911051053} - - {fileID: 5468854766558674440} - - {fileID: 5458638904956629031} - - {fileID: 4323855567392285974} - - {fileID: 1660366043433891224} - - {fileID: 8161962306084117902} - - {fileID: 1641176141026208536} - - {fileID: 6583173963574740253} - - {fileID: 7078848863363856336} - - {fileID: 367958614319848689} - - {fileID: 207600343503609941} - - {fileID: 3447424575006216351} - - {fileID: 7934138973036554881} - - {fileID: 8891725588225632312} + - {fileID: 5668916703579838269} + - {fileID: 8016999325524894007} - {fileID: 571331003711291038} m_Father: {fileID: 3728373286753752492} m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 1403, y: 879} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &4314373707019769868 MonoBehaviour: @@ -763,82 +689,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4a0a4c4177912421880c7561a4776a68, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!1 &3132058230737429278 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 801335922544643756} - - component: {fileID: 3502737790920836584} - - component: {fileID: 1556234264318597920} - m_Layer: 5 - m_Name: Image - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &801335922544643756 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3132058230737429278} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 5287494445142407580} - m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -132, y: 0} - m_SizeDelta: {x: 16, y: 16} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &3502737790920836584 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3132058230737429278} - m_CullTransparentMesh: 1 ---- !u!114 &1556234264318597920 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3132058230737429278} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: d01fa0321b52b44be981a4f81b26a561, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 + k__BackingField: {fileID: 8139991021303961204} + k__BackingField: {fileID: 4264612748387217685} --- !u!1 &3155744230264337343 GameObject: m_ObjectHideFlags: 0 @@ -850,8 +702,9 @@ GameObject: - component: {fileID: 5668916703579838269} - component: {fileID: 1889771204570624278} - component: {fileID: 4404171334059627687} + - component: {fileID: 8139991021303961204} m_Layer: 5 - m_Name: ItemsContainer + m_Name: BackpackGrid m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -868,19 +721,14 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 4244796113344758072} - - {fileID: 4304090543667649168} - - {fileID: 3342306291187924885} - - {fileID: 495494942874780275} - - {fileID: 3043414952116198876} + m_Children: [] m_Father: {fileID: 7207106866394599773} m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -45, y: 8} - m_SizeDelta: {x: 627, y: 645.6} + m_AnchoredPosition: {x: -40, y: -7} + m_SizeDelta: {x: 570, y: 646} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1889771204570624278 CanvasRenderer: @@ -908,13 +756,30 @@ MonoBehaviour: m_Top: 0 m_Bottom: 0 m_ChildAlignment: 0 - m_StartCorner: 0 + m_StartCorner: 3 m_StartAxis: 0 - m_CellSize: {x: 138, y: 144} - m_Spacing: {x: 23, y: 23} + m_CellSize: {x: 120, y: 120} + m_Spacing: {x: 30, y: 34} m_Constraint: 0 m_ConstraintCount: 2 ---- !u!1 &3286026136559681698 +--- !u!114 &8139991021303961204 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3155744230264337343} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5193ad1036af4e62a5d908f9c49d0b8b, type: 3} + m_Name: + m_EditorClassIdentifier: + k__BackingField: + m_AssetGUID: aabac5666448b4345a76347f94ea32a4 + m_SubObjectName: + m_SubObjectType: + m_EditorAssetChanged: 0 +--- !u!1 &4244055408728331100 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -922,244 +787,48 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 8338188608821240427} - - component: {fileID: 5575733174778969561} - - component: {fileID: 2873393278085186971} + - component: {fileID: 5507985720958002706} + - component: {fileID: 3467545109171330443} + - component: {fileID: 7218159617549281228} + - component: {fileID: 703025678671221271} m_Layer: 5 - m_Name: Image + m_Name: TabSelector m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &8338188608821240427 +--- !u!224 &5507985720958002706 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3286026136559681698} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_GameObject: {fileID: 4244055408728331100} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 887411957511789196} + m_Children: + - {fileID: 3760519785924765464} + - {fileID: 6449722440618433214} + m_Father: {fileID: 154018262731813276} m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -82.4, y: 0} - m_SizeDelta: {x: 16, y: 16} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &5575733174778969561 + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 212, y: 0} + m_SizeDelta: {x: 270, y: 42} + m_Pivot: {x: 0, y: 0.5} +--- !u!222 &3467545109171330443 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3286026136559681698} + m_GameObject: {fileID: 4244055408728331100} m_CullTransparentMesh: 1 ---- !u!114 &2873393278085186971 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3286026136559681698} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 46b246382eb374969ad6dd378b8af71a, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!1 &3299427119028308694 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 313271876531389319} - m_Layer: 5 - m_Name: Group2 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &313271876531389319 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3299427119028308694} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 7207106866394599773} - m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -540, y: -5} - m_SizeDelta: {x: 100, y: 100} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!1 &4057406428521757116 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 264594721906844322} - - component: {fileID: 2764842863736462721} - m_Layer: 5 - m_Name: Footer - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &264594721906844322 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4057406428521757116} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 5287494445142407580} - - {fileID: 887411957511789196} - - {fileID: 3685390171852182346} - m_Father: {fileID: 816873455510436537} - m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -274.1989, y: -483.75} - m_SizeDelta: {x: 1371.6022, y: 56.5} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &2764842863736462721 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4057406428521757116} - m_CullTransparentMesh: 1 ---- !u!1 &4155098062868302613 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8161962306084117902} - m_Layer: 5 - m_Name: Group3 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &8161962306084117902 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4155098062868302613} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 7207106866394599773} - m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -540, y: -10} - m_SizeDelta: {x: 100, y: 100} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!1 &4244055408728331100 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5507985720958002706} - - component: {fileID: 3467545109171330443} - - component: {fileID: 7218159617549281228} - - component: {fileID: 703025678671221271} - m_Layer: 5 - m_Name: TabSelector - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &5507985720958002706 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4244055408728331100} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 3760519785924765464} - - {fileID: 6449722440618433214} - m_Father: {fileID: 154018262731813276} - m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -553, y: 0} - m_SizeDelta: {x: 350, y: 56} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &3467545109171330443 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4244055408728331100} - m_CullTransparentMesh: 1 ---- !u!114 &7218159617549281228 +--- !u!114 &7218159617549281228 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1177,7 +846,7 @@ MonoBehaviour: m_Top: 0 m_Bottom: 0 m_ChildAlignment: 3 - m_Spacing: -103.6 + m_Spacing: 14 m_ChildForceExpandWidth: 1 m_ChildForceExpandHeight: 1 m_ChildControlWidth: 0 @@ -1234,7 +903,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 106, y: 42} + m_SizeDelta: {x: 152, y: 42} m_Pivot: {x: 0, y: 0.5} --- !u!222 &8733173210871840204 CanvasRenderer: @@ -1251,380 +920,30 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4713646180881225116} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 12dd1efc4e826764f9b02be515a9a033, type: 3} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 2 ---- !u!1 &4850783691361228933 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3728373286753752492} - - component: {fileID: 7713094028614654963} - - component: {fileID: 3920735185135000066} - m_Layer: 5 - m_Name: ContentBackground - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &3728373286753752492 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4850783691361228933} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 7207106866394599773} - - {fileID: 3574283849676028650} - m_Father: {fileID: 2081082932129842408} - m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 0.5} - m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: -701.5, y: -9} - m_SizeDelta: {x: 1403, y: 879} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &7713094028614654963 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4850783691361228933} - m_CullTransparentMesh: 1 ---- !u!114 &3920735185135000066 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4850783691361228933} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.05490196, g: 0.05490196, b: 0.05882353, a: 0.12156863} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 12dd1efc4e826764f9b02be515a9a033, type: 3} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 2 ---- !u!1 &5061277284546588735 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3685390171852182346} - - component: {fileID: 9205549327458557784} - - component: {fileID: 227824546951945051} - m_Layer: 5 - m_Name: Hint3 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &3685390171852182346 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5061277284546588735} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 5028930195645347647} - m_Father: {fileID: 264594721906844322} - m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -51, y: 0} - m_SizeDelta: {x: 229, y: 17} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &9205549327458557784 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5061277284546588735} - m_CullTransparentMesh: 1 ---- !u!114 &227824546951945051 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5061277284546588735} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_text: Right-click and drag avatar to pan - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 35aa85d68d15435418848a03a2db81ec, type: 2} - m_sharedMaterial: {fileID: 1701868249614554837, guid: 35aa85d68d15435418848a03a2db81ec, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 14 - m_fontSizeBase: 14 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 72 - m_fontStyle: 0 - m_HorizontalAlignment: 1 - m_VerticalAlignment: 256 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!1 &6735301569998411586 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 887411957511789196} - - component: {fileID: 6468580457481340698} - - component: {fileID: 8696286182896805718} - m_Layer: 5 - m_Name: Hint2 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &887411957511789196 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6735301569998411586} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 8338188608821240427} - m_Father: {fileID: 264594721906844322} - m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -287, y: 0} - m_SizeDelta: {x: 140, y: 17} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &6468580457481340698 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6735301569998411586} - m_CullTransparentMesh: 1 ---- !u!114 &8696286182896805718 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6735301569998411586} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_text: Scroll to zoom in/out - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 35aa85d68d15435418848a03a2db81ec, type: 2} - m_sharedMaterial: {fileID: 1701868249614554837, guid: 35aa85d68d15435418848a03a2db81ec, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 14 - m_fontSizeBase: 14 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 72 - m_fontStyle: 0 - m_HorizontalAlignment: 1 - m_VerticalAlignment: 256 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!1 &7048303796339066356 + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 12dd1efc4e826764f9b02be515a9a033, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 2 +--- !u!1 &4850783691361228933 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1632,134 +951,76 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 5287494445142407580} - - component: {fileID: 2265964860917533046} - - component: {fileID: 6813540295895633944} + - component: {fileID: 3728373286753752492} + - component: {fileID: 7713094028614654963} + - component: {fileID: 3920735185135000066} m_Layer: 5 - m_Name: Hint1 + m_Name: ContentBackground m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &5287494445142407580 +--- !u!224 &3728373286753752492 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7048303796339066356} + m_GameObject: {fileID: 4850783691361228933} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 801335922544643756} - m_Father: {fileID: 264594721906844322} + - {fileID: 7207106866394599773} + - {fileID: 3574283849676028650} + m_Father: {fileID: 2081082932129842408} m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -523, y: 0} - m_SizeDelta: {x: 236, y: 17} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &2265964860917533046 +--- !u!222 &7713094028614654963 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7048303796339066356} + m_GameObject: {fileID: 4850783691361228933} m_CullTransparentMesh: 1 ---- !u!114 &6813540295895633944 +--- !u!114 &3920735185135000066 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7048303796339066356} + m_GameObject: {fileID: 4850783691361228933} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0, g: 0, b: 0, a: 0.39215687} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: Left-click and drag avatar to rotate - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 35aa85d68d15435418848a03a2db81ec, type: 2} - m_sharedMaterial: {fileID: 1701868249614554837, guid: 35aa85d68d15435418848a03a2db81ec, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 14 - m_fontSizeBase: 14 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 72 - m_fontStyle: 0 - m_HorizontalAlignment: 1 - m_VerticalAlignment: 256 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} + m_Sprite: {fileID: 21300000, guid: 99428d9ed6da74af2966fb29d960e48f, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 2 --- !u!1 &8178171541332435676 GameObject: m_ObjectHideFlags: 0 @@ -1792,7 +1053,6 @@ RectTransform: - {fileID: 2618566666506401498} - {fileID: 154018262731813276} - {fileID: 2081082932129842408} - - {fileID: 264594721906844322} m_Father: {fileID: 0} m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1880,7 +1140,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0, g: 0, b: 0, a: 0.7058824} + m_Color: {r: 0, g: 0, b: 0, a: 0.47058824} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -1952,7 +1212,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 7207106866394599773} + m_TransformParent: {fileID: 5109493994691160880} m_Modifications: - target: {fileID: 1305929967901934283, guid: 9a3416ab3e1b9486ba48f239340e202d, type: 3} propertyPath: m_Name @@ -1981,7 +1241,7 @@ PrefabInstance: - target: {fileID: 4329488436158027747, guid: 9a3416ab3e1b9486ba48f239340e202d, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: c0688f4e1f63c43ac9ceadb3cb50e8d9, type: 3} + objectReference: {fileID: 21300000, guid: 15c01427d7e8f4c72a16e8e1368c82a6, type: 3} - target: {fileID: 6098108853264045617, guid: 9a3416ab3e1b9486ba48f239340e202d, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -2056,11 +1316,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6643278822725274409, guid: 9a3416ab3e1b9486ba48f239340e202d, type: 3} propertyPath: m_SizeDelta.x - value: 134 + value: 140 objectReference: {fileID: 0} - target: {fileID: 6643278822725274409, guid: 9a3416ab3e1b9486ba48f239340e202d, type: 3} propertyPath: m_SizeDelta.y - value: 78 + value: 80 objectReference: {fileID: 0} - target: {fileID: 6643278822725274409, guid: 9a3416ab3e1b9486ba48f239340e202d, type: 3} propertyPath: m_LocalPosition.x @@ -2092,11 +1352,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6643278822725274409, guid: 9a3416ab3e1b9486ba48f239340e202d, type: 3} propertyPath: m_AnchoredPosition.x - value: -608 + value: -76 objectReference: {fileID: 0} - target: {fileID: 6643278822725274409, guid: 9a3416ab3e1b9486ba48f239340e202d, type: 3} propertyPath: m_AnchoredPosition.y - value: 274 + value: 271 objectReference: {fileID: 0} - target: {fileID: 6643278822725274409, guid: 9a3416ab3e1b9486ba48f239340e202d, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -2158,7 +1418,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 7207106866394599773} + m_TransformParent: {fileID: 5109493994691160880} m_Modifications: - target: {fileID: 1305929967901934283, guid: 9a3416ab3e1b9486ba48f239340e202d, type: 3} propertyPath: m_Name @@ -2187,7 +1447,7 @@ PrefabInstance: - target: {fileID: 4329488436158027747, guid: 9a3416ab3e1b9486ba48f239340e202d, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: c99c55c8bb9ec488da8409fe012968fb, type: 3} + objectReference: {fileID: 21300000, guid: 9b13173961ced41b287b3ec0d724c585, type: 3} - target: {fileID: 6098108853264045617, guid: 9a3416ab3e1b9486ba48f239340e202d, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -2262,11 +1522,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6643278822725274409, guid: 9a3416ab3e1b9486ba48f239340e202d, type: 3} propertyPath: m_SizeDelta.x - value: 134 + value: 140 objectReference: {fileID: 0} - target: {fileID: 6643278822725274409, guid: 9a3416ab3e1b9486ba48f239340e202d, type: 3} propertyPath: m_SizeDelta.y - value: 78 + value: 80 objectReference: {fileID: 0} - target: {fileID: 6643278822725274409, guid: 9a3416ab3e1b9486ba48f239340e202d, type: 3} propertyPath: m_LocalPosition.x @@ -2298,11 +1558,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6643278822725274409, guid: 9a3416ab3e1b9486ba48f239340e202d, type: 3} propertyPath: m_AnchoredPosition.x - value: -472 + value: 78 objectReference: {fileID: 0} - target: {fileID: 6643278822725274409, guid: 9a3416ab3e1b9486ba48f239340e202d, type: 3} propertyPath: m_AnchoredPosition.y - value: 352 + value: 359 objectReference: {fileID: 0} - target: {fileID: 6643278822725274409, guid: 9a3416ab3e1b9486ba48f239340e202d, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -2364,7 +1624,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 7207106866394599773} + m_TransformParent: {fileID: 5109493994691160880} m_Modifications: - target: {fileID: 1305929967901934283, guid: 9a3416ab3e1b9486ba48f239340e202d, type: 3} propertyPath: m_Name @@ -2393,7 +1653,7 @@ PrefabInstance: - target: {fileID: 4329488436158027747, guid: 9a3416ab3e1b9486ba48f239340e202d, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: d306a8c2a2d6246cca8aadb1c515fd02, type: 3} + objectReference: {fileID: 21300000, guid: 1f8423c7e44934bc88742ef8c05aa4ee, type: 3} - target: {fileID: 6098108853264045617, guid: 9a3416ab3e1b9486ba48f239340e202d, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -2468,11 +1728,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6643278822725274409, guid: 9a3416ab3e1b9486ba48f239340e202d, type: 3} propertyPath: m_SizeDelta.x - value: 134 + value: 140 objectReference: {fileID: 0} - target: {fileID: 6643278822725274409, guid: 9a3416ab3e1b9486ba48f239340e202d, type: 3} propertyPath: m_SizeDelta.y - value: 78 + value: 80 objectReference: {fileID: 0} - target: {fileID: 6643278822725274409, guid: 9a3416ab3e1b9486ba48f239340e202d, type: 3} propertyPath: m_LocalPosition.x @@ -2504,11 +1764,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6643278822725274409, guid: 9a3416ab3e1b9486ba48f239340e202d, type: 3} propertyPath: m_AnchoredPosition.x - value: -472 + value: 78 objectReference: {fileID: 0} - target: {fileID: 6643278822725274409, guid: 9a3416ab3e1b9486ba48f239340e202d, type: 3} propertyPath: m_AnchoredPosition.y - value: -97 + value: -107.99999 objectReference: {fileID: 0} - target: {fileID: 6643278822725274409, guid: 9a3416ab3e1b9486ba48f239340e202d, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -2570,7 +1830,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 7207106866394599773} + m_TransformParent: {fileID: 5109493994691160880} m_Modifications: - target: {fileID: 1305929967901934283, guid: 9a3416ab3e1b9486ba48f239340e202d, type: 3} propertyPath: m_Name @@ -2599,7 +1859,7 @@ PrefabInstance: - target: {fileID: 4329488436158027747, guid: 9a3416ab3e1b9486ba48f239340e202d, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 0078c7406afb34e2d8bc608d0ea03203, type: 3} + objectReference: {fileID: 21300000, guid: 98bae2808161c4d678b3f5d109a5ee80, type: 3} - target: {fileID: 6098108853264045617, guid: 9a3416ab3e1b9486ba48f239340e202d, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -2674,11 +1934,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6643278822725274409, guid: 9a3416ab3e1b9486ba48f239340e202d, type: 3} propertyPath: m_SizeDelta.x - value: 134 + value: 140 objectReference: {fileID: 0} - target: {fileID: 6643278822725274409, guid: 9a3416ab3e1b9486ba48f239340e202d, type: 3} propertyPath: m_SizeDelta.y - value: 78 + value: 80 objectReference: {fileID: 0} - target: {fileID: 6643278822725274409, guid: 9a3416ab3e1b9486ba48f239340e202d, type: 3} propertyPath: m_LocalPosition.x @@ -2710,11 +1970,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6643278822725274409, guid: 9a3416ab3e1b9486ba48f239340e202d, type: 3} propertyPath: m_AnchoredPosition.x - value: -608 + value: -76 objectReference: {fileID: 0} - target: {fileID: 6643278822725274409, guid: 9a3416ab3e1b9486ba48f239340e202d, type: 3} propertyPath: m_AnchoredPosition.y - value: 352 + value: 359 objectReference: {fileID: 0} - target: {fileID: 6643278822725274409, guid: 9a3416ab3e1b9486ba48f239340e202d, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -2776,7 +2036,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 7207106866394599773} + m_TransformParent: {fileID: 5109493994691160880} m_Modifications: - target: {fileID: 1305929967901934283, guid: 9a3416ab3e1b9486ba48f239340e202d, type: 3} propertyPath: m_Name @@ -2805,7 +2065,7 @@ PrefabInstance: - target: {fileID: 4329488436158027747, guid: 9a3416ab3e1b9486ba48f239340e202d, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 4b75dfe17605c43dc80a38b04c92091e, type: 3} + objectReference: {fileID: 21300000, guid: 16866e729ce1061429170517e80ef313, type: 3} - target: {fileID: 6098108853264045617, guid: 9a3416ab3e1b9486ba48f239340e202d, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -2880,11 +2140,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6643278822725274409, guid: 9a3416ab3e1b9486ba48f239340e202d, type: 3} propertyPath: m_SizeDelta.x - value: 134 + value: 140 objectReference: {fileID: 0} - target: {fileID: 6643278822725274409, guid: 9a3416ab3e1b9486ba48f239340e202d, type: 3} propertyPath: m_SizeDelta.y - value: 78 + value: 80 objectReference: {fileID: 0} - target: {fileID: 6643278822725274409, guid: 9a3416ab3e1b9486ba48f239340e202d, type: 3} propertyPath: m_LocalPosition.x @@ -2916,11 +2176,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6643278822725274409, guid: 9a3416ab3e1b9486ba48f239340e202d, type: 3} propertyPath: m_AnchoredPosition.x - value: -472 + value: 78 objectReference: {fileID: 0} - target: {fileID: 6643278822725274409, guid: 9a3416ab3e1b9486ba48f239340e202d, type: 3} propertyPath: m_AnchoredPosition.y - value: 89 + value: 81 objectReference: {fileID: 0} - target: {fileID: 6643278822725274409, guid: 9a3416ab3e1b9486ba48f239340e202d, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -2936,7 +2196,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6822543606753027690, guid: 9a3416ab3e1b9486ba48f239340e202d, type: 3} propertyPath: k__BackingField - value: Handwear + value: Hands_wear objectReference: {fileID: 0} - target: {fileID: 7495390461251039812, guid: 9a3416ab3e1b9486ba48f239340e202d, type: 3} propertyPath: m_AnchorMax.y @@ -2982,7 +2242,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 7207106866394599773} + m_TransformParent: {fileID: 5109493994691160880} m_Modifications: - target: {fileID: 1305929967901934283, guid: 9a3416ab3e1b9486ba48f239340e202d, type: 3} propertyPath: m_Name @@ -3011,7 +2271,7 @@ PrefabInstance: - target: {fileID: 4329488436158027747, guid: 9a3416ab3e1b9486ba48f239340e202d, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: c0c541fe1a4c54b07b590db1f95cd07b, type: 3} + objectReference: {fileID: 21300000, guid: bf9cd8edf950343a9ba38284a615c606, type: 3} - target: {fileID: 6098108853264045617, guid: 9a3416ab3e1b9486ba48f239340e202d, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -3086,11 +2346,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6643278822725274409, guid: 9a3416ab3e1b9486ba48f239340e202d, type: 3} propertyPath: m_SizeDelta.x - value: 134 + value: 140 objectReference: {fileID: 0} - target: {fileID: 6643278822725274409, guid: 9a3416ab3e1b9486ba48f239340e202d, type: 3} propertyPath: m_SizeDelta.y - value: 78 + value: 80 objectReference: {fileID: 0} - target: {fileID: 6643278822725274409, guid: 9a3416ab3e1b9486ba48f239340e202d, type: 3} propertyPath: m_LocalPosition.x @@ -3122,11 +2382,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6643278822725274409, guid: 9a3416ab3e1b9486ba48f239340e202d, type: 3} propertyPath: m_AnchoredPosition.x - value: -608 + value: -76 objectReference: {fileID: 0} - target: {fileID: 6643278822725274409, guid: 9a3416ab3e1b9486ba48f239340e202d, type: 3} propertyPath: m_AnchoredPosition.y - value: 11 + value: -7 objectReference: {fileID: 0} - target: {fileID: 6643278822725274409, guid: 9a3416ab3e1b9486ba48f239340e202d, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -3204,15 +2464,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 145861463570281605, guid: 1936c8ca610b0472baddc2c56969a641, type: 3} propertyPath: m_Colors.m_NormalColor.b - value: 0.9882353 + value: 1 objectReference: {fileID: 0} - target: {fileID: 145861463570281605, guid: 1936c8ca610b0472baddc2c56969a641, type: 3} propertyPath: m_Colors.m_NormalColor.g - value: 0.9882353 + value: 1 objectReference: {fileID: 0} - target: {fileID: 145861463570281605, guid: 1936c8ca610b0472baddc2c56969a641, type: 3} propertyPath: m_Colors.m_NormalColor.r - value: 0.9882353 + value: 1 objectReference: {fileID: 0} - target: {fileID: 145861463570281605, guid: 1936c8ca610b0472baddc2c56969a641, type: 3} propertyPath: m_Colors.m_PressedColor.a @@ -3220,15 +2480,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 145861463570281605, guid: 1936c8ca610b0472baddc2c56969a641, type: 3} propertyPath: m_Colors.m_PressedColor.b - value: 0.83137256 + value: 0.8584906 objectReference: {fileID: 0} - target: {fileID: 145861463570281605, guid: 1936c8ca610b0472baddc2c56969a641, type: 3} propertyPath: m_Colors.m_PressedColor.g - value: 0.8039216 + value: 0.8584906 objectReference: {fileID: 0} - target: {fileID: 145861463570281605, guid: 1936c8ca610b0472baddc2c56969a641, type: 3} propertyPath: m_Colors.m_PressedColor.r - value: 0.8117647 + value: 0.8584906 objectReference: {fileID: 0} - target: {fileID: 145861463570281605, guid: 1936c8ca610b0472baddc2c56969a641, type: 3} propertyPath: m_Colors.m_SelectedColor.a @@ -3268,7 +2528,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 647778724686335215, guid: 1936c8ca610b0472baddc2c56969a641, type: 3} propertyPath: m_SizeDelta.x - value: 129.7 + value: 70 objectReference: {fileID: 0} - target: {fileID: 647778724686335215, guid: 1936c8ca610b0472baddc2c56969a641, type: 3} propertyPath: m_SizeDelta.y @@ -3276,7 +2536,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 647778724686335215, guid: 1936c8ca610b0472baddc2c56969a641, type: 3} propertyPath: m_AnchoredPosition.x - value: 14.400055 + value: 18.00006 objectReference: {fileID: 0} - target: {fileID: 647778724686335215, guid: 1936c8ca610b0472baddc2c56969a641, type: 3} propertyPath: m_AnchoredPosition.y @@ -3285,18 +2545,18 @@ PrefabInstance: - target: {fileID: 782066126112996038, guid: 1936c8ca610b0472baddc2c56969a641, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: bad624eed6b994e84bed38fc45e53a77, type: 3} + objectReference: {fileID: 21300000, guid: 05bc7d6b12857fb4b9b7634bf2a4f440, type: 3} - target: {fileID: 782066126112996038, guid: 1936c8ca610b0472baddc2c56969a641, type: 3} propertyPath: m_Color.b - value: 1 + value: 0.9882353 objectReference: {fileID: 0} - target: {fileID: 782066126112996038, guid: 1936c8ca610b0472baddc2c56969a641, type: 3} propertyPath: m_Color.g - value: 1 + value: 0.9882353 objectReference: {fileID: 0} - target: {fileID: 782066126112996038, guid: 1936c8ca610b0472baddc2c56969a641, type: 3} propertyPath: m_Color.r - value: 1 + value: 0.9882353 objectReference: {fileID: 0} - target: {fileID: 1392556527029171851, guid: 1936c8ca610b0472baddc2c56969a641, type: 3} propertyPath: m_Name @@ -3310,6 +2570,14 @@ PrefabInstance: propertyPath: m_AnchorMin.x value: 0 objectReference: {fileID: 0} + - target: {fileID: 2129308136558042850, guid: 1936c8ca610b0472baddc2c56969a641, type: 3} + propertyPath: m_SizeDelta.x + value: 26 + objectReference: {fileID: 0} + - target: {fileID: 2129308136558042850, guid: 1936c8ca610b0472baddc2c56969a641, type: 3} + propertyPath: m_SizeDelta.y + value: 26 + objectReference: {fileID: 0} - target: {fileID: 2129308136558042850, guid: 1936c8ca610b0472baddc2c56969a641, type: 3} propertyPath: m_AnchoredPosition.x value: 20 @@ -3324,7 +2592,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3114688435971539077, guid: 1936c8ca610b0472baddc2c56969a641, type: 3} propertyPath: m_SizeDelta.x - value: 110 + value: 116 objectReference: {fileID: 0} - target: {fileID: 3114688435971539077, guid: 1936c8ca610b0472baddc2c56969a641, type: 3} propertyPath: m_SizeDelta.y @@ -3336,7 +2604,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3278519586392893701, guid: 1936c8ca610b0472baddc2c56969a641, type: 3} propertyPath: m_SizeDelta.x - value: 129.7 + value: 70 objectReference: {fileID: 0} - target: {fileID: 3278519586392893701, guid: 1936c8ca610b0472baddc2c56969a641, type: 3} propertyPath: m_SizeDelta.y @@ -3344,7 +2612,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3278519586392893701, guid: 1936c8ca610b0472baddc2c56969a641, type: 3} propertyPath: m_AnchoredPosition.x - value: 14.4 + value: 18 objectReference: {fileID: 0} - target: {fileID: 3278519586392893701, guid: 1936c8ca610b0472baddc2c56969a641, type: 3} propertyPath: m_AnchoredPosition.y @@ -3380,7 +2648,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4755743825679548413, guid: 1936c8ca610b0472baddc2c56969a641, type: 3} propertyPath: m_SizeDelta.x - value: 110 + value: 116 objectReference: {fileID: 0} - target: {fileID: 4755743825679548413, guid: 1936c8ca610b0472baddc2c56969a641, type: 3} propertyPath: m_SizeDelta.y @@ -3466,6 +2734,10 @@ PrefabInstance: propertyPath: m_VerticalAlignment value: 512 objectReference: {fileID: 0} + - target: {fileID: 5288072022237423886, guid: 1936c8ca610b0472baddc2c56969a641, type: 3} + propertyPath: m_HorizontalAlignment + value: 1 + objectReference: {fileID: 0} - target: {fileID: 5294738254589804664, guid: 1936c8ca610b0472baddc2c56969a641, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -3474,6 +2746,14 @@ PrefabInstance: propertyPath: m_AnchorMin.x value: 0 objectReference: {fileID: 0} + - target: {fileID: 5294738254589804664, guid: 1936c8ca610b0472baddc2c56969a641, type: 3} + propertyPath: m_SizeDelta.x + value: 26 + objectReference: {fileID: 0} + - target: {fileID: 5294738254589804664, guid: 1936c8ca610b0472baddc2c56969a641, type: 3} + propertyPath: m_SizeDelta.y + value: 26 + objectReference: {fileID: 0} - target: {fileID: 5294738254589804664, guid: 1936c8ca610b0472baddc2c56969a641, type: 3} propertyPath: m_AnchoredPosition.x value: 20 @@ -3490,6 +2770,18 @@ PrefabInstance: propertyPath: m_fontSize value: 18 objectReference: {fileID: 0} + - target: {fileID: 6425377980552986654, guid: 1936c8ca610b0472baddc2c56969a641, type: 3} + propertyPath: m_fontColor.b + value: 0.9882353 + objectReference: {fileID: 0} + - target: {fileID: 6425377980552986654, guid: 1936c8ca610b0472baddc2c56969a641, type: 3} + propertyPath: m_fontColor.g + value: 0.9882353 + objectReference: {fileID: 0} + - target: {fileID: 6425377980552986654, guid: 1936c8ca610b0472baddc2c56969a641, type: 3} + propertyPath: m_fontColor.r + value: 0.9882353 + objectReference: {fileID: 0} - target: {fileID: 6425377980552986654, guid: 1936c8ca610b0472baddc2c56969a641, type: 3} propertyPath: m_fontSizeBase value: 18 @@ -3498,13 +2790,17 @@ PrefabInstance: propertyPath: m_VerticalAlignment value: 512 objectReference: {fileID: 0} + - target: {fileID: 6425377980552986654, guid: 1936c8ca610b0472baddc2c56969a641, type: 3} + propertyPath: m_HorizontalAlignment + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7145261904875040787, guid: 1936c8ca610b0472baddc2c56969a641, type: 3} propertyPath: m_Pivot.x value: 0 objectReference: {fileID: 0} - target: {fileID: 7145261904875040787, guid: 1936c8ca610b0472baddc2c56969a641, type: 3} propertyPath: m_SizeDelta.x - value: 110 + value: 116 objectReference: {fileID: 0} - target: {fileID: 7145261904875040787, guid: 1936c8ca610b0472baddc2c56969a641, type: 3} propertyPath: m_SizeDelta.y @@ -3521,18 +2817,18 @@ PrefabInstance: - target: {fileID: 7260612469130449532, guid: 1936c8ca610b0472baddc2c56969a641, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: bad624eed6b994e84bed38fc45e53a77, type: 3} + objectReference: {fileID: 21300000, guid: 05bc7d6b12857fb4b9b7634bf2a4f440, type: 3} - target: {fileID: 7260612469130449532, guid: 1936c8ca610b0472baddc2c56969a641, type: 3} propertyPath: m_Color.b - value: 1 + value: 0.09411765 objectReference: {fileID: 0} - target: {fileID: 7260612469130449532, guid: 1936c8ca610b0472baddc2c56969a641, type: 3} propertyPath: m_Color.g - value: 1 + value: 0.08235294 objectReference: {fileID: 0} - target: {fileID: 7260612469130449532, guid: 1936c8ca610b0472baddc2c56969a641, type: 3} propertyPath: m_Color.r - value: 1 + value: 0.08627451 objectReference: {fileID: 0} - target: {fileID: 8502093406828841120, guid: 1936c8ca610b0472baddc2c56969a641, type: 3} propertyPath: m_Color.b @@ -3600,7 +2896,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 7207106866394599773} + m_TransformParent: {fileID: 5109493994691160880} m_Modifications: - target: {fileID: 1305929967901934283, guid: 9a3416ab3e1b9486ba48f239340e202d, type: 3} propertyPath: m_Name @@ -3629,7 +2925,7 @@ PrefabInstance: - target: {fileID: 4329488436158027747, guid: 9a3416ab3e1b9486ba48f239340e202d, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: df1d4fbf4e6a74017bcf9e6f2eb5486f, type: 3} + objectReference: {fileID: 21300000, guid: 075c9dd99649649f9869afece52cd35b, type: 3} - target: {fileID: 6098108853264045617, guid: 9a3416ab3e1b9486ba48f239340e202d, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -3704,11 +3000,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6643278822725274409, guid: 9a3416ab3e1b9486ba48f239340e202d, type: 3} propertyPath: m_SizeDelta.x - value: 134 + value: 140 objectReference: {fileID: 0} - target: {fileID: 6643278822725274409, guid: 9a3416ab3e1b9486ba48f239340e202d, type: 3} propertyPath: m_SizeDelta.y - value: 78 + value: 80 objectReference: {fileID: 0} - target: {fileID: 6643278822725274409, guid: 9a3416ab3e1b9486ba48f239340e202d, type: 3} propertyPath: m_LocalPosition.x @@ -3740,11 +3036,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6643278822725274409, guid: 9a3416ab3e1b9486ba48f239340e202d, type: 3} propertyPath: m_AnchoredPosition.x - value: -608 + value: -76 objectReference: {fileID: 0} - target: {fileID: 6643278822725274409, guid: 9a3416ab3e1b9486ba48f239340e202d, type: 3} propertyPath: m_AnchoredPosition.y - value: 196 + value: 183 objectReference: {fileID: 0} - target: {fileID: 6643278822725274409, guid: 9a3416ab3e1b9486ba48f239340e202d, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -3806,7 +3102,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 7207106866394599773} + m_TransformParent: {fileID: 5109493994691160880} m_Modifications: - target: {fileID: 1305929967901934283, guid: 9a3416ab3e1b9486ba48f239340e202d, type: 3} propertyPath: m_Name @@ -3835,7 +3131,7 @@ PrefabInstance: - target: {fileID: 4329488436158027747, guid: 9a3416ab3e1b9486ba48f239340e202d, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 2f525faf27fa14ded87402d1684eb85d, type: 3} + objectReference: {fileID: 21300000, guid: bda43422408ca42209dd311b23a1d06f, type: 3} - target: {fileID: 6098108853264045617, guid: 9a3416ab3e1b9486ba48f239340e202d, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -3910,11 +3206,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6643278822725274409, guid: 9a3416ab3e1b9486ba48f239340e202d, type: 3} propertyPath: m_SizeDelta.x - value: 134 + value: 140 objectReference: {fileID: 0} - target: {fileID: 6643278822725274409, guid: 9a3416ab3e1b9486ba48f239340e202d, type: 3} propertyPath: m_SizeDelta.y - value: 78 + value: 80 objectReference: {fileID: 0} - target: {fileID: 6643278822725274409, guid: 9a3416ab3e1b9486ba48f239340e202d, type: 3} propertyPath: m_LocalPosition.x @@ -3946,11 +3242,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6643278822725274409, guid: 9a3416ab3e1b9486ba48f239340e202d, type: 3} propertyPath: m_AnchoredPosition.x - value: -472 + value: 78 objectReference: {fileID: 0} - target: {fileID: 6643278822725274409, guid: 9a3416ab3e1b9486ba48f239340e202d, type: 3} propertyPath: m_AnchoredPosition.y - value: -331 + value: -372 objectReference: {fileID: 0} - target: {fileID: 6643278822725274409, guid: 9a3416ab3e1b9486ba48f239340e202d, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -4012,7 +3308,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 7207106866394599773} + m_TransformParent: {fileID: 5109493994691160880} m_Modifications: - target: {fileID: 1305929967901934283, guid: 9a3416ab3e1b9486ba48f239340e202d, type: 3} propertyPath: m_Name @@ -4041,7 +3337,7 @@ PrefabInstance: - target: {fileID: 4329488436158027747, guid: 9a3416ab3e1b9486ba48f239340e202d, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 5406d9f0e6a9c464499dc8703c83f887, type: 3} + objectReference: {fileID: 21300000, guid: 6bc5be995cfc14e0182a54c5a4fef290, type: 3} - target: {fileID: 6098108853264045617, guid: 9a3416ab3e1b9486ba48f239340e202d, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -4116,11 +3412,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6643278822725274409, guid: 9a3416ab3e1b9486ba48f239340e202d, type: 3} propertyPath: m_SizeDelta.x - value: 134 + value: 140 objectReference: {fileID: 0} - target: {fileID: 6643278822725274409, guid: 9a3416ab3e1b9486ba48f239340e202d, type: 3} propertyPath: m_SizeDelta.y - value: 78 + value: 80 objectReference: {fileID: 0} - target: {fileID: 6643278822725274409, guid: 9a3416ab3e1b9486ba48f239340e202d, type: 3} propertyPath: m_LocalPosition.x @@ -4152,11 +3448,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6643278822725274409, guid: 9a3416ab3e1b9486ba48f239340e202d, type: 3} propertyPath: m_AnchoredPosition.x - value: -608 + value: -76 objectReference: {fileID: 0} - target: {fileID: 6643278822725274409, guid: 9a3416ab3e1b9486ba48f239340e202d, type: 3} propertyPath: m_AnchoredPosition.y - value: -331 + value: -372 objectReference: {fileID: 0} - target: {fileID: 6643278822725274409, guid: 9a3416ab3e1b9486ba48f239340e202d, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -4218,7 +3514,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 7207106866394599773} + m_TransformParent: {fileID: 5109493994691160880} m_Modifications: - target: {fileID: 1305929967901934283, guid: 9a3416ab3e1b9486ba48f239340e202d, type: 3} propertyPath: m_Name @@ -4247,7 +3543,7 @@ PrefabInstance: - target: {fileID: 4329488436158027747, guid: 9a3416ab3e1b9486ba48f239340e202d, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 2de3e59cb38ea4911ab7a9fdb1d2406b, type: 3} + objectReference: {fileID: 21300000, guid: 98a2ad67412f444ee883c03d3a07dd1e, type: 3} - target: {fileID: 6098108853264045617, guid: 9a3416ab3e1b9486ba48f239340e202d, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -4322,11 +3618,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6643278822725274409, guid: 9a3416ab3e1b9486ba48f239340e202d, type: 3} propertyPath: m_SizeDelta.x - value: 134 + value: 140 objectReference: {fileID: 0} - target: {fileID: 6643278822725274409, guid: 9a3416ab3e1b9486ba48f239340e202d, type: 3} propertyPath: m_SizeDelta.y - value: 78 + value: 80 objectReference: {fileID: 0} - target: {fileID: 6643278822725274409, guid: 9a3416ab3e1b9486ba48f239340e202d, type: 3} propertyPath: m_LocalPosition.x @@ -4358,11 +3654,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6643278822725274409, guid: 9a3416ab3e1b9486ba48f239340e202d, type: 3} propertyPath: m_AnchoredPosition.x - value: -608 + value: -76 objectReference: {fileID: 0} - target: {fileID: 6643278822725274409, guid: 9a3416ab3e1b9486ba48f239340e202d, type: 3} propertyPath: m_AnchoredPosition.y - value: -175 + value: -196 objectReference: {fileID: 0} - target: {fileID: 6643278822725274409, guid: 9a3416ab3e1b9486ba48f239340e202d, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -4634,7 +3930,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 7207106866394599773} + m_TransformParent: {fileID: 5109493994691160880} m_Modifications: - target: {fileID: 1305929967901934283, guid: 9a3416ab3e1b9486ba48f239340e202d, type: 3} propertyPath: m_Name @@ -4663,7 +3959,7 @@ PrefabInstance: - target: {fileID: 4329488436158027747, guid: 9a3416ab3e1b9486ba48f239340e202d, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: af4261c3d3ccf4ee5aa2a37b13af6922, type: 3} + objectReference: {fileID: 21300000, guid: 48d5dd980b244494b9f9d9fc540e0b01, type: 3} - target: {fileID: 6098108853264045617, guid: 9a3416ab3e1b9486ba48f239340e202d, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -4738,11 +4034,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6643278822725274409, guid: 9a3416ab3e1b9486ba48f239340e202d, type: 3} propertyPath: m_SizeDelta.x - value: 134 + value: 140 objectReference: {fileID: 0} - target: {fileID: 6643278822725274409, guid: 9a3416ab3e1b9486ba48f239340e202d, type: 3} propertyPath: m_SizeDelta.y - value: 78 + value: 80 objectReference: {fileID: 0} - target: {fileID: 6643278822725274409, guid: 9a3416ab3e1b9486ba48f239340e202d, type: 3} propertyPath: m_LocalPosition.x @@ -4774,11 +4070,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6643278822725274409, guid: 9a3416ab3e1b9486ba48f239340e202d, type: 3} propertyPath: m_AnchoredPosition.x - value: -608 + value: -76 objectReference: {fileID: 0} - target: {fileID: 6643278822725274409, guid: 9a3416ab3e1b9486ba48f239340e202d, type: 3} propertyPath: m_AnchoredPosition.y - value: 89 + value: 81 objectReference: {fileID: 0} - target: {fileID: 6643278822725274409, guid: 9a3416ab3e1b9486ba48f239340e202d, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -4794,7 +4090,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6822543606753027690, guid: 9a3416ab3e1b9486ba48f239340e202d, type: 3} propertyPath: k__BackingField - value: Top + value: Upper_body objectReference: {fileID: 0} - target: {fileID: 7495390461251039812, guid: 9a3416ab3e1b9486ba48f239340e202d, type: 3} propertyPath: m_AnchorMax.y @@ -4840,7 +4136,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 7207106866394599773} + m_TransformParent: {fileID: 5109493994691160880} m_Modifications: - target: {fileID: 1305929967901934283, guid: 9a3416ab3e1b9486ba48f239340e202d, type: 3} propertyPath: m_Name @@ -4869,7 +4165,7 @@ PrefabInstance: - target: {fileID: 4329488436158027747, guid: 9a3416ab3e1b9486ba48f239340e202d, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: aefec5c0deb1246b0b9ccc6f85d98fca, type: 3} + objectReference: {fileID: 21300000, guid: ec6e82c586d96441e9a01726eae9c6f8, type: 3} - target: {fileID: 6098108853264045617, guid: 9a3416ab3e1b9486ba48f239340e202d, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -4944,11 +4240,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6643278822725274409, guid: 9a3416ab3e1b9486ba48f239340e202d, type: 3} propertyPath: m_SizeDelta.x - value: 134 + value: 140 objectReference: {fileID: 0} - target: {fileID: 6643278822725274409, guid: 9a3416ab3e1b9486ba48f239340e202d, type: 3} propertyPath: m_SizeDelta.y - value: 78 + value: 80 objectReference: {fileID: 0} - target: {fileID: 6643278822725274409, guid: 9a3416ab3e1b9486ba48f239340e202d, type: 3} propertyPath: m_LocalPosition.x @@ -4980,11 +4276,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6643278822725274409, guid: 9a3416ab3e1b9486ba48f239340e202d, type: 3} propertyPath: m_AnchoredPosition.x - value: -608 + value: -76 objectReference: {fileID: 0} - target: {fileID: 6643278822725274409, guid: 9a3416ab3e1b9486ba48f239340e202d, type: 3} propertyPath: m_AnchoredPosition.y - value: -97 + value: -108 objectReference: {fileID: 0} - target: {fileID: 6643278822725274409, guid: 9a3416ab3e1b9486ba48f239340e202d, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -5040,124 +4336,74 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 6643278822725274409, guid: 9a3416ab3e1b9486ba48f239340e202d, type: 3} m_PrefabInstance: {fileID: 5401799356361531441} m_PrefabAsset: {fileID: 0} ---- !u!1001 &5774984879103829418 +--- !u!1001 &6145944045108438897 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 5668916703579838269} + m_TransformParent: {fileID: 7207106866394599773} m_Modifications: - - target: {fileID: 4268960914579942832, guid: aabac5666448b4345a76347f94ea32a4, type: 3} - propertyPath: m_AnchoredPosition.y - value: -4.1 - objectReference: {fileID: 0} - - target: {fileID: 6252267455741274073, guid: aabac5666448b4345a76347f94ea32a4, type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 6252267455741274073, guid: aabac5666448b4345a76347f94ea32a4, type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 6252267455741274073, guid: aabac5666448b4345a76347f94ea32a4, type: 3} - propertyPath: m_RootOrder - value: -1 - objectReference: {fileID: 0} - - target: {fileID: 6252267455741274073, guid: aabac5666448b4345a76347f94ea32a4, type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6252267455741274073, guid: aabac5666448b4345a76347f94ea32a4, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6252267455741274073, guid: aabac5666448b4345a76347f94ea32a4, type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6252267455741274073, guid: aabac5666448b4345a76347f94ea32a4, type: 3} - propertyPath: m_AnchorMin.y - value: 0 + - target: {fileID: 804860302255169224, guid: 5ed0eaf7428cb4135baf7d2e09a9430a, type: 3} + propertyPath: m_Colors.m_NormalColor.a + value: 0.19607843 objectReference: {fileID: 0} - - target: {fileID: 6252267455741274073, guid: aabac5666448b4345a76347f94ea32a4, type: 3} - propertyPath: m_SizeDelta.x - value: 0 + - target: {fileID: 804860302255169224, guid: 5ed0eaf7428cb4135baf7d2e09a9430a, type: 3} + propertyPath: m_Colors.m_NormalColor.b + value: 0.9529412 objectReference: {fileID: 0} - - target: {fileID: 6252267455741274073, guid: aabac5666448b4345a76347f94ea32a4, type: 3} - propertyPath: m_SizeDelta.y - value: 0 + - target: {fileID: 804860302255169224, guid: 5ed0eaf7428cb4135baf7d2e09a9430a, type: 3} + propertyPath: m_Colors.m_NormalColor.g + value: 0.29411766 objectReference: {fileID: 0} - - target: {fileID: 6252267455741274073, guid: aabac5666448b4345a76347f94ea32a4, type: 3} - propertyPath: m_LocalPosition.x - value: 0 + - target: {fileID: 804860302255169224, guid: 5ed0eaf7428cb4135baf7d2e09a9430a, type: 3} + propertyPath: m_Colors.m_NormalColor.r + value: 0.6313726 objectReference: {fileID: 0} - - target: {fileID: 6252267455741274073, guid: aabac5666448b4345a76347f94ea32a4, type: 3} - propertyPath: m_LocalPosition.y - value: 0 + - target: {fileID: 804860302255169224, guid: 5ed0eaf7428cb4135baf7d2e09a9430a, type: 3} + propertyPath: m_Colors.m_PressedColor.a + value: 0.11764706 objectReference: {fileID: 0} - - target: {fileID: 6252267455741274073, guid: aabac5666448b4345a76347f94ea32a4, type: 3} - propertyPath: m_LocalPosition.z + - target: {fileID: 804860302255169224, guid: 5ed0eaf7428cb4135baf7d2e09a9430a, type: 3} + propertyPath: m_Colors.m_PressedColor.b value: 0 objectReference: {fileID: 0} - - target: {fileID: 6252267455741274073, guid: aabac5666448b4345a76347f94ea32a4, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 6252267455741274073, guid: aabac5666448b4345a76347f94ea32a4, type: 3} - propertyPath: m_LocalRotation.x + - target: {fileID: 804860302255169224, guid: 5ed0eaf7428cb4135baf7d2e09a9430a, type: 3} + propertyPath: m_Colors.m_PressedColor.g value: 0 objectReference: {fileID: 0} - - target: {fileID: 6252267455741274073, guid: aabac5666448b4345a76347f94ea32a4, type: 3} - propertyPath: m_LocalRotation.y + - target: {fileID: 804860302255169224, guid: 5ed0eaf7428cb4135baf7d2e09a9430a, type: 3} + propertyPath: m_Colors.m_PressedColor.r value: 0 objectReference: {fileID: 0} - - target: {fileID: 6252267455741274073, guid: aabac5666448b4345a76347f94ea32a4, type: 3} - propertyPath: m_LocalRotation.z - value: 0 + - target: {fileID: 804860302255169224, guid: 5ed0eaf7428cb4135baf7d2e09a9430a, type: 3} + propertyPath: m_Colors.m_SelectedColor.a + value: 0.19607843 objectReference: {fileID: 0} - - target: {fileID: 6252267455741274073, guid: aabac5666448b4345a76347f94ea32a4, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 + - target: {fileID: 804860302255169224, guid: 5ed0eaf7428cb4135baf7d2e09a9430a, type: 3} + propertyPath: m_Colors.m_SelectedColor.b + value: 0.9529412 objectReference: {fileID: 0} - - target: {fileID: 6252267455741274073, guid: aabac5666448b4345a76347f94ea32a4, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 + - target: {fileID: 804860302255169224, guid: 5ed0eaf7428cb4135baf7d2e09a9430a, type: 3} + propertyPath: m_Colors.m_SelectedColor.g + value: 0.29411766 objectReference: {fileID: 0} - - target: {fileID: 6252267455741274073, guid: aabac5666448b4345a76347f94ea32a4, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 + - target: {fileID: 804860302255169224, guid: 5ed0eaf7428cb4135baf7d2e09a9430a, type: 3} + propertyPath: m_Colors.m_SelectedColor.r + value: 0.6313726 objectReference: {fileID: 0} - - target: {fileID: 6252267455741274073, guid: aabac5666448b4345a76347f94ea32a4, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 + - target: {fileID: 804860302255169224, guid: 5ed0eaf7428cb4135baf7d2e09a9430a, type: 3} + propertyPath: m_Colors.m_HighlightedColor.b + value: 0.9529412 objectReference: {fileID: 0} - - target: {fileID: 6252267455741274073, guid: aabac5666448b4345a76347f94ea32a4, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 + - target: {fileID: 804860302255169224, guid: 5ed0eaf7428cb4135baf7d2e09a9430a, type: 3} + propertyPath: m_Colors.m_HighlightedColor.g + value: 0.29411766 objectReference: {fileID: 0} - - target: {fileID: 6520438785063841496, guid: aabac5666448b4345a76347f94ea32a4, type: 3} - propertyPath: m_Name - value: BackpackItem (3) + - target: {fileID: 804860302255169224, guid: 5ed0eaf7428cb4135baf7d2e09a9430a, type: 3} + propertyPath: m_Colors.m_HighlightedColor.r + value: 0.6313726 objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: aabac5666448b4345a76347f94ea32a4, type: 3} ---- !u!224 &495494942874780275 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 6252267455741274073, guid: aabac5666448b4345a76347f94ea32a4, type: 3} - m_PrefabInstance: {fileID: 5774984879103829418} - m_PrefabAsset: {fileID: 0} ---- !u!1001 &6145944045108438897 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 7207106866394599773} - m_Modifications: - target: {fileID: 2136973473263099510, guid: 5ed0eaf7428cb4135baf7d2e09a9430a, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -5174,6 +4420,22 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 3358279922690953089, guid: 5ed0eaf7428cb4135baf7d2e09a9430a, type: 3} + propertyPath: m_Color.a + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3358279922690953089, guid: 5ed0eaf7428cb4135baf7d2e09a9430a, type: 3} + propertyPath: m_Color.b + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3358279922690953089, guid: 5ed0eaf7428cb4135baf7d2e09a9430a, type: 3} + propertyPath: m_Color.g + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3358279922690953089, guid: 5ed0eaf7428cb4135baf7d2e09a9430a, type: 3} + propertyPath: m_Color.r + value: 1 + objectReference: {fileID: 0} - target: {fileID: 3576930520628333720, guid: 5ed0eaf7428cb4135baf7d2e09a9430a, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -5276,11 +4538,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5955730194940385775, guid: 5ed0eaf7428cb4135baf7d2e09a9430a, type: 3} propertyPath: m_AnchoredPosition.x - value: 667 + value: 640 objectReference: {fileID: 0} - target: {fileID: 5955730194940385775, guid: 5ed0eaf7428cb4135baf7d2e09a9430a, type: 3} propertyPath: m_AnchoredPosition.y - value: 79 + value: 70 objectReference: {fileID: 0} - target: {fileID: 5955730194940385775, guid: 5ed0eaf7428cb4135baf7d2e09a9430a, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -5294,6 +4556,82 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 6437668814227222751, guid: 5ed0eaf7428cb4135baf7d2e09a9430a, type: 3} + propertyPath: m_Color.a + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6437668814227222751, guid: 5ed0eaf7428cb4135baf7d2e09a9430a, type: 3} + propertyPath: m_Color.b + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6437668814227222751, guid: 5ed0eaf7428cb4135baf7d2e09a9430a, type: 3} + propertyPath: m_Color.g + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6437668814227222751, guid: 5ed0eaf7428cb4135baf7d2e09a9430a, type: 3} + propertyPath: m_Color.r + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7588964123315412853, guid: 5ed0eaf7428cb4135baf7d2e09a9430a, type: 3} + propertyPath: m_Colors.m_NormalColor.a + value: 0.19607843 + objectReference: {fileID: 0} + - target: {fileID: 7588964123315412853, guid: 5ed0eaf7428cb4135baf7d2e09a9430a, type: 3} + propertyPath: m_Colors.m_NormalColor.b + value: 0.9529412 + objectReference: {fileID: 0} + - target: {fileID: 7588964123315412853, guid: 5ed0eaf7428cb4135baf7d2e09a9430a, type: 3} + propertyPath: m_Colors.m_NormalColor.g + value: 0.29411766 + objectReference: {fileID: 0} + - target: {fileID: 7588964123315412853, guid: 5ed0eaf7428cb4135baf7d2e09a9430a, type: 3} + propertyPath: m_Colors.m_NormalColor.r + value: 0.6313726 + objectReference: {fileID: 0} + - target: {fileID: 7588964123315412853, guid: 5ed0eaf7428cb4135baf7d2e09a9430a, type: 3} + propertyPath: m_Colors.m_PressedColor.a + value: 0.11764706 + objectReference: {fileID: 0} + - target: {fileID: 7588964123315412853, guid: 5ed0eaf7428cb4135baf7d2e09a9430a, type: 3} + propertyPath: m_Colors.m_PressedColor.b + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7588964123315412853, guid: 5ed0eaf7428cb4135baf7d2e09a9430a, type: 3} + propertyPath: m_Colors.m_PressedColor.g + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7588964123315412853, guid: 5ed0eaf7428cb4135baf7d2e09a9430a, type: 3} + propertyPath: m_Colors.m_PressedColor.r + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7588964123315412853, guid: 5ed0eaf7428cb4135baf7d2e09a9430a, type: 3} + propertyPath: m_Colors.m_SelectedColor.a + value: 0.19607843 + objectReference: {fileID: 0} + - target: {fileID: 7588964123315412853, guid: 5ed0eaf7428cb4135baf7d2e09a9430a, type: 3} + propertyPath: m_Colors.m_SelectedColor.b + value: 0.9529412 + objectReference: {fileID: 0} + - target: {fileID: 7588964123315412853, guid: 5ed0eaf7428cb4135baf7d2e09a9430a, type: 3} + propertyPath: m_Colors.m_SelectedColor.g + value: 0.29411766 + objectReference: {fileID: 0} + - target: {fileID: 7588964123315412853, guid: 5ed0eaf7428cb4135baf7d2e09a9430a, type: 3} + propertyPath: m_Colors.m_SelectedColor.r + value: 0.6313726 + objectReference: {fileID: 0} + - target: {fileID: 7588964123315412853, guid: 5ed0eaf7428cb4135baf7d2e09a9430a, type: 3} + propertyPath: m_Colors.m_HighlightedColor.b + value: 0.9529412 + objectReference: {fileID: 0} + - target: {fileID: 7588964123315412853, guid: 5ed0eaf7428cb4135baf7d2e09a9430a, type: 3} + propertyPath: m_Colors.m_HighlightedColor.g + value: 0.29411766 + objectReference: {fileID: 0} + - target: {fileID: 7588964123315412853, guid: 5ed0eaf7428cb4135baf7d2e09a9430a, type: 3} + propertyPath: m_Colors.m_HighlightedColor.r + value: 0.6313726 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -5310,7 +4648,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 7207106866394599773} + m_TransformParent: {fileID: 5109493994691160880} m_Modifications: - target: {fileID: 1305929967901934283, guid: 9a3416ab3e1b9486ba48f239340e202d, type: 3} propertyPath: m_Name @@ -5339,7 +4677,7 @@ PrefabInstance: - target: {fileID: 4329488436158027747, guid: 9a3416ab3e1b9486ba48f239340e202d, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: c006e0ed397034829a4b311fd25893fd, type: 3} + objectReference: {fileID: 21300000, guid: 03b05b1004b784dc690bbff5ea268de7, type: 3} - target: {fileID: 6098108853264045617, guid: 9a3416ab3e1b9486ba48f239340e202d, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -5414,11 +4752,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6643278822725274409, guid: 9a3416ab3e1b9486ba48f239340e202d, type: 3} propertyPath: m_SizeDelta.x - value: 134 + value: 140 objectReference: {fileID: 0} - target: {fileID: 6643278822725274409, guid: 9a3416ab3e1b9486ba48f239340e202d, type: 3} propertyPath: m_SizeDelta.y - value: 78 + value: 80 objectReference: {fileID: 0} - target: {fileID: 6643278822725274409, guid: 9a3416ab3e1b9486ba48f239340e202d, type: 3} propertyPath: m_LocalPosition.x @@ -5450,11 +4788,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6643278822725274409, guid: 9a3416ab3e1b9486ba48f239340e202d, type: 3} propertyPath: m_AnchoredPosition.x - value: -472 + value: 78 objectReference: {fileID: 0} - target: {fileID: 6643278822725274409, guid: 9a3416ab3e1b9486ba48f239340e202d, type: 3} propertyPath: m_AnchoredPosition.y - value: 274 + value: 271 objectReference: {fileID: 0} - target: {fileID: 6643278822725274409, guid: 9a3416ab3e1b9486ba48f239340e202d, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -5516,7 +4854,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 7207106866394599773} + m_TransformParent: {fileID: 5109493994691160880} m_Modifications: - target: {fileID: 1305929967901934283, guid: 9a3416ab3e1b9486ba48f239340e202d, type: 3} propertyPath: m_Name @@ -5545,7 +4883,7 @@ PrefabInstance: - target: {fileID: 4329488436158027747, guid: 9a3416ab3e1b9486ba48f239340e202d, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 8321a646ca8e441a5b6d8bed690a2aaf, type: 3} + objectReference: {fileID: 21300000, guid: f88ebb8cd1cd5487ca7c3f4d3e65e76a, type: 3} - target: {fileID: 6098108853264045617, guid: 9a3416ab3e1b9486ba48f239340e202d, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -5620,11 +4958,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6643278822725274409, guid: 9a3416ab3e1b9486ba48f239340e202d, type: 3} propertyPath: m_SizeDelta.x - value: 134 + value: 140 objectReference: {fileID: 0} - target: {fileID: 6643278822725274409, guid: 9a3416ab3e1b9486ba48f239340e202d, type: 3} propertyPath: m_SizeDelta.y - value: 78 + value: 80 objectReference: {fileID: 0} - target: {fileID: 6643278822725274409, guid: 9a3416ab3e1b9486ba48f239340e202d, type: 3} propertyPath: m_LocalPosition.x @@ -5656,11 +4994,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6643278822725274409, guid: 9a3416ab3e1b9486ba48f239340e202d, type: 3} propertyPath: m_AnchoredPosition.x - value: -472 + value: 78 objectReference: {fileID: 0} - target: {fileID: 6643278822725274409, guid: 9a3416ab3e1b9486ba48f239340e202d, type: 3} propertyPath: m_AnchoredPosition.y - value: -175 + value: -196 objectReference: {fileID: 0} - target: {fileID: 6643278822725274409, guid: 9a3416ab3e1b9486ba48f239340e202d, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -5722,7 +5060,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 7207106866394599773} + m_TransformParent: {fileID: 5109493994691160880} m_Modifications: - target: {fileID: 1305929967901934283, guid: 9a3416ab3e1b9486ba48f239340e202d, type: 3} propertyPath: m_Name @@ -5751,7 +5089,7 @@ PrefabInstance: - target: {fileID: 4329488436158027747, guid: 9a3416ab3e1b9486ba48f239340e202d, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 7879a1a71dbb64cb6b8453907a36f60b, type: 3} + objectReference: {fileID: 21300000, guid: 6a3c7a80a921c458c93852cc9cfa33c1, type: 3} - target: {fileID: 6098108853264045617, guid: 9a3416ab3e1b9486ba48f239340e202d, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -5826,11 +5164,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6643278822725274409, guid: 9a3416ab3e1b9486ba48f239340e202d, type: 3} propertyPath: m_SizeDelta.x - value: 134 + value: 140 objectReference: {fileID: 0} - target: {fileID: 6643278822725274409, guid: 9a3416ab3e1b9486ba48f239340e202d, type: 3} propertyPath: m_SizeDelta.y - value: 78 + value: 80 objectReference: {fileID: 0} - target: {fileID: 6643278822725274409, guid: 9a3416ab3e1b9486ba48f239340e202d, type: 3} propertyPath: m_LocalPosition.x @@ -5862,11 +5200,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6643278822725274409, guid: 9a3416ab3e1b9486ba48f239340e202d, type: 3} propertyPath: m_AnchoredPosition.x - value: -608 + value: -76 objectReference: {fileID: 0} - target: {fileID: 6643278822725274409, guid: 9a3416ab3e1b9486ba48f239340e202d, type: 3} propertyPath: m_AnchoredPosition.y - value: -253 + value: -282 objectReference: {fileID: 0} - target: {fileID: 6643278822725274409, guid: 9a3416ab3e1b9486ba48f239340e202d, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -5928,7 +5266,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 7207106866394599773} + m_TransformParent: {fileID: 5109493994691160880} m_Modifications: - target: {fileID: 1305929967901934283, guid: 9a3416ab3e1b9486ba48f239340e202d, type: 3} propertyPath: m_Name @@ -5957,7 +5295,7 @@ PrefabInstance: - target: {fileID: 4329488436158027747, guid: 9a3416ab3e1b9486ba48f239340e202d, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 4418c90e7ae104f7bbae035b3625ceb4, type: 3} + objectReference: {fileID: 21300000, guid: 2bd9c7cbf6f504ad89e22e7f1f497fd2, type: 3} - target: {fileID: 6098108853264045617, guid: 9a3416ab3e1b9486ba48f239340e202d, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -6032,11 +5370,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6643278822725274409, guid: 9a3416ab3e1b9486ba48f239340e202d, type: 3} propertyPath: m_SizeDelta.x - value: 134 + value: 140 objectReference: {fileID: 0} - target: {fileID: 6643278822725274409, guid: 9a3416ab3e1b9486ba48f239340e202d, type: 3} propertyPath: m_SizeDelta.y - value: 78 + value: 80 objectReference: {fileID: 0} - target: {fileID: 6643278822725274409, guid: 9a3416ab3e1b9486ba48f239340e202d, type: 3} propertyPath: m_LocalPosition.x @@ -6068,11 +5406,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6643278822725274409, guid: 9a3416ab3e1b9486ba48f239340e202d, type: 3} propertyPath: m_AnchoredPosition.x - value: -472 + value: 78 objectReference: {fileID: 0} - target: {fileID: 6643278822725274409, guid: 9a3416ab3e1b9486ba48f239340e202d, type: 3} propertyPath: m_AnchoredPosition.y - value: 11 + value: -7 objectReference: {fileID: 0} - target: {fileID: 6643278822725274409, guid: 9a3416ab3e1b9486ba48f239340e202d, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -6086,271 +5424,47 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 6822543606753027690, guid: 9a3416ab3e1b9486ba48f239340e202d, type: 3} - propertyPath: k__BackingField - value: Shoes - objectReference: {fileID: 0} - - target: {fileID: 7495390461251039812, guid: 9a3416ab3e1b9486ba48f239340e202d, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7495390461251039812, guid: 9a3416ab3e1b9486ba48f239340e202d, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7495390461251039812, guid: 9a3416ab3e1b9486ba48f239340e202d, type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7495390461251039812, guid: 9a3416ab3e1b9486ba48f239340e202d, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7495390461251039812, guid: 9a3416ab3e1b9486ba48f239340e202d, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8197210241556340483, guid: 9a3416ab3e1b9486ba48f239340e202d, type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8197210241556340483, guid: 9a3416ab3e1b9486ba48f239340e202d, type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 9a3416ab3e1b9486ba48f239340e202d, type: 3} ---- !u!224 &4323855567392285974 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 6643278822725274409, guid: 9a3416ab3e1b9486ba48f239340e202d, type: 3} - m_PrefabInstance: {fileID: 6931252438526160447} - m_PrefabAsset: {fileID: 0} ---- !u!1001 &7794622317550511841 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 5668916703579838269} - m_Modifications: - - target: {fileID: 493759110962425617, guid: aabac5666448b4345a76347f94ea32a4, type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4268960914579942832, guid: aabac5666448b4345a76347f94ea32a4, type: 3} - propertyPath: m_AnchoredPosition.y - value: -4.1 - objectReference: {fileID: 0} - - target: {fileID: 6252267455741274073, guid: aabac5666448b4345a76347f94ea32a4, type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 6252267455741274073, guid: aabac5666448b4345a76347f94ea32a4, type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 6252267455741274073, guid: aabac5666448b4345a76347f94ea32a4, type: 3} - propertyPath: m_RootOrder - value: -1 - objectReference: {fileID: 0} - - target: {fileID: 6252267455741274073, guid: aabac5666448b4345a76347f94ea32a4, type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6252267455741274073, guid: aabac5666448b4345a76347f94ea32a4, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6252267455741274073, guid: aabac5666448b4345a76347f94ea32a4, type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6252267455741274073, guid: aabac5666448b4345a76347f94ea32a4, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6252267455741274073, guid: aabac5666448b4345a76347f94ea32a4, type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6252267455741274073, guid: aabac5666448b4345a76347f94ea32a4, type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6252267455741274073, guid: aabac5666448b4345a76347f94ea32a4, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6252267455741274073, guid: aabac5666448b4345a76347f94ea32a4, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6252267455741274073, guid: aabac5666448b4345a76347f94ea32a4, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6252267455741274073, guid: aabac5666448b4345a76347f94ea32a4, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 6252267455741274073, guid: aabac5666448b4345a76347f94ea32a4, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6252267455741274073, guid: aabac5666448b4345a76347f94ea32a4, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6252267455741274073, guid: aabac5666448b4345a76347f94ea32a4, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6252267455741274073, guid: aabac5666448b4345a76347f94ea32a4, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6252267455741274073, guid: aabac5666448b4345a76347f94ea32a4, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6252267455741274073, guid: aabac5666448b4345a76347f94ea32a4, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6252267455741274073, guid: aabac5666448b4345a76347f94ea32a4, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6252267455741274073, guid: aabac5666448b4345a76347f94ea32a4, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6520438785063841496, guid: aabac5666448b4345a76347f94ea32a4, type: 3} - propertyPath: m_Name - value: BackpackItem - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: aabac5666448b4345a76347f94ea32a4, type: 3} ---- !u!224 &4244796113344758072 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 6252267455741274073, guid: aabac5666448b4345a76347f94ea32a4, type: 3} - m_PrefabInstance: {fileID: 7794622317550511841} - m_PrefabAsset: {fileID: 0} ---- !u!1001 &7890227020001197385 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 5668916703579838269} - m_Modifications: - - target: {fileID: 4268960914579942832, guid: aabac5666448b4345a76347f94ea32a4, type: 3} - propertyPath: m_AnchoredPosition.y - value: -4.1 - objectReference: {fileID: 0} - - target: {fileID: 6252267455741274073, guid: aabac5666448b4345a76347f94ea32a4, type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 6252267455741274073, guid: aabac5666448b4345a76347f94ea32a4, type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 6252267455741274073, guid: aabac5666448b4345a76347f94ea32a4, type: 3} - propertyPath: m_RootOrder - value: -1 - objectReference: {fileID: 0} - - target: {fileID: 6252267455741274073, guid: aabac5666448b4345a76347f94ea32a4, type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6252267455741274073, guid: aabac5666448b4345a76347f94ea32a4, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6252267455741274073, guid: aabac5666448b4345a76347f94ea32a4, type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6252267455741274073, guid: aabac5666448b4345a76347f94ea32a4, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6252267455741274073, guid: aabac5666448b4345a76347f94ea32a4, type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6252267455741274073, guid: aabac5666448b4345a76347f94ea32a4, type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6252267455741274073, guid: aabac5666448b4345a76347f94ea32a4, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6252267455741274073, guid: aabac5666448b4345a76347f94ea32a4, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6252267455741274073, guid: aabac5666448b4345a76347f94ea32a4, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6252267455741274073, guid: aabac5666448b4345a76347f94ea32a4, type: 3} - propertyPath: m_LocalRotation.w - value: 1 + - target: {fileID: 6822543606753027690, guid: 9a3416ab3e1b9486ba48f239340e202d, type: 3} + propertyPath: k__BackingField + value: Feet objectReference: {fileID: 0} - - target: {fileID: 6252267455741274073, guid: aabac5666448b4345a76347f94ea32a4, type: 3} - propertyPath: m_LocalRotation.x + - target: {fileID: 7495390461251039812, guid: 9a3416ab3e1b9486ba48f239340e202d, type: 3} + propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 6252267455741274073, guid: aabac5666448b4345a76347f94ea32a4, type: 3} - propertyPath: m_LocalRotation.y + - target: {fileID: 7495390461251039812, guid: 9a3416ab3e1b9486ba48f239340e202d, type: 3} + propertyPath: m_AnchorMin.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 6252267455741274073, guid: aabac5666448b4345a76347f94ea32a4, type: 3} - propertyPath: m_LocalRotation.z + - target: {fileID: 7495390461251039812, guid: 9a3416ab3e1b9486ba48f239340e202d, type: 3} + propertyPath: m_SizeDelta.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 6252267455741274073, guid: aabac5666448b4345a76347f94ea32a4, type: 3} + - target: {fileID: 7495390461251039812, guid: 9a3416ab3e1b9486ba48f239340e202d, type: 3} propertyPath: m_AnchoredPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 6252267455741274073, guid: aabac5666448b4345a76347f94ea32a4, type: 3} + - target: {fileID: 7495390461251039812, guid: 9a3416ab3e1b9486ba48f239340e202d, type: 3} propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 6252267455741274073, guid: aabac5666448b4345a76347f94ea32a4, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6252267455741274073, guid: aabac5666448b4345a76347f94ea32a4, type: 3} - propertyPath: m_LocalEulerAnglesHint.y + - target: {fileID: 8197210241556340483, guid: 9a3416ab3e1b9486ba48f239340e202d, type: 3} + propertyPath: m_SizeDelta.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 6252267455741274073, guid: aabac5666448b4345a76347f94ea32a4, type: 3} - propertyPath: m_LocalEulerAnglesHint.z + - target: {fileID: 8197210241556340483, guid: 9a3416ab3e1b9486ba48f239340e202d, type: 3} + propertyPath: m_SizeDelta.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 6520438785063841496, guid: aabac5666448b4345a76347f94ea32a4, type: 3} - propertyPath: m_Name - value: BackpackItem (1) - objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: aabac5666448b4345a76347f94ea32a4, type: 3} ---- !u!224 &4304090543667649168 stripped + m_SourcePrefab: {fileID: 100100000, guid: 9a3416ab3e1b9486ba48f239340e202d, type: 3} +--- !u!224 &4323855567392285974 stripped RectTransform: - m_CorrespondingSourceObject: {fileID: 6252267455741274073, guid: aabac5666448b4345a76347f94ea32a4, type: 3} - m_PrefabInstance: {fileID: 7890227020001197385} + m_CorrespondingSourceObject: {fileID: 6643278822725274409, guid: 9a3416ab3e1b9486ba48f239340e202d, type: 3} + m_PrefabInstance: {fileID: 6931252438526160447} m_PrefabAsset: {fileID: 0} --- !u!1001 &8351393925073263542 PrefabInstance: @@ -6358,7 +5472,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 7207106866394599773} + m_TransformParent: {fileID: 5109493994691160880} m_Modifications: - target: {fileID: 1305929967901934283, guid: 9a3416ab3e1b9486ba48f239340e202d, type: 3} propertyPath: m_Name @@ -6387,7 +5501,7 @@ PrefabInstance: - target: {fileID: 4329488436158027747, guid: 9a3416ab3e1b9486ba48f239340e202d, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 48fb8b5f1eb6247d7aa88e2273b0ba58, type: 3} + objectReference: {fileID: 21300000, guid: 6084de83d5bc748b9a444a61a7c0b96a, type: 3} - target: {fileID: 6098108853264045617, guid: 9a3416ab3e1b9486ba48f239340e202d, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -6462,11 +5576,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6643278822725274409, guid: 9a3416ab3e1b9486ba48f239340e202d, type: 3} propertyPath: m_SizeDelta.x - value: 134 + value: 140 objectReference: {fileID: 0} - target: {fileID: 6643278822725274409, guid: 9a3416ab3e1b9486ba48f239340e202d, type: 3} propertyPath: m_SizeDelta.y - value: 78 + value: 80 objectReference: {fileID: 0} - target: {fileID: 6643278822725274409, guid: 9a3416ab3e1b9486ba48f239340e202d, type: 3} propertyPath: m_LocalPosition.x @@ -6498,11 +5612,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6643278822725274409, guid: 9a3416ab3e1b9486ba48f239340e202d, type: 3} propertyPath: m_AnchoredPosition.x - value: -472 + value: 78 objectReference: {fileID: 0} - target: {fileID: 6643278822725274409, guid: 9a3416ab3e1b9486ba48f239340e202d, type: 3} propertyPath: m_AnchoredPosition.y - value: -253 + value: -282.00003 objectReference: {fileID: 0} - target: {fileID: 6643278822725274409, guid: 9a3416ab3e1b9486ba48f239340e202d, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -6518,7 +5632,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6822543606753027690, guid: 9a3416ab3e1b9486ba48f239340e202d, type: 3} propertyPath: k__BackingField - value: Tophead + value: Top_Head objectReference: {fileID: 0} - target: {fileID: 7495390461251039812, guid: 9a3416ab3e1b9486ba48f239340e202d, type: 3} propertyPath: m_AnchorMax.y @@ -6580,15 +5694,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 145861463570281605, guid: 1936c8ca610b0472baddc2c56969a641, type: 3} propertyPath: m_Colors.m_NormalColor.b - value: 0.9882353 + value: 1 objectReference: {fileID: 0} - target: {fileID: 145861463570281605, guid: 1936c8ca610b0472baddc2c56969a641, type: 3} propertyPath: m_Colors.m_NormalColor.g - value: 0.9882353 + value: 1 objectReference: {fileID: 0} - target: {fileID: 145861463570281605, guid: 1936c8ca610b0472baddc2c56969a641, type: 3} propertyPath: m_Colors.m_NormalColor.r - value: 0.9882353 + value: 1 objectReference: {fileID: 0} - target: {fileID: 145861463570281605, guid: 1936c8ca610b0472baddc2c56969a641, type: 3} propertyPath: m_Colors.m_PressedColor.a @@ -6596,15 +5710,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 145861463570281605, guid: 1936c8ca610b0472baddc2c56969a641, type: 3} propertyPath: m_Colors.m_PressedColor.b - value: 0.83137256 + value: 0.8584906 objectReference: {fileID: 0} - target: {fileID: 145861463570281605, guid: 1936c8ca610b0472baddc2c56969a641, type: 3} propertyPath: m_Colors.m_PressedColor.g - value: 0.8039216 + value: 0.8584906 objectReference: {fileID: 0} - target: {fileID: 145861463570281605, guid: 1936c8ca610b0472baddc2c56969a641, type: 3} propertyPath: m_Colors.m_PressedColor.r - value: 0.8117647 + value: 0.8584906 objectReference: {fileID: 0} - target: {fileID: 145861463570281605, guid: 1936c8ca610b0472baddc2c56969a641, type: 3} propertyPath: m_Colors.m_SelectedColor.a @@ -6644,7 +5758,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 647778724686335215, guid: 1936c8ca610b0472baddc2c56969a641, type: 3} propertyPath: m_SizeDelta.x - value: 129.7 + value: 100 objectReference: {fileID: 0} - target: {fileID: 647778724686335215, guid: 1936c8ca610b0472baddc2c56969a641, type: 3} propertyPath: m_SizeDelta.y @@ -6652,7 +5766,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 647778724686335215, guid: 1936c8ca610b0472baddc2c56969a641, type: 3} propertyPath: m_AnchoredPosition.x - value: 19 + value: 18.999937 objectReference: {fileID: 0} - target: {fileID: 647778724686335215, guid: 1936c8ca610b0472baddc2c56969a641, type: 3} propertyPath: m_AnchoredPosition.y @@ -6661,18 +5775,18 @@ PrefabInstance: - target: {fileID: 782066126112996038, guid: 1936c8ca610b0472baddc2c56969a641, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: d3ecf27700ecf44369a10807f899b558, type: 3} + objectReference: {fileID: 21300000, guid: fbd8ab1095b184feb89e2963e0d53d6b, type: 3} - target: {fileID: 782066126112996038, guid: 1936c8ca610b0472baddc2c56969a641, type: 3} propertyPath: m_Color.b - value: 1 + value: 0.9882353 objectReference: {fileID: 0} - target: {fileID: 782066126112996038, guid: 1936c8ca610b0472baddc2c56969a641, type: 3} propertyPath: m_Color.g - value: 1 + value: 0.9882353 objectReference: {fileID: 0} - target: {fileID: 782066126112996038, guid: 1936c8ca610b0472baddc2c56969a641, type: 3} propertyPath: m_Color.r - value: 1 + value: 0.9882353 objectReference: {fileID: 0} - target: {fileID: 1340690018881578410, guid: 1936c8ca610b0472baddc2c56969a641, type: 3} propertyPath: m_IsActive @@ -6690,9 +5804,17 @@ PrefabInstance: propertyPath: m_AnchorMin.x value: 0 objectReference: {fileID: 0} + - target: {fileID: 2129308136558042850, guid: 1936c8ca610b0472baddc2c56969a641, type: 3} + propertyPath: m_SizeDelta.x + value: 24 + objectReference: {fileID: 0} + - target: {fileID: 2129308136558042850, guid: 1936c8ca610b0472baddc2c56969a641, type: 3} + propertyPath: m_SizeDelta.y + value: 24 + objectReference: {fileID: 0} - target: {fileID: 2129308136558042850, guid: 1936c8ca610b0472baddc2c56969a641, type: 3} propertyPath: m_AnchoredPosition.x - value: 23 + value: 30.2371 objectReference: {fileID: 0} - target: {fileID: 2129308136558042850, guid: 1936c8ca610b0472baddc2c56969a641, type: 3} propertyPath: m_AnchoredPosition.y @@ -6704,7 +5826,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3114688435971539077, guid: 1936c8ca610b0472baddc2c56969a641, type: 3} propertyPath: m_SizeDelta.x - value: 106 + value: 152 objectReference: {fileID: 0} - target: {fileID: 3114688435971539077, guid: 1936c8ca610b0472baddc2c56969a641, type: 3} propertyPath: m_SizeDelta.y @@ -6716,7 +5838,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3278519586392893701, guid: 1936c8ca610b0472baddc2c56969a641, type: 3} propertyPath: m_SizeDelta.x - value: 129.7 + value: 100 objectReference: {fileID: 0} - target: {fileID: 3278519586392893701, guid: 1936c8ca610b0472baddc2c56969a641, type: 3} propertyPath: m_SizeDelta.y @@ -6724,7 +5846,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3278519586392893701, guid: 1936c8ca610b0472baddc2c56969a641, type: 3} propertyPath: m_AnchoredPosition.x - value: 19.000008 + value: 19 objectReference: {fileID: 0} - target: {fileID: 3278519586392893701, guid: 1936c8ca610b0472baddc2c56969a641, type: 3} propertyPath: m_AnchoredPosition.y @@ -6768,7 +5890,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4755743825679548413, guid: 1936c8ca610b0472baddc2c56969a641, type: 3} propertyPath: m_SizeDelta.x - value: 106 + value: 152 objectReference: {fileID: 0} - target: {fileID: 4755743825679548413, guid: 1936c8ca610b0472baddc2c56969a641, type: 3} propertyPath: m_SizeDelta.y @@ -6828,7 +5950,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5288072022237423886, guid: 1936c8ca610b0472baddc2c56969a641, type: 3} propertyPath: m_text - value: Avatar + value: Wearables objectReference: {fileID: 0} - target: {fileID: 5288072022237423886, guid: 1936c8ca610b0472baddc2c56969a641, type: 3} propertyPath: m_fontSize @@ -6862,6 +5984,10 @@ PrefabInstance: propertyPath: m_VerticalAlignment value: 512 objectReference: {fileID: 0} + - target: {fileID: 5288072022237423886, guid: 1936c8ca610b0472baddc2c56969a641, type: 3} + propertyPath: m_HorizontalAlignment + value: 1 + objectReference: {fileID: 0} - target: {fileID: 5294738254589804664, guid: 1936c8ca610b0472baddc2c56969a641, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -6870,6 +5996,14 @@ PrefabInstance: propertyPath: m_AnchorMin.x value: 0 objectReference: {fileID: 0} + - target: {fileID: 5294738254589804664, guid: 1936c8ca610b0472baddc2c56969a641, type: 3} + propertyPath: m_SizeDelta.x + value: 24 + objectReference: {fileID: 0} + - target: {fileID: 5294738254589804664, guid: 1936c8ca610b0472baddc2c56969a641, type: 3} + propertyPath: m_SizeDelta.y + value: 24 + objectReference: {fileID: 0} - target: {fileID: 5294738254589804664, guid: 1936c8ca610b0472baddc2c56969a641, type: 3} propertyPath: m_AnchoredPosition.x value: 23 @@ -6880,12 +6014,24 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6425377980552986654, guid: 1936c8ca610b0472baddc2c56969a641, type: 3} propertyPath: m_text - value: Avatar + value: Wearables objectReference: {fileID: 0} - target: {fileID: 6425377980552986654, guid: 1936c8ca610b0472baddc2c56969a641, type: 3} propertyPath: m_fontSize value: 18 objectReference: {fileID: 0} + - target: {fileID: 6425377980552986654, guid: 1936c8ca610b0472baddc2c56969a641, type: 3} + propertyPath: m_fontColor.b + value: 0.9882353 + objectReference: {fileID: 0} + - target: {fileID: 6425377980552986654, guid: 1936c8ca610b0472baddc2c56969a641, type: 3} + propertyPath: m_fontColor.g + value: 0.9882353 + objectReference: {fileID: 0} + - target: {fileID: 6425377980552986654, guid: 1936c8ca610b0472baddc2c56969a641, type: 3} + propertyPath: m_fontColor.r + value: 0.9882353 + objectReference: {fileID: 0} - target: {fileID: 6425377980552986654, guid: 1936c8ca610b0472baddc2c56969a641, type: 3} propertyPath: m_fontSizeBase value: 18 @@ -6896,12 +6042,16 @@ PrefabInstance: objectReference: {fileID: 735423033564544980, guid: 96ae0a2159a39234f858ea23bdcc74ad, type: 2} - target: {fileID: 6425377980552986654, guid: 1936c8ca610b0472baddc2c56969a641, type: 3} propertyPath: m_fontColor32.rgba - value: 4294967295 + value: 4294769916 objectReference: {fileID: 0} - target: {fileID: 6425377980552986654, guid: 1936c8ca610b0472baddc2c56969a641, type: 3} propertyPath: m_VerticalAlignment value: 512 objectReference: {fileID: 0} + - target: {fileID: 6425377980552986654, guid: 1936c8ca610b0472baddc2c56969a641, type: 3} + propertyPath: m_HorizontalAlignment + value: 1 + objectReference: {fileID: 0} - target: {fileID: 6425377980552986654, guid: 1936c8ca610b0472baddc2c56969a641, type: 3} propertyPath: m_hasFontAssetChanged value: 0 @@ -6912,7 +6062,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7145261904875040787, guid: 1936c8ca610b0472baddc2c56969a641, type: 3} propertyPath: m_SizeDelta.x - value: 106.5 + value: 152 objectReference: {fileID: 0} - target: {fileID: 7145261904875040787, guid: 1936c8ca610b0472baddc2c56969a641, type: 3} propertyPath: m_SizeDelta.y @@ -6920,7 +6070,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7145261904875040787, guid: 1936c8ca610b0472baddc2c56969a641, type: 3} propertyPath: m_AnchoredPosition.x - value: -0.30000305 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7145261904875040787, guid: 1936c8ca610b0472baddc2c56969a641, type: 3} propertyPath: m_AnchoredPosition.y @@ -6929,18 +6079,18 @@ PrefabInstance: - target: {fileID: 7260612469130449532, guid: 1936c8ca610b0472baddc2c56969a641, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: d3ecf27700ecf44369a10807f899b558, type: 3} + objectReference: {fileID: 21300000, guid: fbd8ab1095b184feb89e2963e0d53d6b, type: 3} - target: {fileID: 7260612469130449532, guid: 1936c8ca610b0472baddc2c56969a641, type: 3} propertyPath: m_Color.b - value: 1 + value: 0.09411765 objectReference: {fileID: 0} - target: {fileID: 7260612469130449532, guid: 1936c8ca610b0472baddc2c56969a641, type: 3} propertyPath: m_Color.g - value: 1 + value: 0.08235294 objectReference: {fileID: 0} - target: {fileID: 7260612469130449532, guid: 1936c8ca610b0472baddc2c56969a641, type: 3} propertyPath: m_Color.r - value: 1 + value: 0.08627451 objectReference: {fileID: 0} - target: {fileID: 8502093406828841120, guid: 1936c8ca610b0472baddc2c56969a641, type: 3} propertyPath: m_PixelsPerUnitMultiplier @@ -6994,123 +6144,13 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 4755743825679548413, guid: 1936c8ca610b0472baddc2c56969a641, type: 3} m_PrefabInstance: {fileID: 8489222753318951141} m_PrefabAsset: {fileID: 0} ---- !u!1001 &8693853821454948428 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 5668916703579838269} - m_Modifications: - - target: {fileID: 4268960914579942832, guid: aabac5666448b4345a76347f94ea32a4, type: 3} - propertyPath: m_AnchoredPosition.y - value: -4.1 - objectReference: {fileID: 0} - - target: {fileID: 6252267455741274073, guid: aabac5666448b4345a76347f94ea32a4, type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 6252267455741274073, guid: aabac5666448b4345a76347f94ea32a4, type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 6252267455741274073, guid: aabac5666448b4345a76347f94ea32a4, type: 3} - propertyPath: m_RootOrder - value: -1 - objectReference: {fileID: 0} - - target: {fileID: 6252267455741274073, guid: aabac5666448b4345a76347f94ea32a4, type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6252267455741274073, guid: aabac5666448b4345a76347f94ea32a4, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6252267455741274073, guid: aabac5666448b4345a76347f94ea32a4, type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6252267455741274073, guid: aabac5666448b4345a76347f94ea32a4, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6252267455741274073, guid: aabac5666448b4345a76347f94ea32a4, type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6252267455741274073, guid: aabac5666448b4345a76347f94ea32a4, type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6252267455741274073, guid: aabac5666448b4345a76347f94ea32a4, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6252267455741274073, guid: aabac5666448b4345a76347f94ea32a4, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6252267455741274073, guid: aabac5666448b4345a76347f94ea32a4, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6252267455741274073, guid: aabac5666448b4345a76347f94ea32a4, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 6252267455741274073, guid: aabac5666448b4345a76347f94ea32a4, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6252267455741274073, guid: aabac5666448b4345a76347f94ea32a4, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6252267455741274073, guid: aabac5666448b4345a76347f94ea32a4, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6252267455741274073, guid: aabac5666448b4345a76347f94ea32a4, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6252267455741274073, guid: aabac5666448b4345a76347f94ea32a4, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6252267455741274073, guid: aabac5666448b4345a76347f94ea32a4, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6252267455741274073, guid: aabac5666448b4345a76347f94ea32a4, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6252267455741274073, guid: aabac5666448b4345a76347f94ea32a4, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6520438785063841496, guid: aabac5666448b4345a76347f94ea32a4, type: 3} - propertyPath: m_Name - value: BackpackItem (2) - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: aabac5666448b4345a76347f94ea32a4, type: 3} ---- !u!224 &3342306291187924885 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 6252267455741274073, guid: aabac5666448b4345a76347f94ea32a4, type: 3} - m_PrefabInstance: {fileID: 8693853821454948428} - m_PrefabAsset: {fileID: 0} --- !u!1001 &8765774390410030896 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 7207106866394599773} + m_TransformParent: {fileID: 5109493994691160880} m_Modifications: - target: {fileID: 1305929967901934283, guid: 9a3416ab3e1b9486ba48f239340e202d, type: 3} propertyPath: m_Name @@ -7139,7 +6179,7 @@ PrefabInstance: - target: {fileID: 4329488436158027747, guid: 9a3416ab3e1b9486ba48f239340e202d, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: d4b2c86b4415e43579f68810ac96e6bf, type: 3} + objectReference: {fileID: 21300000, guid: 81132a1626c0d43aabeeec2414a68945, type: 3} - target: {fileID: 6098108853264045617, guid: 9a3416ab3e1b9486ba48f239340e202d, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -7214,11 +6254,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6643278822725274409, guid: 9a3416ab3e1b9486ba48f239340e202d, type: 3} propertyPath: m_SizeDelta.x - value: 134 + value: 140 objectReference: {fileID: 0} - target: {fileID: 6643278822725274409, guid: 9a3416ab3e1b9486ba48f239340e202d, type: 3} propertyPath: m_SizeDelta.y - value: 78 + value: 80 objectReference: {fileID: 0} - target: {fileID: 6643278822725274409, guid: 9a3416ab3e1b9486ba48f239340e202d, type: 3} propertyPath: m_LocalPosition.x @@ -7250,11 +6290,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6643278822725274409, guid: 9a3416ab3e1b9486ba48f239340e202d, type: 3} propertyPath: m_AnchoredPosition.x - value: -472 + value: 78 objectReference: {fileID: 0} - target: {fileID: 6643278822725274409, guid: 9a3416ab3e1b9486ba48f239340e202d, type: 3} propertyPath: m_AnchoredPosition.y - value: 196 + value: 183 objectReference: {fileID: 0} - target: {fileID: 6643278822725274409, guid: 9a3416ab3e1b9486ba48f239340e202d, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -7270,7 +6310,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6822543606753027690, guid: 9a3416ab3e1b9486ba48f239340e202d, type: 3} propertyPath: k__BackingField - value: Facial Hair + value: Facial_Hair objectReference: {fileID: 0} - target: {fileID: 7495390461251039812, guid: 9a3416ab3e1b9486ba48f239340e202d, type: 3} propertyPath: m_AnchorMax.y @@ -7412,7 +6452,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1540264655622709600, guid: 1059933b1543f4e4c949327e8711addb, type: 3} propertyPath: m_SizeDelta.y - value: 860 + value: 870 objectReference: {fileID: 0} - target: {fileID: 1540264655622709600, guid: 1059933b1543f4e4c949327e8711addb, type: 3} propertyPath: m_LocalPosition.x @@ -7444,7 +6484,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1540264655622709600, guid: 1059933b1543f4e4c949327e8711addb, type: 3} propertyPath: m_AnchoredPosition.x - value: 502 + value: 486 objectReference: {fileID: 0} - target: {fileID: 1540264655622709600, guid: 1059933b1543f4e4c949327e8711addb, type: 3} propertyPath: m_AnchoredPosition.y @@ -7527,118 +6567,19 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1059933b1543f4e4c949327e8711addb, type: 3} +--- !u!114 &4264612748387217685 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 4687392140680425794, guid: 1059933b1543f4e4c949327e8711addb, type: 3} + m_PrefabInstance: {fileID: 8800601990679625815} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e72586a42cf441ff84e93576d0da1d6f, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!224 &8016999325524894007 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 1540264655622709600, guid: 1059933b1543f4e4c949327e8711addb, type: 3} m_PrefabInstance: {fileID: 8800601990679625815} m_PrefabAsset: {fileID: 0} ---- !u!1001 &9005200231751367173 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 5668916703579838269} - m_Modifications: - - target: {fileID: 4268960914579942832, guid: aabac5666448b4345a76347f94ea32a4, type: 3} - propertyPath: m_AnchoredPosition.y - value: -4.1 - objectReference: {fileID: 0} - - target: {fileID: 6252267455741274073, guid: aabac5666448b4345a76347f94ea32a4, type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 6252267455741274073, guid: aabac5666448b4345a76347f94ea32a4, type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 6252267455741274073, guid: aabac5666448b4345a76347f94ea32a4, type: 3} - propertyPath: m_RootOrder - value: -1 - objectReference: {fileID: 0} - - target: {fileID: 6252267455741274073, guid: aabac5666448b4345a76347f94ea32a4, type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6252267455741274073, guid: aabac5666448b4345a76347f94ea32a4, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6252267455741274073, guid: aabac5666448b4345a76347f94ea32a4, type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6252267455741274073, guid: aabac5666448b4345a76347f94ea32a4, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6252267455741274073, guid: aabac5666448b4345a76347f94ea32a4, type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6252267455741274073, guid: aabac5666448b4345a76347f94ea32a4, type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6252267455741274073, guid: aabac5666448b4345a76347f94ea32a4, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6252267455741274073, guid: aabac5666448b4345a76347f94ea32a4, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6252267455741274073, guid: aabac5666448b4345a76347f94ea32a4, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6252267455741274073, guid: aabac5666448b4345a76347f94ea32a4, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 6252267455741274073, guid: aabac5666448b4345a76347f94ea32a4, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6252267455741274073, guid: aabac5666448b4345a76347f94ea32a4, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6252267455741274073, guid: aabac5666448b4345a76347f94ea32a4, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6252267455741274073, guid: aabac5666448b4345a76347f94ea32a4, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6252267455741274073, guid: aabac5666448b4345a76347f94ea32a4, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6252267455741274073, guid: aabac5666448b4345a76347f94ea32a4, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6252267455741274073, guid: aabac5666448b4345a76347f94ea32a4, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6252267455741274073, guid: aabac5666448b4345a76347f94ea32a4, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6520438785063841496, guid: aabac5666448b4345a76347f94ea32a4, type: 3} - propertyPath: m_Name - value: BackpackItem (4) - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: aabac5666448b4345a76347f94ea32a4, type: 3} ---- !u!224 &3043414952116198876 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 6252267455741274073, guid: aabac5666448b4345a76347f94ea32a4, type: 3} - m_PrefabInstance: {fileID: 9005200231751367173} - m_PrefabAsset: {fileID: 0} diff --git a/Explorer/Assets/DCL/Backpack/Assets/BackpackItem.prefab b/Explorer/Assets/DCL/Backpack/Assets/BackpackItem.prefab index ff024ecc60..7f4d501c11 100644 --- a/Explorer/Assets/DCL/Backpack/Assets/BackpackItem.prefab +++ b/Explorer/Assets/DCL/Backpack/Assets/BackpackItem.prefab @@ -30,14 +30,14 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 4976251414861074398} + m_Father: {fileID: 950865159361347939} m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: -67.5} - m_SizeDelta: {x: 135, y: 135} - m_Pivot: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: -2} + m_SizeDelta: {x: 120, y: 120} + m_Pivot: {x: 0.5, y: 1} --- !u!222 &8864166673976470744 CanvasRenderer: m_ObjectHideFlags: 0 @@ -66,7 +66,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 8321a646ca8e441a5b6d8bed690a2aaf, type: 3} + m_Sprite: {fileID: 21300000, guid: f88ebb8cd1cd5487ca7c3f4d3e65e76a, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -88,7 +88,7 @@ GameObject: - component: {fileID: 6764027944692418098} - component: {fileID: 2506524606276384560} m_Layer: 5 - m_Name: Background + m_Name: RarityBackground m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -101,21 +101,20 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 333138263188514027} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 4976251414861074398} + - {fileID: 7889409019110968341} - {fileID: 3781053432531553793} - - {fileID: 5713694319271036370} - m_Father: {fileID: 6252267455741274073} + m_Father: {fileID: 9217950789451999232} m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: -72} - m_SizeDelta: {x: 138, y: 138} + m_AnchoredPosition: {x: 0, y: -66} + m_SizeDelta: {x: 126, y: 132} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6764027944692418098 CanvasRenderer: @@ -145,8 +144,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 12dd1efc4e826764f9b02be515a9a033, type: 3} - m_Type: 1 + m_Sprite: {fileID: 21300000, guid: 936dcf8cb7310472086027dcbdae26d5, type: 3} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -180,19 +179,19 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 493759110962425617} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 6252267455741274073} + m_Father: {fileID: 9217950789451999232} m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -50.6, y: -47.9} - m_SizeDelta: {x: 22, y: 22} - m_Pivot: {x: 0.5, y: 0.5} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 0, y: 7} + m_SizeDelta: {x: 140, y: 140} + m_Pivot: {x: 0.5, y: 1} --- !u!222 &4408605076595531238 CanvasRenderer: m_ObjectHideFlags: 0 @@ -214,15 +213,15 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 1, g: 0.45490196, b: 0.22352941, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 663f92e00a3514151ac5152a95a40dbe, type: 3} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: 08234f6b491d84966a3aa2f9d5ada40e, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -230,7 +229,7 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 + m_PixelsPerUnitMultiplier: 2.3 --- !u!1 &1072854971474814543 GameObject: m_ObjectHideFlags: 0 @@ -297,10 +296,10 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: INFO + m_text: UNEQUIP m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 35aa85d68d15435418848a03a2db81ec, type: 2} - m_sharedMaterial: {fileID: 1701868249614554837, guid: 35aa85d68d15435418848a03a2db81ec, type: 2} + m_fontAsset: {fileID: 11400000, guid: 96ae0a2159a39234f858ea23bdcc74ad, type: 2} + m_sharedMaterial: {fileID: 735423033564544980, guid: 96ae0a2159a39234f858ea23bdcc74ad, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -391,20 +390,20 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1986608288359508916} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 5513747933230997094} - {fileID: 6000237012502563033} - m_Father: {fileID: 6252267455741274073} + m_Father: {fileID: 9217950789451999232} m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0.1035, y: -91} - m_SizeDelta: {x: 142.9149, y: 182} + m_AnchoredPosition: {x: 0, y: -83.3} + m_SizeDelta: {x: 142, y: 184} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &788364879739633935 CanvasRenderer: @@ -435,84 +434,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_Sprite: {fileID: 21300000, guid: 55f9c2592118840fc9ced5692cced894, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!1 &2910721015929031450 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4976251414861074398} - - component: {fileID: 6408793238035031531} - - component: {fileID: 2613297841612905961} - m_Layer: 5 - m_Name: NFTRarityBackground - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4976251414861074398 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2910721015929031450} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 7889409019110968341} - m_Father: {fileID: 950865159361347939} - m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 1} - m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0.0000076293945, y: -72.077} - m_SizeDelta: {x: 138, y: 144.15} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &6408793238035031531 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2910721015929031450} - m_CullTransparentMesh: 1 ---- !u!114 &2613297841612905961 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2910721015929031450} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 667cd6c89f5994b68a0685338783b7c7, type: 3} - m_Type: 0 + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -520,7 +442,7 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 2 + m_PixelsPerUnitMultiplier: 2.3 --- !u!1 &2976920167002589955 GameObject: m_ObjectHideFlags: 0 @@ -558,8 +480,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: -69.3} - m_SizeDelta: {x: 135, y: 36} + m_AnchoredPosition: {x: 0, y: -64.7} + m_SizeDelta: {x: 126, y: 36} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1555910130211344231 CanvasRenderer: @@ -582,14 +504,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 1, g: 0.1764706, b: 0.33333334, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 4848194f7bc4d4e509d067d3160eadac, type: 3} + m_Sprite: {fileID: 21300000, guid: 12dd1efc4e826764f9b02be515a9a033, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -598,7 +520,7 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 2.6 + m_PixelsPerUnitMultiplier: 2.5 --- !u!114 &5929508676340867936 MonoBehaviour: m_ObjectHideFlags: 0 @@ -656,7 +578,7 @@ GameObject: - component: {fileID: 4070022229549417329} - component: {fileID: 8176514646182836153} m_Layer: 5 - m_Name: Info + m_Name: Unequip m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -680,8 +602,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: -69.3} - m_SizeDelta: {x: 135, y: 36} + m_AnchoredPosition: {x: 0, y: -64.7} + m_SizeDelta: {x: 126, y: 36} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &928645627875367714 CanvasRenderer: @@ -704,7 +626,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.08627451, g: 0.08235294, b: 0.09411765, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -720,7 +642,7 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 2.6 + m_PixelsPerUnitMultiplier: 2.5 --- !u!114 &8176514646182836153 MonoBehaviour: m_ObjectHideFlags: 0 @@ -742,10 +664,10 @@ MonoBehaviour: m_SelectOnRight: {fileID: 0} m_Transition: 1 m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} - m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_NormalColor: {r: 0.08627451, g: 0.08235294, b: 0.09411765, a: 1} + m_HighlightedColor: {r: 0.2627451, g: 0.2509804, b: 0.2901961, a: 1} + m_PressedColor: {r: 0, g: 0, b: 0, a: 1} + m_SelectedColor: {r: 0.08627451, g: 0.08235294, b: 0.09411765, a: 1} m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} m_ColorMultiplier: 1 m_FadeDuration: 0.1 @@ -790,18 +712,18 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4233702536937593491} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 6252267455741274073} + m_Father: {fileID: 9217950789451999232} m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: -72} - m_SizeDelta: {x: 142, y: 142} + m_AnchoredPosition: {x: 0, y: -63} + m_SizeDelta: {x: 140, y: 140} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3884758107803368326 CanvasRenderer: @@ -840,7 +762,7 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 2.5 + m_PixelsPerUnitMultiplier: 2.3 --- !u!1 &4686061970164223326 GameObject: m_ObjectHideFlags: 0 @@ -872,13 +794,14 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1747175833252397111} + - {fileID: 5713694319271036370} m_Father: {fileID: 950865159361347939} m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -42.3, y: 42.1} - m_SizeDelta: {x: 50, y: 50} + m_AnchoredPosition: {x: -38.6, y: 41.9} + m_SizeDelta: {x: 45, y: 45} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5933872870715121549 CanvasRenderer: @@ -947,10 +870,8 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 4352975541021420847} - - {fileID: 4718511162805314438} - - {fileID: 950865159361347939} - - {fileID: 8326074706031102082} + - {fileID: 9217950789451999232} + - {fileID: 7500074911859471348} m_Father: {fileID: 0} m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -971,11 +892,18 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: e5c19e81bb551482a9447e1bd4b09a5a, type: 3} m_Name: m_EditorClassIdentifier: + k__BackingField: k__BackingField: {fileID: 1986608288359508916} k__BackingField: {fileID: 4233702536937593491} k__BackingField: {fileID: 5929508676340867936} - k__BackingField: {fileID: 8176514646182836153} + k__BackingField: {fileID: 8176514646182836153} k__BackingField: {fileID: 493759110962425617} + k__BackingField: {fileID: 981060080954595276} + k__BackingField: {fileID: 1393358841813331306} + k__BackingField: {fileID: 2506524606276384560} + k__BackingField: {fileID: 1526146829364839132} + k__BackingField: {fileID: 8252342816705450076} + k__BackingField: {fileID: 8241648339715965561} --- !u!1 &7257904519296327889 GameObject: m_ObjectHideFlags: 0 @@ -1001,19 +929,19 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7257904519296327889} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 950865159361347939} + m_Father: {fileID: 3781053432531553793} m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -53.2, y: 54.8} - m_SizeDelta: {x: 18, y: 18} - m_Pivot: {x: 0.5, y: 0.5} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 4, y: -3} + m_SizeDelta: {x: 16, y: 16} + m_Pivot: {x: 0, y: 1} --- !u!222 &7002609433529367291 CanvasRenderer: m_ObjectHideFlags: 0 @@ -1042,7 +970,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: c006e0ed397034829a4b311fd25893fd, type: 3} + m_Sprite: {fileID: 21300000, guid: f88ebb8cd1cd5487ca7c3f4d3e65e76a, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1120,8 +1048,8 @@ MonoBehaviour: m_Calls: [] m_text: EQUIP m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 35aa85d68d15435418848a03a2db81ec, type: 2} - m_sharedMaterial: {fileID: 1701868249614554837, guid: 35aa85d68d15435418848a03a2db81ec, type: 2} + m_fontAsset: {fileID: 11400000, guid: 96ae0a2159a39234f858ea23bdcc74ad, type: 2} + m_sharedMaterial: {fileID: 735423033564544980, guid: 96ae0a2159a39234f858ea23bdcc74ad, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -1220,11 +1148,11 @@ RectTransform: m_Father: {fileID: 3781053432531553793} m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -5.800026, y: -3.500023} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0.000022888184, y: 0} m_SizeDelta: {x: 38.1171, y: 44.3536} - m_Pivot: {x: 0.5, y: 0.5} + m_Pivot: {x: 0, y: 0} --- !u!222 &529336640573032483 CanvasRenderer: m_ObjectHideFlags: 0 @@ -1263,3 +1191,184 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &8241648339715965561 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 9217950789451999232} + m_Layer: 5 + m_Name: FullBackpack + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &9217950789451999232 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8241648339715965561} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 4352975541021420847} + - {fileID: 4718511162805314438} + - {fileID: 950865159361347939} + - {fileID: 8326074706031102082} + m_Father: {fileID: 6252267455741274073} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 0, y: -69.08783} + m_SizeDelta: {x: 126, y: 126.1757} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!1001 &4799334382500403827 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 6252267455741274073} + m_Modifications: + - target: {fileID: 3066730706478737799, guid: 896b313ccb63b47999d8596c72449d6d, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3066730706478737799, guid: 896b313ccb63b47999d8596c72449d6d, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3066730706478737799, guid: 896b313ccb63b47999d8596c72449d6d, type: 3} + propertyPath: m_RootOrder + value: -1 + objectReference: {fileID: 0} + - target: {fileID: 3066730706478737799, guid: 896b313ccb63b47999d8596c72449d6d, type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3066730706478737799, guid: 896b313ccb63b47999d8596c72449d6d, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3066730706478737799, guid: 896b313ccb63b47999d8596c72449d6d, type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3066730706478737799, guid: 896b313ccb63b47999d8596c72449d6d, type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3066730706478737799, guid: 896b313ccb63b47999d8596c72449d6d, type: 3} + propertyPath: m_SizeDelta.x + value: 126 + objectReference: {fileID: 0} + - target: {fileID: 3066730706478737799, guid: 896b313ccb63b47999d8596c72449d6d, type: 3} + propertyPath: m_SizeDelta.y + value: 126.1757 + objectReference: {fileID: 0} + - target: {fileID: 3066730706478737799, guid: 896b313ccb63b47999d8596c72449d6d, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3066730706478737799, guid: 896b313ccb63b47999d8596c72449d6d, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3066730706478737799, guid: 896b313ccb63b47999d8596c72449d6d, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3066730706478737799, guid: 896b313ccb63b47999d8596c72449d6d, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3066730706478737799, guid: 896b313ccb63b47999d8596c72449d6d, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3066730706478737799, guid: 896b313ccb63b47999d8596c72449d6d, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3066730706478737799, guid: 896b313ccb63b47999d8596c72449d6d, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3066730706478737799, guid: 896b313ccb63b47999d8596c72449d6d, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3066730706478737799, guid: 896b313ccb63b47999d8596c72449d6d, type: 3} + propertyPath: m_AnchoredPosition.y + value: -69.08783 + objectReference: {fileID: 0} + - target: {fileID: 3066730706478737799, guid: 896b313ccb63b47999d8596c72449d6d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3066730706478737799, guid: 896b313ccb63b47999d8596c72449d6d, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3066730706478737799, guid: 896b313ccb63b47999d8596c72449d6d, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6647536690506209645, guid: 896b313ccb63b47999d8596c72449d6d, type: 3} + propertyPath: m_Name + value: EmptyLoading + objectReference: {fileID: 0} + - target: {fileID: 6647536690506209645, guid: 896b313ccb63b47999d8596c72449d6d, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8147157649779008060, guid: 896b313ccb63b47999d8596c72449d6d, type: 3} + propertyPath: m_SizeDelta.y + value: 132.18 + objectReference: {fileID: 0} + - target: {fileID: 8147157649779008060, guid: 896b313ccb63b47999d8596c72449d6d, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8147157649779008060, guid: 896b313ccb63b47999d8596c72449d6d, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8147157649779008060, guid: 896b313ccb63b47999d8596c72449d6d, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8147157649779008060, guid: 896b313ccb63b47999d8596c72449d6d, type: 3} + propertyPath: m_AnchoredPosition.y + value: -66.088 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 896b313ccb63b47999d8596c72449d6d, type: 3} +--- !u!224 &7500074911859471348 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 3066730706478737799, guid: 896b313ccb63b47999d8596c72449d6d, type: 3} + m_PrefabInstance: {fileID: 4799334382500403827} + m_PrefabAsset: {fileID: 0} +--- !u!114 &8252342816705450076 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: -5756551260522624465, guid: 896b313ccb63b47999d8596c72449d6d, type: 3} + m_PrefabInstance: {fileID: 4799334382500403827} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ff6d72cd75e9740bf8a28557b12e70c6, type: 3} + m_Name: + m_EditorClassIdentifier: diff --git a/Explorer/Assets/DCL/Backpack/Assets/ItemInfoPanel.prefab b/Explorer/Assets/DCL/Backpack/Assets/ItemInfoPanel.prefab index 4d291e9575..8539743a09 100644 --- a/Explorer/Assets/DCL/Backpack/Assets/ItemInfoPanel.prefab +++ b/Explorer/Assets/DCL/Backpack/Assets/ItemInfoPanel.prefab @@ -17,7 +17,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &4789004073261864206 RectTransform: m_ObjectHideFlags: 0 @@ -66,7 +66,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 90d262106259840f8aeaf1a330ea2b15, type: 3} + m_Sprite: {fileID: 21300000, guid: f88ebb8cd1cd5487ca7c3f4d3e65e76a, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -76,7 +76,7 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 2 ---- !u!1 &1833028484150230911 +--- !u!1 &1058562843373332334 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -84,51 +84,187 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 7376767685074431187} - - component: {fileID: 3158191833838955839} - - component: {fileID: 7970858988767248560} + - component: {fileID: 5156941556420765465} + - component: {fileID: 6159450177763853339} + - component: {fileID: 4581084684168573179} m_Layer: 5 - m_Name: NFTBackground + m_Name: Text (TMP) m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &7376767685074431187 +--- !u!224 &5156941556420765465 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1833028484150230911} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_GameObject: {fileID: 1058562843373332334} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 5615798955076248106} + m_Father: {fileID: 3686168644320475326} m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 364, y: 290} + m_SizeDelta: {x: 200, y: 50} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &3158191833838955839 +--- !u!222 &6159450177763853339 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1833028484150230911} + m_GameObject: {fileID: 1058562843373332334} m_CullTransparentMesh: 1 ---- !u!114 &7970858988767248560 +--- !u!114 &4581084684168573179 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1833028484150230911} + m_GameObject: {fileID: 1058562843373332334} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: No item selected + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 35aa85d68d15435418848a03a2db81ec, type: 2} + m_sharedMaterial: {fileID: 1701868249614554837, guid: 35aa85d68d15435418848a03a2db81ec, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 15 + m_fontSizeBase: 15 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &1432505136072087043 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3686168644320475326} + - component: {fileID: 3642825678303531663} + - component: {fileID: 110861851917175091} + m_Layer: 5 + m_Name: EmptyPanel + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3686168644320475326 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1432505136072087043} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 5156941556420765465} + m_Father: {fileID: 1540264655622709600} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 364, y: 870} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3642825678303531663 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1432505136072087043} + m_CullTransparentMesh: 1 +--- !u!114 &110861851917175091 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1432505136072087043} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} @@ -142,8 +278,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 0} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: 5f9c51f0c825d447185b63b89a239b5c, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -151,7 +287,7 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 2 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &2085111208438590683 GameObject: m_ObjectHideFlags: 0 @@ -186,11 +322,11 @@ RectTransform: m_Father: {fileID: 3237530911883049091} m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 182.04208, y: -14.525002} - m_SizeDelta: {x: 285.2842, y: 29.05} - m_Pivot: {x: 0.5, y: 0.5} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 40, y: 0} + m_SizeDelta: {x: 270, y: 30} + m_Pivot: {x: 0, y: 0.5} --- !u!222 &3604333138792044363 CanvasRenderer: m_ObjectHideFlags: 0 @@ -228,8 +364,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4279768342 - m_fontColor: {r: 0.08627451, g: 0.08235294, b: 0.09411765, a: 1} + rgba: 4294769916 + m_fontColor: {r: 0.9882353, g: 0.9882353, b: 0.9882353, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -264,7 +400,7 @@ MonoBehaviour: m_charWidthMaxAdj: 0 m_enableWordWrapping: 1 m_wordWrappingRatios: 0.4 - m_overflowMode: 0 + m_overflowMode: 1 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 @@ -341,10 +477,10 @@ RectTransform: m_Father: {fileID: 3181044828771526746} m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 326.7667, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 182, y: -77.18} + m_SizeDelta: {x: 320, y: 34.82} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6973193547918108981 CanvasRenderer: @@ -383,8 +519,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4286344049 - m_fontColor: {r: 0.44313726, g: 0.41960785, b: 0.4862745, a: 1} + rgba: 4294769916 + m_fontColor: {r: 0.9882353, g: 0.9882353, b: 0.9882353, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -474,12 +610,11 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 3237530911883049091} - - {fileID: 1239206714727570131} - {fileID: 7682545277126710052} - {fileID: 4266873868327725586} - {fileID: 1353920001928159203} - {fileID: 803283322832404018} - m_Father: {fileID: 1540264655622709600} + m_Father: {fileID: 2172900473627188024} m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -554,10 +689,10 @@ RectTransform: m_Father: {fileID: 3181044828771526746} m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 326.77, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 182, y: -177.31999} + m_SizeDelta: {x: 320, y: 77.46} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1843838769209449120 CanvasRenderer: @@ -597,8 +732,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4279768342 - m_fontColor: {r: 0.08627451, g: 0.08235294, b: 0.09411765, a: 1} + rgba: 4294769916 + m_fontColor: {r: 0.9882353, g: 0.9882353, b: 0.9882353, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -683,14 +818,14 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4661247009497475445} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 7376767685074431187} + - {fileID: 2066054231056124092} - {fileID: 4789004073261864206} - m_Father: {fileID: 1540264655622709600} + m_Father: {fileID: 2172900473627188024} m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -748,7 +883,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3} m_Name: m_EditorClassIdentifier: - m_ShowMaskGraphic: 1 + m_ShowMaskGraphic: 0 --- !u!1 &4807285289620279931 GameObject: m_ObjectHideFlags: 0 @@ -783,10 +918,10 @@ RectTransform: m_Father: {fileID: 3181044828771526746} m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 326.77, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 182, y: -120.59} + m_SizeDelta: {x: 320, y: 20} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7853505819621227998 CanvasRenderer: @@ -825,8 +960,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4286344049 - m_fontColor: {r: 0.44313726, g: 0.41960785, b: 0.4862745, a: 1} + rgba: 4294769916 + m_fontColor: {r: 0.9882353, g: 0.9882353, b: 0.9882353, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -905,7 +1040,7 @@ MonoBehaviour: m_FlexibleWidth: -1 m_FlexibleHeight: -1 m_LayoutPriority: 1 ---- !u!1 &5720210577099208109 +--- !u!1 &5337124909112307158 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -913,55 +1048,56 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1239206714727570131} - - component: {fileID: 6848607529303908690} - - component: {fileID: 3121498563796043484} - - component: {fileID: 4853625982785650965} + - component: {fileID: 2172900473627188024} + - component: {fileID: 3560674202152212673} + - component: {fileID: 1865890770055487935} m_Layer: 5 - m_Name: CreatedBy + m_Name: FullPanel m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1239206714727570131 + m_IsActive: 0 +--- !u!224 &2172900473627188024 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5720210577099208109} + m_GameObject: {fileID: 5337124909112307158} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 3181044828771526746} + m_Children: + - {fileID: 5615798955076248106} + - {fileID: 3181044828771526746} + m_Father: {fileID: 1540264655622709600} m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 364, y: 0} + m_SizeDelta: {x: 364, y: 870} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &6848607529303908690 +--- !u!222 &3560674202152212673 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5720210577099208109} + m_GameObject: {fileID: 5337124909112307158} m_CullTransparentMesh: 1 ---- !u!114 &3121498563796043484 +--- !u!114 &1865890770055487935 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5720210577099208109} + m_GameObject: {fileID: 5337124909112307158} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} @@ -972,95 +1108,16 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: created by Creator - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 96ae0a2159a39234f858ea23bdcc74ad, type: 2} - m_sharedMaterial: {fileID: 735423033564544980, guid: 96ae0a2159a39234f858ea23bdcc74ad, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4279768342 - m_fontColor: {r: 0.08627451, g: 0.08235294, b: 0.09411765, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 15 - m_fontSizeBase: 15 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 72 - m_fontStyle: 0 - m_HorizontalAlignment: 1 - m_VerticalAlignment: 256 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!114 &4853625982785650965 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5720210577099208109} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3} - m_Name: - m_EditorClassIdentifier: - m_IgnoreLayout: 0 - m_MinWidth: -1 - m_MinHeight: 20 - m_PreferredWidth: -1 - m_PreferredHeight: -1 - m_FlexibleWidth: -1 - m_FlexibleHeight: -1 - m_LayoutPriority: 1 + m_Sprite: {fileID: 21300000, guid: 984f8e02caec845c7b41c3baeef24b92, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &6660455497904927832 GameObject: m_ObjectHideFlags: 0 @@ -1073,7 +1130,7 @@ GameObject: - component: {fileID: 6976949258744048468} - component: {fileID: 5700207190427280376} m_Layer: 5 - m_Name: ItemIcon + m_Name: CategoryIcon m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -1094,11 +1151,11 @@ RectTransform: m_Father: {fileID: 3237530911883049091} m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 17, y: -13.5} - m_SizeDelta: {x: 28, y: 30} - m_Pivot: {x: 0.5, y: 0.5} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 28, y: 28} + m_Pivot: {x: 0, y: 0.5} --- !u!222 &6976949258744048468 CanvasRenderer: m_ObjectHideFlags: 0 @@ -1120,14 +1177,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.08627451, g: 0.08235294, b: 0.09411765, a: 1} + m_Color: {r: 0.9882353, g: 0.9882353, b: 0.9882353, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 8321a646ca8e441a5b6d8bed690a2aaf, type: 3} + m_Sprite: {fileID: 21300000, guid: f88ebb8cd1cd5487ca7c3f4d3e65e76a, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1170,10 +1227,10 @@ RectTransform: m_Father: {fileID: 3181044828771526746} m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 316, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 182, y: -102.59} + m_SizeDelta: {x: 320, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1929902718273756381 CanvasRenderer: @@ -1217,7 +1274,7 @@ GameObject: m_Component: - component: {fileID: 1540264655622709600} - component: {fileID: 3293864979209351639} - - component: {fileID: 4187698545446770879} + - component: {fileID: 4687392140680425794} m_Layer: 5 m_Name: ItemInfoPanel m_TagString: Untagged @@ -1237,8 +1294,8 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 5615798955076248106} - - {fileID: 3181044828771526746} + - {fileID: 3686168644320475326} + - {fileID: 2172900473627188024} m_Father: {fileID: 0} m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1255,7 +1312,7 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7034571882556146322} m_CullTransparentMesh: 1 ---- !u!114 &4187698545446770879 +--- !u!114 &4687392140680425794 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1264,27 +1321,17 @@ MonoBehaviour: m_GameObject: {fileID: 7034571882556146322} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Script: {fileID: 11500000, guid: e72586a42cf441ff84e93576d0da1d6f, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 12dd1efc4e826764f9b02be515a9a033, type: 3} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 2 + k__BackingField: {fileID: 1432505136072087043} + k__BackingField: {fileID: 5337124909112307158} + k__BackingField: {fileID: 6761031925246617703} + k__BackingField: {fileID: 5700207190427280376} + k__BackingField: {fileID: 3239992010578180074} + k__BackingField: {fileID: 1865890770055487935} + k__BackingField: {fileID: 5428682008549936836} + k__BackingField: {fileID: 5818285717481497885} --- !u!1 &9106849854819600615 GameObject: m_ObjectHideFlags: 0 @@ -1295,7 +1342,6 @@ GameObject: m_Component: - component: {fileID: 3237530911883049091} - component: {fileID: 9084722218786637228} - - component: {fileID: 4718405251677846175} - component: {fileID: 5538414579952249879} m_Layer: 5 m_Name: ItemHeader @@ -1321,10 +1367,10 @@ RectTransform: m_Father: {fileID: 3181044828771526746} m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 300, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 172, y: -35.885002} + m_SizeDelta: {x: 300, y: 31.77} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &9084722218786637228 CanvasRenderer: @@ -1334,36 +1380,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 9106849854819600615} m_CullTransparentMesh: 1 ---- !u!114 &4718405251677846175 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9106849854819600615} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 0} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 --- !u!114 &5538414579952249879 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1384,3 +1400,114 @@ MonoBehaviour: m_FlexibleWidth: -1 m_FlexibleHeight: -1 m_LayoutPriority: 1 +--- !u!1001 &909031734711447907 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 5615798955076248106} + m_Modifications: + - target: {fileID: 1166888513132788191, guid: d565b61885fb1ef41b1582a285e748e9, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1166888513132788191, guid: d565b61885fb1ef41b1582a285e748e9, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1166888513132788191, guid: d565b61885fb1ef41b1582a285e748e9, type: 3} + propertyPath: m_RootOrder + value: -1 + objectReference: {fileID: 0} + - target: {fileID: 1166888513132788191, guid: d565b61885fb1ef41b1582a285e748e9, type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1166888513132788191, guid: d565b61885fb1ef41b1582a285e748e9, type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1166888513132788191, guid: d565b61885fb1ef41b1582a285e748e9, type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1166888513132788191, guid: d565b61885fb1ef41b1582a285e748e9, type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1166888513132788191, guid: d565b61885fb1ef41b1582a285e748e9, type: 3} + propertyPath: m_SizeDelta.x + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 1166888513132788191, guid: d565b61885fb1ef41b1582a285e748e9, type: 3} + propertyPath: m_SizeDelta.y + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 1166888513132788191, guid: d565b61885fb1ef41b1582a285e748e9, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1166888513132788191, guid: d565b61885fb1ef41b1582a285e748e9, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1166888513132788191, guid: d565b61885fb1ef41b1582a285e748e9, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1166888513132788191, guid: d565b61885fb1ef41b1582a285e748e9, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1166888513132788191, guid: d565b61885fb1ef41b1582a285e748e9, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1166888513132788191, guid: d565b61885fb1ef41b1582a285e748e9, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1166888513132788191, guid: d565b61885fb1ef41b1582a285e748e9, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1166888513132788191, guid: d565b61885fb1ef41b1582a285e748e9, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1166888513132788191, guid: d565b61885fb1ef41b1582a285e748e9, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1166888513132788191, guid: d565b61885fb1ef41b1582a285e748e9, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1166888513132788191, guid: d565b61885fb1ef41b1582a285e748e9, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1166888513132788191, guid: d565b61885fb1ef41b1582a285e748e9, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: -336.96002 + objectReference: {fileID: 0} + - target: {fileID: 2336035712942851721, guid: d565b61885fb1ef41b1582a285e748e9, type: 3} + propertyPath: m_Name + value: LoadingSpinner + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: d565b61885fb1ef41b1582a285e748e9, type: 3} +--- !u!224 &2066054231056124092 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 1166888513132788191, guid: d565b61885fb1ef41b1582a285e748e9, type: 3} + m_PrefabInstance: {fileID: 909031734711447907} + m_PrefabAsset: {fileID: 0} +--- !u!1 &3239992010578180074 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 2336035712942851721, guid: d565b61885fb1ef41b1582a285e748e9, type: 3} + m_PrefabInstance: {fileID: 909031734711447907} + m_PrefabAsset: {fileID: 0} diff --git a/Explorer/Assets/DCL/Backpack/AvatarController.cs b/Explorer/Assets/DCL/Backpack/AvatarController.cs index dee37227e2..1a35834b0a 100644 --- a/Explorer/Assets/DCL/Backpack/AvatarController.cs +++ b/Explorer/Assets/DCL/Backpack/AvatarController.cs @@ -1,37 +1,69 @@ +using Arch.Core; +using Arch.SystemGroups; +using Cysharp.Threading.Tasks; +using DCL.AssetsProvision; +using DCL.Backpack.BackpackBus; using DCL.UI; +using DCL.Web3Authentication.Identities; +using System; +using System.Threading; using UnityEngine; namespace DCL.Backpack { - public class AvatarController : ISection + public class AvatarController : ISection, IDisposable { private readonly RectTransform rectTransform; private readonly AvatarView view; private readonly BackpackSlotsController slotsController; - private readonly NftTypeIconSO rarityBackgrounds; - private readonly NftTypeIconSO categoryIcons; - private readonly NFTColorsSO rarityColors; + private readonly BackpackGridController backpackGridController; + private readonly BackpackInfoPanelController backpackInfoPanelController; public AvatarController(AvatarView view, AvatarSlotView[] slotViews, NftTypeIconSO rarityBackgrounds, + NftTypeIconSO rarityInfoPanelBackgrounds, NftTypeIconSO categoryIcons, - NFTColorsSO rarityColors) + NFTColorsSO rarityColors, + BackpackCommandBus backpackCommandBus, + BackpackEventBus backpackEventBus, + IWeb3IdentityCache web3IdentityCache, + IBackpackEquipStatusController backpackEquipStatusController) { this.view = view; - this.rarityBackgrounds = rarityBackgrounds; - this.categoryIcons = categoryIcons; - this.rarityColors = rarityColors; - slotsController = new BackpackSlotsController(slotViews); + slotsController = new BackpackSlotsController(slotViews, backpackCommandBus, backpackEventBus, rarityBackgrounds); + backpackGridController = new BackpackGridController(view.backpackGridView, backpackCommandBus, backpackEventBus, web3IdentityCache, rarityBackgrounds, rarityColors, categoryIcons, backpackEquipStatusController); + backpackInfoPanelController = new BackpackInfoPanelController(view.backpackInfoPanelView, backpackEventBus, categoryIcons, rarityInfoPanelBackgrounds); rectTransform = view.GetComponent(); } - public void Activate() { } + public async UniTask InitialiseAssetsAsync(IAssetsProvisioner assetsProvisioner, CancellationToken ct) => + await backpackGridController.InitialiseAssetsAsync(assetsProvisioner, ct); + + public void InjectToWorld(ref ArchSystemsWorldBuilder builder, in Entity playerEntity) + { + backpackGridController.InjectToWorld(ref builder, playerEntity); + } + + public void RequestInitialWearablesPage() + { + backpackGridController.RequestPage(0); + } + + public void Activate() + { + } public void Deactivate() { } public RectTransform GetRectTransform() => rectTransform; + + public void Dispose() + { + slotsController?.Dispose(); + backpackInfoPanelController?.Dispose(); + } } } diff --git a/Explorer/Assets/DCL/Backpack/AvatarSlotView.cs b/Explorer/Assets/DCL/Backpack/AvatarSlotView.cs index 83c8fffad3..b68d52b5fd 100644 --- a/Explorer/Assets/DCL/Backpack/AvatarSlotView.cs +++ b/Explorer/Assets/DCL/Backpack/AvatarSlotView.cs @@ -1,3 +1,4 @@ +using DCL.UI; using DG.Tweening; using System; using TMPro; @@ -30,9 +31,30 @@ public class AvatarSlotView : MonoBehaviour, IPointerEnterHandler, IPointerExitH [field: SerializeField] public Button UnequipButton { get; private set; } + [field: SerializeField] + public Button OverrideHide { get; private set; } + + [field: SerializeField] + public Button NoOverride { get; private set; } + [field: SerializeField] public TMP_Text CategoryText { get; private set; } + [field: SerializeField] + public string SlotWearableUrn { get; set; } + + [field: SerializeField] + public Image SlotWearableThumbnail { get; set; } + + [field: SerializeField] + public Image SlotWearableRarityBackground { get; set; } + + [field: SerializeField] + public LoadingBrightView LoadingView { get; private set; } + + [field: SerializeField] + public GameObject NftContainer { get; private set; } + public void Start() { CategoryText.text = Category; @@ -49,12 +71,14 @@ public void OnPointerEnter(PointerEventData eventData) { HoverTootlip.SetActive(true); focusedImage.enabled = true; + UnequipButton.gameObject.SetActive(!string.IsNullOrEmpty(SlotWearableUrn)); ScaleUpAnimation(focusedImage.transform); } public void OnPointerExit(PointerEventData eventData) { HoverTootlip.SetActive(false); + UnequipButton.gameObject.SetActive(false); focusedImage.enabled = false; } diff --git a/Explorer/Assets/DCL/Backpack/AvatarView.cs b/Explorer/Assets/DCL/Backpack/AvatarView.cs index 7ab0a16f69..4b3650900c 100644 --- a/Explorer/Assets/DCL/Backpack/AvatarView.cs +++ b/Explorer/Assets/DCL/Backpack/AvatarView.cs @@ -2,5 +2,12 @@ namespace DCL.Backpack { - public class AvatarView : MonoBehaviour { } + public class AvatarView : MonoBehaviour + { + [field: SerializeField] + internal BackpackGridView backpackGridView { get; private set; } + + [field: SerializeField] + internal BackpackInfoPanelView backpackInfoPanelView { get; private set; } + } } diff --git a/Explorer/Assets/DCL/Backpack/Backpack.asmdef b/Explorer/Assets/DCL/Backpack/Backpack.asmdef index aa45bdab35..9d9f6d6c21 100644 --- a/Explorer/Assets/DCL/Backpack/Backpack.asmdef +++ b/Explorer/Assets/DCL/Backpack/Backpack.asmdef @@ -6,7 +6,15 @@ "GUID:fa7b3fdbb04d67549916da7bd2af58ab", "GUID:6055be8ebefd69e48b49212b09b47b2f", "GUID:f51ebe6a0ceec4240a699833d6309b23", - "GUID:9e24947de15b9834991c9d8411ea37cf" + "GUID:9e24947de15b9834991c9d8411ea37cf", + "GUID:5eabe9a3d4dd19d42a16208ea5411062", + "GUID:9e314663ce958b746873cb22d57ede55", + "GUID:e56a0d6a94c144c784012e63b6043100", + "GUID:4794e238ed0f65142a4aea5848b513e5", + "GUID:8322ea9340a544c59ddc56d4793eac74", + "GUID:275e22790c04e9b47a5085d7b0c4432a", + "GUID:d0ec51c740809fd4680d3ea27279dca7", + "GUID:5ab29fa8ae5769b49ab29e390caca7a4" ], "includePlatforms": [], "excludePlatforms": [], diff --git a/Explorer/Assets/DCL/Backpack/BackpackBus.meta b/Explorer/Assets/DCL/Backpack/BackpackBus.meta new file mode 100644 index 0000000000..3d465e6533 --- /dev/null +++ b/Explorer/Assets/DCL/Backpack/BackpackBus.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: f7d6fdab6e9c4b6386e39e7017262ce6 +timeCreated: 1702975376 \ No newline at end of file diff --git a/Explorer/Assets/DCL/Backpack/BackpackBus/BackpackBusController.cs b/Explorer/Assets/DCL/Backpack/BackpackBus/BackpackBusController.cs new file mode 100644 index 0000000000..f623784559 --- /dev/null +++ b/Explorer/Assets/DCL/Backpack/BackpackBus/BackpackBusController.cs @@ -0,0 +1,67 @@ +using DCL.AvatarRendering.Wearables.Components; +using DCL.AvatarRendering.Wearables.Helpers; +using System; + +namespace DCL.Backpack.BackpackBus +{ + public class BackpackBusController : IDisposable + { + private readonly IWearableCatalog wearableCatalog; + private readonly IBackpackEventBus backpackEventBus; + private readonly IBackpackCommandBus backpackCommandBus; + private readonly IBackpackEquipStatusController backpackEquipStatusController; + + public BackpackBusController( + IWearableCatalog wearableCatalog, + IBackpackEventBus backpackEventBus, + IBackpackCommandBus backpackCommandBus, + IBackpackEquipStatusController backpackEquipStatusController) + { + this.wearableCatalog = wearableCatalog; + this.backpackEventBus = backpackEventBus; + this.backpackCommandBus = backpackCommandBus; + this.backpackEquipStatusController = backpackEquipStatusController; + + this.backpackCommandBus.OnEquipMessageReceived += HandleEquipCommand; + this.backpackCommandBus.OnUnEquipMessageReceived += HandleUnEquipCommand; + this.backpackCommandBus.OnHideMessageReceived += HandleHideCommand; + this.backpackCommandBus.OnSelectMessageReceived += HandleSelectCommand; + } + + private void HandleSelectCommand(BackpackSelectCommand command) + { + if (wearableCatalog.TryGetWearable(command.Id, out IWearable wearable)) + backpackEventBus.SendSelect(wearable); + } + + private void HandleEquipCommand(BackpackEquipCommand command) + { + wearableCatalog.TryGetWearable(command.Id, out IWearable wearable); + string category = wearable?.GetCategory(); + + if (category == null) + return; + + if (backpackEquipStatusController.GetEquippedWearableForCategory(category) != null) + backpackEventBus.SendUnEquip(backpackEquipStatusController.GetEquippedWearableForCategory(category)); + + backpackEventBus.SendEquip(wearable); + } + + private void HandleUnEquipCommand(BackpackUnEquipCommand command) + { + if (wearableCatalog.TryGetWearable(command.Id, out IWearable wearable)) + backpackEventBus.SendUnEquip(wearable); + } + + private void HandleHideCommand(BackpackHideCommand command) { } + + public void Dispose() + { + backpackCommandBus.OnEquipMessageReceived -= HandleEquipCommand; + backpackCommandBus.OnUnEquipMessageReceived -= HandleUnEquipCommand; + backpackCommandBus.OnHideMessageReceived -= HandleHideCommand; + backpackCommandBus.OnSelectMessageReceived -= HandleSelectCommand; + } + } +} diff --git a/Explorer/Assets/DCL/Backpack/BackpackBus/BackpackBusController.cs.meta b/Explorer/Assets/DCL/Backpack/BackpackBus/BackpackBusController.cs.meta new file mode 100644 index 0000000000..9dee589549 --- /dev/null +++ b/Explorer/Assets/DCL/Backpack/BackpackBus/BackpackBusController.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: e1d939f422854ac39a4caebc25d3fd73 +timeCreated: 1702975392 \ No newline at end of file diff --git a/Explorer/Assets/DCL/Backpack/BackpackBus/BackpackCommand.cs b/Explorer/Assets/DCL/Backpack/BackpackBus/BackpackCommand.cs new file mode 100644 index 0000000000..289f932573 --- /dev/null +++ b/Explorer/Assets/DCL/Backpack/BackpackBus/BackpackCommand.cs @@ -0,0 +1,44 @@ +namespace DCL.Backpack.BackpackBus +{ + public readonly struct BackpackEquipCommand + { + public readonly string Id; + + public BackpackEquipCommand(string id) + { + Id = id; + } + } + + public readonly struct BackpackUnEquipCommand + { + public readonly string Id; + + public BackpackUnEquipCommand(string id) + { + Id = id; + } + } + + public readonly struct BackpackSelectCommand + { + public readonly string Id; + + public BackpackSelectCommand(string id) + { + Id = id; + } + } + + public readonly struct BackpackHideCommand + { + public readonly string Category; + public readonly bool? IsHidden; + + public BackpackHideCommand(string category, bool? isHidden) + { + Category = category; + IsHidden = isHidden; + } + } +} diff --git a/Explorer/Assets/DCL/Backpack/BackpackBus/BackpackCommand.cs.meta b/Explorer/Assets/DCL/Backpack/BackpackBus/BackpackCommand.cs.meta new file mode 100644 index 0000000000..0634d5414b --- /dev/null +++ b/Explorer/Assets/DCL/Backpack/BackpackBus/BackpackCommand.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: cbe8fa50bf4c48f0bc4f2445a0c8d1c1 +timeCreated: 1702976839 \ No newline at end of file diff --git a/Explorer/Assets/DCL/Backpack/BackpackBus/BackpackCommandBus.cs b/Explorer/Assets/DCL/Backpack/BackpackBus/BackpackCommandBus.cs new file mode 100644 index 0000000000..c8eb9b354c --- /dev/null +++ b/Explorer/Assets/DCL/Backpack/BackpackBus/BackpackCommandBus.cs @@ -0,0 +1,33 @@ +using DCL.UI; +using System; + +namespace DCL.Backpack.BackpackBus +{ + public class BackpackCommandBus : IBackpackCommandBus + { + public event Action OnEquipMessageReceived; + public event Action OnUnEquipMessageReceived; + public event Action OnSelectMessageReceived; + public event Action OnHideMessageReceived; + + public void SendCommand(BackpackEquipCommand command) + { + OnEquipMessageReceived?.Invoke(command); + } + + public void SendCommand(BackpackUnEquipCommand command) + { + OnUnEquipMessageReceived?.Invoke(command); + } + + public void SendCommand(BackpackSelectCommand command) + { + OnSelectMessageReceived?.Invoke(command); + } + + public void SendCommand(BackpackHideCommand command) + { + OnHideMessageReceived?.Invoke(command); + } + } +} diff --git a/Explorer/Assets/DCL/Backpack/BackpackBus/BackpackCommandBus.cs.meta b/Explorer/Assets/DCL/Backpack/BackpackBus/BackpackCommandBus.cs.meta new file mode 100644 index 0000000000..9d30ad35f1 --- /dev/null +++ b/Explorer/Assets/DCL/Backpack/BackpackBus/BackpackCommandBus.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: f0eb087d27b14e9790625dba24495bb4 +timeCreated: 1703005997 \ No newline at end of file diff --git a/Explorer/Assets/DCL/Backpack/BackpackBus/BackpackEventBus.cs b/Explorer/Assets/DCL/Backpack/BackpackBus/BackpackEventBus.cs new file mode 100644 index 0000000000..b1a63edc39 --- /dev/null +++ b/Explorer/Assets/DCL/Backpack/BackpackBus/BackpackEventBus.cs @@ -0,0 +1,25 @@ +using DCL.AvatarRendering.Wearables.Components; +using System; + +namespace DCL.Backpack.BackpackBus +{ + public class BackpackEventBus : IBackpackEventBus + { + public event Action SelectEvent; + public event Action EquipEvent; + public event Action UnEquipEvent; + public event Action HideEvent; + + public void SendSelect(IWearable equipWearable) => + SelectEvent?.Invoke(equipWearable); + + public void SendEquip(IWearable equipWearable) => + EquipEvent?.Invoke(equipWearable); + + public void SendUnEquip(IWearable unEquipWearable) => + UnEquipEvent?.Invoke(unEquipWearable); + + public void SendHide(string[] hideWearableCategories) => + HideEvent?.Invoke(hideWearableCategories); + } +} diff --git a/Explorer/Assets/DCL/Backpack/BackpackBus/BackpackEventBus.cs.meta b/Explorer/Assets/DCL/Backpack/BackpackBus/BackpackEventBus.cs.meta new file mode 100644 index 0000000000..a5b5dc8d3c --- /dev/null +++ b/Explorer/Assets/DCL/Backpack/BackpackBus/BackpackEventBus.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 7540ae0ebfa84fbc855b84924b0ea630 +timeCreated: 1703005050 \ No newline at end of file diff --git a/Explorer/Assets/DCL/Backpack/BackpackBus/IBackpackCommandBus.cs b/Explorer/Assets/DCL/Backpack/BackpackBus/IBackpackCommandBus.cs new file mode 100644 index 0000000000..fef5cef221 --- /dev/null +++ b/Explorer/Assets/DCL/Backpack/BackpackBus/IBackpackCommandBus.cs @@ -0,0 +1,17 @@ +using System; + +namespace DCL.Backpack.BackpackBus +{ + public interface IBackpackCommandBus + { + public event Action OnEquipMessageReceived; + public event Action OnUnEquipMessageReceived; + public event Action OnSelectMessageReceived; + public event Action OnHideMessageReceived; + + void SendCommand(BackpackEquipCommand command); + void SendCommand(BackpackUnEquipCommand command); + void SendCommand(BackpackSelectCommand command); + void SendCommand(BackpackHideCommand command); + } +} diff --git a/Explorer/Assets/DCL/Backpack/BackpackBus/IBackpackCommandBus.cs.meta b/Explorer/Assets/DCL/Backpack/BackpackBus/IBackpackCommandBus.cs.meta new file mode 100644 index 0000000000..f2943f6374 --- /dev/null +++ b/Explorer/Assets/DCL/Backpack/BackpackBus/IBackpackCommandBus.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 87e109f345bc43738a650ac9cc73e562 +timeCreated: 1702976088 \ No newline at end of file diff --git a/Explorer/Assets/DCL/Backpack/BackpackBus/IBackpackEventBus.cs b/Explorer/Assets/DCL/Backpack/BackpackBus/IBackpackEventBus.cs new file mode 100644 index 0000000000..74b8e124ba --- /dev/null +++ b/Explorer/Assets/DCL/Backpack/BackpackBus/IBackpackEventBus.cs @@ -0,0 +1,18 @@ +using DCL.AvatarRendering.Wearables.Components; +using System; + +namespace DCL.Backpack.BackpackBus +{ + public interface IBackpackEventBus + { + public event Action SelectEvent; + public event Action EquipEvent; + public event Action UnEquipEvent; + public event Action HideEvent; + + public void SendSelect(IWearable equipWearable); + public void SendEquip(IWearable equipWearable); + public void SendUnEquip(IWearable unEquipWearable); + public void SendHide(string[] hideWearableCategories); + } +} diff --git a/Explorer/Assets/DCL/Backpack/BackpackBus/IBackpackEventBus.cs.meta b/Explorer/Assets/DCL/Backpack/BackpackBus/IBackpackEventBus.cs.meta new file mode 100644 index 0000000000..611ed07242 --- /dev/null +++ b/Explorer/Assets/DCL/Backpack/BackpackBus/IBackpackEventBus.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: fce3e4f603b04e3cb0e85a4df1598410 +timeCreated: 1702976074 \ No newline at end of file diff --git a/Explorer/Assets/DCL/Backpack/BackpackControler.cs b/Explorer/Assets/DCL/Backpack/BackpackControler.cs index d3d78a2cf2..176352249b 100644 --- a/Explorer/Assets/DCL/Backpack/BackpackControler.cs +++ b/Explorer/Assets/DCL/Backpack/BackpackControler.cs @@ -1,4 +1,16 @@ +using Arch.Core; +using Arch.SystemGroups; +using CommunicationData.URLHelpers; +using Cysharp.Threading.Tasks; +using DCL.AssetsProvision; +using DCL.AvatarRendering.AvatarShape.Components; +using DCL.AvatarRendering.Wearables.Helpers; +using DCL.Backpack.BackpackBus; +using DCL.Profiles; using DCL.UI; +using DCL.Web3Authentication.Identities; +using ECS.StreamableLoading.Common; +using System; using System.Collections.Generic; using System.Threading; using UnityEngine; @@ -6,24 +18,49 @@ namespace DCL.Backpack { - public class BackpackControler : ISection + public class BackpackControler : ISection, IDisposable { private readonly BackpackView view; + private readonly BackpackCommandBus backpackCommandBus; private readonly RectTransform rectTransform; private CancellationTokenSource animationCts; + private CancellationTokenSource profileLoadingCts; + private readonly AvatarController avatarController; + + private bool initialLoading = false; public BackpackControler( BackpackView view, NftTypeIconSO rarityBackgrounds, + NftTypeIconSO rarityInfoPanelBackgrounds, NftTypeIconSO categoryIcons, - NFTColorsSO rarityColors) + NFTColorsSO rarityColors, + BackpackCommandBus backpackCommandBus, + BackpackEventBus backpackEventBus, + IWeb3IdentityCache web3IdentityCache, + IWearableCatalog wearableCatalog) { this.view = view; + this.backpackCommandBus = backpackCommandBus; + var backpackEquipStatusController = new BackpackEquipStatusController(backpackEventBus); + BackpackBusController busController = new BackpackBusController(wearableCatalog, backpackEventBus, backpackCommandBus, backpackEquipStatusController); + rectTransform = view.transform.parent.GetComponent(); + avatarController = new AvatarController( + view.GetComponentInChildren(), + view.GetComponentsInChildren(), + rarityBackgrounds, + rarityInfoPanelBackgrounds, + categoryIcons, + rarityColors, + backpackCommandBus, + backpackEventBus, + web3IdentityCache, + backpackEquipStatusController); Dictionary backpackSections = new () { - { BackpackSections.Avatar, new AvatarController(view.GetComponentInChildren(),view.GetComponentsInChildren(), rarityBackgrounds, categoryIcons, rarityColors) }, + { BackpackSections.Avatar, avatarController }, { BackpackSections.Emotes, new EmotesController(view.GetComponentInChildren()) }, }; var sectionSelectorController = new SectionSelectorController(backpackSections, BackpackSections.Avatar); @@ -40,9 +77,43 @@ public BackpackControler( } } + public async UniTask InitialiseAssetsAsync(IAssetsProvisioner assetsProvisioner, CancellationToken ct) + { + await avatarController.InitialiseAssetsAsync(assetsProvisioner, ct); + } + + public void InjectToWorld(ref ArchSystemsWorldBuilder builder, in Entity playerEntity) + { + World world = builder.World; + avatarController.InjectToWorld(ref builder, playerEntity); + profileLoadingCts = new CancellationTokenSource(); + AwaitForProfileAsync(world, playerEntity, profileLoadingCts).Forget(); + } + + + private async UniTaskVoid AwaitForProfileAsync(World world, Entity playerEntity, CancellationTokenSource cts) + { + do + { + await UniTask.Delay(1000, cancellationToken: cts.Token); + } + while (!initialLoading); + + world.TryGet(playerEntity, out AvatarShapeComponent avatarShapeComponent); + + if(!avatarShapeComponent.WearablePromise.IsConsumed) + await avatarShapeComponent.WearablePromise.ToUniTaskAsync(world, cancellationToken: cts.Token); + + foreach (URN avatarSharedWearable in world.Get(playerEntity).Avatar.SharedWearables) + backpackCommandBus.SendCommand(new BackpackEquipCommand(avatarSharedWearable.ToString())); + + avatarController.RequestInitialWearablesPage(); + } + public void Activate() { view.gameObject.SetActive(true); + initialLoading = true; } public void Deactivate() @@ -52,5 +123,12 @@ public void Deactivate() public RectTransform GetRectTransform() => rectTransform; + + public void Dispose() + { + avatarController?.Dispose(); + animationCts.SafeCancelAndDispose(); + profileLoadingCts.SafeCancelAndDispose(); + } } } diff --git a/Explorer/Assets/DCL/Backpack/BackpackEquipStatusController.cs b/Explorer/Assets/DCL/Backpack/BackpackEquipStatusController.cs new file mode 100644 index 0000000000..1626fa1cdc --- /dev/null +++ b/Explorer/Assets/DCL/Backpack/BackpackEquipStatusController.cs @@ -0,0 +1,61 @@ +using DCL.AvatarRendering.Wearables.Components; +using DCL.AvatarRendering.Wearables.Helpers; +using DCL.Backpack.BackpackBus; +using System; +using System.Collections.Generic; + +namespace DCL.Backpack +{ + public class BackpackEquipStatusController : IBackpackEquipStatusController + { + private readonly IBackpackEventBus backpackEventBus; + private readonly Dictionary equippedWearables = new (); + + public BackpackEquipStatusController(IBackpackEventBus backpackEventBus) + { + this.backpackEventBus = backpackEventBus; + + this.backpackEventBus.EquipEvent += SetWearableForCategory; + this.backpackEventBus.UnEquipEvent += RemoveWearableForCategory; + + foreach (string category in WearablesConstants.CATEGORIES_PRIORITY) + equippedWearables.Add(category, null); + } + + public IWearable GetEquippedWearableForCategory(string category) => + equippedWearables[category]; + + public bool IsWearableEquipped(IWearable wearable) => + equippedWearables[wearable.GetCategory()] == wearable; + + //This will retrieve the list of default hides for the current equipped wearables + //Manual hide override will be a separate task + //TODO retrieve logic from old renderer + public List GetCurrentWearableHides() + { + List hides = new List(); + + foreach (string category in WearablesConstants.CATEGORIES_PRIORITY) + { + IWearable wearable = equippedWearables[category]; + + if (wearable == null) + continue; + } + + return hides; + } + + private void RemoveWearableForCategory(IWearable wearable) => + equippedWearables[wearable.GetCategory()] = null; + + private void SetWearableForCategory(IWearable wearable) => + equippedWearables[wearable.GetCategory()] = wearable; + } + + public interface IBackpackEquipStatusController + { + IWearable GetEquippedWearableForCategory(string category); + bool IsWearableEquipped(IWearable wearable); + } +} diff --git a/Explorer/Assets/DCL/Backpack/BackpackEquipStatusController.cs.meta b/Explorer/Assets/DCL/Backpack/BackpackEquipStatusController.cs.meta new file mode 100644 index 0000000000..4efd9def8c --- /dev/null +++ b/Explorer/Assets/DCL/Backpack/BackpackEquipStatusController.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 263dd55230ec4b1d9899965cc63f58b3 +timeCreated: 1703688105 \ No newline at end of file diff --git a/Explorer/Assets/DCL/Backpack/BackpackGridController.cs b/Explorer/Assets/DCL/Backpack/BackpackGridController.cs new file mode 100644 index 0000000000..a64cdf126b --- /dev/null +++ b/Explorer/Assets/DCL/Backpack/BackpackGridController.cs @@ -0,0 +1,191 @@ +using Arch.Core; +using Arch.SystemGroups; +using Cysharp.Threading.Tasks; +using DCL.AssetsProvision; +using DCL.AvatarRendering.Wearables.Components; +using DCL.AvatarRendering.Wearables.Components.Intentions; +using DCL.Backpack.BackpackBus; +using DCL.Web3Authentication.Identities; +using ECS.Prioritization.Components; +using ECS.StreamableLoading.Common; +using System.Collections.Generic; +using System.Threading; +using UnityEngine.Pool; +using Utility; +using Object = UnityEngine.Object; +using ParamPromise = ECS.StreamableLoading.Common.AssetPromise; + +namespace DCL.Backpack +{ + public class BackpackGridController + { + private const string PAGE_NUMBER = "pageNumber"; + private const string PAGE_SIZE = "pageSize"; + + private const int CURRENT_PAGE_SIZE = 16; + private static readonly string CURRENT_PAGE_SIZE_STR = CURRENT_PAGE_SIZE.ToString(); + + private readonly BackpackGridView view; + private readonly BackpackCommandBus commandBus; + private readonly BackpackEventBus eventBus; + private readonly IWeb3IdentityCache web3IdentityCache; + private readonly NftTypeIconSO rarityBackgrounds; + private readonly NFTColorsSO rarityColors; + private readonly NftTypeIconSO categoryIcons; + private readonly IBackpackEquipStatusController backpackEquipStatusController; + + private readonly List<(string, string)> requestParameters; + private readonly List results = new (CURRENT_PAGE_SIZE); + + private IObjectPool gridItemsPool; + private readonly Dictionary usedPoolItems; + private World world; + private CancellationTokenSource cts; + + public BackpackGridController( + BackpackGridView view, + BackpackCommandBus commandBus, + BackpackEventBus eventBus, + IWeb3IdentityCache web3IdentityCache, + NftTypeIconSO rarityBackgrounds, + NFTColorsSO rarityColors, + NftTypeIconSO categoryIcons, + IBackpackEquipStatusController backpackEquipStatusController) + { + this.view = view; + this.commandBus = commandBus; + this.eventBus = eventBus; + this.web3IdentityCache = web3IdentityCache; + this.rarityBackgrounds = rarityBackgrounds; + this.rarityColors = rarityColors; + this.categoryIcons = categoryIcons; + this.backpackEquipStatusController = backpackEquipStatusController; + + usedPoolItems = new (); + eventBus.EquipEvent += OnEquip; + eventBus.UnEquipEvent += OnUnequip; + requestParameters = new List<(string, string)>(); + } + + public void InjectToWorld(ref ArchSystemsWorldBuilder builder, in Entity playerEntity) + { + world = builder.World; + } + + public async UniTask InitialiseAssetsAsync(IAssetsProvisioner assetsProvisioner, CancellationToken ct) + { + BackpackItemView backpackItem = (await assetsProvisioner.ProvideMainAssetAsync(view.BackpackItem, ct: ct)).Value; + + gridItemsPool = new ObjectPool( + () => CreateBackpackItem(backpackItem), + _ => { }, + defaultCapacity: CURRENT_PAGE_SIZE + ); + } + + private void SetGridElements(IWearable[] gridWearables) + { + ClearPoolElements(); + + for (var i = 0; i < gridWearables.Length; i++) + { + BackpackItemView backpackItemView = gridItemsPool.Get(); + usedPoolItems.Add(gridWearables[i].GetUrn(), backpackItemView); + + backpackItemView.OnSelectItem += SelectItem; + backpackItemView.EquipButton.onClick.AddListener(() => { commandBus.SendCommand(new BackpackEquipCommand(backpackItemView.ItemId)); }); + backpackItemView.UnEquipButton.onClick.AddListener(() => { commandBus.SendCommand(new BackpackUnEquipCommand(backpackItemView.ItemId)); }); + backpackItemView.ItemId = gridWearables[i].GetUrn(); + backpackItemView.RarityBackground.sprite = rarityBackgrounds.GetTypeImage(gridWearables[i].GetRarity()); + backpackItemView.FlapBackground.color = rarityColors.GetColor(gridWearables[i].GetRarity()); + backpackItemView.CategoryImage.sprite = categoryIcons.GetTypeImage(gridWearables[i].GetCategory()); + backpackItemView.EquippedIcon.SetActive(backpackEquipStatusController.IsWearableEquipped(gridWearables[i])); + + backpackItemView.SetEquipButtonsState(); + WaitForThumbnailAsync(gridWearables[i], backpackItemView, cts.Token).Forget(); + } + } + + private BackpackItemView CreateBackpackItem(BackpackItemView backpackItem) + { + BackpackItemView backpackItemView = Object.Instantiate(backpackItem, view.gameObject.transform); + return backpackItemView; + } + + public void RequestPage(int pageNumber) + { + cts.SafeCancelAndDispose(); + cts = new CancellationTokenSource(); + + requestParameters.Clear(); + requestParameters.Add((PAGE_NUMBER, pageNumber.ToString())); + requestParameters.Add((PAGE_SIZE, CURRENT_PAGE_SIZE_STR)); + + results.Clear(); + + var wearablesPromise = ParamPromise.Create(world, + new GetWearableByParamIntention(requestParameters, web3IdentityCache.Identity!.EphemeralAccount.Address, results), + PartitionComponent.TOP_PRIORITY); + + AwaitWearablesPromiseAsync(wearablesPromise, cts.Token).Forget(); + } + + private async UniTaskVoid AwaitWearablesPromiseAsync(ParamPromise wearablesPromise, CancellationToken ct) + { + AssetPromise uniTaskAsync = await wearablesPromise.ToUniTaskAsync(world, cancellationToken: ct); + + if (!uniTaskAsync.Result!.Value.Succeeded) + return; + + SetGridElements(uniTaskAsync.Result.Value.Asset); + } + + private async UniTaskVoid WaitForThumbnailAsync(IWearable itemWearable, BackpackItemView itemView, CancellationToken ct) + { + itemView.LoadingView.StartLoadingAnimation(itemView.FullBackpackItem); + + do { await UniTask.Delay(500, cancellationToken: ct); } + while (itemWearable.WearableThumbnail == null); + + itemView.WearableThumbnail.sprite = itemWearable.WearableThumbnail.Value.Asset; + itemView.LoadingView.FinishLoadingAnimation(itemView.FullBackpackItem); + } + + private void ClearPoolElements() + { + foreach (var backpackItemView in usedPoolItems) + { + backpackItemView.Value.EquipButton.onClick.RemoveAllListeners(); + backpackItemView.Value.UnEquipButton.onClick.RemoveAllListeners(); + backpackItemView.Value.OnSelectItem -= SelectItem; + backpackItemView.Value.EquippedIcon.SetActive(false); + gridItemsPool.Release(backpackItemView.Value); + } + + usedPoolItems.Clear(); + } + + private void SelectItem(string itemId) + { + commandBus.SendCommand(new BackpackSelectCommand(itemId)); + } + + private void OnUnequip(IWearable unequippedWearable) + { + if (usedPoolItems.TryGetValue(unequippedWearable.GetUrn(), out BackpackItemView backpackItemView)) + { + backpackItemView.EquippedIcon.SetActive(false); + backpackItemView.SetEquipButtonsState(); + } + } + + private void OnEquip(IWearable equippedWearable) + { + if (usedPoolItems.TryGetValue(equippedWearable.GetUrn(), out BackpackItemView backpackItemView)) + { + backpackItemView.EquippedIcon.SetActive(true); + backpackItemView.SetEquipButtonsState(); + } + } + } +} diff --git a/Explorer/Assets/DCL/Backpack/BackpackGridController.cs.meta b/Explorer/Assets/DCL/Backpack/BackpackGridController.cs.meta new file mode 100644 index 0000000000..f283780414 --- /dev/null +++ b/Explorer/Assets/DCL/Backpack/BackpackGridController.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 5b480dbfb5124a9993c6913bb177cede +timeCreated: 1703060981 \ No newline at end of file diff --git a/Explorer/Assets/DCL/Backpack/BackpackGridView.cs b/Explorer/Assets/DCL/Backpack/BackpackGridView.cs new file mode 100644 index 0000000000..497d2a0669 --- /dev/null +++ b/Explorer/Assets/DCL/Backpack/BackpackGridView.cs @@ -0,0 +1,18 @@ +using DCL.AssetsProvision; +using System; +using UnityEngine; + +namespace DCL.Backpack +{ + public class BackpackGridView : MonoBehaviour + { + [field: SerializeField] + public BackpackItemRef BackpackItem { get; private set; } + + [Serializable] + public class BackpackItemRef : ComponentReference + { + public BackpackItemRef(string guid) : base(guid) { } + } + } +} diff --git a/Explorer/Assets/DCL/Backpack/BackpackGridView.cs.meta b/Explorer/Assets/DCL/Backpack/BackpackGridView.cs.meta new file mode 100644 index 0000000000..f5c0eb8b31 --- /dev/null +++ b/Explorer/Assets/DCL/Backpack/BackpackGridView.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 5193ad1036af4e62a5d908f9c49d0b8b +timeCreated: 1703066708 \ No newline at end of file diff --git a/Explorer/Assets/DCL/Backpack/BackpackInfoPanelController.cs b/Explorer/Assets/DCL/Backpack/BackpackInfoPanelController.cs new file mode 100644 index 0000000000..c81f5c2215 --- /dev/null +++ b/Explorer/Assets/DCL/Backpack/BackpackInfoPanelController.cs @@ -0,0 +1,71 @@ +using Cysharp.Threading.Tasks; +using DCL.AvatarRendering.Wearables.Components; +using DCL.Backpack.BackpackBus; +using System; +using System.Threading; +using UnityEngine; +using Utility; + +namespace DCL.Backpack +{ + public class BackpackInfoPanelController : IDisposable + { + private readonly BackpackInfoPanelView view; + private readonly BackpackEventBus backpackEventBus; + private readonly NftTypeIconSO categoryIcons; + private readonly NftTypeIconSO rarityInfoPanelBackgrounds; + private CancellationTokenSource cts; + + public BackpackInfoPanelController( + BackpackInfoPanelView view, + BackpackEventBus backpackEventBus, + NftTypeIconSO categoryIcons, + NftTypeIconSO rarityInfoPanelBackgrounds) + { + this.view = view; + this.backpackEventBus = backpackEventBus; + this.categoryIcons = categoryIcons; + this.rarityInfoPanelBackgrounds = rarityInfoPanelBackgrounds; + + backpackEventBus.SelectEvent += SetPanelContent; + } + + private void SetPanelContent(IWearable wearable) + { + cts.SafeCancelAndDispose(); + cts = new CancellationTokenSource(); + SetInfoPanelStatus(false); + view.WearableThumbnail.gameObject.SetActive(false); + view.LoadingSpinner.SetActive(true); + view.Name.text = wearable.GetName(); + view.Description.text = wearable.GetDescription(); + view.CategoryImage.sprite = categoryIcons.GetTypeImage(wearable.GetCategory()); + view.RarityBackground.sprite = rarityInfoPanelBackgrounds.GetTypeImage(wearable.GetRarity()); + WaitForThumbnailAsync(wearable, cts.Token).Forget(); + } + + private void SetInfoPanelStatus(bool isEmpty) + { + view.EmptyPanel.SetActive(isEmpty); + view.FullPanel.SetActive(!isEmpty); + } + + private async UniTaskVoid WaitForThumbnailAsync(IWearable itemWearable, CancellationToken ct) + { + do + { + await UniTask.Delay(500, cancellationToken: ct); + } + while (itemWearable.WearableThumbnail == null); + + view.WearableThumbnail.sprite = itemWearable.WearableThumbnail.Value.Asset; + view.LoadingSpinner.SetActive(false); + view.WearableThumbnail.gameObject.SetActive(true); + } + + public void Dispose() + { + backpackEventBus.SelectEvent -= SetPanelContent; + } + } +} diff --git a/Explorer/Assets/DCL/Backpack/BackpackInfoPanelController.cs.meta b/Explorer/Assets/DCL/Backpack/BackpackInfoPanelController.cs.meta new file mode 100644 index 0000000000..f2ced6a419 --- /dev/null +++ b/Explorer/Assets/DCL/Backpack/BackpackInfoPanelController.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: e68cac60c0fc452791cc3eaa85333100 +timeCreated: 1703085503 \ No newline at end of file diff --git a/Explorer/Assets/DCL/Backpack/BackpackInfoPanelView.cs b/Explorer/Assets/DCL/Backpack/BackpackInfoPanelView.cs new file mode 100644 index 0000000000..09c486af6a --- /dev/null +++ b/Explorer/Assets/DCL/Backpack/BackpackInfoPanelView.cs @@ -0,0 +1,33 @@ +using TMPro; +using UnityEngine; +using UnityEngine.UI; + +namespace DCL.Backpack +{ + public class BackpackInfoPanelView : MonoBehaviour + { + [field: SerializeField] + public GameObject EmptyPanel { get; private set; } + + [field: SerializeField] + public GameObject FullPanel { get; private set; } + + [field: SerializeField] + public Image WearableThumbnail { get; private set; } + + [field: SerializeField] + public Image CategoryImage { get; private set; } + + [field: SerializeField] + public GameObject LoadingSpinner { get; private set; } + + [field: SerializeField] + public Image RarityBackground { get; private set; } + + [field: SerializeField] + public TMP_Text Name { get; private set; } + + [field: SerializeField] + public TMP_Text Description { get; private set; } + } +} diff --git a/Explorer/Assets/DCL/Backpack/BackpackInfoPanelView.cs.meta b/Explorer/Assets/DCL/Backpack/BackpackInfoPanelView.cs.meta new file mode 100644 index 0000000000..82aa1b9f95 --- /dev/null +++ b/Explorer/Assets/DCL/Backpack/BackpackInfoPanelView.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: e72586a42cf441ff84e93576d0da1d6f +timeCreated: 1703085491 \ No newline at end of file diff --git a/Explorer/Assets/DCL/Backpack/BackpackItemView.cs b/Explorer/Assets/DCL/Backpack/BackpackItemView.cs index c18c0b132f..0f9d4548bc 100644 --- a/Explorer/Assets/DCL/Backpack/BackpackItemView.cs +++ b/Explorer/Assets/DCL/Backpack/BackpackItemView.cs @@ -1,11 +1,18 @@ +using DCL.UI; +using System; using UnityEngine; using UnityEngine.EventSystems; using UnityEngine.UI; namespace DCL.Backpack { - public class BackpackItemView : MonoBehaviour, IPointerEnterHandler, IPointerExitHandler + public class BackpackItemView : MonoBehaviour, IPointerEnterHandler, IPointerExitHandler, IPointerClickHandler { + public event Action OnSelectItem; + + [field: SerializeField] + public string ItemId { get; set; } + [field: SerializeField] public GameObject HoverBackground { get; private set; } @@ -16,21 +23,52 @@ public class BackpackItemView : MonoBehaviour, IPointerEnterHandler, IPointerExi public Button EquipButton { get; private set; } [field: SerializeField] - public Button InfoButton { get; private set; } + public Button UnEquipButton { get; private set; } [field: SerializeField] public GameObject EquippedIcon { get; private set; } + [field: SerializeField] + public Image CategoryImage { get; private set; } + + [field: SerializeField] + public Image WearableThumbnail { get; private set; } + + [field: SerializeField] + public Image RarityBackground { get; private set; } + + [field: SerializeField] + public Image FlapBackground { get; private set; } + + [field: SerializeField] + public LoadingBrightView LoadingView { get; private set; } + + [field: SerializeField] + public GameObject FullBackpackItem { get; private set; } + + public void SetEquipButtonsState() + { + EquipButton.gameObject.SetActive(!EquippedIcon.activeSelf); + UnEquipButton.gameObject.SetActive(EquippedIcon.activeSelf); + } + public void OnPointerEnter(PointerEventData eventData) { HoverBackground.SetActive(true); - EquipButton.gameObject.SetActive(!EquippedIcon.activeSelf); - InfoButton.gameObject.SetActive(EquippedIcon.activeSelf); + SetEquipButtonsState(); } public void OnPointerExit(PointerEventData eventData) { HoverBackground.SetActive(false); } + + public void OnPointerClick(PointerEventData eventData) + { + if (string.IsNullOrEmpty(ItemId)) + return; + + OnSelectItem?.Invoke(ItemId); + } } } diff --git a/Explorer/Assets/DCL/Backpack/BackpackSettings.cs b/Explorer/Assets/DCL/Backpack/BackpackSettings.cs index 679812720e..c2d11556f6 100644 --- a/Explorer/Assets/DCL/Backpack/BackpackSettings.cs +++ b/Explorer/Assets/DCL/Backpack/BackpackSettings.cs @@ -1,3 +1,4 @@ +using DCL.AssetsProvision; using System; using UnityEngine; using UnityEngine.AddressableAssets; @@ -13,6 +14,9 @@ public class BackpackSettings [field: SerializeField] public AssetReferenceT RarityBackgroundsMapping { get; private set; } + [field: SerializeField] + public AssetReferenceT RarityInfoPanelBackgroundsMapping { get; private set; } + [field: SerializeField] public AssetReferenceT RarityColorMappings { get; private set; } } diff --git a/Explorer/Assets/DCL/Backpack/BackpackSlotsController.cs b/Explorer/Assets/DCL/Backpack/BackpackSlotsController.cs index aa0099fe61..0308bb8961 100644 --- a/Explorer/Assets/DCL/Backpack/BackpackSlotsController.cs +++ b/Explorer/Assets/DCL/Backpack/BackpackSlotsController.cs @@ -1,24 +1,77 @@ +using Cysharp.Threading.Tasks; +using DCL.AvatarRendering.Wearables.Components; +using DCL.Backpack.BackpackBus; +using Microsoft.ClearScript.Util.Web; using System; -using System.Collections; using System.Collections.Generic; +using System.Threading; using UnityEngine; +using Utility; namespace DCL.Backpack { - public class BackpackSlotsController + public class BackpackSlotsController : IDisposable { - private readonly Dictionary avatarSlots = new Dictionary(); + private readonly BackpackEventBus backpackEventBus; + private readonly NftTypeIconSO rarityBackgrounds; + private readonly Dictionary avatarSlots = new (); private AvatarSlotView previousSlot; - public BackpackSlotsController(AvatarSlotView[] avatarSlotViews) + public BackpackSlotsController(AvatarSlotView[] avatarSlotViews, BackpackCommandBus backpackCommandBus, BackpackEventBus backpackEventBus, NftTypeIconSO rarityBackgrounds) { + this.backpackEventBus = backpackEventBus; + this.rarityBackgrounds = rarityBackgrounds; + + this.backpackEventBus.EquipEvent += EquipInSlot; + this.backpackEventBus.UnEquipEvent += UnEquipInSlot; + foreach (var avatarSlotView in avatarSlotViews) { - avatarSlots.Add(avatarSlotView.Category, avatarSlotView); + avatarSlots.Add(avatarSlotView.Category.ToLower(), (avatarSlotView, new CancellationTokenSource())); avatarSlotView.OnSlotButtonPressed += OnSlotButtonPressed; + avatarSlotView.UnequipButton.onClick.AddListener(() => backpackCommandBus.SendCommand(new BackpackUnEquipCommand(avatarSlotView.SlotWearableUrn))); } } + private void UnEquipInSlot(IWearable wearable) + { + if (!avatarSlots.TryGetValue(wearable.GetCategory(), out (AvatarSlotView, CancellationTokenSource) avatarSlotView)) return; + + avatarSlotView.Item2.SafeCancelAndDispose(); + avatarSlotView.Item1.UnequipButton.gameObject.SetActive(false); + avatarSlotView.Item1.SlotWearableUrn = null; + avatarSlotView.Item1.SlotWearableThumbnail.gameObject.SetActive(false); + avatarSlotView.Item1.SlotWearableThumbnail.sprite = null; + avatarSlotView.Item1.SlotWearableRarityBackground.sprite = null; + } + + private void EquipInSlot(IWearable equippedWearable) + { + if (!avatarSlots.TryGetValue(equippedWearable.GetCategory(), out (AvatarSlotView, CancellationTokenSource) avatarSlotView)) + return; + + avatarSlotView.Item1.SlotWearableUrn = equippedWearable.GetUrn(); + avatarSlotView.Item1.SlotWearableRarityBackground.sprite = rarityBackgrounds.GetTypeImage(equippedWearable.GetRarity()); + + avatarSlotView.Item2.SafeCancelAndDispose(); + avatarSlotView.Item2 = new CancellationTokenSource(); + WaitForThumbnailAsync(equippedWearable, avatarSlotView.Item1, avatarSlotView.Item2.Token).Forget(); + } + + private async UniTaskVoid WaitForThumbnailAsync(IWearable equippedWearable, AvatarSlotView avatarSlotView, CancellationToken ct) + { + avatarSlotView.LoadingView.StartLoadingAnimation(avatarSlotView.NftContainer); + do + { + await UniTask.Delay(500, cancellationToken: ct); + } + while (equippedWearable.WearableThumbnail == null); + + avatarSlots[equippedWearable.GetCategory()].Item1.SlotWearableThumbnail.sprite = equippedWearable.WearableThumbnail.Value.Asset; + avatarSlots[equippedWearable.GetCategory()].Item1.SlotWearableThumbnail.gameObject.SetActive(true); + avatarSlotView.LoadingView.FinishLoadingAnimation(avatarSlotView.NftContainer); + } + private void OnSlotButtonPressed(AvatarSlotView avatarSlot) { if (previousSlot != null) @@ -34,5 +87,15 @@ private void OnSlotButtonPressed(AvatarSlotView avatarSlot) previousSlot = avatarSlot; avatarSlot.SelectedBackground.SetActive(true); } + + public void Dispose() + { + backpackEventBus.EquipEvent -= EquipInSlot; + backpackEventBus.UnEquipEvent -= UnEquipInSlot; + foreach (var avatarSlotView in avatarSlots.Values) + { + avatarSlotView.Item1.OnSlotButtonPressed -= OnSlotButtonPressed; + } + } } } diff --git a/Explorer/Assets/DCL/Backpack/NftCategoryIcons.asset b/Explorer/Assets/DCL/Backpack/NftCategoryIcons.asset index 38739af1db..b4655ec08d 100644 --- a/Explorer/Assets/DCL/Backpack/NftCategoryIcons.asset +++ b/Explorer/Assets/DCL/Backpack/NftCategoryIcons.asset @@ -14,44 +14,44 @@ MonoBehaviour: m_EditorClassIdentifier: nftIcons: - key: eyes - value: {fileID: 21300000, guid: c006e0ed397034829a4b311fd25893fd, type: 3} + value: {fileID: 21300000, guid: 03b05b1004b784dc690bbff5ea268de7, type: 3} - key: mouth - value: {fileID: 21300000, guid: df1d4fbf4e6a74017bcf9e6f2eb5486f, type: 3} + value: {fileID: 21300000, guid: 075c9dd99649649f9869afece52cd35b, type: 3} - key: eyebrows - value: {fileID: 21300000, guid: c0688f4e1f63c43ac9ceadb3cb50e8d9, type: 3} + value: {fileID: 21300000, guid: 15c01427d7e8f4c72a16e8e1368c82a6, type: 3} - key: hair - value: {fileID: 21300000, guid: c99c55c8bb9ec488da8409fe012968fb, type: 3} + value: {fileID: 21300000, guid: 9b13173961ced41b287b3ec0d724c585, type: 3} - key: upper_body - value: {fileID: 21300000, guid: af4261c3d3ccf4ee5aa2a37b13af6922, type: 3} + value: {fileID: 21300000, guid: 48d5dd980b244494b9f9d9fc540e0b01, type: 3} - key: lower_body - value: {fileID: 21300000, guid: c0c541fe1a4c54b07b590db1f95cd07b, type: 3} + value: {fileID: 21300000, guid: bf9cd8edf950343a9ba38284a615c606, type: 3} - key: feet - value: {fileID: 21300000, guid: 4418c90e7ae104f7bbae035b3625ceb4, type: 3} + value: {fileID: 21300000, guid: 2bd9c7cbf6f504ad89e22e7f1f497fd2, type: 3} - key: head - value: {fileID: 21300000, guid: c99c55c8bb9ec488da8409fe012968fb, type: 3} + value: {fileID: 21300000, guid: 6084de83d5bc748b9a444a61a7c0b96a, type: 3} - key: facial_hair - value: {fileID: 21300000, guid: d4b2c86b4415e43579f68810ac96e6bf, type: 3} + value: {fileID: 21300000, guid: 81132a1626c0d43aabeeec2414a68945, type: 3} - key: tiara - value: {fileID: 21300000, guid: 7879a1a71dbb64cb6b8453907a36f60b, type: 3} + value: {fileID: 21300000, guid: 6a3c7a80a921c458c93852cc9cfa33c1, type: 3} - key: hat - value: {fileID: 21300000, guid: aefec5c0deb1246b0b9ccc6f85d98fca, type: 3} + value: {fileID: 21300000, guid: ec6e82c586d96441e9a01726eae9c6f8, type: 3} - key: helmet - value: {fileID: 21300000, guid: 5406d9f0e6a9c464499dc8703c83f887, type: 3} + value: {fileID: 21300000, guid: 6bc5be995cfc14e0182a54c5a4fef290, type: 3} - key: skin - value: {fileID: 21300000, guid: 2f525faf27fa14ded87402d1684eb85d, type: 3} + value: {fileID: 21300000, guid: bda43422408ca42209dd311b23a1d06f, type: 3} - key: mask - value: {fileID: 21300000, guid: 8321a646ca8e441a5b6d8bed690a2aaf, type: 3} + value: {fileID: 21300000, guid: f88ebb8cd1cd5487ca7c3f4d3e65e76a, type: 3} - key: eyewear - value: {fileID: 21300000, guid: d306a8c2a2d6246cca8aadb1c515fd02, type: 3} + value: {fileID: 21300000, guid: 1f8423c7e44934bc88742ef8c05aa4ee, type: 3} - key: top_head - value: {fileID: 21300000, guid: 48fb8b5f1eb6247d7aa88e2273b0ba58, type: 3} + value: {fileID: 21300000, guid: 6084de83d5bc748b9a444a61a7c0b96a, type: 3} - key: earring - value: {fileID: 21300000, guid: 2de3e59cb38ea4911ab7a9fdb1d2406b, type: 3} + value: {fileID: 21300000, guid: 98a2ad67412f444ee883c03d3a07dd1e, type: 3} - key: emote - value: {fileID: 21300000, guid: 23250cfbf00e34cf1b249bc6e6a0f7fc, type: 3} + value: {fileID: 21300000, guid: 05bc7d6b12857fb4b9b7634bf2a4f440, type: 3} - key: body_shape - value: {fileID: 21300000, guid: 0078c7406afb34e2d8bc608d0ea03203, type: 3} + value: {fileID: 21300000, guid: 98bae2808161c4d678b3f5d109a5ee80, type: 3} - key: hands_wear - value: {fileID: 21300000, guid: 4b75dfe17605c43dc80a38b04c92091e, type: 3} + value: {fileID: 21300000, guid: 16866e729ce1061429170517e80ef313, type: 3} - key: hands - value: {fileID: 21300000, guid: 3db1bd8a9ce01479d83cd1637267ec2a, type: 3} + value: {fileID: 21300000, guid: 1b8e5d35e0b2d46379b97bb7e7ab2c97, type: 3} diff --git a/Explorer/Assets/DCL/Backpack/NftInfoPanelRarityBackgrounds.asset b/Explorer/Assets/DCL/Backpack/NftInfoPanelRarityBackgrounds.asset new file mode 100644 index 0000000000..82ba8bda7a --- /dev/null +++ b/Explorer/Assets/DCL/Backpack/NftInfoPanelRarityBackgrounds.asset @@ -0,0 +1,33 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0ac32b8a6b4e74a16a311e698f9dbfd7, type: 3} + m_Name: NftInfoPanelRarityBackgrounds + m_EditorClassIdentifier: + nftIcons: + - key: rare + value: {fileID: 21300000, guid: 9ca88af112f7e4821986d5ebf7af699a, type: 3} + - key: epic + value: {fileID: 21300000, guid: e0fea03e8025e42bab6a23014f7eeec8, type: 3} + - key: uncommon + value: {fileID: 21300000, guid: 984f8e02caec845c7b41c3baeef24b92, type: 3} + - key: legendary + value: {fileID: 21300000, guid: ef376f68b39b649929d1d83ca633be4e, type: 3} + - key: unique + value: {fileID: 21300000, guid: 72c7e17c54fb4410c827a002a43e34d4, type: 3} + - key: common + value: {fileID: 21300000, guid: eb54ab9d7387e4a82aafd7a784d82f73, type: 3} + - key: mythic + value: {fileID: 21300000, guid: 39254aee4b62348b4b5131b9b861f513, type: 3} + - key: land + value: {fileID: 21300000, guid: eb54ab9d7387e4a82aafd7a784d82f73, type: 3} + - key: name + value: {fileID: 21300000, guid: eb54ab9d7387e4a82aafd7a784d82f73, type: 3} diff --git a/Explorer/Assets/DCL/Backpack/NftInfoPanelRarityBackgrounds.asset.meta b/Explorer/Assets/DCL/Backpack/NftInfoPanelRarityBackgrounds.asset.meta new file mode 100644 index 0000000000..4f3a91ad47 --- /dev/null +++ b/Explorer/Assets/DCL/Backpack/NftInfoPanelRarityBackgrounds.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 66f8f8427a5c4443e95b0d298addd639 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Explorer/Assets/DCL/Backpack/NftRarityBackgrounds.asset b/Explorer/Assets/DCL/Backpack/NftRarityBackgrounds.asset index 4e8dd936d8..8afc871b06 100644 --- a/Explorer/Assets/DCL/Backpack/NftRarityBackgrounds.asset +++ b/Explorer/Assets/DCL/Backpack/NftRarityBackgrounds.asset @@ -14,20 +14,20 @@ MonoBehaviour: m_EditorClassIdentifier: nftIcons: - key: rare - value: {fileID: 21300000, guid: 4a3462f62d6794676b7db0cffc4c93c0, type: 3} + value: {fileID: 21300000, guid: 9b1910f69bae144ec8d4122a091f267e, type: 3} - key: epic - value: {fileID: 21300000, guid: 7a98ab3d0d7ae4df7958fe312df75fd4, type: 3} + value: {fileID: 21300000, guid: dfe2025b3e81f42c5888a2a938ac6706, type: 3} - key: uncommon - value: {fileID: 21300000, guid: eb50d42f8b2e642479006b55f8c538b6, type: 3} + value: {fileID: 21300000, guid: 936dcf8cb7310472086027dcbdae26d5, type: 3} - key: legendary - value: {fileID: 21300000, guid: 39a6c679449244f8491681ec41c88360, type: 3} + value: {fileID: 21300000, guid: 2a287e052dd434673bc1d517abbe6411, type: 3} - key: unique - value: {fileID: 21300000, guid: 771938bcfc47a4694b84810829c6542a, type: 3} + value: {fileID: 21300000, guid: 40a02ef6cf4e94182abb9dfac4d7d0e3, type: 3} - key: common - value: {fileID: 21300000, guid: 667cd6c89f5994b68a0685338783b7c7, type: 3} + value: {fileID: 21300000, guid: d99151485960c4e47a8bd1255170cf90, type: 3} - key: mythic - value: {fileID: 21300000, guid: 382a62f7466574ac8a6d607a3fea583b, type: 3} + value: {fileID: 21300000, guid: 8e9a5e9dd7e99454485c708328d637a5, type: 3} - key: land - value: {fileID: 0} + value: {fileID: 21300000, guid: dfe2025b3e81f42c5888a2a938ac6706, type: 3} - key: name - value: {fileID: 0} + value: {fileID: 21300000, guid: dfe2025b3e81f42c5888a2a938ac6706, type: 3} diff --git a/Explorer/Assets/DCL/ECS/GlobalPartitioning/GlobalDeferredLoadingSystem.cs b/Explorer/Assets/DCL/ECS/GlobalPartitioning/GlobalDeferredLoadingSystem.cs index 7839c58003..b8946d83ec 100644 --- a/Explorer/Assets/DCL/ECS/GlobalPartitioning/GlobalDeferredLoadingSystem.cs +++ b/Explorer/Assets/DCL/ECS/GlobalPartitioning/GlobalDeferredLoadingSystem.cs @@ -12,8 +12,10 @@ using ECS.SceneLifeCycle.Systems; using ECS.StreamableLoading.AssetBundles; using ECS.StreamableLoading.DeferredLoading; +using ECS.StreamableLoading.Textures; using Ipfs; using SceneRunner.Scene; +using UnityEngine; namespace DCL.GlobalPartitioning { @@ -45,6 +47,7 @@ static GlobalDeferredLoadingSystem() CreateQuery(), CreateQuery(), CreateQuery(), + CreateQuery(), }; } diff --git a/Explorer/Assets/DCL/ExplorePanel/Assets/ExplorePanelUI.prefab b/Explorer/Assets/DCL/ExplorePanel/Assets/ExplorePanelUI.prefab index 87fdd263b3..9d89c959d7 100644 --- a/Explorer/Assets/DCL/ExplorePanel/Assets/ExplorePanelUI.prefab +++ b/Explorer/Assets/DCL/ExplorePanel/Assets/ExplorePanelUI.prefab @@ -2542,7 +2542,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7271352765200444393, guid: 59a68b0305a304d4d8aa18e6fe1d5781, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 40.55 objectReference: {fileID: 0} - target: {fileID: 7271352765200444393, guid: 59a68b0305a304d4d8aa18e6fe1d5781, type: 3} propertyPath: m_AnchoredPosition.y diff --git a/Explorer/Assets/DCL/PluginSystem/Global/ExplorePanelPlugin.cs b/Explorer/Assets/DCL/PluginSystem/Global/ExplorePanelPlugin.cs index 07a32a9f7a..c07ab03fa3 100644 --- a/Explorer/Assets/DCL/PluginSystem/Global/ExplorePanelPlugin.cs +++ b/Explorer/Assets/DCL/PluginSystem/Global/ExplorePanelPlugin.cs @@ -1,15 +1,20 @@ using Arch.SystemGroups; using Cysharp.Threading.Tasks; using DCL.AssetsProvision; +using DCL.AvatarRendering.Wearables.Helpers; using DCL.Backpack; +using DCL.Backpack.BackpackBus; using DCL.ExplorePanel; using DCL.Navmap; using DCL.ParcelsService; using DCL.PlacesAPIService; +using DCL.Profiles; using DCL.Settings; +using DCL.Web3Authentication.Identities; using DCL.WebRequests; using Global.Dynamic; using MVC; +using System; using System.Threading; using UnityEngine; using UnityEngine.AddressableAssets; @@ -24,8 +29,13 @@ public class ExplorePanelPlugin : IDCLGlobalPlugin(), mapRendererContainer.MapRenderer, placesAPIService, teleportController, webRequestController); await navmapController.InitialiseAssetsAsync(assetsProvisioner, ct); - (ProvidedAsset rarityColorMappings, ProvidedAsset categoryIconsMapping, ProvidedAsset rarityBackgroundsMapping) = await UniTask.WhenAll( + (ProvidedAsset rarityColorMappings, ProvidedAsset categoryIconsMapping, ProvidedAsset rarityBackgroundsMapping, ProvidedAsset rarityInfoPanelBackgroundsMapping) = await UniTask.WhenAll( assetsProvisioner.ProvideMainAssetAsync(backpackSettings.RarityColorMappings, ct), assetsProvisioner.ProvideMainAssetAsync(backpackSettings.CategoryIconsMapping, ct), - assetsProvisioner.ProvideMainAssetAsync(backpackSettings.RarityBackgroundsMapping, ct)); + assetsProvisioner.ProvideMainAssetAsync(backpackSettings.RarityBackgroundsMapping, ct), + assetsProvisioner.ProvideMainAssetAsync(backpackSettings.RarityInfoPanelBackgroundsMapping, ct)); SettingsController settingsController = new SettingsController(explorePanelView.GetComponentInChildren()); - BackpackControler backpackController = new BackpackControler(explorePanelView.GetComponentInChildren(), rarityBackgroundsMapping.Value, categoryIconsMapping.Value, rarityColorMappings.Value); + backpackController = new BackpackControler(explorePanelView.GetComponentInChildren(), rarityBackgroundsMapping.Value, rarityInfoPanelBackgroundsMapping.Value, categoryIconsMapping.Value, rarityColorMappings.Value, backpackCommandBus, backpackEventBus, web3IdentityCache, wearableCatalog); + await backpackController.InitialiseAssetsAsync(assetsProvisioner, ct); mvcManager.RegisterController(new ExplorePanelController(viewFactoryMethod, navmapController, settingsController, backpackController)); @@ -68,17 +88,20 @@ public async UniTask InitializeAsync(ExplorePanelSettings settings, Cancellation (await assetsProvisioner.ProvideMainAssetAsync(settings.PersistentExploreOpenerPrefab, ct: ct)).Value.GetComponent(), null), mvcManager) ); - //Create here navmap plugin and pass a setting with reference to the navmapview - mvcManager.ShowAsync(PersistentExplorePanelOpenerController.IssueCommand(new EmptyParameter())).Forget(); } public void Dispose() { navmapController.Dispose(); + backpackController.Dispose(); } - public void InjectToWorld(ref ArchSystemsWorldBuilder builder, in GlobalPluginArguments arguments) { } + public void InjectToWorld(ref ArchSystemsWorldBuilder builder, in GlobalPluginArguments arguments) + { + backpackController.InjectToWorld(ref builder, arguments.PlayerEntity); + + } public class ExplorePanelSettings : IDCLPluginSettings { diff --git a/Explorer/Assets/DCL/PluginSystem/Global/WearablePlugin.cs b/Explorer/Assets/DCL/PluginSystem/Global/WearablePlugin.cs index acc5fc09c0..0cfc1b13d4 100644 --- a/Explorer/Assets/DCL/PluginSystem/Global/WearablePlugin.cs +++ b/Explorer/Assets/DCL/PluginSystem/Global/WearablePlugin.cs @@ -40,15 +40,15 @@ public class WearablePlugin : IDCLGlobalPlugin private WearablesDTOList defaultWearablesDTOs; private GameObject defaultEmptyWearableAsset; - public WearablePlugin(IAssetsProvisioner assetsProvisioner, IWebRequestController webRequestController, IRealmData realmData, URLDomain assetBundleURL, CacheCleaner cacheCleaner) + public WearablePlugin(IAssetsProvisioner assetsProvisioner, IWebRequestController webRequestController, IRealmData realmData, URLDomain assetBundleURL, CacheCleaner cacheCleaner, IWearableCatalog wearableCatalog) { - wearableCatalog = new WearableCatalog(); + this.wearableCatalog = wearableCatalog; this.assetsProvisioner = assetsProvisioner; this.webRequestController = webRequestController; this.realmData = realmData; this.assetBundleURL = assetBundleURL; - cacheCleaner.Register(wearableCatalog); + cacheCleaner.Register(this.wearableCatalog); } public void Dispose() { } @@ -77,6 +77,7 @@ public void InjectToWorld(ref ArchSystemsWorldBuilder builder, in GlobalP LoadWearableAssetBundleManifestSystem.InjectToWorld(ref builder, webRequestController, new NoCache(true, true), mutexSync, assetBundleURL); LoadDefaultWearablesSystem.InjectToWorld(ref builder, defaultWearablesDTOs, defaultEmptyWearableAsset, wearableCatalog); + ResolveWearableThumbnailSystem.InjectToWorld(ref builder); } [Serializable] diff --git a/Explorer/Assets/DCL/PluginSystem/World/TexturesLoadingPlugin.cs b/Explorer/Assets/DCL/PluginSystem/World/TexturesLoadingPlugin.cs index eac870e672..a036aa343b 100644 --- a/Explorer/Assets/DCL/PluginSystem/World/TexturesLoadingPlugin.cs +++ b/Explorer/Assets/DCL/PluginSystem/World/TexturesLoadingPlugin.cs @@ -1,14 +1,19 @@ using Arch.SystemGroups; +using Cysharp.Threading.Tasks; +using DCL.PluginSystem.Global; using DCL.PluginSystem.World.Dependencies; using DCL.ResourcesUnloading; using DCL.WebRequests; using ECS.LifeCycle; using ECS.StreamableLoading.Textures; +using System; using System.Collections.Generic; +using System.Threading; +using Utility.Multithreading; namespace DCL.PluginSystem.World { - public class TexturesLoadingPlugin : IDCLWorldPluginWithoutSettings + public class TexturesLoadingPlugin : IDCLWorldPluginWithoutSettings, IDCLGlobalPluginWithoutSettings { private readonly IWebRequestController webRequestController; @@ -26,5 +31,22 @@ public void InjectToWorld(ref ArchSystemsWorldBuilder builder, } public void InjectToEmptySceneWorld(ref ArchSystemsWorldBuilder builder, in EmptyScenesWorldSharedDependencies dependencies) { } + + public void InjectToWorld(ref ArchSystemsWorldBuilder builder, in GlobalPluginArguments arguments) + { + LoadGlobalTextureSystem.InjectToWorld(ref builder, texturesCache, webRequestController, new MutexSync()); + } + +#region Interface Ambiguity + UniTask IDCLPlugin.Initialize(IPluginSettingsContainer container, CancellationToken ct) => + UniTask.CompletedTask; + + UniTask IDCLPlugin.InitializeAsync(NoExposedPluginSettings settings, CancellationToken ct) => + UniTask.CompletedTask; + + void IDisposable.Dispose() + { + } +#endregion } } diff --git a/Explorer/Assets/DCL/UI/Assets/LoadingBright.prefab b/Explorer/Assets/DCL/UI/Assets/LoadingBright.prefab new file mode 100644 index 0000000000..d90bd60a31 --- /dev/null +++ b/Explorer/Assets/DCL/UI/Assets/LoadingBright.prefab @@ -0,0 +1,184 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &6458207428926114633 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8147157649779008060} + - component: {fileID: 7062625370333326512} + - component: {fileID: 2287322344157701924} + m_Layer: 5 + m_Name: AnimatedLoading + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8147157649779008060 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6458207428926114633} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 3066730706478737799} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 0, y: -63.08795} + m_SizeDelta: {x: 126, y: 126.1757} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7062625370333326512 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6458207428926114633} + m_CullTransparentMesh: 1 +--- !u!114 &2287322344157701924 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6458207428926114633} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: b225edcd186224e19b5d8fdc24a08999, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 2 +--- !u!1 &6647536690506209645 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3066730706478737799} + - component: {fileID: 2426399572752873351} + - component: {fileID: 3234025837055934583} + - component: {fileID: 130931977801250836} + - component: {fileID: -5756551260522624465} + m_Layer: 5 + m_Name: LoadingBright + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3066730706478737799 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6647536690506209645} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 8147157649779008060} + m_Father: {fileID: 0} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 0, y: -69.08783} + m_SizeDelta: {x: 126, y: 126.1757} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2426399572752873351 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6647536690506209645} + m_CullTransparentMesh: 1 +--- !u!114 &3234025837055934583 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6647536690506209645} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.8039216, g: 0.6039216, b: 0.99607843, a: 0.2} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 12dd1efc4e826764f9b02be515a9a033, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 2 +--- !u!114 &130931977801250836 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6647536690506209645} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ShowMaskGraphic: 1 +--- !u!114 &-5756551260522624465 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6647536690506209645} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ff6d72cd75e9740bf8a28557b12e70c6, type: 3} + m_Name: + m_EditorClassIdentifier: + k__BackingField: {fileID: 3066730706478737799} + k__BackingField: {fileID: 8147157649779008060} diff --git a/Explorer/Assets/DCL/UI/Assets/LoadingBright.prefab.meta b/Explorer/Assets/DCL/UI/Assets/LoadingBright.prefab.meta new file mode 100644 index 0000000000..6b7182fafa --- /dev/null +++ b/Explorer/Assets/DCL/UI/Assets/LoadingBright.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 896b313ccb63b47999d8596c72449d6d +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Explorer/Assets/DCL/UI/LoadingBrightView.cs b/Explorer/Assets/DCL/UI/LoadingBrightView.cs new file mode 100644 index 0000000000..d7c0d252c1 --- /dev/null +++ b/Explorer/Assets/DCL/UI/LoadingBrightView.cs @@ -0,0 +1,31 @@ +using DG.Tweening; +using UnityEngine; + +namespace DCL.UI +{ + public class LoadingBrightView : MonoBehaviour + { + [field: SerializeField] + private RectTransform referenceParent { get; set; } + + [field: SerializeField] + private RectTransform loadingBrightObject { get; set; } + + private Tween loadingTween; + + public void StartLoadingAnimation(GameObject loadingHide) + { + gameObject.SetActive(true); + loadingHide.SetActive(false); + loadingBrightObject.anchoredPosition = new Vector2(-referenceParent.rect.width, loadingBrightObject.anchoredPosition.y); + loadingTween = loadingBrightObject.DOAnchorPosX(referenceParent.rect.width, 1f).SetEase(Ease.Linear).SetLoops(-1, LoopType.Restart); + } + + public void FinishLoadingAnimation(GameObject loadingHide) + { + gameObject.SetActive(false); + loadingHide.SetActive(true); + loadingTween.Kill(); + } + } +} diff --git a/Explorer/Assets/DCL/UI/LoadingBrightView.cs.meta b/Explorer/Assets/DCL/UI/LoadingBrightView.cs.meta new file mode 100644 index 0000000000..a419f4a2a4 --- /dev/null +++ b/Explorer/Assets/DCL/UI/LoadingBrightView.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: ff6d72cd75e9740bf8a28557b12e70c6 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Explorer/Assets/Locales/Localization Tables/UI Text Localization Table Shared Data.asset b/Explorer/Assets/Locales/Localization Tables/UI Text Localization Table Shared Data.asset index 4483716b3e..319850d862 100644 --- a/Explorer/Assets/Locales/Localization Tables/UI Text Localization Table Shared Data.asset +++ b/Explorer/Assets/Locales/Localization Tables/UI Text Localization Table Shared Data.asset @@ -14,7 +14,11 @@ MonoBehaviour: m_EditorClassIdentifier: m_TableCollectionName: UI Text Localization Table m_TableCollectionNameGuidString: fa6d78a0e08f14179b202ccca9720bb9 - m_Entries: [] + m_Entries: + - m_Id: 23119123067166720 + m_Key: Backpack + m_Metadata: + m_Items: [] m_Metadata: m_Items: [] m_KeyGenerator: diff --git a/Explorer/Assets/Locales/Localization Tables/UI Text Localization Table_en.asset b/Explorer/Assets/Locales/Localization Tables/UI Text Localization Table_en.asset index 18fadf60ff..20cb90c3b7 100644 --- a/Explorer/Assets/Locales/Localization Tables/UI Text Localization Table_en.asset +++ b/Explorer/Assets/Locales/Localization Tables/UI Text Localization Table_en.asset @@ -17,7 +17,11 @@ MonoBehaviour: m_SharedData: {fileID: 11400000, guid: fa6d78a0e08f14179b202ccca9720bb9, type: 2} m_Metadata: m_Items: [] - m_TableData: [] + m_TableData: + - m_Id: 23119123067166720 + m_Localized: Backpack + m_Metadata: + m_Items: [] references: version: 2 RefIds: [] diff --git a/Explorer/Assets/Locales/Localization Tables/UI Text Localization Table_es.asset b/Explorer/Assets/Locales/Localization Tables/UI Text Localization Table_es.asset index 73d76f2a5e..f9af3ebb1f 100644 --- a/Explorer/Assets/Locales/Localization Tables/UI Text Localization Table_es.asset +++ b/Explorer/Assets/Locales/Localization Tables/UI Text Localization Table_es.asset @@ -17,7 +17,11 @@ MonoBehaviour: m_SharedData: {fileID: 11400000, guid: fa6d78a0e08f14179b202ccca9720bb9, type: 2} m_Metadata: m_Items: [] - m_TableData: [] + m_TableData: + - m_Id: 23119123067166720 + m_Localized: Inventario + m_Metadata: + m_Items: [] references: version: 2 RefIds: [] diff --git a/Explorer/Assets/Locales/Localization Tables/UI Text Localization Table_it.asset b/Explorer/Assets/Locales/Localization Tables/UI Text Localization Table_it.asset index 845a551e17..51f6c14d3b 100644 --- a/Explorer/Assets/Locales/Localization Tables/UI Text Localization Table_it.asset +++ b/Explorer/Assets/Locales/Localization Tables/UI Text Localization Table_it.asset @@ -17,7 +17,11 @@ MonoBehaviour: m_SharedData: {fileID: 11400000, guid: fa6d78a0e08f14179b202ccca9720bb9, type: 2} m_Metadata: m_Items: [] - m_TableData: [] + m_TableData: + - m_Id: 23119123067166720 + m_Localized: Inventario + m_Metadata: + m_Items: [] references: version: 2 RefIds: [] diff --git a/Explorer/Assets/Scenes/DynamicSceneLoading.unity b/Explorer/Assets/Scenes/DynamicSceneLoading.unity index 122b3f6d8e..2cc2337aaa 100644 --- a/Explorer/Assets/Scenes/DynamicSceneLoading.unity +++ b/Explorer/Assets/Scenes/DynamicSceneLoading.unity @@ -328,6 +328,11 @@ MonoBehaviour: m_SubObjectName: m_SubObjectType: m_EditorAssetChanged: 0 + k__BackingField: + m_AssetGUID: 66f8f8427a5c4443e95b0d298addd639 + m_SubObjectName: + m_SubObjectType: + m_EditorAssetChanged: 0 k__BackingField: m_AssetGUID: 7491e2fb7fd484d2b8aed984dfc7c6ab m_SubObjectName: diff --git a/Explorer/Assets/Scripts/ECS/StreamableLoading/Textures/LoadGlobalTextureSystem.cs b/Explorer/Assets/Scripts/ECS/StreamableLoading/Textures/LoadGlobalTextureSystem.cs new file mode 100644 index 0000000000..cd5df290b3 --- /dev/null +++ b/Explorer/Assets/Scripts/ECS/StreamableLoading/Textures/LoadGlobalTextureSystem.cs @@ -0,0 +1,22 @@ +using Arch.Core; +using Arch.SystemGroups; +using Arch.SystemGroups.DefaultSystemGroups; +using DCL.Diagnostics; +using DCL.WebRequests; +using ECS.StreamableLoading.AssetBundles; +using ECS.StreamableLoading.Cache; +using UnityEngine; +using Utility.Multithreading; + +namespace ECS.StreamableLoading.Textures +{ + /// + /// We need a separate class to override the UpdateInGroup attribute + /// + [UpdateInGroup(typeof(PresentationSystemGroup))] + [LogCategory(ReportCategory.TEXTURES)] + public partial class LoadGlobalTextureSystem : LoadTextureSystem + { + internal LoadGlobalTextureSystem(World world, IStreamableCache cache, IWebRequestController webRequestController, MutexSync mutexSync) : base(world, cache,webRequestController, mutexSync) { } + } +} diff --git a/Explorer/Assets/Scripts/ECS/StreamableLoading/Textures/LoadGlobalTextureSystem.cs.meta b/Explorer/Assets/Scripts/ECS/StreamableLoading/Textures/LoadGlobalTextureSystem.cs.meta new file mode 100644 index 0000000000..a71162b069 --- /dev/null +++ b/Explorer/Assets/Scripts/ECS/StreamableLoading/Textures/LoadGlobalTextureSystem.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: ca73b61b4ce64b7197d6f489218ae923 +timeCreated: 1704222679 \ No newline at end of file diff --git a/Explorer/Assets/Scripts/Global/Dynamic/DynamicWorldContainer.cs b/Explorer/Assets/Scripts/Global/Dynamic/DynamicWorldContainer.cs index 0dac87ef30..80a201ce0c 100644 --- a/Explorer/Assets/Scripts/Global/Dynamic/DynamicWorldContainer.cs +++ b/Explorer/Assets/Scripts/Global/Dynamic/DynamicWorldContainer.cs @@ -1,6 +1,9 @@ using CommunicationData.URLHelpers; using Cysharp.Threading.Tasks; using DCL.AvatarRendering.Wearables; +using DCL.AvatarRendering.Wearables.Helpers; +using DCL.Backpack; +using DCL.Backpack.BackpackBus; using DCL.Browser; using DCL.DebugUtilities; using DCL.ParcelsService; @@ -79,6 +82,9 @@ public void Dispose() mvcManager = new MVCManager(new WindowStackManager(), new CancellationTokenSource(), popupCloserView); MapRendererContainer mapRendererContainer = await MapRendererContainer.CreateAsync(staticContainer, dynamicSettings.MapRendererSettings, ct); var placesAPIService = new PlacesAPIService(new PlacesAPIClient(staticContainer.WebRequestsContainer.WebRequestController)); + var wearableCatalog = new WearableCatalog(); + var backpackCommandBus = new BackpackCommandBus(); + var backpackEventBus = new BackpackEventBus(); IProfileCache profileCache = new DefaultProfileCache(); container.ProfileRepository = new RealmProfileRepository(staticContainer.WebRequestsContainer.WebRequestController, realmData, @@ -90,14 +96,26 @@ public void Dispose() new InputPlugin(dclInput), new GlobalInteractionPlugin(dclInput, rootUIDocument, staticContainer.AssetsProvisioner, staticContainer.EntityCollidersGlobalCache, exposedGlobalDataContainer.GlobalInputEvents), new CharacterCameraPlugin(staticContainer.AssetsProvisioner, realmSamplingData, exposedGlobalDataContainer.CameraSamplingData, exposedGlobalDataContainer.ExposedCameraData), + new WearablePlugin(staticContainer.AssetsProvisioner, staticContainer.WebRequestsContainer.WebRequestController, realmData, ASSET_BUNDLES_URL, staticContainer.CacheCleaner, wearableCatalog), new ProfilingPlugin(staticContainer.ProfilingProvider, staticContainer.SingletonSharedDependencies.FrameTimeBudget, staticContainer.SingletonSharedDependencies.MemoryBudget, debugBuilder), - new WearablePlugin(staticContainer.AssetsProvisioner, staticContainer.WebRequestsContainer.WebRequestController, realmData, ASSET_BUNDLES_URL, staticContainer.CacheCleaner), new AvatarPlugin(staticContainer.ComponentsContainer.ComponentPoolsRegistry, staticContainer.AssetsProvisioner, staticContainer.SingletonSharedDependencies.FrameTimeBudget, staticContainer.SingletonSharedDependencies.MemoryBudget, realmData, debugBuilder, staticContainer.CacheCleaner), new ProfilePlugin(container.ProfileRepository, profileCache, staticContainer.CacheCleaner, new ProfileIntentionCache()), new MapRendererPlugin(mapRendererContainer.MapRenderer), new MinimapPlugin(staticContainer.AssetsProvisioner, mvcManager, mapRendererContainer, placesAPIService), - new ExplorePanelPlugin(staticContainer.AssetsProvisioner, mvcManager, mapRendererContainer, placesAPIService, parcelServiceContainer.TeleportController, dynamicSettings.BackpackSettings, staticContainer.WebRequestsContainer.WebRequestController), + new ExplorePanelPlugin( + staticContainer.AssetsProvisioner, + mvcManager, + mapRendererContainer, + placesAPIService, + parcelServiceContainer.TeleportController, + dynamicSettings.BackpackSettings, + backpackCommandBus, + backpackEventBus, + staticContainer.WebRequestsContainer.WebRequestController, + storedIdentityProvider, + wearableCatalog), + new WebRequestsPlugin(staticContainer.WebRequestsContainer.AnalyticsContainer, debugBuilder), new Web3AuthenticationPlugin(staticContainer.AssetsProvisioner, web3Authenticator, debugBuilder, mvcManager, container.ProfileRepository, new UnityAppWebBrowser(), realmData, storedIdentityProvider), new SkyBoxPlugin(debugBuilder, skyBoxSceneData), diff --git a/Explorer/Assets/Scripts/Global/StaticContainer.cs b/Explorer/Assets/Scripts/Global/StaticContainer.cs index 2689e4da66..4567534fc5 100644 --- a/Explorer/Assets/Scripts/Global/StaticContainer.cs +++ b/Explorer/Assets/Scripts/Global/StaticContainer.cs @@ -138,6 +138,7 @@ await UniTask.WhenAll( container.PhysicsTickProvider = new PhysicsTickProvider(); var assetBundlePlugin = new AssetBundlesPlugin(container.ReportHandlingSettings, container.CacheCleaner); + var textureResolvePlugin = new TexturesLoadingPlugin(container.WebRequestsContainer.WebRequestController, container.CacheCleaner); container.ECSWorldPlugins = new IDCLWorldPlugin[] { @@ -145,7 +146,7 @@ await UniTask.WhenAll( new BillboardPlugin(exposedGlobalDataContainer.ExposedCameraData), new TextShapePlugin(sharedDependencies.FrameTimeBudget, componentsContainer.ComponentPoolsRegistry, settingsContainer), new MaterialsPlugin(sharedDependencies, addressablesProvisioner), - new TexturesLoadingPlugin(container.WebRequestsContainer.WebRequestController, container.CacheCleaner), + textureResolvePlugin, new AssetsCollidersPlugin(sharedDependencies, container.PhysicsTickProvider), new PrimitivesRenderingPlugin(sharedDependencies), @@ -162,6 +163,7 @@ await UniTask.WhenAll( { assetBundlePlugin, new ResourceUnloadingPlugin(sharedDependencies.MemoryBudget, container.CacheCleaner), + textureResolvePlugin, }; return (container, true); diff --git a/Explorer/Assets/Textures/BackpackPanel/AccesoriesIcon.png b/Explorer/Assets/Textures/BackpackPanel/AccesoriesIcon.png deleted file mode 100755 index 93d95cea83..0000000000 --- a/Explorer/Assets/Textures/BackpackPanel/AccesoriesIcon.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d1d04eefadba45f72791d93289564a87abfa9e3681e3f18c85c777895d2bb382 -size 736 diff --git a/Explorer/Assets/Textures/BackpackPanel/AllIcon.png b/Explorer/Assets/Textures/BackpackPanel/AllIcon.png new file mode 100755 index 0000000000..130292f4a6 --- /dev/null +++ b/Explorer/Assets/Textures/BackpackPanel/AllIcon.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:acaad7bb1194099053d970aedc497814998b7e36e16a183174f9dd18f5435688 +size 2279 diff --git a/Explorer/Assets/Textures/BackpackPanel/AllIcon.png.meta b/Explorer/Assets/Textures/BackpackPanel/AllIcon.png.meta new file mode 100644 index 0000000000..5699556bab --- /dev/null +++ b/Explorer/Assets/Textures/BackpackPanel/AllIcon.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: e568dcbc864c24ab1a9b731a66e362cb +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 0 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 0 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 128 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Explorer/Assets/Textures/BackpackPanel/BackpackBackground.png b/Explorer/Assets/Textures/BackpackPanel/BackpackBackground.png index 0e6ff84c15..6c73f48853 100644 --- a/Explorer/Assets/Textures/BackpackPanel/BackpackBackground.png +++ b/Explorer/Assets/Textures/BackpackPanel/BackpackBackground.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e6b34011128804006c9dc521d73b0e61b9e5bb4c330c18cc6e1a32af609e29f1 -size 4619272 +oid sha256:3036d2cb9dd4f4a86dbb9df84e7df6684be22c962a7c41deaff42df36cfee70e +size 108366 diff --git a/Explorer/Assets/Textures/BackpackPanel/BackpackBackground.png.meta b/Explorer/Assets/Textures/BackpackPanel/BackpackBackground.png.meta index 3be177e8a6..0b4a5a3885 100644 --- a/Explorer/Assets/Textures/BackpackPanel/BackpackBackground.png.meta +++ b/Explorer/Assets/Textures/BackpackPanel/BackpackBackground.png.meta @@ -45,12 +45,12 @@ TextureImporter: compressionQuality: 50 spriteMode: 1 spriteExtrude: 1 - spriteMeshType: 1 + spriteMeshType: 0 alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 + spriteGenerateFallbackPhysicsShape: 0 alphaUsage: 1 alphaIsTransparency: 1 spriteTessellationDetail: -1 @@ -69,7 +69,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 + maxTextureSize: 1024 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 @@ -113,7 +113,7 @@ TextureImporter: physicsShape: [] bones: [] spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 + internalID: 1537655665 vertices: [] indices: edges: [] diff --git a/Explorer/Assets/Textures/BackpackPanel/BodyIcon.png.meta b/Explorer/Assets/Textures/BackpackPanel/BodyIcon.png.meta index 92ed7b4248..caecfaaa0c 100644 --- a/Explorer/Assets/Textures/BackpackPanel/BodyIcon.png.meta +++ b/Explorer/Assets/Textures/BackpackPanel/BodyIcon.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 0078c7406afb34e2d8bc608d0ea03203 +guid: 98bae2808161c4d678b3f5d109a5ee80 TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -45,12 +45,12 @@ TextureImporter: compressionQuality: 50 spriteMode: 1 spriteExtrude: 1 - spriteMeshType: 1 + spriteMeshType: 0 alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 + spriteGenerateFallbackPhysicsShape: 0 alphaUsage: 1 alphaIsTransparency: 1 spriteTessellationDetail: -1 @@ -63,16 +63,16 @@ TextureImporter: compressionQualitySet: 0 textureFormatSet: 0 ignorePngGamma: 0 - applyGammaDecoding: 0 + applyGammaDecoding: 1 swizzle: 50462976 - cookieLightType: 0 + cookieLightType: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 + maxTextureSize: 128 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -82,10 +82,23 @@ TextureImporter: forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: Standalone - maxTextureSize: 2048 + maxTextureSize: 128 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 128 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -95,10 +108,10 @@ TextureImporter: forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: Server - maxTextureSize: 2048 + maxTextureSize: 128 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -112,7 +125,7 @@ TextureImporter: outline: [] physicsShape: [] bones: [] - spriteID: 5e97eb03825dee720800000000000000 + spriteID: 485a8782b9bec404e8dc73f34af5162b internalID: 0 vertices: [] indices: diff --git a/Explorer/Assets/Textures/BackpackPanel/BottomIcon.png.meta b/Explorer/Assets/Textures/BackpackPanel/BottomIcon.png.meta index 444b7de80d..edef34c8f7 100644 --- a/Explorer/Assets/Textures/BackpackPanel/BottomIcon.png.meta +++ b/Explorer/Assets/Textures/BackpackPanel/BottomIcon.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: c0c541fe1a4c54b07b590db1f95cd07b +guid: bf9cd8edf950343a9ba38284a615c606 TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -45,12 +45,12 @@ TextureImporter: compressionQuality: 50 spriteMode: 1 spriteExtrude: 1 - spriteMeshType: 1 + spriteMeshType: 0 alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 + spriteGenerateFallbackPhysicsShape: 0 alphaUsage: 1 alphaIsTransparency: 1 spriteTessellationDetail: -1 @@ -63,16 +63,16 @@ TextureImporter: compressionQualitySet: 0 textureFormatSet: 0 ignorePngGamma: 0 - applyGammaDecoding: 0 + applyGammaDecoding: 1 swizzle: 50462976 - cookieLightType: 0 + cookieLightType: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 + maxTextureSize: 128 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -82,10 +82,23 @@ TextureImporter: forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: Standalone - maxTextureSize: 2048 + maxTextureSize: 128 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 128 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -95,10 +108,10 @@ TextureImporter: forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: Server - maxTextureSize: 2048 + maxTextureSize: 128 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -112,7 +125,7 @@ TextureImporter: outline: [] physicsShape: [] bones: [] - spriteID: 5e97eb03825dee720800000000000000 + spriteID: 3a6b8c378045246d2989ca263961f997 internalID: 0 vertices: [] indices: diff --git a/Explorer/Assets/Textures/BackpackPanel/BrightLoading.png b/Explorer/Assets/Textures/BackpackPanel/BrightLoading.png new file mode 100644 index 0000000000..db3d5e4c2b --- /dev/null +++ b/Explorer/Assets/Textures/BackpackPanel/BrightLoading.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:422ceea098c2ccea3a030fd7df33049bf44a7268b5975580623430772b973059 +size 84629 diff --git a/Explorer/Assets/Textures/BackpackPanel/Rainbow.png.meta b/Explorer/Assets/Textures/BackpackPanel/BrightLoading.png.meta similarity index 98% rename from Explorer/Assets/Textures/BackpackPanel/Rainbow.png.meta rename to Explorer/Assets/Textures/BackpackPanel/BrightLoading.png.meta index f06446d65c..eb885c88b2 100644 --- a/Explorer/Assets/Textures/BackpackPanel/Rainbow.png.meta +++ b/Explorer/Assets/Textures/BackpackPanel/BrightLoading.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 55f9c2592118840fc9ced5692cced894 +guid: b225edcd186224e19b5d8fdc24a08999 TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/Explorer/Assets/Textures/BackpackPanel/CheckmarkGreen.png.meta b/Explorer/Assets/Textures/BackpackPanel/CheckmarkGreen.png.meta index 1a0e8eae5e..77f1367bd9 100644 --- a/Explorer/Assets/Textures/BackpackPanel/CheckmarkGreen.png.meta +++ b/Explorer/Assets/Textures/BackpackPanel/CheckmarkGreen.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 663f92e00a3514151ac5152a95a40dbe +guid: eb045bd1671ab4469815a093d8e7ab8e TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -45,12 +45,12 @@ TextureImporter: compressionQuality: 50 spriteMode: 1 spriteExtrude: 1 - spriteMeshType: 1 + spriteMeshType: 0 alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 + spriteGenerateFallbackPhysicsShape: 0 alphaUsage: 1 alphaIsTransparency: 1 spriteTessellationDetail: -1 @@ -69,7 +69,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 + maxTextureSize: 64 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 diff --git a/Explorer/Assets/Textures/BackpackPanel/CheckmarkIcn.png b/Explorer/Assets/Textures/BackpackPanel/CheckmarkIcn.png new file mode 100755 index 0000000000..66dfff6b43 --- /dev/null +++ b/Explorer/Assets/Textures/BackpackPanel/CheckmarkIcn.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fefa288659ba6df0f5396444b911eda9d5893646f2778389d503933b35bc2c83 +size 304 diff --git a/Explorer/Assets/Textures/BackpackPanel/CheckmarkIcn.png.meta b/Explorer/Assets/Textures/BackpackPanel/CheckmarkIcn.png.meta new file mode 100644 index 0000000000..b1ad84b82c --- /dev/null +++ b/Explorer/Assets/Textures/BackpackPanel/CheckmarkIcn.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: 26a52df623c514a6087f35458a11ab2d +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 0 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 0 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 128 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Explorer/Assets/Textures/BackpackPanel/CloseIcn.png b/Explorer/Assets/Textures/BackpackPanel/CloseIcn.png new file mode 100644 index 0000000000..912899815b --- /dev/null +++ b/Explorer/Assets/Textures/BackpackPanel/CloseIcn.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9d751af8ec2813679a81ed185aff4ab3e13ba046b9537a3a35c3aad948016fae +size 473 diff --git a/Explorer/Assets/Textures/BackpackPanel/CloseIcn.png.meta b/Explorer/Assets/Textures/BackpackPanel/CloseIcn.png.meta new file mode 100644 index 0000000000..8822739f92 --- /dev/null +++ b/Explorer/Assets/Textures/BackpackPanel/CloseIcn.png.meta @@ -0,0 +1,140 @@ +fileFormatVersion: 2 +guid: f49bfce399a8c41568bf017a951a357a +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 0 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 0 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 1 + swizzle: 50462976 + cookieLightType: 1 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 64 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 64 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 64 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 64 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 9b42678479faa4000841c67d2721a7dd + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Explorer/Assets/Textures/BackpackPanel/CornerFlap.png b/Explorer/Assets/Textures/BackpackPanel/CornerFlap.png old mode 100644 new mode 100755 index 78aa8213a9..e76c9e0aa6 --- a/Explorer/Assets/Textures/BackpackPanel/CornerFlap.png +++ b/Explorer/Assets/Textures/BackpackPanel/CornerFlap.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1398b14267fa86b1375a05850556050843c69d91a82dc02d16bd1276f1660124 -size 862 +oid sha256:4652abb1afa73247cc9bdf5f3e8e23a3e4ec82a4f4a336e7c5b93dfb98b0ea06 +size 423 diff --git a/Explorer/Assets/Textures/BackpackPanel/CornerFlap.png.meta b/Explorer/Assets/Textures/BackpackPanel/CornerFlap.png.meta index a38df7489c..6b3dbba880 100644 --- a/Explorer/Assets/Textures/BackpackPanel/CornerFlap.png.meta +++ b/Explorer/Assets/Textures/BackpackPanel/CornerFlap.png.meta @@ -45,12 +45,12 @@ TextureImporter: compressionQuality: 50 spriteMode: 1 spriteExtrude: 1 - spriteMeshType: 1 + spriteMeshType: 0 alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 + spriteGenerateFallbackPhysicsShape: 0 alphaUsage: 1 alphaIsTransparency: 1 spriteTessellationDetail: -1 diff --git a/Explorer/Assets/Textures/BackpackPanel/EarringsIcon.png.meta b/Explorer/Assets/Textures/BackpackPanel/EarringsIcon.png.meta index 3f71b643c3..4cf55ac015 100644 --- a/Explorer/Assets/Textures/BackpackPanel/EarringsIcon.png.meta +++ b/Explorer/Assets/Textures/BackpackPanel/EarringsIcon.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 2de3e59cb38ea4911ab7a9fdb1d2406b +guid: 98a2ad67412f444ee883c03d3a07dd1e TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -45,12 +45,12 @@ TextureImporter: compressionQuality: 50 spriteMode: 1 spriteExtrude: 1 - spriteMeshType: 1 + spriteMeshType: 0 alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 + spriteGenerateFallbackPhysicsShape: 0 alphaUsage: 1 alphaIsTransparency: 1 spriteTessellationDetail: -1 @@ -63,16 +63,16 @@ TextureImporter: compressionQualitySet: 0 textureFormatSet: 0 ignorePngGamma: 0 - applyGammaDecoding: 0 + applyGammaDecoding: 1 swizzle: 50462976 - cookieLightType: 0 + cookieLightType: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 + maxTextureSize: 128 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -82,10 +82,23 @@ TextureImporter: forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: Standalone - maxTextureSize: 2048 + maxTextureSize: 128 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 128 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -95,10 +108,10 @@ TextureImporter: forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: Server - maxTextureSize: 2048 + maxTextureSize: 128 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -112,7 +125,7 @@ TextureImporter: outline: [] physicsShape: [] bones: [] - spriteID: 5e97eb03825dee720800000000000000 + spriteID: aeb6896edfd244d409d8aa8acdf17f35 internalID: 0 vertices: [] indices: diff --git a/Explorer/Assets/Textures/BackpackPanel/EmotesIcon.png.meta b/Explorer/Assets/Textures/BackpackPanel/EmotesIcon.png.meta index 0dc25ef0ce..cd827da7a5 100644 --- a/Explorer/Assets/Textures/BackpackPanel/EmotesIcon.png.meta +++ b/Explorer/Assets/Textures/BackpackPanel/EmotesIcon.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 23250cfbf00e34cf1b249bc6e6a0f7fc +guid: 05bc7d6b12857fb4b9b7634bf2a4f440 TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -45,12 +45,12 @@ TextureImporter: compressionQuality: 50 spriteMode: 1 spriteExtrude: 1 - spriteMeshType: 1 + spriteMeshType: 0 alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 + spriteGenerateFallbackPhysicsShape: 0 alphaUsage: 1 alphaIsTransparency: 1 spriteTessellationDetail: -1 @@ -65,11 +65,11 @@ TextureImporter: ignorePngGamma: 0 applyGammaDecoding: 0 swizzle: 50462976 - cookieLightType: 0 + cookieLightType: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 + maxTextureSize: 128 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 @@ -82,7 +82,46 @@ TextureImporter: forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: Standalone - maxTextureSize: 2048 + maxTextureSize: 128 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 128 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 128 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 128 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 @@ -95,7 +134,7 @@ TextureImporter: forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: Server - maxTextureSize: 2048 + maxTextureSize: 128 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 diff --git a/Explorer/Assets/Textures/BackpackPanel/EmptyCategoryImg.png b/Explorer/Assets/Textures/BackpackPanel/EmptyCategoryImg.png new file mode 100755 index 0000000000..3e5324e704 --- /dev/null +++ b/Explorer/Assets/Textures/BackpackPanel/EmptyCategoryImg.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3bb46f6897151d1ddef9c9bbf2697ec668047aebfaac7888c1e27a50555fe52b +size 1750 diff --git a/Explorer/Assets/Textures/BackpackPanel/EmptyCategoryImg.png.meta b/Explorer/Assets/Textures/BackpackPanel/EmptyCategoryImg.png.meta new file mode 100644 index 0000000000..5b621e332a --- /dev/null +++ b/Explorer/Assets/Textures/BackpackPanel/EmptyCategoryImg.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: 73e87750f1ef74c6fbf35cd8ae4e6c9a +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 0 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 0 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 256 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Explorer/Assets/Textures/BackpackPanel/EmptyIcon.png b/Explorer/Assets/Textures/BackpackPanel/EmptyIcon.png new file mode 100755 index 0000000000..4227e22045 --- /dev/null +++ b/Explorer/Assets/Textures/BackpackPanel/EmptyIcon.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e883cad9e31a17cd7c786147ef46520d1b3762666447b377addd0803488ff767 +size 691 diff --git a/Explorer/Assets/Textures/BackpackPanel/EmptyIcon.png.meta b/Explorer/Assets/Textures/BackpackPanel/EmptyIcon.png.meta new file mode 100644 index 0000000000..21fb32ac0a --- /dev/null +++ b/Explorer/Assets/Textures/BackpackPanel/EmptyIcon.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: 17138637340a445fd8f7c55b3e177e8c +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 0 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 0 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Explorer/Assets/Textures/BackpackPanel/EmptySearchImg.png b/Explorer/Assets/Textures/BackpackPanel/EmptySearchImg.png new file mode 100755 index 0000000000..e803d2e479 --- /dev/null +++ b/Explorer/Assets/Textures/BackpackPanel/EmptySearchImg.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1ac745314ef7085404125b0c96e26a80d5c0490f79b6c85e3a14bf54ffb69396 +size 1750 diff --git a/Explorer/Assets/Textures/BackpackPanel/EmptySearchImg.png.meta b/Explorer/Assets/Textures/BackpackPanel/EmptySearchImg.png.meta new file mode 100644 index 0000000000..d02aa9dae3 --- /dev/null +++ b/Explorer/Assets/Textures/BackpackPanel/EmptySearchImg.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: 1e25d9f1b89ab45ac89c95b027f4a639 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 0 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 0 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 256 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Explorer/Assets/Textures/BackpackPanel/EquippedOutline.png b/Explorer/Assets/Textures/BackpackPanel/EquippedOutline.png new file mode 100755 index 0000000000..d51f062fc0 --- /dev/null +++ b/Explorer/Assets/Textures/BackpackPanel/EquippedOutline.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e37c61d379d442d87aa42769483e9cb9eab534b215816bd478acb37dd3bd0eb0 +size 781 diff --git a/Explorer/Assets/Textures/Container12RectBottom.png.meta b/Explorer/Assets/Textures/BackpackPanel/EquippedOutline.png.meta similarity index 94% rename from Explorer/Assets/Textures/Container12RectBottom.png.meta rename to Explorer/Assets/Textures/BackpackPanel/EquippedOutline.png.meta index 099f7be346..6b8414dfd5 100644 --- a/Explorer/Assets/Textures/Container12RectBottom.png.meta +++ b/Explorer/Assets/Textures/BackpackPanel/EquippedOutline.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 0777b27ffb579410cbb9d7bd29774538 +guid: 08234f6b491d84966a3aa2f9d5ada40e TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -45,12 +45,12 @@ TextureImporter: compressionQuality: 50 spriteMode: 1 spriteExtrude: 1 - spriteMeshType: 1 + spriteMeshType: 0 alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 - spriteBorder: {x: 29, y: 29, z: 29, w: 29} - spriteGenerateFallbackPhysicsShape: 1 + spriteBorder: {x: 43, y: 43, z: 43, w: 43} + spriteGenerateFallbackPhysicsShape: 0 alphaUsage: 1 alphaIsTransparency: 1 spriteTessellationDetail: -1 @@ -69,7 +69,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 + maxTextureSize: 128 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 diff --git a/Explorer/Assets/Textures/BackpackPanel/ExportIcn.png b/Explorer/Assets/Textures/BackpackPanel/ExportIcn.png new file mode 100755 index 0000000000..5addc06b47 --- /dev/null +++ b/Explorer/Assets/Textures/BackpackPanel/ExportIcn.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4c4db4d16e1c7ce280e2837e54df52571bd568a764f89ab9fd1779a916bf00d3 +size 328 diff --git a/Explorer/Assets/Textures/BackpackPanel/ExportIcn.png.meta b/Explorer/Assets/Textures/BackpackPanel/ExportIcn.png.meta new file mode 100644 index 0000000000..e3f22f8e5f --- /dev/null +++ b/Explorer/Assets/Textures/BackpackPanel/ExportIcn.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: cd35a47ccc199454f8e46b36dc47ed08 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 0 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 0 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 128 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Explorer/Assets/Textures/BackpackPanel/EyebrowIcon.png.meta b/Explorer/Assets/Textures/BackpackPanel/EyebrowIcon.png.meta index f4b13e2abe..a4d6d71950 100644 --- a/Explorer/Assets/Textures/BackpackPanel/EyebrowIcon.png.meta +++ b/Explorer/Assets/Textures/BackpackPanel/EyebrowIcon.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: c0688f4e1f63c43ac9ceadb3cb50e8d9 +guid: 15c01427d7e8f4c72a16e8e1368c82a6 TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -45,12 +45,12 @@ TextureImporter: compressionQuality: 50 spriteMode: 1 spriteExtrude: 1 - spriteMeshType: 1 + spriteMeshType: 0 alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 + spriteGenerateFallbackPhysicsShape: 0 alphaUsage: 1 alphaIsTransparency: 1 spriteTessellationDetail: -1 @@ -63,16 +63,16 @@ TextureImporter: compressionQualitySet: 0 textureFormatSet: 0 ignorePngGamma: 0 - applyGammaDecoding: 0 + applyGammaDecoding: 1 swizzle: 50462976 - cookieLightType: 0 + cookieLightType: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 + maxTextureSize: 128 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -82,10 +82,23 @@ TextureImporter: forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: Standalone - maxTextureSize: 2048 + maxTextureSize: 128 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 128 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -95,10 +108,10 @@ TextureImporter: forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: Server - maxTextureSize: 2048 + maxTextureSize: 128 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -112,7 +125,7 @@ TextureImporter: outline: [] physicsShape: [] bones: [] - spriteID: 5e97eb03825dee720800000000000000 + spriteID: 06697a5d63b9b4e94b60a6b34903f1a9 internalID: 0 vertices: [] indices: diff --git a/Explorer/Assets/Textures/BackpackPanel/EyesIcon.png.meta b/Explorer/Assets/Textures/BackpackPanel/EyesIcon.png.meta index b152bd6ab3..136f3efde7 100644 --- a/Explorer/Assets/Textures/BackpackPanel/EyesIcon.png.meta +++ b/Explorer/Assets/Textures/BackpackPanel/EyesIcon.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: c006e0ed397034829a4b311fd25893fd +guid: 03b05b1004b784dc690bbff5ea268de7 TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -45,12 +45,12 @@ TextureImporter: compressionQuality: 50 spriteMode: 1 spriteExtrude: 1 - spriteMeshType: 1 + spriteMeshType: 0 alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 + spriteGenerateFallbackPhysicsShape: 0 alphaUsage: 1 alphaIsTransparency: 1 spriteTessellationDetail: -1 @@ -63,16 +63,16 @@ TextureImporter: compressionQualitySet: 0 textureFormatSet: 0 ignorePngGamma: 0 - applyGammaDecoding: 0 + applyGammaDecoding: 1 swizzle: 50462976 - cookieLightType: 0 + cookieLightType: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 + maxTextureSize: 128 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -82,10 +82,23 @@ TextureImporter: forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: Standalone - maxTextureSize: 2048 + maxTextureSize: 128 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 128 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -95,10 +108,10 @@ TextureImporter: forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: Server - maxTextureSize: 2048 + maxTextureSize: 128 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -112,7 +125,7 @@ TextureImporter: outline: [] physicsShape: [] bones: [] - spriteID: 5e97eb03825dee720800000000000000 + spriteID: bb6b8771346554fc7bf84adda937be56 internalID: 0 vertices: [] indices: diff --git a/Explorer/Assets/Textures/BackpackPanel/EyewareIcon.png b/Explorer/Assets/Textures/BackpackPanel/EyewareIcon.png index cd3f9c754a..ab0280e5ff 100755 --- a/Explorer/Assets/Textures/BackpackPanel/EyewareIcon.png +++ b/Explorer/Assets/Textures/BackpackPanel/EyewareIcon.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d0b393d117b3e63b8089028ab08b373bce9a47b3d7b563061fd7562d255a08b4 -size 500 +oid sha256:49e861f5ec16d4852b9ea34ddc94f485bc0a5019f8049e21014ddd6efedbcf06 +size 530 diff --git a/Explorer/Assets/Textures/BackpackPanel/EyewareIcon.png.meta b/Explorer/Assets/Textures/BackpackPanel/EyewareIcon.png.meta index 337aef712d..163bf07044 100644 --- a/Explorer/Assets/Textures/BackpackPanel/EyewareIcon.png.meta +++ b/Explorer/Assets/Textures/BackpackPanel/EyewareIcon.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: d306a8c2a2d6246cca8aadb1c515fd02 +guid: 1f8423c7e44934bc88742ef8c05aa4ee TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -45,12 +45,12 @@ TextureImporter: compressionQuality: 50 spriteMode: 1 spriteExtrude: 1 - spriteMeshType: 1 + spriteMeshType: 0 alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 + spriteGenerateFallbackPhysicsShape: 0 alphaUsage: 1 alphaIsTransparency: 1 spriteTessellationDetail: -1 @@ -63,16 +63,16 @@ TextureImporter: compressionQualitySet: 0 textureFormatSet: 0 ignorePngGamma: 0 - applyGammaDecoding: 0 + applyGammaDecoding: 1 swizzle: 50462976 - cookieLightType: 0 + cookieLightType: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 + maxTextureSize: 128 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -82,10 +82,23 @@ TextureImporter: forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: Standalone - maxTextureSize: 2048 + maxTextureSize: 128 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 128 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -95,10 +108,10 @@ TextureImporter: forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: Server - maxTextureSize: 2048 + maxTextureSize: 128 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -112,7 +125,7 @@ TextureImporter: outline: [] physicsShape: [] bones: [] - spriteID: 5e97eb03825dee720800000000000000 + spriteID: 0a953fbe7bde84f9dbbdee3336fa6d7f internalID: 0 vertices: [] indices: diff --git a/Explorer/Assets/Textures/BackpackPanel/FacialHairIcon.png.meta b/Explorer/Assets/Textures/BackpackPanel/FacialHairIcon.png.meta index 908cb9edda..360c624bed 100644 --- a/Explorer/Assets/Textures/BackpackPanel/FacialHairIcon.png.meta +++ b/Explorer/Assets/Textures/BackpackPanel/FacialHairIcon.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: d4b2c86b4415e43579f68810ac96e6bf +guid: 81132a1626c0d43aabeeec2414a68945 TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -45,12 +45,12 @@ TextureImporter: compressionQuality: 50 spriteMode: 1 spriteExtrude: 1 - spriteMeshType: 1 + spriteMeshType: 0 alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 + spriteGenerateFallbackPhysicsShape: 0 alphaUsage: 1 alphaIsTransparency: 1 spriteTessellationDetail: -1 @@ -63,16 +63,16 @@ TextureImporter: compressionQualitySet: 0 textureFormatSet: 0 ignorePngGamma: 0 - applyGammaDecoding: 0 + applyGammaDecoding: 1 swizzle: 50462976 - cookieLightType: 0 + cookieLightType: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 + maxTextureSize: 128 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -82,10 +82,23 @@ TextureImporter: forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: Standalone - maxTextureSize: 2048 + maxTextureSize: 128 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 128 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -95,10 +108,10 @@ TextureImporter: forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: Server - maxTextureSize: 2048 + maxTextureSize: 128 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -112,7 +125,7 @@ TextureImporter: outline: [] physicsShape: [] bones: [] - spriteID: 5e97eb03825dee720800000000000000 + spriteID: 702ae1799781e4fa8970c5d3b3be8858 internalID: 0 vertices: [] indices: diff --git a/Explorer/Assets/Textures/BackpackPanel/FilterIcn.png b/Explorer/Assets/Textures/BackpackPanel/FilterIcn.png new file mode 100644 index 0000000000..a58af9889b --- /dev/null +++ b/Explorer/Assets/Textures/BackpackPanel/FilterIcn.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:82cfa3c82e15914561721035a930da6f35258bdd3fe12f189eac1913dbb0f4d9 +size 635 diff --git a/Explorer/Assets/Textures/BackpackPanel/FilterIcn.png.meta b/Explorer/Assets/Textures/BackpackPanel/FilterIcn.png.meta new file mode 100644 index 0000000000..36e7c598ce --- /dev/null +++ b/Explorer/Assets/Textures/BackpackPanel/FilterIcn.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: 36531725cf9d948d6980e4113a2a8c58 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 0 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 0 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 64 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Explorer/Assets/Textures/BackpackPanel/FlapShadow.png b/Explorer/Assets/Textures/BackpackPanel/FlapShadow.png old mode 100644 new mode 100755 index 27d64aa2a4..8a0cf5c3ce --- a/Explorer/Assets/Textures/BackpackPanel/FlapShadow.png +++ b/Explorer/Assets/Textures/BackpackPanel/FlapShadow.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5c2b78d12a9952727eab029bbf04533a10548f822818b042c60ffe37f93bada7 -size 508 +oid sha256:07956a823caa73d475bfdac80d56dd8598e8631a8b61151c7f142c117edc242b +size 356 diff --git a/Explorer/Assets/Textures/BackpackPanel/FlapShadow.png.meta b/Explorer/Assets/Textures/BackpackPanel/FlapShadow.png.meta index 0388dfaeb4..f506ae3866 100644 --- a/Explorer/Assets/Textures/BackpackPanel/FlapShadow.png.meta +++ b/Explorer/Assets/Textures/BackpackPanel/FlapShadow.png.meta @@ -45,12 +45,12 @@ TextureImporter: compressionQuality: 50 spriteMode: 1 spriteExtrude: 1 - spriteMeshType: 1 + spriteMeshType: 0 alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 + spriteGenerateFallbackPhysicsShape: 0 alphaUsage: 1 alphaIsTransparency: 1 spriteTessellationDetail: -1 diff --git a/Explorer/Assets/Textures/BackpackPanel/GiftIcn.png b/Explorer/Assets/Textures/BackpackPanel/GiftIcn.png new file mode 100755 index 0000000000..9cb7ac8293 --- /dev/null +++ b/Explorer/Assets/Textures/BackpackPanel/GiftIcn.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bc5793428d566892e575f2dc478697ffa0dd082cf7dd55defdb1ceb0f897fc69 +size 400 diff --git a/Explorer/Assets/Textures/BackpackPanel/GiftIcn.png.meta b/Explorer/Assets/Textures/BackpackPanel/GiftIcn.png.meta new file mode 100644 index 0000000000..7e28bdbd24 --- /dev/null +++ b/Explorer/Assets/Textures/BackpackPanel/GiftIcn.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: 0b1219d1d39734c7595c33df85e70230 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 0 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 0 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 128 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Explorer/Assets/Textures/BackpackPanel/HairIcon.png.meta b/Explorer/Assets/Textures/BackpackPanel/HairIcon.png.meta index 978682829d..483e316ac1 100644 --- a/Explorer/Assets/Textures/BackpackPanel/HairIcon.png.meta +++ b/Explorer/Assets/Textures/BackpackPanel/HairIcon.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: c99c55c8bb9ec488da8409fe012968fb +guid: 9b13173961ced41b287b3ec0d724c585 TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -45,12 +45,12 @@ TextureImporter: compressionQuality: 50 spriteMode: 1 spriteExtrude: 1 - spriteMeshType: 1 + spriteMeshType: 0 alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 + spriteGenerateFallbackPhysicsShape: 0 alphaUsage: 1 alphaIsTransparency: 1 spriteTessellationDetail: -1 @@ -63,16 +63,16 @@ TextureImporter: compressionQualitySet: 0 textureFormatSet: 0 ignorePngGamma: 0 - applyGammaDecoding: 0 + applyGammaDecoding: 1 swizzle: 50462976 - cookieLightType: 0 + cookieLightType: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 + maxTextureSize: 128 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -82,10 +82,23 @@ TextureImporter: forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: Standalone - maxTextureSize: 2048 + maxTextureSize: 128 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 128 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -95,10 +108,10 @@ TextureImporter: forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: Server - maxTextureSize: 2048 + maxTextureSize: 128 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -112,7 +125,7 @@ TextureImporter: outline: [] physicsShape: [] bones: [] - spriteID: 5e97eb03825dee720800000000000000 + spriteID: 7b9df58842bc84ba89ae1e4f0cf72a73 internalID: 0 vertices: [] indices: diff --git a/Explorer/Assets/Textures/BackpackPanel/HandIcn.png.meta b/Explorer/Assets/Textures/BackpackPanel/HandIcn.png.meta index 6267f48bdf..43c25f793d 100644 --- a/Explorer/Assets/Textures/BackpackPanel/HandIcn.png.meta +++ b/Explorer/Assets/Textures/BackpackPanel/HandIcn.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 3db1bd8a9ce01479d83cd1637267ec2a +guid: 1b8e5d35e0b2d46379b97bb7e7ab2c97 TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -45,12 +45,12 @@ TextureImporter: compressionQuality: 50 spriteMode: 1 spriteExtrude: 1 - spriteMeshType: 1 + spriteMeshType: 0 alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 + spriteGenerateFallbackPhysicsShape: 0 alphaUsage: 1 alphaIsTransparency: 1 spriteTessellationDetail: -1 @@ -69,7 +69,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 + maxTextureSize: 128 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 diff --git a/Explorer/Assets/Textures/BackpackPanel/HandWearIcn.png.meta b/Explorer/Assets/Textures/BackpackPanel/HandWearIcn.png.meta index 86b530d428..fa7874347b 100644 --- a/Explorer/Assets/Textures/BackpackPanel/HandWearIcn.png.meta +++ b/Explorer/Assets/Textures/BackpackPanel/HandWearIcn.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 4b75dfe17605c43dc80a38b04c92091e +guid: 16866e729ce1061429170517e80ef313 TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -45,12 +45,12 @@ TextureImporter: compressionQuality: 50 spriteMode: 1 spriteExtrude: 1 - spriteMeshType: 1 + spriteMeshType: 0 alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 + spriteGenerateFallbackPhysicsShape: 0 alphaUsage: 1 alphaIsTransparency: 1 spriteTessellationDetail: -1 @@ -69,7 +69,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 + maxTextureSize: 128 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 @@ -106,6 +106,32 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Windows Store Apps + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Explorer/Assets/Textures/BackpackPanel/HatIcon.png b/Explorer/Assets/Textures/BackpackPanel/HatIcon.png old mode 100644 new mode 100755 index 94c4387057..151de054be --- a/Explorer/Assets/Textures/BackpackPanel/HatIcon.png +++ b/Explorer/Assets/Textures/BackpackPanel/HatIcon.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fe024ccdb952a834403391c6cb7ce671904513f32a7b0d2d7fa3e00d2c0e89fb -size 953 +oid sha256:96208233314ce5481e68268ff2c0d1ad48b0f55381a0912d80194c6225893d1c +size 524 diff --git a/Explorer/Assets/Textures/BackpackPanel/HatIcon.png.meta b/Explorer/Assets/Textures/BackpackPanel/HatIcon.png.meta index 4fcb989aa3..fc6a7b6f39 100644 --- a/Explorer/Assets/Textures/BackpackPanel/HatIcon.png.meta +++ b/Explorer/Assets/Textures/BackpackPanel/HatIcon.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: aefec5c0deb1246b0b9ccc6f85d98fca +guid: ec6e82c586d96441e9a01726eae9c6f8 TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -45,12 +45,12 @@ TextureImporter: compressionQuality: 50 spriteMode: 1 spriteExtrude: 1 - spriteMeshType: 1 + spriteMeshType: 0 alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 + spriteGenerateFallbackPhysicsShape: 0 alphaUsage: 1 alphaIsTransparency: 1 spriteTessellationDetail: -1 @@ -63,16 +63,16 @@ TextureImporter: compressionQualitySet: 0 textureFormatSet: 0 ignorePngGamma: 0 - applyGammaDecoding: 0 + applyGammaDecoding: 1 swizzle: 50462976 - cookieLightType: 0 + cookieLightType: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 + maxTextureSize: 128 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -82,10 +82,23 @@ TextureImporter: forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: Standalone - maxTextureSize: 2048 + maxTextureSize: 128 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 128 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -95,10 +108,10 @@ TextureImporter: forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: Server - maxTextureSize: 2048 + maxTextureSize: 128 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -112,7 +125,7 @@ TextureImporter: outline: [] physicsShape: [] bones: [] - spriteID: 5e97eb03825dee720800000000000000 + spriteID: fac8f22bbda03473ba05557b61d4d095 internalID: 0 vertices: [] indices: diff --git a/Explorer/Assets/Textures/BackpackPanel/HeadIcon.png b/Explorer/Assets/Textures/BackpackPanel/HeadIcon.png deleted file mode 100755 index 5ab976660e..0000000000 --- a/Explorer/Assets/Textures/BackpackPanel/HeadIcon.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9922f11db5f87c51f0998bd412c66a64efd3d503d2ee25b4e2766155408334c4 -size 479 diff --git a/Explorer/Assets/Textures/BackpackPanel/HelmetIcon.png b/Explorer/Assets/Textures/BackpackPanel/HelmetIcon.png old mode 100644 new mode 100755 index 7db30fc934..1d41ca4421 --- a/Explorer/Assets/Textures/BackpackPanel/HelmetIcon.png +++ b/Explorer/Assets/Textures/BackpackPanel/HelmetIcon.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f2723f61e29fe4ef82bbe0e0b2233167404cbbcd0627c9199a2c16a33d17ccc1 -size 1278 +oid sha256:acd85102bd1908bf7b3715595b2c41917c6437a1ba380bfb5e8a61bb7d4e77b2 +size 784 diff --git a/Explorer/Assets/Textures/BackpackPanel/HelmetIcon.png.meta b/Explorer/Assets/Textures/BackpackPanel/HelmetIcon.png.meta index 1d69c8ff61..22676ce00e 100644 --- a/Explorer/Assets/Textures/BackpackPanel/HelmetIcon.png.meta +++ b/Explorer/Assets/Textures/BackpackPanel/HelmetIcon.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 5406d9f0e6a9c464499dc8703c83f887 +guid: 6bc5be995cfc14e0182a54c5a4fef290 TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -45,12 +45,12 @@ TextureImporter: compressionQuality: 50 spriteMode: 1 spriteExtrude: 1 - spriteMeshType: 1 + spriteMeshType: 0 alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 + spriteGenerateFallbackPhysicsShape: 0 alphaUsage: 1 alphaIsTransparency: 1 spriteTessellationDetail: -1 @@ -63,16 +63,16 @@ TextureImporter: compressionQualitySet: 0 textureFormatSet: 0 ignorePngGamma: 0 - applyGammaDecoding: 0 + applyGammaDecoding: 1 swizzle: 50462976 - cookieLightType: 0 + cookieLightType: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 + maxTextureSize: 128 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -82,10 +82,23 @@ TextureImporter: forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: Standalone - maxTextureSize: 2048 + maxTextureSize: 128 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 128 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -95,10 +108,10 @@ TextureImporter: forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: Server - maxTextureSize: 2048 + maxTextureSize: 128 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -112,7 +125,7 @@ TextureImporter: outline: [] physicsShape: [] bones: [] - spriteID: 5e97eb03825dee720800000000000000 + spriteID: a3196b4dbf6384fc9b1cb81847ad7619 internalID: 0 vertices: [] indices: diff --git a/Explorer/Assets/Textures/BackpackPanel/HiddenIcn.png b/Explorer/Assets/Textures/BackpackPanel/HiddenIcn.png new file mode 100644 index 0000000000..47b2e7f8d3 --- /dev/null +++ b/Explorer/Assets/Textures/BackpackPanel/HiddenIcn.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:075a8177d0a5805e1fa1555ec289d444485e1793e5582d7761b822ad6013f571 +size 444 diff --git a/Explorer/Assets/Textures/BackpackPanel/HiddenIcn.png.meta b/Explorer/Assets/Textures/BackpackPanel/HiddenIcn.png.meta new file mode 100644 index 0000000000..8d99c0d6fc --- /dev/null +++ b/Explorer/Assets/Textures/BackpackPanel/HiddenIcn.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: 8d9ff403c413748a7a82ca7f9443e988 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 0 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 0 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 64 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Explorer/Assets/Textures/BackpackPanel/HoverBg.png b/Explorer/Assets/Textures/BackpackPanel/HoverBg.png new file mode 100755 index 0000000000..262f961ab2 --- /dev/null +++ b/Explorer/Assets/Textures/BackpackPanel/HoverBg.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:94e87bfc626285b2546aa64118d30c1d035bf9e7220dcf3b28ef4ab0f0e2aa4c +size 6154 diff --git a/Explorer/Assets/Textures/Container12RectTop.png.meta b/Explorer/Assets/Textures/BackpackPanel/HoverBg.png.meta similarity index 94% rename from Explorer/Assets/Textures/Container12RectTop.png.meta rename to Explorer/Assets/Textures/BackpackPanel/HoverBg.png.meta index adfedbea86..972086d645 100644 --- a/Explorer/Assets/Textures/Container12RectTop.png.meta +++ b/Explorer/Assets/Textures/BackpackPanel/HoverBg.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 6a691ff28b59f4236a6a8d3b7f4aa258 +guid: 55f9c2592118840fc9ced5692cced894 TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -45,12 +45,12 @@ TextureImporter: compressionQuality: 50 spriteMode: 1 spriteExtrude: 1 - spriteMeshType: 1 + spriteMeshType: 0 alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 - spriteBorder: {x: 29, y: 29, z: 29, w: 29} - spriteGenerateFallbackPhysicsShape: 1 + spriteBorder: {x: 43, y: 0, z: 44, w: 0} + spriteGenerateFallbackPhysicsShape: 0 alphaUsage: 1 alphaIsTransparency: 1 spriteTessellationDetail: -1 @@ -69,7 +69,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 + maxTextureSize: 512 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 diff --git a/Explorer/Assets/Textures/BackpackPanel/InfoCardBackground.meta b/Explorer/Assets/Textures/BackpackPanel/InfoCardBackground.meta new file mode 100644 index 0000000000..1ff06a6906 --- /dev/null +++ b/Explorer/Assets/Textures/BackpackPanel/InfoCardBackground.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 89745505b48744a14add4113f5e1b20b +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Explorer/Assets/Textures/BackpackPanel/InfoCardBackground/InfoPanelBase.png b/Explorer/Assets/Textures/BackpackPanel/InfoCardBackground/InfoPanelBase.png new file mode 100755 index 0000000000..f67e521f23 --- /dev/null +++ b/Explorer/Assets/Textures/BackpackPanel/InfoCardBackground/InfoPanelBase.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:85bd5c26fcc7944750182caf2b3dfcd03dd5b223d9a674109da70f9de38d318e +size 39220 diff --git a/Explorer/Assets/Textures/BackpackPanel/InfoCardBackground/InfoPanelBase.png.meta b/Explorer/Assets/Textures/BackpackPanel/InfoCardBackground/InfoPanelBase.png.meta new file mode 100644 index 0000000000..f95832f4a8 --- /dev/null +++ b/Explorer/Assets/Textures/BackpackPanel/InfoCardBackground/InfoPanelBase.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: 0f37e7ea23f914013907dcd8d2974068 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 0 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 200, z: 0, w: 380} + spriteGenerateFallbackPhysicsShape: 0 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 512 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 1537655665 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Explorer/Assets/Textures/BackpackPanel/InfoCardBackground/InfoPanelCommon.png b/Explorer/Assets/Textures/BackpackPanel/InfoCardBackground/InfoPanelCommon.png new file mode 100755 index 0000000000..ca7c6e3039 --- /dev/null +++ b/Explorer/Assets/Textures/BackpackPanel/InfoCardBackground/InfoPanelCommon.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:02761e3dca574a3e0ccc0e3d598be20fdf52dd82ada2db4fa051d49169a6fffb +size 38837 diff --git a/Explorer/Assets/Textures/BackpackPanel/InfoCardBackground/InfoPanelCommon.png.meta b/Explorer/Assets/Textures/BackpackPanel/InfoCardBackground/InfoPanelCommon.png.meta new file mode 100644 index 0000000000..e22511abe8 --- /dev/null +++ b/Explorer/Assets/Textures/BackpackPanel/InfoCardBackground/InfoPanelCommon.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: eb54ab9d7387e4a82aafd7a784d82f73 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 0 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 200, z: 0, w: 380} + spriteGenerateFallbackPhysicsShape: 0 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 512 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 1537655665 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Explorer/Assets/Textures/BackpackPanel/InfoCardBackground/InfoPanelEmpty.png b/Explorer/Assets/Textures/BackpackPanel/InfoCardBackground/InfoPanelEmpty.png new file mode 100755 index 0000000000..2cd4c7cede --- /dev/null +++ b/Explorer/Assets/Textures/BackpackPanel/InfoCardBackground/InfoPanelEmpty.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dbee6e584ce2c0b8821588a22091b6f56ce447e9813c9e96fca92efb911e767b +size 9148 diff --git a/Explorer/Assets/Textures/BackpackPanel/InfoCardBackground/InfoPanelEmpty.png.meta b/Explorer/Assets/Textures/BackpackPanel/InfoCardBackground/InfoPanelEmpty.png.meta new file mode 100644 index 0000000000..9b88ea1c9a --- /dev/null +++ b/Explorer/Assets/Textures/BackpackPanel/InfoCardBackground/InfoPanelEmpty.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: 5f9c51f0c825d447185b63b89a239b5c +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 0 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 249, z: 0, w: 342} + spriteGenerateFallbackPhysicsShape: 0 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 512 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 1537655665 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Explorer/Assets/Textures/BackpackPanel/InfoCardBackground/InfoPanelEpic.png b/Explorer/Assets/Textures/BackpackPanel/InfoCardBackground/InfoPanelEpic.png new file mode 100755 index 0000000000..6180d67b7c --- /dev/null +++ b/Explorer/Assets/Textures/BackpackPanel/InfoCardBackground/InfoPanelEpic.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2e6a40e4a55d87c15ff37697d26aac20faebc149f941dd61c56c011d03706573 +size 37111 diff --git a/Explorer/Assets/Textures/BackpackPanel/InfoCardBackground/InfoPanelEpic.png.meta b/Explorer/Assets/Textures/BackpackPanel/InfoCardBackground/InfoPanelEpic.png.meta new file mode 100644 index 0000000000..2da3328dd1 --- /dev/null +++ b/Explorer/Assets/Textures/BackpackPanel/InfoCardBackground/InfoPanelEpic.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: e0fea03e8025e42bab6a23014f7eeec8 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 0 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 200, z: 0, w: 380} + spriteGenerateFallbackPhysicsShape: 0 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 512 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 1537655665 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Explorer/Assets/Textures/BackpackPanel/InfoCardBackground/InfoPanelLegendary.png b/Explorer/Assets/Textures/BackpackPanel/InfoCardBackground/InfoPanelLegendary.png new file mode 100755 index 0000000000..fe2d37d503 --- /dev/null +++ b/Explorer/Assets/Textures/BackpackPanel/InfoCardBackground/InfoPanelLegendary.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3722f3de67bddc35f05aec919e9c8b1890d1510921fc8704602703e540f8f4df +size 36871 diff --git a/Explorer/Assets/Textures/BackpackPanel/InfoCardBackground/InfoPanelLegendary.png.meta b/Explorer/Assets/Textures/BackpackPanel/InfoCardBackground/InfoPanelLegendary.png.meta new file mode 100644 index 0000000000..067f13a704 --- /dev/null +++ b/Explorer/Assets/Textures/BackpackPanel/InfoCardBackground/InfoPanelLegendary.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: ef376f68b39b649929d1d83ca633be4e +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 0 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 200, z: 0, w: 380} + spriteGenerateFallbackPhysicsShape: 0 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 512 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 1537655665 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Explorer/Assets/Textures/BackpackPanel/InfoCardBackground/InfoPanelMythic.png b/Explorer/Assets/Textures/BackpackPanel/InfoCardBackground/InfoPanelMythic.png new file mode 100755 index 0000000000..c5963d9937 --- /dev/null +++ b/Explorer/Assets/Textures/BackpackPanel/InfoCardBackground/InfoPanelMythic.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8c52d1c793f4fb510143360e16c425b48c7a683101749776573d22b2926df538 +size 37230 diff --git a/Explorer/Assets/Textures/BackpackPanel/InfoCardBackground/InfoPanelMythic.png.meta b/Explorer/Assets/Textures/BackpackPanel/InfoCardBackground/InfoPanelMythic.png.meta new file mode 100644 index 0000000000..63b44d39f8 --- /dev/null +++ b/Explorer/Assets/Textures/BackpackPanel/InfoCardBackground/InfoPanelMythic.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: 39254aee4b62348b4b5131b9b861f513 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 0 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 200, z: 0, w: 380} + spriteGenerateFallbackPhysicsShape: 0 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 512 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 1537655665 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Explorer/Assets/Textures/BackpackPanel/InfoCardBackground/InfoPanelRare.png b/Explorer/Assets/Textures/BackpackPanel/InfoCardBackground/InfoPanelRare.png new file mode 100755 index 0000000000..02ea1a18d6 --- /dev/null +++ b/Explorer/Assets/Textures/BackpackPanel/InfoCardBackground/InfoPanelRare.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1417a10a91d4bfd7463da212a86e39ba94430c6e7620605270518c9b7a19c7dc +size 37427 diff --git a/Explorer/Assets/Textures/BackpackPanel/InfoCardBackground/InfoPanelRare.png.meta b/Explorer/Assets/Textures/BackpackPanel/InfoCardBackground/InfoPanelRare.png.meta new file mode 100644 index 0000000000..5c3440489a --- /dev/null +++ b/Explorer/Assets/Textures/BackpackPanel/InfoCardBackground/InfoPanelRare.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: 9ca88af112f7e4821986d5ebf7af699a +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 0 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 200, z: 0, w: 380} + spriteGenerateFallbackPhysicsShape: 0 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 512 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 1537655665 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Explorer/Assets/Textures/BackpackPanel/InfoCardBackground/InfoPanelUncommon.png b/Explorer/Assets/Textures/BackpackPanel/InfoCardBackground/InfoPanelUncommon.png new file mode 100755 index 0000000000..524d75bef9 --- /dev/null +++ b/Explorer/Assets/Textures/BackpackPanel/InfoCardBackground/InfoPanelUncommon.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:916724840864cd10f4016c2608f51094049725555a3ef3a0289881af1080975b +size 37080 diff --git a/Explorer/Assets/Textures/BackpackPanel/InfoCardBackground/InfoPanelUncommon.png.meta b/Explorer/Assets/Textures/BackpackPanel/InfoCardBackground/InfoPanelUncommon.png.meta new file mode 100644 index 0000000000..ae5baf90aa --- /dev/null +++ b/Explorer/Assets/Textures/BackpackPanel/InfoCardBackground/InfoPanelUncommon.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: 984f8e02caec845c7b41c3baeef24b92 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 0 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 200, z: 0, w: 380} + spriteGenerateFallbackPhysicsShape: 0 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 1024 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 1537655665 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Explorer/Assets/Textures/BackpackPanel/InfoCardBackground/InfoPanelUnique.png b/Explorer/Assets/Textures/BackpackPanel/InfoCardBackground/InfoPanelUnique.png new file mode 100755 index 0000000000..bacb747710 --- /dev/null +++ b/Explorer/Assets/Textures/BackpackPanel/InfoCardBackground/InfoPanelUnique.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:de54d02a4609b7fa61079bfe1970a1a72b3931e07e6d2c4f748a73834cf6093d +size 46827 diff --git a/Explorer/Assets/Textures/BackpackPanel/InfoCardBackground/InfoPanelUnique.png.meta b/Explorer/Assets/Textures/BackpackPanel/InfoCardBackground/InfoPanelUnique.png.meta new file mode 100644 index 0000000000..0ac4569723 --- /dev/null +++ b/Explorer/Assets/Textures/BackpackPanel/InfoCardBackground/InfoPanelUnique.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: 72c7e17c54fb4410c827a002a43e34d4 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 0 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 200, z: 0, w: 380} + spriteGenerateFallbackPhysicsShape: 0 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 512 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 1537655665 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Explorer/Assets/Textures/BackpackPanel/KeyboardIcn.png b/Explorer/Assets/Textures/BackpackPanel/KeyboardIcn.png new file mode 100755 index 0000000000..fe459ce314 --- /dev/null +++ b/Explorer/Assets/Textures/BackpackPanel/KeyboardIcn.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f14370e90a1315a1909d54fc4e0b2013a8571b5046cdc89a120c55d96c136dc5 +size 439 diff --git a/Explorer/Assets/Textures/BackpackPanel/KeyboardIcn.png.meta b/Explorer/Assets/Textures/BackpackPanel/KeyboardIcn.png.meta new file mode 100644 index 0000000000..c408e472f7 --- /dev/null +++ b/Explorer/Assets/Textures/BackpackPanel/KeyboardIcn.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: 96276d3c5e1e14af7b0fcb4b2379c127 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 0 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 0 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 128 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Explorer/Assets/Textures/BackpackPanel/LeftClickIcn.png.meta b/Explorer/Assets/Textures/BackpackPanel/LeftClickIcn.png.meta index a251fd0ea1..b2b8a6ad8e 100644 --- a/Explorer/Assets/Textures/BackpackPanel/LeftClickIcn.png.meta +++ b/Explorer/Assets/Textures/BackpackPanel/LeftClickIcn.png.meta @@ -1,12 +1,12 @@ fileFormatVersion: 2 -guid: d01fa0321b52b44be981a4f81b26a561 +guid: 17e94f45af7624a0996b2a78cf3009ad TextureImporter: internalIDToNameTable: [] externalObjects: {} serializedVersion: 12 mipmaps: mipMapMode: 0 - enableMipMap: 1 + enableMipMap: 0 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 @@ -37,22 +37,22 @@ TextureImporter: filterMode: 1 aniso: 1 mipBias: 0 - wrapU: 0 - wrapV: 0 + wrapU: 1 + wrapV: 1 wrapW: 0 - nPOTScale: 1 + nPOTScale: 0 lightmap: 0 compressionQuality: 50 spriteMode: 1 spriteExtrude: 1 - spriteMeshType: 1 + spriteMeshType: 0 alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 + spriteGenerateFallbackPhysicsShape: 0 alphaUsage: 1 - alphaIsTransparency: 0 + alphaIsTransparency: 1 spriteTessellationDetail: -1 textureType: 8 textureShape: 1 @@ -69,7 +69,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 + maxTextureSize: 64 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 diff --git a/Explorer/Assets/Textures/BackpackPanel/MaskIcon.png b/Explorer/Assets/Textures/BackpackPanel/MaskIcon.png index e3f48aaa17..362e0b786a 100755 --- a/Explorer/Assets/Textures/BackpackPanel/MaskIcon.png +++ b/Explorer/Assets/Textures/BackpackPanel/MaskIcon.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8c886fc7e98f1bf560cdf95839be183e28f62ffd1ae5b131e0e7d6a8fdd5a3be -size 554 +oid sha256:038e72eefcfc21b9a2e01049a50bb24003ad3005929c336b77ae48dd7b285121 +size 544 diff --git a/Explorer/Assets/Textures/BackpackPanel/MaskIcon.png.meta b/Explorer/Assets/Textures/BackpackPanel/MaskIcon.png.meta index 1dc7a61e44..5f6b798a60 100644 --- a/Explorer/Assets/Textures/BackpackPanel/MaskIcon.png.meta +++ b/Explorer/Assets/Textures/BackpackPanel/MaskIcon.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 8321a646ca8e441a5b6d8bed690a2aaf +guid: f88ebb8cd1cd5487ca7c3f4d3e65e76a TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -45,12 +45,12 @@ TextureImporter: compressionQuality: 50 spriteMode: 1 spriteExtrude: 1 - spriteMeshType: 1 + spriteMeshType: 0 alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 + spriteGenerateFallbackPhysicsShape: 0 alphaUsage: 1 alphaIsTransparency: 1 spriteTessellationDetail: -1 @@ -63,16 +63,16 @@ TextureImporter: compressionQualitySet: 0 textureFormatSet: 0 ignorePngGamma: 0 - applyGammaDecoding: 0 + applyGammaDecoding: 1 swizzle: 50462976 - cookieLightType: 0 + cookieLightType: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 + maxTextureSize: 128 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -82,10 +82,23 @@ TextureImporter: forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: Standalone - maxTextureSize: 2048 + maxTextureSize: 128 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 128 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -95,10 +108,10 @@ TextureImporter: forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: Server - maxTextureSize: 2048 + maxTextureSize: 128 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -112,7 +125,7 @@ TextureImporter: outline: [] physicsShape: [] bones: [] - spriteID: 5e97eb03825dee720800000000000000 + spriteID: 126e14b5282384e57bad110591e26837 internalID: 0 vertices: [] indices: diff --git a/Explorer/Assets/Textures/BackpackPanel/MouthICon.png b/Explorer/Assets/Textures/BackpackPanel/MouthICon.png index 80d450be17..6d2d71088d 100755 --- a/Explorer/Assets/Textures/BackpackPanel/MouthICon.png +++ b/Explorer/Assets/Textures/BackpackPanel/MouthICon.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:02ad553a2ce34edd8ad0837c1673049689988df51a4dbb4731724821ef70321a -size 472 +oid sha256:bc5260c7b4d66edd12391670b69045655b884e7b1296bd51d82e4571db640318 +size 470 diff --git a/Explorer/Assets/Textures/BackpackPanel/MouthICon.png.meta b/Explorer/Assets/Textures/BackpackPanel/MouthICon.png.meta index 246813a833..ec924bbfae 100644 --- a/Explorer/Assets/Textures/BackpackPanel/MouthICon.png.meta +++ b/Explorer/Assets/Textures/BackpackPanel/MouthICon.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: df1d4fbf4e6a74017bcf9e6f2eb5486f +guid: 075c9dd99649649f9869afece52cd35b TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -45,12 +45,12 @@ TextureImporter: compressionQuality: 50 spriteMode: 1 spriteExtrude: 1 - spriteMeshType: 1 + spriteMeshType: 0 alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 + spriteGenerateFallbackPhysicsShape: 0 alphaUsage: 1 alphaIsTransparency: 1 spriteTessellationDetail: -1 @@ -63,16 +63,16 @@ TextureImporter: compressionQualitySet: 0 textureFormatSet: 0 ignorePngGamma: 0 - applyGammaDecoding: 0 + applyGammaDecoding: 1 swizzle: 50462976 - cookieLightType: 0 + cookieLightType: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 + maxTextureSize: 128 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -82,10 +82,23 @@ TextureImporter: forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: Standalone - maxTextureSize: 2048 + maxTextureSize: 128 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 128 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -95,10 +108,10 @@ TextureImporter: forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: Server - maxTextureSize: 2048 + maxTextureSize: 128 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -112,7 +125,7 @@ TextureImporter: outline: [] physicsShape: [] bones: [] - spriteID: 5e97eb03825dee720800000000000000 + spriteID: aec60a1cec2b7424f872ee4cadf76f14 internalID: 0 vertices: [] indices: diff --git a/Explorer/Assets/Textures/BackpackPanel/MustacheIcon.png.meta b/Explorer/Assets/Textures/BackpackPanel/MustacheIcon.png.meta index 943d9e72a5..10ed9ac2d9 100644 --- a/Explorer/Assets/Textures/BackpackPanel/MustacheIcon.png.meta +++ b/Explorer/Assets/Textures/BackpackPanel/MustacheIcon.png.meta @@ -45,12 +45,12 @@ TextureImporter: compressionQuality: 50 spriteMode: 1 spriteExtrude: 1 - spriteMeshType: 1 + spriteMeshType: 0 alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 + spriteGenerateFallbackPhysicsShape: 0 alphaUsage: 1 alphaIsTransparency: 1 spriteTessellationDetail: -1 diff --git a/Explorer/Assets/Textures/BackpackPanel/OutfitBg.png b/Explorer/Assets/Textures/BackpackPanel/OutfitBg.png new file mode 100755 index 0000000000..3df55e1c47 --- /dev/null +++ b/Explorer/Assets/Textures/BackpackPanel/OutfitBg.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0c367e85ac73bd3701c0e60d6b3cf8ada82f807d5d1bdfa45dd4f67b14476fb8 +size 38339 diff --git a/Explorer/Assets/Textures/BackpackPanel/OutfitBg.png.meta b/Explorer/Assets/Textures/BackpackPanel/OutfitBg.png.meta new file mode 100644 index 0000000000..cc3c979eef --- /dev/null +++ b/Explorer/Assets/Textures/BackpackPanel/OutfitBg.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: e503a4cd5afbe4b4192c718dbf9fb1cd +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 0 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 0 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 128 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Explorer/Assets/Textures/BackpackPanel/OutfitBgEmpty.png b/Explorer/Assets/Textures/BackpackPanel/OutfitBgEmpty.png new file mode 100755 index 0000000000..f4bd671b1d --- /dev/null +++ b/Explorer/Assets/Textures/BackpackPanel/OutfitBgEmpty.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9efc66e8e5e06f4f946186d06985010dbf615282041d04c8509c42411e8f88f0 +size 10762 diff --git a/Explorer/Assets/Textures/BackpackPanel/OutfitBgEmpty.png.meta b/Explorer/Assets/Textures/BackpackPanel/OutfitBgEmpty.png.meta new file mode 100644 index 0000000000..dad6765b9a --- /dev/null +++ b/Explorer/Assets/Textures/BackpackPanel/OutfitBgEmpty.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: 3adceed38e04c4f1480a7ca1014548c6 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 0 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 0 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 128 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Explorer/Assets/Textures/BackpackPanel/OutfitBgFree.png b/Explorer/Assets/Textures/BackpackPanel/OutfitBgFree.png new file mode 100755 index 0000000000..404129241c --- /dev/null +++ b/Explorer/Assets/Textures/BackpackPanel/OutfitBgFree.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e84eb170617f6c80ca57661a8c724bd17d02cb0913cdbcd5c2b0394f760eb6b6 +size 3003 diff --git a/Explorer/Assets/Textures/BackpackPanel/OutfitBgFree.png.meta b/Explorer/Assets/Textures/BackpackPanel/OutfitBgFree.png.meta new file mode 100644 index 0000000000..8bd9b82cc9 --- /dev/null +++ b/Explorer/Assets/Textures/BackpackPanel/OutfitBgFree.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: 01462502ccb4a454aaba3e9e24fa7acb +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 0 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 0 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 128 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Explorer/Assets/Textures/BackpackPanel/OutfitsIcn.png b/Explorer/Assets/Textures/BackpackPanel/OutfitsIcn.png new file mode 100755 index 0000000000..8bfb20465c --- /dev/null +++ b/Explorer/Assets/Textures/BackpackPanel/OutfitsIcn.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9dcdb46ca5b808c72b1aa6d64bbbc2f6466ec115930e0d0959aa28ff06be56d3 +size 399 diff --git a/Explorer/Assets/Textures/BackpackPanel/OutfitsIcn.png.meta b/Explorer/Assets/Textures/BackpackPanel/OutfitsIcn.png.meta new file mode 100644 index 0000000000..93a437b24b --- /dev/null +++ b/Explorer/Assets/Textures/BackpackPanel/OutfitsIcn.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: dfec25e4cf70a4f408093194340bfcb4 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 0 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 0 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 128 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Explorer/Assets/Textures/BackpackPanel/Rainbow.png b/Explorer/Assets/Textures/BackpackPanel/Rainbow.png deleted file mode 100644 index 151ea46955..0000000000 --- a/Explorer/Assets/Textures/BackpackPanel/Rainbow.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:696e7b890bf657788f92347ea2e50721bca82c6fe833c08897b91b619175718d -size 85710 diff --git a/Explorer/Assets/Textures/BackpackPanel/RarityBackgrounds/BaseBackground.png.meta b/Explorer/Assets/Textures/BackpackPanel/RarityBackgrounds/BaseBackground.png.meta index 2ed74a6214..5461282213 100644 --- a/Explorer/Assets/Textures/BackpackPanel/RarityBackgrounds/BaseBackground.png.meta +++ b/Explorer/Assets/Textures/BackpackPanel/RarityBackgrounds/BaseBackground.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 43c7e05764ab84918a8336b66e4639db +guid: abde833615c88424dac272e56b6c5cee TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -45,12 +45,12 @@ TextureImporter: compressionQuality: 50 spriteMode: 1 spriteExtrude: 1 - spriteMeshType: 1 + spriteMeshType: 0 alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 + spriteGenerateFallbackPhysicsShape: 0 alphaUsage: 1 alphaIsTransparency: 1 spriteTessellationDetail: -1 @@ -69,7 +69,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 + maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 diff --git a/Explorer/Assets/Textures/BackpackPanel/RarityBackgrounds/CommonBackground.png.meta b/Explorer/Assets/Textures/BackpackPanel/RarityBackgrounds/CommonBackground.png.meta index c785d1a0d8..1d86ab7b49 100644 --- a/Explorer/Assets/Textures/BackpackPanel/RarityBackgrounds/CommonBackground.png.meta +++ b/Explorer/Assets/Textures/BackpackPanel/RarityBackgrounds/CommonBackground.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 667cd6c89f5994b68a0685338783b7c7 +guid: d99151485960c4e47a8bd1255170cf90 TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -45,12 +45,12 @@ TextureImporter: compressionQuality: 50 spriteMode: 1 spriteExtrude: 1 - spriteMeshType: 1 + spriteMeshType: 0 alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 + spriteGenerateFallbackPhysicsShape: 0 alphaUsage: 1 alphaIsTransparency: 1 spriteTessellationDetail: -1 @@ -69,7 +69,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 + maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 diff --git a/Explorer/Assets/Textures/BackpackPanel/RarityBackgrounds/EpicBackground.png.meta b/Explorer/Assets/Textures/BackpackPanel/RarityBackgrounds/EpicBackground.png.meta index 78bdaabf63..bda04de495 100644 --- a/Explorer/Assets/Textures/BackpackPanel/RarityBackgrounds/EpicBackground.png.meta +++ b/Explorer/Assets/Textures/BackpackPanel/RarityBackgrounds/EpicBackground.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 7a98ab3d0d7ae4df7958fe312df75fd4 +guid: dfe2025b3e81f42c5888a2a938ac6706 TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -45,12 +45,12 @@ TextureImporter: compressionQuality: 50 spriteMode: 1 spriteExtrude: 1 - spriteMeshType: 1 + spriteMeshType: 0 alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 + spriteGenerateFallbackPhysicsShape: 0 alphaUsage: 1 alphaIsTransparency: 1 spriteTessellationDetail: -1 @@ -69,7 +69,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 + maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 diff --git a/Explorer/Assets/Textures/BackpackPanel/RarityBackgrounds/LegendaryBackground.png.meta b/Explorer/Assets/Textures/BackpackPanel/RarityBackgrounds/LegendaryBackground.png.meta index d81a477936..810c9f0972 100644 --- a/Explorer/Assets/Textures/BackpackPanel/RarityBackgrounds/LegendaryBackground.png.meta +++ b/Explorer/Assets/Textures/BackpackPanel/RarityBackgrounds/LegendaryBackground.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 39a6c679449244f8491681ec41c88360 +guid: 2a287e052dd434673bc1d517abbe6411 TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -45,12 +45,12 @@ TextureImporter: compressionQuality: 50 spriteMode: 1 spriteExtrude: 1 - spriteMeshType: 1 + spriteMeshType: 0 alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 + spriteGenerateFallbackPhysicsShape: 0 alphaUsage: 1 alphaIsTransparency: 1 spriteTessellationDetail: -1 @@ -69,7 +69,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 + maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 diff --git a/Explorer/Assets/Textures/BackpackPanel/RarityBackgrounds/MythicBackground.png.meta b/Explorer/Assets/Textures/BackpackPanel/RarityBackgrounds/MythicBackground.png.meta index e04dae0511..49f9c5570d 100644 --- a/Explorer/Assets/Textures/BackpackPanel/RarityBackgrounds/MythicBackground.png.meta +++ b/Explorer/Assets/Textures/BackpackPanel/RarityBackgrounds/MythicBackground.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 382a62f7466574ac8a6d607a3fea583b +guid: 8e9a5e9dd7e99454485c708328d637a5 TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -45,12 +45,12 @@ TextureImporter: compressionQuality: 50 spriteMode: 1 spriteExtrude: 1 - spriteMeshType: 1 + spriteMeshType: 0 alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 + spriteGenerateFallbackPhysicsShape: 0 alphaUsage: 1 alphaIsTransparency: 1 spriteTessellationDetail: -1 @@ -69,7 +69,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 + maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 diff --git a/Explorer/Assets/Textures/BackpackPanel/RarityBackgrounds/RareBackground.png.meta b/Explorer/Assets/Textures/BackpackPanel/RarityBackgrounds/RareBackground.png.meta index 2420efcaf1..9764e60b67 100644 --- a/Explorer/Assets/Textures/BackpackPanel/RarityBackgrounds/RareBackground.png.meta +++ b/Explorer/Assets/Textures/BackpackPanel/RarityBackgrounds/RareBackground.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 4a3462f62d6794676b7db0cffc4c93c0 +guid: 9b1910f69bae144ec8d4122a091f267e TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -45,12 +45,12 @@ TextureImporter: compressionQuality: 50 spriteMode: 1 spriteExtrude: 1 - spriteMeshType: 1 + spriteMeshType: 0 alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 + spriteGenerateFallbackPhysicsShape: 0 alphaUsage: 1 alphaIsTransparency: 1 spriteTessellationDetail: -1 @@ -69,7 +69,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 + maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 diff --git a/Explorer/Assets/Textures/BackpackPanel/RarityBackgrounds/UncommonBackground.png.meta b/Explorer/Assets/Textures/BackpackPanel/RarityBackgrounds/UncommonBackground.png.meta index e83fa6caf2..157f8bda5c 100644 --- a/Explorer/Assets/Textures/BackpackPanel/RarityBackgrounds/UncommonBackground.png.meta +++ b/Explorer/Assets/Textures/BackpackPanel/RarityBackgrounds/UncommonBackground.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: eb50d42f8b2e642479006b55f8c538b6 +guid: 936dcf8cb7310472086027dcbdae26d5 TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -45,12 +45,12 @@ TextureImporter: compressionQuality: 50 spriteMode: 1 spriteExtrude: 1 - spriteMeshType: 1 + spriteMeshType: 0 alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 + spriteGenerateFallbackPhysicsShape: 0 alphaUsage: 1 alphaIsTransparency: 1 spriteTessellationDetail: -1 @@ -69,7 +69,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 + maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 diff --git a/Explorer/Assets/Textures/BackpackPanel/RarityBackgrounds/UniqueBackground.png.meta b/Explorer/Assets/Textures/BackpackPanel/RarityBackgrounds/UniqueBackground.png.meta index b8e77c7832..42e812d938 100644 --- a/Explorer/Assets/Textures/BackpackPanel/RarityBackgrounds/UniqueBackground.png.meta +++ b/Explorer/Assets/Textures/BackpackPanel/RarityBackgrounds/UniqueBackground.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 771938bcfc47a4694b84810829c6542a +guid: 40a02ef6cf4e94182abb9dfac4d7d0e3 TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -45,12 +45,12 @@ TextureImporter: compressionQuality: 50 spriteMode: 1 spriteExtrude: 1 - spriteMeshType: 1 + spriteMeshType: 0 alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 + spriteGenerateFallbackPhysicsShape: 0 alphaUsage: 1 alphaIsTransparency: 1 spriteTessellationDetail: -1 @@ -69,7 +69,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 + maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 diff --git a/Explorer/Assets/Textures/BackpackPanel/Rectangle 2666.png b/Explorer/Assets/Textures/BackpackPanel/Rectangle 2666.png deleted file mode 100644 index 2029b977f0..0000000000 --- a/Explorer/Assets/Textures/BackpackPanel/Rectangle 2666.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5d7a8d26971ea22a13d2ec35195871456bcec93fe73e298595a559595924a2ac -size 67850 diff --git a/Explorer/Assets/Textures/BackpackPanel/RightClickIcn.png.meta b/Explorer/Assets/Textures/BackpackPanel/RightClickIcn.png.meta index 634c5ff059..77cc30fc9b 100644 --- a/Explorer/Assets/Textures/BackpackPanel/RightClickIcn.png.meta +++ b/Explorer/Assets/Textures/BackpackPanel/RightClickIcn.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 1ea292628725049eab0b4ed518d4c064 +guid: 0c1f94bccfacc415f8b7916a4f3ae512 TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -45,12 +45,12 @@ TextureImporter: compressionQuality: 50 spriteMode: 1 spriteExtrude: 1 - spriteMeshType: 1 + spriteMeshType: 0 alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 + spriteGenerateFallbackPhysicsShape: 0 alphaUsage: 1 alphaIsTransparency: 1 spriteTessellationDetail: -1 @@ -69,7 +69,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 + maxTextureSize: 64 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 diff --git a/Explorer/Assets/Textures/BackpackPanel/RotateIcn.png b/Explorer/Assets/Textures/BackpackPanel/RotateIcn.png new file mode 100644 index 0000000000..6dabab426c --- /dev/null +++ b/Explorer/Assets/Textures/BackpackPanel/RotateIcn.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6020ea9ee41f9a11f055ea5453ec4b8ed2c0163e16f28062fdf17dd98d141590 +size 2145 diff --git a/Explorer/Assets/Textures/BackpackPanel/RotateIcn.png.meta b/Explorer/Assets/Textures/BackpackPanel/RotateIcn.png.meta new file mode 100644 index 0000000000..df7ecfc726 --- /dev/null +++ b/Explorer/Assets/Textures/BackpackPanel/RotateIcn.png.meta @@ -0,0 +1,140 @@ +fileFormatVersion: 2 +guid: d34aedda08e64344091b34deada8211e +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 0 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 0 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 64 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Explorer/Assets/Textures/BackpackPanel/SaveOutfitIcn.png b/Explorer/Assets/Textures/BackpackPanel/SaveOutfitIcn.png new file mode 100755 index 0000000000..2320ae49ef --- /dev/null +++ b/Explorer/Assets/Textures/BackpackPanel/SaveOutfitIcn.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2ca72966ed3b60480ad533763635e1571b768e363dea0f9ef1b7b085a5627b54 +size 654 diff --git a/Explorer/Assets/Textures/BackpackPanel/SaveOutfitIcn.png.meta b/Explorer/Assets/Textures/BackpackPanel/SaveOutfitIcn.png.meta new file mode 100644 index 0000000000..6477bd6928 --- /dev/null +++ b/Explorer/Assets/Textures/BackpackPanel/SaveOutfitIcn.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: 1193264f359a547a8bbccf692c5af00a +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 0 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 0 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 128 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Explorer/Assets/Textures/BackpackPanel/ScrollIcn.png.meta b/Explorer/Assets/Textures/BackpackPanel/ScrollIcn.png.meta index 8fe12da035..6ee0388ccc 100644 --- a/Explorer/Assets/Textures/BackpackPanel/ScrollIcn.png.meta +++ b/Explorer/Assets/Textures/BackpackPanel/ScrollIcn.png.meta @@ -1,12 +1,12 @@ fileFormatVersion: 2 -guid: 46b246382eb374969ad6dd378b8af71a +guid: 96f72d4a8759b47cea1df19e01632e26 TextureImporter: internalIDToNameTable: [] externalObjects: {} serializedVersion: 12 mipmaps: mipMapMode: 0 - enableMipMap: 1 + enableMipMap: 0 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 @@ -37,22 +37,22 @@ TextureImporter: filterMode: 1 aniso: 1 mipBias: 0 - wrapU: 0 - wrapV: 0 + wrapU: 1 + wrapV: 1 wrapW: 0 - nPOTScale: 1 + nPOTScale: 0 lightmap: 0 compressionQuality: 50 spriteMode: 1 spriteExtrude: 1 - spriteMeshType: 1 + spriteMeshType: 0 alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 + spriteGenerateFallbackPhysicsShape: 0 alphaUsage: 1 - alphaIsTransparency: 0 + alphaIsTransparency: 1 spriteTessellationDetail: -1 textureType: 8 textureShape: 1 @@ -69,7 +69,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 + maxTextureSize: 64 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 diff --git a/Explorer/Assets/Textures/BackpackPanel/SelectedBg.png b/Explorer/Assets/Textures/BackpackPanel/SelectedBg.png new file mode 100755 index 0000000000..beabf91960 --- /dev/null +++ b/Explorer/Assets/Textures/BackpackPanel/SelectedBg.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d694fb7410c266a872cd7a9e163095dc19c8df18424c7908aaedfd314e07001f +size 3028 diff --git a/Explorer/Assets/Textures/BackpackPanel/Rectangle 2666.png.meta b/Explorer/Assets/Textures/BackpackPanel/SelectedBg.png.meta similarity index 95% rename from Explorer/Assets/Textures/BackpackPanel/Rectangle 2666.png.meta rename to Explorer/Assets/Textures/BackpackPanel/SelectedBg.png.meta index 359902477b..64996997fd 100644 --- a/Explorer/Assets/Textures/BackpackPanel/Rectangle 2666.png.meta +++ b/Explorer/Assets/Textures/BackpackPanel/SelectedBg.png.meta @@ -45,12 +45,12 @@ TextureImporter: compressionQuality: 50 spriteMode: 1 spriteExtrude: 1 - spriteMeshType: 1 + spriteMeshType: 0 alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 - spriteBorder: {x: 125, y: 127, z: 125, w: 126} - spriteGenerateFallbackPhysicsShape: 1 + spriteBorder: {x: 41, y: 41, z: 41, w: 41} + spriteGenerateFallbackPhysicsShape: 0 alphaUsage: 1 alphaIsTransparency: 1 spriteTessellationDetail: -1 @@ -69,7 +69,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 + maxTextureSize: 128 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 diff --git a/Explorer/Assets/Textures/BackpackPanel/SellIcn.png b/Explorer/Assets/Textures/BackpackPanel/SellIcn.png new file mode 100755 index 0000000000..073e411aba --- /dev/null +++ b/Explorer/Assets/Textures/BackpackPanel/SellIcn.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:68f64c3ced57429a7525818b31067afbe4f768b4882c0a6508f83c1c019a4ffb +size 488 diff --git a/Explorer/Assets/Textures/BackpackPanel/AccesoriesIcon.png.meta b/Explorer/Assets/Textures/BackpackPanel/SellIcn.png.meta similarity index 97% rename from Explorer/Assets/Textures/BackpackPanel/AccesoriesIcon.png.meta rename to Explorer/Assets/Textures/BackpackPanel/SellIcn.png.meta index 0834bab748..b4e7366790 100644 --- a/Explorer/Assets/Textures/BackpackPanel/AccesoriesIcon.png.meta +++ b/Explorer/Assets/Textures/BackpackPanel/SellIcn.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 510a1519aa9d9468faf0031e7a1ea79e +guid: aef0c5d78a72a485aaf82db1e04acd9e TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -45,7 +45,7 @@ TextureImporter: compressionQuality: 50 spriteMode: 1 spriteExtrude: 1 - spriteMeshType: 1 + spriteMeshType: 0 alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 @@ -69,7 +69,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 + maxTextureSize: 128 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 diff --git a/Explorer/Assets/Textures/BackpackPanel/ShoesIcon.png.meta b/Explorer/Assets/Textures/BackpackPanel/ShoesIcon.png.meta index 2146f2f0aa..82d3f72557 100644 --- a/Explorer/Assets/Textures/BackpackPanel/ShoesIcon.png.meta +++ b/Explorer/Assets/Textures/BackpackPanel/ShoesIcon.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 4418c90e7ae104f7bbae035b3625ceb4 +guid: 2bd9c7cbf6f504ad89e22e7f1f497fd2 TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -45,12 +45,12 @@ TextureImporter: compressionQuality: 50 spriteMode: 1 spriteExtrude: 1 - spriteMeshType: 1 + spriteMeshType: 0 alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 + spriteGenerateFallbackPhysicsShape: 0 alphaUsage: 1 alphaIsTransparency: 1 spriteTessellationDetail: -1 @@ -63,16 +63,16 @@ TextureImporter: compressionQualitySet: 0 textureFormatSet: 0 ignorePngGamma: 0 - applyGammaDecoding: 0 + applyGammaDecoding: 1 swizzle: 50462976 - cookieLightType: 0 + cookieLightType: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 + maxTextureSize: 128 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -82,10 +82,23 @@ TextureImporter: forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: Standalone - maxTextureSize: 2048 + maxTextureSize: 128 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 128 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -95,10 +108,10 @@ TextureImporter: forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: Server - maxTextureSize: 2048 + maxTextureSize: 128 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -112,7 +125,7 @@ TextureImporter: outline: [] physicsShape: [] bones: [] - spriteID: 5e97eb03825dee720800000000000000 + spriteID: e196c29a5bf494e2fa07b3a249b23e75 internalID: 0 vertices: [] indices: diff --git a/Explorer/Assets/Textures/BackpackPanel/Silhouette001.png b/Explorer/Assets/Textures/BackpackPanel/Silhouette001.png new file mode 100755 index 0000000000..2ca3a44868 --- /dev/null +++ b/Explorer/Assets/Textures/BackpackPanel/Silhouette001.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e4099af28aed0114c55801b79eee08c733ee08c6904e59ee9ac8b25b2d735b6e +size 2687 diff --git a/Explorer/Assets/Textures/BackpackPanel/Silhouette001.png.meta b/Explorer/Assets/Textures/BackpackPanel/Silhouette001.png.meta new file mode 100644 index 0000000000..dc14f63528 --- /dev/null +++ b/Explorer/Assets/Textures/BackpackPanel/Silhouette001.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: f57d8e78f64d542e098dbaf497a8b139 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 0 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 0 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 512 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Explorer/Assets/Textures/BackpackPanel/Silhouette002.png b/Explorer/Assets/Textures/BackpackPanel/Silhouette002.png new file mode 100755 index 0000000000..f0d996efcb --- /dev/null +++ b/Explorer/Assets/Textures/BackpackPanel/Silhouette002.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a0dd9379126aa95dcc4407c89786555d1cdbff6376a758ae6c306db6261942b0 +size 3269 diff --git a/Explorer/Assets/Textures/BackpackPanel/Silhouette002.png.meta b/Explorer/Assets/Textures/BackpackPanel/Silhouette002.png.meta new file mode 100644 index 0000000000..a1dea57b7e --- /dev/null +++ b/Explorer/Assets/Textures/BackpackPanel/Silhouette002.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: 7c57e911f193247528edac05922ca019 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 0 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 0 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 512 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Explorer/Assets/Textures/BackpackPanel/Silhouette003.png b/Explorer/Assets/Textures/BackpackPanel/Silhouette003.png new file mode 100755 index 0000000000..f0239f9c4e --- /dev/null +++ b/Explorer/Assets/Textures/BackpackPanel/Silhouette003.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:06ac84d06a3a2f38ccddc3049d3d3c0a1a3004ba75ac4d1fbabc00e8d8aa830d +size 2627 diff --git a/Explorer/Assets/Textures/BackpackPanel/Silhouette003.png.meta b/Explorer/Assets/Textures/BackpackPanel/Silhouette003.png.meta new file mode 100644 index 0000000000..b91d4effe1 --- /dev/null +++ b/Explorer/Assets/Textures/BackpackPanel/Silhouette003.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: b3fcd616f8250405f8bb1aadd61cc220 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 0 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 0 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 512 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Explorer/Assets/Textures/BackpackPanel/Silhouette004.png b/Explorer/Assets/Textures/BackpackPanel/Silhouette004.png new file mode 100755 index 0000000000..f39893ca7a --- /dev/null +++ b/Explorer/Assets/Textures/BackpackPanel/Silhouette004.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b8c83bf2745559ef10045e3d750b725646eadfd3be526823b1f37227319f4390 +size 2923 diff --git a/Explorer/Assets/Textures/BackpackPanel/Silhouette004.png.meta b/Explorer/Assets/Textures/BackpackPanel/Silhouette004.png.meta new file mode 100644 index 0000000000..3205211ada --- /dev/null +++ b/Explorer/Assets/Textures/BackpackPanel/Silhouette004.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: feb17d16b84e84e55a6dc530923024ef +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 0 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 0 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 512 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Explorer/Assets/Textures/BackpackPanel/Silhouette005.png b/Explorer/Assets/Textures/BackpackPanel/Silhouette005.png new file mode 100755 index 0000000000..3148fc4cfd --- /dev/null +++ b/Explorer/Assets/Textures/BackpackPanel/Silhouette005.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7df77f10d14ec44cbda9764bbb6beaea0e2b8e681e68bdb47cf20a84466404c3 +size 2826 diff --git a/Explorer/Assets/Textures/BackpackPanel/Silhouette005.png.meta b/Explorer/Assets/Textures/BackpackPanel/Silhouette005.png.meta new file mode 100644 index 0000000000..d3b5c69313 --- /dev/null +++ b/Explorer/Assets/Textures/BackpackPanel/Silhouette005.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: 4d7db0ddbeffb45699b8fdea65aa4fb4 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 0 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 0 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 512 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Explorer/Assets/Textures/BackpackPanel/SkinsIcon.png b/Explorer/Assets/Textures/BackpackPanel/SkinsIcon.png index 950ceddb4b..da5b80f45a 100755 --- a/Explorer/Assets/Textures/BackpackPanel/SkinsIcon.png +++ b/Explorer/Assets/Textures/BackpackPanel/SkinsIcon.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c9958a6b74be5a0cc6147421c1b56a7a5f611244dd0b956841fe6ac5a299d1b7 -size 656 +oid sha256:e8d3e6ab2335816b581d831d44e788eb6ad5007808e81218538100fec5cbb308 +size 661 diff --git a/Explorer/Assets/Textures/BackpackPanel/SkinsIcon.png.meta b/Explorer/Assets/Textures/BackpackPanel/SkinsIcon.png.meta index 3f2e0e30df..4151c60189 100644 --- a/Explorer/Assets/Textures/BackpackPanel/SkinsIcon.png.meta +++ b/Explorer/Assets/Textures/BackpackPanel/SkinsIcon.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 2f525faf27fa14ded87402d1684eb85d +guid: bda43422408ca42209dd311b23a1d06f TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -45,12 +45,12 @@ TextureImporter: compressionQuality: 50 spriteMode: 1 spriteExtrude: 1 - spriteMeshType: 1 + spriteMeshType: 0 alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 + spriteGenerateFallbackPhysicsShape: 0 alphaUsage: 1 alphaIsTransparency: 1 spriteTessellationDetail: -1 @@ -65,14 +65,14 @@ TextureImporter: ignorePngGamma: 0 applyGammaDecoding: 0 swizzle: 50462976 - cookieLightType: 0 + cookieLightType: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 + maxTextureSize: 128 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -82,10 +82,23 @@ TextureImporter: forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: Standalone - maxTextureSize: 2048 + maxTextureSize: 128 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 128 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -95,10 +108,10 @@ TextureImporter: forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: Server - maxTextureSize: 2048 + maxTextureSize: 128 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 diff --git a/Explorer/Assets/Textures/BackpackPanel/SliderHUE.png b/Explorer/Assets/Textures/BackpackPanel/SliderHUE.png new file mode 100644 index 0000000000..f3ce8d9aa1 --- /dev/null +++ b/Explorer/Assets/Textures/BackpackPanel/SliderHUE.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b9c3c99ec673a436b2796e4b85c40a9a698eec00320d90314ed9866cbe0d5309 +size 6553 diff --git a/Explorer/Assets/Textures/BackpackPanel/SliderHUE.png.meta b/Explorer/Assets/Textures/BackpackPanel/SliderHUE.png.meta new file mode 100644 index 0000000000..a7ad4e05f2 --- /dev/null +++ b/Explorer/Assets/Textures/BackpackPanel/SliderHUE.png.meta @@ -0,0 +1,140 @@ +fileFormatVersion: 2 +guid: cf1014f15559747c1918c2345d4e259a +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 0 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 10, y: 9, z: 12, w: 10} + spriteGenerateFallbackPhysicsShape: 0 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 1 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Explorer/Assets/Textures/BackpackPanel/SliderSaturation.png b/Explorer/Assets/Textures/BackpackPanel/SliderSaturation.png new file mode 100644 index 0000000000..00ae2af40e --- /dev/null +++ b/Explorer/Assets/Textures/BackpackPanel/SliderSaturation.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7a3c76b4594bcf31e7dddcf6608012a0e422e9a7a1e73df9f1977f63205a226f +size 6535 diff --git a/Explorer/Assets/Textures/BackpackPanel/SliderSaturation.png.meta b/Explorer/Assets/Textures/BackpackPanel/SliderSaturation.png.meta new file mode 100644 index 0000000000..808b0064e6 --- /dev/null +++ b/Explorer/Assets/Textures/BackpackPanel/SliderSaturation.png.meta @@ -0,0 +1,140 @@ +fileFormatVersion: 2 +guid: 007d970352cbc4cadadc4cb99da58e7d +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 0 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 11, y: 11, z: 10, w: 9} + spriteGenerateFallbackPhysicsShape: 0 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 1 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Explorer/Assets/Textures/BackpackPanel/SliderValue.png b/Explorer/Assets/Textures/BackpackPanel/SliderValue.png new file mode 100644 index 0000000000..1ec6df6649 --- /dev/null +++ b/Explorer/Assets/Textures/BackpackPanel/SliderValue.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5c74daf4bcaef134c576ae4b368c93a1cd286e6ef4ba4651b771986d4642c6ea +size 3780 diff --git a/Explorer/Assets/Textures/BackpackPanel/SliderValue.png.meta b/Explorer/Assets/Textures/BackpackPanel/SliderValue.png.meta new file mode 100644 index 0000000000..e580cbc81e --- /dev/null +++ b/Explorer/Assets/Textures/BackpackPanel/SliderValue.png.meta @@ -0,0 +1,140 @@ +fileFormatVersion: 2 +guid: 8ee9aed5af74d4e399555cda5681978e +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 0 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 10, y: 11, z: 12, w: 7} + spriteGenerateFallbackPhysicsShape: 0 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 1 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Explorer/Assets/Textures/BackpackPanel/SmartItemBg.png b/Explorer/Assets/Textures/BackpackPanel/SmartItemBg.png new file mode 100755 index 0000000000..af10bc739d --- /dev/null +++ b/Explorer/Assets/Textures/BackpackPanel/SmartItemBg.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4ac05a89004008231c1a04068622b5f83746d0f60caaf2c2bc3be5ea7fc9184b +size 792 diff --git a/Explorer/Assets/Textures/FriendsIcn.png.meta b/Explorer/Assets/Textures/BackpackPanel/SmartItemBg.png.meta similarity index 97% rename from Explorer/Assets/Textures/FriendsIcn.png.meta rename to Explorer/Assets/Textures/BackpackPanel/SmartItemBg.png.meta index 1bfb668448..a422926d5d 100644 --- a/Explorer/Assets/Textures/FriendsIcn.png.meta +++ b/Explorer/Assets/Textures/BackpackPanel/SmartItemBg.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 8de552cb2ca164c5f9e4f7bdcb5519f9 +guid: 62b6d6de1659a428a9f0f806e7073a46 TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -45,7 +45,7 @@ TextureImporter: compressionQuality: 50 spriteMode: 1 spriteExtrude: 1 - spriteMeshType: 1 + spriteMeshType: 0 alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 @@ -69,7 +69,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 + maxTextureSize: 128 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 diff --git a/Explorer/Assets/Textures/BackpackPanel/SmartItemIcn.png b/Explorer/Assets/Textures/BackpackPanel/SmartItemIcn.png new file mode 100644 index 0000000000..641da5c02e --- /dev/null +++ b/Explorer/Assets/Textures/BackpackPanel/SmartItemIcn.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ca0f19356c7aa8c4a010bde4ec88d5a1df9352fbc66faa3d2d904d2169e26651 +size 295 diff --git a/Explorer/Assets/Textures/BackpackPanel/SmartItemIcn.png.meta b/Explorer/Assets/Textures/BackpackPanel/SmartItemIcn.png.meta new file mode 100644 index 0000000000..da68bb127f --- /dev/null +++ b/Explorer/Assets/Textures/BackpackPanel/SmartItemIcn.png.meta @@ -0,0 +1,166 @@ +fileFormatVersion: 2 +guid: 16a5648277f4daa4d9c15a5365076da6 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 0 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 0 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 1 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 512 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 512 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 512 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 512 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 512 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 512 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Explorer/Assets/Textures/BackpackPanel/SoundIcn.png b/Explorer/Assets/Textures/BackpackPanel/SoundIcn.png new file mode 100644 index 0000000000..02482550bc --- /dev/null +++ b/Explorer/Assets/Textures/BackpackPanel/SoundIcn.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6a73a1965be512a0c3120bda0c99ce51d083fd03151c34203a8356fa2e95b22c +size 406 diff --git a/Explorer/Assets/Textures/BackpackPanel/SoundIcn.png.meta b/Explorer/Assets/Textures/BackpackPanel/SoundIcn.png.meta new file mode 100644 index 0000000000..cd176ec2ad --- /dev/null +++ b/Explorer/Assets/Textures/BackpackPanel/SoundIcn.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: 86700c29929bc4233a4561fb3da6140b +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 0 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 0 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 64 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Explorer/Assets/Textures/BackpackPanel/TiaraIcon.png b/Explorer/Assets/Textures/BackpackPanel/TiaraIcon.png old mode 100644 new mode 100755 index a73a94353c..80a65a8df9 --- a/Explorer/Assets/Textures/BackpackPanel/TiaraIcon.png +++ b/Explorer/Assets/Textures/BackpackPanel/TiaraIcon.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:76a1721d75e82eab99b5ef1e3219c2a811f195711c75aa1da981c9b5a7efb720 -size 695 +oid sha256:85164a57d8f820c622ed1717515255ab9d30b9eefd4260c33a8c9cf9d88bc01d +size 501 diff --git a/Explorer/Assets/Textures/BackpackPanel/TiaraIcon.png.meta b/Explorer/Assets/Textures/BackpackPanel/TiaraIcon.png.meta index 9b209e1220..73efe15555 100644 --- a/Explorer/Assets/Textures/BackpackPanel/TiaraIcon.png.meta +++ b/Explorer/Assets/Textures/BackpackPanel/TiaraIcon.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 7879a1a71dbb64cb6b8453907a36f60b +guid: 6a3c7a80a921c458c93852cc9cfa33c1 TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -45,12 +45,12 @@ TextureImporter: compressionQuality: 50 spriteMode: 1 spriteExtrude: 1 - spriteMeshType: 1 + spriteMeshType: 0 alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 + spriteGenerateFallbackPhysicsShape: 0 alphaUsage: 1 alphaIsTransparency: 1 spriteTessellationDetail: -1 @@ -63,16 +63,16 @@ TextureImporter: compressionQualitySet: 0 textureFormatSet: 0 ignorePngGamma: 0 - applyGammaDecoding: 0 + applyGammaDecoding: 1 swizzle: 50462976 - cookieLightType: 0 + cookieLightType: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 + maxTextureSize: 128 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -82,10 +82,23 @@ TextureImporter: forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: Standalone - maxTextureSize: 2048 + maxTextureSize: 128 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 128 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -95,10 +108,10 @@ TextureImporter: forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: Server - maxTextureSize: 2048 + maxTextureSize: 128 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -112,7 +125,7 @@ TextureImporter: outline: [] physicsShape: [] bones: [] - spriteID: 5e97eb03825dee720800000000000000 + spriteID: 56fdf283414bc49ce8b8a349f60b9310 internalID: 0 vertices: [] indices: diff --git a/Explorer/Assets/Textures/BackpackPanel/TopIcon.png.meta b/Explorer/Assets/Textures/BackpackPanel/TopIcon.png.meta index c6015086ed..eaf6a58f9c 100644 --- a/Explorer/Assets/Textures/BackpackPanel/TopIcon.png.meta +++ b/Explorer/Assets/Textures/BackpackPanel/TopIcon.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: af4261c3d3ccf4ee5aa2a37b13af6922 +guid: 48d5dd980b244494b9f9d9fc540e0b01 TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -45,12 +45,12 @@ TextureImporter: compressionQuality: 50 spriteMode: 1 spriteExtrude: 1 - spriteMeshType: 1 + spriteMeshType: 0 alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 + spriteGenerateFallbackPhysicsShape: 0 alphaUsage: 1 alphaIsTransparency: 1 spriteTessellationDetail: -1 @@ -63,16 +63,16 @@ TextureImporter: compressionQualitySet: 0 textureFormatSet: 0 ignorePngGamma: 0 - applyGammaDecoding: 0 + applyGammaDecoding: 1 swizzle: 50462976 - cookieLightType: 0 + cookieLightType: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 + maxTextureSize: 128 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -82,10 +82,23 @@ TextureImporter: forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: Standalone - maxTextureSize: 2048 + maxTextureSize: 128 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 128 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -95,10 +108,10 @@ TextureImporter: forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: Server - maxTextureSize: 2048 + maxTextureSize: 128 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -112,7 +125,7 @@ TextureImporter: outline: [] physicsShape: [] bones: [] - spriteID: 5e97eb03825dee720800000000000000 + spriteID: 846cc7cf89f4e4f07a27bf8a55c02300 internalID: 0 vertices: [] indices: diff --git a/Explorer/Assets/Textures/BackpackPanel/TopheadIcon.png b/Explorer/Assets/Textures/BackpackPanel/TopheadIcon.png old mode 100644 new mode 100755 index d3925ba3b6..fa2f4af9dd --- a/Explorer/Assets/Textures/BackpackPanel/TopheadIcon.png +++ b/Explorer/Assets/Textures/BackpackPanel/TopheadIcon.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dc2e024827636e8b8ea63c9f5b53788497e053cc28bb883429f1ad1cbee4a203 -size 891 +oid sha256:0da8c676bf2373a25d7b6dc893e267bd29d4b68e0d4ab973e6c4400223746ca3 +size 2996 diff --git a/Explorer/Assets/Textures/BackpackPanel/TopheadIcon.png.meta b/Explorer/Assets/Textures/BackpackPanel/TopheadIcon.png.meta index 0e629f12a2..f1fac3f491 100644 --- a/Explorer/Assets/Textures/BackpackPanel/TopheadIcon.png.meta +++ b/Explorer/Assets/Textures/BackpackPanel/TopheadIcon.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 48fb8b5f1eb6247d7aa88e2273b0ba58 +guid: 6084de83d5bc748b9a444a61a7c0b96a TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -45,12 +45,12 @@ TextureImporter: compressionQuality: 50 spriteMode: 1 spriteExtrude: 1 - spriteMeshType: 1 + spriteMeshType: 0 alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 + spriteGenerateFallbackPhysicsShape: 0 alphaUsage: 1 alphaIsTransparency: 1 spriteTessellationDetail: -1 @@ -63,16 +63,16 @@ TextureImporter: compressionQualitySet: 0 textureFormatSet: 0 ignorePngGamma: 0 - applyGammaDecoding: 0 + applyGammaDecoding: 1 swizzle: 50462976 - cookieLightType: 0 + cookieLightType: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 + maxTextureSize: 128 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -82,10 +82,23 @@ TextureImporter: forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: Standalone - maxTextureSize: 2048 + maxTextureSize: 128 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 128 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -95,10 +108,10 @@ TextureImporter: forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: Server - maxTextureSize: 2048 + maxTextureSize: 128 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -112,7 +125,7 @@ TextureImporter: outline: [] physicsShape: [] bones: [] - spriteID: 5e97eb03825dee720800000000000000 + spriteID: d04b51fa0f1d54df09cddceb4aac47da internalID: 0 vertices: [] indices: diff --git a/Explorer/Assets/Textures/BackpackPanel/VerticalPanIcn.png b/Explorer/Assets/Textures/BackpackPanel/VerticalPanIcn.png new file mode 100644 index 0000000000..5249bb75fb --- /dev/null +++ b/Explorer/Assets/Textures/BackpackPanel/VerticalPanIcn.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ee1b4264bb30713054e3d5ea719b6c6f3463ff6f8ea45502c0d3d4f689df1756 +size 1276 diff --git a/Explorer/Assets/Textures/BackpackPanel/VerticalPanIcn.png.meta b/Explorer/Assets/Textures/BackpackPanel/VerticalPanIcn.png.meta new file mode 100644 index 0000000000..36ab770648 --- /dev/null +++ b/Explorer/Assets/Textures/BackpackPanel/VerticalPanIcn.png.meta @@ -0,0 +1,140 @@ +fileFormatVersion: 2 +guid: a0dd824ee2daadd46a4437a4e3145c9e +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 0 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 0 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 64 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Explorer/Assets/Textures/BackpackPanel/VisibleIcon.png b/Explorer/Assets/Textures/BackpackPanel/VisibleIcon.png new file mode 100644 index 0000000000..1cb3007c47 --- /dev/null +++ b/Explorer/Assets/Textures/BackpackPanel/VisibleIcon.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4f513bbe2e50f838f642235762b7242d2b3f6c537c50c18756fd7e278da5f1e4 +size 495 diff --git a/Explorer/Assets/Textures/BackpackPanel/VisibleIcon.png.meta b/Explorer/Assets/Textures/BackpackPanel/VisibleIcon.png.meta new file mode 100644 index 0000000000..447acbaa9e --- /dev/null +++ b/Explorer/Assets/Textures/BackpackPanel/VisibleIcon.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: 2b0a6fdd96915402592ab53957ebf5ac +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 0 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 0 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 64 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Explorer/Assets/Textures/BackpackPanel/WearablesIcn.png b/Explorer/Assets/Textures/BackpackPanel/WearablesIcn.png new file mode 100755 index 0000000000..0ef7fb439c --- /dev/null +++ b/Explorer/Assets/Textures/BackpackPanel/WearablesIcn.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1a6234953ba2164e5df6ab4b73ed89c4a3610fc15babc676635c8362877e2abf +size 481 diff --git a/Explorer/Assets/Textures/BackpackPanel/HeadIcon.png.meta b/Explorer/Assets/Textures/BackpackPanel/WearablesIcn.png.meta similarity index 97% rename from Explorer/Assets/Textures/BackpackPanel/HeadIcon.png.meta rename to Explorer/Assets/Textures/BackpackPanel/WearablesIcn.png.meta index 8c5dcba67e..833a1aedc6 100644 --- a/Explorer/Assets/Textures/BackpackPanel/HeadIcon.png.meta +++ b/Explorer/Assets/Textures/BackpackPanel/WearablesIcn.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 7576c5b09286149758805970dbaa3f17 +guid: fbd8ab1095b184feb89e2963e0d53d6b TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -45,7 +45,7 @@ TextureImporter: compressionQuality: 50 spriteMode: 1 spriteExtrude: 1 - spriteMeshType: 1 + spriteMeshType: 0 alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 @@ -69,7 +69,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 + maxTextureSize: 128 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 diff --git a/Explorer/Assets/Textures/Common/ArrowDown 1.png b/Explorer/Assets/Textures/Common/ArrowDown 1.png deleted file mode 100755 index 741cedfa4d..0000000000 --- a/Explorer/Assets/Textures/Common/ArrowDown 1.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:df4f3807105966e94035c13c53fa8512dc4f49fc2e9a5fe0851b84c3f2385152 -size 351 diff --git a/Explorer/Assets/Textures/Common/ArrowDown 1.png.meta b/Explorer/Assets/Textures/Common/ArrowDown 1.png.meta deleted file mode 100644 index a21e17e91a..0000000000 --- a/Explorer/Assets/Textures/Common/ArrowDown 1.png.meta +++ /dev/null @@ -1,127 +0,0 @@ -fileFormatVersion: 2 -guid: c5e2ebee00c614267987622f8268e807 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 12 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - flipGreenChannel: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMipmapLimit: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 1 - mipBias: 0 - wrapU: 0 - wrapV: 0 - wrapW: 0 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 0 - spriteTessellationDetail: -1 - textureType: 8 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - swizzle: 50462976 - cookieLightType: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Server - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Explorer/Assets/Textures/Common/ArrowLeft 1.png b/Explorer/Assets/Textures/Common/ArrowLeft 1.png deleted file mode 100755 index dc61684ade..0000000000 --- a/Explorer/Assets/Textures/Common/ArrowLeft 1.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:70fd09807833cda7fe614cc9cea2fa46c7ee65b876c12a0ef9dd9af4d7d3a0a8 -size 278 diff --git a/Explorer/Assets/Textures/Common/ArrowLeft 1.png.meta b/Explorer/Assets/Textures/Common/ArrowLeft 1.png.meta deleted file mode 100644 index 24109b280e..0000000000 --- a/Explorer/Assets/Textures/Common/ArrowLeft 1.png.meta +++ /dev/null @@ -1,127 +0,0 @@ -fileFormatVersion: 2 -guid: 4a47a93602e9441f587159027ff39c5a -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 12 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - flipGreenChannel: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMipmapLimit: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 1 - mipBias: 0 - wrapU: 0 - wrapV: 0 - wrapW: 0 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 0 - spriteTessellationDetail: -1 - textureType: 8 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - swizzle: 50462976 - cookieLightType: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Server - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Explorer/Assets/Textures/Common/ArrowRight 1.png b/Explorer/Assets/Textures/Common/ArrowRight 1.png deleted file mode 100755 index 4eb981918c..0000000000 --- a/Explorer/Assets/Textures/Common/ArrowRight 1.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:add035d8fa5427f56c56087f476b645b17113dc556be50cc556c291f69971a72 -size 284 diff --git a/Explorer/Assets/Textures/Common/ArrowRight 1.png.meta b/Explorer/Assets/Textures/Common/ArrowRight 1.png.meta deleted file mode 100644 index d372e01bcb..0000000000 --- a/Explorer/Assets/Textures/Common/ArrowRight 1.png.meta +++ /dev/null @@ -1,127 +0,0 @@ -fileFormatVersion: 2 -guid: 4967361b5e6eb47c588d05632d66d711 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 12 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - flipGreenChannel: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMipmapLimit: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 1 - mipBias: 0 - wrapU: 0 - wrapV: 0 - wrapW: 0 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 0 - spriteTessellationDetail: -1 - textureType: 8 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - swizzle: 50462976 - cookieLightType: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Server - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Explorer/Assets/Textures/Common/ArrowUp 1.png b/Explorer/Assets/Textures/Common/ArrowUp 1.png deleted file mode 100755 index 656d57a4e4..0000000000 --- a/Explorer/Assets/Textures/Common/ArrowUp 1.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:77d89b7d1734be414b4dc6e005f8f26d414a3dfb3a4bc32a91d74b80f600f9d7 -size 339 diff --git a/Explorer/Assets/Textures/Common/ArrowUp 1.png.meta b/Explorer/Assets/Textures/Common/ArrowUp 1.png.meta deleted file mode 100644 index d25d4126ca..0000000000 --- a/Explorer/Assets/Textures/Common/ArrowUp 1.png.meta +++ /dev/null @@ -1,127 +0,0 @@ -fileFormatVersion: 2 -guid: 41f242de34f5140eb9b3a072127756dc -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 12 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - flipGreenChannel: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMipmapLimit: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 1 - mipBias: 0 - wrapU: 0 - wrapV: 0 - wrapW: 0 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 0 - spriteTessellationDetail: -1 - textureType: 8 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - swizzle: 50462976 - cookieLightType: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Server - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Explorer/Assets/Textures/CheckmarkContainer.png b/Explorer/Assets/Textures/Common/CheckboxOff.png similarity index 100% rename from Explorer/Assets/Textures/CheckmarkContainer.png rename to Explorer/Assets/Textures/Common/CheckboxOff.png diff --git a/Explorer/Assets/Textures/CheckmarkContainer.png.meta b/Explorer/Assets/Textures/Common/CheckboxOff.png.meta similarity index 100% rename from Explorer/Assets/Textures/CheckmarkContainer.png.meta rename to Explorer/Assets/Textures/Common/CheckboxOff.png.meta diff --git a/Explorer/Assets/Textures/CheckmarkContainerIcn.png b/Explorer/Assets/Textures/Common/CheckboxOn.png similarity index 100% rename from Explorer/Assets/Textures/CheckmarkContainerIcn.png rename to Explorer/Assets/Textures/Common/CheckboxOn.png diff --git a/Explorer/Assets/Textures/CheckmarkContainerIcn.png.meta b/Explorer/Assets/Textures/Common/CheckboxOn.png.meta similarity index 100% rename from Explorer/Assets/Textures/CheckmarkContainerIcn.png.meta rename to Explorer/Assets/Textures/Common/CheckboxOn.png.meta diff --git a/Explorer/Assets/Textures/CloseButton.png b/Explorer/Assets/Textures/Common/CloseButton.png similarity index 100% rename from Explorer/Assets/Textures/CloseButton.png rename to Explorer/Assets/Textures/Common/CloseButton.png diff --git a/Explorer/Assets/Textures/CloseButton.png.meta b/Explorer/Assets/Textures/Common/CloseButton.png.meta similarity index 100% rename from Explorer/Assets/Textures/CloseButton.png.meta rename to Explorer/Assets/Textures/Common/CloseButton.png.meta diff --git a/Explorer/Assets/Textures/Container12.png b/Explorer/Assets/Textures/Common/Container12.png similarity index 100% rename from Explorer/Assets/Textures/Container12.png rename to Explorer/Assets/Textures/Common/Container12.png diff --git a/Explorer/Assets/Textures/Container12.png.meta b/Explorer/Assets/Textures/Common/Container12.png.meta similarity index 100% rename from Explorer/Assets/Textures/Container12.png.meta rename to Explorer/Assets/Textures/Common/Container12.png.meta diff --git a/Explorer/Assets/Textures/Common/Container12Outline1 1.png b/Explorer/Assets/Textures/Common/Container12Outline1 1.png deleted file mode 100755 index fb81185059..0000000000 --- a/Explorer/Assets/Textures/Common/Container12Outline1 1.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8a9d5049e33b37dc49f6dd413215b19d5040e4c354932cb28a7df982632ef81f -size 559 diff --git a/Explorer/Assets/Textures/Common/Container12Outline1 1.png.meta b/Explorer/Assets/Textures/Common/Container12Outline1 1.png.meta deleted file mode 100644 index dd02660754..0000000000 --- a/Explorer/Assets/Textures/Common/Container12Outline1 1.png.meta +++ /dev/null @@ -1,127 +0,0 @@ -fileFormatVersion: 2 -guid: 69efcf7fa2d114a6faa4ba1d8bad9047 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 12 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - flipGreenChannel: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMipmapLimit: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 1 - mipBias: 0 - wrapU: 0 - wrapV: 0 - wrapW: 0 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 0 - spriteTessellationDetail: -1 - textureType: 8 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - swizzle: 50462976 - cookieLightType: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Server - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Explorer/Assets/Textures/Common/Container12Outline3 1.png b/Explorer/Assets/Textures/Common/Container12Outline3 1.png deleted file mode 100755 index a9bee20b93..0000000000 --- a/Explorer/Assets/Textures/Common/Container12Outline3 1.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e4652f9f8424810bc93d646cb163489576521b6de2a8f4cd4947391911a742c5 -size 639 diff --git a/Explorer/Assets/Textures/Common/Container12Outline3 1.png.meta b/Explorer/Assets/Textures/Common/Container12Outline3 1.png.meta deleted file mode 100644 index 0d50194e1b..0000000000 --- a/Explorer/Assets/Textures/Common/Container12Outline3 1.png.meta +++ /dev/null @@ -1,127 +0,0 @@ -fileFormatVersion: 2 -guid: eb081e98a3e8942e3b205f2a5f0d38fc -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 12 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - flipGreenChannel: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMipmapLimit: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 1 - mipBias: 0 - wrapU: 0 - wrapV: 0 - wrapW: 0 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 0 - spriteTessellationDetail: -1 - textureType: 8 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - swizzle: 50462976 - cookieLightType: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Server - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Explorer/Assets/Textures/Common/Container12RectBottom 1.png b/Explorer/Assets/Textures/Common/Container12RectBottom 1.png deleted file mode 100755 index e02ab44f00..0000000000 --- a/Explorer/Assets/Textures/Common/Container12RectBottom 1.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a88c402df65dc9fd7c695c7074e61463530641a244ecbf0178c40bcea35b1be4 -size 309 diff --git a/Explorer/Assets/Textures/Common/Container12RectBottom 1.png.meta b/Explorer/Assets/Textures/Common/Container12RectBottom 1.png.meta deleted file mode 100644 index 85b73c1f51..0000000000 --- a/Explorer/Assets/Textures/Common/Container12RectBottom 1.png.meta +++ /dev/null @@ -1,127 +0,0 @@ -fileFormatVersion: 2 -guid: cb66c147591e04c76b7c5ae48b0bd2ce -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 12 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - flipGreenChannel: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMipmapLimit: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 1 - mipBias: 0 - wrapU: 0 - wrapV: 0 - wrapW: 0 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 0 - spriteTessellationDetail: -1 - textureType: 8 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - swizzle: 50462976 - cookieLightType: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Server - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Explorer/Assets/Textures/Common/Container12RectBottom.png.meta b/Explorer/Assets/Textures/Common/Container12RectBottom.png.meta index b5e672ff7e..099f7be346 100644 --- a/Explorer/Assets/Textures/Common/Container12RectBottom.png.meta +++ b/Explorer/Assets/Textures/Common/Container12RectBottom.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 5c569e851fe024c7e8e4b57c07575226 +guid: 0777b27ffb579410cbb9d7bd29774538 TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -21,7 +21,7 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 flipGreenChannel: 0 - isReadable: 1 + isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 @@ -45,12 +45,12 @@ TextureImporter: compressionQuality: 50 spriteMode: 1 spriteExtrude: 1 - spriteMeshType: 0 + spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 spriteBorder: {x: 29, y: 29, z: 29, w: 29} - spriteGenerateFallbackPhysicsShape: 0 + spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 1 spriteTessellationDetail: -1 @@ -65,14 +65,14 @@ TextureImporter: ignorePngGamma: 0 applyGammaDecoding: 0 swizzle: 50462976 - cookieLightType: 1 + cookieLightType: 0 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 0 + textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -85,7 +85,7 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 0 + textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -98,7 +98,7 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 0 + textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -113,7 +113,7 @@ TextureImporter: physicsShape: [] bones: [] spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 + internalID: 1537655665 vertices: [] indices: edges: [] diff --git a/Explorer/Assets/Textures/Common/Container12RectLeft 1.png b/Explorer/Assets/Textures/Common/Container12RectLeft 1.png deleted file mode 100755 index eca4b75fcd..0000000000 --- a/Explorer/Assets/Textures/Common/Container12RectLeft 1.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d7f45ae57f1155b77081cd0d218b1da78f292fad77543002298101ec3bc6a45e -size 1899 diff --git a/Explorer/Assets/Textures/Common/Container12RectLeft 1.png.meta b/Explorer/Assets/Textures/Common/Container12RectLeft 1.png.meta deleted file mode 100644 index f8bea34a0c..0000000000 --- a/Explorer/Assets/Textures/Common/Container12RectLeft 1.png.meta +++ /dev/null @@ -1,127 +0,0 @@ -fileFormatVersion: 2 -guid: 418bc66e2daed4c5db30befb5a1771ad -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 12 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - flipGreenChannel: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMipmapLimit: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 1 - mipBias: 0 - wrapU: 0 - wrapV: 0 - wrapW: 0 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 0 - spriteTessellationDetail: -1 - textureType: 8 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - swizzle: 50462976 - cookieLightType: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Server - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Explorer/Assets/Textures/Common/Container12RectRight 1.png b/Explorer/Assets/Textures/Common/Container12RectRight 1.png deleted file mode 100644 index 8054b64f5e..0000000000 --- a/Explorer/Assets/Textures/Common/Container12RectRight 1.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3e22b5bd59c3d2c38ddb1d964606d95e03ff1b4275b546e706b49f7baa5976ea -size 2369 diff --git a/Explorer/Assets/Textures/Common/Container12RectRight 1.png.meta b/Explorer/Assets/Textures/Common/Container12RectRight 1.png.meta deleted file mode 100644 index f3d53bb1f7..0000000000 --- a/Explorer/Assets/Textures/Common/Container12RectRight 1.png.meta +++ /dev/null @@ -1,127 +0,0 @@ -fileFormatVersion: 2 -guid: 435e6dc8ba60a4a4eb88d15de35aa19b -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 12 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - flipGreenChannel: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMipmapLimit: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 1 - mipBias: 0 - wrapU: 0 - wrapV: 0 - wrapW: 0 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 0 - spriteTessellationDetail: -1 - textureType: 8 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - swizzle: 50462976 - cookieLightType: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Server - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Explorer/Assets/Textures/Common/Container12RectTop 1.png b/Explorer/Assets/Textures/Common/Container12RectTop 1.png deleted file mode 100644 index 246f03f2c2..0000000000 --- a/Explorer/Assets/Textures/Common/Container12RectTop 1.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9d91fb0a3d84c583eb9fd7bc45eebf1ae5093653ebddf7693155203eba3faf68 -size 308 diff --git a/Explorer/Assets/Textures/Common/Container12RectTop 1.png.meta b/Explorer/Assets/Textures/Common/Container12RectTop 1.png.meta deleted file mode 100644 index 9dc7c16203..0000000000 --- a/Explorer/Assets/Textures/Common/Container12RectTop 1.png.meta +++ /dev/null @@ -1,127 +0,0 @@ -fileFormatVersion: 2 -guid: 4221f52b6b3394810a836a2914d4d2e3 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 12 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - flipGreenChannel: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMipmapLimit: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 1 - mipBias: 0 - wrapU: 0 - wrapV: 0 - wrapW: 0 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 0 - spriteTessellationDetail: -1 - textureType: 8 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - swizzle: 50462976 - cookieLightType: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Server - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Explorer/Assets/Textures/Common/Container12RectTop.png.meta b/Explorer/Assets/Textures/Common/Container12RectTop.png.meta index 63f21bb653..adfedbea86 100644 --- a/Explorer/Assets/Textures/Common/Container12RectTop.png.meta +++ b/Explorer/Assets/Textures/Common/Container12RectTop.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 590e1b5ec5d7e45379b7d1f4f3f4e1af +guid: 6a691ff28b59f4236a6a8d3b7f4aa258 TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -45,12 +45,12 @@ TextureImporter: compressionQuality: 50 spriteMode: 1 spriteExtrude: 1 - spriteMeshType: 0 + spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 - spriteBorder: {x: 31, y: 31, z: 31, w: 31} - spriteGenerateFallbackPhysicsShape: 0 + spriteBorder: {x: 29, y: 29, z: 29, w: 29} + spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 1 spriteTessellationDetail: -1 @@ -65,11 +65,11 @@ TextureImporter: ignorePngGamma: 0 applyGammaDecoding: 0 swizzle: 50462976 - cookieLightType: 1 + cookieLightType: 0 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 64 + maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 @@ -82,20 +82,7 @@ TextureImporter: forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: Standalone - maxTextureSize: 64 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: WebGL - maxTextureSize: 64 + maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 @@ -108,7 +95,7 @@ TextureImporter: forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: Server - maxTextureSize: 64 + maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 @@ -126,7 +113,7 @@ TextureImporter: physicsShape: [] bones: [] spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 + internalID: 1537655665 vertices: [] indices: edges: [] diff --git a/Explorer/Assets/Textures/Common/Container12Shadow10 1.png b/Explorer/Assets/Textures/Common/Container12Shadow10 1.png deleted file mode 100644 index 4f6a1cfe50..0000000000 --- a/Explorer/Assets/Textures/Common/Container12Shadow10 1.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:efc210671a55cacde5fd3f7eb8b319813c2da90504834fc8cf3ad9361f758583 -size 1276 diff --git a/Explorer/Assets/Textures/Common/Container12Shadow10 1.png.meta b/Explorer/Assets/Textures/Common/Container12Shadow10 1.png.meta deleted file mode 100644 index 33ec6144e3..0000000000 --- a/Explorer/Assets/Textures/Common/Container12Shadow10 1.png.meta +++ /dev/null @@ -1,127 +0,0 @@ -fileFormatVersion: 2 -guid: 9f273f1208ec140a494d9c10ea13f8d7 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 12 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - flipGreenChannel: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMipmapLimit: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 1 - mipBias: 0 - wrapU: 0 - wrapV: 0 - wrapW: 0 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 0 - spriteTessellationDetail: -1 - textureType: 8 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - swizzle: 50462976 - cookieLightType: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Server - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Explorer/Assets/Textures/Common/Container12Shadow4 1.png b/Explorer/Assets/Textures/Common/Container12Shadow4 1.png deleted file mode 100644 index d6af4c5a14..0000000000 --- a/Explorer/Assets/Textures/Common/Container12Shadow4 1.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:028a83502a5567257ca50732ca4f21dd9022108c3d59036b30117c230e1aa1db -size 4332 diff --git a/Explorer/Assets/Textures/Common/Container12Shadow4 1.png.meta b/Explorer/Assets/Textures/Common/Container12Shadow4 1.png.meta deleted file mode 100644 index c4e83decd6..0000000000 --- a/Explorer/Assets/Textures/Common/Container12Shadow4 1.png.meta +++ /dev/null @@ -1,127 +0,0 @@ -fileFormatVersion: 2 -guid: 9ba6d0b2457514c28a0b40c45ad3c7e1 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 12 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - flipGreenChannel: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMipmapLimit: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 1 - mipBias: 0 - wrapU: 0 - wrapV: 0 - wrapW: 0 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 0 - spriteTessellationDetail: -1 - textureType: 8 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - swizzle: 50462976 - cookieLightType: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Server - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Explorer/Assets/Textures/Common/Container24 1.png b/Explorer/Assets/Textures/Common/Container24 1.png deleted file mode 100755 index 250280c3ee..0000000000 --- a/Explorer/Assets/Textures/Common/Container24 1.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9f9491b13de76890d5a0f41f0cbc591faf7b0a491a1a2626982fa693de7e8704 -size 617 diff --git a/Explorer/Assets/Textures/Common/Container24 1.png.meta b/Explorer/Assets/Textures/Common/Container24 1.png.meta deleted file mode 100644 index d0615d4206..0000000000 --- a/Explorer/Assets/Textures/Common/Container24 1.png.meta +++ /dev/null @@ -1,127 +0,0 @@ -fileFormatVersion: 2 -guid: 32b4e2eb2c16e4269beb2e090bf5ea51 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 12 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - flipGreenChannel: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMipmapLimit: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 1 - mipBias: 0 - wrapU: 0 - wrapV: 0 - wrapW: 0 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 0 - spriteTessellationDetail: -1 - textureType: 8 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - swizzle: 50462976 - cookieLightType: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Server - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Explorer/Assets/Textures/Common/Container24.png.meta b/Explorer/Assets/Textures/Common/Container24.png.meta index f514ee5bc2..67828c20d1 100644 --- a/Explorer/Assets/Textures/Common/Container24.png.meta +++ b/Explorer/Assets/Textures/Common/Container24.png.meta @@ -6,7 +6,7 @@ TextureImporter: serializedVersion: 12 mipmaps: mipMapMode: 0 - enableMipMap: 1 + enableMipMap: 0 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 @@ -37,22 +37,22 @@ TextureImporter: filterMode: 1 aniso: 1 mipBias: 0 - wrapU: 0 - wrapV: 0 + wrapU: 1 + wrapV: 1 wrapW: 0 - nPOTScale: 1 + nPOTScale: 0 lightmap: 0 compressionQuality: 50 - spriteMode: 0 + spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 + spriteBorder: {x: 48, y: 48, z: 48, w: 48} + spriteGenerateFallbackPhysicsShape: 0 alphaUsage: 1 - alphaIsTransparency: 0 + alphaIsTransparency: 1 spriteTessellationDetail: -1 textureType: 8 textureShape: 1 @@ -69,7 +69,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 + maxTextureSize: 128 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 @@ -112,8 +112,8 @@ TextureImporter: outline: [] physicsShape: [] bones: [] - spriteID: - internalID: 0 + spriteID: 5e97eb03825dee720800000000000000 + internalID: 1537655665 vertices: [] indices: edges: [] diff --git a/Explorer/Assets/Textures/Common/Container24Shadow10 1.png b/Explorer/Assets/Textures/Common/Container24Shadow10 1.png deleted file mode 100644 index c7116a32e4..0000000000 --- a/Explorer/Assets/Textures/Common/Container24Shadow10 1.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:32480dd44c13eaff560903c962b108a58b81a5d4cb259f412dbb0c2756521679 -size 1782 diff --git a/Explorer/Assets/Textures/Common/Container24Shadow10 1.png.meta b/Explorer/Assets/Textures/Common/Container24Shadow10 1.png.meta deleted file mode 100644 index 3a523c80fb..0000000000 --- a/Explorer/Assets/Textures/Common/Container24Shadow10 1.png.meta +++ /dev/null @@ -1,127 +0,0 @@ -fileFormatVersion: 2 -guid: 0382406be3a6c4bb1a61b40fc0b06b92 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 12 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - flipGreenChannel: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMipmapLimit: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 1 - mipBias: 0 - wrapU: 0 - wrapV: 0 - wrapW: 0 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 0 - spriteTessellationDetail: -1 - textureType: 8 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - swizzle: 50462976 - cookieLightType: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Server - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Explorer/Assets/Textures/Common/Container24Shadow4 1.png b/Explorer/Assets/Textures/Common/Container24Shadow4 1.png deleted file mode 100644 index b0ea361236..0000000000 --- a/Explorer/Assets/Textures/Common/Container24Shadow4 1.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ca096ab3565835465b7300c326b3d7340d1473ac06ae09e526f649469917b90c -size 1360 diff --git a/Explorer/Assets/Textures/Common/Container24Shadow4 1.png.meta b/Explorer/Assets/Textures/Common/Container24Shadow4 1.png.meta deleted file mode 100644 index 73593a3be7..0000000000 --- a/Explorer/Assets/Textures/Common/Container24Shadow4 1.png.meta +++ /dev/null @@ -1,127 +0,0 @@ -fileFormatVersion: 2 -guid: 138cfb8eac28d4809bfff2ef4e47d8d7 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 12 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - flipGreenChannel: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMipmapLimit: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 1 - mipBias: 0 - wrapU: 0 - wrapV: 0 - wrapW: 0 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 0 - spriteTessellationDetail: -1 - textureType: 8 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - swizzle: 50462976 - cookieLightType: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Server - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Explorer/Assets/Textures/FlagAdult.png b/Explorer/Assets/Textures/Common/FlagAdult.png similarity index 100% rename from Explorer/Assets/Textures/FlagAdult.png rename to Explorer/Assets/Textures/Common/FlagAdult.png diff --git a/Explorer/Assets/Textures/FlagAdult.png.meta b/Explorer/Assets/Textures/Common/FlagAdult.png.meta similarity index 100% rename from Explorer/Assets/Textures/FlagAdult.png.meta rename to Explorer/Assets/Textures/Common/FlagAdult.png.meta diff --git a/Explorer/Assets/Textures/FlagRestricted.png b/Explorer/Assets/Textures/Common/FlagRestricted.png similarity index 100% rename from Explorer/Assets/Textures/FlagRestricted.png rename to Explorer/Assets/Textures/Common/FlagRestricted.png diff --git a/Explorer/Assets/Textures/FlagRestricted.png.meta b/Explorer/Assets/Textures/Common/FlagRestricted.png.meta similarity index 100% rename from Explorer/Assets/Textures/FlagRestricted.png.meta rename to Explorer/Assets/Textures/Common/FlagRestricted.png.meta diff --git a/Explorer/Assets/Textures/FlagTeen.png b/Explorer/Assets/Textures/Common/FlagTeen.png similarity index 100% rename from Explorer/Assets/Textures/FlagTeen.png rename to Explorer/Assets/Textures/Common/FlagTeen.png diff --git a/Explorer/Assets/Textures/FlagTeen.png.meta b/Explorer/Assets/Textures/Common/FlagTeen.png.meta similarity index 100% rename from Explorer/Assets/Textures/FlagTeen.png.meta rename to Explorer/Assets/Textures/Common/FlagTeen.png.meta diff --git a/Explorer/Assets/Textures/Common/GradientVertical 1.png b/Explorer/Assets/Textures/Common/GradientVertical 1.png deleted file mode 100755 index 5514518eb2..0000000000 --- a/Explorer/Assets/Textures/Common/GradientVertical 1.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:691e2230c7de32b3492a7e8fc0d72cb7bd9b7fe5b0284c1d4c731504a0f167aa -size 912 diff --git a/Explorer/Assets/Textures/Common/GradientVertical 1.png.meta b/Explorer/Assets/Textures/Common/GradientVertical 1.png.meta deleted file mode 100644 index 85ab7718ed..0000000000 --- a/Explorer/Assets/Textures/Common/GradientVertical 1.png.meta +++ /dev/null @@ -1,127 +0,0 @@ -fileFormatVersion: 2 -guid: 05c242723549f46d3a72a3676e19315a -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 12 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - flipGreenChannel: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMipmapLimit: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 1 - mipBias: 0 - wrapU: 0 - wrapV: 0 - wrapW: 0 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 0 - spriteTessellationDetail: -1 - textureType: 8 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - swizzle: 50462976 - cookieLightType: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Server - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Explorer/Assets/Textures/Common/HandleThick 1.png b/Explorer/Assets/Textures/Common/HandleThick 1.png deleted file mode 100644 index 3f162fed1d..0000000000 --- a/Explorer/Assets/Textures/Common/HandleThick 1.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6c6a3f6a3d2868dff9898272bf03b4b8db97b85f92732c1e041f71044f8f63aa -size 425 diff --git a/Explorer/Assets/Textures/Common/HandleThick 1.png.meta b/Explorer/Assets/Textures/Common/HandleThick 1.png.meta deleted file mode 100644 index 2d9c6b24a3..0000000000 --- a/Explorer/Assets/Textures/Common/HandleThick 1.png.meta +++ /dev/null @@ -1,127 +0,0 @@ -fileFormatVersion: 2 -guid: c0161e0dd24ad41728242032e571b5c9 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 12 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - flipGreenChannel: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMipmapLimit: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 1 - mipBias: 0 - wrapU: 0 - wrapV: 0 - wrapW: 0 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 0 - spriteTessellationDetail: -1 - textureType: 8 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - swizzle: 50462976 - cookieLightType: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Server - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Explorer/Assets/Textures/InfoIcn.png b/Explorer/Assets/Textures/Common/InfoIcn.png similarity index 100% rename from Explorer/Assets/Textures/InfoIcn.png rename to Explorer/Assets/Textures/Common/InfoIcn.png diff --git a/Explorer/Assets/Textures/InfoIcn.png.meta b/Explorer/Assets/Textures/Common/InfoIcn.png.meta similarity index 100% rename from Explorer/Assets/Textures/InfoIcn.png.meta rename to Explorer/Assets/Textures/Common/InfoIcn.png.meta diff --git a/Explorer/Assets/Textures/Common/MenuIcn 1.png b/Explorer/Assets/Textures/Common/MenuIcn 1.png deleted file mode 100755 index 1134c2c764..0000000000 --- a/Explorer/Assets/Textures/Common/MenuIcn 1.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:41fac11ce9cb92d889f18b3596265db316606a483af713211439bfd32445c6d9 -size 261 diff --git a/Explorer/Assets/Textures/Common/MenuIcn 1.png.meta b/Explorer/Assets/Textures/Common/MenuIcn 1.png.meta deleted file mode 100644 index 4df8b50d0c..0000000000 --- a/Explorer/Assets/Textures/Common/MenuIcn 1.png.meta +++ /dev/null @@ -1,127 +0,0 @@ -fileFormatVersion: 2 -guid: 8b296fdd44c8340098a38cf449c65c56 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 12 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - flipGreenChannel: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMipmapLimit: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 1 - mipBias: 0 - wrapU: 0 - wrapV: 0 - wrapW: 0 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 0 - spriteTessellationDetail: -1 - textureType: 8 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - swizzle: 50462976 - cookieLightType: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Server - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Explorer/Assets/Textures/Outline2Top12.png b/Explorer/Assets/Textures/Common/Outline2Top12.png similarity index 100% rename from Explorer/Assets/Textures/Outline2Top12.png rename to Explorer/Assets/Textures/Common/Outline2Top12.png diff --git a/Explorer/Assets/Textures/Outline2Top12.png.meta b/Explorer/Assets/Textures/Common/Outline2Top12.png.meta similarity index 100% rename from Explorer/Assets/Textures/Outline2Top12.png.meta rename to Explorer/Assets/Textures/Common/Outline2Top12.png.meta diff --git a/Explorer/Assets/Textures/PlayersIcon.png b/Explorer/Assets/Textures/Common/PlayersIcon.png similarity index 100% rename from Explorer/Assets/Textures/PlayersIcon.png rename to Explorer/Assets/Textures/Common/PlayersIcon.png diff --git a/Explorer/Assets/Textures/PlayersIcon.png.meta b/Explorer/Assets/Textures/Common/PlayersIcon.png.meta similarity index 100% rename from Explorer/Assets/Textures/PlayersIcon.png.meta rename to Explorer/Assets/Textures/Common/PlayersIcon.png.meta diff --git a/Explorer/Assets/Textures/RestrictedIcn.png b/Explorer/Assets/Textures/Common/RestrictedIcn.png similarity index 100% rename from Explorer/Assets/Textures/RestrictedIcn.png rename to Explorer/Assets/Textures/Common/RestrictedIcn.png diff --git a/Explorer/Assets/Textures/RestrictedIcn.png.meta b/Explorer/Assets/Textures/Common/RestrictedIcn.png.meta similarity index 100% rename from Explorer/Assets/Textures/RestrictedIcn.png.meta rename to Explorer/Assets/Textures/Common/RestrictedIcn.png.meta diff --git a/Explorer/Assets/Textures/TeenIcn.png b/Explorer/Assets/Textures/Common/TeenIcn.png similarity index 100% rename from Explorer/Assets/Textures/TeenIcn.png rename to Explorer/Assets/Textures/Common/TeenIcn.png diff --git a/Explorer/Assets/Textures/TeenIcn.png.meta b/Explorer/Assets/Textures/Common/TeenIcn.png.meta similarity index 100% rename from Explorer/Assets/Textures/TeenIcn.png.meta rename to Explorer/Assets/Textures/Common/TeenIcn.png.meta diff --git a/Explorer/Assets/Textures/TooltipPeak.png b/Explorer/Assets/Textures/Common/TooltipPeak.png similarity index 100% rename from Explorer/Assets/Textures/TooltipPeak.png rename to Explorer/Assets/Textures/Common/TooltipPeak.png diff --git a/Explorer/Assets/Textures/TooltipPeak.png.meta b/Explorer/Assets/Textures/Common/TooltipPeak.png.meta similarity index 100% rename from Explorer/Assets/Textures/TooltipPeak.png.meta rename to Explorer/Assets/Textures/Common/TooltipPeak.png.meta diff --git a/Explorer/Assets/Textures/TopRect12.png b/Explorer/Assets/Textures/Common/TopRect12.png similarity index 100% rename from Explorer/Assets/Textures/TopRect12.png rename to Explorer/Assets/Textures/Common/TopRect12.png diff --git a/Explorer/Assets/Textures/TopRect12.png.meta b/Explorer/Assets/Textures/Common/TopRect12.png.meta similarity index 100% rename from Explorer/Assets/Textures/TopRect12.png.meta rename to Explorer/Assets/Textures/Common/TopRect12.png.meta diff --git a/Explorer/Assets/Textures/Container12RectBottom.png b/Explorer/Assets/Textures/Container12RectBottom.png deleted file mode 100755 index e02ab44f00..0000000000 --- a/Explorer/Assets/Textures/Container12RectBottom.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a88c402df65dc9fd7c695c7074e61463530641a244ecbf0178c40bcea35b1be4 -size 309 diff --git a/Explorer/Assets/Textures/Container12RectTop.png b/Explorer/Assets/Textures/Container12RectTop.png deleted file mode 100644 index 246f03f2c2..0000000000 --- a/Explorer/Assets/Textures/Container12RectTop.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9d91fb0a3d84c583eb9fd7bc45eebf1ae5093653ebddf7693155203eba3faf68 -size 308 diff --git a/Explorer/Assets/Textures/ExplorePanel/FilterIcn.png b/Explorer/Assets/Textures/ExplorePanel/FilterIcn.png index 69a02b8fec..a58af9889b 100644 --- a/Explorer/Assets/Textures/ExplorePanel/FilterIcn.png +++ b/Explorer/Assets/Textures/ExplorePanel/FilterIcn.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1f6c3fe81927fe1c8aea5d96b5f98f4da63afa4e92c6f4caaef0a54d7e39bdb0 -size 320 +oid sha256:82cfa3c82e15914561721035a930da6f35258bdd3fe12f189eac1913dbb0f4d9 +size 635 diff --git a/Explorer/Assets/Textures/ExplorePanel/FriendsIcn.png.meta b/Explorer/Assets/Textures/ExplorePanel/FriendsIcn.png.meta index 7e414f753a..1bfb668448 100644 --- a/Explorer/Assets/Textures/ExplorePanel/FriendsIcn.png.meta +++ b/Explorer/Assets/Textures/ExplorePanel/FriendsIcn.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: c70ad46b3277345beb1e609c5b3dac6f +guid: 8de552cb2ca164c5f9e4f7bdcb5519f9 TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -45,12 +45,12 @@ TextureImporter: compressionQuality: 50 spriteMode: 1 spriteExtrude: 1 - spriteMeshType: 0 + spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 0 + spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 1 spriteTessellationDetail: -1 @@ -69,7 +69,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 64 + maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 diff --git a/Explorer/Assets/Textures/ExplorePanel/PeopleIcn.png.meta b/Explorer/Assets/Textures/ExplorePanel/PeopleIcn.png.meta index 2cfcfdf330..1c5bc98401 100644 --- a/Explorer/Assets/Textures/ExplorePanel/PeopleIcn.png.meta +++ b/Explorer/Assets/Textures/ExplorePanel/PeopleIcn.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 5898e4ddb7e4e4eeab1c73267aff0b3a +guid: 97cc8142564544702b912abd149baa1d TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -45,12 +45,12 @@ TextureImporter: compressionQuality: 50 spriteMode: 1 spriteExtrude: 1 - spriteMeshType: 0 + spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 0 + spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 1 spriteTessellationDetail: -1 @@ -69,7 +69,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 64 + maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 diff --git a/Explorer/Assets/Textures/FriendsIcn.png b/Explorer/Assets/Textures/FriendsIcn.png deleted file mode 100644 index d8d8cdda9f..0000000000 --- a/Explorer/Assets/Textures/FriendsIcn.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0cf77906905b98b42e05615e7b8e752f621b78f4dca25573082d7c5f273b4246 -size 2909 diff --git a/Explorer/Assets/Textures/PeopleIcn.png b/Explorer/Assets/Textures/PeopleIcn.png deleted file mode 100644 index a8833dfc4d..0000000000 --- a/Explorer/Assets/Textures/PeopleIcn.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1f6ba4d0d506c80160c949bd5f014640c7636d15aa9c54590a37af3b558bed46 -size 636 diff --git a/Explorer/Assets/Textures/PeopleIcn.png.meta b/Explorer/Assets/Textures/PeopleIcn.png.meta deleted file mode 100644 index 1c5bc98401..0000000000 --- a/Explorer/Assets/Textures/PeopleIcn.png.meta +++ /dev/null @@ -1,127 +0,0 @@ -fileFormatVersion: 2 -guid: 97cc8142564544702b912abd149baa1d -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 12 - mipmaps: - mipMapMode: 0 - enableMipMap: 0 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - flipGreenChannel: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMipmapLimit: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 1 - mipBias: 0 - wrapU: 1 - wrapV: 1 - wrapW: 0 - nPOTScale: 0 - lightmap: 0 - compressionQuality: 50 - spriteMode: 1 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 1 - spriteTessellationDetail: -1 - textureType: 8 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - swizzle: 50462976 - cookieLightType: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Server - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Explorer/UserSettings/Search.settings b/Explorer/UserSettings/Search.settings index 477e4d616a..6a63b9ec81 100644 --- a/Explorer/UserSettings/Search.settings +++ b/Explorer/UserSettings/Search.settings @@ -8,6 +8,11 @@ onBoardingDoNotAskAgain = true showPackageIndexes = false showStatusBar = false scopes = { + "picker_window_position_offset.45F317DD" = "306;399;320;550" + "picker_search_text.45F317DD" = "" + "last_search.45F317DD" = "" + "OpenInspectorPreview.45F317DD" = "0" + "currentGroup.45F317DD" = "all" } providers = { log = { @@ -55,6 +60,16 @@ providers = { priority = 2500 defaultAction = null } + st = { + active = true + priority = 100 + defaultAction = null + } + at = { + active = true + priority = 100 + defaultAction = null + } } objectSelectors = { }