diff --git a/l2-unity/Assets/Plugins/FMOD/platforms/win/lib/x86_64/fmodstudio.dll.meta b/l2-unity/Assets/Plugins/FMOD/platforms/win/lib/x86_64/fmodstudio.dll.meta index 5425ba509..d5376b285 100644 --- a/l2-unity/Assets/Plugins/FMOD/platforms/win/lib/x86_64/fmodstudio.dll.meta +++ b/l2-unity/Assets/Plugins/FMOD/platforms/win/lib/x86_64/fmodstudio.dll.meta @@ -89,7 +89,7 @@ PluginImporter: - first: Standalone: Win64 second: - enabled: 1 + enabled: 0 settings: CPU: AnyCPU - first: diff --git a/l2-unity/Assets/Plugins/FMOD/platforms/win/lib/x86_64/fmodstudioL.dll.meta b/l2-unity/Assets/Plugins/FMOD/platforms/win/lib/x86_64/fmodstudioL.dll.meta index 627c6e540..1711f8e5b 100644 --- a/l2-unity/Assets/Plugins/FMOD/platforms/win/lib/x86_64/fmodstudioL.dll.meta +++ b/l2-unity/Assets/Plugins/FMOD/platforms/win/lib/x86_64/fmodstudioL.dll.meta @@ -27,7 +27,7 @@ PluginImporter: - first: Standalone: Win64 second: - enabled: 0 + enabled: 1 settings: {} userData: assetBundleName: diff --git a/l2-unity/Assets/Resources/Data/Effects/skybox/L2Sky.mat.meta b/l2-unity/Assets/Resources/Data/Effects/skybox/L2Sky.mat.meta index 0913784bf..6cbd9e130 100644 --- a/l2-unity/Assets/Resources/Data/Effects/skybox/L2Sky.mat.meta +++ b/l2-unity/Assets/Resources/Data/Effects/skybox/L2Sky.mat.meta @@ -2,7 +2,7 @@ fileFormatVersion: 2 guid: 74e09fc0417b6f94c95b3a55ae362ec9 NativeFormatImporter: externalObjects: {} - mainObjectFileID: 2100000 + mainObjectFileID: 0 userData: assetBundleName: assetBundleVariant: diff --git a/l2-unity/Assets/Resources/Data/UI/Frame/Frame_DF_Btn_Close/frames_df_btn_close.png.meta b/l2-unity/Assets/Resources/Data/UI/Frame/Frame_DF_Btn_Close/frames_df_btn_close.png.meta index a7a38076d..d6867dd4c 100644 --- a/l2-unity/Assets/Resources/Data/UI/Frame/Frame_DF_Btn_Close/frames_df_btn_close.png.meta +++ b/l2-unity/Assets/Resources/Data/UI/Frame/Frame_DF_Btn_Close/frames_df_btn_close.png.meta @@ -34,7 +34,7 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: 1 + filterMode: 0 aniso: 1 mipBias: 0 wrapU: 1 @@ -71,7 +71,7 @@ TextureImporter: buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 - textureFormat: -1 + textureFormat: 4 textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 diff --git a/l2-unity/Assets/Resources/Data/UI/Frame/Frame_DF_Btn_Close/frames_df_btn_close_Down.png.meta b/l2-unity/Assets/Resources/Data/UI/Frame/Frame_DF_Btn_Close/frames_df_btn_close_Down.png.meta index 840328bdd..16eab96ef 100644 --- a/l2-unity/Assets/Resources/Data/UI/Frame/Frame_DF_Btn_Close/frames_df_btn_close_Down.png.meta +++ b/l2-unity/Assets/Resources/Data/UI/Frame/Frame_DF_Btn_Close/frames_df_btn_close_Down.png.meta @@ -34,7 +34,7 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: 1 + filterMode: 0 aniso: 1 mipBias: 0 wrapU: 1 @@ -71,7 +71,7 @@ TextureImporter: buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 - textureFormat: -1 + textureFormat: 4 textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 diff --git a/l2-unity/Assets/Resources/Data/UI/Frame/Frame_DF_Btn_Close/frames_df_btn_close_Over.png.meta b/l2-unity/Assets/Resources/Data/UI/Frame/Frame_DF_Btn_Close/frames_df_btn_close_Over.png.meta index 2295bba4c..8422bc1e5 100644 --- a/l2-unity/Assets/Resources/Data/UI/Frame/Frame_DF_Btn_Close/frames_df_btn_close_Over.png.meta +++ b/l2-unity/Assets/Resources/Data/UI/Frame/Frame_DF_Btn_Close/frames_df_btn_close_Over.png.meta @@ -34,7 +34,7 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: 1 + filterMode: 0 aniso: 1 mipBias: 0 wrapU: 1 @@ -71,7 +71,7 @@ TextureImporter: buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 - textureFormat: -1 + textureFormat: 4 textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 diff --git a/l2-unity/Assets/Resources/Data/UI/Scrollbar/ScrollBarLeftBtn_Over.png.meta b/l2-unity/Assets/Resources/Data/UI/Scrollbar/ScrollBarLeftBtn_Over.png.meta index 418757507..85a21dd31 100644 --- a/l2-unity/Assets/Resources/Data/UI/Scrollbar/ScrollBarLeftBtn_Over.png.meta +++ b/l2-unity/Assets/Resources/Data/UI/Scrollbar/ScrollBarLeftBtn_Over.png.meta @@ -34,7 +34,7 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: 1 + filterMode: 0 aniso: 1 mipBias: 0 wrapU: 1 @@ -71,7 +71,7 @@ TextureImporter: buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 - textureFormat: -1 + textureFormat: 4 textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 diff --git a/l2-unity/Assets/Resources/Data/UI/Scrollbar/ScrollBarRightBtn_Over.png.meta b/l2-unity/Assets/Resources/Data/UI/Scrollbar/ScrollBarRightBtn_Over.png.meta index 842fbd29b..cd3c6db47 100644 --- a/l2-unity/Assets/Resources/Data/UI/Scrollbar/ScrollBarRightBtn_Over.png.meta +++ b/l2-unity/Assets/Resources/Data/UI/Scrollbar/ScrollBarRightBtn_Over.png.meta @@ -34,7 +34,7 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: 1 + filterMode: 0 aniso: 1 mipBias: 0 wrapU: 1 @@ -71,7 +71,7 @@ TextureImporter: buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 - textureFormat: -1 + textureFormat: 4 textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 diff --git a/l2-unity/Assets/Resources/Data/UI/Scrollbar/scrollbardownbtn_over.png.meta b/l2-unity/Assets/Resources/Data/UI/Scrollbar/scrollbardownbtn_over.png.meta index cd193935d..fe311edb0 100644 --- a/l2-unity/Assets/Resources/Data/UI/Scrollbar/scrollbardownbtn_over.png.meta +++ b/l2-unity/Assets/Resources/Data/UI/Scrollbar/scrollbardownbtn_over.png.meta @@ -34,7 +34,7 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: 1 + filterMode: 0 aniso: 1 mipBias: 0 wrapU: 1 @@ -71,7 +71,7 @@ TextureImporter: buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 - textureFormat: -1 + textureFormat: 4 textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 diff --git a/l2-unity/Assets/Resources/Data/UI/Scrollbar/scrollbarupbtn_over.png.meta b/l2-unity/Assets/Resources/Data/UI/Scrollbar/scrollbarupbtn_over.png.meta index 22563696c..291de0742 100644 --- a/l2-unity/Assets/Resources/Data/UI/Scrollbar/scrollbarupbtn_over.png.meta +++ b/l2-unity/Assets/Resources/Data/UI/Scrollbar/scrollbarupbtn_over.png.meta @@ -34,7 +34,7 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: 1 + filterMode: 0 aniso: 1 mipBias: 0 wrapU: 1 @@ -71,7 +71,7 @@ TextureImporter: buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 - textureFormat: -1 + textureFormat: 4 textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 diff --git a/l2-unity/Assets/Resources/Data/UI/ShortCut/button/ScrollBarLeftBtn_Over.png.meta b/l2-unity/Assets/Resources/Data/UI/ShortCut/button/ScrollBarLeftBtn_Over.png.meta index eba873535..d1d7cc75b 100644 --- a/l2-unity/Assets/Resources/Data/UI/ShortCut/button/ScrollBarLeftBtn_Over.png.meta +++ b/l2-unity/Assets/Resources/Data/UI/ShortCut/button/ScrollBarLeftBtn_Over.png.meta @@ -71,7 +71,7 @@ TextureImporter: buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 - textureFormat: -1 + textureFormat: 4 textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 diff --git a/l2-unity/Assets/Resources/Data/UI/ShortCut/button/ScrollBarRightBtn_Over.png.meta b/l2-unity/Assets/Resources/Data/UI/ShortCut/button/ScrollBarRightBtn_Over.png.meta index 3655fb57a..d3f21da5d 100644 --- a/l2-unity/Assets/Resources/Data/UI/ShortCut/button/ScrollBarRightBtn_Over.png.meta +++ b/l2-unity/Assets/Resources/Data/UI/ShortCut/button/ScrollBarRightBtn_Over.png.meta @@ -71,7 +71,7 @@ TextureImporter: buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 - textureFormat: -1 + textureFormat: 4 textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 diff --git a/l2-unity/Assets/Resources/Data/UI/Window/CharInfo/CharacterInfo_Top_Img.png.meta b/l2-unity/Assets/Resources/Data/UI/Window/CharInfo/CharacterInfo_Top_Img.png.meta index 73ca51d9c..685ab13f0 100644 --- a/l2-unity/Assets/Resources/Data/UI/Window/CharInfo/CharacterInfo_Top_Img.png.meta +++ b/l2-unity/Assets/Resources/Data/UI/Window/CharInfo/CharacterInfo_Top_Img.png.meta @@ -34,7 +34,7 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: 1 + filterMode: 0 aniso: 1 mipBias: 0 wrapU: 1 @@ -71,7 +71,7 @@ TextureImporter: buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 - textureFormat: -1 + textureFormat: 4 textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 diff --git a/l2-unity/Assets/Resources/Data/UI/Window/Inventory/btn/inventory_df_btn_align.png.meta b/l2-unity/Assets/Resources/Data/UI/Window/Inventory/btn/inventory_df_btn_align.png.meta index 46cd6ee9a..b7ec1b232 100644 --- a/l2-unity/Assets/Resources/Data/UI/Window/Inventory/btn/inventory_df_btn_align.png.meta +++ b/l2-unity/Assets/Resources/Data/UI/Window/Inventory/btn/inventory_df_btn_align.png.meta @@ -34,7 +34,7 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: 1 + filterMode: 0 aniso: 1 mipBias: 0 wrapU: 1 @@ -71,7 +71,7 @@ TextureImporter: buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 - textureFormat: -1 + textureFormat: 4 textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 diff --git a/l2-unity/Assets/Resources/Data/UI/Window/Inventory/btn/inventory_df_btn_align_down.png.meta b/l2-unity/Assets/Resources/Data/UI/Window/Inventory/btn/inventory_df_btn_align_down.png.meta index d2e53515c..02bdd40a3 100644 --- a/l2-unity/Assets/Resources/Data/UI/Window/Inventory/btn/inventory_df_btn_align_down.png.meta +++ b/l2-unity/Assets/Resources/Data/UI/Window/Inventory/btn/inventory_df_btn_align_down.png.meta @@ -34,7 +34,7 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: 1 + filterMode: 0 aniso: 1 mipBias: 0 wrapU: 1 @@ -71,7 +71,7 @@ TextureImporter: buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 - textureFormat: -1 + textureFormat: 4 textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 diff --git a/l2-unity/Assets/Resources/Data/UI/Window/Inventory/btn/inventory_df_btn_align_over.png.meta b/l2-unity/Assets/Resources/Data/UI/Window/Inventory/btn/inventory_df_btn_align_over.png.meta index f8bb3df88..054c27c55 100644 --- a/l2-unity/Assets/Resources/Data/UI/Window/Inventory/btn/inventory_df_btn_align_over.png.meta +++ b/l2-unity/Assets/Resources/Data/UI/Window/Inventory/btn/inventory_df_btn_align_over.png.meta @@ -34,7 +34,7 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: 1 + filterMode: 0 aniso: 1 mipBias: 0 wrapU: 1 @@ -71,7 +71,7 @@ TextureImporter: buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 - textureFormat: -1 + textureFormat: 4 textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 diff --git a/l2-unity/Assets/Resources/Data/UI/Window/Inventory/btn/scrollbardownbtn_over.png.meta b/l2-unity/Assets/Resources/Data/UI/Window/Inventory/btn/scrollbardownbtn_over.png.meta index 75bcc6189..a7c3b08ec 100644 --- a/l2-unity/Assets/Resources/Data/UI/Window/Inventory/btn/scrollbardownbtn_over.png.meta +++ b/l2-unity/Assets/Resources/Data/UI/Window/Inventory/btn/scrollbardownbtn_over.png.meta @@ -34,7 +34,7 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: 1 + filterMode: 0 aniso: 1 mipBias: 0 wrapU: 1 @@ -71,7 +71,7 @@ TextureImporter: buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 - textureFormat: -1 + textureFormat: 4 textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 diff --git a/l2-unity/Assets/Resources/Data/UI/Window/Inventory/btn/scrollbarupbtn_over.png.meta b/l2-unity/Assets/Resources/Data/UI/Window/Inventory/btn/scrollbarupbtn_over.png.meta index 9bf0e586d..598ffc8b6 100644 --- a/l2-unity/Assets/Resources/Data/UI/Window/Inventory/btn/scrollbarupbtn_over.png.meta +++ b/l2-unity/Assets/Resources/Data/UI/Window/Inventory/btn/scrollbarupbtn_over.png.meta @@ -34,7 +34,7 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: 1 + filterMode: 0 aniso: 1 mipBias: 0 wrapU: 1 @@ -71,7 +71,7 @@ TextureImporter: buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 - textureFormat: -1 + textureFormat: 4 textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 diff --git a/l2-unity/Assets/Resources/Data/UI/Window/Inventory/demo_image_row/Adena.png b/l2-unity/Assets/Resources/Data/UI/Window/Inventory/demo_image_row/Adena.png new file mode 100644 index 000000000..09f15b769 Binary files /dev/null and b/l2-unity/Assets/Resources/Data/UI/Window/Inventory/demo_image_row/Adena.png differ diff --git a/l2-unity/Assets/Resources/Data/UI/Window/Inventory/demo_image_row/Adena.png.meta b/l2-unity/Assets/Resources/Data/UI/Window/Inventory/demo_image_row/Adena.png.meta new file mode 100644 index 000000000..b2dd2455d --- /dev/null +++ b/l2-unity/Assets/Resources/Data/UI/Window/Inventory/demo_image_row/Adena.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: bd387d8d3f774f546b6404ac2d217971 +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: 1 + 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/l2-unity/Assets/Resources/Data/UI/Window/Inventory/demo_image_row/NOIMAGE.png b/l2-unity/Assets/Resources/Data/UI/Window/Inventory/demo_image_row/NOIMAGE.png new file mode 100644 index 000000000..2eac444b6 Binary files /dev/null and b/l2-unity/Assets/Resources/Data/UI/Window/Inventory/demo_image_row/NOIMAGE.png differ diff --git a/l2-unity/Assets/Resources/Data/UI/Window/Inventory/demo_image_row/NOIMAGE.png.meta b/l2-unity/Assets/Resources/Data/UI/Window/Inventory/demo_image_row/NOIMAGE.png.meta new file mode 100644 index 000000000..f0d0708fa --- /dev/null +++ b/l2-unity/Assets/Resources/Data/UI/Window/Inventory/demo_image_row/NOIMAGE.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: 00efc8539cf802b46a5974380e1de1ad +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: 1 + 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: 2 + 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: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/l2-unity/Assets/Resources/Data/UI/Window/Inventory/demo_image_row/armor_leather_helmet_i00.png b/l2-unity/Assets/Resources/Data/UI/Window/Inventory/demo_image_row/armor_leather_helmet_i00.png new file mode 100644 index 000000000..df05de6e0 Binary files /dev/null and b/l2-unity/Assets/Resources/Data/UI/Window/Inventory/demo_image_row/armor_leather_helmet_i00.png differ diff --git a/l2-unity/Assets/Resources/Data/UI/Window/Inventory/demo_image_row/armor_leather_helmet_i00.png.meta b/l2-unity/Assets/Resources/Data/UI/Window/Inventory/demo_image_row/armor_leather_helmet_i00.png.meta new file mode 100644 index 000000000..eae0ceb5f --- /dev/null +++ b/l2-unity/Assets/Resources/Data/UI/Window/Inventory/demo_image_row/armor_leather_helmet_i00.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: f3c0a9651938c094c9f587acb3eff1f8 +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: 1 + 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: 2 + 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: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/l2-unity/Assets/Resources/Data/UI/Window/Inventory/demo_image_row/etc_soulshot_none_for_rookie_i00.png b/l2-unity/Assets/Resources/Data/UI/Window/Inventory/demo_image_row/etc_soulshot_none_for_rookie_i00.png new file mode 100644 index 000000000..1051aebe9 Binary files /dev/null and b/l2-unity/Assets/Resources/Data/UI/Window/Inventory/demo_image_row/etc_soulshot_none_for_rookie_i00.png differ diff --git a/l2-unity/Assets/Resources/Data/UI/Window/Inventory/demo_image_row/etc_soulshot_none_for_rookie_i00.png.meta b/l2-unity/Assets/Resources/Data/UI/Window/Inventory/demo_image_row/etc_soulshot_none_for_rookie_i00.png.meta new file mode 100644 index 000000000..36d1e8f84 --- /dev/null +++ b/l2-unity/Assets/Resources/Data/UI/Window/Inventory/demo_image_row/etc_soulshot_none_for_rookie_i00.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: 6c76f24c7207514489f68270565d4f0c +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: 1 + 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: 2 + 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: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/l2-unity/Assets/Resources/Data/UI/Window/Inventory/demo_image_row/weapon_small_sword_i00.png b/l2-unity/Assets/Resources/Data/UI/Window/Inventory/demo_image_row/weapon_small_sword_i00.png new file mode 100644 index 000000000..9db210b6e Binary files /dev/null and b/l2-unity/Assets/Resources/Data/UI/Window/Inventory/demo_image_row/weapon_small_sword_i00.png differ diff --git a/l2-unity/Assets/Resources/Data/UI/Window/Inventory/demo_image_row/weapon_small_sword_i00.png.meta b/l2-unity/Assets/Resources/Data/UI/Window/Inventory/demo_image_row/weapon_small_sword_i00.png.meta new file mode 100644 index 000000000..614f4d05a --- /dev/null +++ b/l2-unity/Assets/Resources/Data/UI/Window/Inventory/demo_image_row/weapon_small_sword_i00.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: c042e0b7c827e484d8ff851913dc3821 +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: 1 + 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: 2 + 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: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/l2-unity/Assets/Resources/Data/UI/Window/Inventory/frames_df_btn_Minimize.png.meta b/l2-unity/Assets/Resources/Data/UI/Window/Inventory/frames_df_btn_Minimize.png.meta index 6a705508d..b3992582d 100644 --- a/l2-unity/Assets/Resources/Data/UI/Window/Inventory/frames_df_btn_Minimize.png.meta +++ b/l2-unity/Assets/Resources/Data/UI/Window/Inventory/frames_df_btn_Minimize.png.meta @@ -34,7 +34,7 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: 1 + filterMode: 0 aniso: 1 mipBias: 0 wrapU: 1 @@ -71,7 +71,7 @@ TextureImporter: buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 - textureFormat: -1 + textureFormat: 4 textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 diff --git a/l2-unity/Assets/Resources/Data/UI/Window/Inventory/frames_df_btn_Minimize_down.png.meta b/l2-unity/Assets/Resources/Data/UI/Window/Inventory/frames_df_btn_Minimize_down.png.meta index d1f90c98f..706983add 100644 --- a/l2-unity/Assets/Resources/Data/UI/Window/Inventory/frames_df_btn_Minimize_down.png.meta +++ b/l2-unity/Assets/Resources/Data/UI/Window/Inventory/frames_df_btn_Minimize_down.png.meta @@ -34,7 +34,7 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: 1 + filterMode: 0 aniso: 1 mipBias: 0 wrapU: 1 @@ -71,7 +71,7 @@ TextureImporter: buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 - textureFormat: -1 + textureFormat: 4 textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 diff --git a/l2-unity/Assets/Resources/Data/UI/Window/Inventory/frames_df_btn_Minimize_over.png.meta b/l2-unity/Assets/Resources/Data/UI/Window/Inventory/frames_df_btn_Minimize_over.png.meta index 32eb1047a..8fcf37e68 100644 --- a/l2-unity/Assets/Resources/Data/UI/Window/Inventory/frames_df_btn_Minimize_over.png.meta +++ b/l2-unity/Assets/Resources/Data/UI/Window/Inventory/frames_df_btn_Minimize_over.png.meta @@ -34,7 +34,7 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: 1 + filterMode: 0 aniso: 1 mipBias: 0 wrapU: 1 @@ -71,7 +71,7 @@ TextureImporter: buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 - textureFormat: -1 + textureFormat: 4 textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 diff --git a/l2-unity/Assets/Resources/Data/UI/Window/Inventory/frames_df_btn_min.png.meta b/l2-unity/Assets/Resources/Data/UI/Window/Inventory/frames_df_btn_min.png.meta index 590d22e14..60cbd99b8 100644 --- a/l2-unity/Assets/Resources/Data/UI/Window/Inventory/frames_df_btn_min.png.meta +++ b/l2-unity/Assets/Resources/Data/UI/Window/Inventory/frames_df_btn_min.png.meta @@ -34,7 +34,7 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: 1 + filterMode: 0 aniso: 1 mipBias: 0 wrapU: 1 @@ -71,7 +71,7 @@ TextureImporter: buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 - textureFormat: -1 + textureFormat: 4 textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 diff --git a/l2-unity/Assets/Resources/Data/UI/Window/Inventory/frames_df_btn_min_Over.png.meta b/l2-unity/Assets/Resources/Data/UI/Window/Inventory/frames_df_btn_min_Over.png.meta index b4e5e1688..0ac2bd729 100644 --- a/l2-unity/Assets/Resources/Data/UI/Window/Inventory/frames_df_btn_min_Over.png.meta +++ b/l2-unity/Assets/Resources/Data/UI/Window/Inventory/frames_df_btn_min_Over.png.meta @@ -34,7 +34,7 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: 1 + filterMode: 0 aniso: 1 mipBias: 0 wrapU: 1 @@ -71,7 +71,7 @@ TextureImporter: buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 - textureFormat: -1 + textureFormat: 4 textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 diff --git a/l2-unity/Assets/Resources/Data/UI/Window/Inventory/frames_df_btn_min_down.png.meta b/l2-unity/Assets/Resources/Data/UI/Window/Inventory/frames_df_btn_min_down.png.meta index 587857179..c7a8d6963 100644 --- a/l2-unity/Assets/Resources/Data/UI/Window/Inventory/frames_df_btn_min_down.png.meta +++ b/l2-unity/Assets/Resources/Data/UI/Window/Inventory/frames_df_btn_min_down.png.meta @@ -34,7 +34,7 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: 1 + filterMode: 0 aniso: 1 mipBias: 0 wrapU: 1 @@ -71,7 +71,7 @@ TextureImporter: buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 - textureFormat: -1 + textureFormat: 4 textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 diff --git a/l2-unity/Assets/Resources/Data/UI/_Elements/Game/CharacterInfoWindow.uxml b/l2-unity/Assets/Resources/Data/UI/_Elements/Game/CharacterInfoWindow.uxml index 84e1d75a6..b59687256 100644 --- a/l2-unity/Assets/Resources/Data/UI/_Elements/Game/CharacterInfoWindow.uxml +++ b/l2-unity/Assets/Resources/Data/UI/_Elements/Game/CharacterInfoWindow.uxml @@ -1,8 +1,9 @@ - - + +