diff --git a/Assets/01.Scenes/02.Combat/LowHealthPoint.asset b/Assets/01.Scenes/02.Combat/LowHealthPoint.asset index 3a5a83381..69f3689e8 100644 --- a/Assets/01.Scenes/02.Combat/LowHealthPoint.asset +++ b/Assets/01.Scenes/02.Combat/LowHealthPoint.asset @@ -78,6 +78,53 @@ MonoBehaviour: components: - {fileID: 8563356217564074714} - {fileID: -7988510701821828726} + - {fileID: 1457841827289327771} +--- !u!114 &1457841827289327771 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c01700fd266d6914ababb731e09af2eb, type: 3} + m_Name: DepthOfField + m_EditorClassIdentifier: + active: 0 + mode: + m_OverrideState: 1 + m_Value: 2 + gaussianStart: + m_OverrideState: 0 + m_Value: 10 + gaussianEnd: + m_OverrideState: 0 + m_Value: 30 + gaussianMaxRadius: + m_OverrideState: 0 + m_Value: 1 + highQualitySampling: + m_OverrideState: 0 + m_Value: 0 + focusDistance: + m_OverrideState: 1 + m_Value: 1 + aperture: + m_OverrideState: 0 + m_Value: 5.6 + focalLength: + m_OverrideState: 0 + m_Value: 50 + bladeCount: + m_OverrideState: 0 + m_Value: 5 + bladeCurvature: + m_OverrideState: 0 + m_Value: 1 + bladeRotation: + m_OverrideState: 0 + m_Value: 0 --- !u!114 &1921075280319716275 MonoBehaviour: m_ObjectHideFlags: 3 diff --git a/Assets/01.Scenes/04.TycoonTest.unity b/Assets/01.Scenes/04.TycoonTest.unity index a4dfdc0bf..9798b6892 100644 --- a/Assets/01.Scenes/04.TycoonTest.unity +++ b/Assets/01.Scenes/04.TycoonTest.unity @@ -9951,7 +9951,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 141888020} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 3b24a5606b164c84db0d3ed3ee8256e1, type: 3} m_Name: @@ -42068,7 +42068,7 @@ Transform: 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_LocalPosition: {x: -600, y: 8, z: -1.55} m_LocalScale: {x: 20, y: 10, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -50959,6 +50959,17 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!114 &928606157 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 3481486763373117091, guid: 29ff4b046e796f249b05a7e81fa48779, type: 3} + m_PrefabInstance: {fileID: 1425009442} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d287dbc75fdbb6b44bd97e6d0604b227, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &928832141 GameObject: m_ObjectHideFlags: 0 @@ -74428,7 +74439,6 @@ RectTransform: m_Children: - {fileID: 1851687885} - {fileID: 588336991} - - {fileID: 2032162537} - {fileID: 1701833860} - {fileID: 1024788553} - {fileID: 392193686} @@ -99415,6 +99425,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 2032162537} - {fileID: 1394631889} - {fileID: 894826554} - {fileID: 2055805161} @@ -108928,7 +108939,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1983229438} - m_Father: {fileID: 1394631889} + m_Father: {fileID: 1861226431} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} @@ -122747,9 +122758,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 4b69878329f04c541838d4c090ad9978, type: 2} - - {fileID: 2100000, guid: cc610b9acc31ccb41befa5093f0db428, type: 2} - - {fileID: 2100000, guid: 4b69878329f04c541838d4c090ad9978, type: 2} + - {fileID: 2100000, guid: 1950cc34c90cf414f883965953a42387, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -123276,8 +123285,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d247ba06193faa74d9335f5481b2b56c, type: 3} m_Name: m_EditorClassIdentifier: - skeletonDataAsset: {fileID: 11400000, guid: d96ab46e9aca1d142b153e02ea521a2a, type: 2} - initialSkinName: 03Clean + skeletonDataAsset: {fileID: 11400000, guid: 0cc512067c261ee45a32d1294b31f8c5, type: 2} + initialSkinName: Lilith fixPrefabOverrideViaMeshFilter: 2 initialFlipX: 0 initialFlipY: 0 @@ -123304,7 +123313,7 @@ MonoBehaviour: physicsMovementRelativeTo: {fileID: 0} updateTiming: 1 unscaledTime: 0 - _animationName: CleaningFloor + _animationName: Idle loop: 1 timeScale: 1 --- !u!114 &5607728471159668077 @@ -124605,6 +124614,18 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 + - m_Target: {fileID: 928606157} + m_TargetAssemblyTypeName: PostProcessingManager, Assembly-CSharp + m_MethodName: DepthOfFieldButton + m_Mode: 6 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 1 + m_CallState: 2 onConversationEnd: m_PersistentCalls: m_Calls: @@ -124632,6 +124653,18 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 1 m_CallState: 2 + - m_Target: {fileID: 928606157} + m_TargetAssemblyTypeName: PostProcessingManager, Assembly-CSharp + m_MethodName: DepthOfFieldButton + m_Mode: 6 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 runOnConversationEndEventsAtEndOfFrame: 0 onConversationCancelled: m_PersistentCalls: @@ -124735,10 +124768,34 @@ MonoBehaviour: actorTransform: {fileID: 0} onSelectedUsable: m_PersistentCalls: - m_Calls: [] + m_Calls: + - m_Target: {fileID: 4672223181233348431} + m_TargetAssemblyTypeName: DDD.Players.Tycoons.TycoonPlayer, Assembly-CSharp + m_MethodName: ShowInteractionUi + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 onDeselectedUsable: m_PersistentCalls: - m_Calls: [] + m_Calls: + - m_Target: {fileID: 4672223181233348431} + m_TargetAssemblyTypeName: DDD.Players.Tycoons.TycoonPlayer, Assembly-CSharp + m_MethodName: HideInteractionUi + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 usablesInRange: [] --- !u!223 &7564252084086657915 Canvas: diff --git a/Assets/02.Scripts/BlueWater/Character/Player/Tycoon/TycoonPlayer.cs b/Assets/02.Scripts/BlueWater/Character/Player/Tycoon/TycoonPlayer.cs index b97697bb9..b68ce0af7 100644 --- a/Assets/02.Scripts/BlueWater/Character/Player/Tycoon/TycoonPlayer.cs +++ b/Assets/02.Scripts/BlueWater/Character/Player/Tycoon/TycoonPlayer.cs @@ -307,6 +307,17 @@ namespace DDD.Players.Tycoons Teleport(_favorabilitySpawnLocation02.position); } + public void ShowInteractionUi() + { + EventManager.InvokeHoldInteracting(0f); + EventManager.InvokeShowInteractionUi("λŒ€ν™”ν•˜κΈ°"); + } + + public void HideInteractionUi() + { + EventManager.InvokeHideInteractionUi(); + } + #endregion } } \ No newline at end of file diff --git a/Assets/02.Scripts/PostProcessingManager.cs b/Assets/02.Scripts/PostProcessingManager.cs index 6aa02443d..8ce1848d3 100644 --- a/Assets/02.Scripts/PostProcessingManager.cs +++ b/Assets/02.Scripts/PostProcessingManager.cs @@ -176,4 +176,6 @@ public enum RendererFeatureName yield return null; } } + + public void DepthOfFieldButton(bool active) => ToggleEffect(active, VolumeType.Global); } \ No newline at end of file diff --git a/Assets/03.Images/DDD/Ui/Characters/LilithBoring.png b/Assets/03.Images/DDD/Ui/Characters/LilithBoring.png new file mode 100644 index 000000000..8c3844fc9 Binary files /dev/null and b/Assets/03.Images/DDD/Ui/Characters/LilithBoring.png differ diff --git a/Assets/03.Images/DDD/Ui/Characters/LilithBoring.png.meta b/Assets/03.Images/DDD/Ui/Characters/LilithBoring.png.meta new file mode 100644 index 000000000..9599c7be1 --- /dev/null +++ b/Assets/03.Images/DDD/Ui/Characters/LilithBoring.png.meta @@ -0,0 +1,156 @@ +fileFormatVersion: 2 +guid: 3a05412ac1dc2e54582dbd941ced7262 +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/08.Spines/Characters/Npcs/Lilith.meta b/Assets/08.Spines/Characters/Npcs/Lilith.meta new file mode 100644 index 000000000..01b9c0c32 --- /dev/null +++ b/Assets/08.Spines/Characters/Npcs/Lilith.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 3012bb69a9b45aa4183d010351e734ed +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/08.Spines/Characters/Npcs/Lilith/CrewSP.atlas.txt b/Assets/08.Spines/Characters/Npcs/Lilith/CrewSP.atlas.txt new file mode 100644 index 000000000..121357600 --- /dev/null +++ b/Assets/08.Spines/Characters/Npcs/Lilith/CrewSP.atlas.txt @@ -0,0 +1,52 @@ +CrewSP.png +size:2033,1328 +filter:Linear,Linear +Item/BeerFull +bounds:546,814,512,512 +Item/Cleaningbroom +bounds:2,26,238,476 +rotate:90 +Item/Cleaningbroom2 +bounds:1060,814,512,512 +Item/Cleaningbroom3 +bounds:797,133,174,498 +rotate:90 +Item/Cleaningstic +bounds:1515,241,181,321 +rotate:90 +Item/Shaker2 +bounds:493,293,302,516 +Item/WoodenBeerMug +bounds:493,35,256,256 +Item/dust2 +bounds:1515,424,338,338 +SP/Body +bounds:1297,8,173,299 +SP/Eye_Left +bounds:1472,10,219,229 +SP/Eye_Left copy +bounds:1693,20,219,218 +rotate:90 +SP/Face +bounds:2,811,542,515 +SP/Hair_Back +bounds:1574,764,446,562 +SP/Hair_Front +bounds:2,266,489,543 +SP/Hair_Left +bounds:751,57,74,439 +rotate:90 +SP/Hair_LeftMini +bounds:797,309,357,503 +SP/Hair_RightMini +bounds:1156,309,357,503 +SP/Hand_Left +bounds:1855,561,176,201 +SP/Hand_Right +bounds:1855,358,176,201 +SP/Leg_Left +bounds:1913,154,82,202 +SP/Leg_Right +bounds:1913,154,82,202 +SP/Mouse +bounds:2,2,59,22 diff --git a/Assets/08.Spines/Characters/Npcs/Lilith/CrewSP.atlas.txt.meta b/Assets/08.Spines/Characters/Npcs/Lilith/CrewSP.atlas.txt.meta new file mode 100644 index 000000000..472dd2dff --- /dev/null +++ b/Assets/08.Spines/Characters/Npcs/Lilith/CrewSP.atlas.txt.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 1844fe54efec8df408d5a51246975156 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/08.Spines/Characters/Npcs/Lilith/CrewSP.png b/Assets/08.Spines/Characters/Npcs/Lilith/CrewSP.png new file mode 100644 index 000000000..8718e8cd0 Binary files /dev/null and b/Assets/08.Spines/Characters/Npcs/Lilith/CrewSP.png differ diff --git a/Assets/08.Spines/Characters/Npcs/Lilith/CrewSP.png.meta b/Assets/08.Spines/Characters/Npcs/Lilith/CrewSP.png.meta new file mode 100644 index 000000000..55c20c65e --- /dev/null +++ b/Assets/08.Spines/Characters/Npcs/Lilith/CrewSP.png.meta @@ -0,0 +1,156 @@ +fileFormatVersion: 2 +guid: e5c96d346dc49a3498dd565f11a54ab6 +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: 1 + 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: 0 + textureFormat: -1 + textureCompression: 0 + 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: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/08.Spines/Characters/Npcs/Lilith/CrewSP.skel.bytes b/Assets/08.Spines/Characters/Npcs/Lilith/CrewSP.skel.bytes new file mode 100644 index 000000000..5e9aaa913 Binary files /dev/null and b/Assets/08.Spines/Characters/Npcs/Lilith/CrewSP.skel.bytes differ diff --git a/Assets/08.Spines/Characters/Npcs/Lilith/CrewSP.skel.bytes.meta b/Assets/08.Spines/Characters/Npcs/Lilith/CrewSP.skel.bytes.meta new file mode 100644 index 000000000..86c41b0d3 --- /dev/null +++ b/Assets/08.Spines/Characters/Npcs/Lilith/CrewSP.skel.bytes.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 5eb524f24413ff34ebd35bba1a47295f +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/08.Spines/Characters/Npcs/Lilith/CrewSP_Atlas.asset b/Assets/08.Spines/Characters/Npcs/Lilith/CrewSP_Atlas.asset new file mode 100644 index 000000000..1c7f09c9f --- /dev/null +++ b/Assets/08.Spines/Characters/Npcs/Lilith/CrewSP_Atlas.asset @@ -0,0 +1,19 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a6b194f808b1af6499c93410e504af42, type: 3} + m_Name: CrewSP_Atlas + m_EditorClassIdentifier: + textureLoadingMode: 0 + onDemandTextureLoader: {fileID: 0} + atlasFile: {fileID: 4900000, guid: 1844fe54efec8df408d5a51246975156, type: 3} + materials: + - {fileID: 2100000, guid: 1950cc34c90cf414f883965953a42387, type: 2} diff --git a/Assets/08.Spines/Characters/Npcs/Lilith/CrewSP_Atlas.asset.meta b/Assets/08.Spines/Characters/Npcs/Lilith/CrewSP_Atlas.asset.meta new file mode 100644 index 000000000..360a2a197 --- /dev/null +++ b/Assets/08.Spines/Characters/Npcs/Lilith/CrewSP_Atlas.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c5eaebb885cd34447b9c23032ccaaca0 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/08.Spines/Characters/Npcs/Lilith/CrewSP_Material.mat b/Assets/08.Spines/Characters/Npcs/Lilith/CrewSP_Material.mat new file mode 100644 index 000000000..e9d49230a --- /dev/null +++ b/Assets/08.Spines/Characters/Npcs/Lilith/CrewSP_Material.mat @@ -0,0 +1,56 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: CrewSP_Material + m_Shader: {fileID: 4800000, guid: b77e51f117177954ea863bdb422344fb, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: + - _STRAIGHT_ALPHA_INPUT + m_InvalidKeywords: + - _USE8NEIGHBOURHOOD_ON + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _MainTex: + m_Texture: {fileID: 2800000, guid: e5c96d346dc49a3498dd565f11a54ab6, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _Cutoff: 0.1 + - _DoubleSidedLighting: 0 + - _LightAffectsAdditive: 0 + - _OutlineMipLevel: 0 + - _OutlineOpaqueAlpha: 1 + - _OutlineReferenceTexWidth: 1024 + - _OutlineSmoothness: 1 + - _OutlineWidth: 3 + - _ReceiveShadows: 0 + - _StencilComp: 8 + - _StencilRef: 1 + - _StraightAlphaInput: 1 + - _ThresholdEnd: 0.25 + - _TintBlack: 0 + - _Use8Neighbourhood: 1 + - _UseScreenSpaceOutlineWidth: 0 + - _ZWrite: 0 + m_Colors: + - _Black: {r: 0, g: 0, b: 0, a: 0} + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _OutlineColor: {r: 1, g: 1, b: 0, a: 1} + m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/08.Spines/Characters/Npcs/Lilith/CrewSP_Material.mat.meta b/Assets/08.Spines/Characters/Npcs/Lilith/CrewSP_Material.mat.meta new file mode 100644 index 000000000..71365765e --- /dev/null +++ b/Assets/08.Spines/Characters/Npcs/Lilith/CrewSP_Material.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 1950cc34c90cf414f883965953a42387 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/08.Spines/Characters/Npcs/Lilith/CrewSP_SkeletonData.asset b/Assets/08.Spines/Characters/Npcs/Lilith/CrewSP_SkeletonData.asset new file mode 100644 index 000000000..69dcd511d --- /dev/null +++ b/Assets/08.Spines/Characters/Npcs/Lilith/CrewSP_SkeletonData.asset @@ -0,0 +1,31 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f1b3b4b945939a54ea0b23d3396115fb, type: 3} + m_Name: CrewSP_SkeletonData + m_EditorClassIdentifier: + atlasAssets: + - {fileID: 11400000, guid: c5eaebb885cd34447b9c23032ccaaca0, type: 2} + scale: 0.001 + skeletonJSON: {fileID: 4900000, guid: 5eb524f24413ff34ebd35bba1a47295f, type: 3} + isUpgradingBlendModeMaterials: 0 + blendModeMaterials: + requiresBlendModeMaterials: 0 + applyAdditiveMaterial: 1 + additiveMaterials: [] + multiplyMaterials: [] + screenMaterials: [] + skeletonDataModifiers: [] + fromAnimation: [] + toAnimation: [] + duration: [] + defaultMix: 0.2 + controller: {fileID: 0} diff --git a/Assets/08.Spines/Characters/Npcs/Lilith/CrewSP_SkeletonData.asset.meta b/Assets/08.Spines/Characters/Npcs/Lilith/CrewSP_SkeletonData.asset.meta new file mode 100644 index 000000000..7ef16e27b --- /dev/null +++ b/Assets/08.Spines/Characters/Npcs/Lilith/CrewSP_SkeletonData.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0cc512067c261ee45a32d1294b31f8c5 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/BlueWater.asset b/Assets/BlueWater.asset index 4a27622a1..510334ab4 100644 --- a/Assets/BlueWater.asset +++ b/Assets/BlueWater.asset @@ -143,6 +143,7 @@ MonoBehaviour: alternatePortraits: [] spritePortraits: - {fileID: 21300000, guid: eabde6098474eee438a8a2acf99d6d25, type: 3} + - {fileID: 21300000, guid: 3a05412ac1dc2e54582dbd941ced7262, type: 3} items: [] locations: [] variables: @@ -3313,7 +3314,7 @@ MonoBehaviour: type: 0 typeString: - title: Dialogue Text - value: "\uD558\uC554..." + value: "[pic=3]\uD558\uC554..." type: 0 typeString: - title: Sequence @@ -3453,7 +3454,7 @@ MonoBehaviour: canvasRect: serializedVersion: 2 x: 162 - y: 181 + y: 180 width: 160 height: 30 - id: 4