Skip to content
This repository was archived by the owner on Oct 17, 2020. It is now read-only.

Commit 83f38f2

Browse files
zac-playfabzac-playfab
authored
Merge pull request #47 from PlayFab/master
Version 0.0.993
2 parents 041f164 + 9130ea9 commit 83f38f2

25 files changed

+1121
-54
lines changed

‎Packages/PlayFabEditorExtensions.unitypackage

52 Bytes
Binary file not shown.

‎Source/Assets/PlayFabEditorExtensions/Editor/PlayFabEditor.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -473,6 +473,7 @@ private static void UpgradeEdEx()
473473
{
474474
if( EditorUtility.DisplayDialog("Confirm EdEx Upgrade", "This action will remove the current PlayFab Editor Extensions and install the lastet version.", "Confirm", "Cancel"))
475475
{
476+
PlayFabEditor.window.Close();
476477
ImportLatestEdEx();
477478
}
478479
}

‎Source/Assets/PlayFabEditorExtensions/Editor/Scripts/Panels/PlayFabEditorSDKTools.cs

Lines changed: 34 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ public static void DrawSdkPanel()
6363

6464

6565
GUILayout.BeginVertical(PlayFabEditorHelper.uiStyle.GetStyle("gpStyleGray1"));
66-
GUILayout.Label(string.Format("SDK v{0} is installed", string.IsNullOrEmpty(installedSdkVersion) ? "Unknown" : installedSdkVersion), labelStyle, GUILayout.MinWidth(EditorGUIUtility.currentViewWidth));
66+
GUILayout.Label(string.Format("SDK {0} is installed", string.IsNullOrEmpty(installedSdkVersion) ? "Unknown" : installedSdkVersion), labelStyle, GUILayout.MinWidth(EditorGUIUtility.currentViewWidth));
6767

6868
if(!isObjectFieldActive)
6969
{
@@ -72,7 +72,7 @@ public static void DrawSdkPanel()
7272
}
7373
else
7474
{
75-
GUILayout.Label("An SDK was detected, but we were unable to find the directory. Drag-and-drop the top-level PlayFab SDK folder below.", PlayFabEditorHelper.uiStyle.GetStyle("orTxt"));
75+
GUILayout.Label("An SDK was detected, but we were unable to find the directory. Drag-and-drop the top-level PlayFab SDK folder below.", PlayFabEditorHelper.uiStyle.GetStyle("orTxt"));
7676
}
7777

7878
GUILayout.BeginHorizontal(PlayFabEditorHelper.uiStyle.GetStyle("gpStyleClear"));
@@ -88,67 +88,56 @@ public static void DrawSdkPanel()
8888
}
8989

9090
if(isSdkSupported == true && sdkFolder != null)
91-
{
92-
GUILayout.BeginHorizontal(PlayFabEditorHelper.uiStyle.GetStyle("gpStyleClear"));
91+
{
92+
GUILayout.BeginHorizontal(PlayFabEditorHelper.uiStyle.GetStyle("gpStyleClear"));
9393

94-
GUILayout.FlexibleSpace();
94+
GUILayout.FlexibleSpace();
9595

96-
if (GUILayout.Button("REMOVE SDK", PlayFabEditorHelper.uiStyle.GetStyle("textButton"), GUILayout.MinHeight(32), GUILayout.MinWidth(200)))
97-
{
98-
RemoveSDK();
99-
}
96+
if (GUILayout.Button("REMOVE SDK", PlayFabEditorHelper.uiStyle.GetStyle("textButton"), GUILayout.MinHeight(32), GUILayout.MinWidth(200)))
97+
{
98+
RemoveSDK();
99+
}
100100

101-
GUILayout.FlexibleSpace();
102-
GUILayout.EndHorizontal();
103-
}
101+
GUILayout.FlexibleSpace();
102+
GUILayout.EndHorizontal();
103+
}
104104

105105
GUILayout.EndVertical();
106106

107107
if(sdkFolder != null)
108108
{
109-
110-
109+
111110
//TODO START BACK HERE...
112111

113112
GUILayout.BeginVertical(PlayFabEditorHelper.uiStyle.GetStyle("gpStyleGray1"));
114-
if(installedSdkVersion == "Unknown")
115-
{
116-
GUILayout.BeginHorizontal(PlayFabEditorHelper.uiStyle.GetStyle("gpStyleClear"));
117-
GUILayout.Label("We were unable to determine what version of SDK is installed.", PlayFabEditorHelper.uiStyle.GetStyle("cGenTxt"), GUILayout.MinHeight(32));
118-
GUILayout.EndHorizontal();
119-
isSdkSupported = false;
120-
}
121-
else
122-
{
123-
isSdkSupported = false;
124-
string[] versionNumber = !string.IsNullOrEmpty(installedSdkVersion) ? installedSdkVersion.Split('.') : null;
113+
isSdkSupported = false;
114+
string[] versionNumber = !string.IsNullOrEmpty(installedSdkVersion) ? installedSdkVersion.Split('.') : new string[0];
125115

126-
int numerical = 0;
127-
if(versionNumber.Length > 0 && int.TryParse(versionNumber[0], out numerical) && numerical < 2)
128-
{
129-
//older version of the SDK
130-
GUILayout.BeginHorizontal(PlayFabEditorHelper.uiStyle.GetStyle("gpStyleClear"));
131-
GUILayout.Label("Most of the Editor Extensions depend on SDK versions >2.0. Consider upgrading to the get most features.", PlayFabEditorHelper.uiStyle.GetStyle("orTxt"));
132-
GUILayout.EndHorizontal();
116+
int numerical = 0;
117+
if(string.IsNullOrEmpty(installedSdkVersion) || versionNumber == null || versionNumber.Length == 0 || (versionNumber.Length > 0 && int.TryParse(versionNumber[0], out numerical) && numerical < 2))
118+
{
119+
//older version of the SDK
120+
GUILayout.BeginHorizontal(PlayFabEditorHelper.uiStyle.GetStyle("gpStyleClear"));
121+
GUILayout.Label("Most of the Editor Extensions depend on SDK versions >2.0. Consider upgrading to the get most features.", PlayFabEditorHelper.uiStyle.GetStyle("orTxt"));
122+
GUILayout.EndHorizontal();
133123

134-
GUILayout.BeginHorizontal(PlayFabEditorHelper.uiStyle.GetStyle("gpStyleClear"));
135-
GUILayout.FlexibleSpace();
136-
if (GUILayout.Button("READ THE UPGRADE GUIDE", PlayFabEditorHelper.uiStyle.GetStyle("textButton"), GUILayout.MinHeight(32)))
137-
{
138-
Application.OpenURL("https://github.com/PlayFab/UnitySDK/blob/master/UPGRADE.md");
139-
}
140-
GUILayout.FlexibleSpace();
141-
GUILayout.EndHorizontal();
142-
}
143-
else if(numerical >= 2)
124+
GUILayout.BeginHorizontal(PlayFabEditorHelper.uiStyle.GetStyle("gpStyleClear"));
125+
GUILayout.FlexibleSpace();
126+
if (GUILayout.Button("READ THE UPGRADE GUIDE", PlayFabEditorHelper.uiStyle.GetStyle("textButton"), GUILayout.MinHeight(32)))
144127
{
145-
isSdkSupported = true;
128+
Application.OpenURL("https://github.com/PlayFab/UnitySDK/blob/master/UPGRADE.md");
146129
}
130+
GUILayout.FlexibleSpace();
131+
GUILayout.EndHorizontal();
132+
}
133+
else if(numerical >= 2)
134+
{
135+
isSdkSupported = true;
147136
}
148137

149138
GUILayout.BeginHorizontal(PlayFabEditorHelper.uiStyle.GetStyle("gpStyleClear"));
150139

151-
if(ShowSDKUpgrade())
140+
if(ShowSDKUpgrade() && isSdkSupported)
152141
{
153142
GUILayout.FlexibleSpace();
154143
if (GUILayout.Button("Upgrade to " + latestSdkVersion, PlayFabEditorHelper.uiStyle.GetStyle("Button"), GUILayout.MinHeight(32)))
@@ -171,7 +160,7 @@ public static void DrawSdkPanel()
171160
GUILayout.EndVertical();
172161
}
173162

174-
if(string.IsNullOrEmpty(PlayFabEditorDataService.envDetails.selectedTitleId))
163+
if(isSdkSupported && string.IsNullOrEmpty(PlayFabEditorDataService.envDetails.selectedTitleId))
175164
{
176165
GUILayout.BeginVertical(PlayFabEditorHelper.uiStyle.GetStyle("gpStyleGray1"));
177166
GUILayout.Label("Before making PlayFab API calls, the SDK must be configured to your PlayFab Title.", PlayFabEditorHelper.uiStyle.GetStyle("orTxt"));
@@ -198,9 +187,6 @@ public static void DrawSdkPanel()
198187
GUILayout.FlexibleSpace();
199188
GUILayout.EndHorizontal();
200189

201-
202-
203-
204190
}
205191
else
206192
{

‎Source/Assets/PlayFabEditorExtensions/Editor/Scripts/Utils/PlayFabEditorDataService.cs

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -214,11 +214,19 @@ from type in assembly.GetTypes()
214214
var type = playfabSettingsType.ToList().FirstOrDefault();
215215
var props = type.GetProperties();
216216

217-
envDetails.selectedTitleId = string.IsNullOrEmpty((string) props.ToList().Find(p => p.Name == "TitleId").GetValue(null, null)) ? envDetails.selectedTitleId : (string) props.ToList().Find(p => p.Name == "TitleId").GetValue(null, null);
218-
envDetails.webRequestType = (PlayFabEditorSettings.WebRequestType)props.ToList().Find(p => p.Name == "RequestType").GetValue(null, null);
219-
envDetails.timeOut = (int) props.ToList().Find(p => p.Name == "RequestTimeout").GetValue(null, null);
220-
envDetails.keepAlive = (bool) props.ToList().Find(p => p.Name == "RequestKeepAlive").GetValue(null, null);
221-
envDetails.compressApiData = (bool)props.ToList().Find(p => p.Name == "CompressApiData").GetValue(null, null);
217+
try
218+
{
219+
envDetails.selectedTitleId = string.IsNullOrEmpty((string) props.ToList().Find(p => p.Name == "TitleId").GetValue(null, null)) ? envDetails.selectedTitleId : (string) props.ToList().Find(p => p.Name == "TitleId").GetValue(null, null);
220+
envDetails.webRequestType = (PlayFabEditorSettings.WebRequestType)props.ToList().Find(p => p.Name == "RequestType").GetValue(null, null);
221+
envDetails.timeOut = (int) props.ToList().Find(p => p.Name == "RequestTimeout").GetValue(null, null);
222+
envDetails.keepAlive = (bool) props.ToList().Find(p => p.Name == "RequestKeepAlive").GetValue(null, null);
223+
envDetails.compressApiData = (bool)props.ToList().Find(p => p.Name == "CompressApiData").GetValue(null, null);
224+
}
225+
catch
226+
{
227+
// do nothing, this cathes issues in really old sdks; clearly there is something wrong here.
228+
PlayFabEditorSDKTools.isSdkSupported = false;
229+
}
222230

223231

224232

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ public class PlayFabEditorHelper : UnityEditor.Editor
1313
{
1414
#region EDITOR_STRINGS
1515
public static string EDEX_NAME = "PlayFab_EditorExtensions";
16-
public static string EDEX_VERSION = "0.0.992";
16+
public static string EDEX_VERSION = "0.0.993";
1717
public static string EDEX_ROOT = Application.dataPath + "/PlayFabEditorExtensions/Editor";
1818
public static string DEV_API_ENDPOINT = "https://editor.playfabapi.com";
1919
public static string TITLE_ENDPOINT = ".playfabapi.com";

‎Source/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll

0 Bytes
Binary file not shown.

‎Source/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll.mdb

-2 Bytes
Binary file not shown.

‎Source/Library/assetDatabase3

0 Bytes
Binary file not shown.

‎Source/Library/metadata/00/00000000000000004000000000000000

0 Bytes
Binary file not shown.

‎Source/Library/metadata/1c/1c7b3fb0903da7c48a812037b700de8b

48 Bytes
Binary file not shown.

‎Source/Library/metadata/80/808d230e8f7859f4a9c84f6653a2ba1c

-580 Bytes
Binary file not shown.

‎Source/Library/metadata/b7/b7a0580bf951d2f46861fe4785bf74f6

0 Bytes
Binary file not shown.

‎Source/Library/metadata/c4/c4c398f1711644e79aae821d377e572e

344 Bytes
Binary file not shown.

‎Source/Temp/UnityTempFile-572d88d93eb5a419484f7518dce7aadb

Lines changed: 134 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,134 @@
1+
-debug
2+
-target:library
3+
-nowarn:0169
4+
-out:'Temp/Assembly-CSharp-Editor.dll'
5+
-r:'/Applications/Unity 5.4/Unity.app/Contents/Managed/UnityEngine.dll'
6+
-r:'/Applications/Unity 5.4/Unity.app/Contents/Managed/UnityEditor.dll'
7+
-r:'Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll'
8+
-r:'Library/ScriptAssemblies/Assembly-CSharp.dll'
9+
-r:'/Applications/Unity 5.4/Unity.app/Contents/UnityExtensions/Unity/Advertisements/Editor/UnityEditor.Advertisements.dll'
10+
-r:'/Applications/Unity 5.4/Unity.app/Contents/UnityExtensions/Unity/EditorTestsRunner/Editor/nunit.framework.dll'
11+
-r:'/Applications/Unity 5.4/Unity.app/Contents/UnityExtensions/Unity/EditorTestsRunner/Editor/UnityEditor.EditorTestsRunner.dll'
12+
-r:'/Applications/Unity 5.4/Unity.app/Contents/UnityExtensions/Unity/GUISystem/UnityEngine.UI.dll'
13+
-r:'/Applications/Unity 5.4/Unity.app/Contents/UnityExtensions/Unity/GUISystem/Editor/UnityEditor.UI.dll'
14+
-r:'/Applications/Unity 5.4/Unity.app/Contents/UnityExtensions/Unity/Networking/UnityEngine.Networking.dll'
15+
-r:'/Applications/Unity 5.4/Unity.app/Contents/UnityExtensions/Unity/Networking/Editor/UnityEditor.Networking.dll'
16+
-r:'/Applications/Unity 5.4/Unity.app/Contents/UnityExtensions/Unity/TreeEditor/Editor/UnityEditor.TreeEditor.dll'
17+
-r:'Assets/AssetStoreTools/Editor/AssetStoreTools.dll'
18+
-r:'Assets/AssetStoreTools/Editor/AssetStoreToolsExtra.dll'
19+
-r:'/Applications/Unity 5.4/Unity.app/Contents/Managed/UnityEditor.Graphs.dll'
20+
-r:'/Applications/Unity 5.4/PlaybackEngines/AndroidPlayer/UnityEditor.Android.Extensions.dll'
21+
-r:'/Applications/Unity 5.4/PlaybackEngines/iOSSupport/UnityEditor.iOS.Extensions.dll'
22+
-r:'/Applications/Unity 5.4/PlaybackEngines/WebGLSupport/UnityEditor.WebGL.Extensions.dll'
23+
-r:'/Applications/Unity 5.4/Unity.app/Contents/PlaybackEngines/MacStandaloneSupport/UnityEditor.OSXStandalone.Extensions.dll'
24+
-r:'/Applications/Unity 5.4/PlaybackEngines/iOSSupport/UnityEditor.iOS.Extensions.Xcode.dll'
25+
-r:'/Applications/Unity 5.4/PlaybackEngines/iOSSupport/UnityEditor.iOS.Extensions.Common.dll'
26+
-define:UNITY_5_3_OR_NEWER
27+
-define:UNITY_5_4_OR_NEWER
28+
-define:UNITY_5_4_0
29+
-define:UNITY_5_4
30+
-define:UNITY_5
31+
-define:ENABLE_NEW_BUGREPORTER
32+
-define:ENABLE_AUDIO
33+
-define:ENABLE_CACHING
34+
-define:ENABLE_CLOTH
35+
-define:ENABLE_DUCK_TYPING
36+
-define:ENABLE_EDITOR_RETINA
37+
-define:ENABLE_RETINA_GUISTYLES
38+
-define:ENABLE_FRAME_DEBUGGER
39+
-define:ENABLE_GENERICS
40+
-define:ENABLE_HOME_SCREEN
41+
-define:ENABLE_IMAGEEFFECTS
42+
-define:ENABLE_LIGHT_PROBES_LEGACY
43+
-define:ENABLE_MICROPHONE
44+
-define:ENABLE_MULTIPLE_DISPLAYS
45+
-define:ENABLE_PHYSICS
46+
-define:ENABLE_PLUGIN_INSPECTOR
47+
-define:ENABLE_SHADOWS
48+
-define:ENABLE_SPRITERENDERER_FLIPPING
49+
-define:ENABLE_SPRITES
50+
-define:ENABLE_SPRITE_POLYGON
51+
-define:ENABLE_TERRAIN
52+
-define:ENABLE_RAKNET
53+
-define:ENABLE_UNET
54+
-define:ENABLE_UNITYEVENTS
55+
-define:ENABLE_VR
56+
-define:ENABLE_WEBCAM
57+
-define:ENABLE_WWW
58+
-define:ENABLE_CLOUD_SERVICES
59+
-define:ENABLE_CLOUD_SERVICES_COLLAB
60+
-define:ENABLE_CLOUD_SERVICES_ADS
61+
-define:ENABLE_CLOUD_HUB
62+
-define:ENABLE_CLOUD_PROJECT_ID
63+
-define:ENABLE_CLOUD_SERVICES_CRASH_REPORTING
64+
-define:ENABLE_CLOUD_SERVICES_PURCHASING
65+
-define:ENABLE_CLOUD_SERVICES_ANALYTICS
66+
-define:ENABLE_CLOUD_SERVICES_UNET
67+
-define:ENABLE_CLOUD_SERVICES_BUILD
68+
-define:ENABLE_CLOUD_LICENSE
69+
-define:ENABLE_EDITOR_METRICS
70+
-define:ENABLE_EDITOR_METRICS_CACHING
71+
-define:INCLUDE_DYNAMIC_GI
72+
-define:INCLUDE_GI
73+
-define:INCLUDE_IL2CPP
74+
-define:INCLUDE_DIRECTX12
75+
-define:PLATFORM_SUPPORTS_MONO
76+
-define:RENDER_SOFTWARE_CURSOR
77+
-define:INCLUDE_PUBNUB
78+
-define:ENABLE_LOCALIZATION
79+
-define:ENABLE_ANDROID_ATLAS_ETC1_COMPRESSION
80+
-define:ENABLE_EDITOR_TESTS_RUNNER
81+
-define:UNITY_STANDALONE_OSX
82+
-define:UNITY_STANDALONE
83+
-define:ENABLE_SUBSTANCE
84+
-define:ENABLE_GAMECENTER
85+
-define:ENABLE_TEXTUREID_MAP
86+
-define:ENABLE_RUNTIME_GI
87+
-define:ENABLE_MOVIES
88+
-define:ENABLE_NETWORK
89+
-define:ENABLE_CRUNCH_TEXTURE_COMPRESSION
90+
-define:ENABLE_UNITYWEBREQUEST
91+
-define:ENABLE_CLUSTERINPUT
92+
-define:ENABLE_WEBSOCKET_HOST
93+
-define:ENABLE_MONO
94+
-define:ENABLE_PROFILER
95+
-define:DEBUG
96+
-define:TRACE
97+
-define:UNITY_ASSERTIONS
98+
-define:UNITY_EDITOR
99+
-define:UNITY_EDITOR_64
100+
-define:UNITY_EDITOR_OSX
101+
-define:UNITY_TEAM_LICENSE
102+
-define:UNITY_PRO_LICENSE
103+
'Assets/PlayFabEditorExtensions/Editor/PlayFabEditor.cs'
104+
'Assets/PlayFabEditorExtensions/Editor/Resources/PLACEHOLDER.cs'
105+
'Assets/PlayFabEditorExtensions/Editor/Scripts/Components/MenuComponent.cs'
106+
'Assets/PlayFabEditorExtensions/Editor/Scripts/Components/ProgressBar.cs'
107+
'Assets/PlayFabEditorExtensions/Editor/Scripts/Components/TitleDataEditor.cs'
108+
'Assets/PlayFabEditorExtensions/Editor/Scripts/Components/TitleDataViewer.cs'
109+
'Assets/PlayFabEditorExtensions/Editor/Scripts/Components/TitleInternalDataEditor.cs'
110+
'Assets/PlayFabEditorExtensions/Editor/Scripts/Components/TitleInternalDataViewer.cs'
111+
'Assets/PlayFabEditorExtensions/Editor/Scripts/Panels/PlayFabEditorAuthenticate.cs'
112+
'Assets/PlayFabEditorExtensions/Editor/Scripts/Panels/PlayFabEditorDataMenu.cs'
113+
'Assets/PlayFabEditorExtensions/Editor/Scripts/Panels/PlayFabEditorHeader.cs'
114+
'Assets/PlayFabEditorExtensions/Editor/Scripts/Panels/PlayFabEditorHelpMenu.cs'
115+
'Assets/PlayFabEditorExtensions/Editor/Scripts/Panels/PlayFabEditorMenu.cs'
116+
'Assets/PlayFabEditorExtensions/Editor/Scripts/Panels/PlayFabEditorSDKTools.cs'
117+
'Assets/PlayFabEditorExtensions/Editor/Scripts/Panels/PlayFabEditorSettings.cs'
118+
'Assets/PlayFabEditorExtensions/Editor/Scripts/Panels/PlayFabEditorToolsMenu.cs'
119+
'Assets/PlayFabEditorExtensions/Editor/Scripts/PlayFabEditorSDK/ISerializer.cs'
120+
'Assets/PlayFabEditorExtensions/Editor/Scripts/PlayFabEditorSDK/PlayFabEditorApi.cs'
121+
'Assets/PlayFabEditorExtensions/Editor/Scripts/PlayFabEditorSDK/PlayFabEditorHttp.cs'
122+
'Assets/PlayFabEditorExtensions/Editor/Scripts/PlayFabEditorSDK/PlayFabEditorModels.cs'
123+
'Assets/PlayFabEditorExtensions/Editor/Scripts/PlayFabEditorSDK/SimpleJson.cs'
124+
'Assets/PlayFabEditorExtensions/Editor/Scripts/Utils/EditorCoroutine.cs'
125+
'Assets/PlayFabEditorExtensions/Editor/Scripts/Utils/PlayFabEditorDataService.cs'
126+
'Assets/PlayFabEditorExtensions/Editor/Scripts/Utils/PlayFabEditorHelper.cs'
127+
'Assets/PlayFabEditorExtensions/Editor/Scripts/Utils/PlayFabEditorPackageManager.cs'
128+
'Assets/PlayFabEditorExtensions/Editor/Scripts/Utils/PlayFabEditorUtils.cs'
129+
'Assets/PlayFabEditorExtensions/Editor/Scripts/Utils/PlayFabGuiFieldHelper.cs'
130+
'Assets/PlayFabSdk/Shared/Editor/AndroidManifestManager.cs'
131+
'Assets/PlayFabSdk/Shared/Editor/PlayFabHelp.cs'
132+
'Assets/PlayFabSdk/Shared/Models/Editor/MakeSharedSettingsObj.cs'
133+
-r:'/Applications/Unity 5.4/Unity.app/Contents/Mono/lib/mono/2.0/System.Runtime.Serialization.dll'
134+
-r:'/Applications/Unity 5.4/Unity.app/Contents/Mono/lib/mono/2.0/System.Xml.Linq.dll'

0 commit comments

Comments
 (0)