diff --git a/.gitignore b/.gitignore index a2ed681..ae5daa8 100644 --- a/.gitignore +++ b/.gitignore @@ -100,3 +100,6 @@ InitTestScene*.unity* # Auto-generated scenes by play mode tests /[Aa]ssets/[Ii]nit[Tt]est[Ss]cene*.unity* + +/[Aa]ssets/[Ss]amples/ +/[Aa]ssets/[Ss]amples.meta diff --git a/Assets/InputSystem_Actions.inputactions b/Assets/InputSystem_Actions.inputactions index b5acefa..d052051 100644 --- a/Assets/InputSystem_Actions.inputactions +++ b/Assets/InputSystem_Actions.inputactions @@ -113,6 +113,15 @@ "processors": "", "interactions": "", "initialStateCheck": false + }, + { + "name": "Inventory", + "type": "Button", + "id": "bf48e9be-890c-46e9-80a2-1d7ecc85e20b", + "expectedControlType": "", + "processors": "", + "interactions": "", + "initialStateCheck": false } ], "bindings": [ @@ -577,6 +586,28 @@ "action": "Reload", "isComposite": false, "isPartOfComposite": false + }, + { + "name": "", + "id": "7da2a8fd-741d-4e7c-86dc-64678b958e39", + "path": "/tab", + "interactions": "", + "processors": "", + "groups": ";Keyboard&Mouse", + "action": "Inventory", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "87ba6bee-8062-426f-87c4-7fad35da459b", + "path": "/buttonEast", + "interactions": "", + "processors": "", + "groups": ";Gamepad", + "action": "Inventory", + "isComposite": false, + "isPartOfComposite": false } ] }, @@ -673,6 +704,15 @@ "processors": "", "interactions": "", "initialStateCheck": false + }, + { + "name": "Inventory", + "type": "Button", + "id": "8234c274-3165-4e2e-8d1c-74103faafd8a", + "expectedControlType": "", + "processors": "", + "interactions": "", + "initialStateCheck": false } ], "bindings": [ @@ -1093,6 +1133,28 @@ "action": "TrackedDeviceOrientation", "isComposite": false, "isPartOfComposite": false + }, + { + "name": "", + "id": "be1028c2-a4be-44d9-8a8a-31172540440c", + "path": "/buttonEast", + "interactions": "", + "processors": "", + "groups": ";Gamepad", + "action": "Inventory", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "3b96fa74-9d2b-473b-8125-6467d3e39870", + "path": "/tab", + "interactions": "", + "processors": "", + "groups": ";Keyboard&Mouse", + "action": "Inventory", + "isComposite": false, + "isPartOfComposite": false } ] } diff --git a/Assets/Prefabs/Key.prefab b/Assets/Prefabs/Key.prefab index 88581c7..c33a0aa 100644 --- a/Assets/Prefabs/Key.prefab +++ b/Assets/Prefabs/Key.prefab @@ -30,7 +30,7 @@ Transform: m_GameObject: {fileID: 2892703864492016621} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0.38268343, z: 0, w: 0.92387956} - m_LocalPosition: {x: -2, y: 0.005, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.4, y: 0.01, z: 0.2} m_ConstrainProportionsScale: 0 m_Children: [] @@ -123,6 +123,12 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: oneTimeUse: 0 + onSelected: + m_PersistentCalls: + m_Calls: [] + onDeselected: + m_PersistentCalls: + m_Calls: [] onInteracted: m_PersistentCalls: m_Calls: diff --git a/Assets/Prefabs/KeyPreview.prefab b/Assets/Prefabs/KeyPreview.prefab new file mode 100644 index 0000000..7b47b5c --- /dev/null +++ b/Assets/Prefabs/KeyPreview.prefab @@ -0,0 +1,88 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &2892703864492016621 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2368094401510200604} + - component: {fileID: 3721857971285848745} + - component: {fileID: 4840302974988827429} + m_Layer: 8 + m_Name: KeyPreview + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2368094401510200604 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2892703864492016621} + serializedVersion: 2 + m_LocalRotation: {x: 0.6830128, y: -0.18301234, z: -0.18301241, w: 0.68301284} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 2, y: 0.02, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 60, y: -90, z: -90} +--- !u!33 &3721857971285848745 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2892703864492016621} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &4840302974988827429 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2892703864492016621} + m_Enabled: 1 + m_CastShadows: 1 + 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_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: be8072c6f51e356f8a8c5affbe22973f, 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: 1 + m_SelectedEditorRenderState: 3 + 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} diff --git a/Assets/Prefabs/KeyPreview.prefab.meta b/Assets/Prefabs/KeyPreview.prefab.meta new file mode 100644 index 0000000..2387811 --- /dev/null +++ b/Assets/Prefabs/KeyPreview.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: cbffd5b6d954099a491f8a2a744b6d01 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/TutorialInfo.meta b/Assets/Resources/Glock17.meta similarity index 77% rename from Assets/TutorialInfo.meta rename to Assets/Resources/Glock17.meta index a700bca..9716476 100644 --- a/Assets/TutorialInfo.meta +++ b/Assets/Resources/Glock17.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: ba062aa6c92b140379dbc06b43dd3b9b +guid: 9d57b977e58d1b58c90a05d6247ee000 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Resources/Glock17.fbx b/Assets/Resources/Glock17/Glock17.fbx similarity index 100% rename from Assets/Resources/Glock17.fbx rename to Assets/Resources/Glock17/Glock17.fbx diff --git a/Assets/Resources/Glock17.fbx.meta b/Assets/Resources/Glock17/Glock17.fbx.meta similarity index 100% rename from Assets/Resources/Glock17.fbx.meta rename to Assets/Resources/Glock17/Glock17.fbx.meta diff --git a/Assets/Resources/Glock17Equipped.prefab b/Assets/Resources/Glock17/Glock17Equipped.prefab similarity index 70% rename from Assets/Resources/Glock17Equipped.prefab rename to Assets/Resources/Glock17/Glock17Equipped.prefab index c2a7688..29f4fd9 100644 --- a/Assets/Resources/Glock17Equipped.prefab +++ b/Assets/Resources/Glock17/Glock17Equipped.prefab @@ -24,7 +24,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3189041518118701393} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 1, z: 0, w: 0} + m_LocalRotation: {x: 0.0017443874, y: -0.9994323, z: 0.033643518, w: 0.000058764297} m_LocalPosition: {x: 0, y: 0.375, z: -1.2} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 @@ -91,12 +91,65 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 272 objectReference: {fileID: 0} + - target: {fileID: -5922622823359544968, guid: bf9d862a19647f28795df2e666425003, type: 3} + propertyPath: m_Layer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -5568371526223589888, guid: bf9d862a19647f28795df2e666425003, type: 3} + propertyPath: m_Layer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -3898791185525528228, guid: bf9d862a19647f28795df2e666425003, type: 3} + propertyPath: m_RenderingLayerMask + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -2059808378567916338, guid: bf9d862a19647f28795df2e666425003, type: 3} + propertyPath: m_Layer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -1967758284531576944, guid: bf9d862a19647f28795df2e666425003, type: 3} + propertyPath: m_RenderingLayerMask + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -1919110505097373512, guid: bf9d862a19647f28795df2e666425003, type: 3} + propertyPath: m_Layer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -1374039232608429058, guid: bf9d862a19647f28795df2e666425003, type: 3} + propertyPath: m_RenderingLayerMask + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 236216658851537685, guid: bf9d862a19647f28795df2e666425003, type: 3} + propertyPath: m_RenderingLayerMask + value: 1 + objectReference: {fileID: 0} - target: {fileID: 919132149155446097, guid: bf9d862a19647f28795df2e666425003, type: 3} propertyPath: m_Name value: Glock17Equipped objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: bf9d862a19647f28795df2e666425003, type: 3} + propertyPath: m_Layer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5232627393660835655, guid: bf9d862a19647f28795df2e666425003, type: 3} + propertyPath: m_RenderingLayerMask + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6619225641134156614, guid: bf9d862a19647f28795df2e666425003, type: 3} + propertyPath: m_Layer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7202271454713460447, guid: bf9d862a19647f28795df2e666425003, type: 3} + propertyPath: m_RenderingLayerMask + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7556193500268387829, guid: bf9d862a19647f28795df2e666425003, type: 3} + propertyPath: m_Layer + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] - m_RemovedGameObjects: [] + m_RemovedGameObjects: + - {fileID: -2407699025559542186, guid: bf9d862a19647f28795df2e666425003, type: 3} m_AddedGameObjects: - targetCorrespondingSourceObject: {fileID: -8679921383154817045, guid: bf9d862a19647f28795df2e666425003, type: 3} insertIndex: -1 diff --git a/Assets/Resources/Glock17Equipped.prefab.meta b/Assets/Resources/Glock17/Glock17Equipped.prefab.meta similarity index 100% rename from Assets/Resources/Glock17Equipped.prefab.meta rename to Assets/Resources/Glock17/Glock17Equipped.prefab.meta diff --git a/Assets/Resources/Glock17/Glock17Preview.prefab b/Assets/Resources/Glock17/Glock17Preview.prefab new file mode 100644 index 0000000..58a9a08 --- /dev/null +++ b/Assets/Resources/Glock17/Glock17Preview.prefab @@ -0,0 +1,112 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &3538664591492219717 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: bf9d862a19647f28795df2e666425003, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: bf9d862a19647f28795df2e666425003, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: bf9d862a19647f28795df2e666425003, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: bf9d862a19647f28795df2e666425003, type: 3} + propertyPath: m_LocalRotation.w + value: 0.65328145 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: bf9d862a19647f28795df2e666425003, type: 3} + propertyPath: m_LocalRotation.x + value: -0.2705982 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: bf9d862a19647f28795df2e666425003, type: 3} + propertyPath: m_LocalRotation.y + value: -0.65328145 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: bf9d862a19647f28795df2e666425003, type: 3} + propertyPath: m_LocalRotation.z + value: -0.2705982 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: bf9d862a19647f28795df2e666425003, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 315 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: bf9d862a19647f28795df2e666425003, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 270 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: bf9d862a19647f28795df2e666425003, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -5922622823359544968, guid: bf9d862a19647f28795df2e666425003, type: 3} + propertyPath: m_Layer + value: 8 + objectReference: {fileID: 0} + - target: {fileID: -5568371526223589888, guid: bf9d862a19647f28795df2e666425003, type: 3} + propertyPath: m_Layer + value: 8 + objectReference: {fileID: 0} + - target: {fileID: -3898791185525528228, guid: bf9d862a19647f28795df2e666425003, type: 3} + propertyPath: m_RenderingLayerMask + value: 2 + objectReference: {fileID: 0} + - target: {fileID: -2059808378567916338, guid: bf9d862a19647f28795df2e666425003, type: 3} + propertyPath: m_Layer + value: 8 + objectReference: {fileID: 0} + - target: {fileID: -1967758284531576944, guid: bf9d862a19647f28795df2e666425003, type: 3} + propertyPath: m_RenderingLayerMask + value: 2 + objectReference: {fileID: 0} + - target: {fileID: -1919110505097373512, guid: bf9d862a19647f28795df2e666425003, type: 3} + propertyPath: m_Layer + value: 8 + objectReference: {fileID: 0} + - target: {fileID: -1374039232608429058, guid: bf9d862a19647f28795df2e666425003, type: 3} + propertyPath: m_RenderingLayerMask + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 236216658851537685, guid: bf9d862a19647f28795df2e666425003, type: 3} + propertyPath: m_RenderingLayerMask + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: bf9d862a19647f28795df2e666425003, type: 3} + propertyPath: m_Name + value: Glock17Preview + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: bf9d862a19647f28795df2e666425003, type: 3} + propertyPath: m_Layer + value: 8 + objectReference: {fileID: 0} + - target: {fileID: 5232627393660835655, guid: bf9d862a19647f28795df2e666425003, type: 3} + propertyPath: m_RenderingLayerMask + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 6619225641134156614, guid: bf9d862a19647f28795df2e666425003, type: 3} + propertyPath: m_Layer + value: 8 + objectReference: {fileID: 0} + - target: {fileID: 7202271454713460447, guid: bf9d862a19647f28795df2e666425003, type: 3} + propertyPath: m_RenderingLayerMask + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 7556193500268387829, guid: bf9d862a19647f28795df2e666425003, type: 3} + propertyPath: m_Layer + value: 8 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: + - {fileID: -2407699025559542186, guid: bf9d862a19647f28795df2e666425003, type: 3} + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: bf9d862a19647f28795df2e666425003, type: 3} diff --git a/Assets/Resources/Glock17/Glock17Preview.prefab.meta b/Assets/Resources/Glock17/Glock17Preview.prefab.meta new file mode 100644 index 0000000..b10aa9a --- /dev/null +++ b/Assets/Resources/Glock17/Glock17Preview.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: f853e5887a27c240d90ca5c19cc270e1 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/SOAP/Input/InventoryInput.asset b/Assets/SOAP/Input/InventoryInput.asset new file mode 100644 index 0000000..c677a79 --- /dev/null +++ b/Assets/SOAP/Input/InventoryInput.asset @@ -0,0 +1,21 @@ +%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: 6c481c42e360ed2b89fb1f5fc4558fdb, type: 3} + m_Name: InventoryInput + m_EditorClassIdentifier: + started: {fileID: 0} + performed: {fileID: 11400000, guid: 05ac93739cc1d1796b9403f2421c056b, type: 2} + canceled: {fileID: 0} + waiting: {fileID: 0} + disabled: {fileID: 0} + reactiveValue: {fileID: 0} + valueAsButton: {fileID: 0} diff --git a/Assets/SOAP/Input/InventoryInput.asset.meta b/Assets/SOAP/Input/InventoryInput.asset.meta new file mode 100644 index 0000000..173605c --- /dev/null +++ b/Assets/SOAP/Input/InventoryInput.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f168a80804247334e9d8ec837f58c9e1 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/SOAP/Input/InventoryInputEvent.asset b/Assets/SOAP/Input/InventoryInputEvent.asset new file mode 100644 index 0000000..0ba2076 --- /dev/null +++ b/Assets/SOAP/Input/InventoryInputEvent.asset @@ -0,0 +1,14 @@ +%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: 56805e83aabe387929ad23e06adda5fd, type: 3} + m_Name: InventoryInputEvent + m_EditorClassIdentifier: diff --git a/Assets/SOAP/Input/InventoryInputEvent.asset.meta b/Assets/SOAP/Input/InventoryInputEvent.asset.meta new file mode 100644 index 0000000..e94e9c1 --- /dev/null +++ b/Assets/SOAP/Input/InventoryInputEvent.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 05ac93739cc1d1796b9403f2421c056b +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/SOAP/Items/DebugKey.asset b/Assets/SOAP/Items/DebugKey.asset index 39d524d..c39b2a3 100644 --- a/Assets/SOAP/Items/DebugKey.asset +++ b/Assets/SOAP/Items/DebugKey.asset @@ -15,10 +15,9 @@ MonoBehaviour: id: 1f650f4d-35fc-412f-b3fc-cf262c9d3e5f displayName: Debug Key description: + icon: {fileID: -123325096, guid: b5ca4025143f3c2078e7070eea546959, type: 3} tags: [] - type: 0 + worldPrefab: {fileID: 2892703864492016621, guid: 51202e3c62c3d3e1c9bb0ff9c09a608f, type: 3} + previewPrefab: {fileID: 2892703864492016621, guid: cbffd5b6d954099a491f8a2a744b6d01, type: 3} stackable: 0 maxStackCount: 10 - icon: {fileID: -1304905567622442630, guid: 4e01e0da3979f115d951c3cb798e4313, type: 3} - instancePrefab: {fileID: 2892703864492016621, guid: 51202e3c62c3d3e1c9bb0ff9c09a608f, type: 3} - previewPrefab: {fileID: 0} diff --git a/Assets/SOAP/Items/Pistol.asset b/Assets/SOAP/Items/Pistol.asset index 9ee9166..0ecb5fd 100644 --- a/Assets/SOAP/Items/Pistol.asset +++ b/Assets/SOAP/Items/Pistol.asset @@ -14,11 +14,12 @@ MonoBehaviour: m_EditorClassIdentifier: id: 3aaccf06-f737-4e9b-9daf-2d99e69a14e7 displayName: Pistol - description: + description: A semi-automatic pistol. Fires 10mm ammunition from a 10-round magazine. + Easy to use, high rate of fire. icon: {fileID: -1451803064, guid: acf7be11a7aec869a96fca7c3cb2e6ff, type: 3} tags: [] worldPrefab: {fileID: 919132149155446097, guid: bf9d862a19647f28795df2e666425003, type: 3} - previewPrefab: {fileID: 919132149155446097, guid: bf9d862a19647f28795df2e666425003, type: 3} + previewPrefab: {fileID: 4457074219773640212, guid: f853e5887a27c240d90ca5c19cc270e1, type: 3} stackable: 0 maxStackCount: 1 equippedPrefab: {fileID: 492801038359376716, guid: 34383341362bbd7c59b199a69ed897e4, type: 3} diff --git a/Assets/SOAP/Items/SelectedItem.asset b/Assets/SOAP/Items/SelectedItem.asset index e8d80bb..2472b24 100644 --- a/Assets/SOAP/Items/SelectedItem.asset +++ b/Assets/SOAP/Items/SelectedItem.asset @@ -9,15 +9,9 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 1ca5a6e9c022cf971a176095a74df394, type: 3} + m_Script: {fileID: 11500000, guid: 267a9c1f4bb280a6a93f4240b8485056, type: 3} m_Name: SelectedItem m_EditorClassIdentifier: - id: 7602a606-109c-4a58-8786-f4c95fee7a92 - displayName: - description: - icon: {fileID: 0} - tags: [] - worldPrefab: {fileID: 0} - previewPrefab: {fileID: 0} - stackable: 0 - maxStackCount: 1 + Description: + value: + value: {fileID: 11400000, guid: 83a7512982c0868bbacfd587c15efbea, type: 2} diff --git a/Assets/SOAP/Items/SelectedItem.asset.meta b/Assets/SOAP/Items/SelectedItem.asset.meta index f587c52..03f52f0 100644 --- a/Assets/SOAP/Items/SelectedItem.asset.meta +++ b/Assets/SOAP/Items/SelectedItem.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 0f16091ed7577d3268f2725cf823d4da +guid: 37d00232a0bee1e8e923705187ff2187 NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/Assets/SOAP/Items/TestInventory.asset b/Assets/SOAP/Items/TestInventory.asset index a35eb8d..6f3e2d6 100644 --- a/Assets/SOAP/Items/TestInventory.asset +++ b/Assets/SOAP/Items/TestInventory.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 9702da9b93bb25bf089c54dc37cc44e7, type: 3} m_Name: TestInventory m_EditorClassIdentifier: - serializableItems: + items: - Item: {fileID: 11400000, guid: 3a9b5fc9b523890cf8abd310dbc64940, type: 2} count: 1 - Item: {fileID: 11400000, guid: 83a7512982c0868bbacfd587c15efbea, type: 2} diff --git a/Assets/SOAP/UI/ItemPreviewDelta.asset b/Assets/SOAP/UI/ItemPreviewDelta.asset new file mode 100644 index 0000000..f7273c3 --- /dev/null +++ b/Assets/SOAP/UI/ItemPreviewDelta.asset @@ -0,0 +1,17 @@ +%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: 1a85afc7b5f9bc9f386e4f76d3725daf, type: 3} + m_Name: ItemPreviewDelta + m_EditorClassIdentifier: + Description: + value: + value: {x: 0, y: 0} diff --git a/Assets/SOAP/UI/ItemPreviewDelta.asset.meta b/Assets/SOAP/UI/ItemPreviewDelta.asset.meta new file mode 100644 index 0000000..8ca19d5 --- /dev/null +++ b/Assets/SOAP/UI/ItemPreviewDelta.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 61bec5de28967d14d8027ebd7c009e4e +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/SOAP/UI/ItemPreviewZoom.asset b/Assets/SOAP/UI/ItemPreviewZoom.asset new file mode 100644 index 0000000..e335fc8 --- /dev/null +++ b/Assets/SOAP/UI/ItemPreviewZoom.asset @@ -0,0 +1,19 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7f5d678d3982081db9d3d4897850cf76, type: 3} + m_Name: ItemPreviewZoom + m_EditorClassIdentifier: + Description: + value: + value: 0 + clamp: 1 + minMax: {x: -50, y: 10} diff --git a/Assets/SOAP/UI/ItemPreviewZoom.asset.meta b/Assets/SOAP/UI/ItemPreviewZoom.asset.meta new file mode 100644 index 0000000..1de6146 --- /dev/null +++ b/Assets/SOAP/UI/ItemPreviewZoom.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b611ded87bd3825d7bf45e43eaea670d +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/TutorialInfo/Icons.meta b/Assets/SceneDependencyCache.meta similarity index 57% rename from Assets/TutorialInfo/Icons.meta rename to Assets/SceneDependencyCache.meta index 1d19fb9..984b0df 100644 --- a/Assets/TutorialInfo/Icons.meta +++ b/Assets/SceneDependencyCache.meta @@ -1,9 +1,8 @@ fileFormatVersion: 2 -guid: 8a0c9218a650547d98138cd835033977 +guid: eccfcb5811706e3efba1ef8e033b5dda folderAsset: yes -timeCreated: 1484670163 -licenseType: Store DefaultImporter: + externalObjects: {} userData: assetBundleName: assetBundleVariant: diff --git a/Assets/SceneDependencyCache/12ee09150bce8c611a562640b944ff62.sceneWithBuildSettings b/Assets/SceneDependencyCache/12ee09150bce8c611a562640b944ff62.sceneWithBuildSettings new file mode 100644 index 0000000..c7bfb10 Binary files /dev/null and b/Assets/SceneDependencyCache/12ee09150bce8c611a562640b944ff62.sceneWithBuildSettings differ diff --git a/Assets/SceneDependencyCache/12ee09150bce8c611a562640b944ff62.sceneWithBuildSettings.meta b/Assets/SceneDependencyCache/12ee09150bce8c611a562640b944ff62.sceneWithBuildSettings.meta new file mode 100644 index 0000000..08a127f --- /dev/null +++ b/Assets/SceneDependencyCache/12ee09150bce8c611a562640b944ff62.sceneWithBuildSettings.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 12ee09150bce8c611a562640b944ff62 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/SceneDependencyCache/6dca14e3027067463143efe5eee5b62c.sceneWithBuildSettings b/Assets/SceneDependencyCache/6dca14e3027067463143efe5eee5b62c.sceneWithBuildSettings new file mode 100644 index 0000000..11d17f2 Binary files /dev/null and b/Assets/SceneDependencyCache/6dca14e3027067463143efe5eee5b62c.sceneWithBuildSettings differ diff --git a/Assets/SceneDependencyCache/6dca14e3027067463143efe5eee5b62c.sceneWithBuildSettings.meta b/Assets/SceneDependencyCache/6dca14e3027067463143efe5eee5b62c.sceneWithBuildSettings.meta new file mode 100644 index 0000000..46d1fbd --- /dev/null +++ b/Assets/SceneDependencyCache/6dca14e3027067463143efe5eee5b62c.sceneWithBuildSettings.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 6dca14e3027067463143efe5eee5b62c +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/TutorialInfo/Scripts.meta b/Assets/Scenes/DebugScene.meta similarity index 57% rename from Assets/TutorialInfo/Scripts.meta rename to Assets/Scenes/DebugScene.meta index 02da605..891e488 100644 --- a/Assets/TutorialInfo/Scripts.meta +++ b/Assets/Scenes/DebugScene.meta @@ -1,9 +1,8 @@ fileFormatVersion: 2 -guid: 5a9bcd70e6a4b4b05badaa72e827d8e0 +guid: f0ff03fa9c3fb660eb36c1516f071f88 folderAsset: yes -timeCreated: 1475835190 -licenseType: Store DefaultImporter: + externalObjects: {} userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Scenes/SampleScene.unity b/Assets/Scenes/DebugScene.unity similarity index 56% rename from Assets/Scenes/SampleScene.unity rename to Assets/Scenes/DebugScene.unity index 231587f..6d97d65 100644 --- a/Assets/Scenes/SampleScene.unity +++ b/Assets/Scenes/DebugScene.unity @@ -119,6 +119,69 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} +--- !u!1 &65105623 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 65105624} + m_Layer: 6 + m_Name: mixamorig:LeftUpLeg + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &65105624 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 65105623} + serializedVersion: 2 + m_LocalRotation: {x: 0.000000018995559, y: 0.01101821, z: 0.9999393, w: 0.00000053245526} + m_LocalPosition: {x: -0.08207788, y: -0.06771803, z: -0.015122138} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 309088843} + m_Father: {fileID: 880188920} + m_LocalEulerAnglesHint: {x: -32.385113, y: -10.229966, z: 162.74034} +--- !u!1 &74863862 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 74863863} + m_Layer: 6 + m_Name: mixamorig:LeftHandMiddle4 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &74863863 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 74863862} + serializedVersion: 2 + m_LocalRotation: {x: -0.000000026759425, y: 0.0010241407, z: -0.000027984757, w: 0.99999946} + m_LocalPosition: {x: 8.712009e-14, y: 0.029528635, z: -1.3157035e-15} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1059598544} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &79264407 GameObject: m_ObjectHideFlags: 0 @@ -227,11 +290,159 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 79264407} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} ---- !u!4 &166564785 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1852576806548013000, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - m_PrefabInstance: {fileID: 1574173917} +--- !u!1 &113463647 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 113463648} + m_Layer: 6 + m_Name: mixamorig:LeftHandMiddle2 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &113463648 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 113463647} + serializedVersion: 2 + m_LocalRotation: {x: -0.00000022318848, y: 0.000000044710372, z: -0.00000025219094, w: 1} + m_LocalPosition: {x: 1.8484327e-17, y: 0.037, z: -4.1078256e-17} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1059598544} + m_Father: {fileID: 690735214} + m_LocalEulerAnglesHint: {x: 59.867607, y: 5.8658566, z: 10.169066} +--- !u!1 &123293703 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 123293704} + m_Layer: 0 + m_Name: Wall + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &123293704 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 123293703} + serializedVersion: 2 + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1504087848} + - {fileID: 518677617} + - {fileID: 584591836} + - {fileID: 1632951288} + m_Father: {fileID: 835116272} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &145119526 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 145119527} + m_Layer: 6 + m_Name: mixamorig:Spine2 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &145119527 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 145119526} + serializedVersion: 2 + m_LocalRotation: {x: 0.01288562, y: 4.7711735e-10, z: 0.000000037024044, w: 0.999917} + m_LocalPosition: {x: -1.1375431e-16, y: 0.09322091, z: 0.000000002823681} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 2063172142} + - {fileID: 491303346} + - {fileID: 1495032982} + m_Father: {fileID: 401758456} + m_LocalEulerAnglesHint: {x: 4.161153, y: -7.89925, z: -0.9497503} +--- !u!4 &166564785 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1116449711} + serializedVersion: 2 + m_LocalRotation: {x: 0.00000008940579, y: -0.0000028014183, z: -0.00000038743, w: 1} + m_LocalPosition: {x: -0.00000022858599, y: 0.2832884, z: 0.000000044725386} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1144917074} + - {fileID: 2048696461} + - {fileID: 1854432974} + - {fileID: 1064654712} + - {fileID: 1876345495} + m_Father: {fileID: 697339117} + m_LocalEulerAnglesHint: {x: -31.44302, y: -44.494686, z: -9.831146} +--- !u!1 &173418117 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 173418118} + m_Layer: 6 + m_Name: mixamorig:LeftHandIndex1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &173418118 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 173418117} + serializedVersion: 2 + m_LocalRotation: {x: -0.00000014648408, y: -0.0000001043264, z: -0.0000004889817, w: 1} + m_LocalPosition: {x: 0.022598628, y: 0.09109309, z: 0.005180343} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 2101993954} + m_Father: {fileID: 1914700222} + m_LocalEulerAnglesHint: {x: 31.460888, y: 2.3883386, z: 3.0228832} --- !u!1 &196218278 GameObject: m_ObjectHideFlags: 0 @@ -340,6 +551,38 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 196218278} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &222869677 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 222869678} + m_Layer: 6 + m_Name: mixamorig:LeftHandThumb1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &222869678 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 222869677} + serializedVersion: 2 + m_LocalRotation: {x: 0.25206134, y: 0.06016923, z: -0.22173478, w: 0.9400417} + m_LocalPosition: {x: 0.026817314, y: 0.024661448, z: 0.015761929} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1431658128} + m_Father: {fileID: 1914700222} + m_LocalEulerAnglesHint: {x: 17.465261, y: 18.092936, z: -15.171781} --- !u!1 &230761402 GameObject: m_ObjectHideFlags: 0 @@ -458,13 +701,203 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 230761402} serializedVersion: 2 - m_LocalRotation: {x: 0.26693356, y: 0.000000007506503, z: -0.000000003603871, w: 0.96371496} + m_LocalRotation: {x: 0.26693356, y: 0.000000005890902, z: -0.0000000034821441, w: 0.96371496} m_LocalPosition: {x: 0, y: 7, z: -10} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &274547353 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 274547354} + m_Layer: 6 + m_Name: mixamorig:RightLeg + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &274547354 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 274547353} + serializedVersion: 2 + m_LocalRotation: {x: -0.03943182, y: 2.4880561e-10, z: -0.000000021124885, w: 0.9992223} + m_LocalPosition: {x: -6.197275e-11, y: 0.44371462, z: -1.6627694e-15} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1021367586} + m_Father: {fileID: 1560075453} + m_LocalEulerAnglesHint: {x: -26.011105, y: 9.33477, z: -2.5860448} +--- !u!1 &286571123 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 286571124} + m_Layer: 6 + m_Name: mixamorig:RightToeBase + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &286571124 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 286571123} + serializedVersion: 2 + m_LocalRotation: {x: 0.3352415, y: -1.8409916e-11, z: 0.00000011136366, w: 0.94213223} + m_LocalPosition: {x: 1.2271307e-17, y: 0.13816866, z: 4.8857846e-17} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1890027872} + m_Father: {fileID: 1021367586} + m_LocalEulerAnglesHint: {x: 39.174488, y: -0.000004402392, z: -0.000034094508} +--- !u!1 &308153350 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 308153351} + m_Layer: 6 + m_Name: mixamorig:LeftHandRing2 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &308153351 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 308153350} + serializedVersion: 2 + m_LocalRotation: {x: 0.000000029802287, y: 0.000000044703462, z: -1.0613732e-13, w: 1} + m_LocalPosition: {x: 3.8807003e-17, y: 0.0315, z: -1.2637012e-16} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1837139488} + m_Father: {fileID: 1520128817} + m_LocalEulerAnglesHint: {x: 60.896133, y: 6.2473845, z: 10.607912} +--- !u!1 &309088842 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 309088843} + m_Layer: 6 + m_Name: mixamorig:LeftLeg + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &309088843 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 309088842} + serializedVersion: 2 + m_LocalRotation: {x: -0.03941025, y: 0.000000015021994, z: -0.000000022099435, w: 0.9992231} + m_LocalPosition: {x: -6.468267e-11, y: 0.4437139, z: 3.7506209e-16} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 684679892} + m_Father: {fileID: 65105624} + m_LocalEulerAnglesHint: {x: -30.908527, y: 11.559987, z: -5.758815} +--- !u!1 &323325841 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 323325842} + m_Layer: 6 + m_Name: mixamorig:RightHandThumb4 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &323325842 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 323325841} + serializedVersion: 2 + m_LocalRotation: {x: 0.0057748538, y: 0.1175092, z: 0.04874371, w: 0.991858} + m_LocalPosition: {x: 1.4209324e-16, y: 0.025749773, z: -2.6613211e-16} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 700934561} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &330427825 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 330427826} + m_Layer: 6 + m_Name: mixamorig:LeftHandPinky4 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &330427826 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 330427825} + serializedVersion: 2 + m_LocalRotation: {x: 0.0000002203471, y: 0.0007833988, z: 0.0002953856, w: 0.99999964} + m_LocalPosition: {x: -1.10373645e-14, y: 0.021255314, z: -4.7608096e-17} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2053644711} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &330585543 GameObject: m_ObjectHideFlags: 0 @@ -552,7 +985,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 330585543} serializedVersion: 2 - m_LocalRotation: {x: 0.26693356, y: 0.000000007049096, z: -0.0000000019524864, w: 0.96371496} + m_LocalRotation: {x: 0.26693356, y: 0.0000000053357643, z: -0.0000000014779212, w: 0.96371496} m_LocalPosition: {x: 0, y: 7, z: -10} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 @@ -635,6 +1068,70 @@ MonoBehaviour: m_PostInfinity: 2 m_RotationOrder: 4 CustomBlends: {fileID: 0} +--- !u!1 &401758455 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 401758456} + m_Layer: 6 + m_Name: mixamorig:Spine1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &401758456 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 401758455} + serializedVersion: 2 + m_LocalRotation: {x: 9.5227246e-26, y: -1.4246206e-13, z: 6.684393e-13, w: 1} + m_LocalPosition: {x: 9.32854e-23, y: 0.10002675, z: 5.83388e-18} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 145119527} + m_Father: {fileID: 1736222801} + m_LocalEulerAnglesHint: {x: 2.5967364, y: -7.860185, z: -1.1188357} +--- !u!1 &406253092 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 406253093} + m_Layer: 6 + m_Name: mixamorig:LeftHandPinky1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &406253093 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 406253092} + serializedVersion: 2 + m_LocalRotation: {x: 0.0000001411864, y: -0.00000011082403, z: -0.0000001505803, w: 1} + m_LocalPosition: {x: -0.038062632, y: 0.08077779, z: 0.00486877} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 414461138} + m_Father: {fileID: 1914700222} + m_LocalEulerAnglesHint: {x: 38.225513, y: 3.1315303, z: -8.314171} --- !u!1 &410087039 GameObject: m_ObjectHideFlags: 0 @@ -756,6 +1253,101 @@ MonoBehaviour: m_LightCookieSize: {x: 1, y: 1} m_LightCookieOffset: {x: 0, y: 0} m_SoftShadowQuality: 1 +--- !u!1 &414461137 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 414461138} + m_Layer: 6 + m_Name: mixamorig:LeftHandPinky2 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &414461138 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 414461137} + serializedVersion: 2 + m_LocalRotation: {x: -0.00000012490868, y: 0.000000014798431, z: 0.00000022861724, w: 1} + m_LocalPosition: {x: 3.8940705e-17, y: 0.036, z: 2.5409893e-16} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 2053644711} + m_Father: {fileID: 406253093} + m_LocalEulerAnglesHint: {x: 58.71873, y: 5.4715405, z: 9.710493} +--- !u!1 &418936591 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 418936592} + m_Layer: 6 + m_Name: mixamorig:LeftHandThumb4 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &418936592 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 418936591} + serializedVersion: 2 + m_LocalRotation: {x: 0.0051534073, y: -0.12268278, z: -0.041651536, w: 0.99155813} + m_LocalPosition: {x: -1.6462281e-16, y: 0.025805814, z: 2.600447e-17} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1866111556} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &491303345 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 491303346} + m_Layer: 6 + m_Name: mixamorig:Neck + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &491303346 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 491303345} + serializedVersion: 2 + m_LocalRotation: {x: -3.3920896e-27, y: 1.4692705e-14, z: 2.3086895e-13, w: 1} + m_LocalPosition: {x: -4.1474883e-12, y: 0.16865322, z: 5.7686385e-16} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 536126520} + m_Father: {fileID: 145119527} + m_LocalEulerAnglesHint: {x: 11.981812, y: -7.481307, z: 2.0068052} --- !u!1 &518677613 GameObject: m_ObjectHideFlags: 0 @@ -858,12 +1450,138 @@ Transform: m_GameObject: {fileID: 518677613} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 4.1545897, y: -1.00055, z: 10.09304} + m_LocalPosition: {x: 1, y: 1.5, z: 10.09304} m_LocalScale: {x: 5, y: 3, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 835116272} + m_Father: {fileID: 123293704} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &525241794 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 525241795} + m_Layer: 6 + m_Name: mixamorig:RightArm + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &525241795 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 525241794} + serializedVersion: 2 + m_LocalRotation: {x: -0.02461611, y: -0.0025627238, z: 0.10349884, w: 0.99432164} + m_LocalPosition: {x: -3.151008e-17, y: 0.108381756, z: -9.694985e-18} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 697339117} + m_Father: {fileID: 1495032982} + m_LocalEulerAnglesHint: {x: 28.047518, y: 37.13001, z: 134.72888} +--- !u!1 &527244040 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 527244041} + m_Layer: 6 + m_Name: mixamorig:HeadTop_End + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &527244041 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 527244040} + serializedVersion: 2 + m_LocalRotation: {x: 9.7144515e-17, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0.000000009856974, y: 0.2096278, z: 0.10122935} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 536126520} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &533526618 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 533526619} + m_Layer: 6 + m_Name: mixamorig:LeftHandIndex4 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &533526619 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 533526618} + serializedVersion: 2 + m_LocalRotation: {x: 0.000000010594604, y: 0.00037756326, z: 0.000013069538, w: 0.99999994} + m_LocalPosition: {x: -8.589727e-15, y: 0.027748656, z: 3.9775513e-16} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1637621029} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &536126519 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 536126520} + m_Layer: 6 + m_Name: mixamorig:Head + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &536126520 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 536126519} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0.0000000010756748, y: 0.09341923, z: 0.028410409} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 527244041} + m_Father: {fileID: 491303346} + m_LocalEulerAnglesHint: {x: -1.0028826, y: -18.883387, z: -10.321247} --- !u!1 &578612839 GameObject: m_ObjectHideFlags: 0 @@ -998,12 +1716,171 @@ Transform: m_GameObject: {fileID: 584591832} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 7.6545897, y: -0.00055003166, z: 10.09304} + m_LocalPosition: {x: 4.5, y: 2.5, z: 10.09304} m_LocalScale: {x: 2, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 835116272} + m_Father: {fileID: 123293704} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &596948197 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 596948198} + m_Layer: 6 + m_Name: mixamorig:RightHandIndex4 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &596948198 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 596948197} + serializedVersion: 2 + m_LocalRotation: {x: 0.0000000865986, y: -0.001002692, z: -0.000087058324, w: 0.9999995} + m_LocalPosition: {x: -7.9067536e-15, y: 0.027721904, z: 5.114471e-12} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1959551400} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &684679891 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 684679892} + m_Layer: 6 + m_Name: mixamorig:LeftFoot + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &684679892 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 684679891} + serializedVersion: 2 + m_LocalRotation: {x: 0.4603244, y: 0.000000007996993, z: 0.00000013181912, w: 0.8877508} + m_LocalPosition: {x: 5.5477796e-11, y: 0.44527847, z: -2.2030602e-16} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1383902096} + m_Father: {fileID: 309088843} + m_LocalEulerAnglesHint: {x: 49.708157, y: 16.607178, z: 13.726621} +--- !u!1 &690735213 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 690735214} + m_Layer: 6 + m_Name: mixamorig:LeftHandMiddle1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &690735214 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 690735213} + serializedVersion: 2 + m_LocalRotation: {x: 0.00000046807824, y: -0.000000029776528, z: 0.00000023048098, w: 1} + m_LocalPosition: {x: 0.0000003660436, y: 0.095334016, z: -0.00000032540473} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 113463648} + m_Father: {fileID: 1914700222} + m_LocalEulerAnglesHint: {x: 41.43787, y: 3.9581158, z: 2.306935} +--- !u!1 &697339116 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 697339117} + m_Layer: 6 + m_Name: mixamorig:RightForeArm + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &697339117 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 697339116} + serializedVersion: 2 + m_LocalRotation: {x: -0.000000029802301, y: -0.00000008940694, z: -5.950795e-14, w: 1} + m_LocalPosition: {x: 9.964063e-11, y: 0.27841517, z: 3.5581792e-16} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 166564785} + m_Father: {fileID: 525241795} + m_LocalEulerAnglesHint: {x: 0.000040444043, y: -0.0000126556115, z: 29.423206} +--- !u!1 &700934560 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 700934561} + m_Layer: 6 + m_Name: mixamorig:RightHandThumb3 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &700934561 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 700934560} + serializedVersion: 2 + m_LocalRotation: {x: 0.00000005937968, y: 0.0008078255, z: -0.000000106261886, w: 0.9999997} + m_LocalPosition: {x: 1.837671e-16, y: 0.03416271, z: 1.9955813e-16} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 323325842} + m_Father: {fileID: 1116525000} + m_LocalEulerAnglesHint: {x: -27.245651, y: 16.650688, z: -54.267376} --- !u!1 &835116271 GameObject: m_ObjectHideFlags: 0 @@ -1029,18 +1906,15 @@ Transform: m_GameObject: {fileID: 835116271} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -2.65459, y: 2.50055, z: -5.09304} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1363717997} - {fileID: 1918868763} - {fileID: 983805441} - - {fileID: 1504087848} - - {fileID: 518677617} - - {fileID: 584591836} + - {fileID: 123293704} - {fileID: 1801804565} - - {fileID: 1632951288} - {fileID: 1699158561} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1053,6 +1927,8 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 860068662} + - component: {fileID: 860068663} + - component: {fileID: 860068664} m_Layer: 0 m_Name: Inventory m_TagString: Untagged @@ -1075,6 +1951,80 @@ Transform: m_Children: [] m_Father: {fileID: 578612840} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &860068663 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 860068661} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 19102, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_PanelSettings: {fileID: 11400000, guid: d8894ba51a816c451b072d957a1cfe45, type: 2} + m_ParentUI: {fileID: 0} + sourceAsset: {fileID: 9197481963319205126, guid: deb1ce82aafbc3b128a0ec5a8cc03439, type: 3} + m_SortingOrder: 0 + m_WorldSpaceSizeMode: 1 + m_WorldSpaceWidth: 1920 + m_WorldSpaceHeight: 1080 +--- !u!114 &860068664 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 860068661} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b37256e37c5968be89fa34dd8344744f, type: 3} + m_Name: + m_EditorClassIdentifier: + doc: {fileID: 860068663} + inventory: {fileID: 11400000, guid: cd3f9ac2afa71f8b6acb3fb0cacfe441, type: 2} + template: {fileID: 9197481963319205126, guid: 01b74a9c8f3685fb2880379892a17e46, type: 3} + displayCount: 5 + selectedItem: {fileID: 11400000, guid: 37d00232a0bee1e8e923705187ff2187, type: 2} + inventoryInput: {fileID: 11400000, guid: 05ac93739cc1d1796b9403f2421c056b, type: 2} + itemPreviewDelta: {fileID: 11400000, guid: 61bec5de28967d14d8027ebd7c009e4e, type: 2} + itemZoom: {fileID: 11400000, guid: b611ded87bd3825d7bf45e43eaea670d, type: 2} + actionMap: {fileID: 11400000, guid: ec7cdb6af08da343ab1b77dab277f433, type: 2} +--- !u!1 &880188919 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 880188920} + m_Layer: 6 + m_Name: mixamorig:Hips + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &880188920 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 880188919} + serializedVersion: 2 + m_LocalRotation: {x: 0.006458546, y: -0.000000017584803, z: 0.0000007343956, w: 0.99997914} + m_LocalPosition: {x: -0.00000006394334, y: 1.0427046, z: 0.01554256} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 65105624} + - {fileID: 1560075453} + - {fileID: 1736222801} + m_Father: {fileID: 1574173918} + m_LocalEulerAnglesHint: {x: 2.248159, y: 54.242958, z: 6.6920185} --- !u!1 &881234002 GameObject: m_ObjectHideFlags: 0 @@ -1232,6 +2182,38 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 893033283} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &922496622 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 922496623} + m_Layer: 6 + m_Name: mixamorig:RightHandMiddle3 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &922496623 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 922496622} + serializedVersion: 2 + m_LocalRotation: {x: -0.000000029802496, y: 0.000000014901515, z: -0.00000017121899, w: 1} + m_LocalPosition: {x: 2.5163898e-15, y: 0.0295, z: -1.5411337e-10} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1871104737} + m_Father: {fileID: 1468996287} + m_LocalEulerAnglesHint: {x: 18.732464, y: -0.26113355, z: -1.5831149} --- !u!1 &983805437 GameObject: m_ObjectHideFlags: 0 @@ -1335,7 +2317,7 @@ Transform: m_GameObject: {fileID: 983805437} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 4.6545897, y: -1.00055, z: 3.09304} + m_LocalPosition: {x: 2, y: 1.5, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -1363,6 +2345,38 @@ MonoBehaviour: onInteracted: m_PersistentCalls: m_Calls: [] +--- !u!1 &1021367585 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1021367586} + m_Layer: 6 + m_Name: mixamorig:RightFoot + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1021367586 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1021367585} + serializedVersion: 2 + m_LocalRotation: {x: 0.46033442, y: 0.000000007743378, z: 0.00000013930745, w: 0.88774556} + m_LocalPosition: {x: 5.538293e-11, y: 0.4452781, z: 1.8670634e-16} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 286571124} + m_Father: {fileID: 274547354} + m_LocalEulerAnglesHint: {x: 58.412933, y: -32.219357, z: -27.812729} --- !u!1 &1028304587 GameObject: m_ObjectHideFlags: 0 @@ -1399,6 +2413,366 @@ Transform: - {fileID: 2044644166} m_Father: {fileID: 1790144273} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1059598543 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1059598544} + m_Layer: 6 + m_Name: mixamorig:LeftHandMiddle3 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1059598544 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1059598543} + serializedVersion: 2 + m_LocalRotation: {x: -0.00000042758987, y: -0.00000010429029, z: 0.0000002544499, w: 1} + m_LocalPosition: {x: 2.870735e-14, y: 0.0295, z: -1.8927175e-16} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 74863863} + m_Father: {fileID: 113463648} + m_LocalEulerAnglesHint: {x: 39.129963, y: 1.7005358, z: 4.782318} +--- !u!1 &1064654711 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1064654712} + m_Layer: 6 + m_Name: mixamorig:RightHandRing1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1064654712 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1064654711} + serializedVersion: 2 + m_LocalRotation: {x: 0.00000006963165, y: -2.1727602e-11, z: 0.00000037766478, w: 1} + m_LocalPosition: {x: 0.01865133, y: 0.09103592, z: 0.0004306965} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1726933839} + m_Father: {fileID: 166564785} + m_LocalEulerAnglesHint: {x: 56.92608, y: -7.4031186, z: -13.187063} +--- !u!1 &1074429006 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1074429007} + - component: {fileID: 1074429008} + m_Layer: 6 + m_Name: Beta_Joints + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1074429007 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1074429006} + serializedVersion: 2 + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1574173918} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!137 &1074429008 +SkinnedMeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1074429006} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 3 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: -7557540490364101082, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} + 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: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + serializedVersion: 2 + m_Quality: 0 + m_UpdateWhenOffscreen: 0 + m_SkinnedMotionVectors: 1 + m_Mesh: {fileID: 2497106002754787046, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} + m_Bones: + - {fileID: 880188920} + - {fileID: 1736222801} + - {fileID: 401758456} + - {fileID: 145119527} + - {fileID: 491303346} + - {fileID: 536126520} + - {fileID: 1495032982} + - {fileID: 525241795} + - {fileID: 697339117} + - {fileID: 166564785} + - {fileID: 1876345495} + - {fileID: 1116525000} + - {fileID: 700934561} + - {fileID: 323325842} + - {fileID: 1144917074} + - {fileID: 1538903915} + - {fileID: 1959551400} + - {fileID: 596948198} + - {fileID: 2048696461} + - {fileID: 1468996287} + - {fileID: 922496623} + - {fileID: 1871104737} + - {fileID: 1064654712} + - {fileID: 1726933839} + - {fileID: 1120405562} + - {fileID: 1347478011} + - {fileID: 1854432974} + - {fileID: 2077448240} + - {fileID: 1786145461} + - {fileID: 1761427027} + - {fileID: 2063172142} + - {fileID: 1092675203} + - {fileID: 1934903265} + - {fileID: 1914700222} + - {fileID: 222869678} + - {fileID: 1431658128} + - {fileID: 1866111556} + - {fileID: 418936592} + - {fileID: 173418118} + - {fileID: 2101993954} + - {fileID: 1637621029} + - {fileID: 533526619} + - {fileID: 690735214} + - {fileID: 113463648} + - {fileID: 1059598544} + - {fileID: 74863863} + - {fileID: 1520128817} + - {fileID: 308153351} + - {fileID: 1837139488} + - {fileID: 1456731653} + - {fileID: 406253093} + - {fileID: 414461138} + - {fileID: 2053644711} + - {fileID: 330427826} + - {fileID: 1560075453} + - {fileID: 274547354} + - {fileID: 1021367586} + - {fileID: 286571124} + - {fileID: 1890027872} + - {fileID: 65105624} + - {fileID: 309088843} + - {fileID: 684679892} + - {fileID: 1383902096} + - {fileID: 1745826419} + m_BlendShapeWeights: [] + m_RootBone: {fileID: 880188920} + m_AABB: + m_Center: {x: 0.0000002682209, y: -0.25909263, z: -0.013641074} + m_Extent: {x: 0.8834671, y: 0.81855863, z: 0.13176143} + m_DirtyAABB: 0 +--- !u!1 &1092675202 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1092675203} + m_Layer: 6 + m_Name: mixamorig:LeftArm + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1092675203 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1092675202} + serializedVersion: 2 + m_LocalRotation: {x: -0.024607385, y: 0.0025615052, z: -0.10350362, w: 0.99432135} + m_LocalPosition: {x: 2.6006848e-17, y: 0.108377054, z: -9.237507e-18} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1934903265} + m_Father: {fileID: 2063172142} + m_LocalEulerAnglesHint: {x: 41.0989, y: 10.770669, z: -61.627575} +--- !u!1 &1116449711 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 166564785} + m_Layer: 6 + m_Name: mixamorig:RightHand + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!1 &1116524999 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1116525000} + m_Layer: 6 + m_Name: mixamorig:RightHandThumb2 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1116525000 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1116524999} + serializedVersion: 2 + m_LocalRotation: {x: -0.000000012847989, y: 0.0011705202, z: -0.00000045966183, w: 0.99999934} + m_LocalPosition: {x: 1.5692586e-16, y: 0.041889854, z: -9.679277e-17} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 700934561} + m_Father: {fileID: 1876345495} + m_LocalEulerAnglesHint: {x: -7.690381, y: 24.266287, z: -26.61609} +--- !u!1 &1120405561 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1120405562} + m_Layer: 6 + m_Name: mixamorig:RightHandRing3 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1120405562 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1120405561} + serializedVersion: 2 + m_LocalRotation: {x: 0.000000029801877, y: 0.00000002980199, z: 0.00000014196344, w: 1} + m_LocalPosition: {x: -2.6225074e-15, y: 0.028896846, z: 8.202333e-12} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1347478011} + m_Father: {fileID: 1726933839} + m_LocalEulerAnglesHint: {x: 49.25673, y: -2.4892333, z: -5.4266458} +--- !u!1 &1144917073 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1144917074} + m_Layer: 6 + m_Name: mixamorig:RightHandIndex1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1144917074 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1144917073} + serializedVersion: 2 + m_LocalRotation: {x: 0.00000029653276, y: -0.000000059517056, z: 0.00000017676955, w: 1} + m_LocalPosition: {x: -0.02259835, y: 0.091082826, z: 0.0051786215} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1538903915} + m_Father: {fileID: 166564785} + m_LocalEulerAnglesHint: {x: 25.356129, y: -1.5339687, z: -4.8776097} --- !u!1 &1190731365 GameObject: m_ObjectHideFlags: 0 @@ -1704,6 +3078,37 @@ MonoBehaviour: value: 100000000 unit: 2 prefab: {fileID: 3360622849527809930, guid: f0629fe523f37f1bf8a8f72ee3f1c716, type: 3} +--- !u!1 &1347478010 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1347478011} + m_Layer: 6 + m_Name: mixamorig:RightHandRing4 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1347478011 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1347478010} + serializedVersion: 2 + m_LocalRotation: {x: -0.00000013396453, y: -0.00014607502, z: 0.00079928624, w: 0.9999997} + m_LocalPosition: {x: -4.719501e-15, y: 0.026388155, z: 5.682296e-12} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1120405562} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1363717994 GameObject: m_ObjectHideFlags: 0 @@ -1788,8 +3193,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1363717994} serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 2.65459, y: -2.50055, z: 5.09304} + 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_ConstrainProportionsScale: 0 m_Children: @@ -1988,6 +3393,38 @@ MonoBehaviour: motor: {fileID: 1363718002} controlScheme: {fileID: 11400000, guid: 109f5449a99535723ac84505399115e8, type: 2} lookValue: {fileID: 11400000, guid: c70e76cde8eafc3beb7fcf9b0680f58a, type: 2} +--- !u!1 &1383902095 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1383902096} + m_Layer: 6 + m_Name: mixamorig:LeftToeBase + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1383902096 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1383902095} + serializedVersion: 2 + m_LocalRotation: {x: 0.33524147, y: 8.340843e-10, z: 0.000000114941855, w: 0.9421323} + m_LocalPosition: {x: -2.3797458e-17, y: 0.13816865, z: -3.4315254e-17} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1745826419} + m_Father: {fileID: 684679892} + m_LocalEulerAnglesHint: {x: 39.174408, y: 0.0000033041151, z: 0.00000047601654} --- !u!1 &1425066166 GameObject: m_ObjectHideFlags: 0 @@ -2033,6 +3470,286 @@ Transform: m_Children: [] m_Father: {fileID: 1363717997} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1431658127 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1431658128} + m_Layer: 6 + m_Name: mixamorig:LeftHandThumb2 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1431658128 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1431658127} + serializedVersion: 2 + m_LocalRotation: {x: -0.00000026462337, y: -0.0010427855, z: 0.00000059159026, w: 0.99999946} + m_LocalPosition: {x: 8.920065e-17, y: 0.041870944, z: 1.1859406e-16} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1866111556} + m_Father: {fileID: 222869678} + m_LocalEulerAnglesHint: {x: -11.022057, y: -7.932933, z: -2.8756566} +--- !u!1 &1440557824 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1440557825} + - component: {fileID: 1440557826} + m_Layer: 6 + m_Name: Beta_Surface + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1440557825 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1440557824} + serializedVersion: 2 + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1574173918} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!137 &1440557826 +SkinnedMeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1440557824} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 3 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: -8474651742996372913, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} + 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: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + serializedVersion: 2 + m_Quality: 0 + m_UpdateWhenOffscreen: 0 + m_SkinnedMotionVectors: 1 + m_Mesh: {fileID: 6796121518194019630, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} + m_Bones: + - {fileID: 880188920} + - {fileID: 1736222801} + - {fileID: 401758456} + - {fileID: 145119527} + - {fileID: 491303346} + - {fileID: 536126520} + - {fileID: 527244041} + - {fileID: 1495032982} + - {fileID: 525241795} + - {fileID: 697339117} + - {fileID: 166564785} + - {fileID: 1876345495} + - {fileID: 1116525000} + - {fileID: 700934561} + - {fileID: 323325842} + - {fileID: 1144917074} + - {fileID: 1538903915} + - {fileID: 1959551400} + - {fileID: 596948198} + - {fileID: 2048696461} + - {fileID: 1468996287} + - {fileID: 922496623} + - {fileID: 1871104737} + - {fileID: 1064654712} + - {fileID: 1726933839} + - {fileID: 1120405562} + - {fileID: 1347478011} + - {fileID: 1854432974} + - {fileID: 2077448240} + - {fileID: 1786145461} + - {fileID: 1761427027} + - {fileID: 2063172142} + - {fileID: 1092675203} + - {fileID: 1934903265} + - {fileID: 1914700222} + - {fileID: 222869678} + - {fileID: 1431658128} + - {fileID: 1866111556} + - {fileID: 418936592} + - {fileID: 173418118} + - {fileID: 2101993954} + - {fileID: 1637621029} + - {fileID: 533526619} + - {fileID: 690735214} + - {fileID: 113463648} + - {fileID: 1059598544} + - {fileID: 74863863} + - {fileID: 1520128817} + - {fileID: 308153351} + - {fileID: 1837139488} + - {fileID: 1456731653} + - {fileID: 406253093} + - {fileID: 414461138} + - {fileID: 2053644711} + - {fileID: 330427826} + - {fileID: 1560075453} + - {fileID: 274547354} + - {fileID: 1021367586} + - {fileID: 286571124} + - {fileID: 1890027872} + - {fileID: 65105624} + - {fileID: 309088843} + - {fileID: 684679892} + - {fileID: 1383902096} + - {fileID: 1745826419} + m_BlendShapeWeights: [] + m_RootBone: {fileID: 880188920} + m_AABB: + m_Center: {x: 0.0000002682209, y: -0.16444433, z: -0.007529475} + m_Extent: {x: 0.9025662, y: 0.9460366, z: 0.17718455} + m_DirtyAABB: 0 +--- !u!1 &1456731652 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1456731653} + m_Layer: 6 + m_Name: mixamorig:LeftHandRing4 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1456731653 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1456731652} + serializedVersion: 2 + m_LocalRotation: {x: -0.00000027316935, y: -0.00049343734, z: -0.000016047023, w: 0.9999999} + m_LocalPosition: {x: 0.0000002327433, y: 0.026443163, z: -0.000000014607575} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1837139488} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1468996286 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1468996287} + m_Layer: 6 + m_Name: mixamorig:RightHandMiddle2 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1468996287 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1468996286} + serializedVersion: 2 + m_LocalRotation: {x: -0.00000008940678, y: -0.000000014901168, z: 0.00000016338068, w: 1} + m_LocalPosition: {x: 1.0026188e-16, y: 0.037, z: -2.8084325e-16} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 922496623} + m_Father: {fileID: 2048696461} + m_LocalEulerAnglesHint: {x: 67.76267, y: -162.95265, z: -168.5062} +--- !u!1 &1495032981 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1495032982} + m_Layer: 6 + m_Name: mixamorig:RightShoulder + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1495032982 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1495032981} + serializedVersion: 2 + m_LocalRotation: {x: 0.48443064, y: 0.57096374, z: -0.52616364, w: 0.40308726} + m_LocalPosition: {x: 0.0456997, y: 0.111958444, z: -0.008066318} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 525241795} + m_Father: {fileID: 145119527} + m_LocalEulerAnglesHint: {x: 82.09471, y: 11.085017, z: -88.589424} --- !u!1 &1500704131 GameObject: m_ObjectHideFlags: 0 @@ -2243,973 +3960,126 @@ Transform: m_GameObject: {fileID: 1504087844} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 11.15459, y: -1.00055, z: 10.09304} + m_LocalPosition: {x: 8, y: 1.5, z: 10.09304} m_LocalScale: {x: 5, y: 3, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 835116272} + m_Father: {fileID: 123293704} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1001 &1574173917 -PrefabInstance: +--- !u!1 &1520128816 +GameObject: m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 1363717997} - m_Modifications: - - target: {fileID: -9070493210130169274, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_Layer - value: 6 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8191740002585371210, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 2.5393105 - objectReference: {fileID: 0} - - target: {fileID: -8191740002585371210, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: -2.7602558 - objectReference: {fileID: 0} - - target: {fileID: -8191740002585371210, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: -25.305489 - objectReference: {fileID: 0} - - target: {fileID: -8183481454299698827, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_Layer - value: 6 - objectReference: {fileID: 0} - - target: {fileID: -8068027186691560116, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 31.676178 - objectReference: {fileID: 0} - - target: {fileID: -8068027186691560116, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 1.0288787 - objectReference: {fileID: 0} - - target: {fileID: -8068027186691560116, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 3.625372 - objectReference: {fileID: 0} - - target: {fileID: -8021001004253913084, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 2.5967364 - objectReference: {fileID: 0} - - target: {fileID: -8021001004253913084, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: -7.860185 - objectReference: {fileID: 0} - - target: {fileID: -8021001004253913084, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: -1.1188357 - objectReference: {fileID: 0} - - target: {fileID: -8006009767450596044, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_Layer - value: 6 - objectReference: {fileID: 0} - - target: {fileID: -7657966619581158213, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_Layer - value: 6 - objectReference: {fileID: 0} - - target: {fileID: -7360747449169001873, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_Layer - value: 6 - objectReference: {fileID: 0} - - target: {fileID: -7219772299731422950, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: -27.245651 - objectReference: {fileID: 0} - - target: {fileID: -7219772299731422950, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 16.650688 - objectReference: {fileID: 0} - - target: {fileID: -7219772299731422950, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: -54.267376 - objectReference: {fileID: 0} - - target: {fileID: -7121769801107515815, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_Layer - value: 6 - objectReference: {fileID: 0} - - target: {fileID: -6874584590210671055, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 49.708157 - objectReference: {fileID: 0} - - target: {fileID: -6874584590210671055, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 16.607178 - objectReference: {fileID: 0} - - target: {fileID: -6874584590210671055, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 13.726621 - objectReference: {fileID: 0} - - target: {fileID: -6857788192064577062, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: -11.022057 - objectReference: {fileID: 0} - - target: {fileID: -6857788192064577062, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: -7.932933 - objectReference: {fileID: 0} - - target: {fileID: -6857788192064577062, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: -2.8756566 - objectReference: {fileID: 0} - - target: {fileID: -6803169544883306252, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 72.349594 - objectReference: {fileID: 0} - - target: {fileID: -6803169544883306252, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 121.42653 - objectReference: {fileID: 0} - - target: {fileID: -6803169544883306252, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: -130.49387 - objectReference: {fileID: 0} - - target: {fileID: -6768225281626788248, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 51.532135 - objectReference: {fileID: 0} - - target: {fileID: -6768225281626788248, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: -2.842689 - objectReference: {fileID: 0} - - target: {fileID: -6768225281626788248, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: -5.8853307 - objectReference: {fileID: 0} - - target: {fileID: -6621945745981909287, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_Layer - value: 6 - objectReference: {fileID: 0} - - target: {fileID: -6370085079684087283, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_Layer - value: 6 - objectReference: {fileID: 0} - - target: {fileID: -6234591296559379751, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_Layer - value: 6 - objectReference: {fileID: 0} - - target: {fileID: -6170625038081293824, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_Layer - value: 6 - objectReference: {fileID: 0} - - target: {fileID: -6056541330796499132, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_Layer - value: 6 - objectReference: {fileID: 0} - - target: {fileID: -6024149945523619558, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 18.732464 - objectReference: {fileID: 0} - - target: {fileID: -6024149945523619558, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: -0.26113355 - objectReference: {fileID: 0} - - target: {fileID: -6024149945523619558, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: -1.5831149 - objectReference: {fileID: 0} - - target: {fileID: -5857696854640597626, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_Layer - value: 6 - objectReference: {fileID: 0} - - target: {fileID: -5665043316445423941, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 19.92245 - objectReference: {fileID: 0} - - target: {fileID: -5665043316445423941, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0.37387395 - objectReference: {fileID: 0} - - target: {fileID: -5665043316445423941, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 2.1285405 - objectReference: {fileID: 0} - - target: {fileID: -5561550452697079657, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_Layer - value: 6 - objectReference: {fileID: 0} - - target: {fileID: -5480977901411583989, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 49.668385 - objectReference: {fileID: 0} - - target: {fileID: -5480977901411583989, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: -2.5498168 - objectReference: {fileID: 0} - - target: {fileID: -5480977901411583989, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: -5.506392 - objectReference: {fileID: 0} - - target: {fileID: -5195048882033904264, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_Layer - value: 6 - objectReference: {fileID: 0} - - target: {fileID: -4999088201633142198, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_Layer - value: 6 - objectReference: {fileID: 0} - - target: {fileID: -4728426434207774260, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_Layer - value: 6 - objectReference: {fileID: 0} - - target: {fileID: -4501530691011011137, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_Layer - value: 6 - objectReference: {fileID: 0} - - target: {fileID: -4332706925441422008, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_Layer - value: 6 - objectReference: {fileID: 0} - - target: {fileID: -4278032810995721380, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_Layer - value: 6 - objectReference: {fileID: 0} - - target: {fileID: -3799395697873186154, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_Layer - value: 6 - objectReference: {fileID: 0} - - target: {fileID: -3746190272939815206, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: -26.011105 - objectReference: {fileID: 0} - - target: {fileID: -3746190272939815206, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 9.33477 - objectReference: {fileID: 0} - - target: {fileID: -3746190272939815206, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: -2.5860448 - objectReference: {fileID: 0} - - target: {fileID: -3542885339558904099, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_Layer - value: 6 - objectReference: {fileID: 0} - - target: {fileID: -3480699329000672020, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: -6.6951637 - objectReference: {fileID: 0} - - target: {fileID: -3480699329000672020, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: -6.4102345 - objectReference: {fileID: 0} - - target: {fileID: -3480699329000672020, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: -3.166779 - objectReference: {fileID: 0} - - target: {fileID: -3478013746326755454, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_Layer - value: 6 - objectReference: {fileID: 0} - - target: {fileID: -3432401550182100168, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 41.0989 - objectReference: {fileID: 0} - - target: {fileID: -3432401550182100168, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 10.770669 - objectReference: {fileID: 0} - - target: {fileID: -3432401550182100168, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: -61.627575 - objectReference: {fileID: 0} - - target: {fileID: -3321919801592875672, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: -1.0028826 - objectReference: {fileID: 0} - - target: {fileID: -3321919801592875672, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: -18.883387 - objectReference: {fileID: 0} - - target: {fileID: -3321919801592875672, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: -10.321247 - objectReference: {fileID: 0} - - target: {fileID: -3214267034143217929, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_Layer - value: 6 - objectReference: {fileID: 0} - - target: {fileID: -3086436065929644917, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_Layer - value: 6 - objectReference: {fileID: 0} - - target: {fileID: -2899422035419094908, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 80.519745 - objectReference: {fileID: 0} - - target: {fileID: -2899422035419094908, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: -145.80515 - objectReference: {fileID: 0} - - target: {fileID: -2899422035419094908, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: -150.79942 - objectReference: {fileID: 0} - - target: {fileID: -2770666803903516498, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 39.174408 - objectReference: {fileID: 0} - - target: {fileID: -2770666803903516498, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0.0000033041151 - objectReference: {fileID: 0} - - target: {fileID: -2770666803903516498, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0.00000047601654 - objectReference: {fileID: 0} - - target: {fileID: -2656431786303760210, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_Layer - value: 6 - objectReference: {fileID: 0} - - target: {fileID: -2594260964506120097, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 49.85728 - objectReference: {fileID: 0} - - target: {fileID: -2594260964506120097, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 5.8566966 - objectReference: {fileID: 0} - - target: {fileID: -2594260964506120097, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: -0.2583566 - objectReference: {fileID: 0} - - target: {fileID: -2389525917609993686, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 59.867607 - objectReference: {fileID: 0} - - target: {fileID: -2389525917609993686, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 5.8658566 - objectReference: {fileID: 0} - - target: {fileID: -2389525917609993686, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 10.169066 - objectReference: {fileID: 0} - - target: {fileID: -2084811680363313996, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_Layer - value: 6 - objectReference: {fileID: 0} - - target: {fileID: -2072040086291044643, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: -30.908527 - objectReference: {fileID: 0} - - target: {fileID: -2072040086291044643, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 11.559987 - objectReference: {fileID: 0} - - target: {fileID: -2072040086291044643, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: -5.758815 - objectReference: {fileID: 0} - - target: {fileID: -1864740628597940677, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 23.891237 - objectReference: {fileID: 0} - - target: {fileID: -1864740628597940677, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0.5505373 - objectReference: {fileID: 0} - - target: {fileID: -1864740628597940677, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 2.6017249 - objectReference: {fileID: 0} - - target: {fileID: -1812909498023395591, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0.0000019083852 - objectReference: {fileID: 0} - - target: {fileID: -1812909498023395591, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: -0.000047138892 - objectReference: {fileID: 0} - - target: {fileID: -1812909498023395591, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: -82.18631 - objectReference: {fileID: 0} - - target: {fileID: -1781356600409242780, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_Layer - value: 6 - objectReference: {fileID: 0} - - target: {fileID: -1703473491307067327, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_Layer - value: 6 - objectReference: {fileID: 0} - - target: {fileID: -1425791611860619382, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_Layer - value: 6 - objectReference: {fileID: 0} - - target: {fileID: -1268151995469589007, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_Layer - value: 6 - objectReference: {fileID: 0} - - target: {fileID: -1200856079203341021, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_Layer - value: 6 - objectReference: {fileID: 0} - - target: {fileID: -1070350730909333850, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 25.356129 - objectReference: {fileID: 0} - - target: {fileID: -1070350730909333850, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: -1.5339687 - objectReference: {fileID: 0} - - target: {fileID: -1070350730909333850, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: -4.8776097 - objectReference: {fileID: 0} - - target: {fileID: -870823317777057635, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: -7.690381 - objectReference: {fileID: 0} - - target: {fileID: -870823317777057635, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 24.266287 - objectReference: {fileID: 0} - - target: {fileID: -870823317777057635, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: -26.61609 - objectReference: {fileID: 0} - - target: {fileID: -751476226918971245, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_Layer - value: 6 - objectReference: {fileID: 0} - - target: {fileID: -552831747908440785, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_Layer - value: 6 - objectReference: {fileID: 0} - - target: {fileID: -290750445479886849, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_Layer - value: 6 - objectReference: {fileID: 0} - - target: {fileID: -203856693384778745, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_Layer - value: 6 - objectReference: {fileID: 0} - - target: {fileID: -104578136787704052, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 56.92608 - objectReference: {fileID: 0} - - target: {fileID: -104578136787704052, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: -7.4031186 - objectReference: {fileID: 0} - - target: {fileID: -104578136787704052, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: -13.187063 - objectReference: {fileID: 0} - - target: {fileID: -76546954072915012, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_Layer - value: 6 - objectReference: {fileID: 0} - - target: {fileID: 9171100556185337, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_Layer - value: 6 - objectReference: {fileID: 0} - - target: {fileID: 366175167995203695, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 4.161153 - objectReference: {fileID: 0} - - target: {fileID: 366175167995203695, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: -7.89925 - objectReference: {fileID: 0} - - target: {fileID: 366175167995203695, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: -0.9497503 - objectReference: {fileID: 0} - - target: {fileID: 414117464747255840, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_Layer - value: 6 - objectReference: {fileID: 0} - - target: {fileID: 608321761475470972, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 58.412933 - objectReference: {fileID: 0} - - target: {fileID: 608321761475470972, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: -32.219357 - objectReference: {fileID: 0} - - target: {fileID: 608321761475470972, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: -27.812729 - objectReference: {fileID: 0} - - target: {fileID: 919132149155446097, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_Name - value: X Bot - objectReference: {fileID: 0} - - target: {fileID: 919132149155446097, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_Layer - value: 6 - objectReference: {fileID: 0} - - target: {fileID: 1082271958561512970, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_Layer - value: 6 - objectReference: {fileID: 0} - - target: {fileID: 1092408308860062549, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 49.25673 - objectReference: {fileID: 0} - - target: {fileID: 1092408308860062549, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: -2.4892333 - objectReference: {fileID: 0} - - target: {fileID: 1092408308860062549, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: -5.4266458 - objectReference: {fileID: 0} - - target: {fileID: 1189529853000058984, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 58.601585 - objectReference: {fileID: 0} - - target: {fileID: 1189529853000058984, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: -8.05534 - objectReference: {fileID: 0} - - target: {fileID: 1189529853000058984, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: -9.966515 - objectReference: {fileID: 0} - - target: {fileID: 1330755669629619180, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 31.460888 - objectReference: {fileID: 0} - - target: {fileID: 1330755669629619180, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 2.3883386 - objectReference: {fileID: 0} - - target: {fileID: 1330755669629619180, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 3.0228832 - objectReference: {fileID: 0} - - target: {fileID: 1339101018200438765, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_Layer - value: 6 - objectReference: {fileID: 0} - - target: {fileID: 1564860333797465651, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 60.896133 - objectReference: {fileID: 0} - - target: {fileID: 1564860333797465651, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 6.2473845 - objectReference: {fileID: 0} - - target: {fileID: 1564860333797465651, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 10.607912 - objectReference: {fileID: 0} - - target: {fileID: 1711505207429034123, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_Layer - value: 6 - objectReference: {fileID: 0} - - target: {fileID: 1852576806548013000, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: -31.44302 - objectReference: {fileID: 0} - - target: {fileID: 1852576806548013000, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: -44.494686 - objectReference: {fileID: 0} - - target: {fileID: 1852576806548013000, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: -9.831146 - objectReference: {fileID: 0} - - target: {fileID: 2158975759703390516, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_Layer - value: 6 - objectReference: {fileID: 0} - - target: {fileID: 2559285840627121667, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: -32.385113 - objectReference: {fileID: 0} - - target: {fileID: 2559285840627121667, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: -10.229966 - objectReference: {fileID: 0} - - target: {fileID: 2559285840627121667, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 162.74034 - objectReference: {fileID: 0} - - target: {fileID: 2563496969622287784, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0.000040444043 - objectReference: {fileID: 0} - - target: {fileID: 2563496969622287784, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: -0.0000126556115 - objectReference: {fileID: 0} - - target: {fileID: 2563496969622287784, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 29.423206 - objectReference: {fileID: 0} - - target: {fileID: 2586065998465600510, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_Layer - value: 6 - objectReference: {fileID: 0} - - target: {fileID: 2715566404302941441, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_Layer - value: 6 - objectReference: {fileID: 0} - - target: {fileID: 2898355158428612036, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_Layer - value: 6 - objectReference: {fileID: 0} - - target: {fileID: 2916570863362053800, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 39.174488 - objectReference: {fileID: 0} - - target: {fileID: 2916570863362053800, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: -0.000004402392 - objectReference: {fileID: 0} - - target: {fileID: 2916570863362053800, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: -0.000034094508 - objectReference: {fileID: 0} - - target: {fileID: 3047284246813455858, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_Layer - value: 6 - objectReference: {fileID: 0} - - target: {fileID: 3135921509060577837, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_Layer - value: 6 - objectReference: {fileID: 0} - - target: {fileID: 3183749884578473501, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 39.129963 - objectReference: {fileID: 0} - - target: {fileID: 3183749884578473501, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 1.7005358 - objectReference: {fileID: 0} - - target: {fileID: 3183749884578473501, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 4.782318 - objectReference: {fileID: 0} - - target: {fileID: 3588849560313704984, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_Layer - value: 6 - objectReference: {fileID: 0} - - target: {fileID: 3614653200513675785, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_Layer - value: 6 - objectReference: {fileID: 0} - - target: {fileID: 3667946887678727147, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 50.94207 - objectReference: {fileID: 0} - - target: {fileID: 3667946887678727147, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: -5.3916473 - objectReference: {fileID: 0} - - target: {fileID: 3667946887678727147, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: -20.710957 - objectReference: {fileID: 0} - - target: {fileID: 3882815353823017779, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_Layer - value: 6 - objectReference: {fileID: 0} - - target: {fileID: 3948933247560734027, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_Layer - value: 6 - objectReference: {fileID: 0} - - target: {fileID: 3974016661214395164, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_Layer - value: 6 - objectReference: {fileID: 0} - - target: {fileID: 4114030615378554161, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_Layer - value: 6 - objectReference: {fileID: 0} - - target: {fileID: 4237274458221626025, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_Layer - value: 6 - objectReference: {fileID: 0} - - target: {fileID: 4441848305933595309, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_Layer - value: 6 - objectReference: {fileID: 0} - - target: {fileID: 4549111882529890269, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_Layer - value: 6 - objectReference: {fileID: 0} - - target: {fileID: 4747904710347621765, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 38.225513 - objectReference: {fileID: 0} - - target: {fileID: 4747904710347621765, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 3.1315303 - objectReference: {fileID: 0} - - target: {fileID: 4747904710347621765, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: -8.314171 - objectReference: {fileID: 0} - - target: {fileID: 5048025441337412694, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 17.465261 - objectReference: {fileID: 0} - - target: {fileID: 5048025441337412694, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 18.092936 - objectReference: {fileID: 0} - - target: {fileID: 5048025441337412694, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: -15.171781 - objectReference: {fileID: 0} - - target: {fileID: 5097370190579632962, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 51.006687 - objectReference: {fileID: 0} - - target: {fileID: 5097370190579632962, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: -2.7569404 - objectReference: {fileID: 0} - - target: {fileID: 5097370190579632962, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: -5.7754064 - objectReference: {fileID: 0} - - target: {fileID: 5120724536234783804, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_Layer - value: 6 - objectReference: {fileID: 0} - - target: {fileID: 5372056943023685468, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 71.165955 - objectReference: {fileID: 0} - - target: {fileID: 5372056943023685468, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: -9.910328 - objectReference: {fileID: 0} - - target: {fileID: 5372056943023685468, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: -13.818539 - objectReference: {fileID: 0} - - target: {fileID: 5465940246521907071, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 2.248159 - objectReference: {fileID: 0} - - target: {fileID: 5465940246521907071, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 54.242958 - objectReference: {fileID: 0} - - target: {fileID: 5465940246521907071, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 6.6920185 - objectReference: {fileID: 0} - - target: {fileID: 6000407479487422213, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 28.047518 - objectReference: {fileID: 0} - - target: {fileID: 6000407479487422213, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 37.13001 - objectReference: {fileID: 0} - - target: {fileID: 6000407479487422213, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 134.72888 - objectReference: {fileID: 0} - - target: {fileID: 6240733294840144465, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_Layer - value: 6 - objectReference: {fileID: 0} - - target: {fileID: 6341119541397085964, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 67.76267 - objectReference: {fileID: 0} - - target: {fileID: 6341119541397085964, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: -162.95265 - objectReference: {fileID: 0} - - target: {fileID: 6341119541397085964, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: -168.5062 - objectReference: {fileID: 0} - - target: {fileID: 6502182839619065283, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: -33.96478 - objectReference: {fileID: 0} - - target: {fileID: 6502182839619065283, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 38.04091 - objectReference: {fileID: 0} - - target: {fileID: 6502182839619065283, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 33.953613 - objectReference: {fileID: 0} - - target: {fileID: 6514210125699187276, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_Layer - value: 6 - objectReference: {fileID: 0} - - target: {fileID: 6515712193588681746, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 11.981812 - objectReference: {fileID: 0} - - target: {fileID: 6515712193588681746, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: -7.481307 - objectReference: {fileID: 0} - - target: {fileID: 6515712193588681746, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 2.0068052 - objectReference: {fileID: 0} - - target: {fileID: 6655383506977046455, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 58.71873 - objectReference: {fileID: 0} - - target: {fileID: 6655383506977046455, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 5.4715405 - objectReference: {fileID: 0} - - target: {fileID: 6655383506977046455, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 9.710493 - objectReference: {fileID: 0} - - target: {fileID: 7078722787440015773, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 82.09471 - objectReference: {fileID: 0} - - target: {fileID: 7078722787440015773, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 11.085017 - objectReference: {fileID: 0} - - target: {fileID: 7078722787440015773, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: -88.589424 - objectReference: {fileID: 0} - - target: {fileID: 7363479242261063072, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_Layer - value: 6 - objectReference: {fileID: 0} - - target: {fileID: 7542137907003004905, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_Layer - value: 6 - objectReference: {fileID: 0} - - target: {fileID: 7666680083751660616, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 61.435116 - objectReference: {fileID: 0} - - target: {fileID: 7666680083751660616, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 6.4591293 - objectReference: {fileID: 0} - - target: {fileID: 7666680083751660616, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 10.849625 - objectReference: {fileID: 0} - - target: {fileID: 7732535366517880319, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_Layer - value: 6 - objectReference: {fileID: 0} - - target: {fileID: 7776229726456038893, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_Layer - value: 6 - objectReference: {fileID: 0} - - target: {fileID: 7882376022164389543, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_Layer - value: 6 - objectReference: {fileID: 0} - - target: {fileID: 8169382868667117632, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: -15.53679 - objectReference: {fileID: 0} - - target: {fileID: 8169382868667117632, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 14.025381 - objectReference: {fileID: 0} - - target: {fileID: 8169382868667117632, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: -174.42992 - objectReference: {fileID: 0} - - target: {fileID: 8255111157037086696, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 41.43787 - objectReference: {fileID: 0} - - target: {fileID: 8255111157037086696, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 3.9581158 - objectReference: {fileID: 0} - - target: {fileID: 8255111157037086696, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 2.306935 - objectReference: {fileID: 0} - - target: {fileID: 8447082967072642302, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 40.87401 - objectReference: {fileID: 0} - - target: {fileID: 8447082967072642302, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 4.0000277 - objectReference: {fileID: 0} - - target: {fileID: 8447082967072642302, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 19.995592 - objectReference: {fileID: 0} - - target: {fileID: 8817898888258712963, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_Layer - value: 6 - objectReference: {fileID: 0} - - target: {fileID: 8953972740105248388, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_Layer - value: 6 - objectReference: {fileID: 0} - - target: {fileID: 9037727976738196030, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - propertyPath: m_Layer - value: 6 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: - - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - insertIndex: -1 - addedObject: {fileID: 1782112145} - m_SourcePrefab: {fileID: 100100000, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} ---- !u!4 &1574173918 stripped -Transform: - m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - m_PrefabInstance: {fileID: 1574173917} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1520128817} + m_Layer: 6 + m_Name: mixamorig:LeftHandRing1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1520128817 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1520128816} + serializedVersion: 2 + m_LocalRotation: {x: -0.00000021796272, y: -0.000000059601565, z: -0.00000020462471, w: 1} + m_LocalPosition: {x: -0.018650811, y: 0.09104528, z: 0.00043028235} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 308153351} + m_Father: {fileID: 1914700222} + m_LocalEulerAnglesHint: {x: 49.85728, y: 5.8566966, z: -0.2583566} +--- !u!1 &1538903914 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1538903915} + m_Layer: 6 + m_Name: mixamorig:RightHandIndex2 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1538903915 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1538903914} + serializedVersion: 2 + m_LocalRotation: {x: -0.00000005960482, y: 0.000000044703484, z: 0.000000016681241, w: 1} + m_LocalPosition: {x: 8.564062e-17, y: 0.037, z: -9.3649935e-17} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1959551400} + m_Father: {fileID: 1144917074} + m_LocalEulerAnglesHint: {x: 49.668385, y: -2.5498168, z: -5.506392} +--- !u!1 &1560075452 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1560075453} + m_Layer: 6 + m_Name: mixamorig:RightUpLeg + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1560075453 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1560075452} + serializedVersion: 2 + m_LocalRotation: {x: 0.000000018984258, y: 0.011028455, z: 0.9999392, w: 0.00000053245526} + m_LocalPosition: {x: 0.08207789, y: -0.06771764, z: -0.015122186} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 274547354} + m_Father: {fileID: 880188920} + m_LocalEulerAnglesHint: {x: -15.53679, y: 14.025381, z: -174.42992} +--- !u!4 &1574173918 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1782112144} + serializedVersion: 2 + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1074429007} + - {fileID: 1440557825} + - {fileID: 880188920} + m_Father: {fileID: 1363717997} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1576051083 PrefabInstance: m_ObjectHideFlags: 0 @@ -3300,13 +4170,45 @@ Transform: m_GameObject: {fileID: 1632951287} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 7.6545897, y: -1.50055, z: 10.09304} + m_LocalPosition: {x: 4.5, y: 1, z: 10} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1190731366} - m_Father: {fileID: 835116272} + m_Father: {fileID: 123293704} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1637621028 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1637621029} + m_Layer: 6 + m_Name: mixamorig:LeftHandIndex3 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1637621029 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1637621028} + serializedVersion: 2 + m_LocalRotation: {x: 0.00000036455287, y: 0.0000000149455, z: -0.00000007340778, w: 1} + m_LocalPosition: {x: 7.177584e-15, y: 0.028499998, z: 3.2100108e-16} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 533526619} + m_Father: {fileID: 2101993954} + m_LocalEulerAnglesHint: {x: 23.891237, y: 0.5505373, z: 2.6017249} --- !u!1 &1699158560 GameObject: m_ObjectHideFlags: 0 @@ -3332,7 +4234,7 @@ Transform: m_GameObject: {fileID: 1699158560} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 2.65459, y: -2.50055, z: 5.09304} + m_LocalPosition: {x: 0, y: 0, z: 5} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -3340,6 +4242,70 @@ Transform: - {fileID: 1790144273} m_Father: {fileID: 835116272} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1726933838 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1726933839} + m_Layer: 6 + m_Name: mixamorig:RightHandRing2 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1726933839 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1726933838} + serializedVersion: 2 + m_LocalRotation: {x: -0.000000029801885, y: -0.000000029801978, z: -0.000000052319, w: 1} + m_LocalPosition: {x: 5.1494657e-17, y: 0.03379273, z: -2.837085e-16} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1120405562} + m_Father: {fileID: 1064654712} + m_LocalEulerAnglesHint: {x: 80.519745, y: -145.80515, z: -150.79942} +--- !u!1 &1736222800 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1736222801} + m_Layer: 6 + m_Name: mixamorig:Spine + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1736222801 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1736222800} + serializedVersion: 2 + m_LocalRotation: {x: -0.08015572, y: 0.00000007167351, z: -0.00000048303406, w: 0.99678236} + m_LocalPosition: {x: 4.2558305e-12, y: 0.101824366, z: -3.9690472e-17} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 401758456} + m_Father: {fileID: 880188920} + m_LocalEulerAnglesHint: {x: -6.6951637, y: -6.4102345, z: -3.166779} --- !u!1 &1740748256 stripped GameObject: m_CorrespondingSourceObject: {fileID: 2892703864492016621, guid: 51202e3c62c3d3e1c9bb0ff9c09a608f, type: 3} @@ -3367,11 +4333,85 @@ Transform: m_CorrespondingSourceObject: {fileID: 2368094401510200604, guid: 51202e3c62c3d3e1c9bb0ff9c09a608f, type: 3} m_PrefabInstance: {fileID: 7547016027398857338} m_PrefabAsset: {fileID: 0} ---- !u!1 &1782112144 stripped +--- !u!1 &1745826418 GameObject: - m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 39499efe4f068c9f1aa32d2ea7e17fa9, type: 3} - m_PrefabInstance: {fileID: 1574173917} + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1745826419} + m_Layer: 6 + m_Name: mixamorig:LeftToe_End + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1745826419 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1745826418} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0.011869166, z: -0, w: 0.99992955} + m_LocalPosition: {x: 4.3545176e-19, y: 0.09278137, z: -1.3126546e-17} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1383902096} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1761427026 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1761427027} + m_Layer: 6 + m_Name: mixamorig:RightHandPinky4 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1761427027 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1761427026} + serializedVersion: 2 + m_LocalRotation: {x: -0.0000000642066, y: -0.0015694813, z: 0.000041285286, w: 0.9999988} + m_LocalPosition: {x: -1.2959057e-15, y: 0.02115781, z: 1.4407352e-10} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1786145461} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1782112144 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1574173918} + - component: {fileID: 1782112145} + m_Layer: 6 + m_Name: X Bot + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 --- !u!95 &1782112145 Animator: serializedVersion: 7 @@ -3394,6 +4434,38 @@ Animator: m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorStateOnDisable: 0 m_WriteDefaultValuesOnDisable: 0 +--- !u!1 &1786145460 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1786145461} + m_Layer: 6 + m_Name: mixamorig:RightHandPinky3 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1786145461 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1786145460} + serializedVersion: 2 + m_LocalRotation: {x: 0.00000002980224, y: -0.00000004470347, z: 0.00000017207036, w: 1} + m_LocalPosition: {x: 5.2800265e-16, y: 0.020999998, z: -2.1163896e-10} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1761427027} + m_Father: {fileID: 2077448240} + m_LocalEulerAnglesHint: {x: 51.532135, y: -2.842689, z: -5.8853307} --- !u!1 &1790144272 GameObject: m_ObjectHideFlags: 0 @@ -3472,7 +4544,7 @@ Transform: m_GameObject: {fileID: 1801804563} serializedVersion: 2 m_LocalRotation: {x: -0, y: 1, z: -0, w: 0} - m_LocalPosition: {x: -1.3454101, y: -2.50055, z: 4.09304} + m_LocalPosition: {x: -3, y: 0, z: 2} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -3545,6 +4617,165 @@ MonoBehaviour: animator: {fileID: 1881513959} hitParam: 1654612129 deathParam: 20298039 +--- !u!1 &1837139487 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1837139488} + m_Layer: 6 + m_Name: mixamorig:LeftHandRing3 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1837139488 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1837139487} + serializedVersion: 2 + m_LocalRotation: {x: 0.000000029802365, y: -0.000000089406974, z: 0.00000011920925, w: 1} + m_LocalPosition: {x: -0.000000026432891, y: 0.0295, z: 0.0000000052098597} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1456731653} + m_Father: {fileID: 308153351} + m_LocalEulerAnglesHint: {x: 19.92245, y: 0.37387395, z: 2.1285405} +--- !u!1 &1854432973 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1854432974} + m_Layer: 6 + m_Name: mixamorig:RightHandPinky1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1854432974 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1854432973} + serializedVersion: 2 + m_LocalRotation: {x: 0.00000015838519, y: -3.1912573e-10, z: -0.00000022509583, w: 1} + m_LocalPosition: {x: 0.038062774, y: 0.08076676, z: 0.004867037} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 2077448240} + m_Father: {fileID: 166564785} + m_LocalEulerAnglesHint: {x: 58.601585, y: -8.05534, z: -9.966515} +--- !u!1 &1866111555 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1866111556} + m_Layer: 6 + m_Name: mixamorig:LeftHandThumb3 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1866111556 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1866111555} + serializedVersion: 2 + m_LocalRotation: {x: 0.000000032398653, y: -0.0007452, z: -0.00000024176848, w: 0.99999976} + m_LocalPosition: {x: 1.2823348e-17, y: 0.034183882, z: 5.503636e-16} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 418936592} + m_Father: {fileID: 1431658128} + m_LocalEulerAnglesHint: {x: 2.5393105, y: -2.7602558, z: -25.305489} +--- !u!1 &1871104736 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1871104737} + m_Layer: 6 + m_Name: mixamorig:RightHandMiddle4 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1871104737 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1871104736} + serializedVersion: 2 + m_LocalRotation: {x: 0.00000015498269, y: -0.0009288142, z: -0.00016639449, w: 0.9999996} + m_LocalPosition: {x: -1.1329194e-15, y: 0.029466288, z: 7.2058734e-11} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 922496623} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1876345494 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1876345495} + m_Layer: 6 + m_Name: mixamorig:RightHandThumb1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1876345495 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1876345494} + serializedVersion: 2 + m_LocalRotation: {x: 0.25208968, y: -0.06028139, z: 0.2217039, w: 0.9400342} + m_LocalPosition: {x: -0.026818518, y: 0.02464805, z: 0.01573984} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1116525000} + m_Father: {fileID: 166564785} + m_LocalEulerAnglesHint: {x: 40.87401, y: 4.0000277, z: 19.995592} --- !u!1 &1881513958 stripped GameObject: m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 015f1ddb77bbd0ce980de36f9e227c78, type: 3} @@ -3572,6 +4803,37 @@ Animator: m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorStateOnDisable: 0 m_WriteDefaultValuesOnDisable: 0 +--- !u!1 &1890027871 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1890027872} + m_Layer: 6 + m_Name: mixamorig:RightToe_End + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1890027872 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1890027871} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: -0.011608068, z: -0, w: 0.99993265} + m_LocalPosition: {x: 3.3725423e-18, y: 0.09278121, z: 4.2890198e-17} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 286571124} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1896475836 GameObject: m_ObjectHideFlags: 0 @@ -3822,6 +5084,40 @@ MonoBehaviour: m_CallState: 2 m_ActionId: 5588bce1-4ae1-4cda-8730-838650924709 m_ActionName: 'Player/Use Secondary[/Keyboard/c,/Mouse/backButton]' + - m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 11400000, guid: f168a80804247334e9d8ec837f58c9e1, type: 2} + m_TargetAssemblyTypeName: KitsuneCafe.SOAP.ReactiveInputAction`1[[System.Single, + mscorlib + m_MethodName: Raise + 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: bf48e9be-890c-46e9-80a2-1d7ecc85e20b + m_ActionName: 'Player/Inventory[/Keyboard/tab]' + - m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 11400000, guid: f168a80804247334e9d8ec837f58c9e1, type: 2} + m_TargetAssemblyTypeName: KitsuneCafe.SOAP.ReactiveInputAction`1[[System.Single, + mscorlib + m_MethodName: Raise + 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: 8234c274-3165-4e2e-8d1c-74103faafd8a + m_ActionName: 'UI/Inventory[/Keyboard/tab]' m_NeverAutoSwitchControlSchemes: 0 m_DefaultControlScheme: m_DefaultActionMap: Player @@ -3836,7 +5132,7 @@ Transform: m_GameObject: {fileID: 1896475836} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 42.22913, y: 0, z: 25.19644} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -3890,6 +5186,42 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1914700221 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1914700222} + m_Layer: 6 + m_Name: mixamorig:LeftHand + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1914700222 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1914700221} + serializedVersion: 2 + m_LocalRotation: {x: -4.6185176e-14, y: -0.0000001788138, z: -0.00000077486027, w: 1} + m_LocalPosition: {x: -0.00000005438735, y: 0.28328833, z: -0.0000000055642486} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 173418118} + - {fileID: 690735214} + - {fileID: 406253093} + - {fileID: 1520128817} + - {fileID: 222869678} + m_Father: {fileID: 1934903265} + m_LocalEulerAnglesHint: {x: -33.96478, y: 38.04091, z: 33.953613} --- !u!1 &1915136994 GameObject: m_ObjectHideFlags: 0 @@ -4048,12 +5380,76 @@ Transform: m_GameObject: {fileID: 1918868759} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 2.65459, y: -2.50055, z: 5.09304} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 10, y: 1, z: 10} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 835116272} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1934903264 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1934903265} + m_Layer: 6 + m_Name: mixamorig:LeftForeArm + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1934903265 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1934903264} + serializedVersion: 2 + m_LocalRotation: {x: -0.000000059604634, y: 0.00000005960464, z: -0.000000059604634, w: 1} + m_LocalPosition: {x: -9.0380454e-17, y: 0.2784152, z: -4.3119334e-17} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1914700222} + m_Father: {fileID: 1092675203} + m_LocalEulerAnglesHint: {x: 0.0000019083852, y: -0.000047138892, z: -82.18631} +--- !u!1 &1959551399 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1959551400} + m_Layer: 6 + m_Name: mixamorig:RightHandIndex3 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1959551400 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1959551399} + serializedVersion: 2 + m_LocalRotation: {x: -0.00000002980207, y: -0.000000044703484, z: -0.00000015755253, w: 1} + m_LocalPosition: {x: 3.4287106e-15, y: 0.028499998, z: -8.893045e-12} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 596948198} + m_Father: {fileID: 1538903915} + m_LocalEulerAnglesHint: {x: 51.006687, y: -2.7569404, z: -5.7754064} --- !u!1 &2044644165 GameObject: m_ObjectHideFlags: 0 @@ -4162,6 +5558,214 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2044644165} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &2048696460 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2048696461} + m_Layer: 6 + m_Name: mixamorig:RightHandMiddle1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2048696461 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2048696460} + serializedVersion: 2 + m_LocalRotation: {x: -0.000000016102785, y: -0.000000029908218, z: -0.000000065639, w: 1} + m_LocalPosition: {x: 0.00000023687323, y: 0.09532501, z: 0.0000003985569} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1468996287} + m_Father: {fileID: 166564785} + m_LocalEulerAnglesHint: {x: 50.94207, y: -5.3916473, z: -20.710957} +--- !u!1 &2053644710 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2053644711} + m_Layer: 6 + m_Name: mixamorig:LeftHandPinky3 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2053644711 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2053644710} + serializedVersion: 2 + m_LocalRotation: {x: 0.00000019501242, y: -0.000000029788245, z: 0.00000012535493, w: 1} + m_LocalPosition: {x: -2.4071785e-15, y: 0.021000002, z: 3.3381643e-16} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 330427826} + m_Father: {fileID: 414461138} + m_LocalEulerAnglesHint: {x: 31.676178, y: 1.0288787, z: 3.625372} +--- !u!1 &2063172141 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2063172142} + m_Layer: 6 + m_Name: mixamorig:LeftShoulder + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2063172142 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2063172141} + serializedVersion: 2 + m_LocalRotation: {x: -0.48442268, y: 0.5709704, z: -0.5261617, w: -0.40308976} + m_LocalPosition: {x: -0.045704458, y: 0.11195644, z: -0.008066272} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1092675203} + m_Father: {fileID: 145119527} + m_LocalEulerAnglesHint: {x: 72.349594, y: 121.42653, z: -130.49387} +--- !u!1 &2073371830 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2073371832} + - component: {fileID: 2073371831} + m_Layer: 0 + m_Name: Item Preview Subscene + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &2073371831 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2073371830} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d482f2480cd8a1fac8e1ebd40c5dc94e, type: 3} + m_Name: + m_EditorClassIdentifier: + scene: + asset: {fileID: 102900000, guid: 4a31ffa7a4feefc509c20ec6e65133f0, type: 3} + guid: 4a31ffa7a4feefc509c20ec6e65133f0 + loadOnStart: 1 +--- !u!4 &2073371832 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2073371830} + serializedVersion: 2 + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &2077448239 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2077448240} + m_Layer: 6 + m_Name: mixamorig:RightHandPinky2 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2077448240 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2077448239} + serializedVersion: 2 + m_LocalRotation: {x: 0.00000014901183, y: 0.000000014900509, z: 0.0000002529358, w: 1} + m_LocalPosition: {x: 1.0715117e-16, y: 0.036, z: -3.087779e-16} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1786145461} + m_Father: {fileID: 1854432974} + m_LocalEulerAnglesHint: {x: 71.165955, y: -9.910328, z: -13.818539} +--- !u!1 &2101993953 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2101993954} + m_Layer: 6 + m_Name: mixamorig:LeftHandIndex2 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2101993954 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2101993953} + serializedVersion: 2 + m_LocalRotation: {x: 0.00000022151215, y: 0.00000007443435, z: -0.0000003188171, w: 1} + m_LocalPosition: {x: 6.4293255e-17, y: 0.037, z: -7.240398e-17} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1637621029} + m_Father: {fileID: 173418118} + m_LocalEulerAnglesHint: {x: 61.435116, y: 6.4591293, z: 10.849625} --- !u!1001 &7547016027398857338 PrefabInstance: m_ObjectHideFlags: 0 @@ -4335,3 +5939,4 @@ SceneRoots: - {fileID: 1914178467} - {fileID: 578612840} - {fileID: 835116272} + - {fileID: 2073371832} diff --git a/Assets/Scenes/SampleScene.unity.meta b/Assets/Scenes/DebugScene.unity.meta similarity index 100% rename from Assets/Scenes/SampleScene.unity.meta rename to Assets/Scenes/DebugScene.unity.meta diff --git a/Assets/Scenes/RecycleView.unity b/Assets/Scenes/DebugScene/ItemPreview.unity similarity index 79% rename from Assets/Scenes/RecycleView.unity rename to Assets/Scenes/DebugScene/ItemPreview.unity index 13b6e48..9d2290f 100644 --- a/Assets/Scenes/RecycleView.unity +++ b/Assets/Scenes/DebugScene/ItemPreview.unity @@ -119,7 +119,7 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} ---- !u!1 &1223357529 +--- !u!1 &341000910 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -127,76 +127,9 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1223357531} - - component: {fileID: 1223357530} - - component: {fileID: 1223357532} - m_Layer: 5 - m_Name: UIDocument - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &1223357530 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1223357529} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 19102, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_PanelSettings: {fileID: 11400000, guid: d8894ba51a816c451b072d957a1cfe45, type: 2} - m_ParentUI: {fileID: 0} - sourceAsset: {fileID: 9197481963319205126, guid: 8cea95d71232d8469b296ca7eb59e0a1, type: 3} - m_SortingOrder: 0 - m_WorldSpaceSizeMode: 1 - m_WorldSpaceWidth: 1920 - m_WorldSpaceHeight: 1080 ---- !u!4 &1223357531 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1223357529} - serializedVersion: 2 - 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_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1223357532 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1223357529} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: b37256e37c5968be89fa34dd8344744f, type: 3} - m_Name: - m_EditorClassIdentifier: - doc: {fileID: 1223357530} - inventory: {fileID: 11400000, guid: cd3f9ac2afa71f8b6acb3fb0cacfe441, type: 2} - template: {fileID: 9197481963319205126, guid: 01b74a9c8f3685fb2880379892a17e46, type: 3} ---- !u!1 &1411077289 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1411077291} - - component: {fileID: 1411077290} - - component: {fileID: 1411077292} + - component: {fileID: 341000913} + - component: {fileID: 341000912} + - component: {fileID: 341000911} m_Layer: 0 m_Name: Directional Light m_TagString: Untagged @@ -204,24 +137,47 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!108 &1411077290 +--- !u!114 &341000911 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 341000910} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Version: 3 + m_UsePipelineSettings: 1 + m_AdditionalLightsShadowResolutionTier: 2 + m_LightLayerMask: 1 + m_RenderingLayers: 2 + m_CustomShadowLayers: 0 + m_ShadowLayerMask: 1 + m_ShadowRenderingLayers: 1 + m_LightCookieSize: {x: 1, y: 1} + m_LightCookieOffset: {x: 0, y: 0} + m_SoftShadowQuality: 0 +--- !u!108 &341000912 Light: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1411077289} + m_GameObject: {fileID: 341000910} m_Enabled: 1 serializedVersion: 11 m_Type: 1 - m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_Intensity: 1 m_Range: 10 m_SpotAngle: 30 m_InnerSpotAngle: 21.80208 m_CookieSize: 10 m_Shadows: - m_Type: 2 + m_Type: 0 m_Resolution: -1 m_CustomResolution: -1 m_Strength: 1 @@ -253,7 +209,7 @@ Light: m_CullingMask: serializedVersion: 2 m_Bits: 4294967295 - m_RenderingLayerMask: 1 + m_RenderingLayerMask: 2 m_Lightmapping: 4 m_LightShadowCasterMode: 0 m_AreaSize: {x: 1, y: 1} @@ -269,45 +225,22 @@ Light: m_LightUnit: 1 m_LuxAtDistance: 1 m_EnableSpotReflector: 1 ---- !u!4 &1411077291 +--- !u!4 &341000913 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1411077289} + m_GameObject: {fileID: 341000910} serializedVersion: 2 m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261} - m_LocalPosition: {x: 0, y: 3, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} ---- !u!114 &1411077292 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1411077289} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Version: 3 - m_UsePipelineSettings: 1 - m_AdditionalLightsShadowResolutionTier: 2 - m_LightLayerMask: 1 - m_RenderingLayers: 1 - m_CustomShadowLayers: 0 - m_ShadowLayerMask: 1 - m_ShadowRenderingLayers: 1 - m_LightCookieSize: {x: 1, y: 1} - m_LightCookieOffset: {x: 0, y: 0} - m_SoftShadowQuality: 0 ---- !u!1 &1889780342 +--- !u!1 &590341843 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -315,98 +248,23 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1889780345} - - component: {fileID: 1889780344} - - component: {fileID: 1889780343} - - component: {fileID: 1889780346} + - component: {fileID: 590341847} + - component: {fileID: 590341846} + - component: {fileID: 590341844} m_Layer: 0 - m_Name: Main Camera - m_TagString: MainCamera + m_Name: Preview Camera + m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!81 &1889780343 -AudioListener: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1889780342} - m_Enabled: 1 ---- !u!20 &1889780344 -Camera: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1889780342} - m_Enabled: 1 - serializedVersion: 2 - m_ClearFlags: 2 - m_BackGroundColor: {r: 1, g: 0.8726415, b: 0.986825, a: 0} - m_projectionMatrixMode: 1 - m_GateFitMode: 2 - m_FOVAxisMode: 0 - m_Iso: 200 - m_ShutterSpeed: 0.005 - m_Aperture: 16 - m_FocusDistance: 10 - m_FocalLength: 50 - m_BladeCount: 5 - m_Curvature: {x: 2, y: 11} - m_BarrelClipping: 0.25 - m_Anamorphism: 0 - m_SensorSize: {x: 36, y: 24} - m_LensShift: {x: 0, y: 0} - m_NormalizedViewPortRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 1 - height: 1 - near clip plane: 0.3 - far clip plane: 1000 - field of view: 60 - orthographic: 0 - orthographic size: 5 - m_Depth: -1 - m_CullingMask: - serializedVersion: 2 - m_Bits: 4294967295 - m_RenderingPath: -1 - m_TargetTexture: {fileID: 0} - m_TargetDisplay: 0 - m_TargetEye: 3 - m_HDR: 1 - m_AllowMSAA: 1 - m_AllowDynamicResolution: 0 - m_ForceIntoRT: 0 - m_OcclusionCulling: 1 - m_StereoConvergence: 10 - m_StereoSeparation: 0.022 ---- !u!4 &1889780345 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1889780342} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 1, z: -10} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1889780346 +--- !u!114 &590341844 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1889780342} + m_GameObject: {fileID: 590341843} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3} @@ -444,10 +302,129 @@ MonoBehaviour: m_MipBias: 0 m_VarianceClampScale: 0.9 m_ContrastAdaptiveSharpening: 0 +--- !u!20 &590341846 +Camera: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 590341843} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 4 + m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_projectionMatrixMode: 1 + m_GateFitMode: 2 + m_FOVAxisMode: 0 + m_Iso: 200 + m_ShutterSpeed: 0.005 + m_Aperture: 16 + m_FocusDistance: 10 + m_FocalLength: 50 + m_BladeCount: 5 + m_Curvature: {x: 2, y: 11} + m_BarrelClipping: 0.25 + m_Anamorphism: 0 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 0.3 + far clip plane: 1000 + field of view: 60 + orthographic: 0 + orthographic size: 5 + m_Depth: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 256 + m_RenderingPath: -1 + m_TargetTexture: {fileID: 8400000, guid: fc19a022409ab0d408fa0e78cfeab827, type: 2} + m_TargetDisplay: 0 + m_TargetEye: 3 + m_HDR: 1 + m_AllowMSAA: 1 + m_AllowDynamicResolution: 0 + m_ForceIntoRT: 0 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 +--- !u!4 &590341847 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 590341843} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -3} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1153614253 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1153614255} + - component: {fileID: 1153614256} + m_Layer: 8 + m_Name: Item Preview + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1153614255 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1153614253} + serializedVersion: 2 + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1153614256 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1153614253} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: cd025ca0b2f740f7f8356cd3113163a2, type: 3} + m_Name: + m_EditorClassIdentifier: + selectedItem: {fileID: 11400000, guid: 37d00232a0bee1e8e923705187ff2187, type: 2} + camera: {fileID: 590341847} + rotationDelta: {fileID: 11400000, guid: 61bec5de28967d14d8027ebd7c009e4e, type: 2} + sensitivity: 25 + angleSnap: 10 + zoom: {fileID: 11400000, guid: b611ded87bd3825d7bf45e43eaea670d, type: 2} + zoomSensitivity: 0.025 + previewLayer: + index: 8 --- !u!1660057539 &9223372036854775807 SceneRoots: m_ObjectHideFlags: 0 m_Roots: - - {fileID: 1889780345} - - {fileID: 1411077291} - - {fileID: 1223357531} + - {fileID: 590341847} + - {fileID: 341000913} + - {fileID: 1153614255} diff --git a/Assets/Scenes/RecycleView.unity.meta b/Assets/Scenes/DebugScene/ItemPreview.unity.meta similarity index 74% rename from Assets/Scenes/RecycleView.unity.meta rename to Assets/Scenes/DebugScene/ItemPreview.unity.meta index 7d06e44..39ddc9c 100644 --- a/Assets/Scenes/RecycleView.unity.meta +++ b/Assets/Scenes/DebugScene/ItemPreview.unity.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 374b635465e0bf8888b5381eb4a6d9b6 +guid: 4a31ffa7a4feefc509c20ec6e65133f0 DefaultImporter: externalObjects: {} userData: diff --git a/Assets/Scripts/Editor/PropertyDrawers/LayerPropertyDrawer.cs b/Assets/Scripts/Editor/PropertyDrawers/LayerPropertyDrawer.cs new file mode 100644 index 0000000..aa7bf45 --- /dev/null +++ b/Assets/Scripts/Editor/PropertyDrawers/LayerPropertyDrawer.cs @@ -0,0 +1,20 @@ +using KitsuneCafe.Sys; +using UnityEditor; +using UnityEditor.UIElements; +using UnityEngine.UIElements; + +namespace KitsuneCafe.Editor +{ + [CustomPropertyDrawer(typeof(Layer))] + public class LayerPropertyDrawer : PropertyDrawer + { + public override VisualElement CreatePropertyGUI(SerializedProperty property) + { + var field = new LayerField(ObjectNames.NicifyVariableName(property.name)); + + field.Bind(property.serializedObject); + field.bindingPath = "index"; + return field; + } + } +} diff --git a/Assets/Scripts/Editor/PropertyDrawers/LayerPropertyDrawer.cs.meta b/Assets/Scripts/Editor/PropertyDrawers/LayerPropertyDrawer.cs.meta new file mode 100644 index 0000000..6ab9fa6 --- /dev/null +++ b/Assets/Scripts/Editor/PropertyDrawers/LayerPropertyDrawer.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 94cf5c15477490054ac75b400651436d \ No newline at end of file diff --git a/Assets/Scripts/Editor/PropertyDrawers/SceneAssetPropertyDrawer.cs b/Assets/Scripts/Editor/PropertyDrawers/SceneAssetPropertyDrawer.cs new file mode 100644 index 0000000..ecd43e3 --- /dev/null +++ b/Assets/Scripts/Editor/PropertyDrawers/SceneAssetPropertyDrawer.cs @@ -0,0 +1,14 @@ +using UnityEditor; +using UnityEngine; + +namespace KitsuneCafe.Editor +{ + // [CustomPropertyDrawer(typeof(SceneAsset))] + public class SceneAssetPropertyDrawer : PropertyDrawer + { + public override void OnGUI(Rect position, SerializedProperty property, GUIContent label) + { + EditorGUI.ObjectField(position, property, typeof(SceneAsset), label); + } + } +} diff --git a/Assets/Scripts/Editor/PropertyDrawers/SceneAssetPropertyDrawer.cs.meta b/Assets/Scripts/Editor/PropertyDrawers/SceneAssetPropertyDrawer.cs.meta new file mode 100644 index 0000000..90857e9 --- /dev/null +++ b/Assets/Scripts/Editor/PropertyDrawers/SceneAssetPropertyDrawer.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: a83d0e4d07a8192a597646d11504b235 \ No newline at end of file diff --git a/Assets/Scripts/Entity/AimFeature.cs b/Assets/Scripts/Entity/AimFeature.cs index b135c1f..12a90fb 100644 --- a/Assets/Scripts/Entity/AimFeature.cs +++ b/Assets/Scripts/Entity/AimFeature.cs @@ -6,7 +6,7 @@ using KitsuneCafe.SOAP; using R3; using UnityEngine; -namespace KitsuneCafe.Entity +namespace KitsuneCafe.Entities { public class AimFeature : MonoBehaviour { diff --git a/Assets/Scripts/Entity/BoneAttachment.cs b/Assets/Scripts/Entity/BoneAttachment.cs index f644ca1..b6264a1 100644 --- a/Assets/Scripts/Entity/BoneAttachment.cs +++ b/Assets/Scripts/Entity/BoneAttachment.cs @@ -1,6 +1,6 @@ using UnityEngine; -namespace KitsuneCafe.Entity +namespace KitsuneCafe.Entities { public class BoneAttachment : MonoBehaviour { diff --git a/Assets/Scripts/Entity/DamageSource.cs b/Assets/Scripts/Entity/DamageSource.cs index f64cdad..6f68168 100644 --- a/Assets/Scripts/Entity/DamageSource.cs +++ b/Assets/Scripts/Entity/DamageSource.cs @@ -1,6 +1,6 @@ using UnityEngine; -namespace KitsuneCafe.Entity +namespace KitsuneCafe.Entities { public class DamageSource : MonoBehaviour, IDamaging { diff --git a/Assets/Scripts/Entity/DeathAnimator.cs b/Assets/Scripts/Entity/DeathAnimator.cs index 1f48920..a8a7a41 100644 --- a/Assets/Scripts/Entity/DeathAnimator.cs +++ b/Assets/Scripts/Entity/DeathAnimator.cs @@ -2,7 +2,7 @@ using KitsuneCafe.Sys.Attributes; using R3; using UnityEngine; -namespace KitsuneCafe.Entity +namespace KitsuneCafe.Entities { public class DummyAnimator : MonoBehaviour { diff --git a/Assets/Scripts/Entity/EntityAnimator.cs b/Assets/Scripts/Entity/EntityAnimator.cs index 818afb1..966621d 100644 --- a/Assets/Scripts/Entity/EntityAnimator.cs +++ b/Assets/Scripts/Entity/EntityAnimator.cs @@ -5,7 +5,7 @@ using KitsuneCafe.Sys.Attributes; using R3; using UnityEngine; -namespace KitsuneCafe.Entity +namespace KitsuneCafe.Entities { public class EntityAnimator : MonoBehaviour { diff --git a/Assets/Scripts/Entity/Health.cs b/Assets/Scripts/Entity/Health.cs index e9d1dc5..b4c9df7 100644 --- a/Assets/Scripts/Entity/Health.cs +++ b/Assets/Scripts/Entity/Health.cs @@ -2,7 +2,7 @@ using System; using R3; using UnityEngine; -namespace KitsuneCafe.Entity +namespace KitsuneCafe.Entities { public record HealthChanged(int Previous, int Current) { diff --git a/Assets/Scripts/Entity/IDamageable.cs b/Assets/Scripts/Entity/IDamageable.cs index 0a913a4..b829eb3 100644 --- a/Assets/Scripts/Entity/IDamageable.cs +++ b/Assets/Scripts/Entity/IDamageable.cs @@ -1,6 +1,6 @@ using KitsuneCafe.Sys; -namespace KitsuneCafe.Entity +namespace KitsuneCafe.Entities { public interface IDamageable : IGameObject { diff --git a/Assets/Scripts/Entity/IDamaging.cs b/Assets/Scripts/Entity/IDamaging.cs index 43f805e..0ac8de7 100644 --- a/Assets/Scripts/Entity/IDamaging.cs +++ b/Assets/Scripts/Entity/IDamaging.cs @@ -1,6 +1,6 @@ using KitsuneCafe.Sys; -namespace KitsuneCafe.Entity +namespace KitsuneCafe.Entities { public interface IDamaging : IGameObject { diff --git a/Assets/Scripts/Entity/Input.cs b/Assets/Scripts/Entity/Input.cs index 035705e..d3e87d9 100644 --- a/Assets/Scripts/Entity/Input.cs +++ b/Assets/Scripts/Entity/Input.cs @@ -2,15 +2,15 @@ using UnityEngine; using UnityEngine.Events; using static UnityEngine.InputSystem.InputAction; -namespace KitsuneCafe.Entity +namespace KitsuneCafe.Entities { public interface IInputProvider { - Vector2 MovementDirection { get; } - bool Sprinting { get; } - bool Interacting { get; } + Vector2 MovementDirection { get; } + bool Sprinting { get; } + bool Interacting { get; } } - + public class Input : MonoBehaviour { [SerializeField] diff --git a/Assets/Scripts/Entity/Motor.cs b/Assets/Scripts/Entity/Motor.cs index d9ad04c..14ad779 100644 --- a/Assets/Scripts/Entity/Motor.cs +++ b/Assets/Scripts/Entity/Motor.cs @@ -4,7 +4,7 @@ using KitsuneCafe.SOAP; using R3; using UnityEngine; -namespace KitsuneCafe.Entity +namespace KitsuneCafe.Entities { public class Motor : MonoBehaviour { diff --git a/Assets/Scripts/Entity/Spring.cs b/Assets/Scripts/Entity/Spring.cs index f67bad1..b1bfbe0 100644 --- a/Assets/Scripts/Entity/Spring.cs +++ b/Assets/Scripts/Entity/Spring.cs @@ -1,6 +1,6 @@ using UnityEngine; -namespace KitsuneCafe.Entity +namespace KitsuneCafe.Entities { public class Spring : MonoBehaviour { diff --git a/Assets/Scripts/Entity/SprintFeature.cs b/Assets/Scripts/Entity/SprintFeature.cs index f4eb3af..aefcbd9 100644 --- a/Assets/Scripts/Entity/SprintFeature.cs +++ b/Assets/Scripts/Entity/SprintFeature.cs @@ -2,7 +2,7 @@ using KitsuneCafe.SOAP; using R3; using UnityEngine; -namespace KitsuneCafe.Entity +namespace KitsuneCafe.Entities { public class SprintFeature : MonoBehaviour { diff --git a/Assets/Scripts/Item/EquipmentInstance.cs b/Assets/Scripts/Item/EquipmentInstance.cs index ccfae5b..3947b0b 100644 --- a/Assets/Scripts/Item/EquipmentInstance.cs +++ b/Assets/Scripts/Item/EquipmentInstance.cs @@ -1,5 +1,5 @@ using System; -using KitsuneCafe.Entity; +using KitsuneCafe.Entities; using KitsuneCafe.SOAP; using R3; using UnityEngine; diff --git a/Assets/Scripts/Item/Firearm.cs b/Assets/Scripts/Item/Firearm.cs index 7baa9e8..6c0853d 100644 --- a/Assets/Scripts/Item/Firearm.cs +++ b/Assets/Scripts/Item/Firearm.cs @@ -1,5 +1,5 @@ using System; -using KitsuneCafe.Entity; +using KitsuneCafe.Entities; using KitsuneCafe.Extension; using KitsuneCafe.SOAP; using R3; diff --git a/Assets/Scripts/Item/Inventory.cs b/Assets/Scripts/Item/Inventory.cs index 409c199..34f3d9a 100644 --- a/Assets/Scripts/Item/Inventory.cs +++ b/Assets/Scripts/Item/Inventory.cs @@ -84,99 +84,42 @@ namespace KitsuneCafe.ItemSystem } [CreateAssetMenu(menuName = KitsuneCafeMenu.Item + "Inventory")] - public class Inventory : ScriptableObject, IList, IInventory, IEnumerable, IObservableCollection, ISerializationCallbackReceiver + public class Inventory : ScriptableObject, IList, IInventory, IEnumerable { [SerializeField] - private List serializableItems = new(); - - private ObservableList runtimeItems; + private List items = new(); [SerializeField] private int capacity = 8; - public event NotifyCollectionChangedEventHandler CollectionChanged = default; - public int Capacity => capacity; - public int Count => runtimeItems?.Count ?? 0; + public int Count => items.Count; public bool IsEmpty => Count == 0; public bool IsFull => Count == Capacity; - public object SyncRoot => runtimeItems.SyncRoot; + public object SyncRoot => ((IList)items).SyncRoot; - public bool IsFixedSize => ((IList)runtimeItems).IsFixedSize; + public bool IsFixedSize => ((IList)items).IsFixedSize; - public bool IsReadOnly => ((IList)runtimeItems).IsReadOnly; + public bool IsReadOnly => ((IList)items).IsReadOnly; - public bool IsSynchronized => ((ICollection)runtimeItems).IsSynchronized; + public bool IsSynchronized => ((ICollection)items).IsSynchronized; - object IList.this[int index] { get => runtimeItems[index]; set => runtimeItems[index] = (InventoryItem)value; } + object IList.this[int index] { get => items[index]; set => items[index] = (InventoryItem)value; } public InventoryItem this[int index] { - get => runtimeItems[index]; - set => runtimeItems[index] = value; - } - - private void OnEnable() - { - if (runtimeItems == null) - { - runtimeItems = new ObservableList(); - } - - runtimeItems.CollectionChanged -= OnCollectionChanged; - runtimeItems.CollectionChanged += OnCollectionChanged; - } - - private void OnDisable() - { - if (runtimeItems != null) - { - runtimeItems.CollectionChanged -= OnCollectionChanged; - } - } - - private void OnCollectionChanged(in NotifyCollectionChangedEventArgs e) - { - CollectionChanged?.Invoke(e); - } - - public void OnBeforeSerialize() - { - if (runtimeItems != null) - { - serializableItems.Clear(); - foreach (var item in runtimeItems) - { - serializableItems.Add(item); - } - } - } - - public void OnAfterDeserialize() - { - if (runtimeItems == null) - { - runtimeItems = new ObservableList(); - } - else - { - runtimeItems.Clear(); - } - - foreach (var item in serializableItems) - { - runtimeItems.Add(item); - } + get => items[index]; + set => items[index] = value; } public IEnumerable Find(Func predicate) { for (int i = 0; i < Count; i++) { - var item = runtimeItems[i]; + var item = items[i]; if (predicate(item)) { @@ -194,7 +137,7 @@ namespace KitsuneCafe.ItemSystem for (int i = 0; i < Count; i++) { - var existingItem = runtimeItems[i]; + var existingItem = items[i]; if (existingItem.Equals(item)) { @@ -204,7 +147,7 @@ namespace KitsuneCafe.ItemSystem } var consumedAmount = existingItem.IncreaseCount(count, out var updatedItem); - runtimeItems[i] = updatedItem.Value; + items[i] = updatedItem.Value; count -= consumedAmount; if (count <= 0) @@ -227,7 +170,7 @@ namespace KitsuneCafe.ItemSystem } count -= InventoryItem.Create(item, count, out var newItem); - runtimeItems.Add(newItem.Value); + items.Add(newItem.Value); } @@ -253,22 +196,22 @@ namespace KitsuneCafe.ItemSystem return Result.Err(InventoryError.InvalidQuantity); } - for (int i = runtimeItems.Count - 1; i >= 0; i--) + for (int i = items.Count - 1; i >= 0; i--) { - var existingItem = runtimeItems[i]; + var existingItem = items[i]; if (existingItem.Item == item) { if (existingItem.Count > count) { existingItem.ReduceCount(count, out var updatedItem); - runtimeItems[i] = updatedItem.Value; + items[i] = updatedItem.Value; return Result.Ok(Unit.Default); } else { count -= existingItem.Count; - runtimeItems.RemoveAt(i); + items.RemoveAt(i); if (count == 0) { @@ -290,7 +233,7 @@ namespace KitsuneCafe.ItemSystem { for (int i = 0; i < Count; i++) { - if (runtimeItems[i].Equals(item)) + if (items[i].Equals(item)) { return true; } @@ -301,7 +244,7 @@ namespace KitsuneCafe.ItemSystem public IEnumerator GetEnumerator() { - return runtimeItems.GetEnumerator(); + return items.GetEnumerator(); } IEnumerator IEnumerable.GetEnumerator() @@ -309,49 +252,44 @@ namespace KitsuneCafe.ItemSystem return GetEnumerator(); } - public ISynchronizedView CreateView(Func transform) - { - return runtimeItems.CreateView(transform); - } - public int Add(object value) { - return ((IList)runtimeItems).Add(value); + return ((IList)items).Add(value); } public void Clear() { - ((IList)runtimeItems).Clear(); + ((IList)items).Clear(); } public bool Contains(object value) { - return ((IList)runtimeItems).Contains(value); + return ((IList)items).Contains(value); } public int IndexOf(object value) { - return ((IList)runtimeItems).IndexOf(value); + return ((IList)items).IndexOf(value); } public void Insert(int index, object value) { - ((IList)runtimeItems).Insert(index, value); + ((IList)items).Insert(index, value); } public void Remove(object value) { - ((IList)runtimeItems).Remove(value); + ((IList)items).Remove(value); } public void RemoveAt(int index) { - ((IList)runtimeItems).RemoveAt(index); + ((IList)items).RemoveAt(index); } public void CopyTo(Array array, int index) { - ((ICollection)runtimeItems).CopyTo(array, index); + ((ICollection)items).CopyTo(array, index); } } } diff --git a/Assets/Scripts/SOAP/ReactiveValue.cs b/Assets/Scripts/SOAP/ReactiveValue.cs index 00e5393..bf603d0 100644 --- a/Assets/Scripts/SOAP/ReactiveValue.cs +++ b/Assets/Scripts/SOAP/ReactiveValue.cs @@ -12,9 +12,9 @@ namespace KitsuneCafe.SOAP [SerializeField] protected SerializableReactiveProperty value; - public T Value { get => value.Value; set { this.value.Value = value; } } + public virtual T Value { get => value.Value; set { this.value.Value = value; } } public ReadOnlyReactiveProperty AsReactiveProperty() => value; public override Observable AsObservable() => value; } -} \ No newline at end of file +} diff --git a/Assets/Scripts/SOAP/Value/FloatValue.cs b/Assets/Scripts/SOAP/Value/FloatValue.cs index f16ea9f..6e40b2f 100644 --- a/Assets/Scripts/SOAP/Value/FloatValue.cs +++ b/Assets/Scripts/SOAP/Value/FloatValue.cs @@ -1,4 +1,5 @@ using KitsuneCafe.Sys; +using KitsuneCafe.Sys.Attributes; using UnityEngine; namespace KitsuneCafe.SOAP @@ -6,6 +7,27 @@ namespace KitsuneCafe.SOAP [CreateAssetMenu(fileName = "FloatValue", menuName = KitsuneCafeMenu.SoapValue + "Float")] public class FloatValue : ReactiveValue { + [SerializeField] + private bool clamp = false; + public bool Clamped => clamp; + [SerializeField, ShowIf("clamp")] + private Vector2 minMax = Vector2.zero; + + public override float Value + { + get => base.Value; + set + { + if (clamp) + { + base.Value = Mathf.Clamp(value, minMax.x, minMax.y); + } + else + { + base.Value = value; + } + } + } } } diff --git a/Assets/Scripts/SOAP/Value/QuaternionValue.cs b/Assets/Scripts/SOAP/Value/QuaternionValue.cs new file mode 100644 index 0000000..aee9ab0 --- /dev/null +++ b/Assets/Scripts/SOAP/Value/QuaternionValue.cs @@ -0,0 +1,12 @@ +using KitsuneCafe.Sys; +using UnityEngine; + +namespace KitsuneCafe.SOAP +{ + [CreateAssetMenu(fileName = "QuaternionValue", menuName = KitsuneCafeMenu.SoapValue + "Quaternion")] + public class QuaternionValue : ReactiveValue + { + + } +} + diff --git a/Assets/Scripts/SOAP/Value/QuaternionValue.cs.meta b/Assets/Scripts/SOAP/Value/QuaternionValue.cs.meta new file mode 100644 index 0000000..61f616b --- /dev/null +++ b/Assets/Scripts/SOAP/Value/QuaternionValue.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 8d8c46ebf04914f9f96e5938bb166973 \ No newline at end of file diff --git a/Assets/Scripts/Scene.meta b/Assets/Scripts/Scene.meta new file mode 100644 index 0000000..594307d --- /dev/null +++ b/Assets/Scripts/Scene.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 16eef83f26bcaed2caf5029fb2957771 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Scene/Subscene.cs b/Assets/Scripts/Scene/Subscene.cs new file mode 100644 index 0000000..5bc733d --- /dev/null +++ b/Assets/Scripts/Scene/Subscene.cs @@ -0,0 +1,103 @@ +using System; +using Eflatun.SceneReference; +using UnityEditor; + +#if UNITY_EDITOR +using UnityEditor.SceneManagement; +#endif +using UnityEngine; +using UnityEngine.SceneManagement; + +namespace KitsuneCafe.Scene +{ + [ExecuteInEditMode] + public class Subscene : MonoBehaviour + { + [SerializeField] + private SceneReference scene; + + [SerializeField] + private bool loadOnStart; + + private AsyncOperation sceneLoadOperation; + + public event Action SceneLoaded = delegate { }; + private bool isLoading = false; + private bool isLoaded = false; + + private void Start() + { +#if UNITY_EDITOR + EditorApplication.playModeStateChanged += OnPlayModeStateChanged; + if (!EditorApplication.isPlayingOrWillChangePlaymode) + { + LoadPreviewScene(); + } +#else + + if (loadOnStart && !isLoading) + { + Load(); + isLoading = true; + } +#endif + } + + private void OnPlayModeStateChanged(PlayModeStateChange change) + { + switch (change) + { + case PlayModeStateChange.EnteredEditMode: + LoadPreviewScene(); + break; + case PlayModeStateChange.ExitingEditMode: + UnloadPreviewScene(); + break; + } + } + +#if UNITY_EDITOR + private void LoadPreviewScene() + { + if (scene.Path == null || SceneManager.GetSceneByPath(scene.Path).isLoaded) + { + return; + } + + EditorSceneManager.OpenScene(scene.Path, OpenSceneMode.Additive); + } + + private void UnloadPreviewScene() + { + if (scene.LoadedScene != null) + { + // EditorSceneManager.CloseScene(scene.LoadedScene, false); + if (loadOnStart) + { + Load(); + } + } + } + +#endif + + private void Load() + { + if (sceneLoadOperation == null) + { + sceneLoadOperation = SceneManager.LoadSceneAsync( + scene.BuildIndex, + LoadSceneMode.Additive + ); + + sceneLoadOperation.completed += OnCompleted; + } + } + + private void OnCompleted(AsyncOperation _operation) + { + isLoaded = true; + SceneLoaded.Invoke(); + } + } +} diff --git a/Assets/Scripts/Scene/Subscene.cs.meta b/Assets/Scripts/Scene/Subscene.cs.meta new file mode 100644 index 0000000..bdcb543 --- /dev/null +++ b/Assets/Scripts/Scene/Subscene.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: d482f2480cd8a1fac8e1ebd40c5dc94e \ No newline at end of file diff --git a/Assets/Scripts/System/Layer.cs b/Assets/Scripts/System/Layer.cs new file mode 100644 index 0000000..9cefe01 --- /dev/null +++ b/Assets/Scripts/System/Layer.cs @@ -0,0 +1,36 @@ +using UnityEngine; + +namespace KitsuneCafe.Sys +{ + [System.Serializable] + public class Layer + { + [SerializeField] + private int index = 0; + + public int Index => index; + + public Layer(int index) + { + this.index = index; + } + + public void Set(int layerIndex) + { + if (layerIndex > 0 && layerIndex < 32) + { + index = layerIndex; + } + } + + public int Mask => 1 << index; + + public override string ToString() + { + return $"Layer {{ Index = {index} }}"; + } + + public static implicit operator int(Layer layer) => layer.Index; + public static implicit operator Layer(int index) => new(index); + } +} diff --git a/Assets/Scripts/System/Layer.cs.meta b/Assets/Scripts/System/Layer.cs.meta new file mode 100644 index 0000000..c04ea99 --- /dev/null +++ b/Assets/Scripts/System/Layer.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 3d72dddf9bd95c216800328c05dd1f1d \ No newline at end of file diff --git a/Assets/Scripts/UI/Elements/Preview.cs b/Assets/Scripts/UI/Elements/Preview.cs new file mode 100644 index 0000000..bd3ee62 --- /dev/null +++ b/Assets/Scripts/UI/Elements/Preview.cs @@ -0,0 +1,138 @@ +using System; +using KitsuneCafe.UI.MVVM; +using UnityEngine; +using UnityEngine.UIElements; + +namespace KitsuneCafe.UI +{ + public class RotateEvent : EventBase + { + public Vector2 Delta { get; set; } + + protected override void Init() + { + base.Init(); + bubbles = true; + tricklesDown = true; + } + } + + public class ZoomEvent : EventBase + { + public float Amount { get; set; } + + protected override void Init() + { + base.Init(); + bubbles = true; + tricklesDown = true; + } + } + + [UxmlElement] + public partial class PreviewView : VisualElement + { + public const string BaseClass = "kitsunecafe__preview"; + + private readonly PreviewViewModel viewModel = new(); + + private readonly DragManipulator drag; + + public PreviewView() + { + AddToClassList(BaseClass); + + drag = new DragManipulator(this); + drag.Started += () => viewModel.EnableRotationCommand.TryExecute(true); + drag.Stopped += () => viewModel.EnableRotationCommand.TryExecute(false); + drag.Dragged += delta => viewModel.RotateCommand.TryExecute(delta); + this.AddManipulator(drag); + + RegisterCallback(OnAttachToPanel); + } + + private void OnAttachToPanel(AttachToPanelEvent evt) + { + var root = panel.visualTree; + root.RegisterCallback(OnMouseWheel); + + viewModel.Rotated += OnRotate; + viewModel.Zoomed += OnZoom; + } + + private void OnRotate(object sender, PreviewViewModel.RotateEvent e) + { + using RotateEvent ev = RotateEvent.GetPooled(); + ev.target = this; + ev.Delta = e.Rotation; + SendEvent(ev); + } + + private void OnZoom(object sender, PreviewViewModel.ZoomEvent e) + { + using ZoomEvent ev = ZoomEvent.GetPooled(); + ev.target = this; + ev.Amount = e.Amount; + SendEvent(ev); + } + + private void OnMouseWheel(WheelEvent evt) + { + viewModel.ZoomCommand.TryExecute(evt.delta.y); + } + } + + + public class PreviewViewModel + { + public record RotateEvent(Vector2 Rotation); + public record ZoomEvent(float Amount); + + public readonly ICommand EnableRotationCommand; + public readonly ICommand RotateCommand; + public readonly ICommand ZoomCommand; + + private bool isRotating = false; + + public event EventHandler Rotated; + public event EventHandler Zoomed; + + public PreviewViewModel() + { + EnableRotationCommand = new RelayCommand(CanEnableRotation, EnableRotation); + RotateCommand = new RelayCommand(CanRotate, Rotate); + ZoomCommand = new RelayCommand(CanZoom, Zoom); + } + + private void EnableRotation(bool enabled) + { + isRotating = enabled; + } + + private bool CanEnableRotation(bool _enabled) + { + return true; + } + + public bool CanRotate(Vector2 _delta) + { + return isRotating; + } + + private void Rotate(Vector2 delta) + { + Rotated?.Invoke(this, new RotateEvent(delta)); + } + + private bool CanZoom(float value) + { + return true; + } + + private void Zoom(float value) + { + Zoomed?.Invoke(this, new ZoomEvent(value)); + } + } +} + diff --git a/Assets/Scripts/UI/Elements/Preview.cs.meta b/Assets/Scripts/UI/Elements/Preview.cs.meta new file mode 100644 index 0000000..8ac5aab --- /dev/null +++ b/Assets/Scripts/UI/Elements/Preview.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 5af5a3e8b4d2c26c8bee10329f0bf21b \ No newline at end of file diff --git a/Assets/Scripts/UI/Elements/Recycler.cs b/Assets/Scripts/UI/Elements/Recycler.cs new file mode 100644 index 0000000..6ed5e66 --- /dev/null +++ b/Assets/Scripts/UI/Elements/Recycler.cs @@ -0,0 +1,276 @@ +using System; +using System.Collections; +using System.Collections.Generic; +using System.Linq; +using KitsuneCafe.UI.MVVM; +using Unity.Properties; +using UnityEngine; +using UnityEngine.UIElements; + +namespace KitsuneCafe.UI +{ + public class RecyclerViewModel + { + public record RotateEvent(Direction Direction, int FirstIndex); + + public enum Direction + { + None = 0, + Clockwise = -1, + CounterClockwise = 1 + } + + private int displayCount; + public int DisplayCount + { + get => displayCount; + set + { + if (displayCount != value) + { + displayCount = value; + CreateIndices(); + } + } + } + + private IList itemSource; + public IList ItemSource + { + get => itemSource; + set + { + if (itemSource != value) + { + itemSource = value; + CreateIndices(); + } + } + } + + public int Count => Math.Min(DisplayCount, ItemSource.Count); + + private List indices; + public IReadOnlyList Indices => indices; + + public readonly ICommand RotateCommand; + + public event EventHandler Rotated = delegate { }; + + public RecyclerViewModel() + { + indices = new(); + RotateCommand = new RelayCommand(CanRotate, Rotate); + } + + private void CreateIndices() + { + if (itemSource == null || displayCount == 0) { return; } + indices = Enumerable.Range(0, Math.Min(DisplayCount, ItemSource.Count)).ToList(); + } + + private bool CanRotate(Direction direction) + { + return direction == Direction.Clockwise || direction == Direction.CounterClockwise; + } + + public void Rotate(Direction direction) + { + if (direction == Direction.Clockwise) + { + indices.RemoveAt(0); + var next = indices.Last() + 1; + next %= ItemSource.Count; + indices.Add(next); + Notify(direction); + } + else if (direction == Direction.CounterClockwise) + { + indices.RemoveAt(ItemSource.Count - 1); + var count = ItemSource.Count; + var previous = indices[0] - 1; + previous += count % count; + indices.Insert(0, previous); + Notify(direction); + } + } + + private void Notify(Direction direction) + { + Rotated?.Invoke(this, new RotateEvent(direction, indices.First())); + } + } + + public class SelectEvent : EventBase + { + public int ElementIndex { get; set; } + public int DataIndex { get; set; } + } + + [UxmlElement] + public partial class RecyclerView : VisualElement + { + public const string BaseClass = "kitsunecafe__recycler-view"; + + [UxmlAttribute, CreateProperty] + public int DisplayCount + { + get => viewModel.DisplayCount; + set + { + viewModel.DisplayCount = value; + CreateItems(); + } + } + + [CreateProperty] + public IList ItemSource + { + get => viewModel.ItemSource; + set + { + if (ItemSource != value) + { + viewModel.ItemSource = value; + CreateItems(); + Rebind(); + } + } + } + + private IBinder binder; + + [CreateProperty] + public IBinder Binder + { + get => binder; + set + { + if (binder != value) + { + binder = value; + CreateItems(); + Rebind(); + } + } + } + + private readonly RecyclerViewModel viewModel = new(); + private readonly DragManipulator drag; + + public RecyclerView() + { + AddToClassList(BaseClass); + + drag = new DragManipulator(this); + drag.Dragged += OnDrag; + this.AddManipulator(drag); + + RegisterCallback(OnNavigationMove); + viewModel.Rotated += OnRotated; + } + + private void CreateItems() + { + Clear(); + if (DisplayCount == 0 || binder == null) { return; } + for (int i = 0; i < DisplayCount; i++) + { + Add(binder.CreateItem()); + } + + FocusFirst(); + } + + private void Rebind() + { + if (viewModel == null || ItemSource == null || DisplayCount == 0 || binder == null) { return; } + + for (int i = 0; i < DisplayCount; i++) + { + TryBindItem(this[i], i); + } + } + + private bool HasItem(int index) + { + return 0 <= index && index < ItemSource.Count; + } + + private void OnRotated(object sender, RecyclerViewModel.RotateEvent e) + { + VisualElement recycled; + switch (e.Direction) + { + case RecyclerViewModel.Direction.Clockwise: + recycled = this[0]; + RemoveAt(0); + Insert(DisplayCount - 1, recycled); + TryBindItem(recycled, DisplayCount - 1); + NotifySelection(); + break; + case RecyclerViewModel.Direction.CounterClockwise: + recycled = this[DisplayCount - 1]; + RemoveAt(DisplayCount - 1); + Insert(0, recycled); + TryBindItem(recycled, 0); + NotifySelection(); + break; + } + + FocusFirst(); + } + + private void NotifySelection() + { + using SelectEvent evt = SelectEvent.GetPooled(); + evt.target = this[0]; + evt.ElementIndex = 0; + evt.DataIndex = viewModel.Indices[0]; + SendEvent(evt); + } + + private void FocusFirst() + { + if (childCount > 0) + { + this[0].Focus(); + } + } + + private void TryBindItem(VisualElement element, int index) + { + if (HasItem(index)) + { + var idx = viewModel.Indices[index]; + if (0 <= idx && idx < ItemSource.Count) + { + binder.BindItem(element, idx); + } + } + else + { + binder.UnbindItem(element); + } + } + + private void OnDrag(Vector2 vector) + { + throw new NotImplementedException(); + } + + private void OnNavigationMove(NavigationMoveEvent evt) + { + var direction = evt.direction switch + { + NavigationMoveEvent.Direction.Left => RecyclerViewModel.Direction.CounterClockwise, + NavigationMoveEvent.Direction.Right => RecyclerViewModel.Direction.Clockwise, + NavigationMoveEvent.Direction.Next => RecyclerViewModel.Direction.Clockwise, + NavigationMoveEvent.Direction.Previous => RecyclerViewModel.Direction.CounterClockwise, + _ => RecyclerViewModel.Direction.None + }; + + viewModel.RotateCommand.TryExecute(direction); + } + } +} diff --git a/Assets/Scripts/UI/Elements/Recycler.cs.meta b/Assets/Scripts/UI/Elements/Recycler.cs.meta new file mode 100644 index 0000000..deff0da --- /dev/null +++ b/Assets/Scripts/UI/Elements/Recycler.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 684cef7995e35a12d8793b920c61ac8e \ No newline at end of file diff --git a/Assets/Scripts/UI/ItemPreview.cs b/Assets/Scripts/UI/ItemPreview.cs new file mode 100644 index 0000000..eb9ad3e --- /dev/null +++ b/Assets/Scripts/UI/ItemPreview.cs @@ -0,0 +1,133 @@ +using System; +using KitsuneCafe.ItemSystem; +using KitsuneCafe.SOAP; +using KitsuneCafe.Sys; +using R3; +using UnityEngine; +using Wacs.Core.Instructions; + +namespace KitsuneCafe.UI +{ + public class ItemPreview : MonoBehaviour + { + [SerializeField] + private ItemValue selectedItem; + + [SerializeField] + private new Transform camera; + + [Header("Rotation")] + [SerializeField] + private Vector2Value rotationDelta; + + [SerializeField] + private float sensitivity = 20; + + [SerializeField] + private float angleSnap = 10; + + [Header("Zoom")] + [SerializeField] + private FloatValue zoom; + + [SerializeField] + private float zoomSensitivity = 0.5f; + + private Vector3 initialPosition; + + [SerializeField] + private Layer previewLayer; + + private GameObject instance; + + private void Start() + { + if (selectedItem.Value != null) + { + ChangeItemPreview(selectedItem.Value); + } + + var d = Disposable.CreateBuilder(); + + selectedItem.AsObservable() + .Subscribe(ChangeItemPreview) + .AddTo(ref d); + + rotationDelta.AsObservable() + .Where(_ => instance != null) + .Subscribe(RotatePreview) + .AddTo(ref d); + + zoom.AsObservable() + .Where(_ => instance != null) + .Subscribe(ZoomPreview) + .AddTo(ref d); + + d.RegisterTo(destroyCancellationToken); + } + + private void ZoomPreview(float amount) + { + if (instance == null) { return; } + + var position = initialPosition; + position.z += amount * zoomSensitivity; + instance.transform.position = position; + } + + private void ChangeItemPreview(Item item) + { + if (instance != null) + { + Destroy(instance); + instance = null; + } + + if (item != null) + { + instance = item.CreatePreview(); + instance.layer = previewLayer; + instance.transform.SetParent(transform); + initialPosition = instance.transform.position; + + ResetPreviewValues(); + } + } + + private void ResetPreviewValues() + { + zoom.Value = 0; + rotationDelta.Value = Vector2.zero; + } + + public void RotatePreview(Vector2 delta) + { + if (instance == null || camera == null) { return; } + + var yawAngle = -delta.x * sensitivity * Time.deltaTime; + var yawRotation = Quaternion.AngleAxis(yawAngle, camera.up); + var pitchAngle = -delta.y * sensitivity * Time.deltaTime; + + var pitchRotation = Quaternion.AngleAxis(pitchAngle, camera.right); + var combinedRotation = pitchRotation * yawRotation; + instance.transform.rotation = combinedRotation * instance.transform.rotation; + + ApplyAngleSnapping(); + } + + public void ApplyAngleSnapping() + { + if (instance == null) return; + + Vector3 euler = instance.transform.rotation.eulerAngles; + + Quaternion rotation = Quaternion.Euler( + Mathf.Round(euler.x / angleSnap) * angleSnap, + Mathf.Round(euler.y / angleSnap) * angleSnap, + Mathf.Round(euler.z / angleSnap) * angleSnap + ); + + instance.transform.rotation = rotation; + } + } +} diff --git a/Assets/Scripts/UI/ItemPreview.cs.meta b/Assets/Scripts/UI/ItemPreview.cs.meta new file mode 100644 index 0000000..7f31498 --- /dev/null +++ b/Assets/Scripts/UI/ItemPreview.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: cd025ca0b2f740f7f8356cd3113163a2 \ No newline at end of file diff --git a/Assets/Scripts/UI/Manipulator.meta b/Assets/Scripts/UI/Manipulator.meta new file mode 100644 index 0000000..22a985f --- /dev/null +++ b/Assets/Scripts/UI/Manipulator.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0b72eac1e69a2d32f85746763e1b1d64 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/UI/Manipulator/DragManipulator.cs b/Assets/Scripts/UI/Manipulator/DragManipulator.cs new file mode 100644 index 0000000..f711a49 --- /dev/null +++ b/Assets/Scripts/UI/Manipulator/DragManipulator.cs @@ -0,0 +1,66 @@ +using System; +using UnityEditor; +using UnityEngine; +using UnityEngine.UIElements; + +namespace KitsuneCafe.UI +{ + public class DragManipulator : PointerManipulator + { + public event Action Started = delegate { }; + public event Action Stopped = delegate { }; + public event Action Dragged = delegate { }; + + private bool isDragging = false; + private bool globalDrag = true; + + private VisualElement releaseTarget; + + public DragManipulator(VisualElement element, bool globalDrag = true) + { + target = element; + this.globalDrag = globalDrag; + } + + protected override void RegisterCallbacksOnTarget() + { + target.RegisterCallback(OnAttachToPanel); + } + + private void OnAttachToPanel(AttachToPanelEvent evt) + { + releaseTarget = globalDrag ? target.panel.visualTree : target; + target.RegisterCallback(OnPointerDown); + releaseTarget.RegisterCallback(OnPointerMove); + releaseTarget.RegisterCallback(OnPointerUp); + } + + protected override void UnregisterCallbacksFromTarget() + { + target.UnregisterCallback(OnAttachToPanel); + target.UnregisterCallback(OnPointerDown); + releaseTarget?.UnregisterCallback(OnPointerMove); + releaseTarget?.UnregisterCallback(OnPointerUp); + } + + private void OnPointerDown(PointerDownEvent _) + { + isDragging = true; + Started?.Invoke(); + } + + private void OnPointerMove(PointerMoveEvent evt) + { + if (isDragging) + { + Dragged?.Invoke(evt.deltaPosition); + } + } + + private void OnPointerUp(PointerUpEvent evt) + { + isDragging = false; + Stopped?.Invoke(); + } + } +} diff --git a/Assets/Scripts/UI/Manipulator/DragManipulator.cs.meta b/Assets/Scripts/UI/Manipulator/DragManipulator.cs.meta new file mode 100644 index 0000000..c61f984 --- /dev/null +++ b/Assets/Scripts/UI/Manipulator/DragManipulator.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: e2d8f2b2cf8c00d9e9c1e89d5e0fb121 \ No newline at end of file diff --git a/Assets/Scripts/UI/Screen/InventoryScreen.cs b/Assets/Scripts/UI/Screen/InventoryScreen.cs index b974655..ce134b8 100644 --- a/Assets/Scripts/UI/Screen/InventoryScreen.cs +++ b/Assets/Scripts/UI/Screen/InventoryScreen.cs @@ -1,6 +1,9 @@ -using System.Collections; +using System; using KitsuneCafe.ItemSystem; +using KitsuneCafe.SOAP; using KitsuneCafe.UI.MVVM; +using R3; +using UnityEditor.UIElements; using UnityEngine; using UnityEngine.UIElements; @@ -8,13 +11,14 @@ namespace KitsuneCafe.UI { public class InventoryScreen : MonoBehaviour { - public const string ItemListIndicators = "item-list-indicator"; - public const string ItemList = "item-list"; + public const string ItemListIndicatorsName = "item-list-indicator"; + public const string ItemListName = "item-list"; + + public const string ItemPreviewName = "item-preview"; - - public const string ItemDetailsTitle = "item-details-title-label"; - public const string ItemDetailsContent = "item-details-content-label"; + public const string ItemDetailsTitleName = "item-details-title-label"; + public const string ItemDetailsContentName = "item-details-content-label"; [SerializeField] private UIDocument doc; @@ -25,12 +29,28 @@ namespace KitsuneCafe.UI [SerializeField] private VisualTreeAsset template; + [SerializeField] + private int displayCount = 5; + + [SerializeField] + private ItemValue selectedItem; + + [SerializeField] + private FloatEvent inventoryInput; + + [SerializeField] + private Vector2Value itemPreviewDelta; + + [SerializeField] + private FloatValue itemZoom; + + [SerializeField] + private ActionMapValue actionMap; + private VisualElement root => doc.rootVisualElement; private VisualElement indicators; - private VisualElement itemList; - private VisualElement detailsTitle; - private VisualElement detailsContent; + private VisualElement itemPreview; private void OnValidate() { @@ -47,7 +67,54 @@ namespace KitsuneCafe.UI private void Start() { + root.visible = false; + inventoryInput.AsObservable() + .Subscribe(_ => + { + root.visible = !root.visible; + actionMap.Value = root.visible ? Input.ActionMap.UI : Input.ActionMap.Player; + }); + + CreateItemList(); + var preview = root.Q(); + + preview.RegisterCallback(evt => + { + itemPreviewDelta.Value = evt.Delta; + }); + + preview.RegisterCallback(evt => + { + itemZoom.Value += evt.Amount; + }); + } + + private void CreateItemList() + { + var itemList = root.Q(); + itemList.ItemSource = inventory; + itemList.Binder = new AdHocBinder( + () => + { + var instance = template.CloneTree(); + instance.focusable = true; + return instance; + }, + (el, i) => + { + el.dataSource = inventory[i]; + }, + el => + { + el.dataSource = null; + } + ); + + itemList.RegisterCallback(evt => + { + Debug.Log($"Selected {evt.DataIndex}"); + }); } } } diff --git a/Assets/TutorialInfo/Icons/URP.png b/Assets/TutorialInfo/Icons/URP.png deleted file mode 100644 index 6194a80..0000000 Binary files a/Assets/TutorialInfo/Icons/URP.png and /dev/null differ diff --git a/Assets/TutorialInfo/Icons/URP.png.meta b/Assets/TutorialInfo/Icons/URP.png.meta deleted file mode 100644 index 0f2cab0..0000000 --- a/Assets/TutorialInfo/Icons/URP.png.meta +++ /dev/null @@ -1,134 +0,0 @@ -fileFormatVersion: 2 -guid: 727a75301c3d24613a3ebcec4a24c2c8 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 11 - mipmaps: - mipMapMode: 0 - enableMipMap: 0 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMasterTextureLimit: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 0 - aniso: 1 - mipBias: 0 - wrapU: 1 - wrapV: 1 - wrapW: 0 - nPOTScale: 0 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 1 - spriteTessellationDetail: -1 - textureType: 2 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 0 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Android - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: iPhone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/TutorialInfo/Layout.wlt b/Assets/TutorialInfo/Layout.wlt deleted file mode 100644 index 7b50a25..0000000 --- a/Assets/TutorialInfo/Layout.wlt +++ /dev/null @@ -1,654 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &1 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 1 - m_Script: {fileID: 12004, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_PixelRect: - serializedVersion: 2 - x: 0 - y: 45 - width: 1666 - height: 958 - m_ShowMode: 4 - m_Title: - m_RootView: {fileID: 6} - m_MinSize: {x: 950, y: 542} - m_MaxSize: {x: 10000, y: 10000} ---- !u!114 &2 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 1 - m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_Children: [] - m_Position: - serializedVersion: 2 - x: 0 - y: 466 - width: 290 - height: 442 - m_MinSize: {x: 234, y: 271} - m_MaxSize: {x: 10004, y: 10021} - m_ActualView: {fileID: 14} - m_Panes: - - {fileID: 14} - m_Selected: 0 - m_LastSelected: 0 ---- !u!114 &3 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 1 - m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_Children: - - {fileID: 4} - - {fileID: 2} - m_Position: - serializedVersion: 2 - x: 973 - y: 0 - width: 290 - height: 908 - m_MinSize: {x: 234, y: 492} - m_MaxSize: {x: 10004, y: 14042} - vertical: 1 - controlID: 226 ---- !u!114 &4 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 1 - m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_Children: [] - m_Position: - serializedVersion: 2 - x: 0 - y: 0 - width: 290 - height: 466 - m_MinSize: {x: 204, y: 221} - m_MaxSize: {x: 4004, y: 4021} - m_ActualView: {fileID: 17} - m_Panes: - - {fileID: 17} - m_Selected: 0 - m_LastSelected: 0 ---- !u!114 &5 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 1 - m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_Children: [] - m_Position: - serializedVersion: 2 - x: 0 - y: 466 - width: 973 - height: 442 - m_MinSize: {x: 202, y: 221} - m_MaxSize: {x: 4002, y: 4021} - m_ActualView: {fileID: 15} - m_Panes: - - {fileID: 15} - m_Selected: 0 - m_LastSelected: 0 ---- !u!114 &6 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 1 - m_Script: {fileID: 12008, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_Children: - - {fileID: 7} - - {fileID: 8} - - {fileID: 9} - m_Position: - serializedVersion: 2 - x: 0 - y: 0 - width: 1666 - height: 958 - m_MinSize: {x: 950, y: 542} - m_MaxSize: {x: 10000, y: 10000} ---- !u!114 &7 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 1 - m_Script: {fileID: 12011, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_Children: [] - m_Position: - serializedVersion: 2 - x: 0 - y: 0 - width: 1666 - height: 30 - m_MinSize: {x: 0, y: 0} - m_MaxSize: {x: 0, y: 0} - m_LastLoadedLayoutName: Tutorial ---- !u!114 &8 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 1 - m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_Children: - - {fileID: 10} - - {fileID: 3} - - {fileID: 11} - m_Position: - serializedVersion: 2 - x: 0 - y: 30 - width: 1666 - height: 908 - m_MinSize: {x: 713, y: 492} - m_MaxSize: {x: 18008, y: 14042} - vertical: 0 - controlID: 74 ---- !u!114 &9 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 1 - m_Script: {fileID: 12042, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_Children: [] - m_Position: - serializedVersion: 2 - x: 0 - y: 938 - width: 1666 - height: 20 - m_MinSize: {x: 0, y: 0} - m_MaxSize: {x: 0, y: 0} ---- !u!114 &10 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 1 - m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_Children: - - {fileID: 12} - - {fileID: 5} - m_Position: - serializedVersion: 2 - x: 0 - y: 0 - width: 973 - height: 908 - m_MinSize: {x: 202, y: 442} - m_MaxSize: {x: 4002, y: 8042} - vertical: 1 - controlID: 75 ---- !u!114 &11 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 1 - m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_Children: [] - m_Position: - serializedVersion: 2 - x: 1263 - y: 0 - width: 403 - height: 908 - m_MinSize: {x: 277, y: 71} - m_MaxSize: {x: 4002, y: 4021} - m_ActualView: {fileID: 13} - m_Panes: - - {fileID: 13} - m_Selected: 0 - m_LastSelected: 0 ---- !u!114 &12 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 1 - m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_Children: [] - m_Position: - serializedVersion: 2 - x: 0 - y: 0 - width: 973 - height: 466 - m_MinSize: {x: 202, y: 221} - m_MaxSize: {x: 4002, y: 4021} - m_ActualView: {fileID: 16} - m_Panes: - - {fileID: 16} - m_Selected: 0 - m_LastSelected: 0 ---- !u!114 &13 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 1 - m_Script: {fileID: 12019, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_AutoRepaintOnSceneChange: 0 - m_MinSize: {x: 275, y: 50} - m_MaxSize: {x: 4000, y: 4000} - m_TitleContent: - m_Text: Inspector - m_Image: {fileID: -6905738622615590433, guid: 0000000000000000d000000000000000, - type: 0} - m_Tooltip: - m_DepthBufferBits: 0 - m_Pos: - serializedVersion: 2 - x: 2 - y: 19 - width: 401 - height: 887 - m_ScrollPosition: {x: 0, y: 0} - m_InspectorMode: 0 - m_PreviewResizer: - m_CachedPref: -160 - m_ControlHash: -371814159 - m_PrefName: Preview_InspectorPreview - m_PreviewWindow: {fileID: 0} ---- !u!114 &14 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 1 - m_Script: {fileID: 12014, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_AutoRepaintOnSceneChange: 0 - m_MinSize: {x: 230, y: 250} - m_MaxSize: {x: 10000, y: 10000} - m_TitleContent: - m_Text: Project - m_Image: {fileID: -7501376956915960154, guid: 0000000000000000d000000000000000, - type: 0} - m_Tooltip: - m_DepthBufferBits: 0 - m_Pos: - serializedVersion: 2 - x: 2 - y: 19 - width: 286 - height: 421 - m_SearchFilter: - m_NameFilter: - m_ClassNames: [] - m_AssetLabels: [] - m_AssetBundleNames: [] - m_VersionControlStates: [] - m_ReferencingInstanceIDs: - m_ScenePaths: [] - m_ShowAllHits: 0 - m_SearchArea: 0 - m_Folders: - - Assets - m_ViewMode: 0 - m_StartGridSize: 64 - m_LastFolders: - - Assets - m_LastFoldersGridSize: -1 - m_LastProjectPath: /Users/danielbrauer/Unity Projects/New Unity Project 47 - m_IsLocked: 0 - m_FolderTreeState: - scrollPos: {x: 0, y: 0} - m_SelectedIDs: ee240000 - m_LastClickedID: 9454 - m_ExpandedIDs: ee24000000ca9a3bffffff7f - m_RenameOverlay: - m_UserAcceptedRename: 0 - m_Name: - m_OriginalName: - m_EditFieldRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 0 - height: 0 - m_UserData: 0 - m_IsWaitingForDelay: 0 - m_IsRenaming: 0 - m_OriginalEventType: 11 - m_IsRenamingFilename: 1 - m_ClientGUIView: {fileID: 0} - m_SearchString: - m_CreateAssetUtility: - m_EndAction: {fileID: 0} - m_InstanceID: 0 - m_Path: - m_Icon: {fileID: 0} - m_ResourceFile: - m_AssetTreeState: - scrollPos: {x: 0, y: 0} - m_SelectedIDs: 68fbffff - m_LastClickedID: 0 - m_ExpandedIDs: ee240000 - m_RenameOverlay: - m_UserAcceptedRename: 0 - m_Name: - m_OriginalName: - m_EditFieldRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 0 - height: 0 - m_UserData: 0 - m_IsWaitingForDelay: 0 - m_IsRenaming: 0 - m_OriginalEventType: 11 - m_IsRenamingFilename: 1 - m_ClientGUIView: {fileID: 0} - m_SearchString: - m_CreateAssetUtility: - m_EndAction: {fileID: 0} - m_InstanceID: 0 - m_Path: - m_Icon: {fileID: 0} - m_ResourceFile: - m_ListAreaState: - m_SelectedInstanceIDs: 68fbffff - m_LastClickedInstanceID: -1176 - m_HadKeyboardFocusLastEvent: 0 - m_ExpandedInstanceIDs: c6230000 - m_RenameOverlay: - m_UserAcceptedRename: 0 - m_Name: - m_OriginalName: - m_EditFieldRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 0 - height: 0 - m_UserData: 0 - m_IsWaitingForDelay: 0 - m_IsRenaming: 0 - m_OriginalEventType: 11 - m_IsRenamingFilename: 1 - m_ClientGUIView: {fileID: 0} - m_CreateAssetUtility: - m_EndAction: {fileID: 0} - m_InstanceID: 0 - m_Path: - m_Icon: {fileID: 0} - m_ResourceFile: - m_NewAssetIndexInList: -1 - m_ScrollPosition: {x: 0, y: 0} - m_GridSize: 64 - m_DirectoriesAreaWidth: 110 ---- !u!114 &15 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 1 - m_Script: {fileID: 12015, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_AutoRepaintOnSceneChange: 1 - m_MinSize: {x: 200, y: 200} - m_MaxSize: {x: 4000, y: 4000} - m_TitleContent: - m_Text: Game - m_Image: {fileID: -2087823869225018852, guid: 0000000000000000d000000000000000, - type: 0} - m_Tooltip: - m_DepthBufferBits: 32 - m_Pos: - serializedVersion: 2 - x: 0 - y: 19 - width: 971 - height: 421 - m_MaximizeOnPlay: 0 - m_Gizmos: 0 - m_Stats: 0 - m_SelectedSizes: 00000000000000000000000000000000000000000000000000000000000000000000000000000000 - m_TargetDisplay: 0 - m_ZoomArea: - m_HRangeLocked: 0 - m_VRangeLocked: 0 - m_HBaseRangeMin: -242.75 - m_HBaseRangeMax: 242.75 - m_VBaseRangeMin: -101 - m_VBaseRangeMax: 101 - m_HAllowExceedBaseRangeMin: 1 - m_HAllowExceedBaseRangeMax: 1 - m_VAllowExceedBaseRangeMin: 1 - m_VAllowExceedBaseRangeMax: 1 - m_ScaleWithWindow: 0 - m_HSlider: 0 - m_VSlider: 0 - m_IgnoreScrollWheelUntilClicked: 0 - m_EnableMouseInput: 1 - m_EnableSliderZoom: 0 - m_UniformScale: 1 - m_UpDirection: 1 - m_DrawArea: - serializedVersion: 2 - x: 0 - y: 17 - width: 971 - height: 404 - m_Scale: {x: 2, y: 2} - m_Translation: {x: 485.5, y: 202} - m_MarginLeft: 0 - m_MarginRight: 0 - m_MarginTop: 0 - m_MarginBottom: 0 - m_LastShownAreaInsideMargins: - serializedVersion: 2 - x: -242.75 - y: -101 - width: 485.5 - height: 202 - m_MinimalGUI: 1 - m_defaultScale: 2 - m_TargetTexture: {fileID: 0} - m_CurrentColorSpace: 0 - m_LastWindowPixelSize: {x: 1942, y: 842} - m_ClearInEditMode: 1 - m_NoCameraWarning: 1 - m_LowResolutionForAspectRatios: 01000000000100000100 ---- !u!114 &16 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 1 - m_Script: {fileID: 12013, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_AutoRepaintOnSceneChange: 1 - m_MinSize: {x: 200, y: 200} - m_MaxSize: {x: 4000, y: 4000} - m_TitleContent: - m_Text: Scene - m_Image: {fileID: 2318424515335265636, guid: 0000000000000000d000000000000000, - type: 0} - m_Tooltip: - m_DepthBufferBits: 32 - m_Pos: - serializedVersion: 2 - x: 0 - y: 19 - width: 971 - height: 445 - m_SceneLighting: 1 - lastFramingTime: 0 - m_2DMode: 0 - m_isRotationLocked: 0 - m_AudioPlay: 0 - m_Position: - m_Target: {x: 0, y: 0, z: 0} - speed: 2 - m_Value: {x: 0, y: 0, z: 0} - m_RenderMode: 0 - m_ValidateTrueMetals: 0 - m_SceneViewState: - showFog: 1 - showMaterialUpdate: 0 - showSkybox: 1 - showFlares: 1 - showImageEffects: 1 - grid: - xGrid: - m_Target: 0 - speed: 2 - m_Value: 0 - yGrid: - m_Target: 1 - speed: 2 - m_Value: 1 - zGrid: - m_Target: 0 - speed: 2 - m_Value: 0 - m_Rotation: - m_Target: {x: -0.08717229, y: 0.89959055, z: -0.21045254, w: -0.3726226} - speed: 2 - m_Value: {x: -0.08717229, y: 0.89959055, z: -0.21045254, w: -0.3726226} - m_Size: - m_Target: 10 - speed: 2 - m_Value: 10 - m_Ortho: - m_Target: 0 - speed: 2 - m_Value: 0 - m_LastSceneViewRotation: {x: 0, y: 0, z: 0, w: 0} - m_LastSceneViewOrtho: 0 - m_ReplacementShader: {fileID: 0} - m_ReplacementString: - m_LastLockedObject: {fileID: 0} - m_ViewIsLockedToObject: 0 ---- !u!114 &17 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 1 - m_Script: {fileID: 12061, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_AutoRepaintOnSceneChange: 0 - m_MinSize: {x: 200, y: 200} - m_MaxSize: {x: 4000, y: 4000} - m_TitleContent: - m_Text: Hierarchy - m_Image: {fileID: -590624980919486359, guid: 0000000000000000d000000000000000, - type: 0} - m_Tooltip: - m_DepthBufferBits: 0 - m_Pos: - serializedVersion: 2 - x: 2 - y: 19 - width: 286 - height: 445 - m_TreeViewState: - scrollPos: {x: 0, y: 0} - m_SelectedIDs: 68fbffff - m_LastClickedID: -1176 - m_ExpandedIDs: 7efbffff00000000 - m_RenameOverlay: - m_UserAcceptedRename: 0 - m_Name: - m_OriginalName: - m_EditFieldRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 0 - height: 0 - m_UserData: 0 - m_IsWaitingForDelay: 0 - m_IsRenaming: 0 - m_OriginalEventType: 11 - m_IsRenamingFilename: 0 - m_ClientGUIView: {fileID: 0} - m_SearchString: - m_ExpandedScenes: - - - m_CurrenRootInstanceID: 0 - m_Locked: 0 - m_CurrentSortingName: TransformSorting diff --git a/Assets/TutorialInfo/Layout.wlt.meta b/Assets/TutorialInfo/Layout.wlt.meta deleted file mode 100644 index c0c8c77..0000000 --- a/Assets/TutorialInfo/Layout.wlt.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: eabc9546105bf4accac1fd62a63e88e6 -timeCreated: 1487337779 -licenseType: Store -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/TutorialInfo/Scripts/Editor.meta b/Assets/TutorialInfo/Scripts/Editor.meta deleted file mode 100644 index f59f099..0000000 --- a/Assets/TutorialInfo/Scripts/Editor.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: 3ad9b87dffba344c89909c6d1b1c17e1 -folderAsset: yes -timeCreated: 1475593892 -licenseType: Store -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/TutorialInfo/Scripts/Editor/ReadmeEditor.cs b/Assets/TutorialInfo/Scripts/Editor/ReadmeEditor.cs deleted file mode 100644 index ad55eca..0000000 --- a/Assets/TutorialInfo/Scripts/Editor/ReadmeEditor.cs +++ /dev/null @@ -1,242 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; -using UnityEditor; -using System; -using System.IO; -using System.Reflection; - -[CustomEditor(typeof(Readme))] -[InitializeOnLoad] -public class ReadmeEditor : Editor -{ - static string s_ShowedReadmeSessionStateName = "ReadmeEditor.showedReadme"; - - static string s_ReadmeSourceDirectory = "Assets/TutorialInfo"; - - const float k_Space = 16f; - - static ReadmeEditor() - { - EditorApplication.delayCall += SelectReadmeAutomatically; - } - - static void RemoveTutorial() - { - if (EditorUtility.DisplayDialog("Remove Readme Assets", - - $"All contents under {s_ReadmeSourceDirectory} will be removed, are you sure you want to proceed?", - "Proceed", - "Cancel")) - { - if (Directory.Exists(s_ReadmeSourceDirectory)) - { - FileUtil.DeleteFileOrDirectory(s_ReadmeSourceDirectory); - FileUtil.DeleteFileOrDirectory(s_ReadmeSourceDirectory + ".meta"); - } - else - { - Debug.Log($"Could not find the Readme folder at {s_ReadmeSourceDirectory}"); - } - - var readmeAsset = SelectReadme(); - if (readmeAsset != null) - { - var path = AssetDatabase.GetAssetPath(readmeAsset); - FileUtil.DeleteFileOrDirectory(path + ".meta"); - FileUtil.DeleteFileOrDirectory(path); - } - - AssetDatabase.Refresh(); - } - } - - static void SelectReadmeAutomatically() - { - if (!SessionState.GetBool(s_ShowedReadmeSessionStateName, false)) - { - var readme = SelectReadme(); - SessionState.SetBool(s_ShowedReadmeSessionStateName, true); - - if (readme && !readme.loadedLayout) - { - LoadLayout(); - readme.loadedLayout = true; - } - } - } - - static void LoadLayout() - { - var assembly = typeof(EditorApplication).Assembly; - var windowLayoutType = assembly.GetType("UnityEditor.WindowLayout", true); - var method = windowLayoutType.GetMethod("LoadWindowLayout", BindingFlags.Public | BindingFlags.Static); - method.Invoke(null, new object[] { Path.Combine(Application.dataPath, "TutorialInfo/Layout.wlt"), false }); - } - - static Readme SelectReadme() - { - var ids = AssetDatabase.FindAssets("Readme t:Readme"); - if (ids.Length == 1) - { - var readmeObject = AssetDatabase.LoadMainAssetAtPath(AssetDatabase.GUIDToAssetPath(ids[0])); - - Selection.objects = new UnityEngine.Object[] { readmeObject }; - - return (Readme)readmeObject; - } - else - { - Debug.Log("Couldn't find a readme"); - return null; - } - } - - protected override void OnHeaderGUI() - { - var readme = (Readme)target; - Init(); - - var iconWidth = Mathf.Min(EditorGUIUtility.currentViewWidth / 3f - 20f, 128f); - - GUILayout.BeginHorizontal("In BigTitle"); - { - if (readme.icon != null) - { - GUILayout.Space(k_Space); - GUILayout.Label(readme.icon, GUILayout.Width(iconWidth), GUILayout.Height(iconWidth)); - } - GUILayout.Space(k_Space); - GUILayout.BeginVertical(); - { - - GUILayout.FlexibleSpace(); - GUILayout.Label(readme.title, TitleStyle); - GUILayout.FlexibleSpace(); - } - GUILayout.EndVertical(); - GUILayout.FlexibleSpace(); - } - GUILayout.EndHorizontal(); - } - - public override void OnInspectorGUI() - { - var readme = (Readme)target; - Init(); - - foreach (var section in readme.sections) - { - if (!string.IsNullOrEmpty(section.heading)) - { - GUILayout.Label(section.heading, HeadingStyle); - } - - if (!string.IsNullOrEmpty(section.text)) - { - GUILayout.Label(section.text, BodyStyle); - } - - if (!string.IsNullOrEmpty(section.linkText)) - { - if (LinkLabel(new GUIContent(section.linkText))) - { - Application.OpenURL(section.url); - } - } - - GUILayout.Space(k_Space); - } - - if (GUILayout.Button("Remove Readme Assets", ButtonStyle)) - { - RemoveTutorial(); - } - } - - bool m_Initialized; - - GUIStyle LinkStyle - { - get { return m_LinkStyle; } - } - - [SerializeField] - GUIStyle m_LinkStyle; - - GUIStyle TitleStyle - { - get { return m_TitleStyle; } - } - - [SerializeField] - GUIStyle m_TitleStyle; - - GUIStyle HeadingStyle - { - get { return m_HeadingStyle; } - } - - [SerializeField] - GUIStyle m_HeadingStyle; - - GUIStyle BodyStyle - { - get { return m_BodyStyle; } - } - - [SerializeField] - GUIStyle m_BodyStyle; - - GUIStyle ButtonStyle - { - get { return m_ButtonStyle; } - } - - [SerializeField] - GUIStyle m_ButtonStyle; - - void Init() - { - if (m_Initialized) - return; - m_BodyStyle = new GUIStyle(EditorStyles.label); - m_BodyStyle.wordWrap = true; - m_BodyStyle.fontSize = 14; - m_BodyStyle.richText = true; - - m_TitleStyle = new GUIStyle(m_BodyStyle); - m_TitleStyle.fontSize = 26; - - m_HeadingStyle = new GUIStyle(m_BodyStyle); - m_HeadingStyle.fontStyle = FontStyle.Bold; - m_HeadingStyle.fontSize = 18; - - m_LinkStyle = new GUIStyle(m_BodyStyle); - m_LinkStyle.wordWrap = false; - - // Match selection color which works nicely for both light and dark skins - m_LinkStyle.normal.textColor = new Color(0x00 / 255f, 0x78 / 255f, 0xDA / 255f, 1f); - m_LinkStyle.stretchWidth = false; - - m_ButtonStyle = new GUIStyle(EditorStyles.miniButton); - m_ButtonStyle.fontStyle = FontStyle.Bold; - - m_Initialized = true; - } - - bool LinkLabel(GUIContent label, params GUILayoutOption[] options) - { - var position = GUILayoutUtility.GetRect(label, LinkStyle, options); - - Handles.BeginGUI(); - Handles.color = LinkStyle.normal.textColor; - Handles.DrawLine(new Vector3(position.xMin, position.yMax), new Vector3(position.xMax, position.yMax)); - Handles.color = Color.white; - Handles.EndGUI(); - - EditorGUIUtility.AddCursorRect(position, MouseCursor.Link); - - return GUI.Button(position, label, LinkStyle); - } -} diff --git a/Assets/TutorialInfo/Scripts/Editor/ReadmeEditor.cs.meta b/Assets/TutorialInfo/Scripts/Editor/ReadmeEditor.cs.meta deleted file mode 100644 index f038618..0000000 --- a/Assets/TutorialInfo/Scripts/Editor/ReadmeEditor.cs.meta +++ /dev/null @@ -1,12 +0,0 @@ -fileFormatVersion: 2 -guid: 476cc7d7cd9874016adc216baab94a0a -timeCreated: 1484146680 -licenseType: Store -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/TutorialInfo/Scripts/Readme.cs b/Assets/TutorialInfo/Scripts/Readme.cs deleted file mode 100644 index 95f6269..0000000 --- a/Assets/TutorialInfo/Scripts/Readme.cs +++ /dev/null @@ -1,16 +0,0 @@ -using System; -using UnityEngine; - -public class Readme : ScriptableObject -{ - public Texture2D icon; - public string title; - public Section[] sections; - public bool loadedLayout; - - [Serializable] - public class Section - { - public string heading, text, linkText, url; - } -} diff --git a/Assets/TutorialInfo/Scripts/Readme.cs.meta b/Assets/TutorialInfo/Scripts/Readme.cs.meta deleted file mode 100644 index 935153f..0000000 --- a/Assets/TutorialInfo/Scripts/Readme.cs.meta +++ /dev/null @@ -1,12 +0,0 @@ -fileFormatVersion: 2 -guid: fcf7219bab7fe46a1ad266029b2fee19 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: - - icon: {instanceID: 0} - executionOrder: 0 - icon: {fileID: 2800000, guid: a186f8a87ca4f4d3aa864638ad5dfb65, type: 3} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/UI/Inventory.uxml b/Assets/UI/Inventory.uxml index 77eca22..d7272c9 100644 --- a/Assets/UI/Inventory.uxml +++ b/Assets/UI/Inventory.uxml @@ -10,7 +10,7 @@ - + @@ -55,20 +55,20 @@ - + - + - + - + - + diff --git a/Assets/UI/ItemSlot.uxml b/Assets/UI/ItemSlot.uxml index 4a5e216..b5218dd 100644 --- a/Assets/UI/ItemSlot.uxml +++ b/Assets/UI/ItemSlot.uxml @@ -3,9 +3,9 @@