diff --git a/Client/Assets/1_Script/UnitSetUiCtrl.cs b/Client/Assets/1_Script/UnitSetUiCtrl.cs index 76a071c5..d36f8630 100644 --- a/Client/Assets/1_Script/UnitSetUiCtrl.cs +++ b/Client/Assets/1_Script/UnitSetUiCtrl.cs @@ -314,28 +314,34 @@ public class UnitSetUiCtrl : SingletonMonoBehaviour switch (part) { case ePart.Weapon: - index = Statics.equipment.FindIndex(n => n.id == selectUnit.equip0_id); - equipment = Statics.equipment[index]; + if ((index = Statics.equipment.FindIndex(n => n.id == selectUnit.equip0_id)) != -1) + equipment = Statics.equipment[index]; + else return; break; case ePart.Armor: - index = Statics.equipment.FindIndex(n => n.id == selectUnit.equip1_id); - equipment = Statics.equipment[index]; + if ((index = Statics.equipment.FindIndex(n => n.id == selectUnit.equip1_id)) != -1) + equipment = Statics.equipment[index]; + else return; break; case ePart.Gloves: - index = Statics.equipment.FindIndex(n => n.id == selectUnit.equip2_id); - equipment = Statics.equipment[index]; + if ((index = Statics.equipment.FindIndex(n => n.id == selectUnit.equip2_id)) != -1) + equipment = Statics.equipment[index]; + else return; break; case ePart.Headpiece: - index = Statics.equipment.FindIndex(n => n.id == selectUnit.equip3_id); - equipment = Statics.equipment[index]; + if ((index = Statics.equipment.FindIndex(n => n.id == selectUnit.equip3_id)) != -1) + equipment = Statics.equipment[index]; + else return; break; case ePart.Shield: - index = Statics.equipment.FindIndex(n => n.id == selectUnit.equip4_id); - equipment = Statics.equipment[index]; + if ((index = Statics.equipment.FindIndex(n => n.id == selectUnit.equip4_id)) != -1) + equipment = Statics.equipment[index]; + else return; break; case ePart.Ring: - index = Statics.equipment.FindIndex(n => n.id == selectUnit.equip5_id); - equipment = Statics.equipment[index]; + if ((index = Statics.equipment.FindIndex(n => n.id == selectUnit.equip5_id)) != -1) + equipment = Statics.equipment[index]; + else return; break; default: Debug.LogError("Not Data"); diff --git a/Client/Assets/2_Sprite/Characters.meta b/Client/Assets/2_Sprite/Characters.meta new file mode 100644 index 00000000..b08f10c0 --- /dev/null +++ b/Client/Assets/2_Sprite/Characters.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 243187f1b6e73674cb9c4224a385c356 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Client/Assets/2_Sprite/Eeeee/Aaa.PNG b/Client/Assets/2_Sprite/Characters/Test.PNG similarity index 100% rename from Client/Assets/2_Sprite/Eeeee/Aaa.PNG rename to Client/Assets/2_Sprite/Characters/Test.PNG diff --git a/Client/Assets/2_Sprite/Characters/Test.PNG.meta b/Client/Assets/2_Sprite/Characters/Test.PNG.meta new file mode 100644 index 00000000..9b0500f2 --- /dev/null +++ b/Client/Assets/2_Sprite/Characters/Test.PNG.meta @@ -0,0 +1,153 @@ +fileFormatVersion: 2 +guid: 113a2f1e55b19ff43a1e85564dd794dd +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: 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: 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: iPhone + 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: Android + 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: