diff --git a/Assets/ResRaw/Fgui/Common/Common_atlas0.png b/Assets/ResRaw/Fgui/Common/Common_atlas0.png
index 5c81922b3..12973337c 100644
Binary files a/Assets/ResRaw/Fgui/Common/Common_atlas0.png and b/Assets/ResRaw/Fgui/Common/Common_atlas0.png differ
diff --git a/Assets/ResRaw/Fgui/Common/Common_atlas_9wej123.png b/Assets/ResRaw/Fgui/Common/Common_atlas_9wej123.png
deleted file mode 100644
index bc80119a2..000000000
Binary files a/Assets/ResRaw/Fgui/Common/Common_atlas_9wej123.png and /dev/null differ
diff --git a/Assets/ResRaw/Fgui/Common/Common_atlas_9wej123.png.meta b/Assets/ResRaw/Fgui/Common/Common_atlas_9wej123.png.meta
deleted file mode 100644
index 389efecfe..000000000
--- a/Assets/ResRaw/Fgui/Common/Common_atlas_9wej123.png.meta
+++ /dev/null
@@ -1,117 +0,0 @@
-fileFormatVersion: 2
-guid: 957a125458540124b853da68ff3b0b53
-TextureImporter:
- internalIDToNameTable: []
- externalObjects: {}
- serializedVersion: 13
- 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: 1
- 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: 0
- textureShape: 1
- singleChannelComponent: 0
- flipbookRows: 1
- flipbookColumns: 1
- maxTextureSizeSet: 0
- compressionQualitySet: 0
- textureFormatSet: 0
- ignorePngGamma: 0
- applyGammaDecoding: 0
- swizzle: 50462976
- cookieLightType: 0
- platformSettings:
- - serializedVersion: 4
- buildTarget: DefaultTexturePlatform
- maxTextureSize: 2048
- resizeAlgorithm: 1
- textureFormat: -1
- textureCompression: 0
- compressionQuality: 50
- crunchedCompression: 0
- allowsAlphaSplitting: 0
- overridden: 0
- ignorePlatformSupport: 0
- androidETC2FallbackOverride: 0
- forceMaximumCompressionQuality_BC6H_BC7: 0
- - serializedVersion: 4
- 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
- spriteSheet:
- serializedVersion: 2
- sprites: []
- outline: []
- customData:
- physicsShape: []
- bones: []
- spriteID:
- internalID: 0
- vertices: []
- indices:
- edges: []
- weights: []
- secondaryTextures: []
- spriteCustomMetadata:
- entries: []
- nameFileIdTable: {}
- mipmapLimitGroupName:
- pSDRemoveMatte: 0
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/ResRaw/Fgui/Common/Common_atlas_dhevef.png b/Assets/ResRaw/Fgui/Common/Common_atlas_dhevef.png
deleted file mode 100644
index 82cf2829e..000000000
Binary files a/Assets/ResRaw/Fgui/Common/Common_atlas_dhevef.png and /dev/null differ
diff --git a/Assets/ResRaw/Fgui/Common/Common_atlas_dhevef.png.meta b/Assets/ResRaw/Fgui/Common/Common_atlas_dhevef.png.meta
deleted file mode 100644
index 63c24eba4..000000000
--- a/Assets/ResRaw/Fgui/Common/Common_atlas_dhevef.png.meta
+++ /dev/null
@@ -1,117 +0,0 @@
-fileFormatVersion: 2
-guid: 1d121d38154ccc44c901c3e057828d3b
-TextureImporter:
- internalIDToNameTable: []
- externalObjects: {}
- serializedVersion: 13
- 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: 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: 0
- textureShape: 1
- singleChannelComponent: 0
- flipbookRows: 1
- flipbookColumns: 1
- maxTextureSizeSet: 0
- compressionQualitySet: 0
- textureFormatSet: 0
- ignorePngGamma: 0
- applyGammaDecoding: 0
- swizzle: 50462976
- cookieLightType: 0
- platformSettings:
- - serializedVersion: 4
- buildTarget: DefaultTexturePlatform
- maxTextureSize: 2048
- resizeAlgorithm: 1
- textureFormat: -1
- textureCompression: 0
- compressionQuality: 50
- crunchedCompression: 0
- allowsAlphaSplitting: 0
- overridden: 0
- ignorePlatformSupport: 0
- androidETC2FallbackOverride: 0
- forceMaximumCompressionQuality_BC6H_BC7: 0
- - serializedVersion: 4
- 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
- spriteSheet:
- serializedVersion: 2
- sprites: []
- outline: []
- customData:
- physicsShape: []
- bones: []
- spriteID:
- internalID: 0
- vertices: []
- indices:
- edges: []
- weights: []
- secondaryTextures: []
- spriteCustomMetadata:
- entries: []
- nameFileIdTable: {}
- mipmapLimitGroupName:
- pSDRemoveMatte: 0
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/ResRaw/Fgui/Common/Common_atlas_dheveg.png b/Assets/ResRaw/Fgui/Common/Common_atlas_dheveg.png
deleted file mode 100644
index 731e45241..000000000
Binary files a/Assets/ResRaw/Fgui/Common/Common_atlas_dheveg.png and /dev/null differ
diff --git a/Assets/ResRaw/Fgui/Common/Common_atlas_dheveg.png.meta b/Assets/ResRaw/Fgui/Common/Common_atlas_dheveg.png.meta
deleted file mode 100644
index 8ed815be1..000000000
--- a/Assets/ResRaw/Fgui/Common/Common_atlas_dheveg.png.meta
+++ /dev/null
@@ -1,117 +0,0 @@
-fileFormatVersion: 2
-guid: 47d4c2f47c4c1174488b9dc3602097c3
-TextureImporter:
- internalIDToNameTable: []
- externalObjects: {}
- serializedVersion: 13
- 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: 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: 0
- textureShape: 1
- singleChannelComponent: 0
- flipbookRows: 1
- flipbookColumns: 1
- maxTextureSizeSet: 0
- compressionQualitySet: 0
- textureFormatSet: 0
- ignorePngGamma: 0
- applyGammaDecoding: 0
- swizzle: 50462976
- cookieLightType: 0
- platformSettings:
- - serializedVersion: 4
- buildTarget: DefaultTexturePlatform
- maxTextureSize: 2048
- resizeAlgorithm: 1
- textureFormat: -1
- textureCompression: 0
- compressionQuality: 50
- crunchedCompression: 0
- allowsAlphaSplitting: 0
- overridden: 0
- ignorePlatformSupport: 0
- androidETC2FallbackOverride: 0
- forceMaximumCompressionQuality_BC6H_BC7: 0
- - serializedVersion: 4
- 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
- spriteSheet:
- serializedVersion: 2
- sprites: []
- outline: []
- customData:
- physicsShape: []
- bones: []
- spriteID:
- internalID: 0
- vertices: []
- indices:
- edges: []
- weights: []
- secondaryTextures: []
- spriteCustomMetadata:
- entries: []
- nameFileIdTable: {}
- mipmapLimitGroupName:
- pSDRemoveMatte: 0
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/ResRaw/Fgui/Common/Common_atlas_dheveh.png b/Assets/ResRaw/Fgui/Common/Common_atlas_dheveh.png
deleted file mode 100644
index 1dec17a98..000000000
Binary files a/Assets/ResRaw/Fgui/Common/Common_atlas_dheveh.png and /dev/null differ
diff --git a/Assets/ResRaw/Fgui/Common/Common_atlas_dheveh.png.meta b/Assets/ResRaw/Fgui/Common/Common_atlas_dheveh.png.meta
deleted file mode 100644
index d4b53e95d..000000000
--- a/Assets/ResRaw/Fgui/Common/Common_atlas_dheveh.png.meta
+++ /dev/null
@@ -1,117 +0,0 @@
-fileFormatVersion: 2
-guid: e42475bd475bcfb44b0c00bdeecdd2de
-TextureImporter:
- internalIDToNameTable: []
- externalObjects: {}
- serializedVersion: 13
- 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: 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: 0
- textureShape: 1
- singleChannelComponent: 0
- flipbookRows: 1
- flipbookColumns: 1
- maxTextureSizeSet: 0
- compressionQualitySet: 0
- textureFormatSet: 0
- ignorePngGamma: 0
- applyGammaDecoding: 0
- swizzle: 50462976
- cookieLightType: 0
- platformSettings:
- - serializedVersion: 4
- buildTarget: DefaultTexturePlatform
- maxTextureSize: 2048
- resizeAlgorithm: 1
- textureFormat: -1
- textureCompression: 0
- compressionQuality: 50
- crunchedCompression: 0
- allowsAlphaSplitting: 0
- overridden: 0
- ignorePlatformSupport: 0
- androidETC2FallbackOverride: 0
- forceMaximumCompressionQuality_BC6H_BC7: 0
- - serializedVersion: 4
- 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
- spriteSheet:
- serializedVersion: 2
- sprites: []
- outline: []
- customData:
- physicsShape: []
- bones: []
- spriteID:
- internalID: 0
- vertices: []
- indices:
- edges: []
- weights: []
- secondaryTextures: []
- spriteCustomMetadata:
- entries: []
- nameFileIdTable: {}
- mipmapLimitGroupName:
- pSDRemoveMatte: 0
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/ResRaw/Fgui/Common/Common_atlas_mbu9ye.png b/Assets/ResRaw/Fgui/Common/Common_atlas_mbu9ye.png
deleted file mode 100644
index 43ce7edb6..000000000
Binary files a/Assets/ResRaw/Fgui/Common/Common_atlas_mbu9ye.png and /dev/null differ
diff --git a/Assets/ResRaw/Fgui/Common/Common_atlas_mbu9ye.png.meta b/Assets/ResRaw/Fgui/Common/Common_atlas_mbu9ye.png.meta
deleted file mode 100644
index 7b45e5e1c..000000000
--- a/Assets/ResRaw/Fgui/Common/Common_atlas_mbu9ye.png.meta
+++ /dev/null
@@ -1,117 +0,0 @@
-fileFormatVersion: 2
-guid: 91f05f7801b3e284e9bf6ec0efa4571e
-TextureImporter:
- internalIDToNameTable: []
- externalObjects: {}
- serializedVersion: 13
- 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: 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: 0
- textureShape: 1
- singleChannelComponent: 0
- flipbookRows: 1
- flipbookColumns: 1
- maxTextureSizeSet: 0
- compressionQualitySet: 0
- textureFormatSet: 0
- ignorePngGamma: 0
- applyGammaDecoding: 0
- swizzle: 50462976
- cookieLightType: 0
- platformSettings:
- - serializedVersion: 4
- buildTarget: DefaultTexturePlatform
- maxTextureSize: 2048
- resizeAlgorithm: 1
- textureFormat: -1
- textureCompression: 0
- compressionQuality: 50
- crunchedCompression: 0
- allowsAlphaSplitting: 0
- overridden: 0
- ignorePlatformSupport: 0
- androidETC2FallbackOverride: 0
- forceMaximumCompressionQuality_BC6H_BC7: 0
- - serializedVersion: 4
- 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
- spriteSheet:
- serializedVersion: 2
- sprites: []
- outline: []
- customData:
- physicsShape: []
- bones: []
- spriteID:
- internalID: 0
- vertices: []
- indices:
- edges: []
- weights: []
- secondaryTextures: []
- spriteCustomMetadata:
- entries: []
- nameFileIdTable: {}
- mipmapLimitGroupName:
- pSDRemoveMatte: 0
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/ResRaw/Fgui/Common/Common_atlas_obry17g.png b/Assets/ResRaw/Fgui/Common/Common_atlas_obry17g.png
deleted file mode 100644
index c2f024eba..000000000
Binary files a/Assets/ResRaw/Fgui/Common/Common_atlas_obry17g.png and /dev/null differ
diff --git a/Assets/ResRaw/Fgui/Common/Common_atlas_obry17g.png.meta b/Assets/ResRaw/Fgui/Common/Common_atlas_obry17g.png.meta
deleted file mode 100644
index 5a0ca8a9e..000000000
--- a/Assets/ResRaw/Fgui/Common/Common_atlas_obry17g.png.meta
+++ /dev/null
@@ -1,117 +0,0 @@
-fileFormatVersion: 2
-guid: 133e78dd9fb901743825f327a030594d
-TextureImporter:
- internalIDToNameTable: []
- externalObjects: {}
- serializedVersion: 13
- 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: 1
- 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: 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: 0
- spriteTessellationDetail: -1
- textureType: 0
- textureShape: 1
- singleChannelComponent: 0
- flipbookRows: 1
- flipbookColumns: 1
- maxTextureSizeSet: 0
- compressionQualitySet: 0
- textureFormatSet: 0
- ignorePngGamma: 0
- applyGammaDecoding: 0
- swizzle: 50462976
- cookieLightType: 0
- platformSettings:
- - serializedVersion: 4
- buildTarget: DefaultTexturePlatform
- maxTextureSize: 2048
- resizeAlgorithm: 1
- textureFormat: -1
- textureCompression: 0
- compressionQuality: 50
- crunchedCompression: 0
- allowsAlphaSplitting: 0
- overridden: 0
- ignorePlatformSupport: 0
- androidETC2FallbackOverride: 0
- forceMaximumCompressionQuality_BC6H_BC7: 0
- - serializedVersion: 4
- 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
- spriteSheet:
- serializedVersion: 2
- sprites: []
- outline: []
- customData:
- physicsShape: []
- bones: []
- spriteID:
- internalID: 0
- vertices: []
- indices:
- edges: []
- weights: []
- secondaryTextures: []
- spriteCustomMetadata:
- entries: []
- nameFileIdTable: {}
- mipmapLimitGroupName:
- pSDRemoveMatte: 0
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/ResRaw/Fgui/Common/Common_fui.bytes b/Assets/ResRaw/Fgui/Common/Common_fui.bytes
index 25748fd3c..4c563f8d6 100644
Binary files a/Assets/ResRaw/Fgui/Common/Common_fui.bytes and b/Assets/ResRaw/Fgui/Common/Common_fui.bytes differ
diff --git a/Assets/ResRaw/Fgui/CommonIcon/CommonIcon_atlas0.png b/Assets/ResRaw/Fgui/CommonIcon/CommonIcon_atlas0.png
index fd5567f2b..1a8e77b62 100644
Binary files a/Assets/ResRaw/Fgui/CommonIcon/CommonIcon_atlas0.png and b/Assets/ResRaw/Fgui/CommonIcon/CommonIcon_atlas0.png differ
diff --git a/Assets/ResRaw/Fgui/CommonIcon/CommonIcon_fui.bytes b/Assets/ResRaw/Fgui/CommonIcon/CommonIcon_fui.bytes
index be3299184..ed8caeb84 100644
Binary files a/Assets/ResRaw/Fgui/CommonIcon/CommonIcon_fui.bytes and b/Assets/ResRaw/Fgui/CommonIcon/CommonIcon_fui.bytes differ
diff --git a/Assets/Scripts/UI/Binders/CommonBinder.cs b/Assets/Scripts/UI/Binders/CommonBinder.cs
index 0218c88ae..05f036599 100644
--- a/Assets/Scripts/UI/Binders/CommonBinder.cs
+++ b/Assets/Scripts/UI/Binders/CommonBinder.cs
@@ -10,7 +10,6 @@ namespace NBF
public static void BindAll()
{
UIObjectFactory.SetPackageItemExtension(SelectPages.URL, typeof(SelectPages));
- UIObjectFactory.SetPackageItemExtension(UIBlurBackground.URL, typeof(UIBlurBackground));
UIObjectFactory.SetPackageItemExtension(BottomMenu.URL, typeof(BottomMenu));
UIObjectFactory.SetPackageItemExtension(CommonInput.URL, typeof(CommonInput));
UIObjectFactory.SetPackageItemExtension(CommonMenuRight.URL, typeof(CommonMenuRight));
@@ -20,6 +19,7 @@ namespace NBF
UIObjectFactory.SetPackageItemExtension(BtnMainMenu.URL, typeof(BtnMainMenu));
UIObjectFactory.SetPackageItemExtension(CommonSubMenu.URL, typeof(CommonSubMenu));
UIObjectFactory.SetPackageItemExtension(ItemsItem.URL, typeof(ItemsItem));
+ UIObjectFactory.SetPackageItemExtension(RewardItem.URL, typeof(RewardItem));
UIObjectFactory.SetPackageItemExtension(MarqueeTag.URL, typeof(MarqueeTag));
UIObjectFactory.SetPackageItemExtension(BtnInputName.URL, typeof(BtnInputName));
UIObjectFactory.SetPackageItemExtension(BtnTextInputControl.URL, typeof(BtnTextInputControl));
diff --git a/Assets/Scripts/UI/ItemsItem.Designer.cs b/Assets/Scripts/UI/Common/Items/ItemsItem.Designer.cs
similarity index 100%
rename from Assets/Scripts/UI/ItemsItem.Designer.cs
rename to Assets/Scripts/UI/Common/Items/ItemsItem.Designer.cs
diff --git a/Assets/Scripts/UI/Common/Items/ItemsItem.Designer.cs.meta b/Assets/Scripts/UI/Common/Items/ItemsItem.Designer.cs.meta
new file mode 100644
index 000000000..2e49e920b
--- /dev/null
+++ b/Assets/Scripts/UI/Common/Items/ItemsItem.Designer.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 0328b2d0c17182c4ab99e0e6c7b04423
\ No newline at end of file
diff --git a/Assets/Scripts/UI/ItemsItem.cs b/Assets/Scripts/UI/Common/Items/ItemsItem.cs
similarity index 100%
rename from Assets/Scripts/UI/ItemsItem.cs
rename to Assets/Scripts/UI/Common/Items/ItemsItem.cs
diff --git a/Assets/Scripts/UI/Common/Items/ItemsItem.cs.meta b/Assets/Scripts/UI/Common/Items/ItemsItem.cs.meta
new file mode 100644
index 000000000..3c1ef48a5
--- /dev/null
+++ b/Assets/Scripts/UI/Common/Items/ItemsItem.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: f9aceae6799cd9242a006fad657cdddf
\ No newline at end of file
diff --git a/Assets/Scripts/UI/Common/Items/RewardItem.Designer.cs b/Assets/Scripts/UI/Common/Items/RewardItem.Designer.cs
new file mode 100644
index 000000000..7ac559978
--- /dev/null
+++ b/Assets/Scripts/UI/Common/Items/RewardItem.Designer.cs
@@ -0,0 +1,25 @@
+/**本脚本为自动生成,每次生成会覆盖!请勿手动修改,生成插件文档及项目地址:https://git.whoot.com/whoot-games/whoot.fguieditorplugin**/
+
+
+using FairyGUI;
+using FairyGUI.Utils;
+using NBC;
+
+namespace NBF
+{
+ public partial class RewardItem
+ {
+ public const string URL = "ui://6hgkvlaujd2r18h";
+
+ public ItemsItem Item;
+
+ public override void ConstructFromXML(XML xml)
+ {
+ base.ConstructFromXML(xml);
+
+ Item = (ItemsItem)GetChild("Item");
+ OnInited();
+ UILanguage.TrySetComponentLanguage(this);
+ }
+ }
+}
\ No newline at end of file
diff --git a/Assets/Scripts/UI/Common/Items/RewardItem.Designer.cs.meta b/Assets/Scripts/UI/Common/Items/RewardItem.Designer.cs.meta
new file mode 100644
index 000000000..624a6a214
--- /dev/null
+++ b/Assets/Scripts/UI/Common/Items/RewardItem.Designer.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 15bf59a176b3ab24caa4ae41536997e5
\ No newline at end of file
diff --git a/Assets/Scripts/UI/Common/Items/RewardItem.cs b/Assets/Scripts/UI/Common/Items/RewardItem.cs
new file mode 100644
index 000000000..e3712351c
--- /dev/null
+++ b/Assets/Scripts/UI/Common/Items/RewardItem.cs
@@ -0,0 +1,15 @@
+// 本脚本只在不存在时会生成一次。组件逻辑写在当前脚本内。已存在不会再次生成覆盖
+
+using UnityEngine;
+using FairyGUI;
+using NBC;
+
+namespace NBF
+{
+ public partial class RewardItem : GLabel
+ {
+ private void OnInited()
+ {
+ }
+ }
+}
\ No newline at end of file
diff --git a/Assets/Scripts/UI/Common/Items/RewardItem.cs.meta b/Assets/Scripts/UI/Common/Items/RewardItem.cs.meta
new file mode 100644
index 000000000..e4bf12e78
--- /dev/null
+++ b/Assets/Scripts/UI/Common/Items/RewardItem.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 40c21b8e0c7fb9542b41ed43b816bb50
\ No newline at end of file
diff --git a/Assets/Scripts/UI/Common/Menu/MainMenu.Designer.cs b/Assets/Scripts/UI/Common/Menu/MainMenu.Designer.cs
index f185a64e6..9127d2284 100644
--- a/Assets/Scripts/UI/Common/Menu/MainMenu.Designer.cs
+++ b/Assets/Scripts/UI/Common/Menu/MainMenu.Designer.cs
@@ -11,6 +11,7 @@ namespace NBF
{
public const string URL = "ui://6hgkvlauh6z617p";
+ public GImage back;
public BtnInputControl BtnPrev;
public BtnInputControl BtnNext;
public GList List;
@@ -22,6 +23,7 @@ namespace NBF
{
base.ConstructFromXML(xml);
+ back = (GImage)GetChild("back");
BtnPrev = (BtnInputControl)GetChild("BtnPrev");
BtnNext = (BtnInputControl)GetChild("BtnNext");
List = (GList)GetChild("List");
diff --git a/Assets/Scripts/UI/RewardPanel.Designer.cs b/Assets/Scripts/UI/Common/Panel/RewardPanel.Designer.cs
similarity index 100%
rename from Assets/Scripts/UI/RewardPanel.Designer.cs
rename to Assets/Scripts/UI/Common/Panel/RewardPanel.Designer.cs
diff --git a/Assets/Scripts/UI/Common/Panel/RewardPanel.Designer.cs.meta b/Assets/Scripts/UI/Common/Panel/RewardPanel.Designer.cs.meta
new file mode 100644
index 000000000..be3585abe
--- /dev/null
+++ b/Assets/Scripts/UI/Common/Panel/RewardPanel.Designer.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 43a54f7cdb8983d4d8a43bf7f96275ca
\ No newline at end of file
diff --git a/Assets/Scripts/UI/RewardPanel.cs b/Assets/Scripts/UI/Common/Panel/RewardPanel.cs
similarity index 100%
rename from Assets/Scripts/UI/RewardPanel.cs
rename to Assets/Scripts/UI/Common/Panel/RewardPanel.cs
diff --git a/Assets/Scripts/UI/Common/Panel/RewardPanel.cs.meta b/Assets/Scripts/UI/Common/Panel/RewardPanel.cs.meta
new file mode 100644
index 000000000..fa19a7ab3
--- /dev/null
+++ b/Assets/Scripts/UI/Common/Panel/RewardPanel.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 6ecaa7319f6029a4a8c52750054bb013
\ No newline at end of file
diff --git a/Assets/Scripts/UI/TestPanel.Designer.cs b/Assets/Scripts/UI/Common/Panel/TestPanel.Designer.cs
similarity index 100%
rename from Assets/Scripts/UI/TestPanel.Designer.cs
rename to Assets/Scripts/UI/Common/Panel/TestPanel.Designer.cs
diff --git a/Assets/Scripts/UI/Common/Panel/TestPanel.Designer.cs.meta b/Assets/Scripts/UI/Common/Panel/TestPanel.Designer.cs.meta
new file mode 100644
index 000000000..7d347bacf
--- /dev/null
+++ b/Assets/Scripts/UI/Common/Panel/TestPanel.Designer.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 68d81821d4fdf414d93d4d9d05846128
\ No newline at end of file
diff --git a/Assets/Scripts/UI/TestPanel.cs b/Assets/Scripts/UI/Common/Panel/TestPanel.cs
similarity index 100%
rename from Assets/Scripts/UI/TestPanel.cs
rename to Assets/Scripts/UI/Common/Panel/TestPanel.cs
diff --git a/Assets/Scripts/UI/Common/Panel/TestPanel.cs.meta b/Assets/Scripts/UI/Common/Panel/TestPanel.cs.meta
new file mode 100644
index 000000000..12edfb4fd
--- /dev/null
+++ b/Assets/Scripts/UI/Common/Panel/TestPanel.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 0263533a6350555448bab0bf95fa9e20
\ No newline at end of file
diff --git a/Assets/Scripts/UI/Login/LoginPanel.cs b/Assets/Scripts/UI/Login/LoginPanel.cs
index 02752eafa..de8436000 100644
--- a/Assets/Scripts/UI/Login/LoginPanel.cs
+++ b/Assets/Scripts/UI/Login/LoginPanel.cs
@@ -32,7 +32,9 @@ namespace NBF
{
await LoginHelper.Login(InputAccount.text);
- await Fishing.Instance.Go(RoleModel.Instance.Info.MapId);
+ // await Fishing.Instance.Go(RoleModel.Instance.Info.MapId);
+
+ TestPanel.Show();
// ChatTestPanel.Show();
diff --git a/FGUIProject/assets/Common/Com/Back/UIBlurBackground.xml b/FGUIProject/assets/Common/Com/Back/UIBlurBackground.xml
index 83a9c50ab..ff4e4c7c5 100644
--- a/FGUIProject/assets/Common/Com/Back/UIBlurBackground.xml
+++ b/FGUIProject/assets/Common/Com/Back/UIBlurBackground.xml
@@ -1,9 +1,7 @@
-
-
-
-
+
+
\ No newline at end of file
diff --git a/FGUIProject/assets/Common/Com/Menu/MainMenu.xml b/FGUIProject/assets/Common/Com/Menu/MainMenu.xml
index 844ba3238..19daca7d4 100644
--- a/FGUIProject/assets/Common/Com/Menu/MainMenu.xml
+++ b/FGUIProject/assets/Common/Com/Menu/MainMenu.xml
@@ -1,7 +1,10 @@
-
+
+
+
+
diff --git a/FGUIProject/assets/Common/Images/Back/Background Artwork.png b/FGUIProject/assets/Common/Images/Back/Background Artwork.png
deleted file mode 100644
index e17f092e4..000000000
Binary files a/FGUIProject/assets/Common/Images/Back/Background Artwork.png and /dev/null differ
diff --git a/FGUIProject/assets/Common/Images/Back/Background(1).png b/FGUIProject/assets/Common/Images/Back/Background(1).png
deleted file mode 100644
index a77b65ef9..000000000
Binary files a/FGUIProject/assets/Common/Images/Back/Background(1).png and /dev/null differ
diff --git a/FGUIProject/assets/Common/Images/Back/Background.png b/FGUIProject/assets/Common/Images/Back/Background.png
deleted file mode 100644
index b934a7e73..000000000
Binary files a/FGUIProject/assets/Common/Images/Back/Background.png and /dev/null differ
diff --git a/FGUIProject/assets/Common/Images/Back/Loading_Jackson_4.png b/FGUIProject/assets/Common/Images/Back/Loading_Jackson_4.png
deleted file mode 100644
index 91e8be036..000000000
Binary files a/FGUIProject/assets/Common/Images/Back/Loading_Jackson_4.png and /dev/null differ
diff --git a/FGUIProject/assets/Common/Images/Back/Loading_Slovakia_3.png b/FGUIProject/assets/Common/Images/Back/Loading_Slovakia_3.png
deleted file mode 100644
index 207449ff8..000000000
Binary files a/FGUIProject/assets/Common/Images/Back/Loading_Slovakia_3.png and /dev/null differ
diff --git a/FGUIProject/assets/Common/Images/Back/Loading_Slovakia_4.png b/FGUIProject/assets/Common/Images/Back/Loading_Slovakia_4.png
deleted file mode 100644
index 6a70d60fe..000000000
Binary files a/FGUIProject/assets/Common/Images/Back/Loading_Slovakia_4.png and /dev/null differ
diff --git a/FGUIProject/assets/Common/ImagesNew/Back/Background - Gray (Light).png b/FGUIProject/assets/Common/ImagesNew/Back/Background - Gray (Light).png
deleted file mode 100644
index c2f024eba..000000000
Binary files a/FGUIProject/assets/Common/ImagesNew/Back/Background - Gray (Light).png and /dev/null differ
diff --git a/FGUIProject/assets/Common/ImagesNew/Back/Dark Background.png b/FGUIProject/assets/Common/ImagesNew/Back/Dark Background.png
deleted file mode 100644
index bc80119a2..000000000
Binary files a/FGUIProject/assets/Common/ImagesNew/Back/Dark Background.png and /dev/null differ
diff --git a/FGUIProject/assets/Common/ImagesNew/Back/Light Background.png b/FGUIProject/assets/Common/ImagesNew/Back/Light Background.png
deleted file mode 100644
index 2f8cc0cd0..000000000
Binary files a/FGUIProject/assets/Common/ImagesNew/Back/Light Background.png and /dev/null differ
diff --git a/FGUIProject/assets/Common/ImagesNew/Back/back1.png b/FGUIProject/assets/Common/ImagesNew/Back/back1.png
new file mode 100644
index 000000000..1757300ac
Binary files /dev/null and b/FGUIProject/assets/Common/ImagesNew/Back/back1.png differ
diff --git a/FGUIProject/assets/Common/Panel/TestPanel.xml b/FGUIProject/assets/Common/Panel/TestPanel.xml
index 951648d88..3a40b6869 100644
--- a/FGUIProject/assets/Common/Panel/TestPanel.xml
+++ b/FGUIProject/assets/Common/Panel/TestPanel.xml
@@ -1,5 +1,5 @@
-
+
diff --git a/FGUIProject/assets/Common/package.xml b/FGUIProject/assets/Common/package.xml
index a7f28a4fd..c36b55e6b 100644
--- a/FGUIProject/assets/Common/package.xml
+++ b/FGUIProject/assets/Common/package.xml
@@ -14,9 +14,6 @@
-
-
-
@@ -49,7 +46,6 @@
-
@@ -223,7 +219,6 @@
-
@@ -248,10 +243,8 @@
-
-
@@ -294,7 +287,6 @@
-
@@ -457,7 +449,6 @@
-
@@ -490,6 +481,7 @@
+
\ No newline at end of file
diff --git a/FGUIProject/settings/whoot/6hgkvlaujd2r18h.json b/FGUIProject/settings/whoot/6hgkvlaujd2r18h.json
new file mode 100644
index 000000000..9db9c7f54
--- /dev/null
+++ b/FGUIProject/settings/whoot/6hgkvlaujd2r18h.json
@@ -0,0 +1 @@
+{"url":"ui://6hgkvlaujd2r18h","name":"RewardItem","scriptType":"component","isCustomName":false,"customName":"","annotation":"","member":{}}
\ No newline at end of file