From cf92c91e9cf7b23340ca2e9c80886e899fa9cd4f Mon Sep 17 00:00:00 2001 From: dbrizov Date: Sat, 25 Sep 2021 13:29:54 +0300 Subject: [PATCH] Integrated the new input system --- .gitignore | 1 + .../{ScriptableObjects.meta => Defs.meta} | 0 Assets/NaughtyCharacter/Defs/Input.meta | 8 + .../Defs/Input/InputActions.inputactions | 759 +++++ .../Defs/Input/InputActions.inputactions.meta | 14 + .../Input/InputSystem.inputsettings.asset | 26 + .../InputSystem.inputsettings.asset.meta | 8 + .../PlayerController.asset | 2 +- .../PlayerController.asset.meta | 0 .../Prefabs/PlayerInput.prefab | 121 +- .../Scripts/Helpers/TestHelper.cs | 31 - .../Scripts/NaughtyCharacter.asmdef | 3 - .../NaughtyCharacter/Scripts/PlayerInput.cs | 45 - Assets/NaughtyCharacter/_Scenes/Demo.unity | 2499 +++++++++-------- .../_Scenes/DemoSettings.lighting | 63 + .../_Scenes/DemoSettings.lighting.meta | 8 + .../{Scripts.meta => _Scripts.meta} | 0 .../{Scripts => _Scripts}/Animation.meta | 0 .../Animation/InterpolationCurve.cs | 0 .../Animation/InterpolationCurve.cs.meta | 0 .../{Scripts => _Scripts}/Character.cs | 0 .../{Scripts => _Scripts}/Character.cs.meta | 0 .../CharacterAnimator.cs | 0 .../CharacterAnimator.cs.meta | 0 .../{Scripts => _Scripts}/Controller.cs | 0 .../{Scripts => _Scripts}/Controller.cs.meta | 0 .../{Scripts => _Scripts}/Helpers.meta | 0 .../Helpers/FpsCounter.cs | 0 .../Helpers/FpsCounter.cs.meta | 0 .../_Scripts/Helpers/TestHelper.cs | 38 + .../Helpers/TestHelper.cs.meta | 0 .../_Scripts/NaughtyCharacter.asmdef | 16 + .../NaughtyCharacter.asmdef.meta | 0 .../{Scripts => _Scripts}/PlayerCamera.cs | 0 .../PlayerCamera.cs.meta | 0 .../{Scripts => _Scripts}/PlayerController.cs | 8 +- .../PlayerController.cs.meta | 0 .../_Scripts/PlayerInputComponent.cs | 45 + .../PlayerInputComponent.cs.meta} | 0 .../{Scripts => _Scripts}/SpringArm.cs | 0 .../{Scripts => _Scripts}/SpringArm.cs.meta | 0 .../{Scripts => _Scripts}/Utility.meta | 0 .../{Scripts => _Scripts}/Utility/Util.cs | 0 .../Utility/Util.cs.meta | 0 Packages/manifest.json | 1 + Packages/packages-lock.json | 7 + ProjectSettings/EditorBuildSettings.asset | 4 +- .../com.unity.probuilder/Settings.json | 65 + ProjectSettings/ProjectSettings.asset | 182 +- 49 files changed, 2704 insertions(+), 1250 deletions(-) rename Assets/NaughtyCharacter/{ScriptableObjects.meta => Defs.meta} (100%) create mode 100644 Assets/NaughtyCharacter/Defs/Input.meta create mode 100644 Assets/NaughtyCharacter/Defs/Input/InputActions.inputactions create mode 100644 Assets/NaughtyCharacter/Defs/Input/InputActions.inputactions.meta create mode 100644 Assets/NaughtyCharacter/Defs/Input/InputSystem.inputsettings.asset create mode 100644 Assets/NaughtyCharacter/Defs/Input/InputSystem.inputsettings.asset.meta rename Assets/NaughtyCharacter/{ScriptableObjects => Defs}/PlayerController.asset (92%) rename Assets/NaughtyCharacter/{ScriptableObjects => Defs}/PlayerController.asset.meta (100%) delete mode 100644 Assets/NaughtyCharacter/Scripts/Helpers/TestHelper.cs delete mode 100644 Assets/NaughtyCharacter/Scripts/NaughtyCharacter.asmdef delete mode 100644 Assets/NaughtyCharacter/Scripts/PlayerInput.cs create mode 100644 Assets/NaughtyCharacter/_Scenes/DemoSettings.lighting create mode 100644 Assets/NaughtyCharacter/_Scenes/DemoSettings.lighting.meta rename Assets/NaughtyCharacter/{Scripts.meta => _Scripts.meta} (100%) rename Assets/NaughtyCharacter/{Scripts => _Scripts}/Animation.meta (100%) rename Assets/NaughtyCharacter/{Scripts => _Scripts}/Animation/InterpolationCurve.cs (100%) rename Assets/NaughtyCharacter/{Scripts => _Scripts}/Animation/InterpolationCurve.cs.meta (100%) rename Assets/NaughtyCharacter/{Scripts => _Scripts}/Character.cs (100%) rename Assets/NaughtyCharacter/{Scripts => _Scripts}/Character.cs.meta (100%) rename Assets/NaughtyCharacter/{Scripts => _Scripts}/CharacterAnimator.cs (100%) rename Assets/NaughtyCharacter/{Scripts => _Scripts}/CharacterAnimator.cs.meta (100%) rename Assets/NaughtyCharacter/{Scripts => _Scripts}/Controller.cs (100%) rename Assets/NaughtyCharacter/{Scripts => _Scripts}/Controller.cs.meta (100%) rename Assets/NaughtyCharacter/{Scripts => _Scripts}/Helpers.meta (100%) rename Assets/NaughtyCharacter/{Scripts => _Scripts}/Helpers/FpsCounter.cs (100%) rename Assets/NaughtyCharacter/{Scripts => _Scripts}/Helpers/FpsCounter.cs.meta (100%) create mode 100644 Assets/NaughtyCharacter/_Scripts/Helpers/TestHelper.cs rename Assets/NaughtyCharacter/{Scripts => _Scripts}/Helpers/TestHelper.cs.meta (100%) create mode 100644 Assets/NaughtyCharacter/_Scripts/NaughtyCharacter.asmdef rename Assets/NaughtyCharacter/{Scripts => _Scripts}/NaughtyCharacter.asmdef.meta (100%) rename Assets/NaughtyCharacter/{Scripts => _Scripts}/PlayerCamera.cs (100%) rename Assets/NaughtyCharacter/{Scripts => _Scripts}/PlayerCamera.cs.meta (100%) rename Assets/NaughtyCharacter/{Scripts => _Scripts}/PlayerController.cs (88%) rename Assets/NaughtyCharacter/{Scripts => _Scripts}/PlayerController.cs.meta (100%) create mode 100644 Assets/NaughtyCharacter/_Scripts/PlayerInputComponent.cs rename Assets/NaughtyCharacter/{Scripts/PlayerInput.cs.meta => _Scripts/PlayerInputComponent.cs.meta} (100%) rename Assets/NaughtyCharacter/{Scripts => _Scripts}/SpringArm.cs (100%) rename Assets/NaughtyCharacter/{Scripts => _Scripts}/SpringArm.cs.meta (100%) rename Assets/NaughtyCharacter/{Scripts => _Scripts}/Utility.meta (100%) rename Assets/NaughtyCharacter/{Scripts => _Scripts}/Utility/Util.cs (100%) rename Assets/NaughtyCharacter/{Scripts => _Scripts}/Utility/Util.cs.meta (100%) diff --git a/.gitignore b/.gitignore index 03b1fe2..03da2f0 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,7 @@ Temp/ Library/ Logs/ +UserSettings/ ==================== ExportedObj/ diff --git a/Assets/NaughtyCharacter/ScriptableObjects.meta b/Assets/NaughtyCharacter/Defs.meta similarity index 100% rename from Assets/NaughtyCharacter/ScriptableObjects.meta rename to Assets/NaughtyCharacter/Defs.meta diff --git a/Assets/NaughtyCharacter/Defs/Input.meta b/Assets/NaughtyCharacter/Defs/Input.meta new file mode 100644 index 0000000..38aaf66 --- /dev/null +++ b/Assets/NaughtyCharacter/Defs/Input.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 8394ca43c1a00f049b3252a87206e80b +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/NaughtyCharacter/Defs/Input/InputActions.inputactions b/Assets/NaughtyCharacter/Defs/Input/InputActions.inputactions new file mode 100644 index 0000000..89eba9f --- /dev/null +++ b/Assets/NaughtyCharacter/Defs/Input/InputActions.inputactions @@ -0,0 +1,759 @@ +{ + "name": "InputActions", + "maps": [ + { + "name": "Player", + "id": "26187126-2039-4c01-8ddf-4500116efb4f", + "actions": [ + { + "name": "Move", + "type": "Value", + "id": "3e0030f3-beab-4f5b-a947-75045fb058a6", + "expectedControlType": "Vector2", + "processors": "", + "interactions": "" + }, + { + "name": "Look", + "type": "Value", + "id": "ffb35f92-3bb0-485c-90b0-b6390c1a0549", + "expectedControlType": "Vector2", + "processors": "", + "interactions": "" + }, + { + "name": "Jump", + "type": "Button", + "id": "2257c83a-cc1e-4498-afff-28c868cea070", + "expectedControlType": "Button", + "processors": "", + "interactions": "" + } + ], + "bindings": [ + { + "name": "", + "id": "978bfe49-cc26-4a3d-ab7b-7d7a29327403", + "path": "/leftStick", + "interactions": "", + "processors": "StickDeadzone", + "groups": ";Gamepad", + "action": "Move", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "WASD", + "id": "00ca640b-d935-4593-8157-c05846ea39b3", + "path": "Dpad", + "interactions": "", + "processors": "", + "groups": "", + "action": "Move", + "isComposite": true, + "isPartOfComposite": false + }, + { + "name": "up", + "id": "e2062cb9-1b15-46a2-838c-2f8d72a0bdd9", + "path": "/w", + "interactions": "", + "processors": "", + "groups": ";Keyboard&Mouse", + "action": "Move", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "up", + "id": "8180e8bd-4097-4f4e-ab88-4523101a6ce9", + "path": "/upArrow", + "interactions": "", + "processors": "", + "groups": ";Keyboard&Mouse", + "action": "Move", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "down", + "id": "320bffee-a40b-4347-ac70-c210eb8bc73a", + "path": "/s", + "interactions": "", + "processors": "", + "groups": ";Keyboard&Mouse", + "action": "Move", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "down", + "id": "1c5327b5-f71c-4f60-99c7-4e737386f1d1", + "path": "/downArrow", + "interactions": "", + "processors": "", + "groups": ";Keyboard&Mouse", + "action": "Move", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "left", + "id": "d2581a9b-1d11-4566-b27d-b92aff5fabbc", + "path": "/a", + "interactions": "", + "processors": "", + "groups": ";Keyboard&Mouse", + "action": "Move", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "left", + "id": "2e46982e-44cc-431b-9f0b-c11910bf467a", + "path": "/leftArrow", + "interactions": "", + "processors": "", + "groups": ";Keyboard&Mouse", + "action": "Move", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "right", + "id": "fcfe95b8-67b9-4526-84b5-5d0bc98d6400", + "path": "/d", + "interactions": "", + "processors": "", + "groups": ";Keyboard&Mouse", + "action": "Move", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "right", + "id": "77bff152-3580-4b21-b6de-dcd0c7e41164", + "path": "/rightArrow", + "interactions": "", + "processors": "", + "groups": ";Keyboard&Mouse", + "action": "Move", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "", + "id": "c1f7a91b-d0fd-4a62-997e-7fb9b69bf235", + "path": "/rightStick", + "interactions": "", + "processors": "StickDeadzone", + "groups": ";Gamepad", + "action": "Look", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "8c8e490b-c610-4785-884f-f04217b23ca4", + "path": "/delta", + "interactions": "", + "processors": "ScaleVector2(x=0.1,y=0.1)", + "groups": ";Keyboard&Mouse;Touch", + "action": "Look", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "aae9a9a3-61c3-46a0-88a3-1b1702362f2a", + "path": "/space", + "interactions": "", + "processors": "", + "groups": "Keyboard&Mouse", + "action": "Jump", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "ce77e840-d369-4281-bd2e-83c1e0d1033c", + "path": "/buttonSouth", + "interactions": "", + "processors": "", + "groups": "Gamepad", + "action": "Jump", + "isComposite": false, + "isPartOfComposite": false + } + ] + }, + { + "name": "UI", + "id": "4a206378-2412-4db8-b6ee-60eac7d67939", + "actions": [ + { + "name": "Navigate", + "type": "Value", + "id": "55f37729-b3e9-459b-98a0-bee304dcd525", + "expectedControlType": "Vector2", + "processors": "", + "interactions": "" + }, + { + "name": "Submit", + "type": "Button", + "id": "30b9f11e-1961-4084-9eac-8618a09baef7", + "expectedControlType": "Button", + "processors": "", + "interactions": "" + }, + { + "name": "Cancel", + "type": "Button", + "id": "cc55d89e-9281-4ca1-b802-e58fbeb4ae64", + "expectedControlType": "Button", + "processors": "", + "interactions": "" + }, + { + "name": "Point", + "type": "PassThrough", + "id": "cfdd3f0a-82b1-4541-a9e0-7c2c23277036", + "expectedControlType": "Vector2", + "processors": "", + "interactions": "" + }, + { + "name": "Click", + "type": "PassThrough", + "id": "2e56e3e5-8e87-4ef2-9a0e-5565fe3d8f25", + "expectedControlType": "Button", + "processors": "", + "interactions": "" + }, + { + "name": "ScrollWheel", + "type": "PassThrough", + "id": "5d035657-3ef7-4944-a7e7-43eb5abc6070", + "expectedControlType": "Vector2", + "processors": "", + "interactions": "" + }, + { + "name": "MiddleClick", + "type": "PassThrough", + "id": "68dc8f22-0892-44a3-a4f0-d5ae6c4081ce", + "expectedControlType": "", + "processors": "", + "interactions": "" + }, + { + "name": "RightClick", + "type": "PassThrough", + "id": "55b87d5c-825a-4641-9691-4597ff8a0d22", + "expectedControlType": "", + "processors": "", + "interactions": "" + }, + { + "name": "TrackedDevicePosition", + "type": "PassThrough", + "id": "f3c6a480-e7ab-4407-81d6-d0d8e14907b9", + "expectedControlType": "Vector3", + "processors": "", + "interactions": "" + }, + { + "name": "TrackedDeviceOrientation", + "type": "PassThrough", + "id": "52b08f2c-7572-40a9-9903-07e3139c448f", + "expectedControlType": "Quaternion", + "processors": "", + "interactions": "" + } + ], + "bindings": [ + { + "name": "Gamepad", + "id": "809f371f-c5e2-4e7a-83a1-d867598f40dd", + "path": "2DVector", + "interactions": "", + "processors": "", + "groups": "", + "action": "Navigate", + "isComposite": true, + "isPartOfComposite": false + }, + { + "name": "up", + "id": "14a5d6e8-4aaf-4119-a9ef-34b8c2c548bf", + "path": "/leftStick/up", + "interactions": "", + "processors": "", + "groups": ";Gamepad", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "up", + "id": "9144cbe6-05e1-4687-a6d7-24f99d23dd81", + "path": "/rightStick/up", + "interactions": "", + "processors": "", + "groups": ";Gamepad", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "down", + "id": "2db08d65-c5fb-421b-983f-c71163608d67", + "path": "/leftStick/down", + "interactions": "", + "processors": "", + "groups": ";Gamepad", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "down", + "id": "58748904-2ea9-4a80-8579-b500e6a76df8", + "path": "/rightStick/down", + "interactions": "", + "processors": "", + "groups": ";Gamepad", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "left", + "id": "8ba04515-75aa-45de-966d-393d9bbd1c14", + "path": "/leftStick/left", + "interactions": "", + "processors": "", + "groups": ";Gamepad", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "left", + "id": "712e721c-bdfb-4b23-a86c-a0d9fcfea921", + "path": "/rightStick/left", + "interactions": "", + "processors": "", + "groups": ";Gamepad", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "right", + "id": "fcd248ae-a788-4676-a12e-f4d81205600b", + "path": "/leftStick/right", + "interactions": "", + "processors": "", + "groups": ";Gamepad", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "right", + "id": "1f04d9bc-c50b-41a1-bfcc-afb75475ec20", + "path": "/rightStick/right", + "interactions": "", + "processors": "", + "groups": ";Gamepad", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "", + "id": "fb8277d4-c5cd-4663-9dc7-ee3f0b506d90", + "path": "/dpad", + "interactions": "", + "processors": "", + "groups": ";Gamepad", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "Joystick", + "id": "e25d9774-381c-4a61-b47c-7b6b299ad9f9", + "path": "2DVector", + "interactions": "", + "processors": "", + "groups": "", + "action": "Navigate", + "isComposite": true, + "isPartOfComposite": false + }, + { + "name": "up", + "id": "3db53b26-6601-41be-9887-63ac74e79d19", + "path": "/stick/up", + "interactions": "", + "processors": "", + "groups": "Joystick", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "down", + "id": "0cb3e13e-3d90-4178-8ae6-d9c5501d653f", + "path": "/stick/down", + "interactions": "", + "processors": "", + "groups": "Joystick", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "left", + "id": "0392d399-f6dd-4c82-8062-c1e9c0d34835", + "path": "/stick/left", + "interactions": "", + "processors": "", + "groups": "Joystick", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "right", + "id": "942a66d9-d42f-43d6-8d70-ecb4ba5363bc", + "path": "/stick/right", + "interactions": "", + "processors": "", + "groups": "Joystick", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "Keyboard", + "id": "ff527021-f211-4c02-933e-5976594c46ed", + "path": "2DVector", + "interactions": "", + "processors": "", + "groups": "", + "action": "Navigate", + "isComposite": true, + "isPartOfComposite": false + }, + { + "name": "up", + "id": "563fbfdd-0f09-408d-aa75-8642c4f08ef0", + "path": "/w", + "interactions": "", + "processors": "", + "groups": "Keyboard&Mouse", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "up", + "id": "eb480147-c587-4a33-85ed-eb0ab9942c43", + "path": "/upArrow", + "interactions": "", + "processors": "", + "groups": "Keyboard&Mouse", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "down", + "id": "2bf42165-60bc-42ca-8072-8c13ab40239b", + "path": "/s", + "interactions": "", + "processors": "", + "groups": "Keyboard&Mouse", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "down", + "id": "85d264ad-e0a0-4565-b7ff-1a37edde51ac", + "path": "/downArrow", + "interactions": "", + "processors": "", + "groups": "Keyboard&Mouse", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "left", + "id": "74214943-c580-44e4-98eb-ad7eebe17902", + "path": "/a", + "interactions": "", + "processors": "", + "groups": "Keyboard&Mouse", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "left", + "id": "cea9b045-a000-445b-95b8-0c171af70a3b", + "path": "/leftArrow", + "interactions": "", + "processors": "", + "groups": "Keyboard&Mouse", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "right", + "id": "8607c725-d935-4808-84b1-8354e29bab63", + "path": "/d", + "interactions": "", + "processors": "", + "groups": "Keyboard&Mouse", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "right", + "id": "4cda81dc-9edd-4e03-9d7c-a71a14345d0b", + "path": "/rightArrow", + "interactions": "", + "processors": "", + "groups": "Keyboard&Mouse", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "", + "id": "9e92bb26-7e3b-4ec4-b06b-3c8f8e498ddc", + "path": "*/{Submit}", + "interactions": "", + "processors": "", + "groups": "", + "action": "Submit", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "82627dcc-3b13-4ba9-841d-e4b746d6553e", + "path": "*/{Cancel}", + "interactions": "", + "processors": "", + "groups": "", + "action": "Cancel", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "c52c8e0b-8179-41d3-b8a1-d149033bbe86", + "path": "/position", + "interactions": "", + "processors": "", + "groups": "Keyboard&Mouse", + "action": "Point", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "e1394cbc-336e-44ce-9ea8-6007ed6193f7", + "path": "/position", + "interactions": "", + "processors": "", + "groups": "Keyboard&Mouse", + "action": "Point", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "5693e57a-238a-46ed-b5ae-e64e6e574302", + "path": "/touch*/position", + "interactions": "", + "processors": "", + "groups": "Touch", + "action": "Point", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "4faf7dc9-b979-4210-aa8c-e808e1ef89f5", + "path": "/leftButton", + "interactions": "", + "processors": "", + "groups": ";Keyboard&Mouse", + "action": "Click", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "8d66d5ba-88d7-48e6-b1cd-198bbfef7ace", + "path": "/tip", + "interactions": "", + "processors": "", + "groups": ";Keyboard&Mouse", + "action": "Click", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "47c2a644-3ebc-4dae-a106-589b7ca75b59", + "path": "/touch*/press", + "interactions": "", + "processors": "", + "groups": "Touch", + "action": "Click", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "bb9e6b34-44bf-4381-ac63-5aa15d19f677", + "path": "/trigger", + "interactions": "", + "processors": "", + "groups": "XR", + "action": "Click", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "38c99815-14ea-4617-8627-164d27641299", + "path": "/scroll", + "interactions": "", + "processors": "", + "groups": ";Keyboard&Mouse", + "action": "ScrollWheel", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "24066f69-da47-44f3-a07e-0015fb02eb2e", + "path": "/middleButton", + "interactions": "", + "processors": "", + "groups": ";Keyboard&Mouse", + "action": "MiddleClick", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "4c191405-5738-4d4b-a523-c6a301dbf754", + "path": "/rightButton", + "interactions": "", + "processors": "", + "groups": ";Keyboard&Mouse", + "action": "RightClick", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "7236c0d9-6ca3-47cf-a6ee-a97f5b59ea77", + "path": "/devicePosition", + "interactions": "", + "processors": "", + "groups": "XR", + "action": "TrackedDevicePosition", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "23e01e3a-f935-4948-8d8b-9bcac77714fb", + "path": "/deviceRotation", + "interactions": "", + "processors": "", + "groups": "XR", + "action": "TrackedDeviceOrientation", + "isComposite": false, + "isPartOfComposite": false + } + ] + } + ], + "controlSchemes": [ + { + "name": "Keyboard&Mouse", + "bindingGroup": "Keyboard&Mouse", + "devices": [ + { + "devicePath": "", + "isOptional": false, + "isOR": false + }, + { + "devicePath": "", + "isOptional": false, + "isOR": false + } + ] + }, + { + "name": "Gamepad", + "bindingGroup": "Gamepad", + "devices": [ + { + "devicePath": "", + "isOptional": false, + "isOR": false + } + ] + }, + { + "name": "Touch", + "bindingGroup": "Touch", + "devices": [ + { + "devicePath": "", + "isOptional": false, + "isOR": false + } + ] + }, + { + "name": "Joystick", + "bindingGroup": "Joystick", + "devices": [ + { + "devicePath": "", + "isOptional": false, + "isOR": false + } + ] + }, + { + "name": "XR", + "bindingGroup": "XR", + "devices": [ + { + "devicePath": "", + "isOptional": false, + "isOR": false + } + ] + } + ] +} \ No newline at end of file diff --git a/Assets/NaughtyCharacter/Defs/Input/InputActions.inputactions.meta b/Assets/NaughtyCharacter/Defs/Input/InputActions.inputactions.meta new file mode 100644 index 0000000..d52e014 --- /dev/null +++ b/Assets/NaughtyCharacter/Defs/Input/InputActions.inputactions.meta @@ -0,0 +1,14 @@ +fileFormatVersion: 2 +guid: 009d6e929d0bf004a89ec38818ea170d +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 8404be70184654265930450def6a9037, type: 3} + generateWrapperCode: 0 + wrapperCodePath: + wrapperClassName: + wrapperCodeNamespace: diff --git a/Assets/NaughtyCharacter/Defs/Input/InputSystem.inputsettings.asset b/Assets/NaughtyCharacter/Defs/Input/InputSystem.inputsettings.asset new file mode 100644 index 0000000..07dfcab --- /dev/null +++ b/Assets/NaughtyCharacter/Defs/Input/InputSystem.inputsettings.asset @@ -0,0 +1,26 @@ +%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: c46f07b5ed07e4e92aa78254188d3d10, type: 3} + m_Name: InputSystem.inputsettings + m_EditorClassIdentifier: + m_SupportedDevices: [] + m_UpdateMode: 1 + m_CompensateForScreenOrientation: 1 + m_FilterNoiseOnCurrent: 0 + m_DefaultDeadzoneMin: 0.2 + m_DefaultDeadzoneMax: 0.9 + m_DefaultButtonPressPoint: 0.5 + m_DefaultTapTime: 0.2 + m_DefaultSlowTapTime: 0.5 + m_DefaultHoldTime: 0.4 + m_TapRadius: 5 + m_MultiTapDelayTime: 0.75 diff --git a/Assets/NaughtyCharacter/Defs/Input/InputSystem.inputsettings.asset.meta b/Assets/NaughtyCharacter/Defs/Input/InputSystem.inputsettings.asset.meta new file mode 100644 index 0000000..13f9531 --- /dev/null +++ b/Assets/NaughtyCharacter/Defs/Input/InputSystem.inputsettings.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d9a128682ad64554d9896e64484326e5 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/NaughtyCharacter/ScriptableObjects/PlayerController.asset b/Assets/NaughtyCharacter/Defs/PlayerController.asset similarity index 92% rename from Assets/NaughtyCharacter/ScriptableObjects/PlayerController.asset rename to Assets/NaughtyCharacter/Defs/PlayerController.asset index 5977a53..b4984e2 100644 --- a/Assets/NaughtyCharacter/ScriptableObjects/PlayerController.asset +++ b/Assets/NaughtyCharacter/Defs/PlayerController.asset @@ -12,4 +12,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: b1f8bc0f18ee8ab4791101b7157f61a7, type: 3} m_Name: PlayerController m_EditorClassIdentifier: - ControlRotationSensitivity: 3 + ControlRotationSensitivity: 2 diff --git a/Assets/NaughtyCharacter/ScriptableObjects/PlayerController.asset.meta b/Assets/NaughtyCharacter/Defs/PlayerController.asset.meta similarity index 100% rename from Assets/NaughtyCharacter/ScriptableObjects/PlayerController.asset.meta rename to Assets/NaughtyCharacter/Defs/PlayerController.asset.meta diff --git a/Assets/NaughtyCharacter/Prefabs/PlayerInput.prefab b/Assets/NaughtyCharacter/Prefabs/PlayerInput.prefab index 4bbf97c..64f69fe 100644 --- a/Assets/NaughtyCharacter/Prefabs/PlayerInput.prefab +++ b/Assets/NaughtyCharacter/Prefabs/PlayerInput.prefab @@ -10,6 +10,7 @@ GameObject: m_Component: - component: {fileID: 4761087743418853988} - component: {fileID: 4761087743418853989} + - component: {fileID: 4761087742372319393} m_Layer: 0 m_Name: PlayerInput m_TagString: Untagged @@ -43,4 +44,122 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: e170c5d4fe2d01c488cf24c716e467a4, type: 3} m_Name: m_EditorClassIdentifier: - MoveAxisDeadZone: 0.2 +--- !u!114 &4761087742372319393 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4761087743418853990} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 62899f850307741f2a39c98a8b639597, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Actions: {fileID: -944628639613478452, guid: 009d6e929d0bf004a89ec38818ea170d, + type: 3} + m_NotificationBehavior: 2 + m_UIInputModule: {fileID: 0} + m_DeviceLostEvent: + m_PersistentCalls: + m_Calls: [] + m_DeviceRegainedEvent: + m_PersistentCalls: + m_Calls: [] + m_ControlsChangedEvent: + m_PersistentCalls: + m_Calls: [] + m_ActionEvents: + - m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 4761087743418853989} + m_TargetAssemblyTypeName: NaughtyCharacter.PlayerInputComponent, NaughtyCharacter + m_MethodName: OnMoveEvent + m_Mode: 0 + 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 + m_ActionId: 3e0030f3-beab-4f5b-a947-75045fb058a6 + m_ActionName: Player/Move[/Keyboard/w,/Keyboard/upArrow,/Keyboard/s,/Keyboard/downArrow,/Keyboard/a,/Keyboard/leftArrow,/Keyboard/d,/Keyboard/rightArrow] + - m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 4761087743418853989} + m_TargetAssemblyTypeName: NaughtyCharacter.PlayerInputComponent, NaughtyCharacter + m_MethodName: OnLookEvent + m_Mode: 0 + 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 + m_ActionId: ffb35f92-3bb0-485c-90b0-b6390c1a0549 + m_ActionName: Player/Look[/Mouse/delta] + - m_PersistentCalls: + m_Calls: [] + m_ActionId: 55f37729-b3e9-459b-98a0-bee304dcd525 + m_ActionName: UI/Navigate[/Keyboard/w,/Keyboard/upArrow,/Keyboard/s,/Keyboard/downArrow,/Keyboard/a,/Keyboard/leftArrow,/Keyboard/d,/Keyboard/rightArrow] + - m_PersistentCalls: + m_Calls: [] + m_ActionId: 30b9f11e-1961-4084-9eac-8618a09baef7 + m_ActionName: UI/Submit[/Keyboard/enter] + - m_PersistentCalls: + m_Calls: [] + m_ActionId: cc55d89e-9281-4ca1-b802-e58fbeb4ae64 + m_ActionName: UI/Cancel[/Keyboard/escape] + - m_PersistentCalls: + m_Calls: [] + m_ActionId: cfdd3f0a-82b1-4541-a9e0-7c2c23277036 + m_ActionName: UI/Point[/Mouse/position] + - m_PersistentCalls: + m_Calls: [] + m_ActionId: 2e56e3e5-8e87-4ef2-9a0e-5565fe3d8f25 + m_ActionName: UI/Click[/Mouse/leftButton] + - m_PersistentCalls: + m_Calls: [] + m_ActionId: 5d035657-3ef7-4944-a7e7-43eb5abc6070 + m_ActionName: UI/ScrollWheel[/Mouse/scroll] + - m_PersistentCalls: + m_Calls: [] + m_ActionId: 68dc8f22-0892-44a3-a4f0-d5ae6c4081ce + m_ActionName: UI/MiddleClick[/Mouse/middleButton] + - m_PersistentCalls: + m_Calls: [] + m_ActionId: 55b87d5c-825a-4641-9691-4597ff8a0d22 + m_ActionName: UI/RightClick[/Mouse/rightButton] + - m_PersistentCalls: + m_Calls: [] + m_ActionId: f3c6a480-e7ab-4407-81d6-d0d8e14907b9 + m_ActionName: UI/TrackedDevicePosition + - m_PersistentCalls: + m_Calls: [] + m_ActionId: 52b08f2c-7572-40a9-9903-07e3139c448f + m_ActionName: UI/TrackedDeviceOrientation + - m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 4761087743418853989} + m_TargetAssemblyTypeName: NaughtyCharacter.PlayerInputComponent, NaughtyCharacter + m_MethodName: OnJumpEvent + m_Mode: 0 + 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 + m_ActionId: 2257c83a-cc1e-4498-afff-28c868cea070 + m_ActionName: Player/Jump[/Keyboard/space,/XInputControllerWindows/buttonSouth] + m_NeverAutoSwitchControlSchemes: 0 + m_DefaultControlScheme: + m_DefaultActionMap: Player + m_SplitScreenIndex: -1 + m_Camera: {fileID: 0} diff --git a/Assets/NaughtyCharacter/Scripts/Helpers/TestHelper.cs b/Assets/NaughtyCharacter/Scripts/Helpers/TestHelper.cs deleted file mode 100644 index 78514c6..0000000 --- a/Assets/NaughtyCharacter/Scripts/Helpers/TestHelper.cs +++ /dev/null @@ -1,31 +0,0 @@ -using UnityEngine; - -namespace NaughtyCharacter -{ - public class TestHelper : MonoBehaviour - { - [SerializeField] - private int _targetFrameRate = 60; - - [SerializeField] - private float _slowMotion = 0.1f; - - protected virtual void Awake() - { - Application.targetFrameRate = _targetFrameRate; - } - - protected virtual void Update() - { - if (Input.GetButtonDown("Slow Motion")) - { - this.ToggleSlowMotion(); - } - } - - private void ToggleSlowMotion() - { - Time.timeScale = Time.timeScale == 1f ? _slowMotion : 1f; - } - } -} diff --git a/Assets/NaughtyCharacter/Scripts/NaughtyCharacter.asmdef b/Assets/NaughtyCharacter/Scripts/NaughtyCharacter.asmdef deleted file mode 100644 index cc67a87..0000000 --- a/Assets/NaughtyCharacter/Scripts/NaughtyCharacter.asmdef +++ /dev/null @@ -1,3 +0,0 @@ -{ - "name": "NaughtyCharacter" -} diff --git a/Assets/NaughtyCharacter/Scripts/PlayerInput.cs b/Assets/NaughtyCharacter/Scripts/PlayerInput.cs deleted file mode 100644 index 33b3c2e..0000000 --- a/Assets/NaughtyCharacter/Scripts/PlayerInput.cs +++ /dev/null @@ -1,45 +0,0 @@ -using UnityEngine; - -namespace NaughtyCharacter -{ - public class PlayerInput : MonoBehaviour - { - public float MoveAxisDeadZone = 0.2f; - - public Vector2 MoveInput { get; private set; } - public Vector2 LastMoveInput { get; private set; } - public Vector2 CameraInput { get; private set; } - public bool JumpInput { get; private set; } - - public bool HasMoveInput { get; private set; } - - public void UpdateInput() - { - // Update MoveInput - Vector2 moveInput = new Vector2(Input.GetAxis("Horizontal"), Input.GetAxis("Vertical")); - if (Mathf.Abs(moveInput.x) < MoveAxisDeadZone) - { - moveInput.x = 0.0f; - } - - if (Mathf.Abs(moveInput.y) < MoveAxisDeadZone) - { - moveInput.y = 0.0f; - } - - bool hasMoveInput = moveInput.sqrMagnitude > 0.0f; - - if (HasMoveInput && !hasMoveInput) - { - LastMoveInput = MoveInput; - } - - MoveInput = moveInput; - HasMoveInput = hasMoveInput; - - // Update other inputs - CameraInput = new Vector2(Input.GetAxis("Mouse X"), Input.GetAxis("Mouse Y")); - JumpInput = Input.GetButton("Jump"); - } - } -} diff --git a/Assets/NaughtyCharacter/_Scenes/Demo.unity b/Assets/NaughtyCharacter/_Scenes/Demo.unity index 6d0a1a1..5aa7368 100644 --- a/Assets/NaughtyCharacter/_Scenes/Demo.unity +++ b/Assets/NaughtyCharacter/_Scenes/Demo.unity @@ -43,7 +43,7 @@ RenderSettings: --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 11 + serializedVersion: 12 m_GIWorkflowMode: 0 m_GISettings: serializedVersion: 2 @@ -99,7 +99,8 @@ LightmapSettings: m_LightProbeSampleCountMultiplier: 4 m_LightingDataAsset: {fileID: 112000000, guid: de48ebbae3f771c41ab4eb3253b662b4, type: 2} - m_UseShadowmask: 1 + m_LightingSettings: {fileID: 4890085278179872738, guid: ade3dad032e507f47829eeed727f5631, + type: 2} --- !u!196 &4 NavMeshSettings: serializedVersion: 2 @@ -119,335 +120,11 @@ NavMeshSettings: manualTileSize: 0 tileSize: 256 accuratePlacement: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 debug: m_Flags: 0 m_NavMeshData: {fileID: 0} ---- !u!43 &152763207 -Mesh: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh13114 - serializedVersion: 10 - m_SubMeshes: - - serializedVersion: 2 - firstByte: 0 - indexCount: 36 - topology: 0 - baseVertex: 0 - firstVertex: 0 - vertexCount: 24 - localAABB: - m_Center: {x: 25, y: 0.5, z: -25} - m_Extent: {x: 25, y: 0.5, z: 25} - m_Shapes: - vertices: [] - shapes: [] - channels: [] - fullWeights: [] - m_BindPose: [] - m_BoneNameHashes: - m_RootBoneNameHash: 0 - m_BonesAABB: [] - m_VariableBoneCountWeights: - m_Data: - m_MeshCompression: 0 - m_IsReadable: 1 - m_KeepVertices: 1 - m_KeepIndices: 1 - m_IndexFormat: 0 - m_IndexBuffer: 000001000200010003000200040005000600050007000600080009000a0009000b000a000c000d000e000d000f000e00100011001200110013001200140015001600150017001600 - m_VertexData: - serializedVersion: 3 - m_VertexCount: 24 - m_Channels: - - stream: 0 - offset: 0 - format: 0 - dimension: 3 - - stream: 0 - offset: 12 - format: 0 - dimension: 3 - - stream: 0 - offset: 24 - format: 0 - dimension: 4 - - stream: 0 - offset: 40 - format: 0 - dimension: 4 - - stream: 0 - offset: 56 - format: 0 - dimension: 2 - - stream: 0 - offset: 64 - format: 0 - dimension: 2 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - m_DataSize: 1728 - _typelessdata: 00000000000000000000000000000000000000000000803f000080bf0000000000000000000080bf0000803f0000803f0000803f0000803f000000000000000040ccff3e6f12833b00004842000000000000000000000000000000000000803f000080bf0000000000000000000080bf0000803f0000803f0000803f0000803f000048c200000000f2bf7d3f6f12833b000000000000803f0000000000000000000000000000803f000080bf0000000000000000000080bf0000803f0000803f0000803f0000803f000000000000803f4accff3eff9f623c000048420000803f0000000000000000000000000000803f000080bf0000000000000000000080bf0000803f0000803f0000803f0000803f000048c20000803ff6bf7d3fff9f623c0000484200000000000000000000803f000000000000000000000000000000000000803f000080bf0000803f0000803f0000803f0000803f00000000000000006f12833b6f12833b0000484200000000000048c20000803f000000000000000000000000000000000000803f000080bf0000803f0000803f0000803f0000803f000048c200000000edbffd3e6f12833b000048420000803f000000000000803f000000000000000000000000000000000000803f000080bf0000803f0000803f0000803f0000803f000000000000803fe514833bff9f623c000048420000803f000048c20000803f000000000000000000000000000000000000803f000080bf0000803f0000803f0000803f0000803f000048c20000803ff6bffd3eff9f623c0000484200000000000048c20000000000000000000080bf0000803f0000000000000000000080bf0000803f0000803f0000803f0000803f00004842000000006f12833b9b14923c0000000000000000000048c20000000000000000000080bf0000803f0000000000000000000080bf0000803f0000803f0000803f0000803f0000000000000000edbffd3e9b14923c000048420000803f000048c20000000000000000000080bf0000803f0000000000000000000080bf0000803f0000803f0000803f0000803f000048420000803fe514833bff9fe23c000000000000803f000048c20000000000000000000080bf0000803f0000000000000000000080bf0000803f0000803f0000803f0000803f000000000000803ff6bffd3eff9fe23c0000000000000000000048c2000080bf00000000000000000000000000000000000080bf000080bf0000803f0000803f0000803f0000803f000048420000000040ccff3e9b14923c000000000000000000000000000080bf00000000000000000000000000000000000080bf000080bf0000803f0000803f0000803f0000803f0000000000000000f2bf7d3f9b14923c000000000000803f000048c2000080bf00000000000000000000000000000000000080bf000080bf0000803f0000803f0000803f0000803f000048420000803f4accff3eff9fe23c000000000000803f00000000000080bf00000000000000000000000000000000000080bf000080bf0000803f0000803f0000803f0000803f000000000000803ff6bf7d3fff9fe23c000000000000803f00000000000000000000803f000000000000803f0000000000000000000080bf0000803f0000803f0000803f0000803f0000000000000000e8bf7d3fbab2013d000048420000803f00000000000000000000803f000000000000803f0000000000000000000080bf0000803f0000803f0000803f0000803f0000484200000000e1bf7d3f01f5053f000000000000803f000048c2000000000000803f000000000000803f0000000000000000000080bf0000803f0000803f0000803f0000803f00000000000048c23fccff3e4db2013d000048420000803f000048c2000000000000803f000000000000803f0000000000000000000080bf0000803f0000803f0000803f0000803f00004842000048c232ccff3efaf4053f0000000000000000000048c200000000000080bf00000000000080bf0000000000000000000080bf0000803f0000803f0000803f0000803f00000000000048c2dabffd3e4db2013d0000484200000000000048c200000000000080bf00000000000080bf0000000000000000000080bf0000803f0000803f0000803f0000803f000048c2000048c2e8bffd3efaf4053f00000000000000000000000000000000000080bf00000000000080bf0000000000000000000080bf0000803f0000803f0000803f0000803f00000000000000006f12833bb7b2013d00004842000000000000000000000000000080bf00000000000080bf0000000000000000000080bf0000803f0000803f0000803f0000803f000048c200000000d515833b01f5053f - m_CompressedMesh: - m_Vertices: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_UV: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Normals: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Tangents: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Weights: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_NormalSigns: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_TangentSigns: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_FloatColors: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_BoneIndices: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_Triangles: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_UVInfo: 0 - m_LocalAABB: - m_Center: {x: 25, y: 0.5, z: -25} - m_Extent: {x: 25, y: 0.5, z: 25} - m_MeshUsageFlags: 0 - m_BakedConvexCollisionMesh: - m_BakedTriangleCollisionMesh: - m_MeshMetrics[0]: 1 - m_MeshMetrics[1]: 1 - m_MeshOptimizationFlags: -1 - m_StreamData: - offset: 0 - size: 0 - path: ---- !u!43 &203689434 -Mesh: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh12794 - serializedVersion: 10 - m_SubMeshes: - - serializedVersion: 2 - firstByte: 0 - indexCount: 36 - topology: 0 - baseVertex: 0 - firstVertex: 0 - vertexCount: 24 - localAABB: - m_Center: {x: 27, y: 2, z: -0.9999987} - m_Extent: {x: 27, y: 2, z: 1.0000013} - m_Shapes: - vertices: [] - shapes: [] - channels: [] - fullWeights: [] - m_BindPose: [] - m_BoneNameHashes: - m_RootBoneNameHash: 0 - m_BonesAABB: [] - m_VariableBoneCountWeights: - m_Data: - m_MeshCompression: 0 - m_IsReadable: 1 - m_KeepVertices: 1 - m_KeepIndices: 1 - m_IndexFormat: 0 - m_IndexBuffer: 000001000200010003000200040005000600050007000600080009000a0009000b000a000c000d000e000d000f000e00100011001200110013001200140015001600150017001600 - m_VertexData: - serializedVersion: 3 - m_VertexCount: 24 - m_Channels: - - stream: 0 - offset: 0 - format: 0 - dimension: 3 - - stream: 0 - offset: 12 - format: 0 - dimension: 3 - - stream: 0 - offset: 24 - format: 0 - dimension: 4 - - stream: 0 - offset: 40 - format: 0 - dimension: 4 - - stream: 0 - offset: 56 - format: 0 - dimension: 2 - - stream: 0 - offset: 64 - format: 0 - dimension: 2 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - m_DataSize: 1728 - _typelessdata: 000000000000000000000000b49750b3000000000000803f000080bf00000000b49750b3000080bf0000803f0000803f0000803f0000803f00000000000000006f12833b8c44373d000058420000000000003036b49750b3000000000000803f000080bf00000000b49750b3000080bf0000803f0000803f0000803f0000803f000058c200000000fbfd7e3f8c44373d000000000000804000000000b49750b3000000000000803f000080bf00000000b49750b3000080bf0000803f0000803f0000803f0000803f00000000000080408114833b2b22f23d000058420000804000003036b49750b3000000000000803f000080bf00000000b49750b3000080bf0000803f0000803f0000803f0000803f000058c200008040fffd7e3f2b22f23d0000584200000000000030360000803f000000000000000000000000000000000000803f000080bf0000803f0000803f0000803f0000803f00003036000000008a12833b5ced8d3e0000584200000000eaffffbf0000803f000000000000000000000000000000000000803f000080bf0000803f0000803f0000803f0000803feaffffbf000000006f12833bbf3a763e0000584200008040000030360000803f000000000000000000000000000000000000803f000080bf0000803f0000803f0000803f0000803f000030360000804012b19e3d5ced8d3e0000584200008040eaffffbf0000803f000000000000000000000000000000000000803f000080bf0000803f0000803f0000803f0000803feaffffbf0000804011b19e3dbf3a763e0000584200000000eaffffbfb497503300000000000080bf0000803f00000000b4975033000080bf0000803f0000803f0000803f0000803f00005842000000006f12833b5253fa3d0000000000000000000000c0b497503300000000000080bf0000803f00000000b4975033000080bf0000803f0000803f0000803f0000803fb497d0b300000000fbfd7e3f5253fa3d0000584200008040eaffffbfb497503300000000000080bf0000803f00000000b4975033000080bf0000803f0000803f0000803f0000803f00005842000080408114833b9b69483e0000000000008040000000c0b497503300000000000080bf0000803f00000000b4975033000080bf0000803f0000803f0000803f0000803fb497d0b300008040fffd7e3f9b69483e0000000000000000000000c0000080bf00000000000000000000000000000000000080bf000080bf0000803f0000803f0000803f0000803f000000400000000011b19e3da5f98f3e000000000000000000000000000080bf00000000000000000000000000000000000080bf000080bf0000803f0000803f0000803f0000803f000000000000000012b19e3da1c9a23e0000000000008040000000c0000080bf00000000000000000000000000000000000080bf000080bf0000803f0000803f0000803f0000803f00000040000080406f12833ba5f98f3e000000000000804000000000000080bf00000000000000000000000000000000000080bf000080bf0000803f0000803f0000803f0000803f00000000000080408a12833ba1c9a23e000000000000804000000000000000000000803f000000000000803f0000000000000000000080bf0000803f0000803f0000803f0000803f000000000000000004fe7e3f31e2263d000058420000804000003036000000000000803f000000000000803f0000000000000000000080bf0000803f0000803f0000803f0000803f00005842000030363a16833b3ee2263d0000000000008040000000c0000000000000803f000000000000803f0000000000000000000080bf0000803f0000803f0000803f0000803f00000000000000c0fcfd7e3f6f12833b0000584200008040eaffffbf000000000000803f000000000000803f0000000000000000000080bf0000803f0000803f0000803f0000803f00005842eaffffbf6f12833bd612833b0000000000000000000000c000000000000080bf00000000000080bf0000000000000000000080bf0000803f0000803f0000803f0000803f00000000000000c06815833b2e824c3e0000584200000000eaffffbf00000000000080bf00000000000080bf0000000000000000000080bf0000803f0000803f0000803f0000803f000058c2eaffffbffcfd7e3f32824c3e00000000000000000000000000000000000080bf00000000000080bf0000000000000000000080bf0000803f0000803f0000803f0000803f00000000000000006f12833b2822723e00005842000000000000303600000000000080bf00000000000080bf0000000000000000000080bf0000803f0000803f0000803f0000803f000058c200003036f6fd7e3f2c22723e - m_CompressedMesh: - m_Vertices: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_UV: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Normals: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Tangents: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Weights: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_NormalSigns: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_TangentSigns: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_FloatColors: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_BoneIndices: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_Triangles: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_UVInfo: 0 - m_LocalAABB: - m_Center: {x: 27, y: 2, z: -0.9999987} - m_Extent: {x: 27, y: 2, z: 1.0000013} - m_MeshUsageFlags: 0 - m_BakedConvexCollisionMesh: - m_BakedTriangleCollisionMesh: - m_MeshMetrics[0]: 1 - m_MeshMetrics[1]: 1 - m_MeshOptimizationFlags: -1 - m_StreamData: - offset: 0 - size: 0 - path: --- !u!1 &204190908 GameObject: m_ObjectHideFlags: 0 @@ -481,7 +158,7 @@ MeshCollider: serializedVersion: 4 m_Convex: 0 m_CookingOptions: 30 - m_Mesh: {fileID: 565426245} + m_Mesh: {fileID: 1398255767} --- !u!114 &204190910 MonoBehaviour: m_ObjectHideFlags: 0 @@ -494,7 +171,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 8233d90336aea43098adf6dbabd606a2, type: 3} m_Name: m_EditorClassIdentifier: - m_MeshFormatVersion: 0 + m_MeshFormatVersion: 2 m_Faces: - m_Indexes: 000000000100000002000000010000000300000002000000 m_SmoothingGroup: 0 @@ -508,7 +185,7 @@ MonoBehaviour: m_Offset: {x: 0, y: 0} m_Rotation: 0 m_Anchor: 9 - m_Material: {fileID: 2100000, guid: c22777d6e868e4f2fb421913386b154e, type: 2} + m_Material: {fileID: 0} m_SubmeshIndex: 0 m_ManualUV: 0 elementGroup: 0 @@ -525,7 +202,7 @@ MonoBehaviour: m_Offset: {x: 0, y: 0} m_Rotation: 0 m_Anchor: 9 - m_Material: {fileID: 2100000, guid: c22777d6e868e4f2fb421913386b154e, type: 2} + m_Material: {fileID: 0} m_SubmeshIndex: 0 m_ManualUV: 0 elementGroup: 0 @@ -542,7 +219,7 @@ MonoBehaviour: m_Offset: {x: 0, y: 0} m_Rotation: 0 m_Anchor: 9 - m_Material: {fileID: 2100000, guid: c22777d6e868e4f2fb421913386b154e, type: 2} + m_Material: {fileID: 0} m_SubmeshIndex: 0 m_ManualUV: 0 elementGroup: 0 @@ -559,7 +236,7 @@ MonoBehaviour: m_Offset: {x: 0, y: 0} m_Rotation: 0 m_Anchor: 9 - m_Material: {fileID: 2100000, guid: c22777d6e868e4f2fb421913386b154e, type: 2} + m_Material: {fileID: 0} m_SubmeshIndex: 0 m_ManualUV: 0 elementGroup: 0 @@ -576,7 +253,7 @@ MonoBehaviour: m_Offset: {x: 0, y: 0} m_Rotation: 0 m_Anchor: 9 - m_Material: {fileID: 2100000, guid: c22777d6e868e4f2fb421913386b154e, type: 2} + m_Material: {fileID: 0} m_SubmeshIndex: 0 m_ManualUV: 0 elementGroup: 0 @@ -593,7 +270,7 @@ MonoBehaviour: m_Offset: {x: 0, y: 0} m_Rotation: 0 m_Anchor: 9 - m_Material: {fileID: 2100000, guid: c22777d6e868e4f2fb421913386b154e, type: 2} + m_Material: {fileID: 0} m_SubmeshIndex: 0 m_ManualUV: 0 elementGroup: 0 @@ -660,7 +337,31 @@ MonoBehaviour: - {x: -3, y: 0} m_Textures2: [] m_Textures3: [] - m_Tangents: [] + m_Tangents: + - {x: -1, y: 0, z: 0, w: -1} + - {x: -1, y: 0, z: 0, w: -1} + - {x: -1, y: 0, z: 0, w: -1} + - {x: -1, y: 0, z: 0, w: -1} + - {x: 0, y: 0, z: 1, w: -1} + - {x: 0, y: 0, z: 1, w: -1} + - {x: 0, y: 0, z: 1, w: -1} + - {x: 0, y: 0, z: 1, w: -1} + - {x: 1, y: 0, z: 0, w: -1} + - {x: 1, y: 0, z: 0, w: -1} + - {x: 1, y: 0, z: 0, w: -1} + - {x: 1, y: 0, z: 0, w: -1} + - {x: 0, y: 0, z: -1, w: -1} + - {x: 0, y: 0, z: -1, w: -1} + - {x: 0, y: 0, z: -1, w: -1} + - {x: 0, y: 0, z: -1, w: -1} + - {x: 1, y: 0, z: 0, w: -1} + - {x: 1, y: 0, z: 0, w: -1} + - {x: 1, y: 0, z: 0, w: -1} + - {x: 1, y: 0, z: 0, w: -1} + - {x: -1, y: 0, z: 0, w: -1} + - {x: -1, y: 0, z: 0, w: -1} + - {x: -1, y: 0, z: 0, w: -1} + - {x: -1, y: 0, z: 0, w: -1} m_Colors: - {r: 1, g: 1, b: 1, a: 1} - {r: 1, g: 1, b: 1, a: 1} @@ -693,6 +394,8 @@ MonoBehaviour: m_AreaError: 15 m_PreserveMeshAssetOnDestroy: 0 assetGuid: + m_Mesh: {fileID: 1398255767} + m_VersionIndex: 0 m_IsSelectable: 1 m_SelectedFaces: m_SelectedEdges: [] @@ -708,10 +411,12 @@ MeshRenderer: m_CastShadows: 2 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -736,14 +441,15 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &204190912 MeshFilter: - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 10 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 204190908} - m_Mesh: {fileID: 565426245} + m_Mesh: {fileID: 1398255767} --- !u!4 &204190913 Transform: m_ObjectHideFlags: 0 @@ -758,13 +464,177 @@ Transform: m_Father: {fileID: 1454059292} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!43 &400395614 +--- !u!43 &245238326 +Mesh: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: pb_Mesh17886 + serializedVersion: 10 + m_SubMeshes: + - serializedVersion: 2 + firstByte: 0 + indexCount: 36 + topology: 0 + baseVertex: 0 + firstVertex: 0 + vertexCount: 24 + localAABB: + m_Center: {x: 2, y: 1, z: -1} + m_Extent: {x: 2, y: 1, z: 1} + m_Shapes: + vertices: [] + shapes: [] + channels: [] + fullWeights: [] + m_BindPose: [] + m_BoneNameHashes: + m_RootBoneNameHash: 0 + m_BonesAABB: [] + m_VariableBoneCountWeights: + m_Data: + m_MeshCompression: 0 + m_IsReadable: 1 + m_KeepVertices: 1 + m_KeepIndices: 1 + m_IndexFormat: 0 + m_IndexBuffer: 000001000200010003000200040005000600050007000600080009000a0009000b000a000c000d000e000d000f000e00100011001200110013001200140015001600150017001600 + m_VertexData: + serializedVersion: 3 + m_VertexCount: 24 + m_Channels: + - stream: 0 + offset: 0 + format: 0 + dimension: 3 + - stream: 0 + offset: 12 + format: 0 + dimension: 3 + - stream: 0 + offset: 24 + format: 0 + dimension: 4 + - stream: 0 + offset: 40 + format: 0 + dimension: 4 + - stream: 0 + offset: 56 + format: 0 + dimension: 2 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + m_DataSize: 1536 + _typelessdata: 00000000000000000000000000000000000000000000803f000080bf0000000000000000000080bf0000803f0000803f0000803f0000803f000000000000000000008040000000000000000000000000000000000000803f000080bf0000000000000000000080bf0000803f0000803f0000803f0000803f000080c0000000000000000080ffe63c0000000000000000000000000000803f000080bf0000000000000000000080bf0000803f0000803f0000803f0000803f0000000080ffe63c00008040000000400000000000000000000000000000803f000080bf0000000000000000000080bf0000803f0000803f0000803f0000803f000080c0000000400000804000000000000000000000803f000000000000000000000000000000000000803f000080bf0000803f0000803f0000803f0000803f00000000000000000000804000000000000000c00000803f000000000000000000000000000000000000803f000080bf0000803f0000803f0000803f0000803f000000c0000000000000804000000040000000000000803f000000000000000000000000000000000000803f000080bf0000803f0000803f0000803f0000803f00000000000000400000804000000040000000c00000803f000000000000000000000000000000000000803f000080bf0000803f0000803f0000803f0000803f000000c0000000400000804000000000000000c00000000000000000000080bf0000803f0000000000000000000080bf0000803f0000803f0000803f0000803f00008040000000000000000000000000000000c00000000000000000000080bf0000803f0000000000000000000080bf0000803f0000803f0000803f0000803f00000000000000000000804000000040000000c00000000000000000000080bf0000803f0000000000000000000080bf0000803f0000803f0000803f0000803f00008040000000400000000080ffe63c000000c00000000000000000000080bf0000803f0000000000000000000080bf0000803f0000803f0000803f0000803f0000000080ffe63c0000000000000000000000c0000080bf00000000000000000000000000000000000080bf000080bf0000803f0000803f0000803f0000803f0000004000000000000000000000000000000000000080bf00000000000000000000000000000000000080bf000080bf0000803f0000803f0000803f0000803f00000000000000000000000080ffe63c000000c0000080bf00000000000000000000000000000000000080bf000080bf0000803f0000803f0000803f0000803f0000004080ffe63c0000000080ffe63c00000000000080bf00000000000000000000000000000000000080bf000080bf0000803f0000803f0000803f0000803f0000000080ffe63c0000000080ffe63c000000003b61e2beff9d653f00000000ff9d653f3b61e23e00000000000080bf0000803f0000803f0000803f0000803f4b454c3c000000000000804000000040000000003b61e2beff9d653f00000000ff9d653f3b61e23e00000000000080bf0000803f0000803f0000803f0000803f271b8f40000000000000000080ffe63c000000c03b61e2beff9d653f00000000ff9d653f3b61e23e00000000000080bf0000803f0000803f0000803f0000803f4b454c3c000000c00000804000000040000000c03b61e2beff9d653f00000000ff9d653f3b61e23e00000000000080bf0000803f0000803f0000803f0000803f271b8f40000000c00000000000000000000000c000000000000080bf00000000000080bf0000000000000000000080bf0000803f0000803f0000803f0000803f00000000000000c00000804000000000000000c000000000000080bf00000000000080bf0000000000000000000080bf0000803f0000803f0000803f0000803f000080c0000000c000000000000000000000000000000000000080bf00000000000080bf0000000000000000000080bf0000803f0000803f0000803f0000803f000000000000000000008040000000000000000000000000000080bf00000000000080bf0000000000000000000080bf0000803f0000803f0000803f0000803f000080c000000000 + m_CompressedMesh: + m_Vertices: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_UV: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Normals: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Tangents: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Weights: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_NormalSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_TangentSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_FloatColors: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_BoneIndices: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_Triangles: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_UVInfo: 0 + m_LocalAABB: + m_Center: {x: 2, y: 1, z: -1} + m_Extent: {x: 2, y: 1, z: 1} + m_MeshUsageFlags: 0 + m_BakedConvexCollisionMesh: + m_BakedTriangleCollisionMesh: + m_MeshMetrics[0]: 1 + m_MeshMetrics[1]: 1 + m_MeshOptimizationFlags: 1 + m_StreamData: + serializedVersion: 2 + offset: 0 + size: 0 + path: +--- !u!43 &386198210 Mesh: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh12816 + m_Name: pb_Mesh17872 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -775,8 +645,8 @@ Mesh: firstVertex: 0 vertexCount: 24 localAABB: - m_Center: {x: 27, y: 2, z: -0.9999987} - m_Extent: {x: 27, y: 2, z: 1.0000013} + m_Center: {x: 25, y: 0.5, z: -25} + m_Extent: {x: 25, y: 0.5, z: 25} m_Shapes: vertices: [] shapes: [] @@ -819,9 +689,9 @@ Mesh: format: 0 dimension: 2 - stream: 0 - offset: 64 + offset: 0 format: 0 - dimension: 2 + dimension: 0 - stream: 0 offset: 0 format: 0 @@ -854,8 +724,8 @@ Mesh: offset: 0 format: 0 dimension: 0 - m_DataSize: 1728 - _typelessdata: 000000000000000000000000b49750b3000000000000803f000080bf00000000b49750b3000080bf0000803f0000803f0000803f0000803f00000000000000006f12833b8c44373d000058420000000000003036b49750b3000000000000803f000080bf00000000b49750b3000080bf0000803f0000803f0000803f0000803f000058c200000000fbfd7e3f8c44373d000000000000804000000000b49750b3000000000000803f000080bf00000000b49750b3000080bf0000803f0000803f0000803f0000803f00000000000080408114833b2b22f23d000058420000804000003036b49750b3000000000000803f000080bf00000000b49750b3000080bf0000803f0000803f0000803f0000803f000058c200008040fffd7e3f2b22f23d0000584200000000000030360000803f000000000000000000000000000000000000803f000080bf0000803f0000803f0000803f0000803f00003036000000008a12833b5ced8d3e0000584200000000eaffffbf0000803f000000000000000000000000000000000000803f000080bf0000803f0000803f0000803f0000803feaffffbf000000006f12833bbf3a763e0000584200008040000030360000803f000000000000000000000000000000000000803f000080bf0000803f0000803f0000803f0000803f000030360000804012b19e3d5ced8d3e0000584200008040eaffffbf0000803f000000000000000000000000000000000000803f000080bf0000803f0000803f0000803f0000803feaffffbf0000804011b19e3dbf3a763e0000584200000000eaffffbfb497503300000000000080bf0000803f00000000b4975033000080bf0000803f0000803f0000803f0000803f00005842000000006f12833b5253fa3d0000000000000000000000c0b497503300000000000080bf0000803f00000000b4975033000080bf0000803f0000803f0000803f0000803fb497d0b300000000fbfd7e3f5253fa3d0000584200008040eaffffbfb497503300000000000080bf0000803f00000000b4975033000080bf0000803f0000803f0000803f0000803f00005842000080408114833b9b69483e0000000000008040000000c0b497503300000000000080bf0000803f00000000b4975033000080bf0000803f0000803f0000803f0000803fb497d0b300008040fffd7e3f9b69483e0000000000000000000000c0000080bf00000000000000000000000000000000000080bf000080bf0000803f0000803f0000803f0000803f000000400000000011b19e3da5f98f3e000000000000000000000000000080bf00000000000000000000000000000000000080bf000080bf0000803f0000803f0000803f0000803f000000000000000012b19e3da1c9a23e0000000000008040000000c0000080bf00000000000000000000000000000000000080bf000080bf0000803f0000803f0000803f0000803f00000040000080406f12833ba5f98f3e000000000000804000000000000080bf00000000000000000000000000000000000080bf000080bf0000803f0000803f0000803f0000803f00000000000080408a12833ba1c9a23e000000000000804000000000000000000000803f000000000000803f0000000000000000000080bf0000803f0000803f0000803f0000803f000000000000000004fe7e3f31e2263d000058420000804000003036000000000000803f000000000000803f0000000000000000000080bf0000803f0000803f0000803f0000803f00005842000030363a16833b3ee2263d0000000000008040000000c0000000000000803f000000000000803f0000000000000000000080bf0000803f0000803f0000803f0000803f00000000000000c0fcfd7e3f6f12833b0000584200008040eaffffbf000000000000803f000000000000803f0000000000000000000080bf0000803f0000803f0000803f0000803f00005842eaffffbf6f12833bd612833b0000000000000000000000c000000000000080bf00000000000080bf0000000000000000000080bf0000803f0000803f0000803f0000803f00000000000000c06815833b2e824c3e0000584200000000eaffffbf00000000000080bf00000000000080bf0000000000000000000080bf0000803f0000803f0000803f0000803f000058c2eaffffbffcfd7e3f32824c3e00000000000000000000000000000000000080bf00000000000080bf0000000000000000000080bf0000803f0000803f0000803f0000803f00000000000000006f12833b2822723e00005842000000000000303600000000000080bf00000000000080bf0000000000000000000080bf0000803f0000803f0000803f0000803f000058c200003036f6fd7e3f2c22723e + m_DataSize: 1536 + _typelessdata: 00000000000000000000000000000000000000000000803f000080bf0000000000000000000080bf0000803f0000803f0000803f0000803f000000000000000000004842000000000000000000000000000000000000803f000080bf0000000000000000000080bf0000803f0000803f0000803f0000803f000048c200000000000000000000803f0000000000000000000000000000803f000080bf0000000000000000000080bf0000803f0000803f0000803f0000803f000000000000803f000048420000803f0000000000000000000000000000803f000080bf0000000000000000000080bf0000803f0000803f0000803f0000803f000048c20000803f0000484200000000000000000000803f000000000000000000000000000000000000803f000080bf0000803f0000803f0000803f0000803f00000000000000000000484200000000000048c20000803f000000000000000000000000000000000000803f000080bf0000803f0000803f0000803f0000803f000048c200000000000048420000803f000000000000803f000000000000000000000000000000000000803f000080bf0000803f0000803f0000803f0000803f000000000000803f000048420000803f000048c20000803f000000000000000000000000000000000000803f000080bf0000803f0000803f0000803f0000803f000048c20000803f0000484200000000000048c20000000000000000000080bf0000803f0000000000000000000080bf0000803f0000803f0000803f0000803f00004842000000000000000000000000000048c20000000000000000000080bf0000803f0000000000000000000080bf0000803f0000803f0000803f0000803f0000000000000000000048420000803f000048c20000000000000000000080bf0000803f0000000000000000000080bf0000803f0000803f0000803f0000803f000048420000803f000000000000803f000048c20000000000000000000080bf0000803f0000000000000000000080bf0000803f0000803f0000803f0000803f000000000000803f0000000000000000000048c2000080bf00000000000000000000000000000000000080bf000080bf0000803f0000803f0000803f0000803f0000484200000000000000000000000000000000000080bf00000000000000000000000000000000000080bf000080bf0000803f0000803f0000803f0000803f0000000000000000000000000000803f000048c2000080bf00000000000000000000000000000000000080bf000080bf0000803f0000803f0000803f0000803f000048420000803f000000000000803f00000000000080bf00000000000000000000000000000000000080bf000080bf0000803f0000803f0000803f0000803f000000000000803f000000000000803f00000000000000000000803f000000000000803f0000000000000000000080bf0000803f0000803f0000803f0000803f0000000000000000000048420000803f00000000000000000000803f000000000000803f0000000000000000000080bf0000803f0000803f0000803f0000803f0000484200000000000000000000803f000048c2000000000000803f000000000000803f0000000000000000000080bf0000803f0000803f0000803f0000803f00000000000048c2000048420000803f000048c2000000000000803f000000000000803f0000000000000000000080bf0000803f0000803f0000803f0000803f00004842000048c20000000000000000000048c200000000000080bf00000000000080bf0000000000000000000080bf0000803f0000803f0000803f0000803f00000000000048c20000484200000000000048c200000000000080bf00000000000080bf0000000000000000000080bf0000803f0000803f0000803f0000803f000048c2000048c200000000000000000000000000000000000080bf00000000000080bf0000000000000000000080bf0000803f0000803f0000803f0000803f000000000000000000004842000000000000000000000000000080bf00000000000080bf0000000000000000000080bf0000803f0000803f0000803f0000803f000048c200000000 m_CompressedMesh: m_Vertices: m_NumItems: 0 @@ -909,15 +779,16 @@ Mesh: m_BitSize: 0 m_UVInfo: 0 m_LocalAABB: - m_Center: {x: 27, y: 2, z: -0.9999987} - m_Extent: {x: 27, y: 2, z: 1.0000013} + m_Center: {x: 25, y: 0.5, z: -25} + m_Extent: {x: 25, y: 0.5, z: 25} m_MeshUsageFlags: 0 m_BakedConvexCollisionMesh: m_BakedTriangleCollisionMesh: m_MeshMetrics[0]: 1 m_MeshMetrics[1]: 1 - m_MeshOptimizationFlags: -1 + m_MeshOptimizationFlags: 1 m_StreamData: + serializedVersion: 2 offset: 0 size: 0 path: @@ -974,6 +845,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -1012,25 +884,25 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a5b59d5fe25b49e4e9307648c1c18e43, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!43 &565426245 +--- !u!43 &441081149 Mesh: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh12736 + m_Name: pb_Mesh17764 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 firstByte: 0 - indexCount: 36 + indexCount: 24 topology: 0 baseVertex: 0 firstVertex: 0 - vertexCount: 24 + vertexCount: 18 localAABB: - m_Center: {x: 1.5, y: 1, z: -5} - m_Extent: {x: 1.5, y: 1, z: 5} + m_Center: {x: 5, y: 1.5, z: 5} + m_Extent: {x: 5, y: 1.5, z: 5} m_Shapes: vertices: [] shapes: [] @@ -1047,10 +919,10 @@ Mesh: m_KeepVertices: 1 m_KeepIndices: 1 m_IndexFormat: 0 - m_IndexBuffer: 000001000200010003000200040005000600050007000600080009000a0009000b000a000c000d000e000d000f000e00100011001200110013001200140015001600150017001600 + m_IndexBuffer: 0200010000000500040003000500060004000900080007000c000b000a000c000d000b000e000f0010000f0011001000 m_VertexData: serializedVersion: 3 - m_VertexCount: 24 + m_VertexCount: 18 m_Channels: - stream: 0 offset: 0 @@ -1073,9 +945,9 @@ Mesh: format: 0 dimension: 2 - stream: 0 - offset: 64 + offset: 0 format: 0 - dimension: 2 + dimension: 0 - stream: 0 offset: 0 format: 0 @@ -1108,8 +980,8 @@ Mesh: offset: 0 format: 0 dimension: 0 - m_DataSize: 1728 - _typelessdata: 00000000000000000000000000000000000000000000803f000080bf0000000000000000000080bf0000803f0000803f0000803f0000803f0000000000000000ca12833b1189553f00004040000000000000000000000000000000000000803f000080bf0000000000000000000080bf0000803f0000803f0000803f0000803f000040c000000000c5317e3e1189553f00000000000000400000000000000000000000000000803f000080bf0000000000000000000080bf0000803f0000803f0000803f0000803f00000000000000406f12833bee377f3f00004040000000400000000000000000000000000000803f000080bf0000000000000000000080bf0000803f0000803f0000803f0000803f000040c000000040c2317e3eee377f3f0000404000000000000000000000803f000000000000000000000000000000000000803f000080bf0000803f0000803f0000803f0000803f0000000000000000cf17833b091f003f0000404000000000000020c10000803f000000000000000000000000000000000000803f000080bf0000803f0000803f0000803f0000803f000020c1000000007d70513f091f003f0000404000000040000000000000803f000000000000000000000000000000000000803f000080bf0000803f0000803f0000803f0000803f00000000000000406f12833be8cd293f0000404000000040000020c10000803f000000000000000000000000000000000000803f000080bf0000803f0000803f0000803f0000803f000020c1000000407370513fe8cd293f0000404000000000000020c10000000000000000000080bf0000803f0000000000000000000080bf0000803f0000803f0000803f0000803f00004040000000002e25813e1189553f0000000000000000000020c10000000000000000000080bf0000803f0000000000000000000080bf0000803f0000803f0000803f0000803f0000000000000000c531fe3e1189553f0000404000000040000020c10000000000000000000080bf0000803f0000000000000000000080bf0000803f0000803f0000803f0000803f00004040000000402c25813eee377f3f0000000000000040000020c10000000000000000000080bf0000803f0000000000000000000080bf0000803f0000803f0000803f0000803f0000000000000040c431fe3eee377f3f0000000000000000000020c1000080bf00000000000000000000000000000000000080bf000080bf0000803f0000803f0000803f0000803f0000204100000000cf17833b0dd42a3f000000000000000000000000000080bf00000000000000000000000000000000000080bf000080bf0000803f0000803f0000803f0000803f00000000000000007d70513f0dd42a3f0000000000000040000020c1000080bf00000000000000000000000000000000000080bf000080bf0000803f0000803f0000803f0000803f00002041000000406f12833bec82543f000000000000004000000000000080bf00000000000000000000000000000000000080bf000080bf0000803f0000803f0000803f0000803f00000000000000407370513fec82543f000000000000004000000000000000000000803f000000000000803f0000000000000000000080bf0000803f0000803f0000803f0000803f00000000000000007d70513f6f12833b000040400000004000000000000000000000803f000000000000803f0000000000000000000080bf0000803f0000803f0000803f0000803f00004040000000007f70513fbe317e3e0000000000000040000020c1000000000000803f000000000000803f0000000000000000000080bf0000803f0000803f0000803f0000803f00000000000020c16f12833bd013833b0000404000000040000020c1000000000000803f000000000000803f0000000000000000000080bf0000803f0000803f0000803f0000803f00004040000020c15913833bc9317e3e0000000000000000000020c100000000000080bf00000000000080bf0000000000000000000080bf0000803f0000803f0000803f0000803f00000000000020c17d70513f3425813e0000404000000000000020c100000000000080bf00000000000080bf0000000000000000000080bf0000803f0000803f0000803f0000803f000040c0000020c17d70513fca31fe3e00000000000000000000000000000000000080bf00000000000080bf0000000000000000000080bf0000803f0000803f0000803f0000803f00000000000000006f12833b2e25813e00004040000000000000000000000000000080bf00000000000080bf0000000000000000000080bf0000803f0000803f0000803f0000803f000040c0000000007012833bc331fe3e + m_DataSize: 1152 + _typelessdata: 0000000000000000000000000000000000000000000080bf0000803f0000000000000000000080bf0000803f0000803f0000803f0000803f00000000000000000000204100000000000000000000000000000000000080bf0000803f0000000000000000000080bf0000803f0000803f0000803f0000803f00002041000000000000000000004040000000000000000000000000000080bf0000803f0000000000000000000080bf0000803f0000803f0000803f0000803f0000000000004040000020410000000000000000431f933e1a34753f000000001b34753f441f93be00000000000080bf0000803f0000803f0000803f0000803f9140194100008035000020410000000000002041431f933e1a34753f000000001b34753f441f93be00000000000080bf0000803f0000803f0000803f0000803f9140194101002041000000000000404000000000431f933e1a34753f000000001b34753f441f93be00000000000080bf0000803f0000803f0000803f0000803fd4ae5cbf00008035000000000000404000002041431f933e1a34753f000000001b34753f441f93be00000000000080bf0000803f0000803f0000803f0000803fd4ae5cbf0100204100002041000000000000204100000000000000000000803f000080bf0000000000000000000080bf0000803f0000803f0000803f0000803f000020c10000000000000000000000000000204100000000000000000000803f000080bf0000000000000000000080bf0000803f0000803f0000803f0000803f000000000000000000000000000040400000204100000000000000000000803f000080bf0000000000000000000080bf0000803f0000803f0000803f0000803f0000000000004040000000000000000000002041000080bf00000000000000000000000000000000000080bf000080bf0000803f0000803f0000803f0000803f000020c100000000000000000000000000000000000080bf00000000000000000000000000000000000080bf000080bf0000803f0000803f0000803f0000803f0000000000000000000000000000404000002041000080bf00000000000000000000000000000000000080bf000080bf0000803f0000803f0000803f0000803f000020c100004040000000000000404000000000000080bf00000000000000000000000000000000000080bf000080bf0000803f0000803f0000803f0000803f000000000000404000000000000000000000000000000000000080bf00000000000080bf0000000000000000000080bf0000803f0000803f0000803f0000803f000000000000000000002041000000000000000000000000000080bf00000000000080bf0000000000000000000080bf0000803f0000803f0000803f0000803f000020c10000000000000000000000000000204100000000000080bf00000000000080bf0000000000000000000080bf0000803f0000803f0000803f0000803f000000000000204100002041000000000000204100000000000080bf00000000000080bf0000000000000000000080bf0000803f0000803f0000803f0000803f000020c100002041 m_CompressedMesh: m_Vertices: m_NumItems: 0 @@ -1163,15 +1035,16 @@ Mesh: m_BitSize: 0 m_UVInfo: 0 m_LocalAABB: - m_Center: {x: 1.5, y: 1, z: -5} - m_Extent: {x: 1.5, y: 1, z: 5} + m_Center: {x: 5, y: 1.5, z: 5} + m_Extent: {x: 5, y: 1.5, z: 5} m_MeshUsageFlags: 0 m_BakedConvexCollisionMesh: m_BakedTriangleCollisionMesh: m_MeshMetrics[0]: 1 m_MeshMetrics[1]: 1 - m_MeshOptimizationFlags: -1 + m_MeshOptimizationFlags: 1 m_StreamData: + serializedVersion: 2 offset: 0 size: 0 path: @@ -1186,6 +1059,10 @@ PrefabInstance: propertyPath: m_Name value: CameraRig objectReference: {fileID: 0} + - target: {fileID: 423682, guid: 80844b2319340044da27db99208a9eac, type: 3} + propertyPath: m_RootOrder + value: 4 + objectReference: {fileID: 0} - target: {fileID: 423682, guid: 80844b2319340044da27db99208a9eac, type: 3} propertyPath: m_LocalPosition.x value: 23 @@ -1198,6 +1075,10 @@ PrefabInstance: propertyPath: m_LocalPosition.z value: -24 objectReference: {fileID: 0} + - target: {fileID: 423682, guid: 80844b2319340044da27db99208a9eac, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} - target: {fileID: 423682, guid: 80844b2319340044da27db99208a9eac, type: 3} propertyPath: m_LocalRotation.x value: 0 @@ -1210,14 +1091,6 @@ PrefabInstance: propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 423682, guid: 80844b2319340044da27db99208a9eac, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 423682, guid: 80844b2319340044da27db99208a9eac, type: 3} - propertyPath: m_RootOrder - value: 4 - objectReference: {fileID: 0} - target: {fileID: 423682, guid: 80844b2319340044da27db99208a9eac, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 @@ -1244,13 +1117,177 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c13ee35010795cc40a47bd37c09f0215, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!43 &761118632 +--- !u!43 &653134222 +Mesh: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: pb_Mesh17812 + serializedVersion: 10 + m_SubMeshes: + - serializedVersion: 2 + firstByte: 0 + indexCount: 36 + topology: 0 + baseVertex: 0 + firstVertex: 0 + vertexCount: 24 + localAABB: + m_Center: {x: 27, y: 2, z: -0.9999987} + m_Extent: {x: 27, y: 2, z: 1.0000013} + m_Shapes: + vertices: [] + shapes: [] + channels: [] + fullWeights: [] + m_BindPose: [] + m_BoneNameHashes: + m_RootBoneNameHash: 0 + m_BonesAABB: [] + m_VariableBoneCountWeights: + m_Data: + m_MeshCompression: 0 + m_IsReadable: 1 + m_KeepVertices: 1 + m_KeepIndices: 1 + m_IndexFormat: 0 + m_IndexBuffer: 000001000200010003000200040005000600050007000600080009000a0009000b000a000c000d000e000d000f000e00100011001200110013001200140015001600150017001600 + m_VertexData: + serializedVersion: 3 + m_VertexCount: 24 + m_Channels: + - stream: 0 + offset: 0 + format: 0 + dimension: 3 + - stream: 0 + offset: 12 + format: 0 + dimension: 3 + - stream: 0 + offset: 24 + format: 0 + dimension: 4 + - stream: 0 + offset: 40 + format: 0 + dimension: 4 + - stream: 0 + offset: 56 + format: 0 + dimension: 2 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + m_DataSize: 1536 + _typelessdata: 000000000000000000000000b49750b3000000000000803f000080bf00000000b49750b3000080bf0000803f0000803f0000803f0000803f0000000000000000000058420000000000003036b49750b3000000000000803f000080bf00000000b49750b3000080bf0000803f0000803f0000803f0000803f000058c200000000000000000000804000000000b49750b3000000000000803f000080bf00000000b49750b3000080bf0000803f0000803f0000803f0000803f0000000000008040000058420000804000003036b49750b3000000000000803f000080bf00000000b49750b3000080bf0000803f0000803f0000803f0000803f000058c2000080400000584200000000000030360000803f000000000000000000000000000000000000803f000080bf0000803f0000803f0000803f0000803f00003036000000000000584200000000eaffffbf0000803f000000000000000000000000000000000000803f000080bf0000803f0000803f0000803f0000803feaffffbf000000000000584200008040000030360000803f000000000000000000000000000000000000803f000080bf0000803f0000803f0000803f0000803f00003036000080400000584200008040eaffffbf0000803f000000000000000000000000000000000000803f000080bf0000803f0000803f0000803f0000803feaffffbf000080400000584200000000eaffffbfb497503300000000000080bf0000803f00000000b4975033000080bf0000803f0000803f0000803f0000803f00005842000000000000000000000000000000c0b497503300000000000080bf0000803f00000000b4975033000080bf0000803f0000803f0000803f0000803fb497d0b3000000000000584200008040eaffffbfb497503300000000000080bf0000803f00000000b4975033000080bf0000803f0000803f0000803f0000803f00005842000080400000000000008040000000c0b497503300000000000080bf0000803f00000000b4975033000080bf0000803f0000803f0000803f0000803fb497d0b3000080400000000000000000000000c0000080bf00000000000000000000000000000000000080bf000080bf0000803f0000803f0000803f0000803f0000004000000000000000000000000000000000000080bf00000000000000000000000000000000000080bf000080bf0000803f0000803f0000803f0000803f00000000000000000000000000008040000000c0000080bf00000000000000000000000000000000000080bf000080bf0000803f0000803f0000803f0000803f0000004000008040000000000000804000000000000080bf00000000000000000000000000000000000080bf000080bf0000803f0000803f0000803f0000803f0000000000008040000000000000804000000000000000000000803f000000000000803f0000000000000000000080bf0000803f0000803f0000803f0000803f0000000000000000000058420000804000003036000000000000803f000000000000803f0000000000000000000080bf0000803f0000803f0000803f0000803f00005842000030360000000000008040000000c0000000000000803f000000000000803f0000000000000000000080bf0000803f0000803f0000803f0000803f00000000000000c00000584200008040eaffffbf000000000000803f000000000000803f0000000000000000000080bf0000803f0000803f0000803f0000803f00005842eaffffbf0000000000000000000000c000000000000080bf00000000000080bf0000000000000000000080bf0000803f0000803f0000803f0000803f00000000000000c00000584200000000eaffffbf00000000000080bf00000000000080bf0000000000000000000080bf0000803f0000803f0000803f0000803f000058c2eaffffbf00000000000000000000000000000000000080bf00000000000080bf0000000000000000000080bf0000803f0000803f0000803f0000803f000000000000000000005842000000000000303600000000000080bf00000000000080bf0000000000000000000080bf0000803f0000803f0000803f0000803f000058c200003036 + m_CompressedMesh: + m_Vertices: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_UV: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Normals: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Tangents: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Weights: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_NormalSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_TangentSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_FloatColors: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_BoneIndices: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_Triangles: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_UVInfo: 0 + m_LocalAABB: + m_Center: {x: 27, y: 2, z: -0.9999987} + m_Extent: {x: 27, y: 2, z: 1.0000013} + m_MeshUsageFlags: 0 + m_BakedConvexCollisionMesh: + m_BakedTriangleCollisionMesh: + m_MeshMetrics[0]: 1 + m_MeshMetrics[1]: 1 + m_MeshOptimizationFlags: 1 + m_StreamData: + serializedVersion: 2 + offset: 0 + size: 0 + path: +--- !u!43 &793845518 Mesh: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh12840 + m_Name: pb_Mesh17860 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -1261,8 +1298,8 @@ Mesh: firstVertex: 0 vertexCount: 24 localAABB: - m_Center: {x: 25, y: 2, z: -1} - m_Extent: {x: 25, y: 2, z: 1} + m_Center: {x: 2, y: 1, z: -1} + m_Extent: {x: 2, y: 1, z: 1} m_Shapes: vertices: [] shapes: [] @@ -1305,9 +1342,9 @@ Mesh: format: 0 dimension: 2 - stream: 0 - offset: 64 + offset: 0 format: 0 - dimension: 2 + dimension: 0 - stream: 0 offset: 0 format: 0 @@ -1340,8 +1377,8 @@ Mesh: offset: 0 format: 0 dimension: 0 - m_DataSize: 1728 - _typelessdata: 00000000000000000000000000000000000000000000803f000080bf0000000000000000000080bf0000803f0000803f0000803f0000803f00000000000000005317833b6f12833b00004842000000000000000000000000000000000000803f000080bf0000000000000000000080bf0000803f0000803f0000803f0000803f000048c20000000004fe7e3f6f12833b00000000000080400000000000000000000000000000803f000080bf0000000000000000000080bf0000803f0000803f0000803f0000803f00000000000080406f12833b4fbbaa3d00004842000080400000000000000000000000000000803f000080bf0000000000000000000080bf0000803f0000803f0000803f0000803f000048c200008040fafd7e3f4fbbaa3d0000484200000000000000000000803f000000000000000000000000000000000000803f000080bf0000803f0000803f0000803f0000803f00000000000000008c12833be0d3ae3e0000484200000000000000c00000803f000000000000000000000000000000000000803f000080bf0000803f0000803f0000803f0000803f000000c0000000006f12833b9c829a3e0000484200008040000000000000803f000000000000000000000000000000000000803f000080bf0000803f0000803f0000803f0000803f000000000000804052bbaa3de0d3ae3e0000484200008040000000c00000803f000000000000000000000000000000000000803f000080bf0000803f0000803f0000803f0000803f000000c00000804050bbaa3d9c829a3e0000484200000000000000c00000000000000000000080bf0000803f0000000000000000000080bf0000803f0000803f0000803f0000803f00004842000000005317833b76ecb23d0000000000000000000000c00000000000000000000080bf0000803f0000000000000000000080bf0000803f0000803f0000803f0000803f000000000000000004fe7e3f76ecb23d0000484200008040000000c00000000000000000000080bf0000803f0000000000000000000080bf0000803f0000803f0000803f0000803f00004842000080406f12833b4fbb2a3e0000000000008040000000c00000000000000000000080bf0000803f0000000000000000000080bf0000803f0000803f0000803f0000803f0000000000008040fafd7e3f4fbb2a3e0000000000000000000000c0000080bf00000000000000000000000000000000000080bf000080bf0000803f0000803f0000803f0000803f000000400000000050bbaa3d0e25843e000000000000000000000000000080bf00000000000000000000000000000000000080bf000080bf0000803f0000803f0000803f0000803f000000000000000052bbaa3d5276983e0000000000008040000000c0000080bf00000000000000000000000000000000000080bf000080bf0000803f0000803f0000803f0000803f00000040000080406f12833b0e25843e000000000000804000000000000080bf00000000000000000000000000000000000080bf000080bf0000803f0000803f0000803f0000803f00000000000080408c12833b5276983e000000000000804000000000000000000000803f000000000000803f0000000000000000000080bf0000803f0000803f0000803f0000803f0000000000000000fcfd7e3fc418823e000048420000804000000000000000000000803f000000000000803f0000000000000000000080bf0000803f0000803f0000803f0000803f00004842000000006f12833bc418823e0000000000008040000000c0000000000000803f000000000000803f0000000000000000000080bf0000803f0000803f0000803f0000803f00000000000000c002fe7e3f008f5b3e0000484200008040000000c0000000000000803f000000000000803f0000000000000000000080bf0000803f0000803f0000803f0000803f00004842000000c09515833b008f5b3e0000000000000000000000c000000000000080bf00000000000080bf0000000000000000000080bf0000803f0000803f0000803f0000803f00000000000000c09515833be2d32e3e0000484200000000000000c000000000000080bf00000000000080bf0000000000000000000080bf0000803f0000803f0000803f0000803f000048c2000000c002fe7e3fe2d32e3e00000000000000000000000000000000000080bf00000000000080bf0000000000000000000080bf0000803f0000803f0000803f0000803f00000000000000006f12833b6c76573e00004842000000000000000000000000000080bf00000000000080bf0000000000000000000080bf0000803f0000803f0000803f0000803f000048c200000000fcfd7e3f6c76573e + m_DataSize: 1536 + _typelessdata: 00000000000000000000000000000000000000000000803f000080bf0000000000000000000080bf0000803f0000803f0000803f0000803f000000000000000000008040000000000000000000000000000000000000803f000080bf0000000000000000000080bf0000803f0000803f0000803f0000803f000080c0000000000000000080ffe63c0000000000000000000000000000803f000080bf0000000000000000000080bf0000803f0000803f0000803f0000803f0000000080ffe63c00008040000000400000000000000000000000000000803f000080bf0000000000000000000080bf0000803f0000803f0000803f0000803f000080c0000000400000804000000000000000000000803f000000000000000000000000000000000000803f000080bf0000803f0000803f0000803f0000803f00000000000000000000804000000000000000c00000803f000000000000000000000000000000000000803f000080bf0000803f0000803f0000803f0000803f000000c0000000000000804000000040000000000000803f000000000000000000000000000000000000803f000080bf0000803f0000803f0000803f0000803f00000000000000400000804000000040000000c00000803f000000000000000000000000000000000000803f000080bf0000803f0000803f0000803f0000803f000000c0000000400000804000000000000000c00000000000000000000080bf0000803f0000000000000000000080bf0000803f0000803f0000803f0000803f00008040000000000000000000000000000000c00000000000000000000080bf0000803f0000000000000000000080bf0000803f0000803f0000803f0000803f00000000000000000000804000000040000000c00000000000000000000080bf0000803f0000000000000000000080bf0000803f0000803f0000803f0000803f00008040000000400000000080ffe63c000000c00000000000000000000080bf0000803f0000000000000000000080bf0000803f0000803f0000803f0000803f0000000080ffe63c0000000000000000000000c0000080bf00000000000000000000000000000000000080bf000080bf0000803f0000803f0000803f0000803f0000004000000000000000000000000000000000000080bf00000000000000000000000000000000000080bf000080bf0000803f0000803f0000803f0000803f00000000000000000000000080ffe63c000000c0000080bf00000000000000000000000000000000000080bf000080bf0000803f0000803f0000803f0000803f0000004080ffe63c0000000080ffe63c00000000000080bf00000000000000000000000000000000000080bf000080bf0000803f0000803f0000803f0000803f0000000080ffe63c0000000080ffe63c000000003b61e2beff9d653f00000000ff9d653f3b61e23e00000000000080bf0000803f0000803f0000803f0000803f4b454c3c000000000000804000000040000000003b61e2beff9d653f00000000ff9d653f3b61e23e00000000000080bf0000803f0000803f0000803f0000803f271b8f40000000000000000080ffe63c000000c03b61e2beff9d653f00000000ff9d653f3b61e23e00000000000080bf0000803f0000803f0000803f0000803f4b454c3c000000c00000804000000040000000c03b61e2beff9d653f00000000ff9d653f3b61e23e00000000000080bf0000803f0000803f0000803f0000803f271b8f40000000c00000000000000000000000c000000000000080bf00000000000080bf0000000000000000000080bf0000803f0000803f0000803f0000803f00000000000000c00000804000000000000000c000000000000080bf00000000000080bf0000000000000000000080bf0000803f0000803f0000803f0000803f000080c0000000c000000000000000000000000000000000000080bf00000000000080bf0000000000000000000080bf0000803f0000803f0000803f0000803f000000000000000000008040000000000000000000000000000080bf00000000000080bf0000000000000000000080bf0000803f0000803f0000803f0000803f000080c000000000 m_CompressedMesh: m_Vertices: m_NumItems: 0 @@ -1395,15 +1432,16 @@ Mesh: m_BitSize: 0 m_UVInfo: 0 m_LocalAABB: - m_Center: {x: 25, y: 2, z: -1} - m_Extent: {x: 25, y: 2, z: 1} + m_Center: {x: 2, y: 1, z: -1} + m_Extent: {x: 2, y: 1, z: 1} m_MeshUsageFlags: 0 m_BakedConvexCollisionMesh: m_BakedTriangleCollisionMesh: m_MeshMetrics[0]: 1 m_MeshMetrics[1]: 1 - m_MeshOptimizationFlags: -1 + m_MeshOptimizationFlags: 1 m_StreamData: + serializedVersion: 2 offset: 0 size: 0 path: @@ -1440,7 +1478,7 @@ MeshCollider: serializedVersion: 4 m_Convex: 0 m_CookingOptions: 30 - m_Mesh: {fileID: 2139475336} + m_Mesh: {fileID: 441081149} --- !u!114 &822196691 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1453,7 +1491,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 8233d90336aea43098adf6dbabd606a2, type: 3} m_Name: m_EditorClassIdentifier: - m_MeshFormatVersion: 0 + m_MeshFormatVersion: 2 m_Faces: - m_Indexes: 020000000100000000000000 m_SmoothingGroup: 0 @@ -1467,7 +1505,7 @@ MonoBehaviour: m_Offset: {x: 0, y: 0} m_Rotation: 0 m_Anchor: 9 - m_Material: {fileID: 2100000, guid: c22777d6e868e4f2fb421913386b154e, type: 2} + m_Material: {fileID: 0} m_SubmeshIndex: 0 m_ManualUV: 0 elementGroup: 0 @@ -1481,10 +1519,10 @@ MonoBehaviour: m_SwapUV: 0 m_Fill: 1 m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} + m_Offset: {x: -0.0000009536743, y: -0.0000009536743} m_Rotation: 0 m_Anchor: 9 - m_Material: {fileID: 2100000, guid: c22777d6e868e4f2fb421913386b154e, type: 2} + m_Material: {fileID: 0} m_SubmeshIndex: 0 m_ManualUV: 0 elementGroup: 0 @@ -1501,7 +1539,7 @@ MonoBehaviour: m_Offset: {x: 0, y: 0} m_Rotation: 0 m_Anchor: 9 - m_Material: {fileID: 2100000, guid: c22777d6e868e4f2fb421913386b154e, type: 2} + m_Material: {fileID: 0} m_SubmeshIndex: 0 m_ManualUV: 0 elementGroup: 0 @@ -1518,7 +1556,7 @@ MonoBehaviour: m_Offset: {x: 0, y: 0} m_Rotation: 0 m_Anchor: 9 - m_Material: {fileID: 2100000, guid: c22777d6e868e4f2fb421913386b154e, type: 2} + m_Material: {fileID: 0} m_SubmeshIndex: 0 m_ManualUV: 0 elementGroup: 0 @@ -1535,7 +1573,7 @@ MonoBehaviour: m_Offset: {x: 0, y: 0} m_Rotation: 0 m_Anchor: 9 - m_Material: {fileID: 2100000, guid: c22777d6e868e4f2fb421913386b154e, type: 2} + m_Material: {fileID: 0} m_SubmeshIndex: 0 m_ManualUV: 0 elementGroup: 0 @@ -1571,10 +1609,10 @@ MonoBehaviour: - {x: 0, y: 0} - {x: 10, y: 0} - {x: 0, y: 3} - - {x: 9.578263, y: 0} - - {x: 9.578263, y: 10} - - {x: -0.86204374, y: 0} - - {x: -0.86204374, y: 10} + - {x: 9.578263, y: 0.0000009536743} + - {x: 9.578263, y: 10.000001} + - {x: -0.86204267, y: 0.0000009536743} + - {x: -0.86204267, y: 10.000001} - {x: -10, y: 0} - {x: 0, y: 0} - {x: 0, y: 3} @@ -1588,7 +1626,25 @@ MonoBehaviour: - {x: -10, y: 10} m_Textures2: [] m_Textures3: [] - m_Tangents: [] + m_Tangents: + - {x: 1, y: 0, z: 0, w: -1} + - {x: 1, y: 0, z: 0, w: -1} + - {x: 1, y: 0, z: 0, w: -1} + - {x: 0.9578263, y: -0.2873479, z: 0, w: -1} + - {x: 0.9578263, y: -0.2873479, z: 0, w: -1} + - {x: 0.9578263, y: -0.2873479, z: 0, w: -1} + - {x: 0.9578263, y: -0.2873479, z: 0, w: -1} + - {x: -1, y: 0, z: 0, w: -1} + - {x: -1, y: 0, z: 0, w: -1} + - {x: -1, y: 0, z: 0, w: -1} + - {x: 0, y: 0, z: -1, w: -1} + - {x: 0, y: 0, z: -1, w: -1} + - {x: 0, y: 0, z: -1, w: -1} + - {x: 0, y: 0, z: -1, w: -1} + - {x: -1, y: 0, z: 0, w: -1} + - {x: -1, y: 0, z: 0, w: -1} + - {x: -1, y: 0, z: 0, w: -1} + - {x: -1, y: 0, z: 0, w: -1} m_Colors: - {r: 1, g: 1, b: 1, a: 1} - {r: 1, g: 1, b: 1, a: 1} @@ -1615,6 +1671,8 @@ MonoBehaviour: m_AreaError: 15 m_PreserveMeshAssetOnDestroy: 0 assetGuid: + m_Mesh: {fileID: 441081149} + m_VersionIndex: 0 m_IsSelectable: 1 m_SelectedFaces: m_SelectedEdges: [] @@ -1630,10 +1688,12 @@ MeshRenderer: m_CastShadows: 2 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1658,14 +1718,15 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &822196693 MeshFilter: - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 10 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 822196689} - m_Mesh: {fileID: 2139475336} + m_Mesh: {fileID: 441081149} --- !u!4 &822196694 Transform: m_ObjectHideFlags: 0 @@ -1680,13 +1741,13 @@ Transform: m_Father: {fileID: 1454059292} m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!43 &936543454 +--- !u!43 &918208465 Mesh: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh12852 + m_Name: pb_Mesh17790 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -1697,8 +1758,8 @@ Mesh: firstVertex: 0 vertexCount: 24 localAABB: - m_Center: {x: 25, y: 2, z: -1} - m_Extent: {x: 25, y: 2, z: 1} + m_Center: {x: 27, y: 2, z: -0.9999987} + m_Extent: {x: 27, y: 2, z: 1.0000013} m_Shapes: vertices: [] shapes: [] @@ -1741,9 +1802,9 @@ Mesh: format: 0 dimension: 2 - stream: 0 - offset: 64 + offset: 0 format: 0 - dimension: 2 + dimension: 0 - stream: 0 offset: 0 format: 0 @@ -1776,8 +1837,8 @@ Mesh: offset: 0 format: 0 dimension: 0 - m_DataSize: 1728 - _typelessdata: 00000000000000000000000000000000000000000000803f000080bf0000000000000000000080bf0000803f0000803f0000803f0000803f00000000000000005317833b6f12833b00004842000000000000000000000000000000000000803f000080bf0000000000000000000080bf0000803f0000803f0000803f0000803f000048c20000000004fe7e3f6f12833b00000000000080400000000000000000000000000000803f000080bf0000000000000000000080bf0000803f0000803f0000803f0000803f00000000000080406f12833b4fbbaa3d00004842000080400000000000000000000000000000803f000080bf0000000000000000000080bf0000803f0000803f0000803f0000803f000048c200008040fafd7e3f4fbbaa3d0000484200000000000000000000803f000000000000000000000000000000000000803f000080bf0000803f0000803f0000803f0000803f00000000000000008c12833be0d3ae3e0000484200000000000000c00000803f000000000000000000000000000000000000803f000080bf0000803f0000803f0000803f0000803f000000c0000000006f12833b9c829a3e0000484200008040000000000000803f000000000000000000000000000000000000803f000080bf0000803f0000803f0000803f0000803f000000000000804052bbaa3de0d3ae3e0000484200008040000000c00000803f000000000000000000000000000000000000803f000080bf0000803f0000803f0000803f0000803f000000c00000804050bbaa3d9c829a3e0000484200000000000000c00000000000000000000080bf0000803f0000000000000000000080bf0000803f0000803f0000803f0000803f00004842000000005317833b76ecb23d0000000000000000000000c00000000000000000000080bf0000803f0000000000000000000080bf0000803f0000803f0000803f0000803f000000000000000004fe7e3f76ecb23d0000484200008040000000c00000000000000000000080bf0000803f0000000000000000000080bf0000803f0000803f0000803f0000803f00004842000080406f12833b4fbb2a3e0000000000008040000000c00000000000000000000080bf0000803f0000000000000000000080bf0000803f0000803f0000803f0000803f0000000000008040fafd7e3f4fbb2a3e0000000000000000000000c0000080bf00000000000000000000000000000000000080bf000080bf0000803f0000803f0000803f0000803f000000400000000050bbaa3d0e25843e000000000000000000000000000080bf00000000000000000000000000000000000080bf000080bf0000803f0000803f0000803f0000803f000000000000000052bbaa3d5276983e0000000000008040000000c0000080bf00000000000000000000000000000000000080bf000080bf0000803f0000803f0000803f0000803f00000040000080406f12833b0e25843e000000000000804000000000000080bf00000000000000000000000000000000000080bf000080bf0000803f0000803f0000803f0000803f00000000000080408c12833b5276983e000000000000804000000000000000000000803f000000000000803f0000000000000000000080bf0000803f0000803f0000803f0000803f0000000000000000fcfd7e3fc418823e000048420000804000000000000000000000803f000000000000803f0000000000000000000080bf0000803f0000803f0000803f0000803f00004842000000006f12833bc418823e0000000000008040000000c0000000000000803f000000000000803f0000000000000000000080bf0000803f0000803f0000803f0000803f00000000000000c002fe7e3f008f5b3e0000484200008040000000c0000000000000803f000000000000803f0000000000000000000080bf0000803f0000803f0000803f0000803f00004842000000c09515833b008f5b3e0000000000000000000000c000000000000080bf00000000000080bf0000000000000000000080bf0000803f0000803f0000803f0000803f00000000000000c09515833be2d32e3e0000484200000000000000c000000000000080bf00000000000080bf0000000000000000000080bf0000803f0000803f0000803f0000803f000048c2000000c002fe7e3fe2d32e3e00000000000000000000000000000000000080bf00000000000080bf0000000000000000000080bf0000803f0000803f0000803f0000803f00000000000000006f12833b6c76573e00004842000000000000000000000000000080bf00000000000080bf0000000000000000000080bf0000803f0000803f0000803f0000803f000048c200000000fcfd7e3f6c76573e + m_DataSize: 1536 + _typelessdata: 000000000000000000000000b49750b3000000000000803f000080bf00000000b49750b3000080bf0000803f0000803f0000803f0000803f0000000000000000000058420000000000003036b49750b3000000000000803f000080bf00000000b49750b3000080bf0000803f0000803f0000803f0000803f000058c200000000000000000000804000000000b49750b3000000000000803f000080bf00000000b49750b3000080bf0000803f0000803f0000803f0000803f0000000000008040000058420000804000003036b49750b3000000000000803f000080bf00000000b49750b3000080bf0000803f0000803f0000803f0000803f000058c2000080400000584200000000000030360000803f000000000000000000000000000000000000803f000080bf0000803f0000803f0000803f0000803f00003036000000000000584200000000eaffffbf0000803f000000000000000000000000000000000000803f000080bf0000803f0000803f0000803f0000803feaffffbf000000000000584200008040000030360000803f000000000000000000000000000000000000803f000080bf0000803f0000803f0000803f0000803f00003036000080400000584200008040eaffffbf0000803f000000000000000000000000000000000000803f000080bf0000803f0000803f0000803f0000803feaffffbf000080400000584200000000eaffffbfb497503300000000000080bf0000803f00000000b4975033000080bf0000803f0000803f0000803f0000803f00005842000000000000000000000000000000c0b497503300000000000080bf0000803f00000000b4975033000080bf0000803f0000803f0000803f0000803fb497d0b3000000000000584200008040eaffffbfb497503300000000000080bf0000803f00000000b4975033000080bf0000803f0000803f0000803f0000803f00005842000080400000000000008040000000c0b497503300000000000080bf0000803f00000000b4975033000080bf0000803f0000803f0000803f0000803fb497d0b3000080400000000000000000000000c0000080bf00000000000000000000000000000000000080bf000080bf0000803f0000803f0000803f0000803f0000004000000000000000000000000000000000000080bf00000000000000000000000000000000000080bf000080bf0000803f0000803f0000803f0000803f00000000000000000000000000008040000000c0000080bf00000000000000000000000000000000000080bf000080bf0000803f0000803f0000803f0000803f0000004000008040000000000000804000000000000080bf00000000000000000000000000000000000080bf000080bf0000803f0000803f0000803f0000803f0000000000008040000000000000804000000000000000000000803f000000000000803f0000000000000000000080bf0000803f0000803f0000803f0000803f0000000000000000000058420000804000003036000000000000803f000000000000803f0000000000000000000080bf0000803f0000803f0000803f0000803f00005842000030360000000000008040000000c0000000000000803f000000000000803f0000000000000000000080bf0000803f0000803f0000803f0000803f00000000000000c00000584200008040eaffffbf000000000000803f000000000000803f0000000000000000000080bf0000803f0000803f0000803f0000803f00005842eaffffbf0000000000000000000000c000000000000080bf00000000000080bf0000000000000000000080bf0000803f0000803f0000803f0000803f00000000000000c00000584200000000eaffffbf00000000000080bf00000000000080bf0000000000000000000080bf0000803f0000803f0000803f0000803f000058c2eaffffbf00000000000000000000000000000000000080bf00000000000080bf0000000000000000000080bf0000803f0000803f0000803f0000803f000000000000000000005842000000000000303600000000000080bf00000000000080bf0000000000000000000080bf0000803f0000803f0000803f0000803f000058c200003036 m_CompressedMesh: m_Vertices: m_NumItems: 0 @@ -1831,15 +1892,16 @@ Mesh: m_BitSize: 0 m_UVInfo: 0 m_LocalAABB: - m_Center: {x: 25, y: 2, z: -1} - m_Extent: {x: 25, y: 2, z: 1} + m_Center: {x: 27, y: 2, z: -0.9999987} + m_Extent: {x: 27, y: 2, z: 1.0000013} m_MeshUsageFlags: 0 m_BakedConvexCollisionMesh: m_BakedTriangleCollisionMesh: m_MeshMetrics[0]: 1 m_MeshMetrics[1]: 1 - m_MeshOptimizationFlags: -1 + m_MeshOptimizationFlags: 1 m_StreamData: + serializedVersion: 2 offset: 0 size: 0 path: @@ -1919,6 +1981,7 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!4 &969104895 @@ -1978,6 +2041,22 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 558b7c7278ea570498efb7d3d1bfc128, type: 3} m_Name: m_EditorClassIdentifier: + SlowMotionAction: + m_Name: Slow Motion + m_Type: 1 + m_ExpectedControlType: Button + m_Id: 558dce50-5502-43d9-ae82-705e951ac58a + m_Processors: + m_Interactions: + m_SingletonActionBindings: + - m_Name: + m_Id: 11f49f47-963a-439e-b0b8-a5a659d9261d + m_Path: /tab + m_Interactions: + m_Processors: + m_Groups: + m_Action: Slow Motion + m_Flags: 0 _targetFrameRate: 60 _slowMotion: 0.1 --- !u!1 &995379447 @@ -2013,7 +2092,7 @@ MeshCollider: serializedVersion: 4 m_Convex: 0 m_CookingOptions: 30 - m_Mesh: {fileID: 203689434} + m_Mesh: {fileID: 918208465} --- !u!114 &995379449 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2026,7 +2105,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 8233d90336aea43098adf6dbabd606a2, type: 3} m_Name: m_EditorClassIdentifier: - m_MeshFormatVersion: 0 + m_MeshFormatVersion: 2 m_Faces: - m_Indexes: 000000000100000002000000010000000300000002000000 m_SmoothingGroup: 0 @@ -2040,7 +2119,7 @@ MonoBehaviour: m_Offset: {x: 0, y: 0} m_Rotation: 0 m_Anchor: 9 - m_Material: {fileID: 2100000, guid: 19139a8c4e62dbc499032524d6c5d83c, type: 2} + m_Material: {fileID: 0} m_SubmeshIndex: 0 m_ManualUV: 0 elementGroup: 0 @@ -2057,7 +2136,7 @@ MonoBehaviour: m_Offset: {x: 0, y: 0} m_Rotation: 0 m_Anchor: 9 - m_Material: {fileID: 2100000, guid: 19139a8c4e62dbc499032524d6c5d83c, type: 2} + m_Material: {fileID: 0} m_SubmeshIndex: 0 m_ManualUV: 0 elementGroup: 0 @@ -2074,7 +2153,7 @@ MonoBehaviour: m_Offset: {x: 0, y: 0} m_Rotation: 0 m_Anchor: 9 - m_Material: {fileID: 2100000, guid: 19139a8c4e62dbc499032524d6c5d83c, type: 2} + m_Material: {fileID: 0} m_SubmeshIndex: 0 m_ManualUV: 0 elementGroup: 0 @@ -2091,7 +2170,7 @@ MonoBehaviour: m_Offset: {x: 0, y: 0} m_Rotation: 0 m_Anchor: 9 - m_Material: {fileID: 2100000, guid: 19139a8c4e62dbc499032524d6c5d83c, type: 2} + m_Material: {fileID: 0} m_SubmeshIndex: 0 m_ManualUV: 0 elementGroup: 0 @@ -2108,7 +2187,7 @@ MonoBehaviour: m_Offset: {x: 0, y: 0} m_Rotation: 0 m_Anchor: 9 - m_Material: {fileID: 2100000, guid: 19139a8c4e62dbc499032524d6c5d83c, type: 2} + m_Material: {fileID: 0} m_SubmeshIndex: 0 m_ManualUV: 0 elementGroup: 0 @@ -2125,7 +2204,7 @@ MonoBehaviour: m_Offset: {x: 0, y: 0} m_Rotation: 0 m_Anchor: 9 - m_Material: {fileID: 2100000, guid: 19139a8c4e62dbc499032524d6c5d83c, type: 2} + m_Material: {fileID: 0} m_SubmeshIndex: 0 m_ManualUV: 0 elementGroup: 0 @@ -2192,7 +2271,31 @@ MonoBehaviour: - {x: -54, y: 0.0000026226044} m_Textures2: [] m_Textures3: [] - m_Tangents: [] + m_Tangents: + - {x: -1, y: 0, z: -0.000000048566747, w: -1} + - {x: -1, y: 0, z: -0.000000048566747, w: -1} + - {x: -1, y: 0, z: -0.000000048566747, w: -1} + - {x: -1, y: 0, z: -0.000000048566747, w: -1} + - {x: 0, y: 0, z: 1, w: -1} + - {x: 0, y: 0, z: 1, w: -1} + - {x: 0, y: 0, z: 1, w: -1} + - {x: 0, y: 0, z: 1, w: -1} + - {x: 1, y: 0, z: 0.000000048566747, w: -1} + - {x: 1, y: 0, z: 0.000000048566747, w: -1} + - {x: 1, y: 0, z: 0.000000048566747, w: -1} + - {x: 1, y: 0, z: 0.000000048566747, w: -1} + - {x: 0, y: 0, z: -1, w: -1} + - {x: 0, y: 0, z: -1, w: -1} + - {x: 0, y: 0, z: -1, w: -1} + - {x: 0, y: 0, z: -1, w: -1} + - {x: 1, y: 0, z: 0, w: -1} + - {x: 1, y: 0, z: 0, w: -1} + - {x: 1, y: 0, z: 0, w: -1} + - {x: 1, y: 0, z: 0, w: -1} + - {x: -1, y: 0, z: 0, w: -1} + - {x: -1, y: 0, z: 0, w: -1} + - {x: -1, y: 0, z: 0, w: -1} + - {x: -1, y: 0, z: 0, w: -1} m_Colors: - {r: 1, g: 1, b: 1, a: 1} - {r: 1, g: 1, b: 1, a: 1} @@ -2225,6 +2328,8 @@ MonoBehaviour: m_AreaError: 15 m_PreserveMeshAssetOnDestroy: 0 assetGuid: + m_Mesh: {fileID: 918208465} + m_VersionIndex: 0 m_IsSelectable: 1 m_SelectedFaces: m_SelectedEdges: [] @@ -2240,10 +2345,12 @@ MeshRenderer: m_CastShadows: 2 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2268,14 +2375,15 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &995379451 MeshFilter: - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 10 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 995379447} - m_Mesh: {fileID: 203689434} + m_Mesh: {fileID: 918208465} --- !u!4 &995379452 Transform: m_ObjectHideFlags: 0 @@ -2348,6 +2456,7 @@ MonoBehaviour: m_FallbackScreenDPI: 96 m_DefaultSpriteDPI: 96 m_DynamicPixelsPerUnit: 1 + m_PresetInfoIsWorld: 0 --- !u!223 &1120238614 Canvas: m_ObjectHideFlags: 0 @@ -2422,7 +2531,7 @@ MeshCollider: serializedVersion: 4 m_Convex: 0 m_CookingOptions: 30 - m_Mesh: {fileID: 400395614} + m_Mesh: {fileID: 653134222} --- !u!114 &1353362938 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2435,7 +2544,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 8233d90336aea43098adf6dbabd606a2, type: 3} m_Name: m_EditorClassIdentifier: - m_MeshFormatVersion: 0 + m_MeshFormatVersion: 2 m_Faces: - m_Indexes: 000000000100000002000000010000000300000002000000 m_SmoothingGroup: 0 @@ -2449,7 +2558,7 @@ MonoBehaviour: m_Offset: {x: 0, y: 0} m_Rotation: 0 m_Anchor: 9 - m_Material: {fileID: 2100000, guid: 19139a8c4e62dbc499032524d6c5d83c, type: 2} + m_Material: {fileID: 0} m_SubmeshIndex: 0 m_ManualUV: 0 elementGroup: 0 @@ -2466,7 +2575,7 @@ MonoBehaviour: m_Offset: {x: 0, y: 0} m_Rotation: 0 m_Anchor: 9 - m_Material: {fileID: 2100000, guid: 19139a8c4e62dbc499032524d6c5d83c, type: 2} + m_Material: {fileID: 0} m_SubmeshIndex: 0 m_ManualUV: 0 elementGroup: 0 @@ -2483,7 +2592,7 @@ MonoBehaviour: m_Offset: {x: 0, y: 0} m_Rotation: 0 m_Anchor: 9 - m_Material: {fileID: 2100000, guid: 19139a8c4e62dbc499032524d6c5d83c, type: 2} + m_Material: {fileID: 0} m_SubmeshIndex: 0 m_ManualUV: 0 elementGroup: 0 @@ -2500,7 +2609,7 @@ MonoBehaviour: m_Offset: {x: 0, y: 0} m_Rotation: 0 m_Anchor: 9 - m_Material: {fileID: 2100000, guid: 19139a8c4e62dbc499032524d6c5d83c, type: 2} + m_Material: {fileID: 0} m_SubmeshIndex: 0 m_ManualUV: 0 elementGroup: 0 @@ -2517,7 +2626,7 @@ MonoBehaviour: m_Offset: {x: 0, y: 0} m_Rotation: 0 m_Anchor: 9 - m_Material: {fileID: 2100000, guid: 19139a8c4e62dbc499032524d6c5d83c, type: 2} + m_Material: {fileID: 0} m_SubmeshIndex: 0 m_ManualUV: 0 elementGroup: 0 @@ -2534,7 +2643,7 @@ MonoBehaviour: m_Offset: {x: 0, y: 0} m_Rotation: 0 m_Anchor: 9 - m_Material: {fileID: 2100000, guid: 19139a8c4e62dbc499032524d6c5d83c, type: 2} + m_Material: {fileID: 0} m_SubmeshIndex: 0 m_ManualUV: 0 elementGroup: 0 @@ -2601,7 +2710,31 @@ MonoBehaviour: - {x: -54, y: 0.0000026226044} m_Textures2: [] m_Textures3: [] - m_Tangents: [] + m_Tangents: + - {x: -1, y: 0, z: -0.000000048566747, w: -1} + - {x: -1, y: 0, z: -0.000000048566747, w: -1} + - {x: -1, y: 0, z: -0.000000048566747, w: -1} + - {x: -1, y: 0, z: -0.000000048566747, w: -1} + - {x: 0, y: 0, z: 1, w: -1} + - {x: 0, y: 0, z: 1, w: -1} + - {x: 0, y: 0, z: 1, w: -1} + - {x: 0, y: 0, z: 1, w: -1} + - {x: 1, y: 0, z: 0.000000048566747, w: -1} + - {x: 1, y: 0, z: 0.000000048566747, w: -1} + - {x: 1, y: 0, z: 0.000000048566747, w: -1} + - {x: 1, y: 0, z: 0.000000048566747, w: -1} + - {x: 0, y: 0, z: -1, w: -1} + - {x: 0, y: 0, z: -1, w: -1} + - {x: 0, y: 0, z: -1, w: -1} + - {x: 0, y: 0, z: -1, w: -1} + - {x: 1, y: 0, z: 0, w: -1} + - {x: 1, y: 0, z: 0, w: -1} + - {x: 1, y: 0, z: 0, w: -1} + - {x: 1, y: 0, z: 0, w: -1} + - {x: -1, y: 0, z: 0, w: -1} + - {x: -1, y: 0, z: 0, w: -1} + - {x: -1, y: 0, z: 0, w: -1} + - {x: -1, y: 0, z: 0, w: -1} m_Colors: - {r: 1, g: 1, b: 1, a: 1} - {r: 1, g: 1, b: 1, a: 1} @@ -2634,6 +2767,8 @@ MonoBehaviour: m_AreaError: 15 m_PreserveMeshAssetOnDestroy: 0 assetGuid: + m_Mesh: {fileID: 653134222} + m_VersionIndex: 0 m_IsSelectable: 1 m_SelectedFaces: m_SelectedEdges: [] @@ -2649,10 +2784,12 @@ MeshRenderer: m_CastShadows: 2 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2677,14 +2814,15 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1353362940 MeshFilter: - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 10 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1353362936} - m_Mesh: {fileID: 400395614} + m_Mesh: {fileID: 653134222} --- !u!4 &1353362941 Transform: m_ObjectHideFlags: 0 @@ -2699,6 +2837,170 @@ Transform: m_Father: {fileID: 1454059292} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: -90.00001, z: 0} +--- !u!43 &1398255767 +Mesh: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: pb_Mesh17732 + serializedVersion: 10 + m_SubMeshes: + - serializedVersion: 2 + firstByte: 0 + indexCount: 36 + topology: 0 + baseVertex: 0 + firstVertex: 0 + vertexCount: 24 + localAABB: + m_Center: {x: 1.5, y: 1, z: -5} + m_Extent: {x: 1.5, y: 1, z: 5} + m_Shapes: + vertices: [] + shapes: [] + channels: [] + fullWeights: [] + m_BindPose: [] + m_BoneNameHashes: + m_RootBoneNameHash: 0 + m_BonesAABB: [] + m_VariableBoneCountWeights: + m_Data: + m_MeshCompression: 0 + m_IsReadable: 1 + m_KeepVertices: 1 + m_KeepIndices: 1 + m_IndexFormat: 0 + m_IndexBuffer: 000001000200010003000200040005000600050007000600080009000a0009000b000a000c000d000e000d000f000e00100011001200110013001200140015001600150017001600 + m_VertexData: + serializedVersion: 3 + m_VertexCount: 24 + m_Channels: + - stream: 0 + offset: 0 + format: 0 + dimension: 3 + - stream: 0 + offset: 12 + format: 0 + dimension: 3 + - stream: 0 + offset: 24 + format: 0 + dimension: 4 + - stream: 0 + offset: 40 + format: 0 + dimension: 4 + - stream: 0 + offset: 56 + format: 0 + dimension: 2 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + m_DataSize: 1536 + _typelessdata: 00000000000000000000000000000000000000000000803f000080bf0000000000000000000080bf0000803f0000803f0000803f0000803f000000000000000000004040000000000000000000000000000000000000803f000080bf0000000000000000000080bf0000803f0000803f0000803f0000803f000040c00000000000000000000000400000000000000000000000000000803f000080bf0000000000000000000080bf0000803f0000803f0000803f0000803f000000000000004000004040000000400000000000000000000000000000803f000080bf0000000000000000000080bf0000803f0000803f0000803f0000803f000040c0000000400000404000000000000000000000803f000000000000000000000000000000000000803f000080bf0000803f0000803f0000803f0000803f00000000000000000000404000000000000020c10000803f000000000000000000000000000000000000803f000080bf0000803f0000803f0000803f0000803f000020c1000000000000404000000040000000000000803f000000000000000000000000000000000000803f000080bf0000803f0000803f0000803f0000803f00000000000000400000404000000040000020c10000803f000000000000000000000000000000000000803f000080bf0000803f0000803f0000803f0000803f000020c1000000400000404000000000000020c10000000000000000000080bf0000803f0000000000000000000080bf0000803f0000803f0000803f0000803f00004040000000000000000000000000000020c10000000000000000000080bf0000803f0000000000000000000080bf0000803f0000803f0000803f0000803f00000000000000000000404000000040000020c10000000000000000000080bf0000803f0000000000000000000080bf0000803f0000803f0000803f0000803f00004040000000400000000000000040000020c10000000000000000000080bf0000803f0000000000000000000080bf0000803f0000803f0000803f0000803f00000000000000400000000000000000000020c1000080bf00000000000000000000000000000000000080bf000080bf0000803f0000803f0000803f0000803f0000204100000000000000000000000000000000000080bf00000000000000000000000000000000000080bf000080bf0000803f0000803f0000803f0000803f00000000000000000000000000000040000020c1000080bf00000000000000000000000000000000000080bf000080bf0000803f0000803f0000803f0000803f0000204100000040000000000000004000000000000080bf00000000000000000000000000000000000080bf000080bf0000803f0000803f0000803f0000803f0000000000000040000000000000004000000000000000000000803f000000000000803f0000000000000000000080bf0000803f0000803f0000803f0000803f0000000000000000000040400000004000000000000000000000803f000000000000803f0000000000000000000080bf0000803f0000803f0000803f0000803f00004040000000000000000000000040000020c1000000000000803f000000000000803f0000000000000000000080bf0000803f0000803f0000803f0000803f00000000000020c10000404000000040000020c1000000000000803f000000000000803f0000000000000000000080bf0000803f0000803f0000803f0000803f00004040000020c10000000000000000000020c100000000000080bf00000000000080bf0000000000000000000080bf0000803f0000803f0000803f0000803f00000000000020c10000404000000000000020c100000000000080bf00000000000080bf0000000000000000000080bf0000803f0000803f0000803f0000803f000040c0000020c100000000000000000000000000000000000080bf00000000000080bf0000000000000000000080bf0000803f0000803f0000803f0000803f000000000000000000004040000000000000000000000000000080bf00000000000080bf0000000000000000000080bf0000803f0000803f0000803f0000803f000040c000000000 + m_CompressedMesh: + m_Vertices: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_UV: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Normals: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Tangents: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Weights: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_NormalSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_TangentSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_FloatColors: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_BoneIndices: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_Triangles: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_UVInfo: 0 + m_LocalAABB: + m_Center: {x: 1.5, y: 1, z: -5} + m_Extent: {x: 1.5, y: 1, z: 5} + m_MeshUsageFlags: 0 + m_BakedConvexCollisionMesh: + m_BakedTriangleCollisionMesh: + m_MeshMetrics[0]: 1 + m_MeshMetrics[1]: 1 + m_MeshOptimizationFlags: 1 + m_StreamData: + serializedVersion: 2 + offset: 0 + size: 0 + path: --- !u!1 &1448740319 GameObject: m_ObjectHideFlags: 0 @@ -2726,16 +3028,35 @@ MonoBehaviour: m_GameObject: {fileID: 1448740319} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3} + m_Script: {fileID: 11500000, guid: 01614664b831546d2ae94a42149d80ac, type: 3} m_Name: m_EditorClassIdentifier: - m_HorizontalAxis: Horizontal - m_VerticalAxis: Vertical - m_SubmitButton: Submit - m_CancelButton: Cancel - m_InputActionsPerSecond: 10 - m_RepeatDelay: 0.5 - m_ForceModuleActive: 0 + m_MoveRepeatDelay: 0.5 + m_MoveRepeatRate: 0.1 + m_ActionsAsset: {fileID: -944628639613478452, guid: ca9f5fa95ffab41fb9a615ab714db018, + type: 3} + m_PointAction: {fileID: 1054132383583890850, guid: ca9f5fa95ffab41fb9a615ab714db018, + type: 3} + m_MoveAction: {fileID: 3710738434707379630, guid: ca9f5fa95ffab41fb9a615ab714db018, + type: 3} + m_SubmitAction: {fileID: 2064916234097673511, guid: ca9f5fa95ffab41fb9a615ab714db018, + type: 3} + m_CancelAction: {fileID: -1967631576421560919, guid: ca9f5fa95ffab41fb9a615ab714db018, + type: 3} + m_LeftClickAction: {fileID: 8056856818456041789, guid: ca9f5fa95ffab41fb9a615ab714db018, + type: 3} + m_MiddleClickAction: {fileID: 3279352641294131588, guid: ca9f5fa95ffab41fb9a615ab714db018, + type: 3} + m_RightClickAction: {fileID: 3837173908680883260, guid: ca9f5fa95ffab41fb9a615ab714db018, + type: 3} + m_ScrollWheelAction: {fileID: 4502412055082496612, guid: ca9f5fa95ffab41fb9a615ab714db018, + type: 3} + m_TrackedDevicePositionAction: {fileID: 4754684134866288074, guid: ca9f5fa95ffab41fb9a615ab714db018, + type: 3} + m_TrackedDeviceOrientationAction: {fileID: 1025543830046995696, guid: ca9f5fa95ffab41fb9a615ab714db018, + type: 3} + m_DeselectOnBackgroundClick: 1 + m_PointerBehavior: 0 --- !u!114 &1448740321 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2837,7 +3158,7 @@ MeshCollider: serializedVersion: 4 m_Convex: 0 m_CookingOptions: 30 - m_Mesh: {fileID: 761118632} + m_Mesh: {fileID: 1743696005} --- !u!114 &1612731907 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2850,7 +3171,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 8233d90336aea43098adf6dbabd606a2, type: 3} m_Name: m_EditorClassIdentifier: - m_MeshFormatVersion: 0 + m_MeshFormatVersion: 2 m_Faces: - m_Indexes: 000000000100000002000000010000000300000002000000 m_SmoothingGroup: 0 @@ -2864,7 +3185,7 @@ MonoBehaviour: m_Offset: {x: 0, y: 0} m_Rotation: 0 m_Anchor: 9 - m_Material: {fileID: 2100000, guid: 19139a8c4e62dbc499032524d6c5d83c, type: 2} + m_Material: {fileID: 0} m_SubmeshIndex: 0 m_ManualUV: 0 elementGroup: 0 @@ -2881,7 +3202,7 @@ MonoBehaviour: m_Offset: {x: 0, y: 0} m_Rotation: 0 m_Anchor: 9 - m_Material: {fileID: 2100000, guid: 19139a8c4e62dbc499032524d6c5d83c, type: 2} + m_Material: {fileID: 0} m_SubmeshIndex: 0 m_ManualUV: 0 elementGroup: 0 @@ -2898,7 +3219,7 @@ MonoBehaviour: m_Offset: {x: 0, y: 0} m_Rotation: 0 m_Anchor: 9 - m_Material: {fileID: 2100000, guid: 19139a8c4e62dbc499032524d6c5d83c, type: 2} + m_Material: {fileID: 0} m_SubmeshIndex: 0 m_ManualUV: 0 elementGroup: 0 @@ -2915,7 +3236,7 @@ MonoBehaviour: m_Offset: {x: 0, y: 0} m_Rotation: 0 m_Anchor: 9 - m_Material: {fileID: 2100000, guid: 19139a8c4e62dbc499032524d6c5d83c, type: 2} + m_Material: {fileID: 0} m_SubmeshIndex: 0 m_ManualUV: 0 elementGroup: 0 @@ -2932,7 +3253,7 @@ MonoBehaviour: m_Offset: {x: 0, y: 0} m_Rotation: 0 m_Anchor: 9 - m_Material: {fileID: 2100000, guid: 19139a8c4e62dbc499032524d6c5d83c, type: 2} + m_Material: {fileID: 0} m_SubmeshIndex: 0 m_ManualUV: 0 elementGroup: 0 @@ -2949,7 +3270,7 @@ MonoBehaviour: m_Offset: {x: 0, y: 0} m_Rotation: 0 m_Anchor: 9 - m_Material: {fileID: 2100000, guid: 19139a8c4e62dbc499032524d6c5d83c, type: 2} + m_Material: {fileID: 0} m_SubmeshIndex: 0 m_ManualUV: 0 elementGroup: 0 @@ -3016,7 +3337,31 @@ MonoBehaviour: - {x: -50, y: 0} m_Textures2: [] m_Textures3: [] - m_Tangents: [] + m_Tangents: + - {x: -1, y: 0, z: 0, w: -1} + - {x: -1, y: 0, z: 0, w: -1} + - {x: -1, y: 0, z: 0, w: -1} + - {x: -1, y: 0, z: 0, w: -1} + - {x: 0, y: 0, z: 1, w: -1} + - {x: 0, y: 0, z: 1, w: -1} + - {x: 0, y: 0, z: 1, w: -1} + - {x: 0, y: 0, z: 1, w: -1} + - {x: 1, y: 0, z: 0, w: -1} + - {x: 1, y: 0, z: 0, w: -1} + - {x: 1, y: 0, z: 0, w: -1} + - {x: 1, y: 0, z: 0, w: -1} + - {x: 0, y: 0, z: -1, w: -1} + - {x: 0, y: 0, z: -1, w: -1} + - {x: 0, y: 0, z: -1, w: -1} + - {x: 0, y: 0, z: -1, w: -1} + - {x: 1, y: 0, z: 0, w: -1} + - {x: 1, y: 0, z: 0, w: -1} + - {x: 1, y: 0, z: 0, w: -1} + - {x: 1, y: 0, z: 0, w: -1} + - {x: -1, y: 0, z: 0, w: -1} + - {x: -1, y: 0, z: 0, w: -1} + - {x: -1, y: 0, z: 0, w: -1} + - {x: -1, y: 0, z: 0, w: -1} m_Colors: - {r: 1, g: 1, b: 1, a: 1} - {r: 1, g: 1, b: 1, a: 1} @@ -3049,6 +3394,8 @@ MonoBehaviour: m_AreaError: 15 m_PreserveMeshAssetOnDestroy: 0 assetGuid: + m_Mesh: {fileID: 1743696005} + m_VersionIndex: 0 m_IsSelectable: 1 m_SelectedFaces: m_SelectedEdges: [] @@ -3064,10 +3411,12 @@ MeshRenderer: m_CastShadows: 2 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -3092,14 +3441,15 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1612731909 MeshFilter: - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 10 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1612731905} - m_Mesh: {fileID: 761118632} + m_Mesh: {fileID: 1743696005} --- !u!4 &1612731910 Transform: m_ObjectHideFlags: 0 @@ -3147,7 +3497,7 @@ MeshCollider: serializedVersion: 4 m_Convex: 0 m_CookingOptions: 30 - m_Mesh: {fileID: 936543454} + m_Mesh: {fileID: 1742155073} --- !u!114 &1672926993 MonoBehaviour: m_ObjectHideFlags: 0 @@ -3160,7 +3510,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 8233d90336aea43098adf6dbabd606a2, type: 3} m_Name: m_EditorClassIdentifier: - m_MeshFormatVersion: 0 + m_MeshFormatVersion: 2 m_Faces: - m_Indexes: 000000000100000002000000010000000300000002000000 m_SmoothingGroup: 0 @@ -3174,7 +3524,7 @@ MonoBehaviour: m_Offset: {x: 0, y: 0} m_Rotation: 0 m_Anchor: 9 - m_Material: {fileID: 2100000, guid: 19139a8c4e62dbc499032524d6c5d83c, type: 2} + m_Material: {fileID: 0} m_SubmeshIndex: 0 m_ManualUV: 0 elementGroup: 0 @@ -3191,7 +3541,7 @@ MonoBehaviour: m_Offset: {x: 0, y: 0} m_Rotation: 0 m_Anchor: 9 - m_Material: {fileID: 2100000, guid: 19139a8c4e62dbc499032524d6c5d83c, type: 2} + m_Material: {fileID: 0} m_SubmeshIndex: 0 m_ManualUV: 0 elementGroup: 0 @@ -3208,7 +3558,7 @@ MonoBehaviour: m_Offset: {x: 0, y: 0} m_Rotation: 0 m_Anchor: 9 - m_Material: {fileID: 2100000, guid: 19139a8c4e62dbc499032524d6c5d83c, type: 2} + m_Material: {fileID: 0} m_SubmeshIndex: 0 m_ManualUV: 0 elementGroup: 0 @@ -3225,7 +3575,7 @@ MonoBehaviour: m_Offset: {x: 0, y: 0} m_Rotation: 0 m_Anchor: 9 - m_Material: {fileID: 2100000, guid: 19139a8c4e62dbc499032524d6c5d83c, type: 2} + m_Material: {fileID: 0} m_SubmeshIndex: 0 m_ManualUV: 0 elementGroup: 0 @@ -3242,7 +3592,7 @@ MonoBehaviour: m_Offset: {x: 0, y: 0} m_Rotation: 0 m_Anchor: 9 - m_Material: {fileID: 2100000, guid: 19139a8c4e62dbc499032524d6c5d83c, type: 2} + m_Material: {fileID: 0} m_SubmeshIndex: 0 m_ManualUV: 0 elementGroup: 0 @@ -3259,7 +3609,7 @@ MonoBehaviour: m_Offset: {x: 0, y: 0} m_Rotation: 0 m_Anchor: 9 - m_Material: {fileID: 2100000, guid: 19139a8c4e62dbc499032524d6c5d83c, type: 2} + m_Material: {fileID: 0} m_SubmeshIndex: 0 m_ManualUV: 0 elementGroup: 0 @@ -3326,7 +3676,31 @@ MonoBehaviour: - {x: -50, y: 0} m_Textures2: [] m_Textures3: [] - m_Tangents: [] + m_Tangents: + - {x: -1, y: 0, z: 0, w: -1} + - {x: -1, y: 0, z: 0, w: -1} + - {x: -1, y: 0, z: 0, w: -1} + - {x: -1, y: 0, z: 0, w: -1} + - {x: 0, y: 0, z: 1, w: -1} + - {x: 0, y: 0, z: 1, w: -1} + - {x: 0, y: 0, z: 1, w: -1} + - {x: 0, y: 0, z: 1, w: -1} + - {x: 1, y: 0, z: 0, w: -1} + - {x: 1, y: 0, z: 0, w: -1} + - {x: 1, y: 0, z: 0, w: -1} + - {x: 1, y: 0, z: 0, w: -1} + - {x: 0, y: 0, z: -1, w: -1} + - {x: 0, y: 0, z: -1, w: -1} + - {x: 0, y: 0, z: -1, w: -1} + - {x: 0, y: 0, z: -1, w: -1} + - {x: 1, y: 0, z: 0, w: -1} + - {x: 1, y: 0, z: 0, w: -1} + - {x: 1, y: 0, z: 0, w: -1} + - {x: 1, y: 0, z: 0, w: -1} + - {x: -1, y: 0, z: 0, w: -1} + - {x: -1, y: 0, z: 0, w: -1} + - {x: -1, y: 0, z: 0, w: -1} + - {x: -1, y: 0, z: 0, w: -1} m_Colors: - {r: 1, g: 1, b: 1, a: 1} - {r: 1, g: 1, b: 1, a: 1} @@ -3359,6 +3733,8 @@ MonoBehaviour: m_AreaError: 15 m_PreserveMeshAssetOnDestroy: 0 assetGuid: + m_Mesh: {fileID: 1742155073} + m_VersionIndex: 0 m_IsSelectable: 1 m_SelectedFaces: m_SelectedEdges: [] @@ -3374,10 +3750,12 @@ MeshRenderer: m_CastShadows: 2 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -3402,14 +3780,15 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1672926995 MeshFilter: - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 10 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1672926991} - m_Mesh: {fileID: 936543454} + m_Mesh: {fileID: 1742155073} --- !u!4 &1672926996 Transform: m_ObjectHideFlags: 0 @@ -3424,6 +3803,334 @@ Transform: m_Father: {fileID: 1454059292} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!43 &1742155073 +Mesh: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: pb_Mesh17848 + serializedVersion: 10 + m_SubMeshes: + - serializedVersion: 2 + firstByte: 0 + indexCount: 36 + topology: 0 + baseVertex: 0 + firstVertex: 0 + vertexCount: 24 + localAABB: + m_Center: {x: 25, y: 2, z: -1} + m_Extent: {x: 25, y: 2, z: 1} + m_Shapes: + vertices: [] + shapes: [] + channels: [] + fullWeights: [] + m_BindPose: [] + m_BoneNameHashes: + m_RootBoneNameHash: 0 + m_BonesAABB: [] + m_VariableBoneCountWeights: + m_Data: + m_MeshCompression: 0 + m_IsReadable: 1 + m_KeepVertices: 1 + m_KeepIndices: 1 + m_IndexFormat: 0 + m_IndexBuffer: 000001000200010003000200040005000600050007000600080009000a0009000b000a000c000d000e000d000f000e00100011001200110013001200140015001600150017001600 + m_VertexData: + serializedVersion: 3 + m_VertexCount: 24 + m_Channels: + - stream: 0 + offset: 0 + format: 0 + dimension: 3 + - stream: 0 + offset: 12 + format: 0 + dimension: 3 + - stream: 0 + offset: 24 + format: 0 + dimension: 4 + - stream: 0 + offset: 40 + format: 0 + dimension: 4 + - stream: 0 + offset: 56 + format: 0 + dimension: 2 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + m_DataSize: 1536 + _typelessdata: 00000000000000000000000000000000000000000000803f000080bf0000000000000000000080bf0000803f0000803f0000803f0000803f000000000000000000004842000000000000000000000000000000000000803f000080bf0000000000000000000080bf0000803f0000803f0000803f0000803f000048c20000000000000000000080400000000000000000000000000000803f000080bf0000000000000000000080bf0000803f0000803f0000803f0000803f000000000000804000004842000080400000000000000000000000000000803f000080bf0000000000000000000080bf0000803f0000803f0000803f0000803f000048c2000080400000484200000000000000000000803f000000000000000000000000000000000000803f000080bf0000803f0000803f0000803f0000803f00000000000000000000484200000000000000c00000803f000000000000000000000000000000000000803f000080bf0000803f0000803f0000803f0000803f000000c0000000000000484200008040000000000000803f000000000000000000000000000000000000803f000080bf0000803f0000803f0000803f0000803f00000000000080400000484200008040000000c00000803f000000000000000000000000000000000000803f000080bf0000803f0000803f0000803f0000803f000000c0000080400000484200000000000000c00000000000000000000080bf0000803f0000000000000000000080bf0000803f0000803f0000803f0000803f00004842000000000000000000000000000000c00000000000000000000080bf0000803f0000000000000000000080bf0000803f0000803f0000803f0000803f00000000000000000000484200008040000000c00000000000000000000080bf0000803f0000000000000000000080bf0000803f0000803f0000803f0000803f00004842000080400000000000008040000000c00000000000000000000080bf0000803f0000000000000000000080bf0000803f0000803f0000803f0000803f00000000000080400000000000000000000000c0000080bf00000000000000000000000000000000000080bf000080bf0000803f0000803f0000803f0000803f0000004000000000000000000000000000000000000080bf00000000000000000000000000000000000080bf000080bf0000803f0000803f0000803f0000803f00000000000000000000000000008040000000c0000080bf00000000000000000000000000000000000080bf000080bf0000803f0000803f0000803f0000803f0000004000008040000000000000804000000000000080bf00000000000000000000000000000000000080bf000080bf0000803f0000803f0000803f0000803f0000000000008040000000000000804000000000000000000000803f000000000000803f0000000000000000000080bf0000803f0000803f0000803f0000803f0000000000000000000048420000804000000000000000000000803f000000000000803f0000000000000000000080bf0000803f0000803f0000803f0000803f00004842000000000000000000008040000000c0000000000000803f000000000000803f0000000000000000000080bf0000803f0000803f0000803f0000803f00000000000000c00000484200008040000000c0000000000000803f000000000000803f0000000000000000000080bf0000803f0000803f0000803f0000803f00004842000000c00000000000000000000000c000000000000080bf00000000000080bf0000000000000000000080bf0000803f0000803f0000803f0000803f00000000000000c00000484200000000000000c000000000000080bf00000000000080bf0000000000000000000080bf0000803f0000803f0000803f0000803f000048c2000000c000000000000000000000000000000000000080bf00000000000080bf0000000000000000000080bf0000803f0000803f0000803f0000803f000000000000000000004842000000000000000000000000000080bf00000000000080bf0000000000000000000080bf0000803f0000803f0000803f0000803f000048c200000000 + m_CompressedMesh: + m_Vertices: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_UV: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Normals: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Tangents: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Weights: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_NormalSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_TangentSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_FloatColors: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_BoneIndices: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_Triangles: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_UVInfo: 0 + m_LocalAABB: + m_Center: {x: 25, y: 2, z: -1} + m_Extent: {x: 25, y: 2, z: 1} + m_MeshUsageFlags: 0 + m_BakedConvexCollisionMesh: + m_BakedTriangleCollisionMesh: + m_MeshMetrics[0]: 1 + m_MeshMetrics[1]: 1 + m_MeshOptimizationFlags: 1 + m_StreamData: + serializedVersion: 2 + offset: 0 + size: 0 + path: +--- !u!43 &1743696005 +Mesh: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: pb_Mesh17836 + serializedVersion: 10 + m_SubMeshes: + - serializedVersion: 2 + firstByte: 0 + indexCount: 36 + topology: 0 + baseVertex: 0 + firstVertex: 0 + vertexCount: 24 + localAABB: + m_Center: {x: 25, y: 2, z: -1} + m_Extent: {x: 25, y: 2, z: 1} + m_Shapes: + vertices: [] + shapes: [] + channels: [] + fullWeights: [] + m_BindPose: [] + m_BoneNameHashes: + m_RootBoneNameHash: 0 + m_BonesAABB: [] + m_VariableBoneCountWeights: + m_Data: + m_MeshCompression: 0 + m_IsReadable: 1 + m_KeepVertices: 1 + m_KeepIndices: 1 + m_IndexFormat: 0 + m_IndexBuffer: 000001000200010003000200040005000600050007000600080009000a0009000b000a000c000d000e000d000f000e00100011001200110013001200140015001600150017001600 + m_VertexData: + serializedVersion: 3 + m_VertexCount: 24 + m_Channels: + - stream: 0 + offset: 0 + format: 0 + dimension: 3 + - stream: 0 + offset: 12 + format: 0 + dimension: 3 + - stream: 0 + offset: 24 + format: 0 + dimension: 4 + - stream: 0 + offset: 40 + format: 0 + dimension: 4 + - stream: 0 + offset: 56 + format: 0 + dimension: 2 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + m_DataSize: 1536 + _typelessdata: 00000000000000000000000000000000000000000000803f000080bf0000000000000000000080bf0000803f0000803f0000803f0000803f000000000000000000004842000000000000000000000000000000000000803f000080bf0000000000000000000080bf0000803f0000803f0000803f0000803f000048c20000000000000000000080400000000000000000000000000000803f000080bf0000000000000000000080bf0000803f0000803f0000803f0000803f000000000000804000004842000080400000000000000000000000000000803f000080bf0000000000000000000080bf0000803f0000803f0000803f0000803f000048c2000080400000484200000000000000000000803f000000000000000000000000000000000000803f000080bf0000803f0000803f0000803f0000803f00000000000000000000484200000000000000c00000803f000000000000000000000000000000000000803f000080bf0000803f0000803f0000803f0000803f000000c0000000000000484200008040000000000000803f000000000000000000000000000000000000803f000080bf0000803f0000803f0000803f0000803f00000000000080400000484200008040000000c00000803f000000000000000000000000000000000000803f000080bf0000803f0000803f0000803f0000803f000000c0000080400000484200000000000000c00000000000000000000080bf0000803f0000000000000000000080bf0000803f0000803f0000803f0000803f00004842000000000000000000000000000000c00000000000000000000080bf0000803f0000000000000000000080bf0000803f0000803f0000803f0000803f00000000000000000000484200008040000000c00000000000000000000080bf0000803f0000000000000000000080bf0000803f0000803f0000803f0000803f00004842000080400000000000008040000000c00000000000000000000080bf0000803f0000000000000000000080bf0000803f0000803f0000803f0000803f00000000000080400000000000000000000000c0000080bf00000000000000000000000000000000000080bf000080bf0000803f0000803f0000803f0000803f0000004000000000000000000000000000000000000080bf00000000000000000000000000000000000080bf000080bf0000803f0000803f0000803f0000803f00000000000000000000000000008040000000c0000080bf00000000000000000000000000000000000080bf000080bf0000803f0000803f0000803f0000803f0000004000008040000000000000804000000000000080bf00000000000000000000000000000000000080bf000080bf0000803f0000803f0000803f0000803f0000000000008040000000000000804000000000000000000000803f000000000000803f0000000000000000000080bf0000803f0000803f0000803f0000803f0000000000000000000048420000804000000000000000000000803f000000000000803f0000000000000000000080bf0000803f0000803f0000803f0000803f00004842000000000000000000008040000000c0000000000000803f000000000000803f0000000000000000000080bf0000803f0000803f0000803f0000803f00000000000000c00000484200008040000000c0000000000000803f000000000000803f0000000000000000000080bf0000803f0000803f0000803f0000803f00004842000000c00000000000000000000000c000000000000080bf00000000000080bf0000000000000000000080bf0000803f0000803f0000803f0000803f00000000000000c00000484200000000000000c000000000000080bf00000000000080bf0000000000000000000080bf0000803f0000803f0000803f0000803f000048c2000000c000000000000000000000000000000000000080bf00000000000080bf0000000000000000000080bf0000803f0000803f0000803f0000803f000000000000000000004842000000000000000000000000000080bf00000000000080bf0000000000000000000080bf0000803f0000803f0000803f0000803f000048c200000000 + m_CompressedMesh: + m_Vertices: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_UV: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Normals: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Tangents: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Weights: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_NormalSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_TangentSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_FloatColors: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_BoneIndices: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_Triangles: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_UVInfo: 0 + m_LocalAABB: + m_Center: {x: 25, y: 2, z: -1} + m_Extent: {x: 25, y: 2, z: 1} + m_MeshUsageFlags: 0 + m_BakedConvexCollisionMesh: + m_BakedTriangleCollisionMesh: + m_MeshMetrics[0]: 1 + m_MeshMetrics[1]: 1 + m_MeshOptimizationFlags: 1 + m_StreamData: + serializedVersion: 2 + offset: 0 + size: 0 + path: --- !u!1 &1770080847 GameObject: m_ObjectHideFlags: 0 @@ -3457,7 +4164,7 @@ MeshCollider: serializedVersion: 4 m_Convex: 0 m_CookingOptions: 30 - m_Mesh: {fileID: 2059655201} + m_Mesh: {fileID: 793845518} --- !u!114 &1770080849 MonoBehaviour: m_ObjectHideFlags: 0 @@ -3470,7 +4177,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 8233d90336aea43098adf6dbabd606a2, type: 3} m_Name: m_EditorClassIdentifier: - m_MeshFormatVersion: 0 + m_MeshFormatVersion: 2 m_Faces: - m_Indexes: 000000000100000002000000010000000300000002000000 m_SmoothingGroup: 0 @@ -3484,7 +4191,7 @@ MonoBehaviour: m_Offset: {x: 0, y: 0} m_Rotation: 0 m_Anchor: 9 - m_Material: {fileID: 2100000, guid: c22777d6e868e4f2fb421913386b154e, type: 2} + m_Material: {fileID: 0} m_SubmeshIndex: 0 m_ManualUV: 0 elementGroup: 0 @@ -3501,7 +4208,7 @@ MonoBehaviour: m_Offset: {x: 0, y: 0} m_Rotation: 0 m_Anchor: 9 - m_Material: {fileID: 2100000, guid: c22777d6e868e4f2fb421913386b154e, type: 2} + m_Material: {fileID: 0} m_SubmeshIndex: 0 m_ManualUV: 0 elementGroup: 0 @@ -3518,7 +4225,7 @@ MonoBehaviour: m_Offset: {x: 0, y: 0} m_Rotation: 0 m_Anchor: 9 - m_Material: {fileID: 2100000, guid: c22777d6e868e4f2fb421913386b154e, type: 2} + m_Material: {fileID: 0} m_SubmeshIndex: 0 m_ManualUV: 0 elementGroup: 0 @@ -3535,7 +4242,7 @@ MonoBehaviour: m_Offset: {x: 0, y: 0} m_Rotation: 0 m_Anchor: 9 - m_Material: {fileID: 2100000, guid: c22777d6e868e4f2fb421913386b154e, type: 2} + m_Material: {fileID: 0} m_SubmeshIndex: 0 m_ManualUV: 0 elementGroup: 0 @@ -3552,7 +4259,7 @@ MonoBehaviour: m_Offset: {x: 0, y: 0} m_Rotation: 0 m_Anchor: 9 - m_Material: {fileID: 2100000, guid: c22777d6e868e4f2fb421913386b154e, type: 2} + m_Material: {fileID: 0} m_SubmeshIndex: 0 m_ManualUV: 0 elementGroup: 0 @@ -3569,7 +4276,7 @@ MonoBehaviour: m_Offset: {x: 0, y: 0} m_Rotation: 0 m_Anchor: 9 - m_Material: {fileID: 2100000, guid: c22777d6e868e4f2fb421913386b154e, type: 2} + m_Material: {fileID: 0} m_SubmeshIndex: 0 m_ManualUV: 0 elementGroup: 0 @@ -3636,7 +4343,31 @@ MonoBehaviour: - {x: -4, y: 0} m_Textures2: [] m_Textures3: [] - m_Tangents: [] + m_Tangents: + - {x: -1, y: 0, z: 0, w: -1} + - {x: -1, y: 0, z: 0, w: -1} + - {x: -1, y: 0, z: 0, w: -1} + - {x: -1, y: 0, z: 0, w: -1} + - {x: 0, y: 0, z: 1, w: -1} + - {x: 0, y: 0, z: 1, w: -1} + - {x: 0, y: 0, z: 1, w: -1} + - {x: 0, y: 0, z: 1, w: -1} + - {x: 1, y: 0, z: 0, w: -1} + - {x: 1, y: 0, z: 0, w: -1} + - {x: 1, y: 0, z: 0, w: -1} + - {x: 1, y: 0, z: 0, w: -1} + - {x: 0, y: 0, z: -1, w: -1} + - {x: 0, y: 0, z: -1, w: -1} + - {x: 0, y: 0, z: -1, w: -1} + - {x: 0, y: 0, z: -1, w: -1} + - {x: 0.8969421, y: 0.44214806, z: 0, w: -1} + - {x: 0.8969421, y: 0.44214806, z: 0, w: -1} + - {x: 0.8969421, y: 0.44214806, z: 0, w: -1} + - {x: 0.8969421, y: 0.44214806, z: 0, w: -1} + - {x: -1, y: 0, z: 0, w: -1} + - {x: -1, y: 0, z: 0, w: -1} + - {x: -1, y: 0, z: 0, w: -1} + - {x: -1, y: 0, z: 0, w: -1} m_Colors: - {r: 1, g: 1, b: 1, a: 1} - {r: 1, g: 1, b: 1, a: 1} @@ -3669,6 +4400,8 @@ MonoBehaviour: m_AreaError: 15 m_PreserveMeshAssetOnDestroy: 0 assetGuid: + m_Mesh: {fileID: 793845518} + m_VersionIndex: 0 m_IsSelectable: 1 m_SelectedFaces: m_SelectedEdges: [] @@ -3684,10 +4417,12 @@ MeshRenderer: m_CastShadows: 2 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -3712,14 +4447,15 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1770080851 MeshFilter: - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 10 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1770080847} - m_Mesh: {fileID: 2059655201} + m_Mesh: {fileID: 793845518} --- !u!4 &1770080852 Transform: m_ObjectHideFlags: 0 @@ -3767,7 +4503,7 @@ MeshCollider: serializedVersion: 4 m_Convex: 0 m_CookingOptions: 30 - m_Mesh: {fileID: 152763207} + m_Mesh: {fileID: 386198210} --- !u!114 &1783516989 MonoBehaviour: m_ObjectHideFlags: 0 @@ -3780,7 +4516,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 8233d90336aea43098adf6dbabd606a2, type: 3} m_Name: m_EditorClassIdentifier: - m_MeshFormatVersion: 0 + m_MeshFormatVersion: 2 m_Faces: - m_Indexes: 000000000100000002000000010000000300000002000000 m_SmoothingGroup: 0 @@ -3794,7 +4530,7 @@ MonoBehaviour: m_Offset: {x: 0, y: 0} m_Rotation: 0 m_Anchor: 9 - m_Material: {fileID: 2100000, guid: e01ac212ff311ac4d98f2f7e8395acc7, type: 2} + m_Material: {fileID: 0} m_SubmeshIndex: 0 m_ManualUV: 0 elementGroup: 0 @@ -3811,7 +4547,7 @@ MonoBehaviour: m_Offset: {x: 0, y: 0} m_Rotation: 0 m_Anchor: 9 - m_Material: {fileID: 2100000, guid: e01ac212ff311ac4d98f2f7e8395acc7, type: 2} + m_Material: {fileID: 0} m_SubmeshIndex: 0 m_ManualUV: 0 elementGroup: 0 @@ -3828,7 +4564,7 @@ MonoBehaviour: m_Offset: {x: 0, y: 0} m_Rotation: 0 m_Anchor: 9 - m_Material: {fileID: 2100000, guid: e01ac212ff311ac4d98f2f7e8395acc7, type: 2} + m_Material: {fileID: 0} m_SubmeshIndex: 0 m_ManualUV: 0 elementGroup: 0 @@ -3845,7 +4581,7 @@ MonoBehaviour: m_Offset: {x: 0, y: 0} m_Rotation: 0 m_Anchor: 9 - m_Material: {fileID: 2100000, guid: e01ac212ff311ac4d98f2f7e8395acc7, type: 2} + m_Material: {fileID: 0} m_SubmeshIndex: 0 m_ManualUV: 0 elementGroup: 0 @@ -3862,7 +4598,7 @@ MonoBehaviour: m_Offset: {x: 0, y: 0} m_Rotation: 0 m_Anchor: 9 - m_Material: {fileID: 2100000, guid: e01ac212ff311ac4d98f2f7e8395acc7, type: 2} + m_Material: {fileID: 0} m_SubmeshIndex: 0 m_ManualUV: 0 elementGroup: 0 @@ -3879,7 +4615,7 @@ MonoBehaviour: m_Offset: {x: 0, y: 0} m_Rotation: 0 m_Anchor: 9 - m_Material: {fileID: 2100000, guid: e01ac212ff311ac4d98f2f7e8395acc7, type: 2} + m_Material: {fileID: 0} m_SubmeshIndex: 0 m_ManualUV: 0 elementGroup: 0 @@ -3946,7 +4682,31 @@ MonoBehaviour: - {x: -50, y: 0} m_Textures2: [] m_Textures3: [] - m_Tangents: [] + m_Tangents: + - {x: -1, y: 0, z: 0, w: -1} + - {x: -1, y: 0, z: 0, w: -1} + - {x: -1, y: 0, z: 0, w: -1} + - {x: -1, y: 0, z: 0, w: -1} + - {x: 0, y: 0, z: 1, w: -1} + - {x: 0, y: 0, z: 1, w: -1} + - {x: 0, y: 0, z: 1, w: -1} + - {x: 0, y: 0, z: 1, w: -1} + - {x: 1, y: 0, z: 0, w: -1} + - {x: 1, y: 0, z: 0, w: -1} + - {x: 1, y: 0, z: 0, w: -1} + - {x: 1, y: 0, z: 0, w: -1} + - {x: 0, y: 0, z: -1, w: -1} + - {x: 0, y: 0, z: -1, w: -1} + - {x: 0, y: 0, z: -1, w: -1} + - {x: 0, y: 0, z: -1, w: -1} + - {x: 1, y: 0, z: 0, w: -1} + - {x: 1, y: 0, z: 0, w: -1} + - {x: 1, y: 0, z: 0, w: -1} + - {x: 1, y: 0, z: 0, w: -1} + - {x: -1, y: 0, z: 0, w: -1} + - {x: -1, y: 0, z: 0, w: -1} + - {x: -1, y: 0, z: 0, w: -1} + - {x: -1, y: 0, z: 0, w: -1} m_Colors: - {r: 1, g: 1, b: 1, a: 1} - {r: 1, g: 1, b: 1, a: 1} @@ -3979,6 +4739,8 @@ MonoBehaviour: m_AreaError: 15 m_PreserveMeshAssetOnDestroy: 0 assetGuid: + m_Mesh: {fileID: 386198210} + m_VersionIndex: 0 m_IsSelectable: 1 m_SelectedFaces: m_SelectedEdges: [] @@ -3994,10 +4756,12 @@ MeshRenderer: m_CastShadows: 2 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -4014,199 +4778,37 @@ MeshRenderer: m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 m_StitchLightmapSeams: 0 - m_SelectedEditorRenderState: 2 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 ---- !u!33 &1783516991 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1783516987} - m_Mesh: {fileID: 152763207} ---- !u!4 &1783516992 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1783516987} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 1454059292} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!43 &1845897094 -Mesh: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh12890 - serializedVersion: 10 - m_SubMeshes: - - serializedVersion: 2 - firstByte: 0 - indexCount: 36 - topology: 0 - baseVertex: 0 - firstVertex: 0 - vertexCount: 24 - localAABB: - m_Center: {x: 2, y: 1, z: -1} - m_Extent: {x: 2, y: 1, z: 1} - m_Shapes: - vertices: [] - shapes: [] - channels: [] - fullWeights: [] - m_BindPose: [] - m_BoneNameHashes: - m_RootBoneNameHash: 0 - m_BonesAABB: [] - m_VariableBoneCountWeights: - m_Data: - m_MeshCompression: 0 - m_IsReadable: 1 - m_KeepVertices: 1 - m_KeepIndices: 1 - m_IndexFormat: 0 - m_IndexBuffer: 000001000200010003000200040005000600050007000600080009000a0009000b000a000c000d000e000d000f000e00100011001200110013001200140015001600150017001600 - m_VertexData: - serializedVersion: 3 - m_VertexCount: 24 - m_Channels: - - stream: 0 - offset: 0 - format: 0 - dimension: 3 - - stream: 0 - offset: 12 - format: 0 - dimension: 3 - - stream: 0 - offset: 24 - format: 0 - dimension: 4 - - stream: 0 - offset: 40 - format: 0 - dimension: 4 - - stream: 0 - offset: 56 - format: 0 - dimension: 2 - - stream: 0 - offset: 64 - format: 0 - dimension: 2 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - m_DataSize: 1728 - _typelessdata: 00000000000000000000000000000000000000000000803f000080bf0000000000000000000080bf0000803f0000803f0000803f0000803f00000000000000006f12833b036a823e00008040000000000000000000000000000000000000803f000080bf0000000000000000000080bf0000803f0000803f0000803f0000803f000080c00000000036affe3e036a823e0000000080ffe63c0000000000000000000000000000803f000080bf0000000000000000000080bf0000803f0000803f0000803f0000803f0000000080ffe63c7415833bf031843e00008040000000400000000000000000000000000000803f000080bf0000000000000000000080bf0000803f0000803f0000803f0000803f000080c00000004038affe3eb75d003f0000804000000000000000000000803f000000000000000000000000000000000000803f000080bf0000803f0000803f0000803f0000803f0000000000000000c15d003fdf63013f0000804000000000000000c00000803f000000000000000000000000000000000000803f000080bf0000803f0000803f0000803f0000803f000000c00000000077863f3fdf63013f0000804000000040000000000000803f000000000000000000000000000000000000803f000080bf0000803f0000803f0000803f0000803f0000000000000040c15d003f958c403f0000804000000040000000c00000803f000000000000000000000000000000000000803f000080bf0000803f0000803f0000803f0000803f000000c00000004077863f3f958c403f0000804000000000000000c00000000000000000000080bf0000803f0000000000000000000080bf0000803f0000803f0000803f0000803f0000804000000000c75d003f036a823e0000000000000000000000c00000000000000000000080bf0000803f0000000000000000000080bf0000803f0000803f0000803f0000803f000000000000000031af7e3f036a823e0000804000000040000000c00000000000000000000080bf0000803f0000000000000000000080bf0000803f0000803f0000803f0000803f0000804000000040c15d003fba5d003f0000000080ffe63c000000c00000000000000000000080bf0000803f0000000000000000000080bf0000803f0000803f0000803f0000803f0000000080ffe63c31af7e3ff031843e0000000000000000000000c0000080bf00000000000000000000000000000000000080bf000080bf0000803f0000803f0000803f0000803f000000400000000045e10e3f6f12833b000000000000000000000000000080bf00000000000000000000000000000000000080bf000080bf0000803f0000803f0000803f0000803f0000000000000000fd094e3f6f12833b0000000080ffe63c000000c0000080bf00000000000000000000000000000000000080bf000080bf0000803f0000803f0000803f0000803f0000004080ffe63c48e10e3fa70df53b0000000080ffe63c00000000000080bf00000000000000000000000000000000000080bf000080bf0000803f0000803f0000803f0000803f0000000080ffe63c000a4e3fa70df53b0000000080ffe63c000000003b61e2beff9d653f00000000ff9d653f3b61e23e00000000000080bf0000803f0000803f0000803f0000803f4b454c3c0000000019db0d3fba5d803e0000804000000040000000003b61e2beff9d653f00000000ff9d653f3b61e23e00000000000080bf0000803f0000803f0000803f0000803f271b8f40000000006f12833bba5d803e0000000080ffe63c000000c03b61e2beff9d653f00000000ff9d653f3b61e23e00000000000080bf0000803f0000803f0000803f0000803f4b454c3c000000c021db0d3f6f12833b0000804000000040000000c03b61e2beff9d653f00000000ff9d653f3b61e23e00000000000080bf0000803f0000803f0000803f0000803f271b8f40000000c02616833b6f12833b0000000000000000000000c000000000000080bf00000000000080bf0000000000000000000080bf0000803f0000803f0000803f0000803f00000000000000c0ab15833bdb63013f0000804000000000000000c000000000000080bf00000000000080bf0000000000000000000080bf0000803f0000803f0000803f0000803f000080c0000000c02aaffe3edb63013f00000000000000000000000000000000000080bf00000000000080bf0000000000000000000080bf0000803f0000803f0000803f0000803f00000000000000006f12833b948c403f00008040000000000000000000000000000080bf00000000000080bf0000000000000000000080bf0000803f0000803f0000803f0000803f000080c0000000001daffe3e948c403f - m_CompressedMesh: - m_Vertices: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_UV: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Normals: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Tangents: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Weights: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_NormalSigns: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_TangentSigns: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_FloatColors: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_BoneIndices: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_Triangles: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_UVInfo: 0 - m_LocalAABB: - m_Center: {x: 2, y: 1, z: -1} - m_Extent: {x: 2, y: 1, z: 1} - m_MeshUsageFlags: 0 - m_BakedConvexCollisionMesh: - m_BakedTriangleCollisionMesh: - m_MeshMetrics[0]: 1 - m_MeshMetrics[1]: 1 - m_MeshOptimizationFlags: -1 - m_StreamData: - offset: 0 - size: 0 - path: + m_SelectedEditorRenderState: 2 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &1783516991 +MeshFilter: + m_ObjectHideFlags: 10 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1783516987} + m_Mesh: {fileID: 386198210} +--- !u!4 &1783516992 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1783516987} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1454059292} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1968330178 GameObject: m_ObjectHideFlags: 0 @@ -4254,7 +4856,7 @@ MeshCollider: serializedVersion: 4 m_Convex: 0 m_CookingOptions: 30 - m_Mesh: {fileID: 1845897094} + m_Mesh: {fileID: 245238326} --- !u!114 &1968330181 MonoBehaviour: m_ObjectHideFlags: 0 @@ -4267,7 +4869,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 8233d90336aea43098adf6dbabd606a2, type: 3} m_Name: m_EditorClassIdentifier: - m_MeshFormatVersion: 0 + m_MeshFormatVersion: 2 m_Faces: - m_Indexes: 000000000100000002000000010000000300000002000000 m_SmoothingGroup: 0 @@ -4281,7 +4883,7 @@ MonoBehaviour: m_Offset: {x: 0, y: 0} m_Rotation: 0 m_Anchor: 9 - m_Material: {fileID: 2100000, guid: c22777d6e868e4f2fb421913386b154e, type: 2} + m_Material: {fileID: 0} m_SubmeshIndex: 0 m_ManualUV: 0 elementGroup: 0 @@ -4298,7 +4900,7 @@ MonoBehaviour: m_Offset: {x: 0, y: 0} m_Rotation: 0 m_Anchor: 9 - m_Material: {fileID: 2100000, guid: c22777d6e868e4f2fb421913386b154e, type: 2} + m_Material: {fileID: 0} m_SubmeshIndex: 0 m_ManualUV: 0 elementGroup: 0 @@ -4315,7 +4917,7 @@ MonoBehaviour: m_Offset: {x: 0, y: 0} m_Rotation: 0 m_Anchor: 9 - m_Material: {fileID: 2100000, guid: c22777d6e868e4f2fb421913386b154e, type: 2} + m_Material: {fileID: 0} m_SubmeshIndex: 0 m_ManualUV: 0 elementGroup: 0 @@ -4332,7 +4934,7 @@ MonoBehaviour: m_Offset: {x: 0, y: 0} m_Rotation: 0 m_Anchor: 9 - m_Material: {fileID: 2100000, guid: c22777d6e868e4f2fb421913386b154e, type: 2} + m_Material: {fileID: 0} m_SubmeshIndex: 0 m_ManualUV: 0 elementGroup: 0 @@ -4349,7 +4951,7 @@ MonoBehaviour: m_Offset: {x: 0, y: 0} m_Rotation: 0 m_Anchor: 9 - m_Material: {fileID: 2100000, guid: c22777d6e868e4f2fb421913386b154e, type: 2} + m_Material: {fileID: 0} m_SubmeshIndex: 0 m_ManualUV: 0 elementGroup: 0 @@ -4366,7 +4968,7 @@ MonoBehaviour: m_Offset: {x: 0, y: 0} m_Rotation: 0 m_Anchor: 9 - m_Material: {fileID: 2100000, guid: c22777d6e868e4f2fb421913386b154e, type: 2} + m_Material: {fileID: 0} m_SubmeshIndex: 0 m_ManualUV: 0 elementGroup: 0 @@ -4433,7 +5035,31 @@ MonoBehaviour: - {x: -4, y: 0} m_Textures2: [] m_Textures3: [] - m_Tangents: [] + m_Tangents: + - {x: -1, y: 0, z: 0, w: -1} + - {x: -1, y: 0, z: 0, w: -1} + - {x: -1, y: 0, z: 0, w: -1} + - {x: -1, y: 0, z: 0, w: -1} + - {x: 0, y: 0, z: 1, w: -1} + - {x: 0, y: 0, z: 1, w: -1} + - {x: 0, y: 0, z: 1, w: -1} + - {x: 0, y: 0, z: 1, w: -1} + - {x: 1, y: 0, z: 0, w: -1} + - {x: 1, y: 0, z: 0, w: -1} + - {x: 1, y: 0, z: 0, w: -1} + - {x: 1, y: 0, z: 0, w: -1} + - {x: 0, y: 0, z: -1, w: -1} + - {x: 0, y: 0, z: -1, w: -1} + - {x: 0, y: 0, z: -1, w: -1} + - {x: 0, y: 0, z: -1, w: -1} + - {x: 0.8969421, y: 0.44214806, z: 0, w: -1} + - {x: 0.8969421, y: 0.44214806, z: 0, w: -1} + - {x: 0.8969421, y: 0.44214806, z: 0, w: -1} + - {x: 0.8969421, y: 0.44214806, z: 0, w: -1} + - {x: -1, y: 0, z: 0, w: -1} + - {x: -1, y: 0, z: 0, w: -1} + - {x: -1, y: 0, z: 0, w: -1} + - {x: -1, y: 0, z: 0, w: -1} m_Colors: - {r: 1, g: 1, b: 1, a: 1} - {r: 1, g: 1, b: 1, a: 1} @@ -4446,403 +5072,82 @@ MonoBehaviour: - {r: 1, g: 1, b: 1, a: 1} - {r: 1, g: 1, b: 1, a: 1} - {r: 1, g: 1, b: 1, a: 1} - - {r: 1, g: 1, b: 1, a: 1} - - {r: 1, g: 1, b: 1, a: 1} - - {r: 1, g: 1, b: 1, a: 1} - - {r: 1, g: 1, b: 1, a: 1} - - {r: 1, g: 1, b: 1, a: 1} - - {r: 1, g: 1, b: 1, a: 1} - - {r: 1, g: 1, b: 1, a: 1} - - {r: 1, g: 1, b: 1, a: 1} - - {r: 1, g: 1, b: 1, a: 1} - - {r: 1, g: 1, b: 1, a: 1} - - {r: 1, g: 1, b: 1, a: 1} - - {r: 1, g: 1, b: 1, a: 1} - - {r: 1, g: 1, b: 1, a: 1} - m_UnwrapParameters: - m_HardAngle: 88 - m_PackMargin: 4 - m_AngleError: 8 - m_AreaError: 15 - m_PreserveMeshAssetOnDestroy: 0 - assetGuid: - m_IsSelectable: 1 - m_SelectedFaces: - m_SelectedEdges: [] - m_SelectedVertices: ---- !u!23 &1968330182 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1968330178} - m_Enabled: 1 - m_CastShadows: 2 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: c22777d6e868e4f2fb421913386b154e, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 0 - m_SelectedEditorRenderState: 2 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 ---- !u!33 &1968330183 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1968330178} - m_Mesh: {fileID: 1845897094} ---- !u!43 &2059655201 -Mesh: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh12864 - serializedVersion: 10 - m_SubMeshes: - - serializedVersion: 2 - firstByte: 0 - indexCount: 36 - topology: 0 - baseVertex: 0 - firstVertex: 0 - vertexCount: 24 - localAABB: - m_Center: {x: 2, y: 1, z: -1} - m_Extent: {x: 2, y: 1, z: 1} - m_Shapes: - vertices: [] - shapes: [] - channels: [] - fullWeights: [] - m_BindPose: [] - m_BoneNameHashes: - m_RootBoneNameHash: 0 - m_BonesAABB: [] - m_VariableBoneCountWeights: - m_Data: - m_MeshCompression: 0 - m_IsReadable: 1 - m_KeepVertices: 1 - m_KeepIndices: 1 - m_IndexFormat: 0 - m_IndexBuffer: 000001000200010003000200040005000600050007000600080009000a0009000b000a000c000d000e000d000f000e00100011001200110013001200140015001600150017001600 - m_VertexData: - serializedVersion: 3 - m_VertexCount: 24 - m_Channels: - - stream: 0 - offset: 0 - format: 0 - dimension: 3 - - stream: 0 - offset: 12 - format: 0 - dimension: 3 - - stream: 0 - offset: 24 - format: 0 - dimension: 4 - - stream: 0 - offset: 40 - format: 0 - dimension: 4 - - stream: 0 - offset: 56 - format: 0 - dimension: 2 - - stream: 0 - offset: 64 - format: 0 - dimension: 2 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - m_DataSize: 1728 - _typelessdata: 00000000000000000000000000000000000000000000803f000080bf0000000000000000000080bf0000803f0000803f0000803f0000803f00000000000000006f12833b036a823e00008040000000000000000000000000000000000000803f000080bf0000000000000000000080bf0000803f0000803f0000803f0000803f000080c00000000036affe3e036a823e0000000080ffe63c0000000000000000000000000000803f000080bf0000000000000000000080bf0000803f0000803f0000803f0000803f0000000080ffe63c7415833bf031843e00008040000000400000000000000000000000000000803f000080bf0000000000000000000080bf0000803f0000803f0000803f0000803f000080c00000004038affe3eb75d003f0000804000000000000000000000803f000000000000000000000000000000000000803f000080bf0000803f0000803f0000803f0000803f0000000000000000c15d003fdf63013f0000804000000000000000c00000803f000000000000000000000000000000000000803f000080bf0000803f0000803f0000803f0000803f000000c00000000077863f3fdf63013f0000804000000040000000000000803f000000000000000000000000000000000000803f000080bf0000803f0000803f0000803f0000803f0000000000000040c15d003f958c403f0000804000000040000000c00000803f000000000000000000000000000000000000803f000080bf0000803f0000803f0000803f0000803f000000c00000004077863f3f958c403f0000804000000000000000c00000000000000000000080bf0000803f0000000000000000000080bf0000803f0000803f0000803f0000803f0000804000000000c75d003f036a823e0000000000000000000000c00000000000000000000080bf0000803f0000000000000000000080bf0000803f0000803f0000803f0000803f000000000000000031af7e3f036a823e0000804000000040000000c00000000000000000000080bf0000803f0000000000000000000080bf0000803f0000803f0000803f0000803f0000804000000040c15d003fba5d003f0000000080ffe63c000000c00000000000000000000080bf0000803f0000000000000000000080bf0000803f0000803f0000803f0000803f0000000080ffe63c31af7e3ff031843e0000000000000000000000c0000080bf00000000000000000000000000000000000080bf000080bf0000803f0000803f0000803f0000803f000000400000000045e10e3f6f12833b000000000000000000000000000080bf00000000000000000000000000000000000080bf000080bf0000803f0000803f0000803f0000803f0000000000000000fd094e3f6f12833b0000000080ffe63c000000c0000080bf00000000000000000000000000000000000080bf000080bf0000803f0000803f0000803f0000803f0000004080ffe63c48e10e3fa70df53b0000000080ffe63c00000000000080bf00000000000000000000000000000000000080bf000080bf0000803f0000803f0000803f0000803f0000000080ffe63c000a4e3fa70df53b0000000080ffe63c000000003b61e2beff9d653f00000000ff9d653f3b61e23e00000000000080bf0000803f0000803f0000803f0000803f4b454c3c0000000019db0d3fba5d803e0000804000000040000000003b61e2beff9d653f00000000ff9d653f3b61e23e00000000000080bf0000803f0000803f0000803f0000803f271b8f40000000006f12833bba5d803e0000000080ffe63c000000c03b61e2beff9d653f00000000ff9d653f3b61e23e00000000000080bf0000803f0000803f0000803f0000803f4b454c3c000000c021db0d3f6f12833b0000804000000040000000c03b61e2beff9d653f00000000ff9d653f3b61e23e00000000000080bf0000803f0000803f0000803f0000803f271b8f40000000c02616833b6f12833b0000000000000000000000c000000000000080bf00000000000080bf0000000000000000000080bf0000803f0000803f0000803f0000803f00000000000000c0ab15833bdb63013f0000804000000000000000c000000000000080bf00000000000080bf0000000000000000000080bf0000803f0000803f0000803f0000803f000080c0000000c02aaffe3edb63013f00000000000000000000000000000000000080bf00000000000080bf0000000000000000000080bf0000803f0000803f0000803f0000803f00000000000000006f12833b948c403f00008040000000000000000000000000000080bf00000000000080bf0000000000000000000080bf0000803f0000803f0000803f0000803f000080c0000000001daffe3e948c403f - m_CompressedMesh: - m_Vertices: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_UV: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Normals: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Tangents: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Weights: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_NormalSigns: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_TangentSigns: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_FloatColors: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_BoneIndices: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_Triangles: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_UVInfo: 0 - m_LocalAABB: - m_Center: {x: 2, y: 1, z: -1} - m_Extent: {x: 2, y: 1, z: 1} - m_MeshUsageFlags: 0 - m_BakedConvexCollisionMesh: - m_BakedTriangleCollisionMesh: - m_MeshMetrics[0]: 1 - m_MeshMetrics[1]: 1 - m_MeshOptimizationFlags: -1 - m_StreamData: - offset: 0 - size: 0 - path: ---- !u!43 &2139475336 -Mesh: + - {r: 1, g: 1, b: 1, a: 1} + - {r: 1, g: 1, b: 1, a: 1} + - {r: 1, g: 1, b: 1, a: 1} + - {r: 1, g: 1, b: 1, a: 1} + - {r: 1, g: 1, b: 1, a: 1} + - {r: 1, g: 1, b: 1, a: 1} + - {r: 1, g: 1, b: 1, a: 1} + - {r: 1, g: 1, b: 1, a: 1} + - {r: 1, g: 1, b: 1, a: 1} + - {r: 1, g: 1, b: 1, a: 1} + - {r: 1, g: 1, b: 1, a: 1} + - {r: 1, g: 1, b: 1, a: 1} + - {r: 1, g: 1, b: 1, a: 1} + m_UnwrapParameters: + m_HardAngle: 88 + m_PackMargin: 4 + m_AngleError: 8 + m_AreaError: 15 + m_PreserveMeshAssetOnDestroy: 0 + assetGuid: + m_Mesh: {fileID: 245238326} + m_VersionIndex: 0 + m_IsSelectable: 1 + m_SelectedFaces: + m_SelectedEdges: [] + m_SelectedVertices: +--- !u!23 &1968330182 +MeshRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh12768 - serializedVersion: 10 - m_SubMeshes: - - serializedVersion: 2 - firstByte: 0 - indexCount: 24 - topology: 0 - baseVertex: 0 - firstVertex: 0 - vertexCount: 18 - localAABB: - m_Center: {x: 5, y: 1.5, z: 5} - m_Extent: {x: 5, y: 1.5, z: 5} - m_Shapes: - vertices: [] - shapes: [] - channels: [] - fullWeights: [] - m_BindPose: [] - m_BoneNameHashes: - m_RootBoneNameHash: 0 - m_BonesAABB: [] - m_VariableBoneCountWeights: - m_Data: - m_MeshCompression: 0 - m_IsReadable: 1 - m_KeepVertices: 1 - m_KeepIndices: 1 - m_IndexFormat: 0 - m_IndexBuffer: 0000010002000300040005000300060004000700080009000a000b000c000a000d000b000e000f0010000f0011001000 - m_VertexData: - serializedVersion: 3 - m_VertexCount: 18 - m_Channels: - - stream: 0 - offset: 0 - format: 0 - dimension: 3 - - stream: 0 - offset: 12 - format: 0 - dimension: 3 - - stream: 0 - offset: 24 - format: 0 - dimension: 4 - - stream: 0 - offset: 40 - format: 0 - dimension: 4 - - stream: 0 - offset: 56 - format: 0 - dimension: 2 - - stream: 0 - offset: 64 - format: 0 - dimension: 2 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - m_DataSize: 1296 - _typelessdata: 0000000000004040000000000000000000000000000080bf0000803f0000000000000000000080bf0000803f0000803f0000803f0000803f0000000000004040e07c7f3f8853e53e0000204100000000000000000000000000000000000080bf0000803f0000000000000000000080bf0000803f0000803f0000803f0000803f0000204100000000627f033fa3ee9a3e0000000000000000000000000000000000000000000080bf0000803f0000000000000000000080bf0000803f0000803f0000803f0000803f0000000000000000e07c7f3fa7ee9a3e000000000000404000000000431f933e1a34753f000000001b34753f441f93be00000000000080bf0000803f0000803f0000803f0000803fe6ae5cbf000000006f12833b3407fa3e000020410000000000002041431f933e1a34753f000000001b34753f441f93be00000000000080bf0000803f0000803f0000803f0000803f91401941000020413d79023f8b12833b000020410000000000000000431f933e1a34753f000000001b34753f441f93be00000000000080bf0000803f0000803f0000803f0000803f91401941000000003d79023f3507fa3e000000000000404000002041431f933e1a34753f000000001b34753f441f93be00000000000080bf0000803f0000803f0000803f0000803fe6ae5cbf000020416f12833b6f12833b00000000000040400000204100000000000000000000803f000080bf0000000000000000000080bf0000803f0000803f0000803f0000803f0000000000004040627f033f59e2983e00000000000000000000204100000000000000000000803f000080bf0000000000000000000080bf0000803f0000803f0000803f0000803f0000000000000000687f033fe9fa1c3e00002041000000000000204100000000000000000000803f000080bf0000000000000000000080bf0000803f0000803f0000803f0000803f000020c100000000e07c7f3fe9fa1c3e000000000000404000002041000080bf00000000000000000000000000000000000080bf000080bf0000803f0000803f0000803f0000803f000020c100004040e07c7f3f55e2183e000000000000000000000000000080bf00000000000000000000000000000000000080bf000080bf0000803f0000803f0000803f0000803f0000000000000000627f033f6f12833b000000000000000000002041000080bf00000000000000000000000000000000000080bf000080bf0000803f0000803f0000803f0000803f000020c100000000e07c7f3f6f12833b000000000000404000000000000080bf00000000000000000000000000000000000080bf000080bf0000803f0000803f0000803f0000803f0000000000004040637f033f55e2183e00000000000000000000000000000000000080bf00000000000080bf0000000000000000000080bf0000803f0000803f0000803f0000803f00000000000000003107fa3e7f13fc3e00002041000000000000000000000000000080bf00000000000080bf0000000000000000000080bf0000803f0000803f0000803f0000803f000020c1000000003e07fa3e40077a3f00000000000000000000204100000000000080bf00000000000080bf0000000000000000000080bf0000803f0000803f0000803f0000803f00000000000020416f12833b8c13fc3e00002041000000000000204100000000000080bf00000000000080bf0000000000000000000080bf0000803f0000803f0000803f0000803f000020c100002041c815833b47077a3f - m_CompressedMesh: - m_Vertices: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_UV: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Normals: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Tangents: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Weights: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_NormalSigns: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_TangentSigns: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_FloatColors: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_BoneIndices: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_Triangles: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_UVInfo: 0 - m_LocalAABB: - m_Center: {x: 5, y: 1.5, z: 5} - m_Extent: {x: 5, y: 1.5, z: 5} - m_MeshUsageFlags: 0 - m_BakedConvexCollisionMesh: - m_BakedTriangleCollisionMesh: - m_MeshMetrics[0]: 1 - m_MeshMetrics[1]: 1 - m_MeshOptimizationFlags: -1 - m_StreamData: - offset: 0 - size: 0 - path: + m_GameObject: {fileID: 1968330178} + m_Enabled: 1 + m_CastShadows: 2 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: c22777d6e868e4f2fb421913386b154e, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 2 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &1968330183 +MeshFilter: + m_ObjectHideFlags: 10 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1968330178} + m_Mesh: {fileID: 245238326} --- !u!1001 &4761087742372319391 PrefabInstance: m_ObjectHideFlags: 0 @@ -4850,6 +5155,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 4761087743418853988, guid: 9fc93746cd21fd242a8ba21364516c37, + type: 3} + propertyPath: m_RootOrder + value: 5 + objectReference: {fileID: 0} - target: {fileID: 4761087743418853988, guid: 9fc93746cd21fd242a8ba21364516c37, type: 3} propertyPath: m_LocalPosition.x @@ -4865,6 +5175,11 @@ PrefabInstance: propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 4761087743418853988, guid: 9fc93746cd21fd242a8ba21364516c37, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} - target: {fileID: 4761087743418853988, guid: 9fc93746cd21fd242a8ba21364516c37, type: 3} propertyPath: m_LocalRotation.x @@ -4880,16 +5195,6 @@ PrefabInstance: propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 4761087743418853988, guid: 9fc93746cd21fd242a8ba21364516c37, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4761087743418853988, guid: 9fc93746cd21fd242a8ba21364516c37, - type: 3} - propertyPath: m_RootOrder - value: 5 - objectReference: {fileID: 0} - target: {fileID: 4761087743418853988, guid: 9fc93746cd21fd242a8ba21364516c37, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -4919,6 +5224,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 3902157398716559074, guid: 624ed88bdba9ae549b799fc81ade2689, + type: 3} + propertyPath: m_RootOrder + value: 3 + objectReference: {fileID: 0} - target: {fileID: 3902157398716559074, guid: 624ed88bdba9ae549b799fc81ade2689, type: 3} propertyPath: m_LocalPosition.x @@ -4934,6 +5244,11 @@ PrefabInstance: propertyPath: m_LocalPosition.z value: -25 objectReference: {fileID: 0} + - target: {fileID: 3902157398716559074, guid: 624ed88bdba9ae549b799fc81ade2689, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} - target: {fileID: 3902157398716559074, guid: 624ed88bdba9ae549b799fc81ade2689, type: 3} propertyPath: m_LocalRotation.x @@ -4949,16 +5264,6 @@ PrefabInstance: propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 3902157398716559074, guid: 624ed88bdba9ae549b799fc81ade2689, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3902157398716559074, guid: 624ed88bdba9ae549b799fc81ade2689, - type: 3} - propertyPath: m_RootOrder - value: 3 - objectReference: {fileID: 0} - target: {fileID: 3902157398716559074, guid: 624ed88bdba9ae549b799fc81ade2689, type: 3} propertyPath: m_LocalEulerAnglesHint.x diff --git a/Assets/NaughtyCharacter/_Scenes/DemoSettings.lighting b/Assets/NaughtyCharacter/_Scenes/DemoSettings.lighting new file mode 100644 index 0000000..ce6bbce --- /dev/null +++ b/Assets/NaughtyCharacter/_Scenes/DemoSettings.lighting @@ -0,0 +1,63 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!850595691 &4890085278179872738 +LightingSettings: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: DemoSettings + serializedVersion: 3 + m_GIWorkflowMode: 0 + m_EnableBakedLightmaps: 1 + m_EnableRealtimeLightmaps: 1 + m_RealtimeEnvironmentLighting: 1 + m_BounceScale: 1 + m_AlbedoBoost: 1 + m_IndirectOutputScale: 1 + m_UsingShadowmask: 1 + m_BakeBackend: 2 + m_LightmapMaxSize: 1024 + m_BakeResolution: 40 + m_Padding: 2 + m_TextureCompression: 1 + m_AO: 0 + m_AOMaxDistance: 1 + m_CompAOExponent: 1 + m_CompAOExponentDirect: 0 + m_ExtractAO: 0 + m_MixedBakeMode: 2 + m_LightmapsBakeMode: 1 + m_FilterMode: 1 + m_LightmapParameters: {fileID: 15204, guid: 0000000000000000f000000000000000, type: 0} + m_ExportTrainingData: 0 + m_TrainingDataDestination: TrainingData + m_RealtimeResolution: 2 + m_ForceWhiteAlbedo: 0 + m_ForceUpdates: 0 + m_FinalGather: 0 + m_FinalGatherRayCount: 256 + m_FinalGatherFiltering: 1 + m_PVRCulling: 1 + m_PVRSampling: 1 + m_PVRDirectSampleCount: 32 + m_PVRSampleCount: 500 + m_PVREnvironmentSampleCount: 500 + m_PVREnvironmentReferencePointCount: 2048 + m_LightProbeSampleCountMultiplier: 4 + m_PVRBounces: 2 + m_PVRMinBounces: 2 + m_PVREnvironmentMIS: 0 + m_PVRFilteringMode: 2 + m_PVRDenoiserTypeDirect: 0 + m_PVRDenoiserTypeIndirect: 0 + m_PVRDenoiserTypeAO: 0 + m_PVRFilterTypeDirect: 0 + m_PVRFilterTypeIndirect: 0 + m_PVRFilterTypeAO: 0 + m_PVRFilteringGaussRadiusDirect: 1 + m_PVRFilteringGaussRadiusIndirect: 5 + m_PVRFilteringGaussRadiusAO: 2 + m_PVRFilteringAtrousPositionSigmaDirect: 0.5 + m_PVRFilteringAtrousPositionSigmaIndirect: 2 + m_PVRFilteringAtrousPositionSigmaAO: 1 diff --git a/Assets/NaughtyCharacter/_Scenes/DemoSettings.lighting.meta b/Assets/NaughtyCharacter/_Scenes/DemoSettings.lighting.meta new file mode 100644 index 0000000..5b3fd73 --- /dev/null +++ b/Assets/NaughtyCharacter/_Scenes/DemoSettings.lighting.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ade3dad032e507f47829eeed727f5631 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 4890085278179872738 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/NaughtyCharacter/Scripts.meta b/Assets/NaughtyCharacter/_Scripts.meta similarity index 100% rename from Assets/NaughtyCharacter/Scripts.meta rename to Assets/NaughtyCharacter/_Scripts.meta diff --git a/Assets/NaughtyCharacter/Scripts/Animation.meta b/Assets/NaughtyCharacter/_Scripts/Animation.meta similarity index 100% rename from Assets/NaughtyCharacter/Scripts/Animation.meta rename to Assets/NaughtyCharacter/_Scripts/Animation.meta diff --git a/Assets/NaughtyCharacter/Scripts/Animation/InterpolationCurve.cs b/Assets/NaughtyCharacter/_Scripts/Animation/InterpolationCurve.cs similarity index 100% rename from Assets/NaughtyCharacter/Scripts/Animation/InterpolationCurve.cs rename to Assets/NaughtyCharacter/_Scripts/Animation/InterpolationCurve.cs diff --git a/Assets/NaughtyCharacter/Scripts/Animation/InterpolationCurve.cs.meta b/Assets/NaughtyCharacter/_Scripts/Animation/InterpolationCurve.cs.meta similarity index 100% rename from Assets/NaughtyCharacter/Scripts/Animation/InterpolationCurve.cs.meta rename to Assets/NaughtyCharacter/_Scripts/Animation/InterpolationCurve.cs.meta diff --git a/Assets/NaughtyCharacter/Scripts/Character.cs b/Assets/NaughtyCharacter/_Scripts/Character.cs similarity index 100% rename from Assets/NaughtyCharacter/Scripts/Character.cs rename to Assets/NaughtyCharacter/_Scripts/Character.cs diff --git a/Assets/NaughtyCharacter/Scripts/Character.cs.meta b/Assets/NaughtyCharacter/_Scripts/Character.cs.meta similarity index 100% rename from Assets/NaughtyCharacter/Scripts/Character.cs.meta rename to Assets/NaughtyCharacter/_Scripts/Character.cs.meta diff --git a/Assets/NaughtyCharacter/Scripts/CharacterAnimator.cs b/Assets/NaughtyCharacter/_Scripts/CharacterAnimator.cs similarity index 100% rename from Assets/NaughtyCharacter/Scripts/CharacterAnimator.cs rename to Assets/NaughtyCharacter/_Scripts/CharacterAnimator.cs diff --git a/Assets/NaughtyCharacter/Scripts/CharacterAnimator.cs.meta b/Assets/NaughtyCharacter/_Scripts/CharacterAnimator.cs.meta similarity index 100% rename from Assets/NaughtyCharacter/Scripts/CharacterAnimator.cs.meta rename to Assets/NaughtyCharacter/_Scripts/CharacterAnimator.cs.meta diff --git a/Assets/NaughtyCharacter/Scripts/Controller.cs b/Assets/NaughtyCharacter/_Scripts/Controller.cs similarity index 100% rename from Assets/NaughtyCharacter/Scripts/Controller.cs rename to Assets/NaughtyCharacter/_Scripts/Controller.cs diff --git a/Assets/NaughtyCharacter/Scripts/Controller.cs.meta b/Assets/NaughtyCharacter/_Scripts/Controller.cs.meta similarity index 100% rename from Assets/NaughtyCharacter/Scripts/Controller.cs.meta rename to Assets/NaughtyCharacter/_Scripts/Controller.cs.meta diff --git a/Assets/NaughtyCharacter/Scripts/Helpers.meta b/Assets/NaughtyCharacter/_Scripts/Helpers.meta similarity index 100% rename from Assets/NaughtyCharacter/Scripts/Helpers.meta rename to Assets/NaughtyCharacter/_Scripts/Helpers.meta diff --git a/Assets/NaughtyCharacter/Scripts/Helpers/FpsCounter.cs b/Assets/NaughtyCharacter/_Scripts/Helpers/FpsCounter.cs similarity index 100% rename from Assets/NaughtyCharacter/Scripts/Helpers/FpsCounter.cs rename to Assets/NaughtyCharacter/_Scripts/Helpers/FpsCounter.cs diff --git a/Assets/NaughtyCharacter/Scripts/Helpers/FpsCounter.cs.meta b/Assets/NaughtyCharacter/_Scripts/Helpers/FpsCounter.cs.meta similarity index 100% rename from Assets/NaughtyCharacter/Scripts/Helpers/FpsCounter.cs.meta rename to Assets/NaughtyCharacter/_Scripts/Helpers/FpsCounter.cs.meta diff --git a/Assets/NaughtyCharacter/_Scripts/Helpers/TestHelper.cs b/Assets/NaughtyCharacter/_Scripts/Helpers/TestHelper.cs new file mode 100644 index 0000000..ed971dd --- /dev/null +++ b/Assets/NaughtyCharacter/_Scripts/Helpers/TestHelper.cs @@ -0,0 +1,38 @@ +using UnityEngine; +using UnityEngine.InputSystem; + +namespace NaughtyCharacter +{ + public class TestHelper : MonoBehaviour + { + public InputAction SlowMotionAction; + + [SerializeField] + private int _targetFrameRate = 60; + + [SerializeField] + private float _slowMotion = 0.1f; + + private void Awake() + { + Application.targetFrameRate = _targetFrameRate; + } + + private void OnEnable() + { + SlowMotionAction.Enable(); + SlowMotionAction.started += ToggleSlowMotion; + } + + private void OnDisable() + { + SlowMotionAction.Disable(); + SlowMotionAction.started -= ToggleSlowMotion; + } + + private void ToggleSlowMotion(InputAction.CallbackContext context) + { + Time.timeScale = Time.timeScale == 1f ? _slowMotion : 1f; + } + } +} diff --git a/Assets/NaughtyCharacter/Scripts/Helpers/TestHelper.cs.meta b/Assets/NaughtyCharacter/_Scripts/Helpers/TestHelper.cs.meta similarity index 100% rename from Assets/NaughtyCharacter/Scripts/Helpers/TestHelper.cs.meta rename to Assets/NaughtyCharacter/_Scripts/Helpers/TestHelper.cs.meta diff --git a/Assets/NaughtyCharacter/_Scripts/NaughtyCharacter.asmdef b/Assets/NaughtyCharacter/_Scripts/NaughtyCharacter.asmdef new file mode 100644 index 0000000..185021d --- /dev/null +++ b/Assets/NaughtyCharacter/_Scripts/NaughtyCharacter.asmdef @@ -0,0 +1,16 @@ +{ + "name": "NaughtyCharacter", + "rootNamespace": "", + "references": [ + "GUID:75469ad4d38634e559750d17036d5f7c" + ], + "includePlatforms": [], + "excludePlatforms": [], + "allowUnsafeCode": false, + "overrideReferences": false, + "precompiledReferences": [], + "autoReferenced": true, + "defineConstraints": [], + "versionDefines": [], + "noEngineReferences": false +} \ No newline at end of file diff --git a/Assets/NaughtyCharacter/Scripts/NaughtyCharacter.asmdef.meta b/Assets/NaughtyCharacter/_Scripts/NaughtyCharacter.asmdef.meta similarity index 100% rename from Assets/NaughtyCharacter/Scripts/NaughtyCharacter.asmdef.meta rename to Assets/NaughtyCharacter/_Scripts/NaughtyCharacter.asmdef.meta diff --git a/Assets/NaughtyCharacter/Scripts/PlayerCamera.cs b/Assets/NaughtyCharacter/_Scripts/PlayerCamera.cs similarity index 100% rename from Assets/NaughtyCharacter/Scripts/PlayerCamera.cs rename to Assets/NaughtyCharacter/_Scripts/PlayerCamera.cs diff --git a/Assets/NaughtyCharacter/Scripts/PlayerCamera.cs.meta b/Assets/NaughtyCharacter/_Scripts/PlayerCamera.cs.meta similarity index 100% rename from Assets/NaughtyCharacter/Scripts/PlayerCamera.cs.meta rename to Assets/NaughtyCharacter/_Scripts/PlayerCamera.cs.meta diff --git a/Assets/NaughtyCharacter/Scripts/PlayerController.cs b/Assets/NaughtyCharacter/_Scripts/PlayerController.cs similarity index 88% rename from Assets/NaughtyCharacter/Scripts/PlayerController.cs rename to Assets/NaughtyCharacter/_Scripts/PlayerController.cs index debb36f..085bca3 100644 --- a/Assets/NaughtyCharacter/Scripts/PlayerController.cs +++ b/Assets/NaughtyCharacter/_Scripts/PlayerController.cs @@ -5,21 +5,19 @@ namespace NaughtyCharacter [CreateAssetMenu(fileName = "PlayerController", menuName = "NaughtyCharacter/PlayerController")] public class PlayerController : Controller { - public float ControlRotationSensitivity = 3.0f; + public float ControlRotationSensitivity = 1.0f; - private PlayerInput _playerInput; + private PlayerInputComponent _playerInput; private PlayerCamera _playerCamera; public override void Init() { - _playerInput = FindObjectOfType(); + _playerInput = FindObjectOfType(); _playerCamera = FindObjectOfType(); } public override void OnCharacterUpdate() { - _playerInput.UpdateInput(); - UpdateControlRotation(); Character.SetMovementInput(GetMovementInput()); Character.SetJumpInput(_playerInput.JumpInput); diff --git a/Assets/NaughtyCharacter/Scripts/PlayerController.cs.meta b/Assets/NaughtyCharacter/_Scripts/PlayerController.cs.meta similarity index 100% rename from Assets/NaughtyCharacter/Scripts/PlayerController.cs.meta rename to Assets/NaughtyCharacter/_Scripts/PlayerController.cs.meta diff --git a/Assets/NaughtyCharacter/_Scripts/PlayerInputComponent.cs b/Assets/NaughtyCharacter/_Scripts/PlayerInputComponent.cs new file mode 100644 index 0000000..6ae7ea9 --- /dev/null +++ b/Assets/NaughtyCharacter/_Scripts/PlayerInputComponent.cs @@ -0,0 +1,45 @@ +using UnityEngine; +using UnityEngine.InputSystem; + +namespace NaughtyCharacter +{ + public class PlayerInputComponent : MonoBehaviour + { + public Vector2 MoveInput { get; private set; } + public Vector2 LastMoveInput { get; private set; } + public Vector2 CameraInput { get; private set; } + public bool JumpInput { get; private set; } + public bool HasMoveInput { get; private set; } + + public void OnMoveEvent(InputAction.CallbackContext context) + { + Vector2 moveInput = context.ReadValue(); + + bool hasMoveInput = moveInput.sqrMagnitude > 0.0f; + if (HasMoveInput && !hasMoveInput) + { + LastMoveInput = MoveInput; + } + + MoveInput = moveInput; + HasMoveInput = hasMoveInput; + } + + public void OnLookEvent(InputAction.CallbackContext context) + { + CameraInput = context.ReadValue(); + } + + public void OnJumpEvent(InputAction.CallbackContext context) + { + if (context.started || context.performed) + { + JumpInput = true; + } + else if (context.canceled) + { + JumpInput = false; + } + } + } +} diff --git a/Assets/NaughtyCharacter/Scripts/PlayerInput.cs.meta b/Assets/NaughtyCharacter/_Scripts/PlayerInputComponent.cs.meta similarity index 100% rename from Assets/NaughtyCharacter/Scripts/PlayerInput.cs.meta rename to Assets/NaughtyCharacter/_Scripts/PlayerInputComponent.cs.meta diff --git a/Assets/NaughtyCharacter/Scripts/SpringArm.cs b/Assets/NaughtyCharacter/_Scripts/SpringArm.cs similarity index 100% rename from Assets/NaughtyCharacter/Scripts/SpringArm.cs rename to Assets/NaughtyCharacter/_Scripts/SpringArm.cs diff --git a/Assets/NaughtyCharacter/Scripts/SpringArm.cs.meta b/Assets/NaughtyCharacter/_Scripts/SpringArm.cs.meta similarity index 100% rename from Assets/NaughtyCharacter/Scripts/SpringArm.cs.meta rename to Assets/NaughtyCharacter/_Scripts/SpringArm.cs.meta diff --git a/Assets/NaughtyCharacter/Scripts/Utility.meta b/Assets/NaughtyCharacter/_Scripts/Utility.meta similarity index 100% rename from Assets/NaughtyCharacter/Scripts/Utility.meta rename to Assets/NaughtyCharacter/_Scripts/Utility.meta diff --git a/Assets/NaughtyCharacter/Scripts/Utility/Util.cs b/Assets/NaughtyCharacter/_Scripts/Utility/Util.cs similarity index 100% rename from Assets/NaughtyCharacter/Scripts/Utility/Util.cs rename to Assets/NaughtyCharacter/_Scripts/Utility/Util.cs diff --git a/Assets/NaughtyCharacter/Scripts/Utility/Util.cs.meta b/Assets/NaughtyCharacter/_Scripts/Utility/Util.cs.meta similarity index 100% rename from Assets/NaughtyCharacter/Scripts/Utility/Util.cs.meta rename to Assets/NaughtyCharacter/_Scripts/Utility/Util.cs.meta diff --git a/Packages/manifest.json b/Packages/manifest.json index f72f533..9f518c2 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -1,6 +1,7 @@ { "dependencies": { "com.unity.ide.visualstudio": "2.0.11", + "com.unity.inputsystem": "1.0.2", "com.unity.probuilder": "5.0.3", "com.unity.ugui": "1.0.0", "com.unity.modules.ai": "1.0.0", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index 9acf209..38086a7 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -16,6 +16,13 @@ }, "url": "https://packages.unity.com" }, + "com.unity.inputsystem": { + "version": "1.0.2", + "depth": 0, + "source": "registry", + "dependencies": {}, + "url": "https://packages.unity.com" + }, "com.unity.probuilder": { "version": "5.0.3", "depth": 0, diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index 9bd6d10..1d5f436 100644 --- a/ProjectSettings/EditorBuildSettings.asset +++ b/ProjectSettings/EditorBuildSettings.asset @@ -8,4 +8,6 @@ EditorBuildSettings: - enabled: 0 path: guid: 00000000000000000000000000000000 - m_configObjects: {} + m_configObjects: + com.unity.input.settings: {fileID: 11400000, guid: d9a128682ad64554d9896e64484326e5, + type: 2} diff --git a/ProjectSettings/Packages/com.unity.probuilder/Settings.json b/ProjectSettings/Packages/com.unity.probuilder/Settings.json index 02d14ff..9c43240 100644 --- a/ProjectSettings/Packages/com.unity.probuilder/Settings.json +++ b/ProjectSettings/Packages/com.unity.probuilder/Settings.json @@ -42,6 +42,71 @@ "type": "System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089", "key": "experimental.enabled", "value": "{\"m_Value\":false}" + }, + { + "type": "System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089", + "key": "editor.showEditorNotifications", + "value": "{\"m_Value\":false}" + }, + { + "type": "System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089", + "key": "editor.showSceneInfo", + "value": "{\"m_Value\":false}" + }, + { + "type": "System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089", + "key": "editor.stripProBuilderScriptsOnBuild", + "value": "{\"m_Value\":true}" + }, + { + "type": "System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089", + "key": "editor.autoRecalculateCollisions", + "value": "{\"m_Value\":false}" + }, + { + "type": "System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089", + "key": "mesh.meshColliderIsConvex", + "value": "{\"m_Value\":false}" + }, + { + "type": "System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089", + "key": "mesh.newShapesSnapToGrid", + "value": "{\"m_Value\":true}" + }, + { + "type": "UnityEngine.ProBuilder.UnwrapParameters, Unity.ProBuilder, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null", + "key": "lightmapping.defaultLightmapUnwrapParameters", + "value": "{\"m_Value\":{\"m_HardAngle\":88.0,\"m_PackMargin\":20.0,\"m_AngleError\":8.0,\"m_AreaError\":15.0}}" + }, + { + "type": "System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089", + "key": "uv.uvEditorGridSnapIncrement", + "value": "{\"m_Value\":0.125}" + }, + { + "type": "UnityEngine.Material, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null", + "key": "mesh.userMaterial", + "value": "{\"m_Value\":{\"instanceID\":0}}" + }, + { + "type": "UnityEditor.StaticEditorFlags, UnityEditor.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null", + "key": "mesh.defaultStaticEditorFlags", + "value": "{\"m_Value\":0}" + }, + { + "type": "UnityEngine.ProBuilder.PivotLocation, Unity.ProBuilder, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null", + "key": "mesh.newShapePivotLocation", + "value": "{\"m_Value\":1}" + }, + { + "type": "UnityEngine.Rendering.ShadowCastingMode, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null", + "key": "mesh.shadowCastingMode", + "value": "{\"m_Value\":1}" + }, + { + "type": "UnityEngine.ProBuilder.ColliderType, Unity.ProBuilder, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null", + "key": "mesh.newShapeColliderType", + "value": "{\"m_Value\":2}" } ] } diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 22e0d47..9424402 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -3,7 +3,7 @@ --- !u!129 &1 PlayerSettings: m_ObjectHideFlags: 0 - serializedVersion: 18 + serializedVersion: 22 productGUID: 7aceaa3841eda1c43b4bf05b9a04d736 AndroidProfiler: 0 AndroidFilterTouchesWhenObscured: 0 @@ -49,10 +49,11 @@ PlayerSettings: m_StereoRenderingPath: 0 m_ActiveColorSpace: 0 m_MTRendering: 1 + mipStripping: 0 + numberOfMipsStripped: 0 m_StackTraceTypes: 010000000100000001000000010000000100000001000000 iosShowActivityIndicatorOnLoading: -1 androidShowActivityIndicatorOnLoading: -1 - displayResolutionDialog: 1 iosUseCustomAppBackgroundBehavior: 0 iosAllowHTTPDownload: 1 allowedAutorotateToPortrait: 1 @@ -67,6 +68,12 @@ PlayerSettings: androidRenderOutsideSafeArea: 0 androidUseSwappy: 0 androidBlitType: 0 + androidResizableWindow: 0 + androidDefaultWindowWidth: 1920 + androidDefaultWindowHeight: 1080 + androidMinimumWindowWidth: 400 + androidMinimumWindowHeight: 300 + androidFullscreenMode: 1 defaultIsNativeResolution: 1 macRetinaSupport: 1 runInBackground: 1 @@ -85,7 +92,6 @@ PlayerSettings: useMacAppStoreValidation: 0 macAppStoreCategory: public.app-category.games gpuSkinning: 0 - graphicsJobs: 0 xboxPIXTextureCapture: 0 xboxEnableAvatar: 0 xboxEnableKinect: 0 @@ -93,7 +99,6 @@ PlayerSettings: xboxEnableFitness: 0 visibleInBackground: 0 allowFullscreenSwitch: 1 - graphicsJobMode: 0 fullscreenMode: 1 xboxSpeechDB: 0 xboxEnableHeadOrientation: 0 @@ -106,6 +111,7 @@ PlayerSettings: xboxOneMonoLoggingLevel: 0 xboxOneLoggingLevel: 1 xboxOneDisableEsram: 0 + xboxOneEnableTypeOptimization: 0 xboxOnePresentImmediateThreshold: 0 switchQueueCommandMemory: 0 switchQueueControlMemory: 16384 @@ -113,7 +119,15 @@ PlayerSettings: switchNVNShaderPoolsGranularity: 33554432 switchNVNDefaultPoolsGranularity: 16777216 switchNVNOtherPoolsGranularity: 16777216 + switchNVNMaxPublicTextureIDCount: 0 + switchNVNMaxPublicSamplerIDCount: 0 + stadiaPresentMode: 0 + stadiaTargetFramerate: 0 + vulkanNumSwapchainBuffers: 3 vulkanEnableSetSRGBWrite: 0 + vulkanEnablePreTransform: 0 + vulkanEnableLateAcquireNextImage: 0 + vulkanEnableCommandBufferRecycling: 1 m_SupportedAspectRatios: 4:3: 1 5:4: 1 @@ -128,34 +142,11 @@ PlayerSettings: xboxOneDisableKinectGpuReservation: 0 xboxOneEnable7thCore: 1 vrSettings: - cardboard: - depthFormat: 0 - enableTransitionView: 0 - daydream: - depthFormat: 0 - useSustainedPerformanceMode: 0 - enableVideoLayer: 0 - useProtectedVideoMemory: 0 - minimumSupportedHeadTracking: 0 - maximumSupportedHeadTracking: 1 - hololens: - depthFormat: 1 - depthBufferSharingEnabled: 0 - lumin: - depthFormat: 0 - frameTiming: 2 - enableGLCache: 0 - glCacheMaxBlobSize: 524288 - glCacheMaxFileSize: 8388608 - oculus: - sharedDepthBuffer: 1 - dashSupport: 1 - lowOverheadMode: 0 enable360StereoCapture: 0 isWsaHolographicRemotingEnabled: 0 - protectGraphicsMemory: 0 enableFrameTimingStats: 0 useHDRDisplay: 0 + D3DHDRBitDepth: 0 m_ColorGamuts: 00000000 targetPixelDensity: 30 resolutionScalingMode: 0 @@ -167,9 +158,12 @@ PlayerSettings: iPhone: com.Company.ProductName tvOS: com.Company.ProductName buildNumber: + Standalone: 0 iPhone: 0 + tvOS: 0 + overrideDefaultApplicationIdentifier: 1 AndroidBundleVersionCode: 1 - AndroidMinSdkVersion: 16 + AndroidMinSdkVersion: 19 AndroidTargetSdkVersion: 0 AndroidPreferredInstallLocation: 1 aotOptions: @@ -184,32 +178,16 @@ PlayerSettings: StripUnusedMeshComponents: 0 VertexChannelCompressionMask: 214 iPhoneSdkVersion: 988 - iOSTargetOSVersionString: 9.0 + iOSTargetOSVersionString: 11.0 tvOSSdkVersion: 0 tvOSRequireExtendedGameController: 0 - tvOSTargetOSVersionString: 9.0 + tvOSTargetOSVersionString: 11.0 uIPrerenderedIcon: 0 uIRequiresPersistentWiFi: 0 uIRequiresFullScreen: 1 uIStatusBarHidden: 1 uIExitOnSuspend: 0 uIStatusBarStyle: 0 - iPhoneSplashScreen: {fileID: 0} - iPhoneHighResSplashScreen: {fileID: 0} - iPhoneTallHighResSplashScreen: {fileID: 0} - iPhone47inSplashScreen: {fileID: 0} - iPhone55inPortraitSplashScreen: {fileID: 0} - iPhone55inLandscapeSplashScreen: {fileID: 0} - iPhone58inPortraitSplashScreen: {fileID: 0} - iPhone58inLandscapeSplashScreen: {fileID: 0} - iPadPortraitSplashScreen: {fileID: 0} - iPadHighResPortraitSplashScreen: {fileID: 0} - iPadLandscapeSplashScreen: {fileID: 0} - iPadHighResLandscapeSplashScreen: {fileID: 0} - iPhone65inPortraitSplashScreen: {fileID: 0} - iPhone65inLandscapeSplashScreen: {fileID: 0} - iPhone61inPortraitSplashScreen: {fileID: 0} - iPhone61inLandscapeSplashScreen: {fileID: 0} appleTVSplashScreen: {fileID: 0} appleTVSplashScreen2x: {fileID: 0} tvOSSmallIconLayers: [] @@ -237,8 +215,8 @@ PlayerSettings: iOSLaunchScreeniPadFillPct: 100 iOSLaunchScreeniPadSize: 100 iOSLaunchScreeniPadCustomXibPath: - iOSUseLaunchScreenStoryboard: 0 iOSLaunchScreenCustomStoryboardPath: + iOSLaunchScreeniPadCustomStoryboardPath: iOSDeviceRequirements: [] iOSURLSchemes: [] iOSBackgroundModes: 0 @@ -246,6 +224,7 @@ PlayerSettings: metalEditorSupport: 1 metalAPIValidation: 1 iOSRenderExtraFrameOnPause: 1 + iosCopyPluginsCodeInsteadOfSymlink: 0 appleDeveloperTeamID: iOSManualSigningProvisioningProfileID: tvOSManualSigningProvisioningProfileID: @@ -255,10 +234,19 @@ PlayerSettings: iOSRequireARKit: 0 iOSAutomaticallyDetectAndAddCapabilities: 1 appleEnableProMotion: 0 + shaderPrecisionModel: 0 clonedFromGUID: 00000000000000000000000000000000 templatePackageId: templateDefaultScene: + useCustomMainManifest: 0 + useCustomLauncherManifest: 0 + useCustomMainGradleTemplate: 0 + useCustomLauncherGradleManifest: 0 + useCustomBaseGradleTemplate: 0 + useCustomGradlePropertiesTemplate: 0 + useCustomProguardFile: 0 AndroidTargetArchitectures: 5 + AndroidTargetDevices: 0 AndroidSplashScreenScale: 0 androidSplashScreen: {fileID: 0} AndroidKeystoreName: '{inproject}: ' @@ -275,9 +263,12 @@ PlayerSettings: height: 180 banner: {fileID: 0} androidGamepadSupportLevel: 0 + chromeosInputEmulation: 1 + AndroidMinifyWithR8: 0 + AndroidMinifyRelease: 0 + AndroidMinifyDebug: 0 AndroidValidateAppBundleSize: 1 AndroidAppBundleSizeToValidate: 150 - resolutionDialogBanner: {fileID: 0} m_BuildTargetIcons: - m_BuildTarget: m_Icons: @@ -291,10 +282,53 @@ PlayerSettings: - m_BuildTarget: Standalone m_StaticBatching: 1 m_DynamicBatching: 1 + m_BuildTargetGraphicsJobs: + - m_BuildTarget: MacStandaloneSupport + m_GraphicsJobs: 0 + - m_BuildTarget: Switch + m_GraphicsJobs: 0 + - m_BuildTarget: MetroSupport + m_GraphicsJobs: 0 + - m_BuildTarget: GameCoreScarlettSupport + m_GraphicsJobs: 0 + - m_BuildTarget: AppleTVSupport + m_GraphicsJobs: 0 + - m_BuildTarget: BJMSupport + m_GraphicsJobs: 0 + - m_BuildTarget: LinuxStandaloneSupport + m_GraphicsJobs: 0 + - m_BuildTarget: GameCoreXboxOneSupport + m_GraphicsJobs: 0 + - m_BuildTarget: PS4Player + m_GraphicsJobs: 0 + - m_BuildTarget: iOSSupport + m_GraphicsJobs: 0 + - m_BuildTarget: PS5Player + m_GraphicsJobs: 0 + - m_BuildTarget: WindowsStandaloneSupport + m_GraphicsJobs: 0 + - m_BuildTarget: XboxOnePlayer + m_GraphicsJobs: 0 + - m_BuildTarget: LuminSupport + m_GraphicsJobs: 0 + - m_BuildTarget: CloudRendering + m_GraphicsJobs: 0 + - m_BuildTarget: AndroidPlayer + m_GraphicsJobs: 0 + - m_BuildTarget: WebGLSupport + m_GraphicsJobs: 0 + m_BuildTargetGraphicsJobMode: + - m_BuildTarget: PS4Player + m_GraphicsJobMode: 0 + - m_BuildTarget: XboxOnePlayer + m_GraphicsJobMode: 0 m_BuildTargetGraphicsAPIs: - m_BuildTarget: AndroidPlayer m_APIs: 08000000 m_Automatic: 0 + - m_BuildTarget: iOSSupport + m_APIs: 10000000 + m_Automatic: 1 m_BuildTargetVRSettings: - m_BuildTarget: Android m_Enabled: 0 @@ -353,7 +387,6 @@ PlayerSettings: openGLRequireES31: 0 openGLRequireES31AEP: 0 openGLRequireES32: 0 - vuforiaEnabled: 0 m_TemplateCustomTags: {} mobileMTRendering: iPhone: 1 @@ -366,6 +399,7 @@ PlayerSettings: - m_BuildTarget: PS4 m_EncodingQuality: 1 m_BuildTargetGroupLightmapSettings: [] + m_BuildTargetNormalMapEncoding: [] playModeTestRunnerEnabled: 0 runPlayModeTestAsEditModeTest: 0 actionOnDotNetUnhandledException: 1 @@ -375,12 +409,16 @@ PlayerSettings: cameraUsageDescription: locationUsageDescription: microphoneUsageDescription: + bluetoothUsageDescription: + switchNMETAOverride: switchNetLibKey: switchSocketMemoryPoolSize: 6144 switchSocketAllocatorPoolSize: 128 switchSocketConcurrencyLimit: 14 switchScreenResolutionBehavior: 2 switchUseCPUProfiler: 0 + switchUseGOLDLinker: 0 + switchLTOSetting: 0 switchApplicationID: 0x01004b9000490000 switchNSODependencies: switchTitleNames_0: @@ -398,6 +436,7 @@ PlayerSettings: switchTitleNames_12: switchTitleNames_13: switchTitleNames_14: + switchTitleNames_15: switchPublisherNames_0: switchPublisherNames_1: switchPublisherNames_2: @@ -413,6 +452,7 @@ PlayerSettings: switchPublisherNames_12: switchPublisherNames_13: switchPublisherNames_14: + switchPublisherNames_15: switchIcons_0: {fileID: 0} switchIcons_1: {fileID: 0} switchIcons_2: {fileID: 0} @@ -428,6 +468,7 @@ PlayerSettings: switchIcons_12: {fileID: 0} switchIcons_13: {fileID: 0} switchIcons_14: {fileID: 0} + switchIcons_15: {fileID: 0} switchSmallIcons_0: {fileID: 0} switchSmallIcons_1: {fileID: 0} switchSmallIcons_2: {fileID: 0} @@ -443,6 +484,7 @@ PlayerSettings: switchSmallIcons_12: {fileID: 0} switchSmallIcons_13: {fileID: 0} switchSmallIcons_14: {fileID: 0} + switchSmallIcons_15: {fileID: 0} switchManualHTML: switchAccessibleURLs: switchLegalInformation: @@ -474,6 +516,7 @@ PlayerSettings: switchRatingsInt_9: 0 switchRatingsInt_10: 0 switchRatingsInt_11: 0 + switchRatingsInt_12: 0 switchLocalCommunicationIds_0: switchLocalCommunicationIds_1: switchLocalCommunicationIds_2: @@ -504,6 +547,9 @@ PlayerSettings: switchSocketInitializeEnabled: 1 switchNetworkInterfaceManagerInitializeEnabled: 1 switchPlayerConnectionEnabled: 1 + switchUseNewStyleFilepaths: 0 + switchUseMicroSleepForYield: 1 + switchMicroSleepForYieldTime: 25 ps4NPAgeRating: 12 ps4NPTitleSecret: ps4NPTrophyPackPath: @@ -530,6 +576,7 @@ PlayerSettings: ps4ShareFilePath: ps4ShareOverlayImagePath: ps4PrivacyGuardImagePath: + ps4ExtraSceSysFile: ps4NPtitleDatPath: ps4RemotePlayKeyAssignment: -1 ps4RemotePlayKeyMappingDir: @@ -555,6 +602,7 @@ PlayerSettings: ps4UseResolutionFallback: 0 ps4ReprojectionSupport: 0 ps4UseAudio3dBackend: 0 + ps4UseLowGarlicFragmentationMode: 1 ps4SocialScreenEnabled: 0 ps4ScriptOptimizationLevel: 2 ps4Audio3dVirtualSpeakerCount: 14 @@ -571,8 +619,12 @@ PlayerSettings: ps4disableAutoHideSplash: 0 ps4videoRecordingFeaturesUsed: 0 ps4contentSearchFeaturesUsed: 0 + ps4CompatibilityPS5: 0 + ps4AllowPS5Detection: 0 + ps4GPU800MHz: 1 ps4attribEyeToEyeDistanceSettingVR: 0 ps4IncludedModules: [] + ps4attribVROutputEnabled: 0 monoEnv: splashScreenBackgroundSourceLandscape: {fileID: 0} splashScreenBackgroundSourcePortrait: {fileID: 0} @@ -589,9 +641,10 @@ PlayerSettings: webGLAnalyzeBuildSize: 0 webGLUseEmbeddedResources: 0 webGLCompressionFormat: 1 + webGLWasmArithmeticExceptions: 0 webGLLinkerTarget: 1 webGLThreadsSupport: 0 - webGLWasmStreaming: 0 + webGLDecompressionFallback: 0 scriptingDefineSymbols: 1: UNITY_POST_PROCESSING_STACK_V2 7: UNITY_POST_PROCESSING_STACK_V2 @@ -602,8 +655,9 @@ PlayerSettings: 26: UNITY_POST_PROCESSING_STACK_V2 27: UNITY_POST_PROCESSING_STACK_V2 28: UNITY_POST_PROCESSING_STACK_V2 + additionalCompilerArguments: {} platformArchitecture: - iPhone: 2 + iPhone: 1 scriptingBackend: Android: 0 Standalone: 0 @@ -615,10 +669,14 @@ PlayerSettings: managedStrippingLevel: {} incrementalIl2cppBuild: iPhone: 0 + suppressCommonWarnings: 1 allowUnsafeCode: 0 + useDeterministicCompilation: 1 + enableRoslynAnalyzers: 1 additionalIl2CppArgs: scriptingRuntimeVersion: 1 gcIncremental: 0 + assemblyVersionValidation: 1 gcWBarrierValidation: 0 apiCompatibilityLevelPerPlatform: Standalone: 3 @@ -668,18 +726,16 @@ PlayerSettings: XboxOneCapability: [] XboxOneGameRating: {} XboxOneIsContentPackage: 0 + XboxOneEnhancedXboxCompatibilityMode: 0 XboxOneEnableGPUVariability: 0 XboxOneSockets: {} XboxOneSplashScreen: {fileID: 0} XboxOneAllowedProductIds: [] XboxOnePersistentLocalStorageSize: 0 XboxOneXTitleMemory: 8 - xboxOneScriptCompiler: 1 XboxOneOverrideIdentityName: - vrEditorSettings: - daydream: - daydreamIconForeground: {fileID: 0} - daydreamIconBackground: {fileID: 0} + XboxOneOverrideIdentityPublisher: + vrEditorSettings: {} cloudServicesEnabled: Analytics: 0 Build: 0 @@ -701,19 +757,13 @@ PlayerSettings: luminVersion: m_VersionCode: 1 m_VersionName: - facebookSdkVersion: - facebookAppId: - facebookCookies: 1 - facebookLogging: 1 - facebookStatus: 1 - facebookXfbml: 0 - facebookFrictionlessRequests: 1 apiCompatibilityLevel: 6 + activeInputHandler: 1 cloudProjectId: framebufferDepthMemorylessMode: 0 + qualitySettingsNames: [] projectName: organizationId: cloudEnabled: 0 - enableNativePlatformBackendsForNewInputSystem: 0 - disableOldInputManagerSupport: 0 legacyClampBlendShapeWeights: 1 + virtualTexturingSupportEnabled: 0