From 519b8edc621121f86c2eec672514841ec251b542 Mon Sep 17 00:00:00 2001 From: Casey Yee Date: Wed, 20 Jun 2018 17:11:26 -0700 Subject: [PATCH 01/12] simplify controller handling by eliminating ControllerManager --- ...nteraction.cs => ControllerInteraction.cs} | 37 ++---- ....cs.meta => ControllerInteraction.cs.meta} | 0 Assets/WebVR/Scripts/WebVRController.cs | 123 +++++++++++++++--- .../WebVR/Scripts/WebVRControllerManager.cs | 116 ----------------- .../Scripts/WebVRControllerManager.cs.meta | 13 -- 5 files changed, 112 insertions(+), 177 deletions(-) rename Assets/WebVR/Scripts/{WebVRControllerInteraction.cs => ControllerInteraction.cs} (58%) rename Assets/WebVR/Scripts/{WebVRControllerInteraction.cs.meta => ControllerInteraction.cs.meta} (100%) delete mode 100644 Assets/WebVR/Scripts/WebVRControllerManager.cs delete mode 100644 Assets/WebVR/Scripts/WebVRControllerManager.cs.meta diff --git a/Assets/WebVR/Scripts/WebVRControllerInteraction.cs b/Assets/WebVR/Scripts/ControllerInteraction.cs similarity index 58% rename from Assets/WebVR/Scripts/WebVRControllerInteraction.cs rename to Assets/WebVR/Scripts/ControllerInteraction.cs index 168d56d..1412768 100644 --- a/Assets/WebVR/Scripts/WebVRControllerInteraction.cs +++ b/Assets/WebVR/Scripts/ControllerInteraction.cs @@ -4,50 +4,29 @@ using System.Collections.Generic; using System.Runtime.InteropServices; -public class WebVRControllerInteraction : MonoBehaviour +public class ControllerInteraction : MonoBehaviour { - [Tooltip("Map GameObject to controller hand name.")] - public WebVRControllerHand hand = WebVRControllerHand.NONE; - - private WebVRControllerManager controllerManager; - private FixedJoint attachJoint = null; private Rigidbody currentRigidBody = null; private List contactRigidBodies = new List (); void Awake() { - controllerManager = WebVRControllerManager.Instance; attachJoint = GetComponent (); } void Update() { - WebVRController controller = controllerManager.GetController(gameObject, hand); + WebVRController controller = gameObject.GetComponent(); - if (controller != null) + if (controller.GetButtonDown("Trigger")) { - // Apply controller orientation and position. - Matrix4x4 sitStand = controller.sitStand; - Quaternion sitStandRotation = Quaternion.LookRotation ( - sitStand.GetColumn (2), - sitStand.GetColumn (1) - ); - transform.rotation = sitStandRotation * controller.rotation; - transform.position = sitStand.MultiplyPoint(controller.position); - - // Button interactions - if (controller.GetButtonDown(WebVRInputAction.Trigger) || - controller.GetButtonDown(WebVRInputAction.Grip)) - { - Pickup(); - } + Pickup(); + } - if (controller.GetButtonUp(WebVRInputAction.Trigger) || - controller.GetButtonUp(WebVRInputAction.Grip)) - { - Drop(); - } + if (controller.GetButtonUp("Trigger")) + { + Drop(); } } diff --git a/Assets/WebVR/Scripts/WebVRControllerInteraction.cs.meta b/Assets/WebVR/Scripts/ControllerInteraction.cs.meta similarity index 100% rename from Assets/WebVR/Scripts/WebVRControllerInteraction.cs.meta rename to Assets/WebVR/Scripts/ControllerInteraction.cs.meta diff --git a/Assets/WebVR/Scripts/WebVRController.cs b/Assets/WebVR/Scripts/WebVRController.cs index cde98de..072907e 100644 --- a/Assets/WebVR/Scripts/WebVRController.cs +++ b/Assets/WebVR/Scripts/WebVRController.cs @@ -4,6 +4,8 @@ using System.Collections.Generic; using System.Linq; +public enum WebVRControllerHand { NONE, LEFT, RIGHT }; + [System.Serializable] public class WebVRControllerButton { @@ -12,44 +14,63 @@ public class WebVRControllerButton public float value; } -public class WebVRController +public class WebVRController : MonoBehaviour { + [Tooltip("Controller hand to use.")] + public WebVRControllerHand hand = WebVRControllerHand.NONE; + [Tooltip("Controller input settings.")] + public WebVRControllerInputMap inputMap; + [HideInInspector] public int index; - public Enum hand; + [HideInInspector] public Vector3 position; + [HideInInspector] public Quaternion rotation; + [HideInInspector] public Matrix4x4 sitStand; + [HideInInspector] public WebVRControllerButton[] buttons = null; - public GameObject gameObject; - private Dictionary buttonStates = new Dictionary(); + private Dictionary buttonStates = new Dictionary(); public void UpdateButtons(WebVRControllerButton[] buttons) { for (int i = 0; i < buttons.Length; i++) { WebVRControllerButton button = buttons[i]; - foreach(WebVRInputAction action in Enum.GetValues(typeof(WebVRInputAction))) + foreach (WebVRControllerInput input in inputMap.inputs) { - if (i == (int)action) { - if (buttonStates.ContainsKey(action)) - buttonStates[action][0] = button.pressed; + if (input.gamepadButtonId == i) + { + if (buttonStates.ContainsKey(input.actionName)) + buttonStates[input.actionName][0] = button.pressed; else - buttonStates.Add (action, new bool[]{ button.pressed, false }); + buttonStates.Add(input.actionName, new bool[]{ button.pressed, false }); } } } } - public bool GetButton(WebVRInputAction action) + public bool GetButton(string action) { if (!buttonStates.ContainsKey(action)) return false; return buttonStates[action][0]; } - public bool GetButtonDown(WebVRInputAction action) + public bool GetButtonDown(string action) { + // Use Unity Input Manager when XR is enabled and WebVR is not being used (eg: standalone or from within editor). + if (UnityEngine.XR.XRDevice.isPresent) + { + foreach(WebVRControllerInput input in inputMap.inputs) + { + if (action == input.actionName) + return Input.GetButtonDown(input.unityInputName); + } + return false; + } + if (!buttonStates.ContainsKey(action)) return false; @@ -65,8 +86,19 @@ public bool GetButtonDown(WebVRInputAction action) return isDown; } - public bool GetButtonUp(WebVRInputAction action) + public bool GetButtonUp(string action) { + // Use Unity Input Manager when XR is enabled and WebVR is not being used (eg: standalone or from within editor). + if (UnityEngine.XR.XRDevice.isPresent) + { + foreach(WebVRControllerInput input in inputMap.inputs) + { + if (action == input.actionName) + return Input.GetButtonUp(input.unityInputName); + } + return false; + } + if (!buttonStates.ContainsKey(action)) return false; @@ -81,13 +113,66 @@ public bool GetButtonUp(WebVRInputAction action) return isUp; } - public WebVRController(int index, Enum hand, Vector3 position, Quaternion rotation, Matrix4x4 sitStand) + private void onControllerUpdate( + int index, string handValue, Vector3 position, Quaternion rotation, Matrix4x4 sitStand, WebVRControllerButton[] buttonValues) + { + if (handFromString(handValue) == hand) + { + // Apply controller orientation and position. + Quaternion sitStandRotation = Quaternion.LookRotation ( + sitStand.GetColumn (2), + sitStand.GetColumn (1) + ); + transform.rotation = sitStandRotation * rotation; + transform.position = sitStand.MultiplyPoint(position); + + UpdateButtons(buttonValues); + } + } + +private WebVRControllerHand handFromString(string handValue) + { + WebVRControllerHand handParsed = WebVRControllerHand.NONE; + + if (!String.IsNullOrEmpty(handValue)) { + try + { + handParsed = (WebVRControllerHand) Enum.Parse(typeof(WebVRControllerHand), handValue.ToUpper(), true); + } + catch + { + Debug.LogError("Unrecognized controller Hand '" + handValue + "'!"); + } + } + return handParsed; + } + + void Update() + { + // Use Unity XR Input when enabled. When using WebVR, updates are performed onControllerUpdate. + if (UnityEngine.XR.XRDevice.isPresent) + { + if (hand == WebVRControllerHand.LEFT) + { + transform.position = UnityEngine.XR.InputTracking.GetLocalPosition(UnityEngine.XR.XRNode.LeftHand); + transform.rotation = UnityEngine.XR.InputTracking.GetLocalRotation(UnityEngine.XR.XRNode.LeftHand); + } + + if (hand == WebVRControllerHand.RIGHT) + { + transform.position = UnityEngine.XR.InputTracking.GetLocalPosition(UnityEngine.XR.XRNode.RightHand); + transform.rotation = UnityEngine.XR.InputTracking.GetLocalRotation(UnityEngine.XR.XRNode.RightHand); + } + } + } + + void OnEnable() + { + WebVRManager.Instance.OnControllerUpdate += onControllerUpdate; + } + + void OnDisabled() { - this.index = index; - this.hand = hand; - this.position = position; - this.rotation = rotation; - this.sitStand = sitStand; - this.gameObject = null; + WebVRManager.Instance.OnControllerUpdate -= onControllerUpdate; } } diff --git a/Assets/WebVR/Scripts/WebVRControllerManager.cs b/Assets/WebVR/Scripts/WebVRControllerManager.cs deleted file mode 100644 index 41520c0..0000000 --- a/Assets/WebVR/Scripts/WebVRControllerManager.cs +++ /dev/null @@ -1,116 +0,0 @@ -using UnityEngine; -using System; -using System.Collections; -using System.Collections.Generic; -using System.Linq; - -public enum WebVRControllerHand { NONE, LEFT, RIGHT }; - -public enum WebVRInputAction -{ - Trigger = 1, - Grip = 2 -} - -public class WebVRControllerManager : MonoBehaviour -{ - public static WebVRControllerManager instance; - - public List controllers = new List(); - - public static WebVRControllerManager Instance - { - get - { - if (instance == null) - { - GameObject go = new GameObject("WebVRControllerManager"); - go.AddComponent(); - } - return instance; - } - } - - void Start() - { - WebVRManager.Instance.OnControllerUpdate += onControllerUpdate; - } - - void Awake() - { - instance = this; - } - - void Update() - { - #if UNITY_EDITOR - // update controllers using Unity XR support when in editor. - WebVRControllerButton[] buttons = new WebVRControllerButton[0]; - onControllerUpdate( - 0, - "left", - UnityEngine.XR.InputTracking.GetLocalPosition(UnityEngine.XR.XRNode.LeftHand), - UnityEngine.XR.InputTracking.GetLocalRotation(UnityEngine.XR.XRNode.LeftHand), - Matrix4x4.identity, buttons); - - onControllerUpdate( - 1, - "right", - UnityEngine.XR.InputTracking.GetLocalPosition(UnityEngine.XR.XRNode.RightHand), - UnityEngine.XR.InputTracking.GetLocalRotation(UnityEngine.XR.XRNode.RightHand), - Matrix4x4.identity, buttons); - #endif - } - - // registers GameObject to controller returning controller. - public WebVRController GetController(GameObject gameObject, Enum h) - { - WebVRController controller = controllers.Where(x => x.gameObject == gameObject).FirstOrDefault(); - - if (controller != null) - return controller; - - WebVRController unbound; - if ((WebVRControllerHand)h == WebVRControllerHand.NONE) - unbound = controllers.Where(x => x.gameObject == null).FirstOrDefault(); - else - unbound = controllers.Where(x => (WebVRControllerHand)x.hand == (WebVRControllerHand)h).FirstOrDefault(); - - if (unbound != null) { - unbound.gameObject = gameObject; - Debug.Log("Binding " + gameObject.name + " to " + unbound.hand); - return unbound; - } - return null; - } - - private void onControllerUpdate( - int index, string h, Vector3 position, Quaternion rotation, Matrix4x4 sitStand, WebVRControllerButton[] b) - { - // add or update controller values. - WebVRController controller = controllers.Where(x => x.index == index).FirstOrDefault(); - - if (controller == null) - { - // convert string to enum - Enum hand; - if (String.IsNullOrEmpty(h)) - hand = WebVRControllerHand.NONE; - else - hand = (WebVRControllerHand) Enum.Parse(typeof(WebVRControllerHand), h.ToUpper(), true); - - Debug.Log("Adding controller, Index: " + index + " Hand: " + hand); - controller = new WebVRController(index, hand, position, rotation, sitStand); - controllers.Add(controller); - } - else - { - controller.position = position; - controller.rotation = rotation; - controller.sitStand = sitStand; - } - - if (b != null) - controller.UpdateButtons(b); - } -} diff --git a/Assets/WebVR/Scripts/WebVRControllerManager.cs.meta b/Assets/WebVR/Scripts/WebVRControllerManager.cs.meta deleted file mode 100644 index 347f474..0000000 --- a/Assets/WebVR/Scripts/WebVRControllerManager.cs.meta +++ /dev/null @@ -1,13 +0,0 @@ -fileFormatVersion: 2 -guid: 4e77d58b91e9148dbb39ab1416b6ce4e -timeCreated: 1523470993 -licenseType: Free -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: From 19826ebbe568d6068e09f1326c45d9eae992f740 Mon Sep 17 00:00:00 2001 From: Casey Yee Date: Wed, 20 Jun 2018 17:12:25 -0700 Subject: [PATCH 02/12] Scriptable object for input mapping --- .../WebVR/Scripts/WebVRControllerInputMap.cs | 19 +++++++++++++++++++ .../Scripts/WebVRControllerInputMap.cs.meta | 11 +++++++++++ 2 files changed, 30 insertions(+) create mode 100644 Assets/WebVR/Scripts/WebVRControllerInputMap.cs create mode 100644 Assets/WebVR/Scripts/WebVRControllerInputMap.cs.meta diff --git a/Assets/WebVR/Scripts/WebVRControllerInputMap.cs b/Assets/WebVR/Scripts/WebVRControllerInputMap.cs new file mode 100644 index 0000000..a99bf52 --- /dev/null +++ b/Assets/WebVR/Scripts/WebVRControllerInputMap.cs @@ -0,0 +1,19 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +[CreateAssetMenu(menuName = "WebVRControllerInputMap")] +public class WebVRControllerInputMap : ScriptableObject { + [Header("WebVR Controller Input Map")] + public List inputs; +} + +[System.Serializable] +public class WebVRControllerInput { + [Tooltip("A meaningful name describing the gesture performed on the controller.")] + public string actionName; + [Tooltip("Button ID from Web Gamepad API.")] + public int gamepadButtonId; + [Tooltip("Button name defined in Unity Input Manager.")] + public string unityInputName; +} \ No newline at end of file diff --git a/Assets/WebVR/Scripts/WebVRControllerInputMap.cs.meta b/Assets/WebVR/Scripts/WebVRControllerInputMap.cs.meta new file mode 100644 index 0000000..77fc3a5 --- /dev/null +++ b/Assets/WebVR/Scripts/WebVRControllerInputMap.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 1e7662275a7474749b33e0ca7828e275 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: From 5eb2886e931178040d8fae8804e73c1ba9d7af89 Mon Sep 17 00:00:00 2001 From: Casey Yee Date: Wed, 20 Jun 2018 17:13:49 -0700 Subject: [PATCH 03/12] Adds input manager settings for XR controller inputs --- ProjectSettings/InputManager.asset | 32 ++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/ProjectSettings/InputManager.asset b/ProjectSettings/InputManager.asset index 17c8f53..f46f5c4 100644 --- a/ProjectSettings/InputManager.asset +++ b/ProjectSettings/InputManager.asset @@ -293,3 +293,35 @@ InputManager: type: 0 axis: 0 joyNum: 0 + - serializedVersion: 3 + m_Name: TriggerLeft + descriptiveName: + descriptiveNegativeName: + negativeButton: + positiveButton: escape + altNegativeButton: + altPositiveButton: joystick button 14 + gravity: 1000 + dead: 0.001 + sensitivity: 1000 + snap: 0 + invert: 0 + type: 0 + axis: 0 + joyNum: 0 + - serializedVersion: 3 + m_Name: TriggerRight + descriptiveName: + descriptiveNegativeName: + negativeButton: + positiveButton: escape + altNegativeButton: + altPositiveButton: joystick button 15 + gravity: 1000 + dead: 0.001 + sensitivity: 1000 + snap: 0 + invert: 0 + type: 0 + axis: 0 + joyNum: 0 From fb70136eba521b780ee23e458e84d1b2c76ddce8 Mon Sep 17 00:00:00 2001 From: Casey Yee Date: Wed, 20 Jun 2018 17:16:09 -0700 Subject: [PATCH 04/12] Adds Left and Right controller input maps --- Assets/WebVR/Scripts/LeftControllerMap.asset | 20 +++++++++++++++++++ .../Scripts/LeftControllerMap.asset.meta | 8 ++++++++ Assets/WebVR/Scripts/RightControllerMap.asset | 20 +++++++++++++++++++ .../Scripts/RightControllerMap.asset.meta | 8 ++++++++ 4 files changed, 56 insertions(+) create mode 100644 Assets/WebVR/Scripts/LeftControllerMap.asset create mode 100644 Assets/WebVR/Scripts/LeftControllerMap.asset.meta create mode 100644 Assets/WebVR/Scripts/RightControllerMap.asset create mode 100644 Assets/WebVR/Scripts/RightControllerMap.asset.meta diff --git a/Assets/WebVR/Scripts/LeftControllerMap.asset b/Assets/WebVR/Scripts/LeftControllerMap.asset new file mode 100644 index 0000000..11493a8 --- /dev/null +++ b/Assets/WebVR/Scripts/LeftControllerMap.asset @@ -0,0 +1,20 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1e7662275a7474749b33e0ca7828e275, type: 3} + m_Name: LeftControllerMap + m_EditorClassIdentifier: + inputs: + - actionName: Trigger + gamepadButtonId: 1 + unityInputName: TriggerLeft + - actionName: Grip + gamepadButtonId: 2 + unityInputName: TriggerLeft diff --git a/Assets/WebVR/Scripts/LeftControllerMap.asset.meta b/Assets/WebVR/Scripts/LeftControllerMap.asset.meta new file mode 100644 index 0000000..1f8cfac --- /dev/null +++ b/Assets/WebVR/Scripts/LeftControllerMap.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 26f07d6c5efe68c4392fb6a9e5f7e7e4 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/WebVR/Scripts/RightControllerMap.asset b/Assets/WebVR/Scripts/RightControllerMap.asset new file mode 100644 index 0000000..c6c4af3 --- /dev/null +++ b/Assets/WebVR/Scripts/RightControllerMap.asset @@ -0,0 +1,20 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1e7662275a7474749b33e0ca7828e275, type: 3} + m_Name: RightControllerMap + m_EditorClassIdentifier: + inputs: + - actionName: Trigger + gamepadButtonId: 1 + unityInputName: TriggerRight + - actionName: Grip + gamepadButtonId: 2 + unityInputName: TriggerRight diff --git a/Assets/WebVR/Scripts/RightControllerMap.asset.meta b/Assets/WebVR/Scripts/RightControllerMap.asset.meta new file mode 100644 index 0000000..97f8a8c --- /dev/null +++ b/Assets/WebVR/Scripts/RightControllerMap.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 510be64d3ed4d3e4d892d9b4db758026 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: From 636fcbaa580570effdc4588dd78607ed5c7bb5b9 Mon Sep 17 00:00:00 2001 From: Casey Yee Date: Fri, 22 Jun 2018 16:15:03 -0700 Subject: [PATCH 05/12] Adds support for controller axis --- Assets/WebGLTemplates/WebVR/webvr.js | 83 +++++++------ Assets/WebVR/Scripts/ControllerInteraction.cs | 4 + Assets/WebVR/Scripts/WebVRController.cs | 115 ++++++++++++------ .../WebVR/Scripts/WebVRControllerInputMap.cs | 26 ++-- Assets/WebVR/Scripts/WebVRManager.cs | 6 +- 5 files changed, 153 insertions(+), 81 deletions(-) diff --git a/Assets/WebGLTemplates/WebVR/webvr.js b/Assets/WebGLTemplates/WebVR/webvr.js index 1219f1f..fc0f89c 100644 --- a/Assets/WebGLTemplates/WebVR/webvr.js +++ b/Assets/WebGLTemplates/WebVR/webvr.js @@ -147,6 +147,53 @@ }); } + function getVrGamepads(gamepads) { + var vrGamepads = [] + for (var i = 0; i < gamepads.length; ++i) { + var gamepad = gamepads[i]; + if (gamepad && (gamepad.pose || gamepad.displayId)) { + if (gamepad.pose.position && gamepad.pose.orientation) { + // flips gamepad axis to work with Unity. + var position = gamepad.pose.position; + position[2] *= -1; + var orientation = gamepad.pose.orientation; + orientation[0] *= -1; + orientation[1] *= -1; + + vrGamepads.push({ + index: gamepad.index, + hand: gamepad.hand, + buttons: getGamepadButtons(gamepad), + axes: getGamepadAxes(gamepad), + orientation: Array.from(orientation), + position: Array.from(position) + }); + } + } + } + return vrGamepads; + } + + function getGamepadButtons(gamepad) { + var buttons = []; + for (var i = 0; i < gamepad.buttons.length; i++) { + buttons.push({ + pressed: gamepad.buttons[i].pressed, + touched: gamepad.buttons[i].touched, + value: gamepad.buttons[i].value + }); + } + return buttons; + } + + function getGamepadAxes(gamepad) { + var axes = []; + for (var i = 0; i < gamepad.axes.length; i++) { + axes.push(gamepad.axes[i]); + } + return axes; + } + function onAnimate () { if (!vrDisplay && gameInstance.vrDisplay) { frameData = new VRFrameData(); @@ -201,47 +248,13 @@ } mat4.transpose(sitStand, sitStand); - // gamepads - gamepads = navigator.getGamepads(); - vrGamepads = []; - for (var i = 0; i < gamepads.length; ++i) { - var gamepad = gamepads[i]; - if (gamepad && (gamepad.pose || gamepad.displayId)) { - if (gamepad.pose.position && gamepad.pose.orientation) { - // flips gamepad axis to work with Unity. - var position = gamepad.pose.position; - position[2] *= -1; - var orientation = gamepad.pose.orientation; - orientation[0] *= -1; - orientation[1] *= -1; - - var buttons = []; - for (var j = 0; j < gamepad.buttons.length; j++) { - buttons.push({ - pressed: gamepad.buttons[j].pressed, - touched: gamepad.buttons[j].touched, - value: gamepad.buttons[j].value - }); - } - - vrGamepads.push({ - index: gamepad.index, - hand: gamepad.hand, - buttons: buttons, - orientation: Array.from(orientation), - position: Array.from(position) - }); - } - } - } - var vrData = { leftProjectionMatrix: Array.from(leftProjectionMatrix), rightProjectionMatrix: Array.from(rightProjectionMatrix), leftViewMatrix: Array.from(leftViewMatrix), rightViewMatrix: Array.from(rightViewMatrix), sitStand: Array.from(sitStand), - controllers: vrGamepads + controllers: getVrGamepads(navigator.getGamepads()) }; gameInstance.SendMessage('WebVRCameraSet', 'OnWebVRData', JSON.stringify(vrData)); diff --git a/Assets/WebVR/Scripts/ControllerInteraction.cs b/Assets/WebVR/Scripts/ControllerInteraction.cs index 1412768..e9fb200 100644 --- a/Assets/WebVR/Scripts/ControllerInteraction.cs +++ b/Assets/WebVR/Scripts/ControllerInteraction.cs @@ -28,6 +28,10 @@ void Update() { Drop(); } + + if (controller.GetAxis("Grip") > 0.5f) { + Debug.Log("Gripping!" + controller.hand + " " + controller.GetAxis("Grip")); + } } void OnTriggerEnter(Collider other) diff --git a/Assets/WebVR/Scripts/WebVRController.cs b/Assets/WebVR/Scripts/WebVRController.cs index 072907e..fce85f8 100644 --- a/Assets/WebVR/Scripts/WebVRController.cs +++ b/Assets/WebVR/Scripts/WebVRController.cs @@ -10,8 +10,16 @@ public enum WebVRControllerHand { NONE, LEFT, RIGHT }; public class WebVRControllerButton { public bool pressed; + public bool prevPressedState; public bool touched; public float value; + + public WebVRControllerButton(bool isPressed, float buttonValue) + { + pressed = isPressed; + prevPressedState = false; + value = buttonValue; + } } public class WebVRController : MonoBehaviour @@ -28,34 +36,78 @@ public class WebVRController : MonoBehaviour public Quaternion rotation; [HideInInspector] public Matrix4x4 sitStand; - [HideInInspector] - public WebVRControllerButton[] buttons = null; + private float[] axes; + + private Dictionary buttonStates = new Dictionary(); - private Dictionary buttonStates = new Dictionary(); - - public void UpdateButtons(WebVRControllerButton[] buttons) + private void UpdateButtons(WebVRControllerButton[] buttons) { for (int i = 0; i < buttons.Length; i++) { WebVRControllerButton button = buttons[i]; foreach (WebVRControllerInput input in inputMap.inputs) { - if (input.gamepadButtonId == i) + if (input.gamepadId == i) { if (buttonStates.ContainsKey(input.actionName)) - buttonStates[input.actionName][0] = button.pressed; + { + buttonStates[input.actionName].pressed = button.pressed; + buttonStates[input.actionName].value = button.value; + } + else + buttonStates.Add(input.actionName, new WebVRControllerButton(button.pressed, button.value)); + } + } + } + } + + public float GetAxis(string action) + { + for (var i = 0; i < inputMap.inputs.Count; i++) + { + WebVRControllerInput input = inputMap.inputs[i]; + if (action == input.actionName) + { + if (UnityEngine.XR.XRDevice.isPresent && !input.unityInputIsButton) + { + return Input.GetAxis(input.unityInputName); + } + else + { + if (input.gamepadIsButton) + { + if (!buttonStates.ContainsKey(action)) + return 0; + return buttonStates[action].value; + } else - buttonStates.Add(input.actionName, new bool[]{ button.pressed, false }); + return axes[i]; } } } + //Debug.LogError("No Axes found for '" + action + "' in Input Map!"); + return 0; } public bool GetButton(string action) { if (!buttonStates.ContainsKey(action)) return false; - return buttonStates[action][0]; + return buttonStates[action].pressed; + } + + private bool GetPastButtonState(string action) + { + if (!buttonStates.ContainsKey(action)) + return false; + return buttonStates[action].prevPressedState; + } + + private void SetPastButtonState(string action, bool isPressed) + { + if (!buttonStates.ContainsKey(action)) + return; + buttonStates[action].prevPressedState = isPressed; } public bool GetButtonDown(string action) @@ -65,25 +117,18 @@ public bool GetButtonDown(string action) { foreach(WebVRControllerInput input in inputMap.inputs) { - if (action == input.actionName) + if (action == input.actionName && input.unityInputIsButton) return Input.GetButtonDown(input.unityInputName); } return false; } - if (!buttonStates.ContainsKey(action)) - return false; - - bool isDown = false; - bool buttonPressed = buttonStates[action][0]; - bool prevButtonState = buttonStates[action][1]; - - if (buttonPressed && prevButtonState != buttonPressed) + if (GetButton(action) && GetPastButtonState(action) != GetButton(action)) { - buttonStates[action][1] = true; - isDown = true; + SetPastButtonState(action, true); + return true; } - return isDown; + return false; } public bool GetButtonUp(string action) @@ -93,28 +138,22 @@ public bool GetButtonUp(string action) { foreach(WebVRControllerInput input in inputMap.inputs) { - if (action == input.actionName) + if (action == input.actionName && input.unityInputIsButton) return Input.GetButtonUp(input.unityInputName); } return false; } - if (!buttonStates.ContainsKey(action)) - return false; - - bool isUp = false; - bool buttonPressed = buttonStates[action][0]; - bool prevButtonState = buttonStates[action][1]; - - if (!buttonPressed && prevButtonState) { - buttonStates[action][1] = false; - isUp = true; + if (!GetButton(action) && GetPastButtonState(action)) + { + SetPastButtonState(action, false); + return true; } - return isUp; + return false; } private void onControllerUpdate( - int index, string handValue, Vector3 position, Quaternion rotation, Matrix4x4 sitStand, WebVRControllerButton[] buttonValues) + int index, string handValue, Vector3 position, Quaternion rotation, Matrix4x4 sitStand, WebVRControllerButton[] buttonValues, float[] axesValues) { if (handFromString(handValue) == hand) { @@ -127,10 +166,11 @@ private void onControllerUpdate( transform.position = sitStand.MultiplyPoint(position); UpdateButtons(buttonValues); + axes = axesValues; } } -private WebVRControllerHand handFromString(string handValue) + private WebVRControllerHand handFromString(string handValue) { WebVRControllerHand handParsed = WebVRControllerHand.NONE; @@ -168,6 +208,11 @@ void Update() void OnEnable() { + if (inputMap == null) + { + Debug.LogError("A Input Map must be assigned to WebVRController!"); + return; + } WebVRManager.Instance.OnControllerUpdate += onControllerUpdate; } diff --git a/Assets/WebVR/Scripts/WebVRControllerInputMap.cs b/Assets/WebVR/Scripts/WebVRControllerInputMap.cs index a99bf52..99ea067 100644 --- a/Assets/WebVR/Scripts/WebVRControllerInputMap.cs +++ b/Assets/WebVR/Scripts/WebVRControllerInputMap.cs @@ -4,16 +4,24 @@ [CreateAssetMenu(menuName = "WebVRControllerInputMap")] public class WebVRControllerInputMap : ScriptableObject { - [Header("WebVR Controller Input Map")] - public List inputs; + [Header("WebVR Controller Input Map")] + public List inputs; } [System.Serializable] public class WebVRControllerInput { - [Tooltip("A meaningful name describing the gesture performed on the controller.")] - public string actionName; - [Tooltip("Button ID from Web Gamepad API.")] - public int gamepadButtonId; - [Tooltip("Button name defined in Unity Input Manager.")] - public string unityInputName; -} \ No newline at end of file + [Tooltip("A meaningful name describing the gesture performed on the controller.")] + public string actionName; + + [Header("Web Gamepad API configuration")] + [Tooltip("Button or axes ID from Web Gamepad API.")] + public int gamepadId; + [Tooltip("Whether gesture derives its values from a Gamepad API button.")] + public bool gamepadIsButton; + + [Header("Unity Input Manager configuration")] + [Tooltip("button name defined in Unity Input Manager.")] + public string unityInputName; + [Tooltip("Whether gesture derives its values from a Unity button input.")] + public bool unityInputIsButton; +} diff --git a/Assets/WebVR/Scripts/WebVRManager.cs b/Assets/WebVR/Scripts/WebVRManager.cs index 2d8a06d..9336f32 100644 --- a/Assets/WebVR/Scripts/WebVRManager.cs +++ b/Assets/WebVR/Scripts/WebVRManager.cs @@ -39,7 +39,8 @@ public delegate void ControllerUpdate(int index, Vector3 position, Quaternion rotation, Matrix4x4 sitStand, - WebVRControllerButton[] buttons); + WebVRControllerButton[] buttons, + float[] axes); public event ControllerUpdate OnControllerUpdate; public static WebVRManager Instance { @@ -102,7 +103,7 @@ public void OnWebVRData (string jsonString) Quaternion rotation = new Quaternion (controllerData.orientation [0], controllerData.orientation [1], controllerData.orientation [2], controllerData.orientation [3]); if (OnControllerUpdate != null) - OnControllerUpdate(controllerData.index, controllerData.hand, position, rotation, sitStand, controllerData.buttons); + OnControllerUpdate(controllerData.index, controllerData.hand, position, rotation, sitStand, controllerData.buttons, controllerData.axes); } } } @@ -206,6 +207,7 @@ private class WebVRControllerData public string hand = null; public float[] orientation = null; public float[] position = null; + public float[] axes = null; public WebVRControllerButton[] buttons = new WebVRControllerButton[0]; } From 4a87249fae6d4fff9d425e6c72cd311eaa2f4f23 Mon Sep 17 00:00:00 2001 From: Casey Yee Date: Fri, 22 Jun 2018 16:16:36 -0700 Subject: [PATCH 06/12] Updates controller map assets --- Assets/WebVR/Scripts/LeftControllerMap.asset | 10 +++++++--- Assets/WebVR/Scripts/LeftControllerMap.asset.meta | 2 +- Assets/WebVR/Scripts/RightControllerMap.asset | 10 +++++++--- Assets/WebVR/Scripts/RightControllerMap.asset.meta | 2 +- 4 files changed, 16 insertions(+), 8 deletions(-) diff --git a/Assets/WebVR/Scripts/LeftControllerMap.asset b/Assets/WebVR/Scripts/LeftControllerMap.asset index 11493a8..337def2 100644 --- a/Assets/WebVR/Scripts/LeftControllerMap.asset +++ b/Assets/WebVR/Scripts/LeftControllerMap.asset @@ -13,8 +13,12 @@ MonoBehaviour: m_EditorClassIdentifier: inputs: - actionName: Trigger - gamepadButtonId: 1 + gamepadId: 1 + gamepadIsButton: 1 unityInputName: TriggerLeft + unityInputIsButton: 1 - actionName: Grip - gamepadButtonId: 2 - unityInputName: TriggerLeft + gamepadId: 2 + gamepadIsButton: 1 + unityInputName: GripLeft + unityInputIsButton: 0 diff --git a/Assets/WebVR/Scripts/LeftControllerMap.asset.meta b/Assets/WebVR/Scripts/LeftControllerMap.asset.meta index 1f8cfac..8cbd488 100644 --- a/Assets/WebVR/Scripts/LeftControllerMap.asset.meta +++ b/Assets/WebVR/Scripts/LeftControllerMap.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 26f07d6c5efe68c4392fb6a9e5f7e7e4 +guid: b249a0801fba0f74198588a3ecb37bbe NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/Assets/WebVR/Scripts/RightControllerMap.asset b/Assets/WebVR/Scripts/RightControllerMap.asset index c6c4af3..fc2921f 100644 --- a/Assets/WebVR/Scripts/RightControllerMap.asset +++ b/Assets/WebVR/Scripts/RightControllerMap.asset @@ -13,8 +13,12 @@ MonoBehaviour: m_EditorClassIdentifier: inputs: - actionName: Trigger - gamepadButtonId: 1 + gamepadId: 1 + gamepadIsButton: 1 unityInputName: TriggerRight + unityInputIsButton: 1 - actionName: Grip - gamepadButtonId: 2 - unityInputName: TriggerRight + gamepadId: 2 + gamepadIsButton: 1 + unityInputName: GripRight + unityInputIsButton: 0 diff --git a/Assets/WebVR/Scripts/RightControllerMap.asset.meta b/Assets/WebVR/Scripts/RightControllerMap.asset.meta index 97f8a8c..7532e91 100644 --- a/Assets/WebVR/Scripts/RightControllerMap.asset.meta +++ b/Assets/WebVR/Scripts/RightControllerMap.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 510be64d3ed4d3e4d892d9b4db758026 +guid: a760722b59f73e94287ddd9ffc44440f NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 From b7202e985de972f84f3e5586fd69e3e9f2d6dfa5 Mon Sep 17 00:00:00 2001 From: Casey Yee Date: Fri, 22 Jun 2018 16:18:47 -0700 Subject: [PATCH 07/12] Updates Input Manager settings --- ProjectSettings/InputManager.asset | 40 +++++++++++++++++++++++++++--- 1 file changed, 36 insertions(+), 4 deletions(-) diff --git a/ProjectSettings/InputManager.asset b/ProjectSettings/InputManager.asset index f46f5c4..b96a44a 100644 --- a/ProjectSettings/InputManager.asset +++ b/ProjectSettings/InputManager.asset @@ -298,9 +298,9 @@ InputManager: descriptiveName: descriptiveNegativeName: negativeButton: - positiveButton: escape + positiveButton: joystick button 14 altNegativeButton: - altPositiveButton: joystick button 14 + altPositiveButton: gravity: 1000 dead: 0.001 sensitivity: 1000 @@ -314,9 +314,9 @@ InputManager: descriptiveName: descriptiveNegativeName: negativeButton: - positiveButton: escape + positiveButton: joystick button 15 altNegativeButton: - altPositiveButton: joystick button 15 + altPositiveButton: gravity: 1000 dead: 0.001 sensitivity: 1000 @@ -325,3 +325,35 @@ InputManager: type: 0 axis: 0 joyNum: 0 + - serializedVersion: 3 + m_Name: GripLeft + descriptiveName: + descriptiveNegativeName: + negativeButton: + positiveButton: + altNegativeButton: + altPositiveButton: + gravity: 1000 + dead: 0.001 + sensitivity: 1000 + snap: 0 + invert: 0 + type: 2 + axis: 10 + joyNum: 0 + - serializedVersion: 3 + m_Name: GripRight + descriptiveName: + descriptiveNegativeName: + negativeButton: + positiveButton: + altNegativeButton: + altPositiveButton: + gravity: 1000 + dead: 0.001 + sensitivity: 1000 + snap: 0 + invert: 0 + type: 2 + axis: 11 + joyNum: 0 From 0fefd4087608e305a2727494eea4265b574ed114 Mon Sep 17 00:00:00 2001 From: Casey Yee Date: Tue, 26 Jun 2018 15:55:01 -0700 Subject: [PATCH 08/12] Adds ability to use axis as buttons --- Assets/WebVR/Scripts/ControllerInteraction.cs | 21 +++++---- Assets/WebVR/Scripts/WebVRController.cs | 46 ++++++++++++++----- 2 files changed, 46 insertions(+), 21 deletions(-) diff --git a/Assets/WebVR/Scripts/ControllerInteraction.cs b/Assets/WebVR/Scripts/ControllerInteraction.cs index e9fb200..c544714 100644 --- a/Assets/WebVR/Scripts/ControllerInteraction.cs +++ b/Assets/WebVR/Scripts/ControllerInteraction.cs @@ -10,29 +10,32 @@ public class ControllerInteraction : MonoBehaviour private Rigidbody currentRigidBody = null; private List contactRigidBodies = new List (); + private Animator anim; + void Awake() { attachJoint = GetComponent (); } + void Start() + { + anim = gameObject.GetComponent(); + } + void Update() { WebVRController controller = gameObject.GetComponent(); - if (controller.GetButtonDown("Trigger")) - { + float normalizedTime = controller.GetButton("Trigger") ? 1 : controller.GetAxis("Grip"); + + if (controller.GetButtonDown("Trigger") || controller.GetButtonDown("Grip")) Pickup(); - } - if (controller.GetButtonUp("Trigger")) - { + if (controller.GetButtonUp("Trigger") || controller.GetButtonUp("Grip")) Drop(); - } - if (controller.GetAxis("Grip") > 0.5f) { - Debug.Log("Gripping!" + controller.hand + " " + controller.GetAxis("Grip")); + anim.Play("Take", -1, normalizedTime); } - } void OnTriggerEnter(Collider other) { diff --git a/Assets/WebVR/Scripts/WebVRController.cs b/Assets/WebVR/Scripts/WebVRController.cs index fce85f8..4962ca1 100644 --- a/Assets/WebVR/Scripts/WebVRController.cs +++ b/Assets/WebVR/Scripts/WebVRController.cs @@ -40,6 +40,7 @@ public class WebVRController : MonoBehaviour private Dictionary buttonStates = new Dictionary(); + // Updates button states from Web gamepad API. private void UpdateButtons(WebVRControllerButton[] buttons) { for (int i = 0; i < buttons.Length; i++) @@ -48,15 +49,7 @@ private void UpdateButtons(WebVRControllerButton[] buttons) foreach (WebVRControllerInput input in inputMap.inputs) { if (input.gamepadId == i) - { - if (buttonStates.ContainsKey(input.actionName)) - { - buttonStates[input.actionName].pressed = button.pressed; - buttonStates[input.actionName].value = button.value; - } - else - buttonStates.Add(input.actionName, new WebVRControllerButton(button.pressed, button.value)); - } + SetButtonState(input.actionName, button.pressed, button.value); } } } @@ -91,6 +84,15 @@ public float GetAxis(string action) public bool GetButton(string action) { + if (UnityEngine.XR.XRDevice.isPresent) + { + foreach(WebVRControllerInput input in inputMap.inputs) + { + if (action == input.actionName && input.unityInputIsButton) + return Input.GetButton(input.unityInputName); + } + } + if (!buttonStates.ContainsKey(action)) return false; return buttonStates[action].pressed; @@ -103,6 +105,17 @@ private bool GetPastButtonState(string action) return buttonStates[action].prevPressedState; } + private void SetButtonState(string action, bool isPressed, float value) + { + if (buttonStates.ContainsKey(action)) + { + buttonStates[action].pressed = isPressed; + buttonStates[action].value = value; + } + else + buttonStates.Add(action, new WebVRControllerButton(isPressed, value)); + } + private void SetPastButtonState(string action, bool isPressed) { if (!buttonStates.ContainsKey(action)) @@ -120,10 +133,9 @@ public bool GetButtonDown(string action) if (action == input.actionName && input.unityInputIsButton) return Input.GetButtonDown(input.unityInputName); } - return false; } - if (GetButton(action) && GetPastButtonState(action) != GetButton(action)) + if (GetButton(action) && !GetPastButtonState(action)) { SetPastButtonState(action, true); return true; @@ -141,7 +153,6 @@ public bool GetButtonUp(string action) if (action == input.actionName && input.unityInputIsButton) return Input.GetButtonUp(input.unityInputName); } - return false; } if (!GetButton(action) && GetPastButtonState(action)) @@ -203,6 +214,17 @@ void Update() transform.position = UnityEngine.XR.InputTracking.GetLocalPosition(UnityEngine.XR.XRNode.RightHand); transform.rotation = UnityEngine.XR.InputTracking.GetLocalRotation(UnityEngine.XR.XRNode.RightHand); } + + foreach(WebVRControllerInput input in inputMap.inputs) + { + if (!input.unityInputIsButton) + { + if (Input.GetAxis(input.unityInputName) != 0) + SetButtonState(input.actionName, true, Input.GetAxis(input.unityInputName)); + if (Input.GetAxis(input.unityInputName) < 1) + SetButtonState(input.actionName, false, Input.GetAxis(input.unityInputName)); + } + } } } From 0e6daf28b9a23dfbd352dfe14f81ce71610395f4 Mon Sep 17 00:00:00 2001 From: Casey Yee Date: Tue, 26 Jun 2018 15:56:52 -0700 Subject: [PATCH 09/12] Use axis rather than button for Trigger gesture --- Assets/WebVR/Scripts/LeftControllerMap.asset | 2 +- Assets/WebVR/Scripts/RightControllerMap.asset | 2 +- ProjectSettings/InputManager.asset | 12 ++++++------ 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Assets/WebVR/Scripts/LeftControllerMap.asset b/Assets/WebVR/Scripts/LeftControllerMap.asset index 337def2..107bcc3 100644 --- a/Assets/WebVR/Scripts/LeftControllerMap.asset +++ b/Assets/WebVR/Scripts/LeftControllerMap.asset @@ -16,7 +16,7 @@ MonoBehaviour: gamepadId: 1 gamepadIsButton: 1 unityInputName: TriggerLeft - unityInputIsButton: 1 + unityInputIsButton: 0 - actionName: Grip gamepadId: 2 gamepadIsButton: 1 diff --git a/Assets/WebVR/Scripts/RightControllerMap.asset b/Assets/WebVR/Scripts/RightControllerMap.asset index fc2921f..f5f9569 100644 --- a/Assets/WebVR/Scripts/RightControllerMap.asset +++ b/Assets/WebVR/Scripts/RightControllerMap.asset @@ -16,7 +16,7 @@ MonoBehaviour: gamepadId: 1 gamepadIsButton: 1 unityInputName: TriggerRight - unityInputIsButton: 1 + unityInputIsButton: 0 - actionName: Grip gamepadId: 2 gamepadIsButton: 1 diff --git a/ProjectSettings/InputManager.asset b/ProjectSettings/InputManager.asset index b96a44a..ee23731 100644 --- a/ProjectSettings/InputManager.asset +++ b/ProjectSettings/InputManager.asset @@ -298,7 +298,7 @@ InputManager: descriptiveName: descriptiveNegativeName: negativeButton: - positiveButton: joystick button 14 + positiveButton: altNegativeButton: altPositiveButton: gravity: 1000 @@ -306,15 +306,15 @@ InputManager: sensitivity: 1000 snap: 0 invert: 0 - type: 0 - axis: 0 + type: 2 + axis: 8 joyNum: 0 - serializedVersion: 3 m_Name: TriggerRight descriptiveName: descriptiveNegativeName: negativeButton: - positiveButton: joystick button 15 + positiveButton: altNegativeButton: altPositiveButton: gravity: 1000 @@ -322,8 +322,8 @@ InputManager: sensitivity: 1000 snap: 0 invert: 0 - type: 0 - axis: 0 + type: 2 + axis: 9 joyNum: 0 - serializedVersion: 3 m_Name: GripLeft From e4a8e5135b8fb9b76233e66eebb7182d313fc1e5 Mon Sep 17 00:00:00 2001 From: Casey Yee Date: Tue, 26 Jun 2018 16:07:36 -0700 Subject: [PATCH 10/12] Adds animation and controllers to hands --- Assets/WebVR/Models/TakeL.controller | 69 +++++++++++++++++++++++ Assets/WebVR/Models/TakeL.controller.meta | 8 +++ Assets/WebVR/Models/TakeR.controller | 69 +++++++++++++++++++++++ Assets/WebVR/Models/TakeR.controller.meta | 8 +++ Assets/WebVR/Models/handL.dae.meta | 33 ++++++++++- Assets/WebVR/Models/handR.dae.meta | 33 ++++++++++- 6 files changed, 214 insertions(+), 6 deletions(-) create mode 100644 Assets/WebVR/Models/TakeL.controller create mode 100644 Assets/WebVR/Models/TakeL.controller.meta create mode 100644 Assets/WebVR/Models/TakeR.controller create mode 100644 Assets/WebVR/Models/TakeR.controller.meta diff --git a/Assets/WebVR/Models/TakeL.controller b/Assets/WebVR/Models/TakeL.controller new file mode 100644 index 0000000..0264cc1 --- /dev/null +++ b/Assets/WebVR/Models/TakeL.controller @@ -0,0 +1,69 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: TakeL + serializedVersion: 5 + m_AnimatorParameters: [] + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: 1107335396987614582} + m_Mask: {fileID: 0} + m_Motions: [] + m_Behaviours: [] + m_BlendingMode: 0 + m_SyncedLayerIndex: -1 + m_DefaultWeight: 0 + m_IKPass: 0 + m_SyncedLayerAffectsTiming: 0 + m_Controller: {fileID: 9100000} +--- !u!1102 &1102756554104886100 +AnimatorState: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: Take + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: 013217fcf4bba4f3380d9159876fa8ea, type: 3} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1107 &1107335396987614582 +AnimatorStateMachine: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: Base Layer + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: 1102756554104886100} + m_Position: {x: 312, y: 24, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 50, y: 20, z: 0} + m_EntryPosition: {x: 50, y: 120, z: 0} + m_ExitPosition: {x: 312, y: 132, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: 1102756554104886100} diff --git a/Assets/WebVR/Models/TakeL.controller.meta b/Assets/WebVR/Models/TakeL.controller.meta new file mode 100644 index 0000000..64712d8 --- /dev/null +++ b/Assets/WebVR/Models/TakeL.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b2216e835b0bdf54ea15eddd311bf60f +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/WebVR/Models/TakeR.controller b/Assets/WebVR/Models/TakeR.controller new file mode 100644 index 0000000..05212e4 --- /dev/null +++ b/Assets/WebVR/Models/TakeR.controller @@ -0,0 +1,69 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: TakeR + serializedVersion: 5 + m_AnimatorParameters: [] + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: 1107335396987614582} + m_Mask: {fileID: 0} + m_Motions: [] + m_Behaviours: [] + m_BlendingMode: 0 + m_SyncedLayerIndex: -1 + m_DefaultWeight: 0 + m_IKPass: 0 + m_SyncedLayerAffectsTiming: 0 + m_Controller: {fileID: 9100000} +--- !u!1102 &1102869512511796832 +AnimatorState: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: Take + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: c99aacc3accab4fdaadab5e3ea13b9c7, type: 3} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1107 &1107335396987614582 +AnimatorStateMachine: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: Base Layer + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: 1102869512511796832} + m_Position: {x: 288, y: 24, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 50, y: 20, z: 0} + m_EntryPosition: {x: 50, y: 120, z: 0} + m_ExitPosition: {x: 312, y: 132, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: 1102869512511796832} diff --git a/Assets/WebVR/Models/TakeR.controller.meta b/Assets/WebVR/Models/TakeR.controller.meta new file mode 100644 index 0000000..e7b3cff --- /dev/null +++ b/Assets/WebVR/Models/TakeR.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 7a78fb7b47e7d9743ae217df5ba993db +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/WebVR/Models/handL.dae.meta b/Assets/WebVR/Models/handL.dae.meta index 8675fd9..b4c65d5 100644 --- a/Assets/WebVR/Models/handL.dae.meta +++ b/Assets/WebVR/Models/handL.dae.meta @@ -1,7 +1,5 @@ fileFormatVersion: 2 guid: 013217fcf4bba4f3380d9159876fa8ea -timeCreated: 1516842000 -licenseType: Free ModelImporter: serializedVersion: 22 fileIDToRecycleName: @@ -75,6 +73,7 @@ ModelImporter: animationRetargetingWarnings: animationDoRetargetingWarnings: 0 importAnimatedCustomProperties: 0 + importConstraints: 0 animationCompression: 1 animationRotationError: 0.5 animationPositionError: 0.5 @@ -82,7 +81,35 @@ ModelImporter: animationWrapMode: 0 extraExposedTransformPaths: [] extraUserProperties: [] - clipAnimations: [] + clipAnimations: + - serializedVersion: 16 + name: Take 001 + takeName: Take 001 + firstFrame: 1 + lastFrame: 8 + wrapMode: 0 + orientationOffsetY: 0 + level: 0 + cycleOffset: 0 + loop: 0 + hasAdditiveReferencePose: 0 + loopTime: 0 + loopBlend: 0 + loopBlendOrientation: 0 + loopBlendPositionY: 0 + loopBlendPositionXZ: 0 + keepOriginalOrientation: 0 + keepOriginalPositionY: 1 + keepOriginalPositionXZ: 0 + heightFromFeet: 0 + mirror: 0 + bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000 + curves: [] + events: [] + transformMask: [] + maskType: 3 + maskSource: {instanceID: 0} + additiveReferencePoseFrame: 0 isReadable: 1 meshes: lODScreenPercentages: [] diff --git a/Assets/WebVR/Models/handR.dae.meta b/Assets/WebVR/Models/handR.dae.meta index c5be244..c3a98ba 100644 --- a/Assets/WebVR/Models/handR.dae.meta +++ b/Assets/WebVR/Models/handR.dae.meta @@ -1,7 +1,5 @@ fileFormatVersion: 2 guid: c99aacc3accab4fdaadab5e3ea13b9c7 -timeCreated: 1516842000 -licenseType: Free ModelImporter: serializedVersion: 22 fileIDToRecycleName: @@ -75,6 +73,7 @@ ModelImporter: animationRetargetingWarnings: animationDoRetargetingWarnings: 0 importAnimatedCustomProperties: 0 + importConstraints: 0 animationCompression: 1 animationRotationError: 0.5 animationPositionError: 0.5 @@ -82,7 +81,35 @@ ModelImporter: animationWrapMode: 0 extraExposedTransformPaths: [] extraUserProperties: [] - clipAnimations: [] + clipAnimations: + - serializedVersion: 16 + name: Take 001 + takeName: Take 001 + firstFrame: 1 + lastFrame: 8 + wrapMode: 0 + orientationOffsetY: 0 + level: 0 + cycleOffset: 0 + loop: 0 + hasAdditiveReferencePose: 0 + loopTime: 0 + loopBlend: 0 + loopBlendOrientation: 0 + loopBlendPositionY: 0 + loopBlendPositionXZ: 0 + keepOriginalOrientation: 0 + keepOriginalPositionY: 1 + keepOriginalPositionXZ: 0 + heightFromFeet: 0 + mirror: 0 + bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000 + curves: [] + events: [] + transformMask: [] + maskType: 3 + maskSource: {instanceID: 0} + additiveReferencePoseFrame: 0 isReadable: 1 meshes: lODScreenPercentages: [] From 9042bc2d94e5d3dec95bd6672060db606595466a Mon Sep 17 00:00:00 2001 From: Casey Yee Date: Wed, 20 Jun 2018 17:17:14 -0700 Subject: [PATCH 11/12] Updates prefab --- Assets/WebVR/Prefabs/WebVRCameraSet.prefab | 115 ++++++++++++++---- .../WebVR/Prefabs/WebVRCameraSet.prefab.meta | 2 +- 2 files changed, 94 insertions(+), 23 deletions(-) diff --git a/Assets/WebVR/Prefabs/WebVRCameraSet.prefab b/Assets/WebVR/Prefabs/WebVRCameraSet.prefab index 2bb40ae..915308d 100644 --- a/Assets/WebVR/Prefabs/WebVRCameraSet.prefab +++ b/Assets/WebVR/Prefabs/WebVRCameraSet.prefab @@ -388,8 +388,8 @@ GameObject: serializedVersion: 5 m_Component: - component: {fileID: 4545079059221816} - - component: {fileID: 114505210183185788} - component: {fileID: 81134526380146952} + - component: {fileID: 114038308936181916} m_Layer: 0 m_Name: WebVRCameraSet m_TagString: Untagged @@ -511,10 +511,11 @@ GameObject: serializedVersion: 5 m_Component: - component: {fileID: 4427160273819458} - - component: {fileID: 95292425453911886} - component: {fileID: 54027100335586508} - component: {fileID: 138596338900119798} + - component: {fileID: 95292425453911886} - component: {fileID: 135139238002636258} + - component: {fileID: 114128207473628304} - component: {fileID: 114589835210473740} m_Layer: 0 m_Name: handL @@ -669,11 +670,12 @@ GameObject: serializedVersion: 5 m_Component: - component: {fileID: 4446684710817404} - - component: {fileID: 95219300520550374} - component: {fileID: 54413995134380664} - component: {fileID: 138281815166716050} + - component: {fileID: 95219300520550374} - component: {fileID: 135505933631826540} - - component: {fileID: 114938468152300300} + - component: {fileID: 114546255618804366} + - component: {fileID: 114372649503696970} m_Layer: 0 m_Name: handR m_TagString: Untagged @@ -1400,7 +1402,7 @@ Rigidbody: m_Mass: 1 m_Drag: 0 m_AngularDrag: 0.05 - m_UseGravity: 1 + m_UseGravity: 0 m_IsKinematic: 1 m_Interpolate: 0 m_Constraints: 0 @@ -1415,7 +1417,7 @@ Rigidbody: m_Mass: 1 m_Drag: 0 m_AngularDrag: 0.05 - m_UseGravity: 1 + m_UseGravity: 0 m_IsKinematic: 1 m_Interpolate: 0 m_Constraints: 0 @@ -1455,9 +1457,9 @@ Animator: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1986733487743170} - m_Enabled: 0 + m_Enabled: 1 m_Avatar: {fileID: 9000000, guid: c99aacc3accab4fdaadab5e3ea13b9c7, type: 3} - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 7a78fb7b47e7d9743ae217df5ba993db, type: 2} m_CullingMode: 1 m_UpdateMode: 0 m_ApplyRootMotion: 0 @@ -1465,6 +1467,7 @@ Animator: m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 --- !u!95 &95292425453911886 Animator: serializedVersion: 3 @@ -1472,9 +1475,9 @@ Animator: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1799026754646168} - m_Enabled: 0 + m_Enabled: 1 m_Avatar: {fileID: 9000000, guid: 013217fcf4bba4f3380d9159876fa8ea, type: 3} - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000, guid: b2216e835b0bdf54ea15eddd311bf60f, type: 2} m_CullingMode: 1 m_UpdateMode: 0 m_ApplyRootMotion: 0 @@ -1482,6 +1485,21 @@ Animator: m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!114 &114038308936181916 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1611361787474004} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ff1886996f9b04360b75e76507e5c7fe, type: 3} + m_Name: + m_EditorClassIdentifier: + toggleVRKeyName: v + vrState: 1 + dontDestroyOnLoad: 0 --- !u!114 &114104781069495054 MonoBehaviour: m_ObjectHideFlags: 1 @@ -1497,6 +1515,39 @@ MonoBehaviour: translationEnabled: 1 mouseSensitivity: 1 straffeSpeed: 5 +--- !u!114 &114128207473628304 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1799026754646168} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3fa198f02a3814330938d23cee1fe833, type: 3} + m_Name: + m_EditorClassIdentifier: + hand: 1 + inputMap: {fileID: 11400000, guid: b249a0801fba0f74198588a3ecb37bbe, type: 2} + index: 0 + position: {x: 0, y: 0, z: 0} + rotation: {x: 0, y: 0, z: 0, w: 0} + sitStand: + e00: 0 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 0 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 0 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 0 --- !u!114 &114243127810226890 MonoBehaviour: m_ObjectHideFlags: 1 @@ -1509,43 +1560,61 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: DefaultHeight: 1.2 ---- !u!114 &114505210183185788 +--- !u!114 &114372649503696970 MonoBehaviour: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1611361787474004} + m_GameObject: {fileID: 1986733487743170} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ff1886996f9b04360b75e76507e5c7fe, type: 3} + m_Script: {fileID: 11500000, guid: 2b177e4ed656f482db5c87c9876ce9da, type: 3} m_Name: m_EditorClassIdentifier: - toggleVRKeyName: v - vrState: 0 ---- !u!114 &114589835210473740 +--- !u!114 &114546255618804366 MonoBehaviour: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1799026754646168} + m_GameObject: {fileID: 1986733487743170} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2b177e4ed656f482db5c87c9876ce9da, type: 3} + m_Script: {fileID: 11500000, guid: 3fa198f02a3814330938d23cee1fe833, type: 3} m_Name: m_EditorClassIdentifier: - hand: 1 ---- !u!114 &114938468152300300 + hand: 2 + inputMap: {fileID: 11400000, guid: a760722b59f73e94287ddd9ffc44440f, type: 2} + index: 0 + position: {x: 0, y: 0, z: 0} + rotation: {x: 0, y: 0, z: 0, w: 0} + sitStand: + e00: 0 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 0 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 0 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 0 +--- !u!114 &114589835210473740 MonoBehaviour: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1986733487743170} + m_GameObject: {fileID: 1799026754646168} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 2b177e4ed656f482db5c87c9876ce9da, type: 3} m_Name: m_EditorClassIdentifier: - hand: 2 --- !u!124 &124058817231526930 Behaviour: m_ObjectHideFlags: 1 @@ -1604,6 +1673,7 @@ SkinnedMeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RenderingLayerMask: 4294967295 m_Materials: - {fileID: 2100000, guid: c99aacc3accab4fdaadab5e3ea13b9c7, type: 3} m_StaticBatchInfo: @@ -1666,6 +1736,7 @@ SkinnedMeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RenderingLayerMask: 4294967295 m_Materials: - {fileID: 2100000, guid: 013217fcf4bba4f3380d9159876fa8ea, type: 3} m_StaticBatchInfo: diff --git a/Assets/WebVR/Prefabs/WebVRCameraSet.prefab.meta b/Assets/WebVR/Prefabs/WebVRCameraSet.prefab.meta index d23e0a1..ac319d0 100644 --- a/Assets/WebVR/Prefabs/WebVRCameraSet.prefab.meta +++ b/Assets/WebVR/Prefabs/WebVRCameraSet.prefab.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: dce5a3a326b3543559422e1877dd7922 +guid: 54a613ba6e982e84db04156af08d6a89 timeCreated: 1523120895 licenseType: Free NativeFormatImporter: From 5cdbaf69097467d420b656f481d5d5a877157e12 Mon Sep 17 00:00:00 2001 From: Casey Yee Date: Wed, 20 Jun 2018 17:17:35 -0700 Subject: [PATCH 12/12] Updates scene --- Assets/WebVR/Scenes/WebVR.unity | 2050 +++++++++++++++++++++++++++++-- 1 file changed, 1975 insertions(+), 75 deletions(-) diff --git a/Assets/WebVR/Scenes/WebVR.unity b/Assets/WebVR/Scenes/WebVR.unity index 1fa9610..c8651ad 100644 --- a/Assets/WebVR/Scenes/WebVR.unity +++ b/Assets/WebVR/Scenes/WebVR.unity @@ -13,7 +13,7 @@ OcclusionCullingSettings: --- !u!104 &2 RenderSettings: m_ObjectHideFlags: 0 - serializedVersion: 8 + serializedVersion: 9 m_Fog: 1 m_FogColor: {r: 0.22794116, g: 0.19488274, b: 0.13575907, a: 1} m_FogMode: 2 @@ -39,6 +39,7 @@ RenderSettings: m_CustomReflection: {fileID: 0} m_Sun: {fileID: 82741410} m_IndirectSpecularColor: {r: 0.57859135, g: 0.60705847, b: 0.5485997, a: 1} + m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 @@ -54,11 +55,10 @@ LightmapSettings: m_EnableBakedLightmaps: 1 m_EnableRealtimeLightmaps: 1 m_LightmapEditorSettings: - serializedVersion: 9 + serializedVersion: 10 m_Resolution: 2 m_BakeResolution: 40 - m_TextureWidth: 512 - m_TextureHeight: 1024 + m_AtlasSize: 512 m_AO: 0 m_AOMaxDistance: 1 m_CompAOExponent: 1 @@ -113,6 +113,95 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} +--- !u!1 &48183871 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 1611361787474004, guid: 54a613ba6e982e84db04156af08d6a89, + type: 2} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 48183874} + - component: {fileID: 48183873} + - component: {fileID: 48183872} + m_Layer: 0 + m_Name: WebVRCameraSet + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &48183872 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 114038308936181916, guid: 54a613ba6e982e84db04156af08d6a89, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 48183871} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ff1886996f9b04360b75e76507e5c7fe, type: 3} + m_Name: + m_EditorClassIdentifier: + toggleVRKeyName: v + vrState: 1 + dontDestroyOnLoad: 0 +--- !u!81 &48183873 +AudioListener: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 81134526380146952, guid: 54a613ba6e982e84db04156af08d6a89, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 48183871} + m_Enabled: 0 +--- !u!4 &48183874 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 4545079059221816, guid: 54a613ba6e982e84db04156af08d6a89, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 48183871} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 2040219168} + - {fileID: 630965156} + - {fileID: 1053801000} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &61252993 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 1605939772801798, guid: 54a613ba6e982e84db04156af08d6a89, + type: 2} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 61252994} + m_Layer: 0 + m_Name: F1b + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &61252994 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 4034986098219846, guid: 54a613ba6e982e84db04156af08d6a89, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 61252993} + m_LocalRotation: {x: -0.118903995, y: 0.02931632, z: -0.050600722, w: 0.9911821} + m_LocalPosition: {x: -0, y: 0.04395578, z: 0} + m_LocalScale: {x: 0.9999999, y: 1.0000001, z: 1.0000001} + m_Children: + - {fileID: 1372412613} + m_Father: {fileID: 2066780127} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &74115543 Prefab: m_ObjectHideFlags: 0 @@ -236,6 +325,66 @@ Transform: m_Father: {fileID: 1807604226} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 143.729, y: -15.052002, z: 46.773987} +--- !u!1 &110589086 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 1876021384311268, guid: 54a613ba6e982e84db04156af08d6a89, + type: 2} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 110589087} + m_Layer: 0 + m_Name: F2c + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &110589087 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 4331423678772190, guid: 54a613ba6e982e84db04156af08d6a89, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 110589086} + m_LocalRotation: {x: -0.11653612, y: 0.00000017147882, z: -0.000000054896564, w: 0.9931865} + m_LocalPosition: {x: -0, y: 0.03227397, z: 0} + m_LocalScale: {x: 1, y: 1, z: 0.99999994} + m_Children: [] + m_Father: {fileID: 772486534} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &118684227 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 1655097157867806, guid: 54a613ba6e982e84db04156af08d6a89, + type: 2} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 118684228} + m_Layer: 0 + m_Name: F4c + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &118684228 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 4995997209270562, guid: 54a613ba6e982e84db04156af08d6a89, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 118684227} + m_LocalRotation: {x: -0.10375115, y: -0.00057289324, z: 0.005649949, w: 0.99458706} + m_LocalPosition: {x: -0.00000000745058, y: 0.0252485, z: -0.00000000372529} + m_LocalScale: {x: 1.0000001, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 214930528} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!82 &119473854 AudioSource: m_ObjectHideFlags: 0 @@ -265,54 +414,69 @@ AudioSource: rolloffCustomCurve: serializedVersion: 2 m_Curve: - - serializedVersion: 2 + - serializedVersion: 3 time: 0 value: 1 inSlope: 0 outSlope: 0 tangentMode: 0 - - serializedVersion: 2 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 time: 1 value: 0 inSlope: 0 outSlope: 0 tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 panLevelCustomCurve: serializedVersion: 2 m_Curve: - - serializedVersion: 2 + - serializedVersion: 3 time: 0 value: 0 inSlope: 0 outSlope: 0 tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 0 spreadCustomCurve: serializedVersion: 2 m_Curve: - - serializedVersion: 2 + - serializedVersion: 3 time: 0 value: 0 inSlope: 0 outSlope: 0 tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 reverbZoneMixCustomCurve: serializedVersion: 2 m_Curve: - - serializedVersion: 2 + - serializedVersion: 3 time: 0 value: 1 inSlope: 0 outSlope: 0 tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 0 @@ -345,6 +509,67 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 +--- !u!1 &185600198 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 1909436482644148, guid: 54a613ba6e982e84db04156af08d6a89, + type: 2} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 185600199} + m_Layer: 0 + m_Name: F1c + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &185600199 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 4626993254615212, guid: 54a613ba6e982e84db04156af08d6a89, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 185600198} + m_LocalRotation: {x: -0.20563336, y: 0.004241824, z: -0.015431455, w: 0.9784982} + m_LocalPosition: {x: -0.00000000372529, y: 0.03710472, z: 0} + m_LocalScale: {x: 0.9999998, y: 1, z: 0.99999994} + m_Children: [] + m_Father: {fileID: 682714385} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &214930527 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 1283108379736390, guid: 54a613ba6e982e84db04156af08d6a89, + type: 2} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 214930528} + m_Layer: 0 + m_Name: F4b + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &214930528 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 4583264519497326, guid: 54a613ba6e982e84db04156af08d6a89, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 214930527} + m_LocalRotation: {x: -0.18996151, y: 0.0036995257, z: -0.027802391, w: 0.98139083} + m_LocalPosition: {x: -0.00000000745058, y: 0.03987956, z: 0.00000000177533} + m_LocalScale: {x: 1, y: 0.9999999, z: 1} + m_Children: + - {fileID: 118684228} + m_Father: {fileID: 804649268} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &238384394 Prefab: m_ObjectHideFlags: 0 @@ -407,48 +632,37 @@ Prefab: m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: 2b0960a38d49646e59e2a4b209a0ef93, type: 3} m_IsPrefabParent: 0 ---- !u!1001 &240676649 -Prefab: +--- !u!1 &239861070 +GameObject: m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 4545079059221816, guid: dce5a3a326b3543559422e1877dd7922, type: 2} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4545079059221816, guid: dce5a3a326b3543559422e1877dd7922, type: 2} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4545079059221816, guid: dce5a3a326b3543559422e1877dd7922, type: 2} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4545079059221816, guid: dce5a3a326b3543559422e1877dd7922, type: 2} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4545079059221816, guid: dce5a3a326b3543559422e1877dd7922, type: 2} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4545079059221816, guid: dce5a3a326b3543559422e1877dd7922, type: 2} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4545079059221816, guid: dce5a3a326b3543559422e1877dd7922, type: 2} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4545079059221816, guid: dce5a3a326b3543559422e1877dd7922, type: 2} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_ParentPrefab: {fileID: 100100000, guid: dce5a3a326b3543559422e1877dd7922, type: 2} - m_IsPrefabParent: 0 + m_PrefabParentObject: {fileID: 1136128897566686, guid: 54a613ba6e982e84db04156af08d6a89, + type: 2} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 239861071} + m_Layer: 0 + m_Name: Armature + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &239861071 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 4603535410349480, guid: 54a613ba6e982e84db04156af08d6a89, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 239861070} + m_LocalRotation: {x: 0.52522314, y: -0.47343507, z: -0.47343513, w: 0.52522284} + m_LocalPosition: {x: -0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 860179517} + m_Father: {fileID: 2040219168} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &291315340 GameObject: m_ObjectHideFlags: 0 @@ -480,6 +694,7 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RenderingLayerMask: 4294967295 m_Materials: - {fileID: 2100000, guid: 611da8dfdd869483bace2e70281e7b29, type: 2} m_StaticBatchInfo: @@ -533,6 +748,183 @@ Transform: m_Father: {fileID: 2005427646} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 10.427, y: 58.319004, z: 25.665} +--- !u!1 &313818645 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 1496930222956870, guid: 54a613ba6e982e84db04156af08d6a89, + type: 2} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 313818646} + m_Layer: 0 + m_Name: F4c + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &313818646 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 4347971614768690, guid: 54a613ba6e982e84db04156af08d6a89, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 313818645} + m_LocalRotation: {x: -0.10380725, y: 0.00063826254, z: -0.0058165276, w: 0.9945802} + m_LocalPosition: {x: -0, y: 0.02527546, z: -0.00000000186265} + m_LocalScale: {x: 1.0000001, y: 0.99999994, z: 1.0000001} + m_Children: [] + m_Father: {fileID: 697572863} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &349752368 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 1375127060900384, guid: 54a613ba6e982e84db04156af08d6a89, + type: 2} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 349752369} + m_Layer: 0 + m_Name: Tc + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &349752369 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 4358374644902258, guid: 54a613ba6e982e84db04156af08d6a89, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 349752368} + m_LocalRotation: {x: -0.11150081, y: 0.021267705, z: -0.07582151, w: 0.9906394} + m_LocalPosition: {x: 0.00000000745058, y: 0.02687041, z: 0} + m_LocalScale: {x: 1, y: 1.0000001, z: 1.0000001} + m_Children: [] + m_Father: {fileID: 365802621} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &365802620 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 1156281662418980, guid: 54a613ba6e982e84db04156af08d6a89, + type: 2} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 365802621} + m_Layer: 0 + m_Name: Tb + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &365802621 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 4712399538937390, guid: 54a613ba6e982e84db04156af08d6a89, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 365802620} + m_LocalRotation: {x: -0.06180185, y: 0.043109026, z: -0.1561716, w: 0.98485154} + m_LocalPosition: {x: 0.00000000745058, y: 0.0499248, z: -2.32831e-10} + m_LocalScale: {x: 0.99999994, y: 0.99999994, z: 0.99999994} + m_Children: + - {fileID: 349752369} + m_Father: {fileID: 1848703934} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &430802472 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 1325129670532142, guid: 54a613ba6e982e84db04156af08d6a89, + type: 2} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 430802473} + - component: {fileID: 430802476} + - component: {fileID: 430802475} + - component: {fileID: 430802474} + m_Layer: 0 + m_Name: CameraR + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &430802473 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 4172172842306312, guid: 54a613ba6e982e84db04156af08d6a89, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 430802472} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0.032, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1053801000} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!92 &430802474 +Behaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 92781379743582448, guid: 54a613ba6e982e84db04156af08d6a89, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 430802472} + m_Enabled: 1 +--- !u!124 &430802475 +Behaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 124875879843251026, guid: 54a613ba6e982e84db04156af08d6a89, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 430802472} + m_Enabled: 1 +--- !u!20 &430802476 +Camera: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 20572450475250664, guid: 54a613ba6e982e84db04156af08d6a89, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 430802472} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 1 + m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0.019607844} + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0.5 + y: 0 + width: 0.5 + 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: 4294967295 + m_RenderingPath: -1 + m_TargetTexture: {fileID: 0} + m_TargetDisplay: 0 + m_TargetEye: 3 + m_HDR: 0 + m_AllowMSAA: 1 + m_AllowDynamicResolution: 0 + m_ForceIntoRT: 0 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 --- !u!1 &440688400 GameObject: m_ObjectHideFlags: 0 @@ -565,6 +957,7 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RenderingLayerMask: 4294967295 m_Materials: - {fileID: 2100000, guid: 5b8924a643c3d485e8262dd13187586c, type: 2} m_StaticBatchInfo: @@ -633,20 +1026,112 @@ Rigidbody: m_Interpolate: 0 m_Constraints: 0 m_CollisionDetection: 0 ---- !u!1001 &620001436 -Prefab: +--- !u!1 &462027987 +GameObject: m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 1807604226} - m_Modifications: - - target: {fileID: 400002, guid: 2b0960a38d49646e59e2a4b209a0ef93, type: 3} - propertyPath: m_LocalPosition.x - value: -33.786667 - objectReference: {fileID: 0} - - target: {fileID: 400002, guid: 2b0960a38d49646e59e2a4b209a0ef93, type: 3} - propertyPath: m_LocalPosition.y - value: -12.37 + m_PrefabParentObject: {fileID: 1523937847610120, guid: 54a613ba6e982e84db04156af08d6a89, + type: 2} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 462027988} + m_Layer: 0 + m_Name: F2a + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &462027988 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 4604444620687898, guid: 54a613ba6e982e84db04156af08d6a89, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 462027987} + m_LocalRotation: {x: -0.10011451, y: 0.70648915, z: 0.029556468, w: 0.69998336} + m_LocalPosition: {x: -0, y: 0.08572537, z: -9.31323e-10} + m_LocalScale: {x: 1, y: 1.0000001, z: 1.0000001} + m_Children: + - {fileID: 772486534} + m_Father: {fileID: 860179517} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &531120099 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 1861885331562932, guid: 54a613ba6e982e84db04156af08d6a89, + type: 2} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 531120100} + m_Layer: 0 + m_Name: F4a + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &531120100 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 4744495647388140, guid: 54a613ba6e982e84db04156af08d6a89, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 531120099} + m_LocalRotation: {x: -0.12349578, y: 0.7036239, z: 0.021750657, w: 0.6994206} + m_LocalPosition: {x: -0.000795471, y: 0.08865888, z: -0.0472644} + m_LocalScale: {x: 1, y: 1.0000001, z: 1} + m_Children: + - {fileID: 697572863} + m_Father: {fileID: 860179517} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &577781338 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 1054071125730440, guid: 54a613ba6e982e84db04156af08d6a89, + type: 2} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 577781339} + m_Layer: 0 + m_Name: Tc + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &577781339 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 4048029464873450, guid: 54a613ba6e982e84db04156af08d6a89, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 577781338} + m_LocalRotation: {x: -0.11127382, y: -0.020869998, z: 0.07564749, w: 0.99068666} + m_LocalPosition: {x: -0.00000000745058, y: 0.02686657, z: -4.65661e-10} + m_LocalScale: {x: 1.0000001, y: 1, z: 1.0000001} + m_Children: [] + m_Father: {fileID: 883942784} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &620001436 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1807604226} + m_Modifications: + - target: {fileID: 400002, guid: 2b0960a38d49646e59e2a4b209a0ef93, type: 3} + propertyPath: m_LocalPosition.x + value: -33.786667 + objectReference: {fileID: 0} + - target: {fileID: 400002, guid: 2b0960a38d49646e59e2a4b209a0ef93, type: 3} + propertyPath: m_LocalPosition.y + value: -12.37 objectReference: {fileID: 0} - target: {fileID: 400002, guid: 2b0960a38d49646e59e2a4b209a0ef93, type: 3} propertyPath: m_LocalPosition.z @@ -695,10 +1180,250 @@ Prefab: m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: 2b0960a38d49646e59e2a4b209a0ef93, type: 3} m_IsPrefabParent: 0 +--- !u!1 &630965155 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 1986733487743170, guid: 54a613ba6e982e84db04156af08d6a89, + type: 2} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 630965156} + - component: {fileID: 630965161} + - component: {fileID: 630965160} + - component: {fileID: 630965162} + - component: {fileID: 630965159} + - component: {fileID: 630965158} + - component: {fileID: 630965157} + m_Layer: 0 + m_Name: handR + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &630965156 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 4446684710817404, guid: 54a613ba6e982e84db04156af08d6a89, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 630965155} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0.25, y: 0.74500006, z: -0.541} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 681911866} + - {fileID: 1269233425} + m_Father: {fileID: 48183874} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &630965157 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 114372649503696970, guid: 54a613ba6e982e84db04156af08d6a89, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 630965155} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2b177e4ed656f482db5c87c9876ce9da, type: 3} + m_Name: + m_EditorClassIdentifier: + anim: {fileID: 0} +--- !u!114 &630965158 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 114546255618804366, guid: 54a613ba6e982e84db04156af08d6a89, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 630965155} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3fa198f02a3814330938d23cee1fe833, type: 3} + m_Name: + m_EditorClassIdentifier: + hand: 2 + inputMap: {fileID: 11400000, guid: a760722b59f73e94287ddd9ffc44440f, type: 2} + index: 0 + position: {x: 0, y: 0, z: 0} + rotation: {x: 0, y: 0, z: 0, w: 0} + sitStand: + e00: 0 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 0 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 0 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 0 +--- !u!135 &630965159 +SphereCollider: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 135505933631826540, guid: 54a613ba6e982e84db04156af08d6a89, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 630965155} + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_Enabled: 1 + serializedVersion: 2 + m_Radius: 0.15 + m_Center: {x: 0, y: 0, z: 0} +--- !u!138 &630965160 +FixedJoint: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 138281815166716050, guid: 54a613ba6e982e84db04156af08d6a89, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 630965155} + m_ConnectedBody: {fileID: 0} + m_BreakForce: Infinity + m_BreakTorque: Infinity + m_EnableCollision: 0 + m_EnablePreprocessing: 1 + m_MassScale: 1 + m_ConnectedMassScale: 1 +--- !u!54 &630965161 +Rigidbody: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 54413995134380664, guid: 54a613ba6e982e84db04156af08d6a89, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 630965155} + serializedVersion: 2 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0.05 + m_UseGravity: 0 + m_IsKinematic: 1 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 +--- !u!95 &630965162 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 95219300520550374, guid: 54a613ba6e982e84db04156af08d6a89, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 630965155} + m_Enabled: 1 + m_Avatar: {fileID: 9000000, guid: c99aacc3accab4fdaadab5e3ea13b9c7, type: 3} + m_Controller: {fileID: 9100000, guid: 7a78fb7b47e7d9743ae217df5ba993db, type: 2} + m_CullingMode: 1 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!1 &681911865 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 1644997114004198, guid: 54a613ba6e982e84db04156af08d6a89, + type: 2} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 681911866} + m_Layer: 0 + m_Name: Armature + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &681911866 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 4817586320957540, guid: 54a613ba6e982e84db04156af08d6a89, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 681911865} + m_LocalRotation: {x: 0.5000001, y: 0.49999994, z: 0.49999994, w: 0.5000001} + m_LocalPosition: {x: -0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 1481541975} + m_Father: {fileID: 630965156} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &682714384 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 1700223032786422, guid: 54a613ba6e982e84db04156af08d6a89, + type: 2} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 682714385} + m_Layer: 0 + m_Name: F1b + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &682714385 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 4116344884517928, guid: 54a613ba6e982e84db04156af08d6a89, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 682714384} + m_LocalRotation: {x: -0.11508171, y: 0.027945505, z: -0.080578156, w: 0.98968804} + m_LocalPosition: {x: -0, y: 0.04402144, z: 0} + m_LocalScale: {x: 1, y: 1.0000001, z: 1} + m_Children: + - {fileID: 185600199} + m_Father: {fileID: 1677654373} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &697572861 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 1024448717718808, guid: 54a613ba6e982e84db04156af08d6a89, + type: 2} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 697572863} + m_Layer: 0 + m_Name: F4b + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 --- !u!4 &697572862 stripped Transform: m_PrefabParentObject: {fileID: 400000, guid: 7e57e26a714804d3c9f1baa605131856, type: 3} m_PrefabInternal: {fileID: 1898865630} +--- !u!4 &697572863 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 4151368847565090, guid: 54a613ba6e982e84db04156af08d6a89, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 697572861} + m_LocalRotation: {x: -0.1904387, y: -0.0032620444, z: 0.027573023, w: 0.9813064} + m_LocalPosition: {x: -0.00000000372529, y: 0.0398853, z: 9.31323e-10} + m_LocalScale: {x: 1, y: 0.99999994, z: 0.9999999} + m_Children: + - {fileID: 313818646} + m_Father: {fileID: 531120100} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &705953490 GameObject: m_ObjectHideFlags: 0 @@ -743,6 +1468,7 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RenderingLayerMask: 4294967295 m_Materials: - {fileID: 2100000, guid: 611da8dfdd869483bace2e70281e7b29, type: 2} m_StaticBatchInfo: @@ -783,6 +1509,134 @@ MeshFilter: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 705953490} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &730084779 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 1105671963348452, guid: 54a613ba6e982e84db04156af08d6a89, + type: 2} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 730084780} + m_Layer: 0 + m_Name: F3b + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &730084780 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 4386271876531508, guid: 54a613ba6e982e84db04156af08d6a89, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 730084779} + m_LocalRotation: {x: -0.14600956, y: 0.00039178607, z: -0.00014838319, w: 0.9892831} + m_LocalPosition: {x: -0, y: 0.05072762, z: 9.74978e-10} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 1003753585} + m_Father: {fileID: 1528373737} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &772486533 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 1202656389968332, guid: 54a613ba6e982e84db04156af08d6a89, + type: 2} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 772486534} + m_Layer: 0 + m_Name: F2b + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &772486534 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 4081122567523882, guid: 54a613ba6e982e84db04156af08d6a89, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 772486533} + m_LocalRotation: {x: -0.14640093, y: -0.00000033671984, z: -0.00000009125756, w: 0.9892253} + m_LocalPosition: {x: -9.31323e-10, y: 0.05073346, z: 0} + m_LocalScale: {x: 1, y: 0.99999994, z: 0.99999994} + m_Children: + - {fileID: 110589087} + m_Father: {fileID: 462027988} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &804649267 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 1409020080755110, guid: 54a613ba6e982e84db04156af08d6a89, + type: 2} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 804649268} + m_Layer: 0 + m_Name: F4a + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &804649268 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 4804943446011556, guid: 54a613ba6e982e84db04156af08d6a89, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 804649267} + m_LocalRotation: {x: -0.123249, y: -0.7033996, z: -0.021546032, w: 0.69969594} + m_LocalPosition: {x: 0.000792709, y: 0.08865885, z: -0.04726442} + m_LocalScale: {x: 0.99999994, y: 0.9999999, z: 0.99999994} + m_Children: + - {fileID: 214930528} + m_Father: {fileID: 1481541975} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &860179516 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 1213172031206742, guid: 54a613ba6e982e84db04156af08d6a89, + type: 2} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 860179517} + m_Layer: 0 + m_Name: Palm + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &860179517 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 4099324660282070, guid: 54a613ba6e982e84db04156af08d6a89, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 860179516} + m_LocalRotation: {x: 0.07191966, y: -0.74258643, z: 0.0025354908, w: 0.66587275} + m_LocalPosition: {x: -0.00000000136106, y: -0.1, z: -6.35497e-10} + m_LocalScale: {x: 0.99999994, y: 0.9999998, z: 0.9999999} + m_Children: + - {fileID: 2066780127} + - {fileID: 462027988} + - {fileID: 1478365019} + - {fileID: 531120100} + - {fileID: 1848703934} + m_Father: {fileID: 239861071} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &867024821 GameObject: m_ObjectHideFlags: 0 @@ -828,6 +1682,7 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RenderingLayerMask: 4294967295 m_Materials: - {fileID: 2100000, guid: 1087007d77ce4468ba0f905331ed7144, type: 2} m_StaticBatchInfo: @@ -887,6 +1742,37 @@ MeshFilter: Transform: m_PrefabParentObject: {fileID: 400002, guid: 2b0960a38d49646e59e2a4b209a0ef93, type: 3} m_PrefabInternal: {fileID: 74115543} +--- !u!1 &883942783 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 1756918114997010, guid: 54a613ba6e982e84db04156af08d6a89, + type: 2} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 883942784} + m_Layer: 0 + m_Name: Tb + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &883942784 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 4638388912140168, guid: 54a613ba6e982e84db04156af08d6a89, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 883942783} + m_LocalRotation: {x: -0.06163988, y: -0.042713895, z: 0.15610854, w: 0.9848889} + m_LocalPosition: {x: 0.00000000745058, y: 0.04992442, z: 2.32831e-10} + m_LocalScale: {x: 1, y: 1.0000001, z: 1} + m_Children: + - {fileID: 577781339} + m_Father: {fileID: 2003988304} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &887596128 GameObject: m_ObjectHideFlags: 0 @@ -931,6 +1817,7 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RenderingLayerMask: 4294967295 m_Materials: - {fileID: 2100000, guid: 611da8dfdd869483bace2e70281e7b29, type: 2} m_StaticBatchInfo: @@ -1037,6 +1924,187 @@ Prefab: m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: 7e57e26a714804d3c9f1baa605131856, type: 3} m_IsPrefabParent: 0 +--- !u!1 &955315777 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 1664295426898042, guid: 54a613ba6e982e84db04156af08d6a89, + type: 2} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 955315778} + - component: {fileID: 955315779} + m_Layer: 0 + m_Name: model + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &955315778 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 4925627231713262, guid: 54a613ba6e982e84db04156af08d6a89, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 955315777} + m_LocalRotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071068} + m_LocalPosition: {x: -0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 2040219168} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!137 &955315779 +SkinnedMeshRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 137859123971994456, guid: 54a613ba6e982e84db04156af08d6a89, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 955315777} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RenderingLayerMask: 4294967295 + m_Materials: + - {fileID: 2100000, guid: 013217fcf4bba4f3380d9159876fa8ea, type: 3} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + 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: 4300000, guid: 013217fcf4bba4f3380d9159876fa8ea, type: 3} + m_Bones: + - {fileID: 860179517} + - {fileID: 462027988} + - {fileID: 772486534} + - {fileID: 110589087} + - {fileID: 1478365019} + - {fileID: 1374460781} + - {fileID: 1612252590} + - {fileID: 531120100} + - {fileID: 697572863} + - {fileID: 313818646} + - {fileID: 2066780127} + - {fileID: 61252994} + - {fileID: 1372412613} + - {fileID: 1848703934} + - {fileID: 365802621} + - {fileID: 349752369} + m_BlendShapeWeights: [] + m_RootBone: {fileID: 860179517} + m_AABB: + m_Center: {x: -0.008465625, y: 0.07335146, z: 0.018426947} + m_Extent: {x: 0.050279543, y: 0.12551184, z: 0.08560432} + m_DirtyAABB: 0 +--- !u!1 &1003753584 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 1348070424530650, guid: 54a613ba6e982e84db04156af08d6a89, + type: 2} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 1003753585} + m_Layer: 0 + m_Name: F3c + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1003753585 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 4137490589593614, guid: 54a613ba6e982e84db04156af08d6a89, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1003753584} + m_LocalRotation: {x: -0.15862529, y: 0.00015723592, z: -0.00024939046, w: 0.98733884} + m_LocalPosition: {x: -0, y: 0.03225039, z: 0} + m_LocalScale: {x: 1.0000001, y: 1, z: 0.9999999} + m_Children: [] + m_Father: {fileID: 730084780} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1053800999 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 1363028859183752, guid: 54a613ba6e982e84db04156af08d6a89, + type: 2} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 1053801000} + - component: {fileID: 1053801002} + - component: {fileID: 1053801001} + m_Layer: 0 + m_Name: Cameras + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1053801000 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 4414771795277364, guid: 54a613ba6e982e84db04156af08d6a89, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1053800999} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 1169845870} + - {fileID: 1719793602} + - {fileID: 430802473} + m_Father: {fileID: 48183874} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!81 &1053801001 +AudioListener: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 81178167226133646, guid: 54a613ba6e982e84db04156af08d6a89, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1053800999} + m_Enabled: 1 +--- !u!114 &1053801002 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 114243127810226890, guid: 54a613ba6e982e84db04156af08d6a89, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1053800999} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2330d5cea21bb564e97ad081f15487d9, type: 3} + m_Name: + m_EditorClassIdentifier: + DefaultHeight: 1.2 --- !u!1 &1056994842 GameObject: m_ObjectHideFlags: 0 @@ -1068,6 +2136,7 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RenderingLayerMask: 4294967295 m_Materials: - {fileID: 2100000, guid: 611da8dfdd869483bace2e70281e7b29, type: 2} m_StaticBatchInfo: @@ -1121,6 +2190,37 @@ Transform: m_Father: {fileID: 2005427646} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: -24.645, y: 88.898, z: -17.815} +--- !u!1 &1080666957 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 1159826726411084, guid: 54a613ba6e982e84db04156af08d6a89, + type: 2} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 1080666958} + m_Layer: 0 + m_Name: F2b + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1080666958 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 4872909289549612, guid: 54a613ba6e982e84db04156af08d6a89, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1080666957} + m_LocalRotation: {x: -0.14600942, y: 0.00039184737, z: -0.00014851069, w: 0.98928314} + m_LocalPosition: {x: -0, y: 0.05072759, z: -0.00000000349246} + m_LocalScale: {x: 0.99999994, y: 1, z: 1.0000001} + m_Children: + - {fileID: 1537570778} + m_Father: {fileID: 1254811527} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1080696541 stripped GameObject: m_PrefabParentObject: {fileID: 100000, guid: 55a05d7345e094dee9a176728bb6070f, type: 3} @@ -1202,6 +2302,7 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RenderingLayerMask: 4294967295 m_Materials: - {fileID: 2100000, guid: 611da8dfdd869483bace2e70281e7b29, type: 2} m_StaticBatchInfo: @@ -1245,20 +2346,301 @@ MeshFilter: --- !u!4 &1161959902 Transform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1161959898} + m_LocalRotation: {x: -0.000000014901158, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0.26865622, y: -1.5347002, z: 2.6643436} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 2005427646} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: -16.601002, y: -7.7430005, z: 25.449001} +--- !u!1 &1169845869 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 1854678450583440, guid: 54a613ba6e982e84db04156af08d6a89, + type: 2} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 1169845870} + - component: {fileID: 1169845873} + - component: {fileID: 1169845872} + - component: {fileID: 1169845871} + m_Layer: 0 + m_Name: CameraMain + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1169845870 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 4684771153913254, guid: 54a613ba6e982e84db04156af08d6a89, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1169845869} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1053801000} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1169845871 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 114104781069495054, guid: 54a613ba6e982e84db04156af08d6a89, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1169845869} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 683f145ef879be447ba25c1080ac1984, type: 3} + m_Name: + m_EditorClassIdentifier: + rotationEnabled: 1 + translationEnabled: 1 + mouseSensitivity: 1 + straffeSpeed: 5 +--- !u!124 &1169845872 +Behaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 124984793849493392, guid: 54a613ba6e982e84db04156af08d6a89, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1169845869} + m_Enabled: 1 +--- !u!20 &1169845873 +Camera: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 20092747195267750, guid: 54a613ba6e982e84db04156af08d6a89, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1169845869} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 1 + m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0.019607844} + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 0.1 + far clip plane: 1000 + field of view: 80 + orthographic: 0 + orthographic size: 5 + m_Depth: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingPath: -1 + m_TargetTexture: {fileID: 0} + m_TargetDisplay: 0 + m_TargetEye: 3 + m_HDR: 0 + m_AllowMSAA: 1 + m_AllowDynamicResolution: 0 + m_ForceIntoRT: 0 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 +--- !u!4 &1189473524 stripped +Transform: + m_PrefabParentObject: {fileID: 400000, guid: 7e57e26a714804d3c9f1baa605131856, type: 3} + m_PrefabInternal: {fileID: 1736382262} +--- !u!1 &1254811526 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 1233828694671076, guid: 54a613ba6e982e84db04156af08d6a89, + type: 2} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 1254811527} + m_Layer: 0 + m_Name: F2a + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1254811527 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 4965576792379482, guid: 54a613ba6e982e84db04156af08d6a89, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1254811526} + m_LocalRotation: {x: -0.09988781, y: -0.7062805, z: -0.029368026, w: 0.70023406} + m_LocalPosition: {x: -0, y: 0.08572534, z: 0} + m_LocalScale: {x: 1, y: 0.9999997, z: 0.9999998} + m_Children: + - {fileID: 1080666958} + m_Father: {fileID: 1481541975} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1269233424 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 1091283458777958, guid: 54a613ba6e982e84db04156af08d6a89, + type: 2} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 1269233425} + - component: {fileID: 1269233426} + m_Layer: 0 + m_Name: model + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1269233425 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 4974700127051642, guid: 54a613ba6e982e84db04156af08d6a89, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1269233424} + m_LocalRotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071068} + m_LocalPosition: {x: -0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 630965156} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!137 &1269233426 +SkinnedMeshRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 137037042967364456, guid: 54a613ba6e982e84db04156af08d6a89, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1269233424} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RenderingLayerMask: 4294967295 + m_Materials: + - {fileID: 2100000, guid: c99aacc3accab4fdaadab5e3ea13b9c7, type: 3} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + 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: 4300000, guid: c99aacc3accab4fdaadab5e3ea13b9c7, type: 3} + m_Bones: + - {fileID: 1481541975} + - {fileID: 1254811527} + - {fileID: 1080666958} + - {fileID: 1537570778} + - {fileID: 1528373737} + - {fileID: 730084780} + - {fileID: 1003753585} + - {fileID: 804649268} + - {fileID: 214930528} + - {fileID: 118684228} + - {fileID: 1677654373} + - {fileID: 682714385} + - {fileID: 185600199} + - {fileID: 2003988304} + - {fileID: 883942784} + - {fileID: 577781339} + m_BlendShapeWeights: [] + m_RootBone: {fileID: 1481541975} + m_AABB: + m_Center: {x: 0.008486092, y: 0.07785222, z: 0.018433996} + m_Extent: {x: 0.05023212, y: 0.12092428, z: 0.08558848} + m_DirtyAABB: 0 +--- !u!1 &1372412612 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 1917753719558438, guid: 54a613ba6e982e84db04156af08d6a89, + type: 2} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 1372412613} + m_Layer: 0 + m_Name: F1c + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1372412613 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 4968533499100556, guid: 54a613ba6e982e84db04156af08d6a89, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1372412612} + m_LocalRotation: {x: -0.20307738, y: 0.021668296, z: -0.006307985, w: 0.9789026} + m_LocalPosition: {x: -0, y: 0.03633453, z: 4.65661e-10} + m_LocalScale: {x: 1.0000001, y: 1, z: 0.9999999} + m_Children: [] + m_Father: {fileID: 61252994} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1374460780 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 1893179984823500, guid: 54a613ba6e982e84db04156af08d6a89, + type: 2} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 1374460781} + m_Layer: 0 + m_Name: F3b + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1374460781 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 4507959915322784, guid: 54a613ba6e982e84db04156af08d6a89, + type: 2} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1161959898} - m_LocalRotation: {x: -0.000000014901158, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0.26865622, y: -1.5347002, z: 2.6643436} + m_GameObject: {fileID: 1374460780} + m_LocalRotation: {x: -0.14640084, y: -0.00000034621323, z: -0.00000014161881, w: 0.9892254} + m_LocalPosition: {x: -0, y: 0.05073346, z: 9.31323e-10} m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 2005427646} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: -16.601002, y: -7.7430005, z: 25.449001} ---- !u!4 &1189473524 stripped -Transform: - m_PrefabParentObject: {fileID: 400000, guid: 7e57e26a714804d3c9f1baa605131856, type: 3} - m_PrefabInternal: {fileID: 1736382262} + m_Children: + - {fileID: 1612252590} + m_Father: {fileID: 1478365019} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1451920843 Prefab: m_ObjectHideFlags: 0 @@ -1321,10 +2703,137 @@ Prefab: m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: 55a05d7345e094dee9a176728bb6070f, type: 3} m_IsPrefabParent: 0 +--- !u!1 &1478365017 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 1859026024318526, guid: 54a613ba6e982e84db04156af08d6a89, + type: 2} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 1478365019} + m_Layer: 0 + m_Name: F3a + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 --- !u!4 &1478365018 stripped Transform: m_PrefabParentObject: {fileID: 400002, guid: 2b0960a38d49646e59e2a4b209a0ef93, type: 3} m_PrefabInternal: {fileID: 238384394} +--- !u!4 &1478365019 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 4828694364882628, guid: 54a613ba6e982e84db04156af08d6a89, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1478365017} + m_LocalRotation: {x: -0.10011455, y: 0.7064892, z: 0.02955652, w: 0.6999833} + m_LocalPosition: {x: -0.000611898, y: 0.08924116, z: -0.0238383} + m_LocalScale: {x: 1, y: 0.9999999, z: 1} + m_Children: + - {fileID: 1374460781} + m_Father: {fileID: 860179517} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1481541974 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 1305641983383064, guid: 54a613ba6e982e84db04156af08d6a89, + type: 2} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 1481541975} + m_Layer: 0 + m_Name: Palm + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1481541975 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 4761071769301884, guid: 54a613ba6e982e84db04156af08d6a89, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1481541974} + m_LocalRotation: {x: 0.071954556, y: 0.7071058, z: 0.0011924944, w: 0.7034362} + m_LocalPosition: {x: -0, y: -0.1, z: -8.36735e-10} + m_LocalScale: {x: 0.9999999, y: 0.9999999, z: 1} + m_Children: + - {fileID: 1677654373} + - {fileID: 1254811527} + - {fileID: 1528373737} + - {fileID: 804649268} + - {fileID: 2003988304} + m_Father: {fileID: 681911866} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1528373736 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 1125718440957756, guid: 54a613ba6e982e84db04156af08d6a89, + type: 2} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 1528373737} + m_Layer: 0 + m_Name: F3a + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1528373737 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 4377295061658584, guid: 54a613ba6e982e84db04156af08d6a89, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1528373736} + m_LocalRotation: {x: -0.09988771, y: -0.70628065, z: -0.029368034, w: 0.700234} + m_LocalPosition: {x: 0.000609777, y: 0.08924112, z: -0.02383831} + m_LocalScale: {x: 1.0000001, y: 0.99999994, z: 1} + m_Children: + - {fileID: 730084780} + m_Father: {fileID: 1481541975} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1537570777 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 1087105799524324, guid: 54a613ba6e982e84db04156af08d6a89, + type: 2} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 1537570778} + m_Layer: 0 + m_Name: F2c + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1537570778 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 4098401385612792, guid: 54a613ba6e982e84db04156af08d6a89, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1537570777} + m_LocalRotation: {x: -0.11638724, y: 0.00014860035, z: -0.00018190508, w: 0.9932039} + m_LocalPosition: {x: -0, y: 0.03225041, z: 0.00000000372529} + m_LocalScale: {x: 0.9999999, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1080666958} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1543435172 GameObject: m_ObjectHideFlags: 0 @@ -1372,6 +2881,7 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RenderingLayerMask: 4294967295 m_Materials: - {fileID: 2100000, guid: 1087007d77ce4468ba0f905331ed7144, type: 2} m_StaticBatchInfo: @@ -1470,6 +2980,7 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RenderingLayerMask: 4294967295 m_Materials: - {fileID: 2100000, guid: 1087007d77ce4468ba0f905331ed7144, type: 2} m_StaticBatchInfo: @@ -1525,10 +3036,40 @@ MeshFilter: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1544748170} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &1612252588 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 1644691530447244, guid: 54a613ba6e982e84db04156af08d6a89, + type: 2} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 1612252590} + m_Layer: 0 + m_Name: F3c + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 --- !u!4 &1612252589 stripped Transform: m_PrefabParentObject: {fileID: 400002, guid: 2b0960a38d49646e59e2a4b209a0ef93, type: 3} m_PrefabInternal: {fileID: 620001436} +--- !u!4 &1612252590 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 4776451879929968, guid: 54a613ba6e982e84db04156af08d6a89, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1612252588} + m_LocalRotation: {x: -0.15878263, y: 0.00000012448224, z: -0.000000093646925, w: 0.98731357} + m_LocalPosition: {x: -9.31323e-10, y: 0.03227397, z: 0} + m_LocalScale: {x: 1, y: 1, z: 0.99999994} + m_Children: [] + m_Father: {fileID: 1374460781} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1636266819 GameObject: m_ObjectHideFlags: 0 @@ -1560,6 +3101,7 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RenderingLayerMask: 4294967295 m_Materials: - {fileID: 2100000, guid: f8d6f757b9e2b4c2290301f6a22ea109, type: 2} m_StaticBatchInfo: @@ -1613,6 +3155,123 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1677654372 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 1836701339249518, guid: 54a613ba6e982e84db04156af08d6a89, + type: 2} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 1677654373} + m_Layer: 0 + m_Name: F1a + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1677654373 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 4165819996228668, guid: 54a613ba6e982e84db04156af08d6a89, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1677654372} + m_LocalRotation: {x: -0.10984154, y: -0.70521337, z: -0.02806852, w: 0.6998722} + m_LocalPosition: {x: 0.000884182, y: 0.09693757, z: 0.02622143} + m_LocalScale: {x: 1, y: 0.99999994, z: 0.9999999} + m_Children: + - {fileID: 682714385} + m_Father: {fileID: 1481541975} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1719793601 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 1207760918314088, guid: 54a613ba6e982e84db04156af08d6a89, + type: 2} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 1719793602} + - component: {fileID: 1719793605} + - component: {fileID: 1719793604} + - component: {fileID: 1719793603} + m_Layer: 0 + m_Name: CameraL + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1719793602 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 4357122362856218, guid: 54a613ba6e982e84db04156af08d6a89, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1719793601} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0.032, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1053801000} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!92 &1719793603 +Behaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 92959729688311338, guid: 54a613ba6e982e84db04156af08d6a89, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1719793601} + m_Enabled: 1 +--- !u!124 &1719793604 +Behaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 124058817231526930, guid: 54a613ba6e982e84db04156af08d6a89, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1719793601} + m_Enabled: 1 +--- !u!20 &1719793605 +Camera: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 20930522213222284, guid: 54a613ba6e982e84db04156af08d6a89, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1719793601} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 1 + m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0.019607844} + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0.5 + 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: 4294967295 + m_RenderingPath: -1 + m_TargetTexture: {fileID: 0} + m_TargetDisplay: 0 + m_TargetEye: 3 + m_HDR: 0 + m_AllowMSAA: 1 + m_AllowDynamicResolution: 0 + m_ForceIntoRT: 0 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 --- !u!1001 &1736382262 Prefab: m_ObjectHideFlags: 0 @@ -1715,6 +3374,37 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1848703933 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 1905164251696926, guid: 54a613ba6e982e84db04156af08d6a89, + type: 2} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 1848703934} + m_Layer: 0 + m_Name: Ta + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1848703934 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 4823347666767780, guid: 54a613ba6e982e84db04156af08d6a89, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1848703933} + m_LocalRotation: {x: 0.17188144, y: 0.7050341, z: 0.21990187, w: 0.6519409} + m_LocalPosition: {x: 0.000893312, y: 0.02558266, z: 0.02851765} + m_LocalScale: {x: 1.0000002, y: 1.0000002, z: 1.0000001} + m_Children: + - {fileID: 365802621} + m_Father: {fileID: 860179517} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1898865630 Prefab: m_ObjectHideFlags: 0 @@ -1777,6 +3467,37 @@ Prefab: m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: 7e57e26a714804d3c9f1baa605131856, type: 3} m_IsPrefabParent: 0 +--- !u!1 &2003988303 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 1647411076831720, guid: 54a613ba6e982e84db04156af08d6a89, + type: 2} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 2003988304} + m_Layer: 0 + m_Name: Ta + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2003988304 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 4986867267525168, guid: 54a613ba6e982e84db04156af08d6a89, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 2003988303} + m_LocalRotation: {x: 0.17197049, y: -0.7049472, z: -0.21982582, w: 0.652037} + m_LocalPosition: {x: -0.000890217, y: 0.02558262, z: 0.02851763} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 883942784} + m_Father: {fileID: 1481541975} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2005427645 GameObject: m_ObjectHideFlags: 0 @@ -1842,6 +3563,7 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RenderingLayerMask: 4294967295 m_Materials: - {fileID: 2100000, guid: 611da8dfdd869483bace2e70281e7b29, type: 2} m_StaticBatchInfo: @@ -1895,7 +3617,185 @@ Transform: m_Father: {fileID: 2005427646} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: -16.601002, y: -7.7430005, z: 25.449001} +--- !u!1 &2040219167 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 1799026754646168, guid: 54a613ba6e982e84db04156af08d6a89, + type: 2} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 2040219168} + - component: {fileID: 2040219173} + - component: {fileID: 2040219172} + - component: {fileID: 2040219174} + - component: {fileID: 2040219171} + - component: {fileID: 2040219170} + - component: {fileID: 2040219169} + m_Layer: 0 + m_Name: handL + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2040219168 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 4427160273819458, guid: 54a613ba6e982e84db04156af08d6a89, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 2040219167} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0.25, y: 0.745, z: -0.541} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 239861071} + - {fileID: 955315778} + m_Father: {fileID: 48183874} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &2040219169 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 114589835210473740, guid: 54a613ba6e982e84db04156af08d6a89, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 2040219167} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2b177e4ed656f482db5c87c9876ce9da, type: 3} + m_Name: + m_EditorClassIdentifier: + anim: {fileID: 0} +--- !u!114 &2040219170 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 114128207473628304, guid: 54a613ba6e982e84db04156af08d6a89, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 2040219167} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3fa198f02a3814330938d23cee1fe833, type: 3} + m_Name: + m_EditorClassIdentifier: + hand: 1 + inputMap: {fileID: 11400000, guid: b249a0801fba0f74198588a3ecb37bbe, type: 2} + index: 0 + position: {x: 0, y: 0, z: 0} + rotation: {x: 0, y: 0, z: 0, w: 0} + sitStand: + e00: 0 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 0 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 0 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 0 +--- !u!135 &2040219171 +SphereCollider: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 135139238002636258, guid: 54a613ba6e982e84db04156af08d6a89, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 2040219167} + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_Enabled: 1 + serializedVersion: 2 + m_Radius: 0.15 + m_Center: {x: 0, y: 0, z: 0} +--- !u!138 &2040219172 +FixedJoint: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 138596338900119798, guid: 54a613ba6e982e84db04156af08d6a89, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 2040219167} + m_ConnectedBody: {fileID: 0} + m_BreakForce: Infinity + m_BreakTorque: Infinity + m_EnableCollision: 0 + m_EnablePreprocessing: 1 + m_MassScale: 1 + m_ConnectedMassScale: 1 +--- !u!54 &2040219173 +Rigidbody: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 54027100335586508, guid: 54a613ba6e982e84db04156af08d6a89, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 2040219167} + serializedVersion: 2 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0.05 + m_UseGravity: 0 + m_IsKinematic: 1 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 +--- !u!95 &2040219174 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 95292425453911886, guid: 54a613ba6e982e84db04156af08d6a89, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 2040219167} + m_Enabled: 1 + m_Avatar: {fileID: 9000000, guid: 013217fcf4bba4f3380d9159876fa8ea, type: 3} + m_Controller: {fileID: 9100000, guid: b2216e835b0bdf54ea15eddd311bf60f, type: 2} + m_CullingMode: 1 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!1 &2066780125 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 1509733746680976, guid: 54a613ba6e982e84db04156af08d6a89, + type: 2} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 2066780127} + m_Layer: 0 + m_Name: F1a + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 --- !u!4 &2066780126 stripped Transform: m_PrefabParentObject: {fileID: 400000, guid: 7e57e26a714804d3c9f1baa605131856, type: 3} m_PrefabInternal: {fileID: 908053159} +--- !u!4 &2066780127 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 4086651033436338, guid: 54a613ba6e982e84db04156af08d6a89, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 2066780125} + m_LocalRotation: {x: -0.104454964, y: 0.7062923, z: 0.033938684, w: 0.6993486} + m_LocalPosition: {x: -0.000887241, y: 0.09693762, z: 0.02622143} + m_LocalScale: {x: 1.0000001, y: 0.9999998, z: 0.99999994} + m_Children: + - {fileID: 61252994} + m_Father: {fileID: 860179517} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}