Skip to content

Commit 11e700f

Browse files
paulhazenpaulhazen
committed
Merge branch 'feat/config-ui-consolidation' of github.com:PlayEveryWare/eos_plugin_for_unity into feat/config-ui-consolidation
2 parents f2b8168 + 36a98dd commit 11e700f

File tree

3 files changed

+18
-23
lines changed

3 files changed

+18
-23
lines changed

‎com.playeveryware.eos/Runtime/Core/Config/Attributes/ConfigFieldAttribute.cs‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -49,12 +49,6 @@ public class ConfigFieldAttribute : Attribute
4949
/// </summary>
5050
public ConfigFieldType FieldType { get; }
5151

52-
public ConfigFieldAttribute(
53-
string label,
54-
string tooltip = null,
55-
int group = -1) :
56-
this(label, ConfigFieldType.Text, tooltip, group) { }
57-
5852
public ConfigFieldAttribute(
5953
string label,
6054
ConfigFieldType type,

‎com.playeveryware.eos/Runtime/Core/Config/EOSConfig.cs‎

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -77,22 +77,22 @@ protected EOSConfig() : base("EpicOnlineServicesConfig.json")
7777
/// Product Name defined in the
7878
/// [Development Portal](https://dev.epicgames.com/portal/)
7979
/// </summary>
80-
[ConfigField("Product Name",
80+
[ConfigField("Product Name", ConfigFieldType.Text,
8181
"Product name defined in the Development Portal.", 0)]
8282
public string productName;
8383

8484
/// <summary>
8585
/// Version of Product.
8686
/// </summary>
87-
[ConfigField("Product Version",
87+
[ConfigField("Product Version", ConfigFieldType.Text,
8888
"Version of the product.", 0)]
8989
public string productVersion;
9090

9191
/// <summary>
9292
/// Product Id defined in the
9393
/// [Development Portal](https://dev.epicgames.com/portal/)
9494
/// </summary>
95-
[ConfigField("Product Id",
95+
[ConfigField("Product Id", ConfigFieldType.Text,
9696
"Product Id defined in the Development Portal.", 0)]
9797
public string productID;
9898

@@ -104,14 +104,15 @@ protected EOSConfig() : base("EpicOnlineServicesConfig.json")
104104
/// Sandbox Id defined in the
105105
/// [Development Portal](https://dev.epicgames.com/portal/)
106106
/// </summary>
107-
[ConfigField("Sandbox Id", "Sandbox Id to use.", 1)]
107+
[ConfigField("Sandbox Id", ConfigFieldType.Text,
108+
"Sandbox Id to use.", 1)]
108109
public string sandboxID;
109110

110111
/// <summary>
111112
/// Deployment Id defined in the
112113
/// [Development Portal](https://dev.epicgames.com/portal/)
113114
/// </summary>
114-
[ConfigField("Deployment Id",
115+
[ConfigField("Deployment Id", ConfigFieldType.Text,
115116
"Deployment Id to use.", 1)]
116117
public string deploymentID;
117118

@@ -142,7 +143,7 @@ protected EOSConfig() : base("EpicOnlineServicesConfig.json")
142143
/// Client Secret defined in the
143144
/// [Development Portal](https://dev.epicgames.com/portal/)
144145
/// </summary>
145-
[ConfigField("Client Secret",
146+
[ConfigField("Client Secret", ConfigFieldType.Text,
146147
"Client Secret defined in the Development Portal.",
147148
2)]
148149
public string clientSecret;
@@ -151,7 +152,7 @@ protected EOSConfig() : base("EpicOnlineServicesConfig.json")
151152
/// Client Id defined in the
152153
/// [Development Portal](https://dev.epicgames.com/portal/)
153154
/// </summary>
154-
[ConfigField("Client Id",
155+
[ConfigField("Client Id", ConfigFieldType.Text,
155156
"Client Id defined in the Development Portal.",
156157
2)]
157158
public string clientID;
@@ -160,7 +161,7 @@ protected EOSConfig() : base("EpicOnlineServicesConfig.json")
160161
/// Encryption Key&lt; used by default to decode files previously
161162
/// encoded and stored in EOS.
162163
/// </summary>
163-
[ConfigField("Encryption Key",
164+
[ConfigField("Encryption Key", ConfigFieldType.Text,
164165
"Encryption key to use for client authentication.",
165166
2)]
166167
public string encryptionKey;
@@ -233,7 +234,7 @@ protected EOSConfig() : base("EpicOnlineServicesConfig.json")
233234
/// Network Work Affinity; specifies thread affinity for network
234235
/// management that is not IO.
235236
/// </summary>
236-
[ConfigField("Network Work",
237+
[ConfigField("Network Work", ConfigFieldType.Text,
237238
"Specifies affinity for threads that manage network tasks " +
238239
"that are not IO related.",
239240
3)]
@@ -243,7 +244,7 @@ protected EOSConfig() : base("EpicOnlineServicesConfig.json")
243244
/// Storage IO Affinity; specifies affinity for threads that will
244245
/// interact with a storage device.
245246
/// </summary>
246-
[ConfigField("Storage IO",
247+
[ConfigField("Storage IO", ConfigFieldType.Text,
247248
"Specifies affinity for threads that generate storage IO.",
248249
3)]
249250
public string ThreadAffinity_storageIO;
@@ -252,7 +253,7 @@ protected EOSConfig() : base("EpicOnlineServicesConfig.json")
252253
/// Web Socket IO Affinity; specifies affinity for threads that generate
253254
/// web socket IO.
254255
/// </summary>
255-
[ConfigField("Web Socket IO",
256+
[ConfigField("Web Socket IO", ConfigFieldType.Text,
256257
"Specifies affinity for threads that generate web socket " +
257258
"IO.", 3)]
258259
public string ThreadAffinity_webSocketIO;
@@ -261,7 +262,7 @@ protected EOSConfig() : base("EpicOnlineServicesConfig.json")
261262
/// P2P IO Affinity; specifies affinity for any thread that will
262263
/// generate IO related to P2P traffic and management.
263264
/// </summary>
264-
[ConfigField("P2P IO",
265+
[ConfigField("P2P IO", ConfigFieldType.Text,
265266
"Specifies affinity for any thread that will generate IO " +
266267
"related to P2P traffic and management.",
267268
3)]
@@ -271,7 +272,7 @@ protected EOSConfig() : base("EpicOnlineServicesConfig.json")
271272
/// HTTP Request IO Affinity; specifies affinity for any thread that
272273
/// will generate http request IO.
273274
/// </summary>
274-
[ConfigField("HTTP Request IO",
275+
[ConfigField("HTTP Request IO", ConfigFieldType.Text,
275276
"Specifies the affinity for any thread that will generate " +
276277
"HTTP request IO.",
277278
3)]
@@ -281,7 +282,7 @@ protected EOSConfig() : base("EpicOnlineServicesConfig.json")
281282
/// RTC IO Affinity&lt;/c&gt; specifies affinity for any thread that
282283
/// will generate IO related to RTC traffic and management.
283284
/// </summary>
284-
[ConfigField("RTC IO",
285+
[ConfigField("RTC IO", ConfigFieldType.Text,
285286
"Specifies the affinity for any thread that will generate " +
286287
"IO related to RTC traffic and management.",
287288
3)]
@@ -308,15 +309,15 @@ protected EOSConfig() : base("EpicOnlineServicesConfig.json")
308309
/// <summary>
309310
/// Initial Button Delay.
310311
/// </summary>
311-
[ConfigField("Initial Button Delay",
312+
[ConfigField("Initial Button Delay", ConfigFieldType.Text,
312313
"Initial Button Delay (if not set, whatever the default " +
313314
"is will be used).", 4)]
314315
public string initialButtonDelayForOverlay;
315316

316317
/// <summary>
317318
/// Repeat button delay for overlay.
318319
/// </summary>
319-
[ConfigField("Repeat Button Delay",
320+
[ConfigField("Repeat Button Delay", ConfigFieldType.Text,
320321
"Repeat button delay for the overlay. If not set, " +
321322
"whatever the default is will be used.", 4)]
322323
public string repeatButtonDelayForOverlay;

‎com.playeveryware.eos/Runtime/Core/Config/RuntimeConfig.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
* SOFTWARE.
2121
*/
2222

23-
#define EOS_RUNTIME_NEW_CONFIG_SYSTEM
23+
//#define EOS_RUNTIME_NEW_CONFIG_SYSTEM
2424

2525
namespace PlayEveryWare.EpicOnlineServices
2626
{

0 commit comments

Comments
 (0)