Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
U
UFrameIT
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
FrameIT
UFrameIT
Commits
a0e83acf
Commit
a0e83acf
authored
4 months ago
by
baletiballo
Browse files
Options
Downloads
Patches
Plain Diff
auto-reload default server addresses from streaming assets if smth broke them
Instead of telling the player to do so
parent
eb1e55f4
No related branches found
No related tags found
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
Assets/Scripts/InteractionEngine/CommunicationEvents.cs
+13
-7
13 additions, 7 deletions
Assets/Scripts/InteractionEngine/CommunicationEvents.cs
with
13 additions
and
7 deletions
Assets/Scripts/InteractionEngine/CommunicationEvents.cs
+
13
−
7
View file @
a0e83acf
...
...
@@ -94,6 +94,12 @@ public class ServerSlotData
/// </summary>
public
IEnumerator
UpdateServerStatus
(
bool
skipIfAlreadyChecked
=
false
)
{
// This is the "default" value of slot1. If it has not been overwritten, the config should be reset from Streaming Assets (as it says)
// This should hopefully deal with this situation before a player has to
if
(
domain
.
Equals
(
"if you can read this, go to 'Options'\n -> 'Reset Options'\n -> PRESS: 'Reset Configurations'"
))
{
StreamingAssetLoader
.
ResetPlayerConfig
();
}
if
(
skipIfAlreadyChecked
&&
hasBeenChecked
)
{
yield
break
;
// Skip, if not neccessary
...
...
@@ -105,7 +111,7 @@ public IEnumerator UpdateServerStatus(bool skipIfAlreadyChecked = false)
if
(
string
.
IsNullOrEmpty
(
domain
))
{
currentStatus
=
ServerStatus
.
NoNetworkAddress
;
UnityEngine
.
Debug
.
LogWarning
(
"Server
"
+
myKey
.
ToString
()
+
"
has no network adress."
);
UnityEngine
.
Debug
.
LogWarning
(
$
"Server
{
myKey
}
has no network adress."
);
}
else
{
...
...
@@ -118,7 +124,7 @@ public IEnumerator UpdateServerStatus(bool skipIfAlreadyChecked = false)
}
else
{
UnityEngine
.
Debug
.
Log
(
"Couldn't connect to Server
"
+
myKey
.
ToString
()
+
"
under
"
+
domain
+
" : "
+
request
.
error
+
"\n
"
);
UnityEngine
.
Debug
.
Log
(
$
"Couldn't connect to Server
{
myKey
}
under
{
domain
}
:
{
request
.
error
}
"
);
currentStatus
=
ServerStatus
.
offline
;
//try again
...
...
@@ -149,11 +155,11 @@ public IEnumerator UpdateServerStatus(bool skipIfAlreadyChecked = false)
{
{
ServerSlot
.
last
,
new
ServerSlotData
(
""
)
},
{
ServerSlot
.
newIP
,
new
ServerSlotData
(
""
)
},
{
ServerSlot
.
slot1
,
new
ServerSlotData
(
"
-
if you can read this"
)
},
{
ServerSlot
.
slot2
,
new
ServerSlotData
(
"
- NetworkConfig
"
)
},
{
ServerSlot
.
slot3
,
new
ServerSlotData
(
"
- GO TO -> 'Options'
"
)
},
{
ServerSlot
.
slot4
,
new
ServerSlotData
(
"
- -> 'Reset Options'
"
)
},
{
ServerSlot
.
slot5
,
new
ServerSlotData
(
"
- -> PRESS: 'Reset Configurations'
"
)
},
{
ServerSlot
.
slot1
,
new
ServerSlotData
(
"if you can read this
, go to 'Options'\n -> 'Reset Options'\n -> PRESS: 'Reset Configurations'
"
)
},
{
ServerSlot
.
slot2
,
new
ServerSlotData
(
""
)
},
{
ServerSlot
.
slot3
,
new
ServerSlotData
(
""
)
},
{
ServerSlot
.
slot4
,
new
ServerSlotData
(
""
)
},
{
ServerSlot
.
slot5
,
new
ServerSlotData
(
""
)
},
{
ServerSlot
.
selecIP
,
new
ServerSlotData
(
""
)
},
{
ServerSlot
.
localServer
,
new
ServerSlotData
(
ServerAddressLocal
)
}
};
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment