Adjustments
This commit is contained in:
parent
ab5185cde3
commit
c77be0d3e5
Assets
DCDC_Project_Files/CountryInfo and Slider/CountryInfoUI
OurScripts
SharedSpatialAnchors
ThirdParty/Photon/PhotonUnityNetworking/Resources
ProjectSettings
@ -11,6 +11,7 @@ public class SingleCountryDataUI : MonoBehaviour
|
||||
public TMP_Text countryName;
|
||||
public TMP_Text co2ratio;
|
||||
|
||||
|
||||
|
||||
|
||||
// Start is called before the first frame update
|
||||
|
@ -1,5 +1,6 @@
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using Photon.Pun;
|
||||
using TMPro;
|
||||
using UnityEngine;
|
||||
using UnityEngine.InputSystem.XR;
|
||||
@ -8,13 +9,14 @@ public class ThreeDSlider : MonoBehaviour
|
||||
{
|
||||
public GlobeControllerScript globeControllerScript;
|
||||
int year;
|
||||
public PhotonView sliderPhotonView;
|
||||
|
||||
// Start is called before the first frame update
|
||||
void Start()
|
||||
{
|
||||
year = 2018;
|
||||
globeControllerScript = GameObject.Find("GlobeController").GetComponent<GlobeControllerScript>();
|
||||
|
||||
sliderPhotonView = this.GetComponent<PhotonView>();
|
||||
}
|
||||
|
||||
// Update is called once per frame
|
||||
@ -29,10 +31,17 @@ public class ThreeDSlider : MonoBehaviour
|
||||
{
|
||||
year = int.Parse(other.name);
|
||||
Debug.Log("Chose year: " + year.ToString());
|
||||
globeControllerScript.updateYearForAll(year);
|
||||
sliderPhotonView.RPC("ChangeYearRPC", RpcTarget.All, year);
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
[PunRPC]
|
||||
void ChangeYearRPC(int year)
|
||||
{
|
||||
globeControllerScript.updateYearForAll(year);
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
@ -131,6 +131,7 @@ MonoBehaviour:
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
globeControllerScript: {fileID: 0}
|
||||
sliderPhotonView: {fileID: 0}
|
||||
--- !u!114 &778367036782907371
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -557,7 +557,7 @@ Transform:
|
||||
serializedVersion: 2
|
||||
m_LocalRotation: {x: 0.06386786, y: -0.30840605, z: 0.19246735, w: 0.92938846}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_LocalScale: {x: 0.5, y: 0.5, z: 0.5}
|
||||
m_ConstrainProportionsScale: 1
|
||||
m_Children:
|
||||
- {fileID: 3539242263973632390}
|
||||
|
@ -826,7 +826,7 @@ PrefabInstance:
|
||||
- target: {fileID: 2354572584401757569, guid: 66ffb155de7ac9441b9fb9790635558c, type: 3}
|
||||
propertyPath: prefabCountryContainer
|
||||
value:
|
||||
objectReference: {fileID: 7767972221604155437, guid: b320684f447961b4889ab67566a410b0, type: 3}
|
||||
objectReference: {fileID: 258636511145112296, guid: f0004bcf39207ce4eb2e4c823c572f05, type: 3}
|
||||
- target: {fileID: 2354572584401757569, guid: 66ffb155de7ac9441b9fb9790635558c, type: 3}
|
||||
propertyPath: maxNumberOfCountriesDisplayed
|
||||
value: 2
|
||||
@ -835,6 +835,10 @@ PrefabInstance:
|
||||
propertyPath: m_fontStyle
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5507293341175511290, guid: 66ffb155de7ac9441b9fb9790635558c, type: 3}
|
||||
propertyPath: m_Camera
|
||||
value:
|
||||
objectReference: {fileID: 1412402831}
|
||||
- target: {fileID: 5747729682785990289, guid: 66ffb155de7ac9441b9fb9790635558c, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: UI
|
||||
@ -849,7 +853,7 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6055830746814444891, guid: 66ffb155de7ac9441b9fb9790635558c, type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: 3.08
|
||||
value: 2.14
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6055830746814444891, guid: 66ffb155de7ac9441b9fb9790635558c, type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
@ -5222,6 +5226,11 @@ CanvasRenderer:
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1395659657}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!20 &1412402831 stripped
|
||||
Camera:
|
||||
m_CorrespondingSourceObject: {fileID: 5414912244174007119, guid: 60fa00281e83b294583adc31df520fbe, type: 3}
|
||||
m_PrefabInstance: {fileID: 2982998299393685461}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1 &1415638851
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -64,6 +64,7 @@ MonoBehaviour:
|
||||
- UpdateYearRPC
|
||||
- SetData
|
||||
- ShowNewCountryInCanvas
|
||||
- ChangeYearRPC
|
||||
DisableAutoOpenWizard: 1
|
||||
ShowSettings: 1
|
||||
DevRegionSetOnce: 1
|
||||
|
@ -534,7 +534,7 @@ PlayerSettings:
|
||||
iPhone: 0
|
||||
tvOS: 0
|
||||
overrideDefaultApplicationIdentifier: 1
|
||||
AndroidBundleVersionCode: 68
|
||||
AndroidBundleVersionCode: 70
|
||||
AndroidMinSdkVersion: 32
|
||||
AndroidTargetSdkVersion: 0
|
||||
AndroidPreferredInstallLocation: 0
|
||||
|
Loading…
x
Reference in New Issue
Block a user