Work on PUN interactions
Rotation working over network but still having issues with colorchanges, it works in simulator but not when built to headset.
This commit is contained in:
Nicklas Bourelius
parent
fd53aa04bb
commit
89532a0987
Assets
GlobePhotonColorControlScript.csGlobePhotonColorControlScript.cs.meta
Oculus
OurScripts
SharedSpatialAnchors
Prefabs/Resources
Scenes
Scripts
ThirdParty/Photon/PhotonUnityNetworking/Resources
ProjectSettings
54
Assets/GlobePhotonColorControlScript.cs
Normal file
54
Assets/GlobePhotonColorControlScript.cs
Normal file
@ -0,0 +1,54 @@
|
||||
using Photon.Pun;
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using UnityEngine;
|
||||
|
||||
public class GlobePhotonColorControlScript : MonoBehaviour
|
||||
{
|
||||
public int selectedYear;
|
||||
public GlobeControllerScript globeControllerScript;
|
||||
public ColorizeCountriesScript colorizeCountriesScript;
|
||||
public PhotonView photonView;
|
||||
|
||||
// Start is called before the first frame update
|
||||
void Start()
|
||||
{
|
||||
selectedYear = 2018;
|
||||
photonView = GetComponent<PhotonView>();
|
||||
var globeController = FindAnyObjectByType<GlobeControllerScript>();
|
||||
globeControllerScript = globeController.GetComponent<GlobeControllerScript>();
|
||||
var colorizeCountries = FindAnyObjectByType<ColorizeCountriesScript>();
|
||||
colorizeCountriesScript = colorizeCountries.GetComponent<ColorizeCountriesScript>();
|
||||
}
|
||||
|
||||
// Update is called once per frame
|
||||
void Update()
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
|
||||
public void SelectNextYear()
|
||||
{
|
||||
selectedYear = Mathf.Min(selectedYear + 1, 2018);
|
||||
Debug.Log("Selected Year: " + selectedYear);
|
||||
photonView.RPC("UpdateYearRPC", RpcTarget.All, selectedYear);
|
||||
//colorizeCountriesScript.ColorizeCountries(selectedYear, this.gameObject);
|
||||
}
|
||||
|
||||
public void SelectPreviousYear()
|
||||
{
|
||||
selectedYear = Mathf.Max(selectedYear - 1, 1991);
|
||||
Debug.Log("Selected Year: " + selectedYear);
|
||||
photonView.RPC("UpdateYearRPC", RpcTarget.All, selectedYear);
|
||||
//colorizeCountriesScript.ColorizeCountries(selectedYear, this.gameObject);
|
||||
}
|
||||
|
||||
[PunRPC]
|
||||
public void UpdateYearRPC(int year)
|
||||
{
|
||||
Debug.Log("Updated to: " + selectedYear);
|
||||
colorizeCountriesScript.ColorizeCountries(year, this.gameObject);
|
||||
}
|
||||
|
||||
}
|
||||
11
Assets/GlobePhotonColorControlScript.cs.meta
Normal file
11
Assets/GlobePhotonColorControlScript.cs.meta
Normal file
@ -0,0 +1,11 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 4c493910d81f67941a139733e5733401
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
defaultReferences: []
|
||||
executionOrder: 0
|
||||
icon: {instanceID: 0}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@ -39,5 +39,5 @@ MonoBehaviour:
|
||||
systemSplashScreen: {fileID: 0}
|
||||
systemSplashScreenType: 0
|
||||
_systemLoadingScreenBackground: 0
|
||||
ovrPluginMd5Win64: e2f96821b9509a5aaf6b44cbb17681838f16294dc8b353245927ecd374ef4ef2
|
||||
ovrPluginMd5Android: b11c9996e5f49cf2c13b34f2f4bb8d16709b89a4a858464e0e3b2e4a1cd2cc19
|
||||
ovrPluginMd5Win64: e2f96821b9509a5aaf6b44cbb176818395d145d4929524dd579e4366a9a795c2
|
||||
ovrPluginMd5Android: b11c9996e5f49cf2c13b34f2f4bb8d16fb8586c8dcddd3f487a213ad3516b72e
|
||||
|
||||
@ -1,3 +1,4 @@
|
||||
using Photon.Pun;
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using UnityEngine;
|
||||
@ -7,7 +8,7 @@ using static OVRPlugin;
|
||||
public class ColorizeCountriesScript : MonoBehaviour
|
||||
{
|
||||
public DataManager dataManager;
|
||||
public WorldMapGlobe map;
|
||||
//public WorldMapGlobe map;
|
||||
|
||||
//public GlobeControllerScript globeController;
|
||||
//int selectedYear;
|
||||
@ -19,13 +20,14 @@ public class ColorizeCountriesScript : MonoBehaviour
|
||||
//map.ToggleCountrySurface("Brazil", true, Color.green);
|
||||
}
|
||||
|
||||
/* void Update()
|
||||
{
|
||||
selectedYear = globeController.selectedYear;
|
||||
}*/
|
||||
|
||||
public void ColorizeCountries(int year)
|
||||
/* void Update()
|
||||
{
|
||||
selectedYear = globeController.selectedYear;
|
||||
}*/
|
||||
[PunRPC]
|
||||
public void ColorizeCountries(int year, GameObject globe)
|
||||
{
|
||||
WorldMapGlobe globeScript = globe.GetComponent<WorldMapGlobe>();
|
||||
List<DataFormatWorld> data = dataManager.GetDataForYear(year);
|
||||
if (data == null)
|
||||
{
|
||||
@ -46,7 +48,7 @@ public class ColorizeCountriesScript : MonoBehaviour
|
||||
{
|
||||
Color color = CalculateColor(entry.co2emissions, minCO2, maxCO2);
|
||||
//Applying the appropriate color to the contry
|
||||
map.ToggleCountrySurface(entry.countryName, true, color);
|
||||
globeScript.ToggleCountrySurface(entry.countryName, true, color);
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,150 +1,165 @@
|
||||
using Photon.Pun;
|
||||
using UnityEngine;
|
||||
using WPM;
|
||||
using PhotonPun = Photon.Pun;
|
||||
using PhotonRealtime = Photon.Realtime;
|
||||
|
||||
public class GlobeInteraction : MonoBehaviour //PunCallbacks
|
||||
public class GlobeControllerScript : MonoBehaviour //PunCallbacks
|
||||
{
|
||||
private bool isInteracting = false;
|
||||
//private bool isInteracting = false;
|
||||
public float rotateSpeed = 100f;
|
||||
private float step;
|
||||
private int selectedYear;
|
||||
public ColorizeCountriesScript colorizeScript;
|
||||
private float rotationY;
|
||||
public float thumbstickThreshold = 0.1f; // Tröskelvärde för att avgöra om thumbsticken används
|
||||
//public int selectedYear;
|
||||
//public ColorizeCountriesScript colorizeScript;
|
||||
public DataManager dataManager;
|
||||
public GameObject globe;
|
||||
public GlobePhotonColorControlScript globePhotonScript;
|
||||
//public PhotonView photonView;
|
||||
|
||||
|
||||
public GameObject globePrefab;
|
||||
//public WorldMapGlobe map;
|
||||
|
||||
void Start()
|
||||
{
|
||||
selectedYear = 2018;
|
||||
|
||||
Debug.Log("BEFOREPassed spawnglobe method");
|
||||
SpawnGlobe();
|
||||
Debug.Log("Passed spawnglobe method");
|
||||
//selectedYear = 2018;
|
||||
|
||||
//map = WorldMapGlobe.instance;
|
||||
|
||||
// TEST
|
||||
//PhotonNetwork.Instantiate("GlobePrefab", Vector3.zero, Quaternion.identity);
|
||||
}
|
||||
|
||||
|
||||
void Update()
|
||||
{
|
||||
|
||||
// Kontrollera om trigger på kontrollen trycks ner Spawna isåfall globen, lägg till block för om en redan finns.
|
||||
if (OVRInput.GetDown(OVRInput.Button.One))
|
||||
{
|
||||
Debug.Log("Y button pressed on controller");
|
||||
SpawnGlobe();
|
||||
}
|
||||
|
||||
//Get thumbstick input för rotation
|
||||
Vector2 thumbstickInput = OVRInput.Get(OVRInput.Axis2D.SecondaryThumbstick);
|
||||
|
||||
//Check to see that its above threshhold, eg being used
|
||||
if (thumbstickInput.magnitude > thumbstickThreshold || Input.GetKeyDown(KeyCode.N))
|
||||
{
|
||||
//photonView.RPC("RotateLeftRPC", RpcTarget.Others);
|
||||
rotationY = OVRInput.Get(OVRInput.Axis2D.SecondaryThumbstick).x;
|
||||
RotateRPC(rotationY);
|
||||
Debug.Log("Pressed N or thumb");
|
||||
|
||||
}
|
||||
|
||||
if (OVRInput.GetDown(OVRInput.Button.PrimaryIndexTrigger))
|
||||
{
|
||||
//selectedYear = Mathf.Min(selectedYear + 1, 2018);
|
||||
globePhotonScript.SelectNextYear();
|
||||
Debug.Log("Pressed Next year ");
|
||||
}
|
||||
if (OVRInput.GetDown(OVRInput.Button.SecondaryIndexTrigger))
|
||||
{
|
||||
//selectedYear = Mathf.Max(selectedYear - 1, 1991);
|
||||
globePhotonScript.SelectPreviousYear();
|
||||
Debug.Log("Pressed prev year ");
|
||||
}
|
||||
}
|
||||
|
||||
private void SpawnGlobe()
|
||||
{
|
||||
Debug.Log("Went to method");
|
||||
var networkedGlobe = PhotonPun.PhotonNetwork.Instantiate(globePrefab.name, new Vector3(0, 0, 0), Quaternion.identity);
|
||||
if (globePrefab == null)
|
||||
{
|
||||
Debug.LogError("Globe prefab is not assigned.");
|
||||
return;
|
||||
}
|
||||
|
||||
var networkedGlobe = PhotonNetwork.Instantiate(globePrefab.name, new Vector3(0, 0, 0), Quaternion.identity);
|
||||
Debug.Log("Instantiated Globe");
|
||||
|
||||
var photonGrabbable = networkedGlobe.GetComponent<PhotonGrabbableObject>();
|
||||
globe = photonGrabbable.gameObject;
|
||||
globePhotonScript = globe.GetComponent<GlobePhotonColorControlScript>();
|
||||
//photonView = networkedGlobe.GetComponent<PhotonView>();
|
||||
|
||||
if (photonGrabbable == null)
|
||||
{
|
||||
Debug.LogError("PhotonGrabbableObject component is missing on the instantiated globe.");
|
||||
return;
|
||||
}
|
||||
|
||||
photonGrabbable.TransferOwnershipToLocalPlayer();
|
||||
Debug.Log("Ownership transferred to local player.");
|
||||
}
|
||||
|
||||
void Update()
|
||||
{/*
|
||||
if (photonView.IsMine && isInteracting)
|
||||
{
|
||||
HandleRotation();
|
||||
ChangeYear();
|
||||
}
|
||||
else
|
||||
{
|
||||
CheckForInteraction();
|
||||
}*/
|
||||
//}
|
||||
|
||||
//**Rotation code**
|
||||
//private void HandleRotation()
|
||||
//{
|
||||
if (OVRInput.Get(OVRInput.Button.SecondaryThumbstickLeft) || Input.GetKeyDown(KeyCode.N))
|
||||
{
|
||||
//photonView.RPC("RotateLeftRPC", RpcTarget.Others);
|
||||
RotateLeftRPC();
|
||||
Debug.Log("Pressed N Left");
|
||||
|
||||
}
|
||||
|
||||
if (OVRInput.Get(OVRInput.Button.SecondaryThumbstickRight) || Input.GetKeyUp(KeyCode.M))
|
||||
{
|
||||
//photonView.RPC("RotateRightRPC", RpcTarget.Others);
|
||||
RotateRightRPC();
|
||||
Debug.Log("Pressed M Right");
|
||||
|
||||
}
|
||||
|
||||
if (OVRInput.Get(OVRInput.Button.One) || Input.GetKeyDown(KeyCode.K))
|
||||
{
|
||||
SelectNextYear();
|
||||
Debug.Log("Pressed Next year K");
|
||||
}
|
||||
if (OVRInput.Get(OVRInput.Button.Two) || Input.GetKeyDown(KeyCode.J))
|
||||
{
|
||||
SelectPreviousYear();
|
||||
Debug.Log("Pressed prev year J");
|
||||
}
|
||||
|
||||
/*if (!OVRInput.Get(OVRInput.Button.PrimaryThumbstickLeft) && !OVRInput.Get(OVRInput.Button.PrimaryThumbstickRight))
|
||||
{
|
||||
isInteracting = false;
|
||||
photonView.RPC("ReleaseOwnership", RpcTarget.All);
|
||||
}*/
|
||||
}
|
||||
|
||||
//[PunRPC]
|
||||
void RotateLeftRPC()
|
||||
[PunRPC]
|
||||
void RotateRPC(float direction)
|
||||
{
|
||||
step = rotateSpeed * Time.deltaTime;
|
||||
step = rotateSpeed * direction * Time.deltaTime;
|
||||
globe.transform.Rotate(0, step, 0);
|
||||
}
|
||||
|
||||
//[PunRPC]
|
||||
void RotateRightRPC()
|
||||
/*void RotateRightRPC()
|
||||
{
|
||||
step = rotateSpeed * Time.deltaTime;
|
||||
globe.transform.Rotate(0, -step, 0);
|
||||
}
|
||||
}*/
|
||||
//**Rotation Code End**
|
||||
|
||||
//**Change Year Code**
|
||||
// private void ChangeYear()
|
||||
// private void ChangeYear()
|
||||
//{
|
||||
/* if (OVRInput.Get(OVRInput.Touch.One))
|
||||
{
|
||||
SelectNextYear();
|
||||
}
|
||||
if (OVRInput.Get(OVRInput.Touch.Two))
|
||||
{
|
||||
SelectPreviousYear();
|
||||
}*/
|
||||
/* if (OVRInput.Get(OVRInput.Touch.One))
|
||||
{
|
||||
SelectNextYear();
|
||||
}
|
||||
if (OVRInput.Get(OVRInput.Touch.Two))
|
||||
{
|
||||
SelectPreviousYear();
|
||||
}*/
|
||||
|
||||
/*if (!OVRInput.Get(OVRInput.Touch.One) && !OVRInput.Get(OVRInput.Touch.Two))
|
||||
{
|
||||
isInteracting = false;
|
||||
photonView.RPC("ReleaseOwnership", RpcTarget.All);
|
||||
}*/
|
||||
/*if (!OVRInput.Get(OVRInput.Touch.One) && !OVRInput.Get(OVRInput.Touch.Two))
|
||||
{
|
||||
isInteracting = false;
|
||||
photonView.RPC("ReleaseOwnership", RpcTarget.All);
|
||||
}*/
|
||||
//}
|
||||
|
||||
void SelectNextYear()
|
||||
/*
|
||||
//[PunRPC]
|
||||
//void SelectNextYear()
|
||||
{
|
||||
|
||||
selectedYear = Mathf.Min(selectedYear + 1, 2018);
|
||||
//photonView.RPC("UpdateSelectedYearRPC", RpcTarget.All, selectedYear);
|
||||
UpdateSelectedYearRPC(selectedYear);
|
||||
}
|
||||
//UpdateSelectedYearRPC(selectedYear);
|
||||
|
||||
Debug.Log("Selected Year: " + selectedYear);
|
||||
colorizeScript.ColorizeCountries(selectedYear, globe);
|
||||
}
|
||||
[PunRPC]
|
||||
void SelectPreviousYear()
|
||||
{
|
||||
selectedYear = Mathf.Max(selectedYear - 1, 1991);
|
||||
//photonView.RPC("UpdateSelectedYearRPC", RpcTarget.All, selectedYear);
|
||||
UpdateSelectedYearRPC(selectedYear);
|
||||
}
|
||||
//UpdateSelectedYearRPC(selectedYear);
|
||||
|
||||
|
||||
Debug.Log("Selected Year: " + selectedYear);
|
||||
colorizeScript.ColorizeCountries(selectedYear, globe);
|
||||
}*/
|
||||
|
||||
/*
|
||||
[PunRPC]
|
||||
void UpdateSelectedYearRPC(int year)
|
||||
{
|
||||
selectedYear = year;
|
||||
Debug.Log("Selected Year: " + selectedYear);
|
||||
colorizeScript.ColorizeCountries(selectedYear);
|
||||
}
|
||||
colorizeScript.ColorizeCountries(selectedYear, globe);
|
||||
}*/
|
||||
|
||||
//**Change Year Code End**
|
||||
|
||||
//**Interaction and Ownership handling**
|
||||
|
||||
@ -0,0 +1,787 @@
|
||||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!1 &1841391562026931893
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 3842958366830969424}
|
||||
- component: {fileID: 2544404813717525821}
|
||||
m_Layer: 0
|
||||
m_Name: GrabInteractable
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &3842958366830969424
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1841391562026931893}
|
||||
serializedVersion: 2
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 4845915175992131303}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!114 &2544404813717525821
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1841391562026931893}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 5a1bc992571301d4a9602ac95ef4c71a, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
_interactorFilters: []
|
||||
_maxInteractors: -1
|
||||
_maxSelectingInteractors: -1
|
||||
_data: {fileID: 0}
|
||||
_pointableElement: {fileID: 6991219106398992493}
|
||||
_rigidbody: {fileID: 5018166209383245865}
|
||||
_grabSource: {fileID: 0}
|
||||
_useClosestPointAsGrabSource: 1
|
||||
_releaseDistance: 0
|
||||
_resetGrabOnGrabsUpdated: 1
|
||||
_physicsGrabbable: {fileID: 8360913207784568672}
|
||||
--- !u!1 &3221958905156704162
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 4845915175992131303}
|
||||
- component: {fileID: 6991219106398992493}
|
||||
- component: {fileID: 8488393094715532146}
|
||||
- component: {fileID: 8360913207784568672}
|
||||
- component: {fileID: 5018166209383245865}
|
||||
- component: {fileID: 144685978841521929}
|
||||
- component: {fileID: 6604386455194602246}
|
||||
- component: {fileID: 6912944617867957795}
|
||||
- component: {fileID: 847531836235365747}
|
||||
m_Layer: 0
|
||||
m_Name: PhotonGrabbableCube 1
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &4845915175992131303
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3221958905156704162}
|
||||
serializedVersion: 2
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
- {fileID: 4272616019530068474}
|
||||
- {fileID: 3842958366830969424}
|
||||
- {fileID: 6233992331740682862}
|
||||
- {fileID: 7088866482443678436}
|
||||
m_Father: {fileID: 0}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!114 &6991219106398992493
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3221958905156704162}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 43f86b14a27b52f4f9298c33015b5c26, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
_transferOnSecondSelection: 0
|
||||
_addNewPointsToFront: 0
|
||||
_forwardElement: {fileID: 0}
|
||||
_oneGrabTransformer: {fileID: 8488393094715532146}
|
||||
_twoGrabTransformer: {fileID: 0}
|
||||
_targetTransform: {fileID: 0}
|
||||
_maxGrabPoints: -1
|
||||
--- !u!114 &8488393094715532146
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3221958905156704162}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 3236b8f205019504589358e7e0412a38, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
_positionConstraints:
|
||||
ConstraintsAreRelative: 0
|
||||
XAxis:
|
||||
ConstrainAxis: 0
|
||||
AxisRange:
|
||||
Min: 0
|
||||
Max: 0
|
||||
YAxis:
|
||||
ConstrainAxis: 0
|
||||
AxisRange:
|
||||
Min: 0
|
||||
Max: 0
|
||||
ZAxis:
|
||||
ConstrainAxis: 0
|
||||
AxisRange:
|
||||
Min: 0
|
||||
Max: 0
|
||||
_rotationConstraints:
|
||||
XAxis:
|
||||
ConstrainAxis: 0
|
||||
AxisRange:
|
||||
Min: 0
|
||||
Max: 0
|
||||
YAxis:
|
||||
ConstrainAxis: 0
|
||||
AxisRange:
|
||||
Min: 0
|
||||
Max: 0
|
||||
ZAxis:
|
||||
ConstrainAxis: 0
|
||||
AxisRange:
|
||||
Min: 0
|
||||
Max: 0
|
||||
--- !u!114 &8360913207784568672
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3221958905156704162}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 1bedaac29a943f844a7074b53c8bdf9f, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
_pointable: {fileID: 6991219106398992493}
|
||||
_rigidbody: {fileID: 5018166209383245865}
|
||||
_scaleMassWithSize: 1
|
||||
--- !u!54 &5018166209383245865
|
||||
Rigidbody:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3221958905156704162}
|
||||
serializedVersion: 4
|
||||
m_Mass: 5
|
||||
m_Drag: 10
|
||||
m_AngularDrag: 10
|
||||
m_CenterOfMass: {x: 0, y: 0, z: 0}
|
||||
m_InertiaTensor: {x: 1, y: 1, z: 1}
|
||||
m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_IncludeLayers:
|
||||
serializedVersion: 2
|
||||
m_Bits: 0
|
||||
m_ExcludeLayers:
|
||||
serializedVersion: 2
|
||||
m_Bits: 0
|
||||
m_ImplicitCom: 1
|
||||
m_ImplicitTensor: 1
|
||||
m_UseGravity: 0
|
||||
m_IsKinematic: 0
|
||||
m_Interpolate: 0
|
||||
m_Constraints: 0
|
||||
m_CollisionDetection: 3
|
||||
--- !u!114 &144685978841521929
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3221958905156704162}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: aa584fbee541324448dd18d8409c7a41, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
ObservedComponentsFoldoutOpen: 1
|
||||
Group: 0
|
||||
prefixField: -1
|
||||
Synchronization: 3
|
||||
OwnershipTransfer: 1
|
||||
observableSearch: 2
|
||||
ObservedComponents:
|
||||
- {fileID: 6604386455194602246}
|
||||
- {fileID: 6912944617867957795}
|
||||
sceneViewId: 0
|
||||
InstantiationId: 0
|
||||
isRuntimeInstantiated: 0
|
||||
--- !u!114 &6604386455194602246
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3221958905156704162}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 627855c7f81362d41938ffe0b1475957, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_SynchronizePosition: 1
|
||||
m_SynchronizeRotation: 1
|
||||
m_SynchronizeScale: 1
|
||||
m_UseLocal: 1
|
||||
--- !u!114 &6912944617867957795
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3221958905156704162}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 64179f3720bbfe947b7724caa67b7c1d, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_SynchronizeVelocity: 1
|
||||
m_SynchronizeAngularVelocity: 1
|
||||
m_TeleportEnabled: 1
|
||||
m_TeleportIfDistanceGreaterThan: 3
|
||||
--- !u!114 &847531836235365747
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3221958905156704162}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 118420a922675d145ade2a28e327d7a5, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!1 &4029595151237844121
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 6233992331740682862}
|
||||
- component: {fileID: 6428903378181003095}
|
||||
- component: {fileID: 8533787906866929429}
|
||||
- component: {fileID: 5635664587236325805}
|
||||
m_Layer: 0
|
||||
m_Name: HandGrabInteractable
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &6233992331740682862
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 4029595151237844121}
|
||||
serializedVersion: 2
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 4845915175992131303}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!114 &6428903378181003095
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 4029595151237844121}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: e9a7676b01585ce43908639a27765dfc, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
_interactorFilters: []
|
||||
_maxInteractors: -1
|
||||
_maxSelectingInteractors: -1
|
||||
_data: {fileID: 0}
|
||||
_pointableElement: {fileID: 6991219106398992493}
|
||||
_rigidbody: {fileID: 5018166209383245865}
|
||||
_physicsGrabbable: {fileID: 8360913207784568672}
|
||||
_resetGrabOnGrabsUpdated: 1
|
||||
_scoringModifier:
|
||||
_positionRotationWeight: 0
|
||||
_slippiness: 0
|
||||
_supportedGrabTypes: 1
|
||||
_pinchGrabRules:
|
||||
_thumbRequirement: 2
|
||||
_indexRequirement: 1
|
||||
_middleRequirement: 1
|
||||
_ringRequirement: 1
|
||||
_pinkyRequirement: 1
|
||||
_unselectMode: 0
|
||||
_palmGrabRules:
|
||||
_thumbRequirement: 2
|
||||
_indexRequirement: 2
|
||||
_middleRequirement: 2
|
||||
_ringRequirement: 2
|
||||
_pinkyRequirement: 2
|
||||
_unselectMode: 0
|
||||
_movementProvider: {fileID: 0}
|
||||
_handAligment: 0
|
||||
_handGrabPoses:
|
||||
- {fileID: 8533787906866929429}
|
||||
--- !u!114 &8533787906866929429
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 4029595151237844121}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 622db80eec0bd344f920b1aa056ae8d0, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
_surface: {fileID: 5635664587236325805}
|
||||
_relativeTo: {fileID: 4845915175992131303}
|
||||
_usesHandPose: 0
|
||||
_handPose:
|
||||
_handedness: 0
|
||||
_fingersFreedom: 0200000002000000010000000100000000000000
|
||||
_jointRotations:
|
||||
- {x: 0.3753869, y: -0.4245841, z: 0.007778856, w: 0.8238644}
|
||||
- {x: 0.2602303, y: -0.02433088, z: -0.125678, w: 0.9570231}
|
||||
- {x: -0.08270377, y: 0.0769617, z: 0.08406223, w: 0.9900357}
|
||||
- {x: 0.08350593, y: -0.06501573, z: 0.05827406, w: 0.9926752}
|
||||
- {x: 0.03068309, y: 0.01885559, z: -0.04328144, w: 0.9984136}
|
||||
- {x: -0.02585241, y: 0.007116061, z: -0.003292944, w: 0.999635}
|
||||
- {x: -0.016056, y: 0.02714872, z: 0.072034, w: 0.9969034}
|
||||
- {x: -0.009066326, y: 0.05146559, z: -0.05183575, w: 0.9972874}
|
||||
- {x: -0.01122823, y: 0.004378874, z: 0.001978267, w: 0.9999254}
|
||||
- {x: -0.03431955, y: 0.004611839, z: 0.09300701, w: 0.9950631}
|
||||
- {x: -0.05315936, y: 0.1231034, z: -0.04981349, w: 0.9897162}
|
||||
- {x: -0.03363252, y: 0.00278984, z: -0.00567602, w: 0.9994143}
|
||||
- {x: -0.003477462, y: -0.02917945, z: 0.02502854, w: 0.9992548}
|
||||
- {x: -0.207036, y: 0.1403428, z: -0.0183118, w: 0.9680417}
|
||||
- {x: 0.09111304, y: -0.00407137, z: -0.02812923, w: 0.9954349}
|
||||
- {x: -0.03761665, y: 0.04293772, z: 0.01328605, w: 0.9982809}
|
||||
- {x: 0.0006447434, y: -0.04917067, z: 0.02401883, w: 0.9985014}
|
||||
--- !u!114 &5635664587236325805
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 4029595151237844121}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 8951a656a7c00e74094166ef415cdce5, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
_collider: {fileID: 3669213732193282467}
|
||||
--- !u!1 &4564432758993287399
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 4272616019530068474}
|
||||
- component: {fileID: 5204800780451180547}
|
||||
- component: {fileID: 8419284263078431121}
|
||||
- component: {fileID: 6073791525896900716}
|
||||
m_Layer: 0
|
||||
m_Name: Visuals
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &4272616019530068474
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 4564432758993287399}
|
||||
serializedVersion: 2
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
- {fileID: 3622713788834399014}
|
||||
m_Father: {fileID: 4845915175992131303}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!114 &5204800780451180547
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 4564432758993287399}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: d5e48d93b64a9ae4f9fd5a728c8f51af, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
_renderers:
|
||||
- {fileID: 3417076111437976598}
|
||||
_vectorProperties: []
|
||||
_colorProperties: []
|
||||
_floatProperties: []
|
||||
_updateEveryFrame: 1
|
||||
--- !u!114 &8419284263078431121
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 4564432758993287399}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 3266c3d920715b84089935c4ab019210, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
_interactableView: {fileID: 6073791525896900716}
|
||||
_editor: {fileID: 5204800780451180547}
|
||||
_colorShaderPropertyName: _Color
|
||||
_normalColorState:
|
||||
Color: {r: 0.83137256, g: 0.83137256, b: 0.83137256, a: 1}
|
||||
ColorCurve:
|
||||
serializedVersion: 2
|
||||
m_Curve:
|
||||
- serializedVersion: 3
|
||||
time: 0
|
||||
value: 0
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 0
|
||||
weightedMode: 0
|
||||
inWeight: 0
|
||||
outWeight: 0
|
||||
- serializedVersion: 3
|
||||
time: 1
|
||||
value: 1
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 0
|
||||
weightedMode: 0
|
||||
inWeight: 0
|
||||
outWeight: 0
|
||||
m_PreInfinity: 2
|
||||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
ColorTime: 0.1
|
||||
_hoverColorState:
|
||||
Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
ColorCurve:
|
||||
serializedVersion: 2
|
||||
m_Curve:
|
||||
- serializedVersion: 3
|
||||
time: 0
|
||||
value: 0
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 0
|
||||
weightedMode: 0
|
||||
inWeight: 0
|
||||
outWeight: 0
|
||||
- serializedVersion: 3
|
||||
time: 1
|
||||
value: 1
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 0
|
||||
weightedMode: 0
|
||||
inWeight: 0
|
||||
outWeight: 0
|
||||
m_PreInfinity: 2
|
||||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
ColorTime: 0.1
|
||||
_selectColorState:
|
||||
Color: {r: 0.83137256, g: 0.83137256, b: 0.83137256, a: 1}
|
||||
ColorCurve:
|
||||
serializedVersion: 2
|
||||
m_Curve:
|
||||
- serializedVersion: 3
|
||||
time: 0
|
||||
value: 0
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 0
|
||||
weightedMode: 0
|
||||
inWeight: 0
|
||||
outWeight: 0
|
||||
- serializedVersion: 3
|
||||
time: 1
|
||||
value: 1
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 0
|
||||
weightedMode: 0
|
||||
inWeight: 0
|
||||
outWeight: 0
|
||||
m_PreInfinity: 2
|
||||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
ColorTime: 0.1
|
||||
_disabledColorState:
|
||||
Color: {r: 0.5, g: 0.5, b: 0.5, a: 1}
|
||||
ColorCurve:
|
||||
serializedVersion: 2
|
||||
m_Curve:
|
||||
- serializedVersion: 3
|
||||
time: 0
|
||||
value: 0
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 0
|
||||
weightedMode: 0
|
||||
inWeight: 0
|
||||
outWeight: 0
|
||||
- serializedVersion: 3
|
||||
time: 1
|
||||
value: 1
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 0
|
||||
weightedMode: 0
|
||||
inWeight: 0
|
||||
outWeight: 0
|
||||
m_PreInfinity: 2
|
||||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
ColorTime: 0.1
|
||||
--- !u!114 &6073791525896900716
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 4564432758993287399}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 4bff16bb2b8cae9409e88ec4d3527c9b, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
_interactables:
|
||||
- {fileID: 2544404813717525821}
|
||||
- {fileID: 6428903378181003095}
|
||||
_data: {fileID: 0}
|
||||
--- !u!1 &6450454850969247481
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 7088866482443678436}
|
||||
- component: {fileID: 8743259545388947644}
|
||||
m_Layer: 0
|
||||
m_Name: Audio
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &7088866482443678436
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6450454850969247481}
|
||||
serializedVersion: 2
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 4845915175992131303}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!114 &8743259545388947644
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6450454850969247481}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: e2f8f6e9e6f3e114b9bf9a57c2160615, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
_pointable: {fileID: 6991219106398992493}
|
||||
_whenRelease:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
_whenHover:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
_whenUnhover:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
_whenSelect:
|
||||
m_PersistentCalls:
|
||||
m_Calls:
|
||||
- m_Target: {fileID: 0}
|
||||
m_TargetAssemblyTypeName: Oculus.Interaction.AudioTrigger, Oculus.Interaction.Samples
|
||||
m_MethodName:
|
||||
m_Mode: 1
|
||||
m_Arguments:
|
||||
m_ObjectArgument: {fileID: 0}
|
||||
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
|
||||
m_IntArgument: 0
|
||||
m_FloatArgument: 0
|
||||
m_StringArgument:
|
||||
m_BoolArgument: 0
|
||||
m_CallState: 2
|
||||
_whenUnselect:
|
||||
m_PersistentCalls:
|
||||
m_Calls:
|
||||
- m_Target: {fileID: 0}
|
||||
m_TargetAssemblyTypeName: Oculus.Interaction.AudioTrigger, Oculus.Interaction.Samples
|
||||
m_MethodName:
|
||||
m_Mode: 1
|
||||
m_Arguments:
|
||||
m_ObjectArgument: {fileID: 0}
|
||||
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
|
||||
m_IntArgument: 0
|
||||
m_FloatArgument: 0
|
||||
m_StringArgument:
|
||||
m_BoolArgument: 0
|
||||
m_CallState: 2
|
||||
_whenMove:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
_whenCancel:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
--- !u!1 &7531080943665285426
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 3622713788834399014}
|
||||
- component: {fileID: 4157341637532237980}
|
||||
- component: {fileID: 3417076111437976598}
|
||||
- component: {fileID: 3669213732193282467}
|
||||
m_Layer: 0
|
||||
m_Name: Mesh
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &3622713788834399014
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7531080943665285426}
|
||||
serializedVersion: 2
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 0.1, y: 0.1, z: 0.1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 4272616019530068474}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!33 &4157341637532237980
|
||||
MeshFilter:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7531080943665285426}
|
||||
m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
|
||||
--- !u!23 &3417076111437976598
|
||||
MeshRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7531080943665285426}
|
||||
m_Enabled: 1
|
||||
m_CastShadows: 1
|
||||
m_ReceiveShadows: 1
|
||||
m_DynamicOccludee: 1
|
||||
m_StaticShadowCaster: 0
|
||||
m_MotionVectors: 1
|
||||
m_LightProbeUsage: 1
|
||||
m_ReflectionProbeUsage: 1
|
||||
m_RayTracingMode: 2
|
||||
m_RayTraceProcedural: 0
|
||||
m_RenderingLayerMask: 1
|
||||
m_RendererPriority: 0
|
||||
m_Materials:
|
||||
- {fileID: 2100000, guid: 67468ba92fc29c949b6698fc969d3931, type: 2}
|
||||
m_StaticBatchInfo:
|
||||
firstSubMesh: 0
|
||||
subMeshCount: 0
|
||||
m_StaticBatchRoot: {fileID: 0}
|
||||
m_ProbeAnchor: {fileID: 0}
|
||||
m_LightProbeVolumeOverride: {fileID: 0}
|
||||
m_ScaleInLightmap: 1
|
||||
m_ReceiveGI: 1
|
||||
m_PreserveUVs: 0
|
||||
m_IgnoreNormalsForChartDetection: 0
|
||||
m_ImportantGI: 0
|
||||
m_StitchLightmapSeams: 1
|
||||
m_SelectedEditorRenderState: 3
|
||||
m_MinimumChartSize: 4
|
||||
m_AutoUVMaxDistance: 0.5
|
||||
m_AutoUVMaxAngle: 89
|
||||
m_LightmapParameters: {fileID: 0}
|
||||
m_SortingLayerID: 0
|
||||
m_SortingLayer: 0
|
||||
m_SortingOrder: 0
|
||||
m_AdditionalVertexStreams: {fileID: 0}
|
||||
--- !u!64 &3669213732193282467
|
||||
MeshCollider:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7531080943665285426}
|
||||
m_Material: {fileID: 0}
|
||||
m_IncludeLayers:
|
||||
serializedVersion: 2
|
||||
m_Bits: 0
|
||||
m_ExcludeLayers:
|
||||
serializedVersion: 2
|
||||
m_Bits: 0
|
||||
m_LayerOverridePriority: 0
|
||||
m_IsTrigger: 0
|
||||
m_ProvidesContacts: 0
|
||||
m_Enabled: 1
|
||||
serializedVersion: 5
|
||||
m_Convex: 1
|
||||
m_CookingOptions: 30
|
||||
m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
|
||||
@ -0,0 +1,7 @@
|
||||
fileFormatVersion: 2
|
||||
guid: aa368f8feb3b1464a9fec4c343cce9d5
|
||||
PrefabImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@ -572,6 +572,7 @@ GameObject:
|
||||
- component: {fileID: -5486952210277217927}
|
||||
- component: {fileID: 7991879063188750820}
|
||||
- component: {fileID: -6688978051257570587}
|
||||
- component: {fileID: -4992002008911229736}
|
||||
m_Layer: 0
|
||||
m_Name: WorldMapGlobeNetworked
|
||||
m_TagString: Untagged
|
||||
@ -587,7 +588,7 @@ Transform:
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7396151283535584159}
|
||||
serializedVersion: 2
|
||||
m_LocalRotation: {x: -0.17471422, y: 0.8436631, z: 0.10294477, w: 0.4971015}
|
||||
m_LocalRotation: {x: 0.085721545, y: -0.41393292, z: 0.18377861, w: 0.88743275}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
@ -3531,7 +3532,7 @@ MonoBehaviour:
|
||||
prefixField: -1
|
||||
Synchronization: 3
|
||||
OwnershipTransfer: 1
|
||||
observableSearch: 2
|
||||
observableSearch: 0
|
||||
ObservedComponents:
|
||||
- {fileID: -1208514937380598629}
|
||||
- {fileID: 6252590898031954898}
|
||||
@ -3688,6 +3689,22 @@ MonoBehaviour:
|
||||
m_Script: {fileID: 11500000, guid: 118420a922675d145ade2a28e327d7a5, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!114 &-4992002008911229736
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7396151283535584159}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 4c493910d81f67941a139733e5733401, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
selectedYear: 2018
|
||||
globeControllerScript: {fileID: 0}
|
||||
colorizeCountriesScript: {fileID: 0}
|
||||
photonView: {fileID: 0}
|
||||
--- !u!1 &7890797501656919946
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
||||
File diff suppressed because one or more lines are too long
@ -100,6 +100,14 @@ public class PhotonAnchorManager : PhotonPun.MonoBehaviourPunCallbacks
|
||||
if (controlPanel)
|
||||
controlPanel.StatusText.text = $"Status: {PhotonPun.PhotonNetwork.NetworkClientState}";
|
||||
}
|
||||
|
||||
//For testing purposes
|
||||
if (OVRInput.Get(OVRInput.Button.PrimaryIndexTrigger))
|
||||
{
|
||||
OnCreateRoomButtonPressed();
|
||||
}
|
||||
//*
|
||||
|
||||
}
|
||||
|
||||
#endregion
|
||||
|
||||
@ -56,6 +56,12 @@ MonoBehaviour:
|
||||
- RotateRightRPC
|
||||
- UpdateSelectedYearRPC
|
||||
- ReleaseOwnership
|
||||
- RotateRPC
|
||||
- SelectNextYear
|
||||
- SelectPreviousYear
|
||||
- ColorizeCountries
|
||||
- updateYearRPC
|
||||
- UpdateYearRPC
|
||||
DisableAutoOpenWizard: 1
|
||||
ShowSettings: 1
|
||||
DevRegionSetOnce: 1
|
||||
|
||||
@ -534,7 +534,7 @@ PlayerSettings:
|
||||
iPhone: 0
|
||||
tvOS: 0
|
||||
overrideDefaultApplicationIdentifier: 1
|
||||
AndroidBundleVersionCode: 39
|
||||
AndroidBundleVersionCode: 45
|
||||
AndroidMinSdkVersion: 32
|
||||
AndroidTargetSdkVersion: 0
|
||||
AndroidPreferredInstallLocation: 0
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user