From 592de1bf096f1287b7f16452415c2617fd3f493f Mon Sep 17 00:00:00 2001 From: Kevin Ring Date: Thu, 14 Dec 2023 23:17:16 +1100 Subject: [PATCH 1/2] Use AssetDatabase.LoadAssetAtPath instead of Resources.Load in Editor --- Runtime/CesiumIonServer.cs | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Runtime/CesiumIonServer.cs b/Runtime/CesiumIonServer.cs index 004e78d1..47697819 100644 --- a/Runtime/CesiumIonServer.cs +++ b/Runtime/CesiumIonServer.cs @@ -65,7 +65,13 @@ public static CesiumIonServer defaultServer { get { +#if UNITY_EDITOR + CesiumIonServer result = AssetDatabase.LoadAssetAtPath( + "Assets/CesiumSettings/Resources/CesiumIonServers/ion.cesium.com.asset", + typeof(CesiumIonServer)) as CesiumIonServer; +#else CesiumIonServer result = Resources.Load("CesiumIonServers/ion.cesium.com"); +#endif #if UNITY_EDITOR if (result == null) From 7606c4a22e6229a933e43c5fe359193d587298d6 Mon Sep 17 00:00:00 2001 From: Kevin Ring Date: Thu, 14 Dec 2023 23:27:30 +1100 Subject: [PATCH 2/2] Update CHANGES.md, bump to v1.7.1. --- CHANGES.md | 6 ++++++ package.json | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGES.md b/CHANGES.md index 618a9e86..03037b7b 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,5 +1,11 @@ # Change Log +### v1.7.1 - 2023-12-14 + +##### Fixes :wrench: + +- Fixed a bug that prevented the default `CesiumIonServer` asset from remembering its token in a clean project. + ### v1.7.0 - 2023-12-14 ##### Additions :tada: diff --git a/package.json b/package.json index 06fa6e2f..93046570 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "com.cesium.unity", - "version": "1.7.0", + "version": "1.7.1", "displayName": "Cesium for Unity", "description": "Cesium for Unity brings the 3D geospatial ecosystem to Unity. By combining a high-accuracy full-scale WGS84 globe, open APIs and open standards for spatial indexing such as 3D Tiles, and cloud-based real-world content from [Cesium ion](https://cesium.com/cesium-ion) with Unity, this plugin enables 3D geospatial workflows and applications in Unity.", "license": "Apache-2.0",