updates for 0.7

alffanclub · alffanclub · commit 3535f9075c00 · 2019-04-10T14:42:35.000-05:00
diff --git a/Basic AssetReference/Assets/Scripts/ListOfReferences.cs b/Basic AssetReference/Assets/Scripts/ListOfReferences.cs
@@ -23,7 +23,7 @@ void Start ()
 		}
 	}
 
-	void OnShapeLoaded(IAsyncOperation<GameObject> obj)
+	void OnShapeLoaded(AsyncOperationHandle<GameObject> obj)
 	{
 		m_ToLoadCount--;
 		if (m_ToLoadCount <= 0)
diff --git a/Basic AssetReference/Packages/manifest.json b/Basic AssetReference/Packages/manifest.json
@@ -1,11 +1,12 @@
 {
   "dependencies": {
-    "com.unity.addressables": "0.6.7-preview",
-    "com.unity.ads": "2.0.8",
-    "com.unity.analytics": "2.0.16",
-    "com.unity.package-manager-ui": "1.9.11",
+    "com.unity.addressables": "0.7.1-preview",
+    "com.unity.ads": "2.3.1",
+    "com.unity.analytics": "3.2.2",
+    "com.unity.collab-proxy": "1.2.15",
+    "com.unity.package-manager-ui": "2.0.3",
     "com.unity.purchasing": "2.0.3",
-    "com.unity.textmeshpro": "1.2.4",
+    "com.unity.textmeshpro": "1.3.0",
     "com.unity.modules.ai": "1.0.0",
     "com.unity.modules.animation": "1.0.0",
     "com.unity.modules.assetbundle": "1.0.0",
@@ -36,5 +37,6 @@
     "com.unity.modules.vr": "1.0.0",
     "com.unity.modules.wind": "1.0.0",
     "com.unity.modules.xr": "1.0.0"
-  }
+  },
+  "registry": "https://staging-packages.unity.com"
 }
diff --git a/Scene Loading/Assets/AddScenes.cs b/Scene Loading/Assets/AddScenes.cs
@@ -4,6 +4,7 @@
 using UnityEngine.AddressableAssets;
 using UnityEngine.ResourceManagement;
 using UnityEngine.ResourceManagement.AsyncOperations;
+using UnityEngine.ResourceManagement.ResourceProviders;
 using UnityEngine.SceneManagement;
 using UnityEngine.Serialization;
 using UnityEngine.UI;
@@ -13,7 +14,7 @@ public class AddScenes : MonoBehaviour
 	public string addressToAdd;
 	Button m_AddButton;
 	public TMPro.TMP_Text textArea;
-	Scene m_LoadedScene;
+	SceneInstance m_LoadedScene;
 	bool m_ReadyToLoad = true;
 	// Use this for initialization
 	void Start () {
@@ -39,21 +40,21 @@ void OnButtonClick()
 		}
 	}
 
-	void OnSceneUnloaded(IAsyncOperation<Scene> obj)
+	void OnSceneUnloaded(AsyncOperationHandle<SceneInstance> obj)
 	{
 		if (obj.Status == AsyncOperationStatus.Succeeded)
 		{
 			textArea.text = "Reload " + addressToAdd;
 			m_ReadyToLoad = true;
-			m_LoadedScene = new Scene();
+			m_LoadedScene = new SceneInstance();
 		}
 		else
 		{
 			Debug.LogError("Failed to unload scene at address: " + addressToAdd);
 		}
 	}
 
-	void OnSceneLoaded(IAsyncOperation<Scene> obj)
+	void OnSceneLoaded(AsyncOperationHandle<SceneInstance> obj)
 	{
 		if (obj.Status == AsyncOperationStatus.Succeeded)
 		{
diff --git a/Scene Loading/Packages/manifest.json b/Scene Loading/Packages/manifest.json
@@ -1,6 +1,6 @@
 {
   "dependencies": {
-    "com.unity.addressables": "0.6.7-preview",
+    "com.unity.addressables": "0.7.0-preview",
     "com.unity.ads": "2.3.1",
     "com.unity.analytics": "3.2.2",
     "com.unity.collab-proxy": "1.2.15",
@@ -37,5 +37,6 @@
     "com.unity.modules.vr": "1.0.0",
     "com.unity.modules.wind": "1.0.0",
     "com.unity.modules.xr": "1.0.0"
-  }
+  },
+  "registry": "https://staging-packages.unity.com"
 }
diff --git a/Sprite Land/Assets/Scripts/SpriteControlTest.cs b/Sprite Land/Assets/Scripts/SpriteControlTest.cs
@@ -40,8 +40,8 @@ void Update()
             singleEntry = null;
         }
     }
-
-    void SingleDone(IAsyncOperation<Sprite> op)
+    
+    void SingleDone(AsyncOperationHandle<Sprite> op)
     {
         if (op.Result == null)
         {
@@ -53,7 +53,7 @@ void SingleDone(IAsyncOperation<Sprite> op)
         singleEntry = op.Result;
     }
 
-    void SheetDone(IAsyncOperation<IList<Sprite>> op)
+    void SheetDone(AsyncOperationHandle<IList<Sprite>> op)
     {
         if (op.Result == null)
         {
diff --git a/Sprite Land/Packages/manifest.json b/Sprite Land/Packages/manifest.json
@@ -1,6 +1,6 @@
 {
   "dependencies": {
-	"com.unity.addressables": "0.6.7-preview",
+	"com.unity.addressables": "0.7.0-preview",
     "com.unity.ads": "2.3.1",
     "com.unity.analytics": "3.2.2",
     "com.unity.collab-proxy": "1.2.15",
@@ -37,5 +37,6 @@
     "com.unity.modules.vr": "1.0.0",
     "com.unity.modules.wind": "1.0.0",
     "com.unity.modules.xr": "1.0.0"
-  }
+  },
+  "registry": "https://staging-packages.unity.com"
 }
diff --git a/Texture Variations/Assets/Editor/BuildScriptInherited.cs b/Texture Variations/Assets/Editor/BuildScriptInherited.cs
@@ -19,11 +19,11 @@ public override string Name
         get { return "Pack Variations"; }
     }
 
-    protected override TResult BuildDataImplementation<TResult>(IDataBuilderContext context)
+    protected override TResult BuildDataImplementation<TResult>(AddressablesDataBuilderInput context)
     {
         var result = base.BuildDataImplementation<TResult>(context);
-        
-        AddressableAssetSettings settings = context.GetValue<AddressableAssetSettings>(AddressablesBuildDataBuilderContext.BuildScriptContextConstants.kAddressableAssetSettings);
+
+        AddressableAssetSettings settings = context.AddressableSettings;
         DoCleanup(settings);
         return result;
     }
diff --git a/Texture Variations/Assets/Editor/BuildScriptInheritedFastMode.cs b/Texture Variations/Assets/Editor/BuildScriptInheritedFastMode.cs
@@ -19,11 +19,11 @@ public override string Name
         get { return "Vary Fast"; }
     }
 
-    protected override TResult BuildDataImplementation<TResult>(IDataBuilderContext context)
+    protected override TResult BuildDataImplementation<TResult>(AddressablesDataBuilderInput context)
     {
         var result = base.BuildDataImplementation<TResult>(context);
-        
-        AddressableAssetSettings settings = context.GetValue<AddressableAssetSettings>(AddressablesBuildDataBuilderContext.BuildScriptContextConstants.kAddressableAssetSettings);
+
+        AddressableAssetSettings settings = context.AddressableSettings;
         DoCleanup(settings);
         return result;
     }
diff --git a/Texture Variations/Assets/Editor/BuildScriptInheritedVirtualMode.cs b/Texture Variations/Assets/Editor/BuildScriptInheritedVirtualMode.cs
@@ -20,11 +20,11 @@ public override string Name
         get { return "Virtual Variety"; }
     }
 
-    protected override TResult BuildDataImplementation<TResult>(IDataBuilderContext context)
+    protected override TResult BuildDataImplementation<TResult>(AddressablesDataBuilderInput context)
     {
         var result = base.BuildDataImplementation<TResult>(context);
-        
-        AddressableAssetSettings settings = context.GetValue<AddressableAssetSettings>(AddressablesBuildDataBuilderContext.BuildScriptContextConstants.kAddressableAssetSettings);
+
+        AddressableAssetSettings settings = context.AddressableSettings;
         DoCleanup(settings);
         return result;
     }
diff --git a/Texture Variations/Packages/manifest.json b/Texture Variations/Packages/manifest.json
@@ -1,8 +1,6 @@
 {
   "dependencies": {
-	"com.unity.addressables": "file:../../../AddressablesDemo_cds/AddressablesDemo/Packages/com.unity.addressables",
-	"com.unity.scriptablebuildpipeline": "file:../../../AddressablesDemo_cds/AddressablesDemo/Packages/com.unity.scriptablebuildpipeline",
-	"com.unity.scriptablebuildpipeline.experimental": "file:../../../AddressablesDemo_cds/AddressablesDemo/Packages/com.unity.scriptablebuildpipeline.experimental",
+	"com.unity.addressables": "0.7.0-preview",
     "com.unity.ads": "2.3.1",
     "com.unity.analytics": "3.2.2",
     "com.unity.collab-proxy": "1.2.15",

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ void Start ()`
`23`	`23`	`}`
`24`	`24`	`}`
`25`	`25`
`26`		`- void OnShapeLoaded(IAsyncOperation<GameObject> obj)`
	`26`	`+ void OnShapeLoaded(AsyncOperationHandle<GameObject> obj)`
`27`	`27`	`{`
`28`	`28`	`m_ToLoadCount--;`
`29`	`29`	`if (m_ToLoadCount <= 0)`
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@`
`4`	`4`	`using UnityEngine.AddressableAssets;`
`5`	`5`	`using UnityEngine.ResourceManagement;`
`6`	`6`	`using UnityEngine.ResourceManagement.AsyncOperations;`
	`7`	`+using UnityEngine.ResourceManagement.ResourceProviders;`
`7`	`8`	`using UnityEngine.SceneManagement;`
`8`	`9`	`using UnityEngine.Serialization;`
`9`	`10`	`using UnityEngine.UI;`
`@@ -13,7 +14,7 @@ public class AddScenes : MonoBehaviour`
`13`	`14`	`public string addressToAdd;`
`14`	`15`	`Button m_AddButton;`
`15`	`16`	`public TMPro.TMP_Text textArea;`
`16`		`- Scene m_LoadedScene;`
	`17`	`+ SceneInstance m_LoadedScene;`
`17`	`18`	`bool m_ReadyToLoad = true;`
`18`	`19`	`// Use this for initialization`
`19`	`20`	`void Start () {`
`@@ -39,21 +40,21 @@ void OnButtonClick()`
`39`	`40`	`}`
`40`	`41`	`}`
`41`	`42`
`42`		`- void OnSceneUnloaded(IAsyncOperation<Scene> obj)`
	`43`	`+ void OnSceneUnloaded(AsyncOperationHandle<SceneInstance> obj)`
`43`	`44`	`{`
`44`	`45`	`if (obj.Status == AsyncOperationStatus.Succeeded)`
`45`	`46`	`{`
`46`	`47`	`textArea.text = "Reload " + addressToAdd;`
`47`	`48`	`m_ReadyToLoad = true;`
`48`		`- m_LoadedScene = new Scene();`
	`49`	`+ m_LoadedScene = new SceneInstance();`
`49`	`50`	`}`
`50`	`51`	`else`
`51`	`52`	`{`
`52`	`53`	`Debug.LogError("Failed to unload scene at address: " + addressToAdd);`
`53`	`54`	`}`
`54`	`55`	`}`
`55`	`56`
`56`		`- void OnSceneLoaded(IAsyncOperation<Scene> obj)`
	`57`	`+ void OnSceneLoaded(AsyncOperationHandle<SceneInstance> obj)`
`57`	`58`	`{`
`58`	`59`	`if (obj.Status == AsyncOperationStatus.Succeeded)`
`59`	`60`	`{`
Original file line number	Diff line number	Diff line change
`@@ -40,8 +40,8 @@ void Update()`
`40`	`40`	`singleEntry = null;`
`41`	`41`	`}`
`42`	`42`	`}`
`43`		`-`
`44`		`- void SingleDone(IAsyncOperation<Sprite> op)`
	`43`	`+`
	`44`	`+ void SingleDone(AsyncOperationHandle<Sprite> op)`
`45`	`45`	`{`
`46`	`46`	`if (op.Result == null)`
`47`	`47`	`{`
`@@ -53,7 +53,7 @@ void SingleDone(IAsyncOperation<Sprite> op)`
`53`	`53`	`singleEntry = op.Result;`
`54`	`54`	`}`
`55`	`55`
`56`		`- void SheetDone(IAsyncOperation<IList<Sprite>> op)`
	`56`	`+ void SheetDone(AsyncOperationHandle<IList<Sprite>> op)`
`57`	`57`	`{`
`58`	`58`	`if (op.Result == null)`
`59`	`59`	`{`
Original file line number	Diff line number	Diff line change
`@@ -19,11 +19,11 @@ public override string Name`
`19`	`19`	`get { return "Pack Variations"; }`
`20`	`20`	`}`
`21`	`21`
`22`		`- protected override TResult BuildDataImplementation<TResult>(IDataBuilderContext context)`
	`22`	`+ protected override TResult BuildDataImplementation<TResult>(AddressablesDataBuilderInput context)`
`23`	`23`	`{`
`24`	`24`	`var result = base.BuildDataImplementation<TResult>(context);`
`25`		`-`
`26`		`- AddressableAssetSettings settings = context.GetValue<AddressableAssetSettings>(AddressablesBuildDataBuilderContext.BuildScriptContextConstants.kAddressableAssetSettings);`
	`25`	`+`
	`26`	`+ AddressableAssetSettings settings = context.AddressableSettings;`
`27`	`27`	`DoCleanup(settings);`
`28`	`28`	`return result;`
`29`	`29`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,11 +20,11 @@ public override string Name`
`20`	`20`	`get { return "Virtual Variety"; }`
`21`	`21`	`}`
`22`	`22`
`23`		`- protected override TResult BuildDataImplementation<TResult>(IDataBuilderContext context)`
	`23`	`+ protected override TResult BuildDataImplementation<TResult>(AddressablesDataBuilderInput context)`
`24`	`24`	`{`
`25`	`25`	`var result = base.BuildDataImplementation<TResult>(context);`
`26`		`-`
`27`		`- AddressableAssetSettings settings = context.GetValue<AddressableAssetSettings>(AddressablesBuildDataBuilderContext.BuildScriptContextConstants.kAddressableAssetSettings);`
	`26`	`+`
	`27`	`+ AddressableAssetSettings settings = context.AddressableSettings;`
`28`	`28`	`DoCleanup(settings);`
`29`	`29`	`return result;`
`30`	`30`	`}`