Compare commits
3 Commits
4b2eb1b258
...
d3f466d3c4
| Author | SHA1 | Date |
|---|---|---|
|
|
d3f466d3c4 | |
|
|
703c29f2e9 | |
|
|
89da691111 |
|
|
@ -20,6 +20,6 @@ jobs:
|
||||||
registry-url: "https://registry.npmjs.org"
|
registry-url: "https://registry.npmjs.org"
|
||||||
- run: npm install
|
- run: npm install
|
||||||
- run: npm ci
|
- run: npm ci
|
||||||
- run: npm publish
|
- run: npm publish --access public
|
||||||
env:
|
env:
|
||||||
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
|
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
|
||||||
|
|
|
||||||
|
|
@ -20,6 +20,6 @@ jobs:
|
||||||
registry-url: "https://registry.npmjs.org"
|
registry-url: "https://registry.npmjs.org"
|
||||||
- run: npm install
|
- run: npm install
|
||||||
- run: npm ci
|
- run: npm ci
|
||||||
- run: npm publish
|
- run: npm publish --access public
|
||||||
env:
|
env:
|
||||||
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
|
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
|
||||||
|
|
|
||||||
|
|
@ -259,6 +259,7 @@ namespace VELConnect
|
||||||
{
|
{
|
||||||
state = JsonConvert.DeserializeObject<State>(json);
|
state = JsonConvert.DeserializeObject<State>(json);
|
||||||
if (state == null) return;
|
if (state == null) return;
|
||||||
|
if (state.room == null) return;
|
||||||
|
|
||||||
bool isInitialState = false;
|
bool isInitialState = false;
|
||||||
|
|
||||||
|
|
@ -404,12 +405,12 @@ namespace VELConnect
|
||||||
}
|
}
|
||||||
|
|
||||||
// if (state.room.modified_by != DeviceId && state.room.data != null)
|
// if (state.room.modified_by != DeviceId && state.room.data != null)
|
||||||
if (state.room?.data != null)
|
if (state.room.data != null)
|
||||||
{
|
{
|
||||||
foreach (KeyValuePair<string, string> elem in state.room.data)
|
foreach (KeyValuePair<string, string> elem in state.room.data)
|
||||||
{
|
{
|
||||||
string oldValue = null;
|
string oldValue = null;
|
||||||
lastState?.room.data.TryGetValue(elem.Key, out oldValue);
|
lastState?.room?.data.TryGetValue(elem.Key, out oldValue);
|
||||||
if (elem.Value != oldValue)
|
if (elem.Value != oldValue)
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
|
|
@ -751,6 +752,7 @@ namespace VELConnect
|
||||||
State.DataBlock room = new State.DataBlock
|
State.DataBlock room = new State.DataBlock
|
||||||
{
|
{
|
||||||
category = "room",
|
category = "room",
|
||||||
|
modified_by = "Unity",
|
||||||
data = data
|
data = data
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
@ -913,7 +915,7 @@ namespace VELConnect
|
||||||
case UnityWebRequest.Result.ConnectionError:
|
case UnityWebRequest.Result.ConnectionError:
|
||||||
case UnityWebRequest.Result.DataProcessingError:
|
case UnityWebRequest.Result.DataProcessingError:
|
||||||
case UnityWebRequest.Result.ProtocolError:
|
case UnityWebRequest.Result.ProtocolError:
|
||||||
Debug.LogError(url + ": Error: " + webRequest.error + "\n" + webRequest.downloadHandler.text + "\n" + Environment.StackTrace);
|
Debug.LogWarning(url + ": Error: " + webRequest.error + "\n" + webRequest.downloadHandler.text + "\n" + Environment.StackTrace);
|
||||||
failureCallback?.Invoke(webRequest.error);
|
failureCallback?.Invoke(webRequest.error);
|
||||||
break;
|
break;
|
||||||
case UnityWebRequest.Result.Success:
|
case UnityWebRequest.Result.Success:
|
||||||
|
|
|
||||||
|
|
@ -73,7 +73,6 @@ namespace VELConnect
|
||||||
loading = false;
|
loading = false;
|
||||||
}, s =>
|
}, s =>
|
||||||
{
|
{
|
||||||
Debug.LogError(s);
|
|
||||||
loading = false;
|
loading = false;
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
{
|
{
|
||||||
"name": "edu.uga.engr.vel.vel-connect",
|
"name": "edu.uga.engr.vel.vel-connect",
|
||||||
"displayName": "VEL-Connect",
|
"displayName": "VEL-Connect",
|
||||||
"version": "4.0.2",
|
"version": "4.0.5",
|
||||||
"unity": "2019.1",
|
"unity": "2019.1",
|
||||||
"description": "Web-based configuration for VR applications",
|
"description": "Web-based configuration for VR applications",
|
||||||
"keywords": [],
|
"keywords": [],
|
||||||
|
|
|
||||||
|
|
@ -1,12 +1,12 @@
|
||||||
{
|
{
|
||||||
"name": "@velaboratory/velconnect",
|
"name": "@velaboratory/velconnect",
|
||||||
"version": "1.0.0",
|
"version": "1.0.1",
|
||||||
"lockfileVersion": 2,
|
"lockfileVersion": 2,
|
||||||
"requires": true,
|
"requires": true,
|
||||||
"packages": {
|
"packages": {
|
||||||
"": {
|
"": {
|
||||||
"name": "@velaboratory/velconnect",
|
"name": "@velaboratory/velconnect",
|
||||||
"version": "1.0.0",
|
"version": "1.0.1",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"pocketbase": "^0.20.3"
|
"pocketbase": "^0.20.3"
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue