From 9df81db479f36f6577c417c4ab23b6441e7e85a7 Mon Sep 17 00:00:00 2001 From: aswew1538 Date: Mon, 29 Jun 2026 14:38:43 +0900 Subject: [PATCH] 111 --- Assets/02_Scripts/Managers/GameClear.cs | 2 +- .../RandomSceneRouteManager.cs | 17 +- .../Cave/HandPose/RightHand_Star.asset | 3 + .../Cave/HandPose/RightHand_Star.asset.meta | 8 + .../04_Models/Characters/Fariy/Fairy.prefab | 4 +- .../Tablet/Materials/TabletPanel 1.mat | 143 ++++++ .../Tablet/Materials/TabletPanel 1.mat.meta | 8 + .../Tablet/Materials/TabletPanel.mat | 3 +- Assets/05_Textures/LastPicture1.png | 3 + Assets/05_Textures/LastPicture1.png.meta | 156 +++++++ .../CatsRoom/Cat1_CatsRoom_Area1 1.wdg | 409 ++++++++++++++++++ .../CatsRoom/Cat1_CatsRoom_Area1 1.wdg.meta | 10 + .../08_Timeline/Timeline_GeptoSecond.playable | 218 +++++++++- Assets/My project/fishhook scene.meta | 4 + Assets/My project/fishhook scene.unity.meta | 4 + .../fishhook scene/NavMesh-Terrain.asset.meta | 4 + .../Interactors/Left_NearFarInteractor.prefab | 4 +- .../AndroidXRSettingsInitializer.meta | 4 + ProjectSettings/TagManager.asset | 4 +- 19 files changed, 989 insertions(+), 19 deletions(-) create mode 100644 Assets/04_Models/Cave/HandPose/RightHand_Star.asset create mode 100644 Assets/04_Models/Cave/HandPose/RightHand_Star.asset.meta create mode 100644 Assets/04_Models/Tablet/Materials/TabletPanel 1.mat create mode 100644 Assets/04_Models/Tablet/Materials/TabletPanel 1.mat.meta create mode 100644 Assets/05_Textures/LastPicture1.png create mode 100644 Assets/05_Textures/LastPicture1.png.meta create mode 100644 Assets/07_Data/Communication/DialogGraph/CatsRoom/Cat1_CatsRoom_Area1 1.wdg create mode 100644 Assets/07_Data/Communication/DialogGraph/CatsRoom/Cat1_CatsRoom_Area1 1.wdg.meta diff --git a/Assets/02_Scripts/Managers/GameClear.cs b/Assets/02_Scripts/Managers/GameClear.cs index 6ad2f57..6cff788 100644 --- a/Assets/02_Scripts/Managers/GameClear.cs +++ b/Assets/02_Scripts/Managers/GameClear.cs @@ -111,7 +111,7 @@ public void SetZoneActive(DialogRegion zone, bool active) public void SetClearDialogParameter() { string sceneName1 = "블랙잭"; - string sceneCode1 = "blackjack"; + string sceneCode1 = "BlackjackRoom"; string sceneName2 = "캣룸"; string sceneCode2 = "CatsRoom"; diff --git a/Assets/02_Scripts/Managers/change room manager/RandomSceneRouteManager.cs b/Assets/02_Scripts/Managers/change room manager/RandomSceneRouteManager.cs index 54f6e66..7438ad1 100644 --- a/Assets/02_Scripts/Managers/change room manager/RandomSceneRouteManager.cs +++ b/Assets/02_Scripts/Managers/change room manager/RandomSceneRouteManager.cs @@ -211,20 +211,23 @@ private string GetDisplayName(string sceneName) { switch (sceneName) { - case "blackjack": - return "ºí·¢Àè"; + case "BlackjackRoom": + return "ÀúÁÖ¹ÞÀº ³­Æļ±"; case "CatsRoom": - return "Ĺ·ë"; + return "³¶¾ÆÄ¡µéÀÇ ¾ð´ö"; case "MazeRoom": - return "¹Ì·Î¹æ"; + return "Ǫ¸¥ ¿äÁ¤ÀÇ Á¤¿ø"; - case "Cave_Test_2": - return "µ¿±¼¹æ"; + case "CaveRoom": + return "°Å²Ù·Î °è°î"; + + case "FishhookRoom": + return "´«¹°¿¡ Àá±ä ³¬½ÃÅÍ"; case "Gepto first": - return "Á¦ÆäÅä"; + return "Á¦ÆäÅäÀÇ ÀÛ¾÷½Ç"; default: return sceneName; diff --git a/Assets/04_Models/Cave/HandPose/RightHand_Star.asset b/Assets/04_Models/Cave/HandPose/RightHand_Star.asset new file mode 100644 index 0000000..1b6dd26 --- /dev/null +++ b/Assets/04_Models/Cave/HandPose/RightHand_Star.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:978cea0f42cedbdaa62b655039013e7ce7db4bcd2fe2bb9919eff839d0bd5dfd +size 5067 diff --git a/Assets/04_Models/Cave/HandPose/RightHand_Star.asset.meta b/Assets/04_Models/Cave/HandPose/RightHand_Star.asset.meta new file mode 100644 index 0000000..0e8034e --- /dev/null +++ b/Assets/04_Models/Cave/HandPose/RightHand_Star.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2703a5fcd75b5244f9a863b9cc641521 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/04_Models/Characters/Fariy/Fairy.prefab b/Assets/04_Models/Characters/Fariy/Fairy.prefab index 3ae5916..4a6a040 100644 --- a/Assets/04_Models/Characters/Fariy/Fairy.prefab +++ b/Assets/04_Models/Characters/Fariy/Fairy.prefab @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dd35520032bebc1e1dc3e73c54cb6904e165018457b8327f7c0fc3acec74ae73 -size 487680 +oid sha256:de7173c12fdf6acd6e0d709f4d8f891368e49cc624f4f330fc9d495666f496fe +size 488867 diff --git a/Assets/04_Models/Tablet/Materials/TabletPanel 1.mat b/Assets/04_Models/Tablet/Materials/TabletPanel 1.mat new file mode 100644 index 0000000..94f2cb0 --- /dev/null +++ b/Assets/04_Models/Tablet/Materials/TabletPanel 1.mat @@ -0,0 +1,143 @@ +%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: TabletPanel 1 + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: + - _ALPHAPREMULTIPLY_ON + - _SURFACE_TYPE_TRANSPARENT + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 3000 + stringTagMap: + RenderType: Transparent + disabledShaderPasses: + - MOTIONVECTORS + - DepthOnly + - SHADOWCASTER + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 2800000, guid: fd044c5f5de35e541b6efad6e996106d, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: fd044c5f5de35e541b6efad6e996106d, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _AddPrecomputedVelocity: 0 + - _AlphaClip: 0 + - _AlphaToMask: 0 + - _Blend: 0 + - _BlendModePreserveSpecular: 1 + - _BumpScale: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 + - _DetailNormalMapScale: 1 + - _DstBlend: 10 + - _DstBlendAlpha: 10 + - _EnvironmentReflections: 1 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 1 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _SrcBlendAlpha: 1 + - _Surface: 1 + - _UVSec: 0 + - _WorkflowMode: 1 + - _XRMotionVectorsPass: 1 + - _ZWrite: 0 + m_Colors: + - _BaseColor: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0.0045400523, g: 0.0045400523, b: 0.0045400523, a: 1} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] + m_AllowLocking: 1 +--- !u!114 &4350146435477003703 +MonoBehaviour: + m_ObjectHideFlags: 11 + 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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: Unity.RenderPipelines.Universal.Editor::UnityEditor.Rendering.Universal.AssetVersion + version: 10 diff --git a/Assets/04_Models/Tablet/Materials/TabletPanel 1.mat.meta b/Assets/04_Models/Tablet/Materials/TabletPanel 1.mat.meta new file mode 100644 index 0000000..68c7cda --- /dev/null +++ b/Assets/04_Models/Tablet/Materials/TabletPanel 1.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0b52ccd9a460c9d4ab5476130ad6a4c9 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/04_Models/Tablet/Materials/TabletPanel.mat b/Assets/04_Models/Tablet/Materials/TabletPanel.mat index dc14f2f..35901b5 100644 --- a/Assets/04_Models/Tablet/Materials/TabletPanel.mat +++ b/Assets/04_Models/Tablet/Materials/TabletPanel.mat @@ -13,10 +13,9 @@ Material: m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _ALPHAPREMULTIPLY_ON - - _EMISSION - _SURFACE_TYPE_TRANSPARENT m_InvalidKeywords: [] - m_LightmapFlags: 2 + m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: 3000 diff --git a/Assets/05_Textures/LastPicture1.png b/Assets/05_Textures/LastPicture1.png new file mode 100644 index 0000000..c5d2a93 --- /dev/null +++ b/Assets/05_Textures/LastPicture1.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3692bb668921355e55d4075a71a1742ddd578c6d4e9925dbfce4d34c297986d8 +size 528094 diff --git a/Assets/05_Textures/LastPicture1.png.meta b/Assets/05_Textures/LastPicture1.png.meta new file mode 100644 index 0000000..7a3c13d --- /dev/null +++ b/Assets/05_Textures/LastPicture1.png.meta @@ -0,0 +1,156 @@ +fileFormatVersion: 2 +guid: fd044c5f5de35e541b6efad6e996106d +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: 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: 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: WebGL + 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/07_Data/Communication/DialogGraph/CatsRoom/Cat1_CatsRoom_Area1 1.wdg b/Assets/07_Data/Communication/DialogGraph/CatsRoom/Cat1_CatsRoom_Area1 1.wdg new file mode 100644 index 0000000..613c4c8 --- /dev/null +++ b/Assets/07_Data/Communication/DialogGraph/CatsRoom/Cat1_CatsRoom_Area1 1.wdg @@ -0,0 +1,409 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &1 +MonoBehaviour: + m_ObjectHideFlags: 61 + 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: 790b4d75d92f4b0984310a268dbd952f, type: 3} + m_Name: Cat1_CatsRoom_Area1 1 + m_EditorClassIdentifier: Unity.GraphToolkit.Editor::Unity.GraphToolkit.Editor.Implementation.GraphObjectImp + m_GraphModel: + rid: 6595524353106116630 + references: + version: 2 + RefIds: + - rid: -2 + type: {class: , ns: , asm: } + - rid: 6595524353106116630 + type: {class: GraphModelImp, ns: Unity.GraphToolkit.Editor.Implementation, asm: Unity.GraphToolkit.Editor} + data: + m_Guid: + m_Value0: 13819889836145151562 + m_Value1: 2645381255326452780 + m_HashGuid: + serializedVersion: 2 + Hash: 4a8e76c6951ccabf2ccc35633c48b624 + m_Name: Cat1_CatsRoom_Area1 1 + m_GraphNodeModels: + - rid: 6595524353106116633 + - rid: 6595524353106116635 + - rid: 6595524353106116646 + m_GraphWireModels: + - rid: 6595524353106116636 + - rid: 6595524353106116647 + m_GraphStickyNoteModels: [] + m_GraphPlacematModels: [] + m_GraphVariableModels: [] + m_GraphPortalModels: [] + m_SectionModels: + - rid: 6595524353106116631 + m_LocalSubgraphs: [] + m_LastKnownBounds: + serializedVersion: 2 + x: 222 + y: 84 + width: 920 + height: 386 + m_GraphElementMetaData: + - m_Guid: + m_Value0: 14845512388065122572 + m_Value1: 17804268460506216482 + m_HashGuid: + serializedVersion: 2 + Hash: 0c5948afdcda05ce22f82972d57715f7 + m_Category: 0 + m_Index: 0 + - m_Guid: + m_Value0: 7989713923298697385 + m_Value1: 15604869423937906234 + m_HashGuid: + serializedVersion: 2 + Hash: a920365f7b2ae16e3a662c1c10a28fd8 + m_Category: 0 + m_Index: 1 + - m_Guid: + m_Value0: 5269650743910428719 + m_Value1: 257959026697812224 + m_HashGuid: + serializedVersion: 2 + Hash: 2f7027896e8f214900b9ed385e749403 + m_Category: 2 + m_Index: 0 + - m_Guid: + m_Value0: 7697830479301862552 + m_Value1: 13043115897654624489 + m_HashGuid: + serializedVersion: 2 + Hash: 9864f63b0930d46ae940f4b3cd7402b5 + m_Category: 0 + m_Index: 2 + - m_Guid: + m_Value0: 13678802302849805841 + m_Value1: 5869810211712229956 + m_HashGuid: + serializedVersion: 2 + Hash: 116e289638ded4bd446211b849c17551 + m_Category: 2 + m_Index: 1 + m_EntryPoint: + rid: 6595524353106116633 + m_Graph: + rid: 6595524353106116632 + - rid: 6595524353106116631 + type: {class: SectionModel, ns: Unity.GraphToolkit.Editor, asm: Unity.GraphToolkit.Internal.Editor} + data: + m_Guid: + m_Value0: 13482299192089173763 + m_Value1: 8100932157345530803 + m_HashGuid: + serializedVersion: 2 + Hash: 03df02d4aebf1abbb3831e64e04a6c70 + m_Version: 2 + m_Items: [] + m_Title: + - rid: 6595524353106116632 + type: {class: DialogGraph, ns: WhaleAdventure.Dialog.GraphTool.Editor, asm: Assembly-CSharp-Editor} + data: + - rid: 6595524353106116633 + type: {class: UserNodeModelImp, ns: Unity.GraphToolkit.Editor.Implementation, asm: Unity.GraphToolkit.Editor} + data: + m_Guid: + m_Value0: 14845512388065122572 + m_Value1: 17804268460506216482 + m_HashGuid: + serializedVersion: 2 + Hash: 0c5948afdcda05ce22f82972d57715f7 + m_Version: 2 + m_Position: {x: 222.2174, y: 116.434784} + m_Title: + m_Tooltip: + m_NodePreviewModel: + rid: -2 + m_State: 0 + m_InputConstantsById: + m_KeyList: [] + m_ValueList: [] + m_InputPortInfos: + expandedPortsById: + m_KeyList: [] + m_ValueList: + m_OutputPortInfos: + expandedPortsById: + m_KeyList: [] + m_ValueList: + m_Collapsed: 0 + m_CurrentModeIndex: 0 + m_ElementColor: + m_Color: {r: 0, g: 0, b: 0, a: 0} + m_HasUserColor: 0 + m_Node: + rid: 6595524353106116634 + - rid: 6595524353106116634 + type: {class: DialogStartNode, ns: WhaleAdventure.Dialog.GraphTool.Editor, asm: Assembly-CSharp-Editor} + data: + - rid: 6595524353106116635 + type: {class: UserNodeModelImp, ns: Unity.GraphToolkit.Editor.Implementation, asm: Unity.GraphToolkit.Editor} + data: + m_Guid: + m_Value0: 7989713923298697385 + m_Value1: 15604869423937906234 + m_HashGuid: + serializedVersion: 2 + Hash: a920365f7b2ae16e3a662c1c10a28fd8 + m_Version: 2 + m_Position: {x: 430.9063, y: 86.04323} + m_Title: + m_Tooltip: + m_NodePreviewModel: + rid: -2 + m_State: 0 + m_InputConstantsById: + m_KeyList: + - __option_ChoiceCount + - Speaker + - TalkText + - Gesture + - Expression + - Voice + - LineDuration + - LookAtPlayer + - WaitForInput + - __option_EventKey + m_ValueList: + - rid: 6595524353106116637 + - rid: 6595524353106116638 + - rid: 6595524353106116639 + - rid: 6595524353106116640 + - rid: 6595524353106116641 + - rid: 6595524353106116642 + - rid: 6595524353106116643 + - rid: 6595524353106116644 + - rid: 6595524374970761386 + - rid: 6595524374970761398 + m_InputPortInfos: + expandedPortsById: + m_KeyList: [] + m_ValueList: + m_OutputPortInfos: + expandedPortsById: + m_KeyList: [] + m_ValueList: + m_Collapsed: 0 + m_CurrentModeIndex: 0 + m_ElementColor: + m_Color: {r: 0, g: 0, b: 0, a: 0} + m_HasUserColor: 0 + m_Node: + rid: 6595524353106116645 + - rid: 6595524353106116636 + type: {class: WireModel, ns: Unity.GraphToolkit.Editor, asm: Unity.GraphToolkit.Internal.Editor} + data: + m_Guid: + m_Value0: 5269650743910428719 + m_Value1: 257959026697812224 + m_HashGuid: + serializedVersion: 2 + Hash: 2f7027896e8f214900b9ed385e749403 + m_Version: 2 + m_FromPortReference: + m_NodeModelGuid: + m_Value0: 14845512388065122572 + m_Value1: 17804268460506216482 + m_NodeModelHashGuid: + serializedVersion: 2 + Hash: 0c5948afdcda05ce22f82972d57715f7 + m_UniqueId: Out + m_PortDirection: 2 + m_PortOrientation: 0 + m_Title: + m_ToPortReference: + m_NodeModelGuid: + m_Value0: 7989713923298697385 + m_Value1: 15604869423937906234 + m_NodeModelHashGuid: + serializedVersion: 2 + Hash: a920365f7b2ae16e3a662c1c10a28fd8 + m_UniqueId: In + m_PortDirection: 1 + m_PortOrientation: 0 + m_Title: + - rid: 6595524353106116637 + type: {class: 'Constant`1[[System.Int32, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: Unity.GraphToolkit.Internal.Editor} + data: + m_Value: 0 + - rid: 6595524353106116638 + type: {class: 'Constant`1[[CharacterData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: Unity.GraphToolkit.Internal.Editor} + data: + m_Value: {fileID: 11400000, guid: 47faf39975a3c214c923a3cbca747c5a, type: 2} + - rid: 6595524353106116639 + type: {class: 'Constant`1[[WhaleAdventure.Dialog.GraphTool.Editor.DialogText, Assembly-CSharp-Editor]]', ns: Unity.GraphToolkit.Editor, asm: Unity.GraphToolkit.Internal.Editor} + data: + m_Value: + Value: "\uC7A0\uAE50, \uB108 \uC74C\uC545\uC801 \uC7AC\uB2A5\uC774 \uC788\uC5B4\uBCF4\uC774\uB294\uB370?" + - rid: 6595524353106116640 + type: {class: 'Constant`1[[GestureData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: Unity.GraphToolkit.Internal.Editor} + data: + m_Value: {fileID: 0} + - rid: 6595524353106116641 + type: {class: 'Constant`1[[ExpressionData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: Unity.GraphToolkit.Internal.Editor} + data: + m_Value: {fileID: 0} + - rid: 6595524353106116642 + type: {class: 'Constant`1[[VoiceClip, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: Unity.GraphToolkit.Internal.Editor} + data: + m_Value: {fileID: 0} + - rid: 6595524353106116643 + type: {class: 'Constant`1[[System.Single, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: Unity.GraphToolkit.Internal.Editor} + data: + m_Value: 5 + - rid: 6595524353106116644 + type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: Unity.GraphToolkit.Internal.Editor} + data: + m_Value: 1 + - rid: 6595524353106116645 + type: {class: DialogLineNode, ns: WhaleAdventure.Dialog.GraphTool.Editor, asm: Assembly-CSharp-Editor} + data: + - rid: 6595524353106116646 + type: {class: UserNodeModelImp, ns: Unity.GraphToolkit.Editor.Implementation, asm: Unity.GraphToolkit.Editor} + data: + m_Guid: + m_Value0: 7697830479301862552 + m_Value1: 13043115897654624489 + m_HashGuid: + serializedVersion: 2 + Hash: 9864f63b0930d46ae940f4b3cd7402b5 + m_Version: 2 + m_Position: {x: 806, y: 84} + m_Title: + m_Tooltip: + m_NodePreviewModel: + rid: -2 + m_State: 0 + m_InputConstantsById: + m_KeyList: + - __option_ChoiceCount + - Speaker + - TalkText + - Gesture + - Expression + - Voice + - LineDuration + - LookAtPlayer + - WaitForInput + - __option_EventKey + m_ValueList: + - rid: 6595524353106116648 + - rid: 6595524353106116649 + - rid: 6595524353106116650 + - rid: 6595524353106116651 + - rid: 6595524353106116652 + - rid: 6595524353106116653 + - rid: 6595524353106116654 + - rid: 6595524353106116655 + - rid: 6595524374970761387 + - rid: 6595524374970761399 + m_InputPortInfos: + expandedPortsById: + m_KeyList: [] + m_ValueList: + m_OutputPortInfos: + expandedPortsById: + m_KeyList: [] + m_ValueList: + m_Collapsed: 0 + m_CurrentModeIndex: 0 + m_ElementColor: + m_Color: {r: 0, g: 0, b: 0, a: 0} + m_HasUserColor: 0 + m_Node: + rid: 6595524353106116656 + - rid: 6595524353106116647 + type: {class: WireModel, ns: Unity.GraphToolkit.Editor, asm: Unity.GraphToolkit.Internal.Editor} + data: + m_Guid: + m_Value0: 13678802302849805841 + m_Value1: 5869810211712229956 + m_HashGuid: + serializedVersion: 2 + Hash: 116e289638ded4bd446211b849c17551 + m_Version: 2 + m_FromPortReference: + m_NodeModelGuid: + m_Value0: 7989713923298697385 + m_Value1: 15604869423937906234 + m_NodeModelHashGuid: + serializedVersion: 2 + Hash: a920365f7b2ae16e3a662c1c10a28fd8 + m_UniqueId: Out + m_PortDirection: 2 + m_PortOrientation: 0 + m_Title: + m_ToPortReference: + m_NodeModelGuid: + m_Value0: 7697830479301862552 + m_Value1: 13043115897654624489 + m_NodeModelHashGuid: + serializedVersion: 2 + Hash: 9864f63b0930d46ae940f4b3cd7402b5 + m_UniqueId: In + m_PortDirection: 1 + m_PortOrientation: 0 + m_Title: + - rid: 6595524353106116648 + type: {class: 'Constant`1[[System.Int32, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: Unity.GraphToolkit.Internal.Editor} + data: + m_Value: 0 + - rid: 6595524353106116649 + type: {class: 'Constant`1[[CharacterData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: Unity.GraphToolkit.Internal.Editor} + data: + m_Value: {fileID: 11400000, guid: 47faf39975a3c214c923a3cbca747c5a, type: 2} + - rid: 6595524353106116650 + type: {class: 'Constant`1[[WhaleAdventure.Dialog.GraphTool.Editor.DialogText, Assembly-CSharp-Editor]]', ns: Unity.GraphToolkit.Editor, asm: Unity.GraphToolkit.Internal.Editor} + data: + m_Value: + Value: "\uC6B0\uB9AC\uC640 \uAC19\uC774 \uB9AC\uB4EC\uC744 \uB9DE\uCDB0\uBCF4\uC9C0 + \uC54A\uC744\uB798?" + - rid: 6595524353106116651 + type: {class: 'Constant`1[[GestureData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: Unity.GraphToolkit.Internal.Editor} + data: + m_Value: {fileID: 0} + - rid: 6595524353106116652 + type: {class: 'Constant`1[[ExpressionData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: Unity.GraphToolkit.Internal.Editor} + data: + m_Value: {fileID: 0} + - rid: 6595524353106116653 + type: {class: 'Constant`1[[VoiceClip, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: Unity.GraphToolkit.Internal.Editor} + data: + m_Value: {fileID: 0} + - rid: 6595524353106116654 + type: {class: 'Constant`1[[System.Single, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: Unity.GraphToolkit.Internal.Editor} + data: + m_Value: 5 + - rid: 6595524353106116655 + type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: Unity.GraphToolkit.Internal.Editor} + data: + m_Value: 0 + - rid: 6595524353106116656 + type: {class: DialogLineNode, ns: WhaleAdventure.Dialog.GraphTool.Editor, asm: Assembly-CSharp-Editor} + data: + - rid: 6595524374970761386 + type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: Unity.GraphToolkit.Internal.Editor} + data: + m_Value: 0 + - rid: 6595524374970761387 + type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: Unity.GraphToolkit.Internal.Editor} + data: + m_Value: 0 + - rid: 6595524374970761398 + type: {class: 'Constant`1[[System.String, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: Unity.GraphToolkit.Internal.Editor} + data: + m_Value: + - rid: 6595524374970761399 + type: {class: 'Constant`1[[System.String, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: Unity.GraphToolkit.Internal.Editor} + data: + m_Value: diff --git a/Assets/07_Data/Communication/DialogGraph/CatsRoom/Cat1_CatsRoom_Area1 1.wdg.meta b/Assets/07_Data/Communication/DialogGraph/CatsRoom/Cat1_CatsRoom_Area1 1.wdg.meta new file mode 100644 index 0000000..69947bf --- /dev/null +++ b/Assets/07_Data/Communication/DialogGraph/CatsRoom/Cat1_CatsRoom_Area1 1.wdg.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 4a8537c362f67c04ea93007aa4906f8c +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 2ae5ca89bbed445479d9023586f0c041, type: 3} diff --git a/Assets/08_Timeline/Timeline_GeptoSecond.playable b/Assets/08_Timeline/Timeline_GeptoSecond.playable index 250f190..cc1f10e 100644 --- a/Assets/08_Timeline/Timeline_GeptoSecond.playable +++ b/Assets/08_Timeline/Timeline_GeptoSecond.playable @@ -38,7 +38,7 @@ MonoBehaviour: m_Children: [] m_Clips: - m_Version: 1 - m_Start: 4 + m_Start: 8 m_ClipIn: 0 m_Asset: {fileID: 8000411283881595332} m_Duration: 7 @@ -147,7 +147,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 15c38f6fa1940124db1ab7f6fe7268d1, type: 3} m_Name: Signal Emitter m_EditorClassIdentifier: Unity.Timeline::UnityEngine.Timeline.SignalEmitter - m_Time: 10.5 + m_Time: 14.75 m_Retroactive: 0 m_EmitOnce: 0 m_Asset: {fileID: 11400000, guid: 9b02eaa2955e72b4294be05e52c90129, type: 2} @@ -167,12 +167,26 @@ MonoBehaviour: m_Tracks: - {fileID: -456888005300554224} - {fileID: -4088094050139152046} + - {fileID: 9149116783555101762} + - {fileID: 7060129291087529930} m_FixedDuration: 0 m_EditorSettings: m_Framerate: 60 m_ScenePreview: 1 m_DurationMode: 0 m_MarkerTrack: {fileID: 0} +--- !u!114 &3811749994670932209 +MonoBehaviour: + m_ObjectHideFlags: 1 + 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: fde0d25a170598d46a0b9dc16b4527a5, type: 3} + m_Name: ActivationPlayableAsset + m_EditorClassIdentifier: Unity.Timeline::UnityEngine.Timeline.ActivationPlayableAsset --- !u!114 &4070348831193287581 MonoBehaviour: m_ObjectHideFlags: 1 @@ -185,10 +199,103 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 15c38f6fa1940124db1ab7f6fe7268d1, type: 3} m_Name: Signal Emitter m_EditorClassIdentifier: Unity.Timeline::UnityEngine.Timeline.SignalEmitter - m_Time: 8 + m_Time: 13.3 m_Retroactive: 0 m_EmitOnce: 0 m_Asset: {fileID: 11400000, guid: dd9b6bdf576e28947b0f6c15b6f12b75, type: 2} +--- !u!114 &7060129291087529930 +MonoBehaviour: + m_ObjectHideFlags: 1 + 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: 21bf7f712d84d26478ebe6a299f21738, type: 3} + m_Name: Activation Track (2) + m_EditorClassIdentifier: Unity.Timeline::UnityEngine.Timeline.ActivationTrack + m_Version: 3 + m_AnimClip: {fileID: 0} + m_Locked: 0 + m_Muted: 0 + m_CustomPlayableFullTypename: + m_Curves: {fileID: 0} + m_Parent: {fileID: 11400000} + m_Children: [] + m_Clips: + - m_Version: 1 + m_Start: 8 + m_ClipIn: 0 + m_Asset: {fileID: 9107058836472601442} + m_Duration: 7 + m_TimeScale: 1 + m_ParentTrack: {fileID: 7060129291087529930} + m_EaseInDuration: 0 + m_EaseOutDuration: 0 + m_BlendInDuration: 0 + m_BlendOutDuration: 0 + m_MixInCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + m_MixOutCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + m_BlendInCurveMode: 0 + m_BlendOutCurveMode: 0 + m_ExposedParameterNames: [] + m_AnimationCurves: {fileID: 0} + m_Recordable: 0 + m_PostExtrapolationMode: 0 + m_PreExtrapolationMode: 0 + m_PostExtrapolationTime: 0 + m_PreExtrapolationTime: 0 + m_DisplayName: Active + m_Markers: + m_Objects: [] + m_PostPlaybackState: 3 --- !u!114 &8000411283881595332 MonoBehaviour: m_ObjectHideFlags: 1 @@ -201,3 +308,108 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fde0d25a170598d46a0b9dc16b4527a5, type: 3} m_Name: ActivationPlayableAsset m_EditorClassIdentifier: Unity.Timeline::UnityEngine.Timeline.ActivationPlayableAsset +--- !u!114 &9107058836472601442 +MonoBehaviour: + m_ObjectHideFlags: 1 + 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: fde0d25a170598d46a0b9dc16b4527a5, type: 3} + m_Name: ActivationPlayableAsset + m_EditorClassIdentifier: Unity.Timeline::UnityEngine.Timeline.ActivationPlayableAsset +--- !u!114 &9149116783555101762 +MonoBehaviour: + m_ObjectHideFlags: 1 + 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: 21bf7f712d84d26478ebe6a299f21738, type: 3} + m_Name: Activation Track (1) + m_EditorClassIdentifier: Unity.Timeline::UnityEngine.Timeline.ActivationTrack + m_Version: 3 + m_AnimClip: {fileID: 0} + m_Locked: 0 + m_Muted: 0 + m_CustomPlayableFullTypename: + m_Curves: {fileID: 0} + m_Parent: {fileID: 11400000} + m_Children: [] + m_Clips: + - m_Version: 1 + m_Start: 0 + m_ClipIn: 0 + m_Asset: {fileID: 3811749994670932209} + m_Duration: 8 + m_TimeScale: 1 + m_ParentTrack: {fileID: 9149116783555101762} + m_EaseInDuration: 0 + m_EaseOutDuration: 0 + m_BlendInDuration: 0 + m_BlendOutDuration: 0 + m_MixInCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + m_MixOutCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + m_BlendInCurveMode: 0 + m_BlendOutCurveMode: 0 + m_ExposedParameterNames: [] + m_AnimationCurves: {fileID: 0} + m_Recordable: 0 + m_PostExtrapolationMode: 0 + m_PreExtrapolationMode: 0 + m_PostExtrapolationTime: 0 + m_PreExtrapolationTime: 0 + m_DisplayName: Active + m_Markers: + m_Objects: [] + m_PostPlaybackState: 3 diff --git a/Assets/My project/fishhook scene.meta b/Assets/My project/fishhook scene.meta index 33da939..c71decf 100644 --- a/Assets/My project/fishhook scene.meta +++ b/Assets/My project/fishhook scene.meta @@ -1,5 +1,9 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: c9e7644bbc6b3324eb679151bb0018fa +======= +guid: a32c27501966c844da3c4e2e54236880 +>>>>>>> 3887731db4d2b6ac4d3d2887acc3414ddf555690 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/My project/fishhook scene.unity.meta b/Assets/My project/fishhook scene.unity.meta index 66ca784..045a615 100644 --- a/Assets/My project/fishhook scene.unity.meta +++ b/Assets/My project/fishhook scene.unity.meta @@ -1,5 +1,9 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: 96e0f6dd612977042b62b4b18a2f8c9a +======= +guid: 5e660f31b31a3c1489ac3a3e5804f0aa +>>>>>>> 3887731db4d2b6ac4d3d2887acc3414ddf555690 DefaultImporter: externalObjects: {} userData: diff --git a/Assets/My project/fishhook scene/NavMesh-Terrain.asset.meta b/Assets/My project/fishhook scene/NavMesh-Terrain.asset.meta index 86b8a82..6c281de 100644 --- a/Assets/My project/fishhook scene/NavMesh-Terrain.asset.meta +++ b/Assets/My project/fishhook scene/NavMesh-Terrain.asset.meta @@ -1,5 +1,9 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: 73f8b205cedf821488958abbf597e518 +======= +guid: 897f994e3e3765248902eea88350c6f7 +>>>>>>> 3887731db4d2b6ac4d3d2887acc3414ddf555690 NativeFormatImporter: externalObjects: {} mainObjectFileID: 0 diff --git a/Assets/Samples/XR Interaction Toolkit/3.4.1/Starter Assets/Prefabs/Interactors/Left_NearFarInteractor.prefab b/Assets/Samples/XR Interaction Toolkit/3.4.1/Starter Assets/Prefabs/Interactors/Left_NearFarInteractor.prefab index f5af267..e1e3103 100644 --- a/Assets/Samples/XR Interaction Toolkit/3.4.1/Starter Assets/Prefabs/Interactors/Left_NearFarInteractor.prefab +++ b/Assets/Samples/XR Interaction Toolkit/3.4.1/Starter Assets/Prefabs/Interactors/Left_NearFarInteractor.prefab @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:934e042066da4cff97119b284827a25bce1630fb9faee6685299756ddb0e595f -size 21260 +oid sha256:67ce8dc2c59d253df9126940aec6ce60ef49cec9f10606040cf537ff7ef3c213 +size 22017 diff --git a/Assets/XR/AndroidXR/AndroidXRSettingsInitializer.meta b/Assets/XR/AndroidXR/AndroidXRSettingsInitializer.meta index b385279..5021ca1 100644 --- a/Assets/XR/AndroidXR/AndroidXRSettingsInitializer.meta +++ b/Assets/XR/AndroidXR/AndroidXRSettingsInitializer.meta @@ -1,5 +1,9 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: 7f4320a32f7a846409fcf9cc7fa5fda1 +======= +guid: 779ddf707232c4f49a357660d770bcf9 +>>>>>>> 3887731db4d2b6ac4d3d2887acc3414ddf555690 DefaultImporter: externalObjects: {} userData: diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset index 637ba98..1572d9b 100644 --- a/ProjectSettings/TagManager.asset +++ b/ProjectSettings/TagManager.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e8d4ffbba55f43de3c4c2454e262aa0d4d01351b23ec0462dee606021029f4b3 -size 483 +oid sha256:82794d01d7b76816805cefc7f4129a43d92d4b2fa2c73df6c0f93933266d8e50 +size 545