diff --git a/Assets/01_Scenes/WhaleAdventure_VR/Normal/WhaleAttackScene.unity b/Assets/01_Scenes/WhaleAdventure_VR/Normal/WhaleAttackScene.unity index 3e9af72..face6ed 100644 --- a/Assets/01_Scenes/WhaleAdventure_VR/Normal/WhaleAttackScene.unity +++ b/Assets/01_Scenes/WhaleAdventure_VR/Normal/WhaleAttackScene.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:634d579546738aa2ce3edc55fb434a156e493132548d7290ad84eece61b8da3d -size 80352 +oid sha256:737587783636571775434eec1b9a9363acee72b5f206293e1ddcb66072b7c3e9 +size 80728 diff --git a/Assets/09_UI/talk/menu_panel_REAL_transparent_cropped.png b/Assets/09_UI/talk/menu_panel_REAL_transparent_cropped.png new file mode 100644 index 0000000..8f1bd3a --- /dev/null +++ b/Assets/09_UI/talk/menu_panel_REAL_transparent_cropped.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:57a6ab4b1f7bb370c7efda9b0a8aefa96003938856bbb19d40b1d15cb8090e57 +size 2011118 diff --git a/Assets/09_UI/talk/pinocchio_title_banner_REAL_transparent_cropped.png b/Assets/09_UI/talk/pinocchio_title_banner_REAL_transparent_cropped.png new file mode 100644 index 0000000..91c98af --- /dev/null +++ b/Assets/09_UI/talk/pinocchio_title_banner_REAL_transparent_cropped.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a20230fbfa2f34f1d087377ffd494588323ceb0b86a1845f2f4a8bb06d88c6cd +size 2128944 diff --git a/Assets/09_UI/talk/wood_button_plain_REAL_transparent.png b/Assets/09_UI/talk/wood_button_plain_REAL_transparent.png new file mode 100644 index 0000000..89358ba --- /dev/null +++ b/Assets/09_UI/talk/wood_button_plain_REAL_transparent.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dc398b072a2a8eeab384ea53b9650dc488799ba64845406ffcbec5685e1323b8 +size 1447030 diff --git a/Assets/My project/Fishing Scripts/model/New Material.mat.meta b/Assets/My project/Fishing Scripts/model/New Material.mat.meta index ccf7e6b..7407b2a 100644 --- a/Assets/My project/Fishing Scripts/model/New Material.mat.meta +++ b/Assets/My project/Fishing Scripts/model/New Material.mat.meta @@ -1,8 +1,15 @@ fileFormatVersion: 2 +<<<<<<<< HEAD:Assets/My project/Fishing Scripts/model/New Material.mat.meta guid: 803c199824d061648a60dcefbaab9c14 NativeFormatImporter: externalObjects: {} mainObjectFileID: 2100000 +======== +guid: 9c0e704ea9510154c87905364d1e2058 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 +>>>>>>>> b688a14be4642113a27a5e81d7c3f9922d9c34f4:Assets/XR/Settings/OpenXR Package Settings.asset.meta userData: assetBundleName: assetBundleVariant: diff --git a/Assets/XR/Settings/OpenXR Package Settings.asset b/Assets/XR/Settings/OpenXR Package Settings.asset new file mode 100644 index 0000000..7db06b1 --- /dev/null +++ b/Assets/XR/Settings/OpenXR Package Settings.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4859dc7f625a8b8ee4419129f119da15e224fe90d79332fc8a86e90c43dfd29c +size 42383 diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index 366c4c4..7ee9ebc 100644 --- a/ProjectSettings/EditorBuildSettings.asset +++ b/ProjectSettings/EditorBuildSettings.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7957bc4ebd8426a0b73ec962c33b2f8026fadedf014e5d424a18e27b8dde196c +oid sha256:b595fa1d898c1d4664042b99f968f8ea428237e30412c0e1b535b9845ad09554 size 2072