From c3210a2a7c61015ae75914eebfdb4e7f90773e9c Mon Sep 17 00:00:00 2001 From: nakjun Date: Fri, 12 Jun 2026 10:45:54 +0900 Subject: [PATCH] =?UTF-8?q?2026-06-12=20=EB=B8=94=EB=9E=99=EC=9E=AD=20?= =?UTF-8?q?=EB=A7=88=ED=85=8C=EB=A6=AC=EC=96=BC=20=EC=88=98=EC=A0=95,=20?= =?UTF-8?q?=EB=82=98=EB=AC=B4=EC=8A=A4=ED=8B=B1=20=EB=AA=A8=EB=8D=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WhaleAdventure_VR/Rooms/CatsRoom.unity | 4 +- Assets/01_Scenes/blackjack.meta | 8 + Assets/01_Scenes/blackjack.unity | 4 +- .../blackjack/Global Volume Profile.asset | 3 + .../Global Volume Profile.asset.meta | 8 + Assets/04_Models/Choice.meta | 8 + Assets/04_Models/Choice/Row.meta | 8 + .../Choice/Row/ChoiceRow.prefab.meta | 7 + Assets/04_Models/Note.meta | 8 + Assets/04_Models/Note/Prefabs.meta | 8 + Assets/04_Models/Note/Prefabs/Note.prefab | 3 + .../04_Models/Note/Prefabs/Note.prefab.meta | 7 + Assets/04_Models/Objects/WoodStick.meta | 8 + .../Objects/WoodStick/Materials.meta | 8 + .../Objects/WoodStick/Materials/Leaf_Mat.mat | 139 ++++++++++++++++++ .../WoodStick/Materials/Leaf_Mat.mat.meta | 8 + .../WoodStick/Materials/WoodBody_Mat.mat | 139 ++++++++++++++++++ .../WoodStick/Materials/WoodBody_Mat.mat.meta | 8 + .../04_Models/Objects/WoodStick/Prefabs.meta | 8 + .../WoodStick/Prefabs/WoodStick.prefab | 3 + .../WoodStick/Prefabs/WoodStick.prefab.meta | 7 + .../WoodStick/Prefabs/WoodStick2.prefab | 3 + .../WoodStick/Prefabs/WoodStick2.prefab.meta | 7 + .../04_Models/Objects/WoodStick/WoodStick.fbx | 3 + .../Objects/WoodStick/WoodStick.fbx.meta | 120 +++++++++++++++ .../Objects/WoodStick/WoodStick2.fbx | 3 + .../Objects/WoodStick/WoodStick2.fbx.meta | 115 +++++++++++++++ .../hook/5_material004_1_0_0.002.mat | 9 +- .../06_Materials/blackjack/hook/face.002.mat | 7 +- .../blackjack/hook/feather.002.mat | 7 +- .../06_Materials/blackjack/hook/hat.002.mat | 7 +- .../blackjack/hook/sleeves and pants.002.mat | 7 +- .../06_Materials/blackjack/hook/sword.002.mat | 7 +- 33 files changed, 676 insertions(+), 23 deletions(-) create mode 100644 Assets/01_Scenes/blackjack.meta create mode 100644 Assets/01_Scenes/blackjack/Global Volume Profile.asset create mode 100644 Assets/01_Scenes/blackjack/Global Volume Profile.asset.meta create mode 100644 Assets/04_Models/Choice.meta create mode 100644 Assets/04_Models/Choice/Row.meta create mode 100644 Assets/04_Models/Choice/Row/ChoiceRow.prefab.meta create mode 100644 Assets/04_Models/Note.meta create mode 100644 Assets/04_Models/Note/Prefabs.meta create mode 100644 Assets/04_Models/Note/Prefabs/Note.prefab create mode 100644 Assets/04_Models/Note/Prefabs/Note.prefab.meta create mode 100644 Assets/04_Models/Objects/WoodStick.meta create mode 100644 Assets/04_Models/Objects/WoodStick/Materials.meta create mode 100644 Assets/04_Models/Objects/WoodStick/Materials/Leaf_Mat.mat create mode 100644 Assets/04_Models/Objects/WoodStick/Materials/Leaf_Mat.mat.meta create mode 100644 Assets/04_Models/Objects/WoodStick/Materials/WoodBody_Mat.mat create mode 100644 Assets/04_Models/Objects/WoodStick/Materials/WoodBody_Mat.mat.meta create mode 100644 Assets/04_Models/Objects/WoodStick/Prefabs.meta create mode 100644 Assets/04_Models/Objects/WoodStick/Prefabs/WoodStick.prefab create mode 100644 Assets/04_Models/Objects/WoodStick/Prefabs/WoodStick.prefab.meta create mode 100644 Assets/04_Models/Objects/WoodStick/Prefabs/WoodStick2.prefab create mode 100644 Assets/04_Models/Objects/WoodStick/Prefabs/WoodStick2.prefab.meta create mode 100644 Assets/04_Models/Objects/WoodStick/WoodStick.fbx create mode 100644 Assets/04_Models/Objects/WoodStick/WoodStick.fbx.meta create mode 100644 Assets/04_Models/Objects/WoodStick/WoodStick2.fbx create mode 100644 Assets/04_Models/Objects/WoodStick/WoodStick2.fbx.meta diff --git a/Assets/01_Scenes/WhaleAdventure_VR/Rooms/CatsRoom.unity b/Assets/01_Scenes/WhaleAdventure_VR/Rooms/CatsRoom.unity index 7d84d53d..ddf6ea55 100644 --- a/Assets/01_Scenes/WhaleAdventure_VR/Rooms/CatsRoom.unity +++ b/Assets/01_Scenes/WhaleAdventure_VR/Rooms/CatsRoom.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e57a155ac46a1d04f9005ab94f41ff1e863e76d528d542f54f7d006792c8eb0d -size 1967251 +oid sha256:46f0da1fa62d6c1dbc788aca44209499fded1f8eb6b7a8e75979b5b493da6891 +size 1975898 diff --git a/Assets/01_Scenes/blackjack.meta b/Assets/01_Scenes/blackjack.meta new file mode 100644 index 00000000..fde89494 --- /dev/null +++ b/Assets/01_Scenes/blackjack.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b444b93c505df9d4084a7b6a61ad8f8c +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/01_Scenes/blackjack.unity b/Assets/01_Scenes/blackjack.unity index 2b18a39b..cbc42dfc 100644 --- a/Assets/01_Scenes/blackjack.unity +++ b/Assets/01_Scenes/blackjack.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9cd0f95e9e5c57289ef4069e4c55068be6492fa9cce3309f283c62685a091c7e -size 1902199 +oid sha256:2d5d787f409e26c99d3ca33fc72d85554569a0bb120edfbe2ca0c64bc424e162 +size 1904615 diff --git a/Assets/01_Scenes/blackjack/Global Volume Profile.asset b/Assets/01_Scenes/blackjack/Global Volume Profile.asset new file mode 100644 index 00000000..fabc6a7d --- /dev/null +++ b/Assets/01_Scenes/blackjack/Global Volume Profile.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1f0b0ff30061363208786a652870e7a5b9784522a70e83485c8820d569f3d9f6 +size 1667 diff --git a/Assets/01_Scenes/blackjack/Global Volume Profile.asset.meta b/Assets/01_Scenes/blackjack/Global Volume Profile.asset.meta new file mode 100644 index 00000000..8a20cbc4 --- /dev/null +++ b/Assets/01_Scenes/blackjack/Global Volume Profile.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d82b5a7c0fe5406408aef80e63bd61cc +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/04_Models/Choice.meta b/Assets/04_Models/Choice.meta new file mode 100644 index 00000000..8a701eaf --- /dev/null +++ b/Assets/04_Models/Choice.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 3c3d47294b7c6dc4586fcb4730796bd0 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/04_Models/Choice/Row.meta b/Assets/04_Models/Choice/Row.meta new file mode 100644 index 00000000..660a0e84 --- /dev/null +++ b/Assets/04_Models/Choice/Row.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 8452cf732cb70f24ab158237e01f3fdc +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/04_Models/Choice/Row/ChoiceRow.prefab.meta b/Assets/04_Models/Choice/Row/ChoiceRow.prefab.meta new file mode 100644 index 00000000..4234a324 --- /dev/null +++ b/Assets/04_Models/Choice/Row/ChoiceRow.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 68b0a72dcff3de54b9e6ef4b8d163135 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/04_Models/Note.meta b/Assets/04_Models/Note.meta new file mode 100644 index 00000000..a8670fe1 --- /dev/null +++ b/Assets/04_Models/Note.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 21082e94953626345bd7febc750cb99f +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/04_Models/Note/Prefabs.meta b/Assets/04_Models/Note/Prefabs.meta new file mode 100644 index 00000000..24ba5d89 --- /dev/null +++ b/Assets/04_Models/Note/Prefabs.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ac12f9936e583d5488783b6ac0fbfdfd +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/04_Models/Note/Prefabs/Note.prefab b/Assets/04_Models/Note/Prefabs/Note.prefab new file mode 100644 index 00000000..4e6616cd --- /dev/null +++ b/Assets/04_Models/Note/Prefabs/Note.prefab @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:624f2b164c4ccf21e4c3a915b31f999e27178ada6f622fa88abcc852688552e1 +size 901 diff --git a/Assets/04_Models/Note/Prefabs/Note.prefab.meta b/Assets/04_Models/Note/Prefabs/Note.prefab.meta new file mode 100644 index 00000000..418171ba --- /dev/null +++ b/Assets/04_Models/Note/Prefabs/Note.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 2f3e152888fa71247b0e4c40ea069d7d +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/04_Models/Objects/WoodStick.meta b/Assets/04_Models/Objects/WoodStick.meta new file mode 100644 index 00000000..716eec69 --- /dev/null +++ b/Assets/04_Models/Objects/WoodStick.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 183b1e10293f8aa4a820efefb61fe0ad +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/04_Models/Objects/WoodStick/Materials.meta b/Assets/04_Models/Objects/WoodStick/Materials.meta new file mode 100644 index 00000000..6b40b3b6 --- /dev/null +++ b/Assets/04_Models/Objects/WoodStick/Materials.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f1fd5a9ba2e83ea4197b7de34df73a35 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/04_Models/Objects/WoodStick/Materials/Leaf_Mat.mat b/Assets/04_Models/Objects/WoodStick/Materials/Leaf_Mat.mat new file mode 100644 index 00000000..261876b3 --- /dev/null +++ b/Assets/04_Models/Objects/WoodStick/Materials/Leaf_Mat.mat @@ -0,0 +1,139 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &-134744908871584592 +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 +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Leaf_Mat + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: + RenderType: Opaque + disabledShaderPasses: + - MOTIONVECTORS + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 0} + 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: 0} + 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: 0 + - _DstBlendAlpha: 0 + - _EnvironmentReflections: 1 + - _GlossMapScale: 1 + - _Glossiness: 0.20329665 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0.20329665 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _SrcBlendAlpha: 1 + - _Surface: 0 + - _UVSec: 0 + - _WorkflowMode: 1 + - _XRMotionVectorsPass: 1 + - _ZWrite: 1 + m_Colors: + - _BaseColor: {r: 0.26526877, g: 0.9063354, b: 0.3704489, a: 1} + - _Color: {r: 0.26526874, g: 0.9063354, b: 0.37044886, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 0} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/04_Models/Objects/WoodStick/Materials/Leaf_Mat.mat.meta b/Assets/04_Models/Objects/WoodStick/Materials/Leaf_Mat.mat.meta new file mode 100644 index 00000000..935fbdcb --- /dev/null +++ b/Assets/04_Models/Objects/WoodStick/Materials/Leaf_Mat.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 65b9259f39b83ed468ea8e11c81a627f +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/04_Models/Objects/WoodStick/Materials/WoodBody_Mat.mat b/Assets/04_Models/Objects/WoodStick/Materials/WoodBody_Mat.mat new file mode 100644 index 00000000..cdb952e6 --- /dev/null +++ b/Assets/04_Models/Objects/WoodStick/Materials/WoodBody_Mat.mat @@ -0,0 +1,139 @@ +%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: WoodBody_Mat + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: + RenderType: Opaque + disabledShaderPasses: + - MOTIONVECTORS + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 0} + 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: 0} + 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: 0 + - _DstBlendAlpha: 0 + - _EnvironmentReflections: 1 + - _GlossMapScale: 1 + - _Glossiness: 0.2912088 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0.2912088 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _SrcBlendAlpha: 1 + - _Surface: 0 + - _UVSec: 0 + - _WorkflowMode: 1 + - _XRMotionVectorsPass: 1 + - _ZWrite: 1 + m_Colors: + - _BaseColor: {r: 0.5202273, g: 0.35837743, b: 0.10521189, a: 1} + - _Color: {r: 0.52022725, g: 0.35837737, b: 0.10521186, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 0} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] + m_AllowLocking: 1 +--- !u!114 &975744584727806908 +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/Objects/WoodStick/Materials/WoodBody_Mat.mat.meta b/Assets/04_Models/Objects/WoodStick/Materials/WoodBody_Mat.mat.meta new file mode 100644 index 00000000..ccfd6506 --- /dev/null +++ b/Assets/04_Models/Objects/WoodStick/Materials/WoodBody_Mat.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 63350bab3a59650449c12eb24c8a28cd +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/04_Models/Objects/WoodStick/Prefabs.meta b/Assets/04_Models/Objects/WoodStick/Prefabs.meta new file mode 100644 index 00000000..4a50a300 --- /dev/null +++ b/Assets/04_Models/Objects/WoodStick/Prefabs.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: de9897c3feb1ce24b99feac5a0b8e6b2 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/04_Models/Objects/WoodStick/Prefabs/WoodStick.prefab b/Assets/04_Models/Objects/WoodStick/Prefabs/WoodStick.prefab new file mode 100644 index 00000000..275e174b --- /dev/null +++ b/Assets/04_Models/Objects/WoodStick/Prefabs/WoodStick.prefab @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:347949b2523f90fbd074226cb453a3c07e6cd8921846b25311e4024e44418656 +size 2470 diff --git a/Assets/04_Models/Objects/WoodStick/Prefabs/WoodStick.prefab.meta b/Assets/04_Models/Objects/WoodStick/Prefabs/WoodStick.prefab.meta new file mode 100644 index 00000000..b07009d1 --- /dev/null +++ b/Assets/04_Models/Objects/WoodStick/Prefabs/WoodStick.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 64d706dccf193ad4c9250a92f1782af8 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/04_Models/Objects/WoodStick/Prefabs/WoodStick2.prefab b/Assets/04_Models/Objects/WoodStick/Prefabs/WoodStick2.prefab new file mode 100644 index 00000000..0f894bbc --- /dev/null +++ b/Assets/04_Models/Objects/WoodStick/Prefabs/WoodStick2.prefab @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0f83e33ec907238a72211fbfa9a135b4676be91d21892e91b7b1ceb934e4f24d +size 2722 diff --git a/Assets/04_Models/Objects/WoodStick/Prefabs/WoodStick2.prefab.meta b/Assets/04_Models/Objects/WoodStick/Prefabs/WoodStick2.prefab.meta new file mode 100644 index 00000000..c762371b --- /dev/null +++ b/Assets/04_Models/Objects/WoodStick/Prefabs/WoodStick2.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 6df6ce53099740a4da7e7770a360c63d +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/04_Models/Objects/WoodStick/WoodStick.fbx b/Assets/04_Models/Objects/WoodStick/WoodStick.fbx new file mode 100644 index 00000000..5d168ee8 --- /dev/null +++ b/Assets/04_Models/Objects/WoodStick/WoodStick.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5ae80474d555de20fa20b535cb8906f4ddbf13d7a82f030a449030972039ae5c +size 21788 diff --git a/Assets/04_Models/Objects/WoodStick/WoodStick.fbx.meta b/Assets/04_Models/Objects/WoodStick/WoodStick.fbx.meta new file mode 100644 index 00000000..ded27721 --- /dev/null +++ b/Assets/04_Models/Objects/WoodStick/WoodStick.fbx.meta @@ -0,0 +1,120 @@ +fileFormatVersion: 2 +guid: f0d26766fc417d54c98b7f81dc13317c +ModelImporter: + serializedVersion: 24200 + internalIDToNameTable: [] + externalObjects: + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: Material + second: {fileID: 2100000, guid: 63350bab3a59650449c12eb24c8a28cd, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: Material.001 + second: {fileID: 2100000, guid: 65b9259f39b83ed468ea8e11c81a627f, type: 2} + materials: + materialImportMode: 2 + materialName: 0 + materialSearch: 1 + materialLocation: 1 + animations: + legacyGenerateAnimations: 4 + bakeSimulation: 0 + resampleCurves: 1 + optimizeGameObjects: 0 + removeConstantScaleCurves: 0 + motionNodeName: + animationImportErrors: + animationImportWarnings: + animationRetargetingWarnings: + animationDoRetargetingWarnings: 0 + importAnimatedCustomProperties: 0 + importConstraints: 0 + animationCompression: 1 + animationRotationError: 0.5 + animationPositionError: 0.5 + animationScaleError: 0.5 + animationWrapMode: 0 + extraExposedTransformPaths: [] + extraUserProperties: [] + clipAnimations: [] + isReadable: 0 + meshes: + lODScreenPercentages: [] + globalScale: 0.05 + meshCompression: 0 + addColliders: 0 + useSRGBMaterialColor: 1 + sortHierarchyByName: 1 + importPhysicalCameras: 1 + importVisibility: 1 + importBlendShapes: 1 + importCameras: 1 + importLights: 1 + nodeNameCollisionStrategy: 1 + fileIdsGeneration: 2 + swapUVChannels: 0 + generateSecondaryUV: 0 + useFileUnits: 1 + keepQuads: 0 + weldVertices: 1 + bakeAxisConversion: 0 + preserveHierarchy: 0 + skinWeightsMode: 0 + maxBonesPerVertex: 4 + minBoneWeight: 0.001 + optimizeBones: 1 + generateMeshLods: 0 + meshLodGenerationFlags: 0 + maximumMeshLod: -1 + meshOptimizationFlags: -1 + indexFormat: 0 + secondaryUVAngleDistortion: 8 + secondaryUVAreaDistortion: 15.000001 + secondaryUVHardAngle: 88 + secondaryUVMarginMethod: 1 + secondaryUVMinLightmapResolution: 40 + secondaryUVMinObjectScale: 1 + secondaryUVPackMargin: 4 + useFileScale: 1 + strictVertexDataChecks: 0 + tangentSpace: + normalSmoothAngle: 60 + normalImportMode: 0 + tangentImportMode: 3 + normalCalculationMode: 4 + legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0 + blendShapeNormalImportMode: 1 + normalSmoothingSource: 0 + referencedClips: [] + importAnimation: 1 + humanDescription: + serializedVersion: 3 + human: [] + skeleton: [] + armTwist: 0.5 + foreArmTwist: 0.5 + upperLegTwist: 0.5 + legTwist: 0.5 + armStretch: 0.05 + legStretch: 0.05 + feetSpacing: 0 + globalScale: 0.05 + rootMotionBoneName: + hasTranslationDoF: 0 + hasExtraRoot: 0 + skeletonHasParents: 1 + lastHumanDescriptionAvatarSource: {instanceID: 0} + autoGenerateAvatarMappingIfUnspecified: 1 + animationType: 2 + humanoidOversampling: 1 + avatarSetup: 0 + addHumanoidExtraRootOnlyWhenUsingAvatar: 1 + importBlendShapeDeformPercent: 1 + remapMaterialsIfMaterialImportModeIsNone: 0 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/04_Models/Objects/WoodStick/WoodStick2.fbx b/Assets/04_Models/Objects/WoodStick/WoodStick2.fbx new file mode 100644 index 00000000..d483a7bd --- /dev/null +++ b/Assets/04_Models/Objects/WoodStick/WoodStick2.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1bf04043d02ec42c8a284691ddb3a49b104669b5a8055e9d513f3c981eccc006 +size 16684 diff --git a/Assets/04_Models/Objects/WoodStick/WoodStick2.fbx.meta b/Assets/04_Models/Objects/WoodStick/WoodStick2.fbx.meta new file mode 100644 index 00000000..b815c657 --- /dev/null +++ b/Assets/04_Models/Objects/WoodStick/WoodStick2.fbx.meta @@ -0,0 +1,115 @@ +fileFormatVersion: 2 +guid: f1405b67ce259954fb4cc5676c700d4b +ModelImporter: + serializedVersion: 24200 + internalIDToNameTable: [] + externalObjects: + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: Material + second: {fileID: 2100000, guid: a8bd7f57a3c4fc0429bdb1f69f6c8455, type: 2} + materials: + materialImportMode: 2 + materialName: 0 + materialSearch: 1 + materialLocation: 1 + animations: + legacyGenerateAnimations: 4 + bakeSimulation: 0 + resampleCurves: 1 + optimizeGameObjects: 0 + removeConstantScaleCurves: 0 + motionNodeName: + animationImportErrors: + animationImportWarnings: + animationRetargetingWarnings: + animationDoRetargetingWarnings: 0 + importAnimatedCustomProperties: 0 + importConstraints: 0 + animationCompression: 1 + animationRotationError: 0.5 + animationPositionError: 0.5 + animationScaleError: 0.5 + animationWrapMode: 0 + extraExposedTransformPaths: [] + extraUserProperties: [] + clipAnimations: [] + isReadable: 0 + meshes: + lODScreenPercentages: [] + globalScale: 0.05 + meshCompression: 0 + addColliders: 0 + useSRGBMaterialColor: 1 + sortHierarchyByName: 1 + importPhysicalCameras: 1 + importVisibility: 1 + importBlendShapes: 1 + importCameras: 1 + importLights: 1 + nodeNameCollisionStrategy: 1 + fileIdsGeneration: 2 + swapUVChannels: 0 + generateSecondaryUV: 0 + useFileUnits: 1 + keepQuads: 0 + weldVertices: 1 + bakeAxisConversion: 0 + preserveHierarchy: 0 + skinWeightsMode: 0 + maxBonesPerVertex: 4 + minBoneWeight: 0.001 + optimizeBones: 1 + generateMeshLods: 0 + meshLodGenerationFlags: 0 + maximumMeshLod: -1 + meshOptimizationFlags: -1 + indexFormat: 0 + secondaryUVAngleDistortion: 8 + secondaryUVAreaDistortion: 15.000001 + secondaryUVHardAngle: 88 + secondaryUVMarginMethod: 1 + secondaryUVMinLightmapResolution: 40 + secondaryUVMinObjectScale: 1 + secondaryUVPackMargin: 4 + useFileScale: 1 + strictVertexDataChecks: 0 + tangentSpace: + normalSmoothAngle: 60 + normalImportMode: 0 + tangentImportMode: 3 + normalCalculationMode: 4 + legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0 + blendShapeNormalImportMode: 1 + normalSmoothingSource: 0 + referencedClips: [] + importAnimation: 1 + humanDescription: + serializedVersion: 3 + human: [] + skeleton: [] + armTwist: 0.5 + foreArmTwist: 0.5 + upperLegTwist: 0.5 + legTwist: 0.5 + armStretch: 0.05 + legStretch: 0.05 + feetSpacing: 0 + globalScale: 0.05 + rootMotionBoneName: + hasTranslationDoF: 0 + hasExtraRoot: 0 + skeletonHasParents: 1 + lastHumanDescriptionAvatarSource: {instanceID: 0} + autoGenerateAvatarMappingIfUnspecified: 1 + animationType: 2 + humanoidOversampling: 1 + avatarSetup: 0 + addHumanoidExtraRootOnlyWhenUsingAvatar: 1 + importBlendShapeDeformPercent: 1 + remapMaterialsIfMaterialImportModeIsNone: 0 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/06_Materials/blackjack/hook/5_material004_1_0_0.002.mat b/Assets/06_Materials/blackjack/hook/5_material004_1_0_0.002.mat index beb3a078..1a227b06 100644 --- a/Assets/06_Materials/blackjack/hook/5_material004_1_0_0.002.mat +++ b/Assets/06_Materials/blackjack/hook/5_material004_1_0_0.002.mat @@ -24,9 +24,10 @@ Material: m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] + m_ValidKeywords: + - _EMISSION m_InvalidKeywords: [] - m_LightmapFlags: 4 + m_LightmapFlags: 2 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 @@ -120,7 +121,7 @@ Material: - _Parallax: 0.02 - _QueueOffset: 0 - _ReceiveShadows: 1 - - _Smoothness: 0 + - _Smoothness: 0.01 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 @@ -133,7 +134,7 @@ Material: m_Colors: - _BaseColor: {r: 0.9063317, g: 0.9063317, b: 0.9063317, a: 1} - _Color: {r: 0.9063317, g: 0.9063317, b: 0.9063317, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _EmissionColor: {r: 0.039215688, g: 0.0022249904, b: 0.0022249904, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] m_AllowLocking: 1 diff --git a/Assets/06_Materials/blackjack/hook/face.002.mat b/Assets/06_Materials/blackjack/hook/face.002.mat index f71e70ea..68341111 100644 --- a/Assets/06_Materials/blackjack/hook/face.002.mat +++ b/Assets/06_Materials/blackjack/hook/face.002.mat @@ -24,9 +24,10 @@ Material: m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] + m_ValidKeywords: + - _EMISSION m_InvalidKeywords: [] - m_LightmapFlags: 4 + m_LightmapFlags: 2 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 @@ -133,7 +134,7 @@ Material: m_Colors: - _BaseColor: {r: 0.9063317, g: 0.9063317, b: 0.9063317, a: 1} - _Color: {r: 0.9063317, g: 0.9063317, b: 0.9063317, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _EmissionColor: {r: 0.03773582, g: 0.0044230027, b: 0.0012459948, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] m_AllowLocking: 1 diff --git a/Assets/06_Materials/blackjack/hook/feather.002.mat b/Assets/06_Materials/blackjack/hook/feather.002.mat index 6e2d2f69..25a707c0 100644 --- a/Assets/06_Materials/blackjack/hook/feather.002.mat +++ b/Assets/06_Materials/blackjack/hook/feather.002.mat @@ -11,9 +11,10 @@ Material: m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] + m_ValidKeywords: + - _EMISSION m_InvalidKeywords: [] - m_LightmapFlags: 4 + m_LightmapFlags: 2 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 @@ -120,7 +121,7 @@ Material: m_Colors: - _BaseColor: {r: 0.9063317, g: 0.9063317, b: 0.9063317, a: 1} - _Color: {r: 0.9063317, g: 0.9063317, b: 0.9063317, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _EmissionColor: {r: 0.0017354944, g: 0.005499365, b: 0.028301895, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] m_AllowLocking: 1 diff --git a/Assets/06_Materials/blackjack/hook/hat.002.mat b/Assets/06_Materials/blackjack/hook/hat.002.mat index f8864f57..8186c5fe 100644 --- a/Assets/06_Materials/blackjack/hook/hat.002.mat +++ b/Assets/06_Materials/blackjack/hook/hat.002.mat @@ -24,9 +24,10 @@ Material: m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] + m_ValidKeywords: + - _EMISSION m_InvalidKeywords: [] - m_LightmapFlags: 4 + m_LightmapFlags: 2 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 @@ -133,7 +134,7 @@ Material: m_Colors: - _BaseColor: {r: 0.9063317, g: 0.9063317, b: 0.9063317, a: 1} - _Color: {r: 0.9063317, g: 0.9063317, b: 0.9063317, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _EmissionColor: {r: 0.039215688, g: 0.0033374857, b: 0.0033374857, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] m_AllowLocking: 1 diff --git a/Assets/06_Materials/blackjack/hook/sleeves and pants.002.mat b/Assets/06_Materials/blackjack/hook/sleeves and pants.002.mat index 819a8b01..e0fe2784 100644 --- a/Assets/06_Materials/blackjack/hook/sleeves and pants.002.mat +++ b/Assets/06_Materials/blackjack/hook/sleeves and pants.002.mat @@ -11,9 +11,10 @@ Material: m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] + m_ValidKeywords: + - _EMISSION m_InvalidKeywords: [] - m_LightmapFlags: 4 + m_LightmapFlags: 2 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 @@ -120,7 +121,7 @@ Material: m_Colors: - _BaseColor: {r: 0.9063317, g: 0.9063317, b: 0.9063317, a: 1} - _Color: {r: 0.9063317, g: 0.9063317, b: 0.9063317, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _EmissionColor: {r: 0.039215688, g: 0.003921569, b: 0.003921569, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] m_AllowLocking: 1 diff --git a/Assets/06_Materials/blackjack/hook/sword.002.mat b/Assets/06_Materials/blackjack/hook/sword.002.mat index 0aeecd90..fb86a50e 100644 --- a/Assets/06_Materials/blackjack/hook/sword.002.mat +++ b/Assets/06_Materials/blackjack/hook/sword.002.mat @@ -24,9 +24,10 @@ Material: m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] + m_ValidKeywords: + - _EMISSION m_InvalidKeywords: [] - m_LightmapFlags: 4 + m_LightmapFlags: 2 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 @@ -133,7 +134,7 @@ Material: m_Colors: - _BaseColor: {r: 0.9063317, g: 0.9063317, b: 0.9063317, a: 1} - _Color: {r: 0.9063317, g: 0.9063317, b: 0.9063317, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _EmissionColor: {r: 0.16037738, g: 0.06203276, b: 0.043120332, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] m_AllowLocking: 1