diff --git a/Assets/Scenes/Worlds/RiverWorld.unity b/Assets/Scenes/Worlds/RiverWorld.unity
index e3c7decff4b974e6f3814ae6581687e5831185e4..3b65f2a4e5824418878f39be84233913f4f63e4f 100644
--- a/Assets/Scenes/Worlds/RiverWorld.unity
+++ b/Assets/Scenes/Worlds/RiverWorld.unity
@@ -35020,6 +35020,12 @@ Transform:
type: 3}
m_PrefabInstance: {fileID: 1640447903}
m_PrefabAsset: {fileID: 0}
+--- !u!1 &1645740525 stripped
+GameObject:
+ m_CorrespondingSourceObject: {fileID: 7778809873180294482, guid: b07552db700124a4680401e6fb94c186,
+ type: 3}
+ m_PrefabInstance: {fileID: 3020720018843181009}
+ m_PrefabAsset: {fileID: 0}
--- !u!1001 &1662462856
PrefabInstance:
m_ObjectHideFlags: 0
@@ -35890,12 +35896,6 @@ Transform:
type: 3}
m_PrefabInstance: {fileID: 1698959509}
m_PrefabAsset: {fileID: 0}
---- !u!1 &1704251509 stripped
-GameObject:
- m_CorrespondingSourceObject: {fileID: 6930393306597857396, guid: b07552db700124a4680401e6fb94c186,
- type: 3}
- m_PrefabInstance: {fileID: 3020720018843181009}
- m_PrefabAsset: {fileID: 0}
--- !u!1001 &1710384107
PrefabInstance:
m_ObjectHideFlags: 0
@@ -58766,7 +58766,7 @@ PrefabInstance:
type: 3}
propertyPath: player
value:
- objectReference: {fileID: 1704251509}
+ objectReference: {fileID: 1645740525}
- target: {fileID: 3020720019048698010, guid: b07552db700124a4680401e6fb94c186,
type: 3}
propertyPath: walkAroundObject
@@ -59032,6 +59032,11 @@ PrefabInstance:
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
+ - target: {fileID: 3513925820391953378, guid: b07552db700124a4680401e6fb94c186,
+ type: 3}
+ propertyPath: m_TagString
+ value: Player
+ objectReference: {fileID: 0}
- target: {fileID: 3518642511282427553, guid: b07552db700124a4680401e6fb94c186,
type: 3}
propertyPath: m_Enabled
@@ -59137,11 +59142,6 @@ PrefabInstance:
propertyPath: m_LocalRotation.z
value: 0.000000011423238
objectReference: {fileID: 0}
- - target: {fileID: 4812433399655966640, guid: b07552db700124a4680401e6fb94c186,
- type: 3}
- propertyPath: m_Enabled
- value: 1
- objectReference: {fileID: 0}
- target: {fileID: 4911573750081415578, guid: b07552db700124a4680401e6fb94c186,
type: 3}
propertyPath: m_AnchorMax.x
diff --git a/Assets/Scripts/Loading/StreamingAssetLoader.cs b/Assets/Scripts/Loading/StreamingAssetLoader.cs
index ffa8c4883697d0f20779393f9433e39cf79b0e6b..ff3edee16675902b74682ec7c04734aefaf68bea 100644
--- a/Assets/Scripts/Loading/StreamingAssetLoader.cs
+++ b/Assets/Scripts/Loading/StreamingAssetLoader.cs
@@ -161,133 +161,77 @@ public static void NetworkJSON_Load()
string json = reader.ReadToEnd();
reader.Close();
+ NetworkJSONonlyString myObjsOnlyStrings = JsonUtility.FromJson<NetworkJSONonlyString>(json);
NetworkJSON myObjs = JsonUtility.FromJson<NetworkJSON>(json);
- if (string.IsNullOrEmpty(myObjs.newIP))
- {
- CommunicationEvents.newIP = "";
- }
- else
- {
+ if (string.IsNullOrEmpty(myObjsOnlyStrings.newIP)){
+ CommunicationEvents.newIP = "";
+ }else{
CommunicationEvents.newIP = myObjs.newIP;
}
- if (string.IsNullOrEmpty(myObjs.lastIP))
- {
+ if (string.IsNullOrEmpty(myObjsOnlyStrings.lastIP)){
CommunicationEvents.lastIP = "";
- }
- else
- {
+ }else{
CommunicationEvents.lastIP = myObjs.lastIP;
}
- if (string.IsNullOrEmpty(myObjs.IPslot1))
- {
+ if(string.IsNullOrEmpty(myObjsOnlyStrings.IPslot1)){
CommunicationEvents.IPslot1 = "";
- }
- else
- {
+ }else{
CommunicationEvents.IPslot1 = myObjs.IPslot1;//myObjs.IPslot1;
}
- if (string.IsNullOrEmpty(myObjs.IPslot2))
- {
+ if (string.IsNullOrEmpty(myObjsOnlyStrings.IPslot2)){
CommunicationEvents.IPslot2 = "";//"Empty";
- }
- else
- {
+ }else{
CommunicationEvents.IPslot2 = myObjs.IPslot2;
}
- if (string.IsNullOrEmpty(myObjs.IPslot3))
- {
+ if (string.IsNullOrEmpty(myObjsOnlyStrings.IPslot3)){
CommunicationEvents.IPslot3 = "";
- }
- else
- {
+ }else{
CommunicationEvents.IPslot3 = myObjs.IPslot3;
}
- if (string.IsNullOrEmpty(myObjs.selecIP))
- {
+ if (string.IsNullOrEmpty(myObjsOnlyStrings.selecIP)){
CommunicationEvents.selecIP = "";
- }
- else
- {
+ }else{
CommunicationEvents.selecIP = myObjs.selecIP;
}
- if (false)
- {
-
- }
- else
- {
+ if (string.IsNullOrEmpty(myObjsOnlyStrings.ControlMode)){
+ }else{
UIconfig.controlMode = myObjs.ControlMode;
}
- if (false)
- {
-
- }
- else
- {
+ if (string.IsNullOrEmpty(myObjsOnlyStrings.TouchMode)) {
+ }else{
UIconfig.touchControlMode = myObjs.TouchMode;
}
- if (false)
- {
-
- }
- else
- {
+ if (string.IsNullOrEmpty(myObjsOnlyStrings.TAvisibility)){
+ }else{
UIconfig.TAvisibility = myObjs.TAvisibility;
}
- if (false)
- {
-
- }
- else
- {
+ if (string.IsNullOrEmpty(myObjsOnlyStrings.autoOSrecognition)) {
+ }else{
CommunicationEvents.autoOSrecognition = myObjs.autoOSrecognition;
}
- if (false)
- {
-
- }
- else
- {
+ if (string.IsNullOrEmpty(myObjsOnlyStrings.Opsys)){
+ }else{
CommunicationEvents.Opsys = myObjs.Opsys;
}
- if (false)
- {
-
- }
- else
- {
+ if (string.IsNullOrEmpty(myObjsOnlyStrings.FrameITUIversion)){
+ }else{
UIconfig.FrameITUIversion = myObjs.FrameITUIversion;
}
- if (false)
- {
-
- }
- else
- {
+ if (string.IsNullOrEmpty(myObjsOnlyStrings.InputManagerVersion)){
+ }else{
UIconfig.InputManagerVersion = myObjs.InputManagerVersion;
}
- if (false)
- {
+ if (string.IsNullOrEmpty(myObjsOnlyStrings.colliderScale_all)){
- }
- else
- {
+ }else{
UIconfig.colliderScale_all = myObjs.colliderScale_all;
}
- if (false)
- {
-
- }
- else
- {
+ if (string.IsNullOrEmpty(myObjsOnlyStrings.cursorSize)){
+ } else {
UIconfig.cursorSize = myObjs.cursorSize;
}
- if (false)
- {
-
- }
- else
- {
+ if (string.IsNullOrEmpty(myObjsOnlyStrings.camRotatingSensitivity)){
+ }else{
UIconfig.camRotatingSensitivity = myObjs.camRotatingSensitivity;
}
diff --git a/Assets/Scripts/UI/UIconfig.cs b/Assets/Scripts/UI/UIconfig.cs
index f478ae7541be8e9c46428908901fec814f3049c4..35f579da424da6333c2a6039b1f65a965ec43f2b 100644
--- a/Assets/Scripts/UI/UIconfig.cs
+++ b/Assets/Scripts/UI/UIconfig.cs
@@ -64,6 +64,8 @@ public static class UIconfig
public static float camRotatingSensitivity_default = 1f; //slider 100% which value?
public static float camRotatingSensitivity_sliderMax = 4f; //max value for slider
+
+ //------------------------------------------------------------------------------------------------------
public class NetworkJSON
{
public string lastIP;
@@ -84,9 +86,30 @@ public class NetworkJSON
public float camRotatingSensitivity; //Sensitivity to inputs.
}
+ public class NetworkJSONonlyString
+ {
+ public string lastIP;
+ public string newIP;
+ public string IPslot1;
+ public string IPslot2;
+ public string IPslot3;
+ public string selecIP;
+ public string ControlMode;
+ public string TouchMode;
+ public string TAvisibility;
+ public string autoOSrecognition;
+ public string Opsys;
+ public string FrameITUIversion;
+ public string InputManagerVersion;
+ public string colliderScale_all;
+ public string cursorSize;
+ public string camRotatingSensitivity; //Sensitivity to inputs.
+
+ }
+ //------------------------------------------------------------------------------------------------------
//INPUTMANAGER KEY BINDINGS LIST for display Purpose
- public static string InputManager_KeyBinding_Horizontal_01 = "left";
+ public static string InputManager_KeyBinding_Horizontal_01 = "left";
public static string InputManager_KeyBinding_Horizontal_1 = "right";
public static string InputManager_KeyBinding_Horizontal_02 = "a";
public static string InputManager_KeyBinding_Horizontal_2= "d";
diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset
index 22041dfcc9ee627bf830ca75600d295abadecd05..0a74b62c402f2c5273503b05534a6f733b7d29e2 100644
--- a/UserSettings/EditorUserSettings.asset
+++ b/UserSettings/EditorUserSettings.asset
@@ -24,13 +24,13 @@ EditorUserSettings:
value: 22424703114646680e0b0227036c721518021d39631b32313f3d2e30f0e53136acf238e0f323
flags: 0
RecentlyUsedScenePath-6:
- value: 22424703114646680e0b0227036c721518021d3963042725232a151ee7ee213dacf238e0f323
+ value: 22424703114646680e0b0227036c721518021d39630527392304183df7e57a2decee22f0
flags: 0
RecentlyUsedScenePath-7:
- value: 22424703114646680e0b0227036c721518021d39630527392304183df7e57a2decee22f0
+ value: 22424703114646680e0b0227036c681f041b1c39631a2f26283b2a3cf0ec3076f7e93ffdfe
flags: 0
RecentlyUsedScenePath-8:
- value: 22424703114646680e0b0227036c681f041b1c39631a2f26283b2a3cf0ec3076f7e93ffdfe
+ value: 22424703114646680e0b0227036c721518021d3963042725232a151ee7ee213dacf238e0f323
flags: 0
UnityRemoteDevice:
value: 225f4d46245b0d4902070862342649191512