666 (d89018cf) · Commits · 聂雨荷 / hololens2

Assets/MixedRealityToolkit.Generated/ProjectPreferences.asset

+2 −1

Original line number	Diff line number	Diff line
		@@ -18,7 +18,8 @@ MonoBehaviour:
		- _MixedRealityToolkit_Editor_LockProfiles
		- MixedRealityToolkit_Editor_RunOptimalConfig
		- MixedRealityToolkit_Editor_NullDataProviders
		values: 01010100
		- _MixedRealityToolkit_Editor_AutoEnableUWPCapabilities
		values: 0101010001
		intPreferences:
		keys:
		- _MixedRealityToolkit_Editor_ConfiguratorState

Assets/Script/CityManager.cs

+30 −25

Original line number	Diff line number	Diff line
		@@ -9,6 +9,7 @@ using UnityEngine.UI;

		public class CityManager : MonoBehaviour
		{
		public Camera camera;
		// Start is called before the first frame update
		void Start()
		{
		@@ -28,7 +29,8 @@ public class CityManager : MonoBehaviour
		if (board.IsNull())
		{
		board = (GameObject)Resources.Load("Prefabs/GeographyBoard");
		Instantiate(board);
		GameObject i = Instantiate(board);
		i.transform.gameObject.GetComponent<Canvas>().worldCamera = camera;
		}
		else
		{
		@@ -120,30 +122,33 @@ public class CityManager : MonoBehaviour
		{
		while (true)
		{
		string locUrl =
		"https://api.map.baidu.com/geoconv/v1/?from=1&to=5&ak=UexT0eqWG8q7X6YF1DQmSw3K3mH5dSw8&coords=";
		locUrl += Input.location.lastData.longitude.ToString() +
		"," + Input.location.lastData.latitude.ToString();
		Debug.Log(locUrl);
		HttpRequest locRequest = new HttpRequest();
		StartCoroutine(locRequest.Get(locUrl));
		while (!locRequest.isComplete)
		{
		yield return new WaitForSeconds(1);
		}

		if (int.Parse(locRequest.value["status"].ToString()) == 0)
		{
		if (Math.Abs(User.GetInstance().Longitude - float.Parse(locRequest.value["result"]["x"].ToString())) >
		0.0001 \|\|
		Math.Abs(User.GetInstance().Latitude - float.Parse(locRequest.value["result"]["y"].ToString())) >
		0.0001)
		{
		User.GetInstance().Longitude = float.Parse(locRequest.value["result"]["x"].ToString());
		User.GetInstance().Latitude = float.Parse(locRequest.value["result"]["y"].ToString());
		User.GetInstance().Longitude = float.Parse(Input.location.lastData.longitude.ToString());
		User.GetInstance().Latitude = float.Parse(Input.location.lastData.latitude.ToString());
		StartCoroutine(nameof(GetLocationDetails));
		}
		}
		// string locUrl =
		// "https://api.map.baidu.com/geoconv/v1/?from=1&to=5&ak=UexT0eqWG8q7X6YF1DQmSw3K3mH5dSw8&coords=";
		// locUrl += Input.location.lastData.longitude.ToString() +
		// "," + Input.location.lastData.latitude.ToString();
		// Debug.Log(locUrl);
		// HttpRequest locRequest = new HttpRequest();
		// StartCoroutine(locRequest.Get(locUrl));
		// while (!locRequest.isComplete)
		// {
		// yield return new WaitForSeconds(1);
		// }
		//
		// if (int.Parse(locRequest.value["status"].ToString()) == 0)
		// {
		// if (Math.Abs(User.GetInstance().Longitude - float.Parse(locRequest.value["result"]["x"].ToString())) >
		// 0.0001 \|\|
		// Math.Abs(User.GetInstance().Latitude - float.Parse(locRequest.value["result"]["y"].ToString())) >
		// 0.0001)
		// {
		// User.GetInstance().Longitude = float.Parse(locRequest.value["result"]["x"].ToString());
		// User.GetInstance().Latitude = float.Parse(locRequest.value["result"]["y"].ToString());
		// StartCoroutine(nameof(GetLocationDetails));
		// }
		// }


		yield return new WaitForSeconds(5);

Assets/Script/GeographyManager.cs

+0 −1

Original line number	Diff line number	Diff line
		@@ -5,7 +5,6 @@ using Script;
		using UnityEngine;
		using UnityEngine.Networking;
		using UnityEngine.UI;
		using UnityEngine.UIElements;
		using XCharts;
		using Image = UnityEngine.UI.Image;

ProjectSettings/InputManager.asset

+624 −0

Original line number	Diff line number	Diff line
		@@ -773,3 +773,627 @@ InputManager:
		type: 2
		axis: 2
		joyNum: 0
		- serializedVersion: 3
		m_Name: XRI_Left_Primary2DAxis_Vertical
		descriptiveName: Device joystick/touchpad horizontal motion
		descriptiveNegativeName:
		negativeButton:
		positiveButton:
		altNegativeButton:
		altPositiveButton:
		gravity: 0
		dead: 0.19
		sensitivity: 1
		snap: 0
		invert: 0
		type: 2
		axis: 1
		joyNum: 0
		- serializedVersion: 3
		m_Name: XRI_Left_Primary2DAxis_Horizontal
		descriptiveName: Device joystick/touchpad horizontal motion
		descriptiveNegativeName:
		negativeButton:
		positiveButton:
		altNegativeButton:
		altPositiveButton:
		gravity: 0
		dead: 0.19
		sensitivity: 1
		snap: 0
		invert: 0
		type: 2
		axis: 0
		joyNum: 0
		- serializedVersion: 3
		m_Name: XRI_Left_Secondary2DAxis_Vertical
		descriptiveName: Device joystick/touchpad horizontal motion.
		descriptiveNegativeName:
		negativeButton:
		positiveButton:
		altNegativeButton:
		altPositiveButton:
		gravity: 0
		dead: 0.19
		sensitivity: 1
		snap: 0
		invert: 0
		type: 2
		axis: 17
		joyNum: 0
		- serializedVersion: 3
		m_Name: XRI_Left_Secondary2DAxis_Horizontal
		descriptiveName: Device joystick/touchpad horizontal motion
		descriptiveNegativeName:
		negativeButton:
		positiveButton:
		altNegativeButton:
		altPositiveButton:
		gravity: 0
		dead: 0.19
		sensitivity: 1
		snap: 0
		invert: 0
		type: 2
		axis: 16
		joyNum: 0
		- serializedVersion: 3
		m_Name: XRI_Left_Trigger
		descriptiveName: Device trigger axis
		descriptiveNegativeName:
		negativeButton:
		positiveButton:
		altNegativeButton:
		altPositiveButton:
		gravity: 0
		dead: 0.001
		sensitivity: 1
		snap: 0
		invert: 0
		type: 2
		axis: 8
		joyNum: 0
		- serializedVersion: 3
		m_Name: XRI_Left_Grip
		descriptiveName: Device grip axis
		descriptiveNegativeName:
		negativeButton:
		positiveButton:
		altNegativeButton:
		altPositiveButton:
		gravity: 0
		dead: 0.001
		sensitivity: 1
		snap: 0
		invert: 0
		type: 2
		axis: 10
		joyNum: 0
		- serializedVersion: 3
		m_Name: XRI_Left_IndexTouch
		descriptiveName: Device index finger proximity touch axis.
		descriptiveNegativeName:
		negativeButton:
		positiveButton:
		altNegativeButton:
		altPositiveButton:
		gravity: 0
		dead: 0.19
		sensitivity: 1
		snap: 0
		invert: 0
		type: 2
		axis: 12
		joyNum: 0
		- serializedVersion: 3
		m_Name: XRI_Left_ThumbTouch
		descriptiveName: Device thumb proximity touch axis
		descriptiveNegativeName:
		negativeButton:
		positiveButton:
		altNegativeButton:
		altPositiveButton:
		gravity: 0
		dead: 0.19
		sensitivity: 1
		snap: 0
		invert: 0
		type: 2
		axis: 14
		joyNum: 0
		- serializedVersion: 3
		m_Name: XRI_Left_PrimaryButton
		descriptiveName: Device primary button
		descriptiveNegativeName:
		negativeButton:
		positiveButton: joystick button 2
		altNegativeButton:
		altPositiveButton:
		gravity: 1000
		dead: 0.001
		sensitivity: 1000
		snap: 0
		invert: 0
		type: 0
		axis: 0
		joyNum: 0
		- serializedVersion: 3
		m_Name: XRI_Left_SecondaryButton
		descriptiveName: Device secondary button
		descriptiveNegativeName:
		negativeButton:
		positiveButton: joystick button 3
		altNegativeButton:
		altPositiveButton:
		gravity: 1000
		dead: 0.001
		sensitivity: 1000
		snap: 0
		invert: 0
		type: 0
		axis: 0
		joyNum: 0
		- serializedVersion: 3
		m_Name: XRI_Left_PrimaryTouch
		descriptiveName: Device primary touch
		descriptiveNegativeName:
		negativeButton:
		positiveButton: joystick button 12
		altNegativeButton:
		altPositiveButton:
		gravity: 0
		dead: 0
		sensitivity: 0.1
		snap: 0
		invert: 0
		type: 0
		axis: 0
		joyNum: 0
		- serializedVersion: 3
		m_Name: XRI_Left_SecondaryTouch
		descriptiveName: Device secondary button
		descriptiveNegativeName:
		negativeButton:
		positiveButton: joystick button 13
		altNegativeButton:
		altPositiveButton:
		gravity: 0
		dead: 0
		sensitivity: 0.1
		snap: 0
		invert: 0
		type: 0
		axis: 0
		joyNum: 0
		- serializedVersion: 3
		m_Name: XRI_Left_GripButton
		descriptiveName: Device grip button
		descriptiveNegativeName:
		negativeButton:
		positiveButton: joystick button 4
		altNegativeButton:
		altPositiveButton:
		gravity: 0
		dead: 0
		sensitivity: 0.1
		snap: 0
		invert: 0
		type: 0
		axis: 0
		joyNum: 0
		- serializedVersion: 3
		m_Name: XRI_Left_TriggerButton
		descriptiveName: Device trigger button
		descriptiveNegativeName:
		negativeButton:
		positiveButton: joystick button 14
		altNegativeButton:
		altPositiveButton:
		gravity: 0
		dead: 0
		sensitivity: 0.1
		snap: 0
		invert: 0
		type: 0
		axis: 0
		joyNum: 0
		- serializedVersion: 3
		m_Name: XRI_Left_MenuButton
		descriptiveName: Device menu button
		descriptiveNegativeName:
		negativeButton:
		positiveButton: joystick button 6
		altNegativeButton:
		altPositiveButton:
		gravity: 1000
		dead: 0.001
		sensitivity: 1000
		snap: 0
		invert: 0
		type: 0
		axis: 0
		joyNum: 0
		- serializedVersion: 3
		m_Name: XRI_Left_Primary2DAxisClick
		descriptiveName: Device stick/touchpad click
		descriptiveNegativeName:
		negativeButton:
		positiveButton: joystick button 8
		altNegativeButton:
		altPositiveButton:
		gravity: 0
		dead: 0
		sensitivity: 0.1
		snap: 0
		invert: 0
		type: 0
		axis: 0
		joyNum: 0
		- serializedVersion: 3
		m_Name: XRI_Left_Primary2DAxisTouch
		descriptiveName: Device stick/touchpad touch
		descriptiveNegativeName:
		negativeButton:
		positiveButton: joystick button 16
		altNegativeButton:
		altPositiveButton:
		gravity: 0
		dead: 0
		sensitivity: 0.1
		snap: 0
		invert: 0
		type: 0
		axis: 0
		joyNum: 0
		- serializedVersion: 3
		m_Name: XRI_Left_Thumbrest
		descriptiveName: Device thumbrest
		descriptiveNegativeName:
		negativeButton:
		positiveButton: joystick button 18
		altNegativeButton:
		altPositiveButton:
		gravity: 0
		dead: 0
		sensitivity: 0.1
		snap: 0
		invert: 0
		type: 0
		axis: 0
		joyNum: 0
		- serializedVersion: 3
		m_Name: XRI_Right_Primary2DAxis_Vertical
		descriptiveName: Device joystick/touchpad horizontal motion
		descriptiveNegativeName:
		negativeButton:
		positiveButton:
		altNegativeButton:
		altPositiveButton:
		gravity: 0
		dead: 0.19
		sensitivity: 1
		snap: 0
		invert: 0
		type: 2
		axis: 4
		joyNum: 0
		- serializedVersion: 3
		m_Name: XRI_Right_Primary2DAxis_Horizontal
		descriptiveName: Device joystick/touchpad horizontal motion
		descriptiveNegativeName:
		negativeButton:
		positiveButton:
		altNegativeButton:
		altPositiveButton:
		gravity: 0
		dead: 0.19
		sensitivity: 1
		snap: 0
		invert: 0
		type: 2
		axis: 3
		joyNum: 0
		- serializedVersion: 3
		m_Name: XRI_Right_Secondary2DAxis_Vertical
		descriptiveName: Device joystick/touchpad horizontal motion.
		descriptiveNegativeName:
		negativeButton:
		positiveButton:
		altNegativeButton:
		altPositiveButton:
		gravity: 0
		dead: 0.19
		sensitivity: 1
		snap: 0
		invert: 0
		type: 2
		axis: 19
		joyNum: 0
		- serializedVersion: 3
		m_Name: XRI_Right_Secondary2DAxis_Horizontal
		descriptiveName: Device joystick/touchpad horizontal motion
		descriptiveNegativeName:
		negativeButton:
		positiveButton:
		altNegativeButton:
		altPositiveButton:
		gravity: 0
		dead: 0.19
		sensitivity: 1
		snap: 0
		invert: 0
		type: 2
		axis: 18
		joyNum: 0
		- serializedVersion: 3
		m_Name: XRI_Right_Trigger
		descriptiveName: Device trigger axis
		descriptiveNegativeName:
		negativeButton:
		positiveButton:
		altNegativeButton:
		altPositiveButton:
		gravity: 0
		dead: 0.001
		sensitivity: 1
		snap: 0
		invert: 0
		type: 2
		axis: 9
		joyNum: 0
		- serializedVersion: 3
		m_Name: XRI_Right_Grip
		descriptiveName: Device grip axis
		descriptiveNegativeName:
		negativeButton:
		positiveButton:
		altNegativeButton:
		altPositiveButton:
		gravity: 0
		dead: 0.001
		sensitivity: 1
		snap: 0
		invert: 0
		type: 2
		axis: 11
		joyNum: 0
		- serializedVersion: 3
		m_Name: XRI_Right_IndexTouch
		descriptiveName: Device index finger proximity touch axis.
		descriptiveNegativeName:
		negativeButton:
		positiveButton:
		altNegativeButton:
		altPositiveButton:
		gravity: 0
		dead: 0.19
		sensitivity: 1
		snap: 0
		invert: 0
		type: 2
		axis: 13
		joyNum: 0
		- serializedVersion: 3
		m_Name: XRI_Right_ThumbTouch
		descriptiveName: Device thumb proximity touch axis
		descriptiveNegativeName:
		negativeButton:
		positiveButton:
		altNegativeButton:
		altPositiveButton:
		gravity: 0
		dead: 0.19
		sensitivity: 1
		snap: 0
		invert: 0
		type: 2
		axis: 15
		joyNum: 0
		- serializedVersion: 3
		m_Name: XRI_Right_PrimaryButton
		descriptiveName: Device primary button
		descriptiveNegativeName:
		negativeButton:
		positiveButton: joystick button 0
		altNegativeButton:
		altPositiveButton:
		gravity: 1000
		dead: 0.001
		sensitivity: 1000
		snap: 0
		invert: 0
		type: 0
		axis: 0
		joyNum: 0
		- serializedVersion: 3
		m_Name: XRI_Right_SecondaryButton
		descriptiveName: Device secondary button
		descriptiveNegativeName:
		negativeButton:
		positiveButton: joystick button 1
		altNegativeButton:
		altPositiveButton:
		gravity: 1000
		dead: 0.001
		sensitivity: 1000
		snap: 0
		invert: 0
		type: 0
		axis: 0
		joyNum: 0
		- serializedVersion: 3
		m_Name: XRI_Right_PrimaryTouch
		descriptiveName: Device primary touch
		descriptiveNegativeName:
		negativeButton:
		positiveButton: joystick button 10
		altNegativeButton:
		altPositiveButton:
		gravity: 0
		dead: 0
		sensitivity: 0.1
		snap: 0
		invert: 0
		type: 0
		axis: 0
		joyNum: 0
		- serializedVersion: 3
		m_Name: XRI_Right_SecondaryTouch
		descriptiveName: Device secondary button
		descriptiveNegativeName:
		negativeButton:
		positiveButton: joystick button 11
		altNegativeButton:
		altPositiveButton:
		gravity: 0
		dead: 0
		sensitivity: 0.1
		snap: 0
		invert: 0
		type: 0
		axis: 0
		joyNum: 0
		- serializedVersion: 3
		m_Name: XRI_Right_GripButton
		descriptiveName: Device grip button
		descriptiveNegativeName:
		negativeButton:
		positiveButton: joystick button 5
		altNegativeButton:
		altPositiveButton:
		gravity: 0
		dead: 0
		sensitivity: 0.1
		snap: 0
		invert: 0
		type: 0
		axis: 0
		joyNum: 0
		- serializedVersion: 3
		m_Name: XRI_Right_TriggerButton
		descriptiveName: Device trigger button
		descriptiveNegativeName:
		negativeButton:
		positiveButton: joystick button 15
		altNegativeButton:
		altPositiveButton:
		gravity: 0
		dead: 0
		sensitivity: 0.1
		snap: 0
		invert: 0
		type: 0
		axis: 0
		joyNum: 0
		- serializedVersion: 3
		m_Name: XRI_Right_MenuButton
		descriptiveName: Device menu button
		descriptiveNegativeName:
		negativeButton:
		positiveButton: joystick button 7
		altNegativeButton:
		altPositiveButton:
		gravity: 1000
		dead: 0.001
		sensitivity: 1000
		snap: 0
		invert: 0
		type: 0
		axis: 0
		joyNum: 0
		- serializedVersion: 3
		m_Name: XRI_Right_Primary2DAxisClick
		descriptiveName: Device stick/touchpad click
		descriptiveNegativeName:
		negativeButton:
		positiveButton: joystick button 9
		altNegativeButton:
		altPositiveButton:
		gravity: 0
		dead: 0
		sensitivity: 0.1
		snap: 0
		invert: 0
		type: 0
		axis: 0
		joyNum: 0
		- serializedVersion: 3
		m_Name: XRI_Right_Primary2DAxisTouch
		descriptiveName: Device stick/touchpad touch
		descriptiveNegativeName:
		negativeButton:
		positiveButton: joystick button 17
		altNegativeButton:
		altPositiveButton:
		gravity: 0
		dead: 0
		sensitivity: 0.1
		snap: 0
		invert: 0
		type: 0
		axis: 0
		joyNum: 0
		- serializedVersion: 3
		m_Name: XRI_Right_Thumbrest
		descriptiveName: Device thumbrest
		descriptiveNegativeName:
		negativeButton:
		positiveButton: joystick button 19
		altNegativeButton:
		altPositiveButton:
		gravity: 0
		dead: 0
		sensitivity: 0.1
		snap: 0
		invert: 0
		type: 0
		axis: 0
		joyNum: 0
		- serializedVersion: 3
		m_Name: XRI_Combined_Trigger
		descriptiveName: Combined Trigger
		descriptiveNegativeName:
		negativeButton:
		positiveButton:
		altNegativeButton:
		altPositiveButton:
		gravity: 0
		dead: 0.19
		sensitivity: 1
		snap: 0
		invert: 0
		type: 2
		axis: 2
		joyNum: 0
		- serializedVersion: 3
		m_Name: XRI_DPad_Vertical
		descriptiveName: Device directional pad. These values are replicated l/r
		descriptiveNegativeName:
		negativeButton:
		positiveButton:
		altNegativeButton:
		altPositiveButton:
		gravity: 0
		dead: 0.001
		sensitivity: 1
		snap: 0
		invert: 0
		type: 2
		axis: 6
		joyNum: 0
		- serializedVersion: 3
		m_Name: XRI_DPad_Horizontal
		descriptiveName: Device directional pad. These values are replicated l/r
		descriptiveNegativeName:
		negativeButton:
		positiveButton:
		altNegativeButton:
		altPositiveButton:
		gravity: 0
		dead: 0.001
		sensitivity: 1
		snap: 0
		invert: 0
		type: 2
		axis: 5
		joyNum: 0

ProjectSettings/ProjectSettings.asset

+1 −2

Original line number	Diff line number	Diff line
		@@ -137,7 +137,6 @@ PlayerSettings:
		- {fileID: 0}
		- {fileID: 9118675918475686074, guid: a1778138968d3e8498567472f4330129, type: 2}
		- {fileID: -8760679359998906221, guid: 0a61dd4b1707b3c44aff4e602403b2bc, type: 2}
		- {fileID: 0}
		metroInputSource: 0
		wsaTransparentSwapchain: 0
		m_HolographicPauseOnTrackingLoss: 1
		@@ -662,10 +661,10 @@ PlayerSettings:
		PointOfService: True
		RecordedCallsFolder: True
		Contacts: True
		InternetClient: True
		Proximity: True
		CodeGeneration: True
		BackgroundMediaPlayback: True
		InternetClient: True
		metroTargetDeviceFamilies:
		Holographic: True
		metroFTAName:

Admin message