diff --git a/Assets/01.Scenes/04.TycoonTest.unity b/Assets/01.Scenes/04.TycoonTest.unity index bceb83cb0..a4dfdc0bf 100644 --- a/Assets/01.Scenes/04.TycoonTest.unity +++ b/Assets/01.Scenes/04.TycoonTest.unity @@ -36316,6 +36316,7 @@ Transform: - {fileID: 927884127} - {fileID: 328578421} - {fileID: 508640128} + - {fileID: 761635216} m_Father: {fileID: 1286766283} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &667436812 @@ -42041,6 +42042,93 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 70f56d7d65d2e7842b5bd517ae7fe7fe, type: 3} +--- !u!1 &761635215 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 761635216} + - component: {fileID: 761635217} + m_Layer: 0 + m_Name: BlackWall + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &761635216 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 761635215} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -600, y: 8.05, z: -1.55} + m_LocalScale: {x: 20, y: 10, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 665793561} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &761635217 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 761635215} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 9dfc825aed78fcd4ba02077103263b40, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 6 + m_Sprite: {fileID: 7482667652216324306, guid: 311925a002f4447b3a28927169b83ea6, type: 3} + m_Color: {r: 0, g: 0, b: 0, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1, y: 1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!4 &762367306 stripped Transform: m_CorrespondingSourceObject: {fileID: 1061695247072719575, guid: 8c27cdf982110444481465fe39e60326, type: 3} @@ -55747,7 +55835,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &1035656002 Transform: m_ObjectHideFlags: 0 diff --git a/Assets/03.Images/DDD/Ui/Characters/Emily.png b/Assets/03.Images/DDD/Ui/Characters/Emily.png deleted file mode 100644 index 07c226a86..000000000 Binary files a/Assets/03.Images/DDD/Ui/Characters/Emily.png and /dev/null differ diff --git a/Assets/03.Images/DDD/Ui/Characters/EmilyAngry.png b/Assets/03.Images/DDD/Ui/Characters/EmilyAngry.png new file mode 100644 index 000000000..38b06c45d Binary files /dev/null and b/Assets/03.Images/DDD/Ui/Characters/EmilyAngry.png differ diff --git a/Assets/03.Images/DDD/Ui/Characters/Sephira.png.meta b/Assets/03.Images/DDD/Ui/Characters/EmilyAngry.png.meta similarity index 98% rename from Assets/03.Images/DDD/Ui/Characters/Sephira.png.meta rename to Assets/03.Images/DDD/Ui/Characters/EmilyAngry.png.meta index 021e1cf67..0c476db97 100644 --- a/Assets/03.Images/DDD/Ui/Characters/Sephira.png.meta +++ b/Assets/03.Images/DDD/Ui/Characters/EmilyAngry.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 80abf4a52ec3c8f4c84810d5da100207 +guid: 84da3dff8e16b5c40a4fd2effc2e7df2 TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/Assets/03.Images/DDD/Ui/Characters/EmilyNormal.png b/Assets/03.Images/DDD/Ui/Characters/EmilyNormal.png new file mode 100644 index 000000000..2ca8f3e7e Binary files /dev/null and b/Assets/03.Images/DDD/Ui/Characters/EmilyNormal.png differ diff --git a/Assets/03.Images/DDD/Ui/Characters/Emily.png.meta b/Assets/03.Images/DDD/Ui/Characters/EmilyNormal.png.meta similarity index 98% rename from Assets/03.Images/DDD/Ui/Characters/Emily.png.meta rename to Assets/03.Images/DDD/Ui/Characters/EmilyNormal.png.meta index ab811fad5..d336adea4 100644 --- a/Assets/03.Images/DDD/Ui/Characters/Emily.png.meta +++ b/Assets/03.Images/DDD/Ui/Characters/EmilyNormal.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: c493c34b1338a504abace527651c21e0 +guid: 03dca29d68b546644a4621ffbf852ec5 TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/Assets/03.Images/DDD/Ui/Characters/EmilyQuestion.png b/Assets/03.Images/DDD/Ui/Characters/EmilyQuestion.png new file mode 100644 index 000000000..80a47cb3f Binary files /dev/null and b/Assets/03.Images/DDD/Ui/Characters/EmilyQuestion.png differ diff --git a/Assets/03.Images/DDD/Ui/Characters/Lilith.png.meta b/Assets/03.Images/DDD/Ui/Characters/EmilyQuestion.png.meta similarity index 98% rename from Assets/03.Images/DDD/Ui/Characters/Lilith.png.meta rename to Assets/03.Images/DDD/Ui/Characters/EmilyQuestion.png.meta index 69b198c08..c6984d668 100644 --- a/Assets/03.Images/DDD/Ui/Characters/Lilith.png.meta +++ b/Assets/03.Images/DDD/Ui/Characters/EmilyQuestion.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 17ab9668e195c9f48aaf3078d126443b +guid: d630df130ca9e8d44b31f8a58d6ea1da TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/Assets/03.Images/DDD/Ui/Characters/Lilith.png b/Assets/03.Images/DDD/Ui/Characters/Lilith.png deleted file mode 100644 index 81dfc5056..000000000 Binary files a/Assets/03.Images/DDD/Ui/Characters/Lilith.png and /dev/null differ diff --git a/Assets/03.Images/DDD/Ui/Characters/LilithNormal.png b/Assets/03.Images/DDD/Ui/Characters/LilithNormal.png new file mode 100644 index 000000000..b89d37273 Binary files /dev/null and b/Assets/03.Images/DDD/Ui/Characters/LilithNormal.png differ diff --git a/Assets/03.Images/DDD/Ui/Characters/LilithNormal.png.meta b/Assets/03.Images/DDD/Ui/Characters/LilithNormal.png.meta new file mode 100644 index 000000000..ed5953706 --- /dev/null +++ b/Assets/03.Images/DDD/Ui/Characters/LilithNormal.png.meta @@ -0,0 +1,156 @@ +fileFormatVersion: 2 +guid: c47a7c88a638fa84d9df405aab71e315 +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: 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: 4 + 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: 4 + buildTarget: iOS + 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: 4 + 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: 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 + - serializedVersion: 4 + buildTarget: WindowsStoreApps + 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: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/03.Images/DDD/Ui/Characters/LilithSurprise.png b/Assets/03.Images/DDD/Ui/Characters/LilithSurprise.png new file mode 100644 index 000000000..db9b8c6b9 Binary files /dev/null and b/Assets/03.Images/DDD/Ui/Characters/LilithSurprise.png differ diff --git a/Assets/03.Images/DDD/Ui/Characters/LilithSurprise.png.meta b/Assets/03.Images/DDD/Ui/Characters/LilithSurprise.png.meta new file mode 100644 index 000000000..89f287b36 --- /dev/null +++ b/Assets/03.Images/DDD/Ui/Characters/LilithSurprise.png.meta @@ -0,0 +1,156 @@ +fileFormatVersion: 2 +guid: eabde6098474eee438a8a2acf99d6d25 +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: 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: 4 + 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: 4 + buildTarget: iOS + 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: 4 + 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: 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 + - serializedVersion: 4 + buildTarget: WindowsStoreApps + 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: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/03.Images/DDD/Ui/Characters/Sephira.png b/Assets/03.Images/DDD/Ui/Characters/Sephira.png deleted file mode 100644 index 7cedbad71..000000000 Binary files a/Assets/03.Images/DDD/Ui/Characters/Sephira.png and /dev/null differ diff --git a/Assets/03.Images/DDD/Ui/Characters/SephiraHappy.png b/Assets/03.Images/DDD/Ui/Characters/SephiraHappy.png new file mode 100644 index 000000000..33624d09d Binary files /dev/null and b/Assets/03.Images/DDD/Ui/Characters/SephiraHappy.png differ diff --git a/Assets/03.Images/DDD/Ui/Characters/SephiraHappy.png.meta b/Assets/03.Images/DDD/Ui/Characters/SephiraHappy.png.meta new file mode 100644 index 000000000..804059347 --- /dev/null +++ b/Assets/03.Images/DDD/Ui/Characters/SephiraHappy.png.meta @@ -0,0 +1,156 @@ +fileFormatVersion: 2 +guid: 2cf462cff3ff4124ab23888b78cdc8f5 +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: 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: 4 + 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: 4 + buildTarget: iOS + 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: 4 + 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: 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 + - serializedVersion: 4 + buildTarget: WindowsStoreApps + 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: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/03.Images/DDD/Ui/Characters/SephiraNormal.png b/Assets/03.Images/DDD/Ui/Characters/SephiraNormal.png new file mode 100644 index 000000000..cc43bf575 Binary files /dev/null and b/Assets/03.Images/DDD/Ui/Characters/SephiraNormal.png differ diff --git a/Assets/03.Images/DDD/Ui/Characters/SephiraNormal.png.meta b/Assets/03.Images/DDD/Ui/Characters/SephiraNormal.png.meta new file mode 100644 index 000000000..169b8b30e --- /dev/null +++ b/Assets/03.Images/DDD/Ui/Characters/SephiraNormal.png.meta @@ -0,0 +1,156 @@ +fileFormatVersion: 2 +guid: f2817f37d4803394480737e64a42028b +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: 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: 4 + 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: 4 + buildTarget: iOS + 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: 4 + 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: 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 + - serializedVersion: 4 + buildTarget: WindowsStoreApps + 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: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/05.Prefabs/BlueWater/Uis/Template Dialogue UI.prefab b/Assets/05.Prefabs/BlueWater/Uis/Template Dialogue UI.prefab index fcd810b19..5a7aaf6b5 100644 --- a/Assets/05.Prefabs/BlueWater/Uis/Template Dialogue UI.prefab +++ b/Assets/05.Prefabs/BlueWater/Uis/Template Dialogue UI.prefab @@ -1583,14 +1583,14 @@ MonoBehaviour: m_text: Continue m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 2f35c40df3d2a1a41b57c8b9eca40913, type: 2} - m_sharedMaterial: {fileID: 1328173432319114220, guid: 2f35c40df3d2a1a41b57c8b9eca40913, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: 12575fbfb1a20814aae86a588932b912, 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} + rgba: 4278190080 + m_fontColor: {r: 0, g: 0, b: 0, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -3711,7 +3711,7 @@ MonoBehaviour: styleSheet: {fileID: 0} databaseActions: {fileID: 11400000, guid: 9a432e50e248d0a4f94ec8ce58c24ce3, type: 2} defaultAppearancesTags: - - size + - fade defaultDisappearancesTags: - fade defaultBehaviorsTags: [] diff --git a/Assets/BlueWater.asset b/Assets/BlueWater.asset index 5d6f723db..4a27622a1 100644 --- a/Assets/BlueWater.asset +++ b/Assets/BlueWater.asset @@ -58,9 +58,11 @@ MonoBehaviour: type: 0 typeString: CustomFieldType_Text portrait: {fileID: 0} - spritePortrait: {fileID: 21300000, guid: c493c34b1338a504abace527651c21e0, type: 3} + spritePortrait: {fileID: 21300000, guid: 03dca29d68b546644a4621ffbf852ec5, type: 3} alternatePortraits: [] - spritePortraits: [] + spritePortraits: + - {fileID: 21300000, guid: 84da3dff8e16b5c40a4fd2effc2e7df2, type: 3} + - {fileID: 21300000, guid: d630df130ca9e8d44b31f8a58d6ea1da, type: 3} - id: 2 fields: - title: Name @@ -110,9 +112,10 @@ MonoBehaviour: type: 0 typeString: CustomFieldType_Text portrait: {fileID: 0} - spritePortrait: {fileID: 21300000, guid: 80abf4a52ec3c8f4c84810d5da100207, type: 3} + spritePortrait: {fileID: 21300000, guid: f2817f37d4803394480737e64a42028b, type: 3} alternatePortraits: [] - spritePortraits: [] + spritePortraits: + - {fileID: 21300000, guid: 2cf462cff3ff4124ab23888b78cdc8f5, type: 3} - id: 4 fields: - title: Name @@ -136,9 +139,10 @@ MonoBehaviour: type: 0 typeString: portrait: {fileID: 0} - spritePortrait: {fileID: 21300000, guid: 17ab9668e195c9f48aaf3078d126443b, type: 3} + spritePortrait: {fileID: 21300000, guid: c47a7c88a638fa84d9df405aab71e315, type: 3} alternatePortraits: [] - spritePortraits: [] + spritePortraits: + - {fileID: 21300000, guid: eabde6098474eee438a8a2acf99d6d25, type: 3} items: [] locations: [] variables: @@ -2798,11 +2802,11 @@ MonoBehaviour: - title: Title value: type: 0 - typeString: + typeString: CustomFieldType_Text - title: Description value: type: 0 - typeString: + typeString: CustomFieldType_Text - title: Actor value: 1 type: 5 @@ -2814,15 +2818,15 @@ MonoBehaviour: - title: Menu Text value: type: 0 - typeString: + typeString: CustomFieldType_Text - title: Dialogue Text - value: "\uD558\uC544..." + value: "[pic=2]\uD558\uC544\uC544\uC544.." type: 0 - typeString: + typeString: CustomFieldType_Text - title: Sequence value: type: 0 - typeString: + typeString: CustomFieldType_Text conversationID: 9 isRoot: 0 isGroup: 0 @@ -2844,7 +2848,7 @@ MonoBehaviour: m_Calls: [] canvasRect: serializedVersion: 2 - x: 433 + x: 432.2 y: 143 width: 160 height: 30 @@ -2926,10 +2930,11 @@ MonoBehaviour: type: 0 typeString: - title: Dialogue Text - value: "\uC774\uBC88\uC5D0 \uB9C8\uB140 \uC190\uB2D8\uC774 \uC640\uC11C \uC785\uB9DB\uC5D0 - \uB9DE\uB294\uAC8C \uC5C6\uB2E4\uACE0 \uB9E4\uC7A5\uC5D0 \uC794\uB729 \uB3C5\uC5F0\uAE30\uB97C - \uBFCC\uB9AC\uACE0 \uAC14\uC9C0 \uBB50\uC57C...!\r\n\uB355\uBD84\uC5D0 - \uC190\uB2D8\uB3C4 \uB2E4 \uB3C4\uB9DD\uAC00\uACE0.\r\n\uB4B7\uCC98\uB9AC\uD558\uB290\uB77C + value: "[pic=2]\uC774\uBC88\uC5D0 \uB9C8\uB140 + \uC190\uB2D8\uC774 \uC640\uC11C \uC785\uB9DB\uC5D0 \uB9DE\uB294\uAC8C \uC5C6\uB2E4\uACE0 + \uB9E4\uC7A5\uC5D0 \uC794\uB729 \uB3C5\uC5F0\uAE30\uB97C \uBFCC\uB9AC\uACE0 + \uAC14\uC9C0 \uBB50\uC57C...!\r\n\uB355\uBD84\uC5D0 \uC190\uB2D8\uB3C4 + \uB2E4 \uB3C4\uB9DD\uAC00\uACE0.\r\n\uB4B7\uCC98\uB9AC\uD558\uB290\uB77C \uC5BC\uB9C8\uB098 \uD798\uB4E4\uC5C8\uB294\uC9C0." type: 0 typeString: @@ -2985,9 +2990,10 @@ MonoBehaviour: type: 0 typeString: - title: Dialogue Text - value: "\uC544\uD558! \uB9C8\uB140\uB77C\uBA74 \uB0B4\uAC00 \uC798 \uC54C\uC9C0!\r\n\uC2EC\uC5F0 - \uD574\uC870\uB97C \uD55C \uBC88 \uC0AC\uC6A9\uD574\uBCF4\uB294 \uAC74 - \uC5B4\uB54C?" + value: "[pic=2]\uC544\uD558! \uB9C8\uB140\uB77C\uBA74 + \uB0B4\uAC00 \uC798 \uC54C\uC9C0!\r\n\uC2EC\uC5F0 + \uD574\uC870\uB97C \uD55C \uBC88 \uC0AC\uC6A9\uD574\uBCF4\uB294 + \uAC74 \uC5B4\uB54C?" type: 0 typeString: - title: Sequence @@ -3042,7 +3048,7 @@ MonoBehaviour: type: 0 typeString: - title: Dialogue Text - value: "\uC2EC\uC5F0 \uD574\uC870?" + value: "[pic=3]\uC2EC\uC5F0 \uD574\uC870?" type: 0 typeString: - title: Sequence @@ -3097,8 +3103,8 @@ MonoBehaviour: type: 0 typeString: - title: Dialogue Text - value: "\uC774\uAC8C \uB9C8\uB140\uB4E4\uC774\uB77C\uBA74 \uD658\uC7A5\uD558\uB294 - \uC2E0\uBE44\uD55C \uD48D\uBBF8\uB97C \uB354\uD574\uC8FC\uAC70\uB4E0!" + value: "[pic=2]\uC774\uAC8C \uB9C8\uB140\uB4E4\uC774\uB77C\uBA74 + \uD658\uC7A5\uD558\uB294 \uC2E0\uBE44\uD55C \uD48D\uBBF8\uB97C \uB354\uD574\uC8FC\uAC70\uB4E0!" type: 0 typeString: - title: Sequence @@ -3177,7 +3183,7 @@ MonoBehaviour: canvasRect: serializedVersion: 2 x: 433 - y: 443 + y: 443.8 width: 160 height: 30 entryGroups: [] @@ -3362,7 +3368,8 @@ MonoBehaviour: type: 0 typeString: - title: Dialogue Text - value: "\uC548\uB155 \uB9B4\uB9AC\uC2A4, \uC88B\uC740 \uC544\uCE68\uC774\uC57C." + value: "\uC548\uB155! \uB9B4\uB9AC\uC2A4, \uC88B\uC740 + \uC544\uCE68\uC774\uC57C." type: 0 typeString: - title: Sequence @@ -3417,7 +3424,7 @@ MonoBehaviour: type: 0 typeString: - title: Dialogue Text - value: "\uC544\uB2C8, \uD53C\uACE4\uD55C \uC544\uCE68\uC774\uC57C..." + value: "\uC544\uB2C8, \uD53C\uACE4\uD55C \uC544\uCE68\uC774\uC57C..." type: 0 typeString: - title: Sequence @@ -3472,7 +3479,8 @@ MonoBehaviour: type: 0 typeString: - title: Dialogue Text - value: "\uC624\uB298\uB3C4 \uBC24\uC0C8 \uC545\uB839\uC744 \uD1F4\uCE58 \uD55C\uAC70\uC57C?" + value: "[pic=3]\uC624\uB298\uB3C4 \uBC24\uC0C8 \uC545\uB839\uC744 + \uD1F4\uCE58 \uD55C\uAC70\uC57C?" type: 0 typeString: - title: Sequence @@ -3527,8 +3535,8 @@ MonoBehaviour: type: 0 typeString: - title: Dialogue Text - value: "\uC545\uB839\uB4E4\uC774 \uB108\uBB34 \uC2DC\uB044\uB7EC\uC6CC\u2026\r\n\r\n\uB2E4 - \uC8FD\uC5B4\uBC84\uB838\uC73C\uBA74\u2026" + value: "\uC545\uB839\uB4E4\uC774 \uB108\uBB34 \uC2DC\uB044\uB7EC\uC6CC\u2026\r\n\uB2E4\uC8FD\uC5B4\uBC84\uB838\uC73C\uBA74\u2026" type: 0 typeString: - title: Sequence @@ -3639,7 +3647,7 @@ MonoBehaviour: type: 0 typeString: - title: Dialogue Text - value: "\uC120\uC7A5 \uB108, \uC88B\uC740 \uB140\uC11D\uC774\uC5C8\uAD6C\uB098...!" + value: "[pic=2]\uC120\uC7A5 \uB108, \uC88B\uC740 \uB140\uC11D\uC774\uC5C8\uAD6C\uB098...!" type: 0 typeString: - title: Sequence @@ -3694,7 +3702,7 @@ MonoBehaviour: type: 0 typeString: - title: Dialogue Text - value: "\uC751?" + value: "[pic=3]\uC751?" type: 0 typeString: - title: Sequence @@ -3717,7 +3725,7 @@ MonoBehaviour: canvasRect: serializedVersion: 2 x: 162 - y: 431 + y: 431.8 width: 160 height: 30 entryGroups: [] @@ -3732,7 +3740,7 @@ MonoBehaviour: syncItemsDatabase: {fileID: 0} syncLocationsDatabase: {fileID: 0} syncVariablesDatabase: {fileID: 0} - templateJson: '{"treatItemsAsQuests":true,"actorFields":[{"title":"Name","value":"","type":0,"typeString":""},{"title":"Pictures","value":"[]","type":3,"typeString":"CustomFieldType_Files"},{"title":"Description","value":"","type":0,"typeString":""},{"title":"IsPlayer","value":"False","type":2,"typeString":"CustomFieldType_Boolean"}],"itemFields":[{"title":"Name","value":"","type":0,"typeString":""},{"title":"Pictures","value":"[]","type":3,"typeString":"CustomFieldType_Files"},{"title":"Description","value":"","type":0,"typeString":""},{"title":"Is + templateJson: '{"treatItemsAsQuests":true,"actorFields":[{"title":"Name","value":"","type":0,"typeString":"CustomFieldType_Text"},{"title":"Pictures","value":"[]","type":3,"typeString":"CustomFieldType_Files"},{"title":"Description","value":"","type":0,"typeString":"CustomFieldType_Text"},{"title":"IsPlayer","value":"False","type":2,"typeString":"CustomFieldType_Boolean"}],"itemFields":[{"title":"Name","value":"","type":0,"typeString":""},{"title":"Pictures","value":"[]","type":3,"typeString":"CustomFieldType_Files"},{"title":"Description","value":"","type":0,"typeString":""},{"title":"Is Item","value":"True","type":2,"typeString":"CustomFieldType_Boolean"}],"questFields":[{"title":"Name","value":"","type":0,"typeString":""},{"title":"Pictures","value":"[]","type":3,"typeString":"CustomFieldType_Files"},{"title":"Description","value":"","type":0,"typeString":""},{"title":"Success Description","value":"","type":0,"typeString":""},{"title":"Failure Description","value":"","type":0,"typeString":""},{"title":"State","value":"unassigned","type":0,"typeString":""},{"title":"Is Item","value":"False","type":2,"typeString":"CustomFieldType_Boolean"}],"locationFields":[{"title":"Name","value":"","type":0,"typeString":""},{"title":"Description","value":"","type":0,"typeString":""}],"variableFields":[{"title":"Name","value":"","type":0,"typeString":""},{"title":"Initial