Merge pull request #41 from PlayFab/master

Release 0.0.992

Author: zac-playfab

Packages/PlayFabEditorExtensions.unitypackage

@@ -0,0 +1,15 @@
+using UnityEngine;
+using System.Collections;
+
+public class NewBehaviourScript : MonoBehaviour {
+
+	// Use this for initialization
+	void Start () {
+	
+	}
+	
+	// Update is called once per frame
+	void Update () {
+	
+	}
+}

Source/Assets/NewBehaviourScript.cs

@@ -40,7 +40,7 @@ void OnGUI () {
 
             EditorGUILayout.BeginHorizontal(PlayFabEditorHelper.uiStyle.GetStyle("gpStyleClear"));
             GUILayout.FlexibleSpace();
-            if(GUILayout.Button("Save",  PlayFabEditorHelper.uiStyle.GetStyle("Button"), GUILayout.MaxWidth(200)))
+            if(GUILayout.Button("SAVE",  PlayFabEditorHelper.uiStyle.GetStyle("Button"), GUILayout.MaxWidth(200)))
                 {
                     for(int z = 0; z < PlayFabEditorDataMenu.tdViewer.items.Count; z++)
                     {

Source/Assets/NewBehaviourScript.cs.meta

@@ -70,7 +70,7 @@ public void Draw()
                             EditorGUILayout.LabelField(":", GUILayout.MaxWidth(10));
                             GUILayout.Label(""+items[z].Value, valStyle, GUILayout.MaxWidth(valueInputBoxWidth), GUILayout.MaxHeight(25));  
 
-                        if(GUILayout.Button("Edit",  PlayFabEditorHelper.uiStyle.GetStyle("Button"), GUILayout.MaxHeight(19), GUILayout.MinWidth(35)))
+                        if(GUILayout.Button("EDIT",  PlayFabEditorHelper.uiStyle.GetStyle("Button"), GUILayout.MaxHeight(19), GUILayout.MinWidth(35)))
                             {
                                 tdEditor.LoadData(items[z].Key, items[z].Value);
                                 TitleDataEditor.ShowWindow(tdEditor);

Source/Assets/PlayFabEditorExtensions/Editor/Scripts/Components/TitleDataEditor.cs

@@ -67,7 +67,7 @@ public void Draw()
                             EditorGUILayout.LabelField(":", GUILayout.MaxWidth(10));
                             GUILayout.Label(""+items[z].Value, valStyle, GUILayout.MaxWidth(valueInputBoxWidth), GUILayout.MaxHeight(25));  
 
-                        if(GUILayout.Button("Edit",  PlayFabEditorHelper.uiStyle.GetStyle("Button"), GUILayout.MaxHeight(19), GUILayout.MinWidth(35)))
+                        if(GUILayout.Button("EDIT",  PlayFabEditorHelper.uiStyle.GetStyle("Button"), GUILayout.MaxHeight(19), GUILayout.MinWidth(35)))
                             {
                                 tdEditor.LoadData(items[z].Key, items[z].Value);
                                 TitleInternalDataEditor.ShowWindow(tdEditor);

Source/Assets/PlayFabEditorExtensions/Editor/Scripts/Components/TitleDataViewer.cs

@@ -44,7 +44,7 @@ public static void DrawToolsPanel()
                     GUILayout.EndHorizontal();
 
 
-                    if(File.Exists(PlayFabEditorDataService.envDetails.localCloudScriptPath) || File.Exists(PlayFabEditorHelper.CLOUDSCRIPT_PATH))
+                    if(File.Exists(PlayFabEditorDataService.envDetails.localCloudScriptPath))
                     {
                         var path = File.Exists(PlayFabEditorDataService.envDetails.localCloudScriptPath) ? PlayFabEditorDataService.envDetails.localCloudScriptPath : PlayFabEditorHelper.CLOUDSCRIPT_PATH;
                         var shortPath = "..." + path.Substring(path.LastIndexOf('/'));

Source/Assets/PlayFabEditorExtensions/Editor/Scripts/Components/TitleInternalDataViewer.cs

@@ -13,7 +13,7 @@ public class PlayFabEditorHelper : UnityEditor.Editor
     {
         #region EDITOR_STRINGS
         public static string EDEX_NAME = "PlayFab_EditorExtensions";
-        public static string EDEX_VERSION = "0.0.991";
+        public static string EDEX_VERSION = "0.0.992";
         public static string EDEX_ROOT =  Application.dataPath + "/PlayFabEditorExtensions/Editor";
         public static string DEV_API_ENDPOINT = "https://editor.playfabapi.com";
         public static string TITLE_ENDPOINT = ".playfabapi.com";

Source/Assets/PlayFabEditorExtensions/Editor/Scripts/Panels/PlayFabEditorToolsMenu.cs

@@ -171,15 +171,21 @@ static void RemoveAndroidPushPlugin()
             static void ScanForInstalledPackages()
             {
                 //TODO will need to update once whe have more than 1 package.
-
-                DirectoryInfo pluginDir = new DirectoryInfo(Application.dataPath + "/Plugins/Android/");
-                var files = pluginDir.GetFiles("PlayFabUnityAndroid.aar", SearchOption.TopDirectoryOnly);
-                if(files.Length > 0)
+                try
                 {
-                    AndroidPushPlugin = true;
-                    _androidPushPluginPreviousState = true;
-                }
-                   
+                    DirectoryInfo pluginDir = new DirectoryInfo(Application.dataPath + "/Plugins/Android/");
+                    var files = pluginDir.GetFiles("PlayFabUnityAndroid.aar", SearchOption.TopDirectoryOnly);
+                    if(files.Length > 0)
+                    {
+                        AndroidPushPlugin = true;
+                        _androidPushPluginPreviousState = true;
+                    }
+               }
+               catch
+               {
+                    AndroidPushPlugin = false;
+                    _androidPushPluginPreviousState = false;
+               }
             }
         #endregion
 

Source/Assets/PlayFabEditorExtensions/Editor/Scripts/Utils/PlayFabEditorHelper.cs

@@ -0,0 +1,134 @@
+-debug
+-target:library
+-nowarn:0169
+-out:'Temp/Assembly-CSharp-Editor.dll'
+-r:'/Applications/Unity 5.4/Unity.app/Contents/Managed/UnityEngine.dll'
+-r:'/Applications/Unity 5.4/Unity.app/Contents/Managed/UnityEditor.dll'
+-r:'Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll'
+-r:'Library/ScriptAssemblies/Assembly-CSharp.dll'
+-r:'/Applications/Unity 5.4/Unity.app/Contents/UnityExtensions/Unity/Advertisements/Editor/UnityEditor.Advertisements.dll'
+-r:'/Applications/Unity 5.4/Unity.app/Contents/UnityExtensions/Unity/EditorTestsRunner/Editor/nunit.framework.dll'
+-r:'/Applications/Unity 5.4/Unity.app/Contents/UnityExtensions/Unity/EditorTestsRunner/Editor/UnityEditor.EditorTestsRunner.dll'
+-r:'/Applications/Unity 5.4/Unity.app/Contents/UnityExtensions/Unity/GUISystem/UnityEngine.UI.dll'
+-r:'/Applications/Unity 5.4/Unity.app/Contents/UnityExtensions/Unity/GUISystem/Editor/UnityEditor.UI.dll'
+-r:'/Applications/Unity 5.4/Unity.app/Contents/UnityExtensions/Unity/Networking/UnityEngine.Networking.dll'
+-r:'/Applications/Unity 5.4/Unity.app/Contents/UnityExtensions/Unity/Networking/Editor/UnityEditor.Networking.dll'
+-r:'/Applications/Unity 5.4/Unity.app/Contents/UnityExtensions/Unity/TreeEditor/Editor/UnityEditor.TreeEditor.dll'
+-r:'Assets/AssetStoreTools/Editor/AssetStoreTools.dll'
+-r:'Assets/AssetStoreTools/Editor/AssetStoreToolsExtra.dll'
+-r:'/Applications/Unity 5.4/Unity.app/Contents/Managed/UnityEditor.Graphs.dll'
+-r:'/Applications/Unity 5.4/PlaybackEngines/AndroidPlayer/UnityEditor.Android.Extensions.dll'
+-r:'/Applications/Unity 5.4/PlaybackEngines/iOSSupport/UnityEditor.iOS.Extensions.dll'
+-r:'/Applications/Unity 5.4/PlaybackEngines/WebGLSupport/UnityEditor.WebGL.Extensions.dll'
+-r:'/Applications/Unity 5.4/Unity.app/Contents/PlaybackEngines/MacStandaloneSupport/UnityEditor.OSXStandalone.Extensions.dll'
+-r:'/Applications/Unity 5.4/PlaybackEngines/iOSSupport/UnityEditor.iOS.Extensions.Xcode.dll'
+-r:'/Applications/Unity 5.4/PlaybackEngines/iOSSupport/UnityEditor.iOS.Extensions.Common.dll'
+-define:UNITY_5_3_OR_NEWER
+-define:UNITY_5_4_OR_NEWER
+-define:UNITY_5_4_0
+-define:UNITY_5_4
+-define:UNITY_5
+-define:ENABLE_NEW_BUGREPORTER
+-define:ENABLE_AUDIO
+-define:ENABLE_CACHING
+-define:ENABLE_CLOTH
+-define:ENABLE_DUCK_TYPING
+-define:ENABLE_EDITOR_RETINA
+-define:ENABLE_RETINA_GUISTYLES
+-define:ENABLE_FRAME_DEBUGGER
+-define:ENABLE_GENERICS
+-define:ENABLE_HOME_SCREEN
+-define:ENABLE_IMAGEEFFECTS
+-define:ENABLE_LIGHT_PROBES_LEGACY
+-define:ENABLE_MICROPHONE
+-define:ENABLE_MULTIPLE_DISPLAYS
+-define:ENABLE_PHYSICS
+-define:ENABLE_PLUGIN_INSPECTOR
+-define:ENABLE_SHADOWS
+-define:ENABLE_SPRITERENDERER_FLIPPING
+-define:ENABLE_SPRITES
+-define:ENABLE_SPRITE_POLYGON
+-define:ENABLE_TERRAIN
+-define:ENABLE_RAKNET
+-define:ENABLE_UNET
+-define:ENABLE_UNITYEVENTS
+-define:ENABLE_VR
+-define:ENABLE_WEBCAM
+-define:ENABLE_WWW
+-define:ENABLE_CLOUD_SERVICES
+-define:ENABLE_CLOUD_SERVICES_COLLAB
+-define:ENABLE_CLOUD_SERVICES_ADS
+-define:ENABLE_CLOUD_HUB
+-define:ENABLE_CLOUD_PROJECT_ID
+-define:ENABLE_CLOUD_SERVICES_CRASH_REPORTING
+-define:ENABLE_CLOUD_SERVICES_PURCHASING
+-define:ENABLE_CLOUD_SERVICES_ANALYTICS
+-define:ENABLE_CLOUD_SERVICES_UNET
+-define:ENABLE_CLOUD_SERVICES_BUILD
+-define:ENABLE_CLOUD_LICENSE
+-define:ENABLE_EDITOR_METRICS
+-define:ENABLE_EDITOR_METRICS_CACHING
+-define:INCLUDE_DYNAMIC_GI
+-define:INCLUDE_GI
+-define:INCLUDE_IL2CPP
+-define:INCLUDE_DIRECTX12
+-define:PLATFORM_SUPPORTS_MONO
+-define:RENDER_SOFTWARE_CURSOR
+-define:INCLUDE_PUBNUB
+-define:ENABLE_LOCALIZATION
+-define:ENABLE_ANDROID_ATLAS_ETC1_COMPRESSION
+-define:ENABLE_EDITOR_TESTS_RUNNER
+-define:UNITY_STANDALONE_OSX
+-define:UNITY_STANDALONE
+-define:ENABLE_SUBSTANCE
+-define:ENABLE_GAMECENTER
+-define:ENABLE_TEXTUREID_MAP
+-define:ENABLE_RUNTIME_GI
+-define:ENABLE_MOVIES
+-define:ENABLE_NETWORK
+-define:ENABLE_CRUNCH_TEXTURE_COMPRESSION
+-define:ENABLE_UNITYWEBREQUEST
+-define:ENABLE_CLUSTERINPUT
+-define:ENABLE_WEBSOCKET_HOST
+-define:ENABLE_MONO
+-define:ENABLE_PROFILER
+-define:DEBUG
+-define:TRACE
+-define:UNITY_ASSERTIONS
+-define:UNITY_EDITOR
+-define:UNITY_EDITOR_64
+-define:UNITY_EDITOR_OSX
+-define:UNITY_TEAM_LICENSE
+-define:UNITY_PRO_LICENSE
+'Assets/PlayFabEditorExtensions/Editor/PlayFabEditor.cs'
+'Assets/PlayFabEditorExtensions/Editor/Resources/PLACEHOLDER.cs'
+'Assets/PlayFabEditorExtensions/Editor/Scripts/Components/MenuComponent.cs'
+'Assets/PlayFabEditorExtensions/Editor/Scripts/Components/ProgressBar.cs'
+'Assets/PlayFabEditorExtensions/Editor/Scripts/Components/TitleDataEditor.cs'
+'Assets/PlayFabEditorExtensions/Editor/Scripts/Components/TitleDataViewer.cs'
+'Assets/PlayFabEditorExtensions/Editor/Scripts/Components/TitleInternalDataEditor.cs'
+'Assets/PlayFabEditorExtensions/Editor/Scripts/Components/TitleInternalDataViewer.cs'
+'Assets/PlayFabEditorExtensions/Editor/Scripts/Panels/PlayFabEditorAuthenticate.cs'
+'Assets/PlayFabEditorExtensions/Editor/Scripts/Panels/PlayFabEditorDataMenu.cs'
+'Assets/PlayFabEditorExtensions/Editor/Scripts/Panels/PlayFabEditorHeader.cs'
+'Assets/PlayFabEditorExtensions/Editor/Scripts/Panels/PlayFabEditorHelpMenu.cs'
+'Assets/PlayFabEditorExtensions/Editor/Scripts/Panels/PlayFabEditorMenu.cs'
+'Assets/PlayFabEditorExtensions/Editor/Scripts/Panels/PlayFabEditorSDKTools.cs'
+'Assets/PlayFabEditorExtensions/Editor/Scripts/Panels/PlayFabEditorSettings.cs'
+'Assets/PlayFabEditorExtensions/Editor/Scripts/Panels/PlayFabEditorToolsMenu.cs'
+'Assets/PlayFabEditorExtensions/Editor/Scripts/PlayFabEditorSDK/ISerializer.cs'
+'Assets/PlayFabEditorExtensions/Editor/Scripts/PlayFabEditorSDK/PlayFabEditorApi.cs'
+'Assets/PlayFabEditorExtensions/Editor/Scripts/PlayFabEditorSDK/PlayFabEditorHttp.cs'
+'Assets/PlayFabEditorExtensions/Editor/Scripts/PlayFabEditorSDK/PlayFabEditorModels.cs'
+'Assets/PlayFabEditorExtensions/Editor/Scripts/PlayFabEditorSDK/SimpleJson.cs'
+'Assets/PlayFabEditorExtensions/Editor/Scripts/Utils/EditorCoroutine.cs'
+'Assets/PlayFabEditorExtensions/Editor/Scripts/Utils/PlayFabEditorDataService.cs'
+'Assets/PlayFabEditorExtensions/Editor/Scripts/Utils/PlayFabEditorHelper.cs'
+'Assets/PlayFabEditorExtensions/Editor/Scripts/Utils/PlayFabEditorPackageManager.cs'
+'Assets/PlayFabEditorExtensions/Editor/Scripts/Utils/PlayFabEditorUtils.cs'
+'Assets/PlayFabEditorExtensions/Editor/Scripts/Utils/PlayFabGuiFieldHelper.cs'
+'Assets/PlayFabSdk/Shared/Editor/AndroidManifestManager.cs'
+'Assets/PlayFabSdk/Shared/Editor/PlayFabHelp.cs'
+'Assets/PlayFabSdk/Shared/Models/Editor/MakeSharedSettingsObj.cs'
+-r:'/Applications/Unity 5.4/Unity.app/Contents/Mono/lib/mono/2.0/System.Runtime.Serialization.dll'
+-r:'/Applications/Unity 5.4/Unity.app/Contents/Mono/lib/mono/2.0/System.Xml.Linq.dll'