Skip to content

山
山西检定流水线数字孪生项目
Commit 6a5e4c8b authored by 潘梓豪's avatar 潘梓豪
Browse files
Options

更新场景

parent 945f1ef1
Hide whitespace changes
Inline Side-by-side
Showing with 51 additions and 48 deletions
Assets/Scripts/Components/AGV/LoginManager.cs
View file @ 6a5e4c8b
......@@ -120,12 +120,15 @@ public class LoginManager : MonoBehaviour
private IEnumerator FaultInformation()
{
string jsonData = "{\"lineId\":\"" + lineID.text + "\"}";
string jsonData = "";
while (true)
{
if (!String.IsNullOrEmpty(faultInterface.text))
{
{
if (!String.IsNullOrEmpty(faultInterface.text) && !String.IsNullOrEmpty(lineID.text))
{
jsonData = "{\"lineId\":\"" + lineID.text + "\"}";
Debug.Log(faultInterface.text +"=="+ jsonData);
using (UnityWebRequest request = UnityWebRequest.PostWwwForm(faultInterface.text, jsonData))
{
// 设置请求头
......@@ -172,7 +175,7 @@ public class LoginManager : MonoBehaviour
{
while (true)
{
if (!String.IsNullOrEmpty(post_url.text))
if (!String.IsNullOrEmpty(post_url.text) && !String.IsNullOrEmpty(lineID.text))
{
using (UnityWebRequest request = UnityWebRequest.Get(post_url.text + "?lineId=" + lineID.text))
{
......
Assets/StreamingAssets/URL.json
View file @ 6a5e4c8b
{
"productionlineID1": "http://193.168.200.161:8093/maintenance/jqrznxj/stt/getRobotPosition?lineId=EB6F0348492C181DE055000000000001",
"productionlineID2": "",
"productionlineID2": "http://193.168.200.161:8093/maintenance/jqrznxj/stt/getRobotPosition?lineId=EB6F0348492C181DE055000000000002",
"faultInterface": "http://193.168.200.161:8093/maintenance/mtknowledgefaultevent/getRecentUnResolveEvent",
"lineID1": "EB6F0348492C181DE055000000000001",
"lineID2": "",
"lineID2": "EB6F0348492C181DE055000000000002",
"post_url": "http://193.168.200.161:8093/maintenance/bigScreen/sensor/getThreeModelSensorData"
}
\ No newline at end of file
Assets/WebGLTemplates/ZeusWebGL/index.html
View file @ 6a5e4c8b
......@@ -172,9 +172,9 @@
symbolsUrl: buildUrl + "/{{{ SYMBOLS_FILENAME }}}",
#endif
streamingAssetsUrl: "StreamingAssets",
companyName: JSON.stringify({{{ COMPANY_NAME }}}).replace(/^"(.*)"$/,'$1'),
productName: JSON.stringify({{{ PRODUCT_NAME }}}).replace(/^"(.*)"$/,'$1'),
productVersion: JSON.stringify({{{ PRODUCT_VERSION }}}).replace(/^"(.*)"$/,'$1'),
companyName: {{{ JSON.stringify(COMPANY_NAME) }}},
productName: {{{ JSON.stringify(PRODUCT_NAME) }}},
productVersion: {{{ JSON.stringify(PRODUCT_VERSION) }}},
showBanner: unityShowBanner,
};
......
Assets/_Scenes/1_Main.unity
View file @ 6a5e4c8b
......@@ -1013,22 +1013,22 @@ PrefabInstance:
- target: {fileID: 297434755436261067, guid: 6a1bc17fb471d834cae62b8b564a5c7b,
type: 3}
propertyPath: m_LocalRotation.w
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 297434755436261067, guid: 6a1bc17fb471d834cae62b8b564a5c7b,
type: 3}
propertyPath: m_LocalRotation.x
value: -0
value: 0
objectReference: {fileID: 0}
- target: {fileID: 297434755436261067, guid: 6a1bc17fb471d834cae62b8b564a5c7b,
type: 3}
propertyPath: m_LocalRotation.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 297434755436261067, guid: 6a1bc17fb471d834cae62b8b564a5c7b,
type: 3}
propertyPath: m_LocalRotation.z
value: -0
value: 0
objectReference: {fileID: 0}
- target: {fileID: 297434755436261067, guid: 6a1bc17fb471d834cae62b8b564a5c7b,
type: 3}
......@@ -4014,7 +4014,7 @@ RectTransform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 74507191}
m_LocalRotation: {x: -0, y: 1, z: -0, w: 0}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
......@@ -15330,7 +15330,7 @@ RectTransform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 191573675}
m_LocalRotation: {x: -0, y: 1, z: -0, w: 0}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
......@@ -15343,7 +15343,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 130, y: -130}
m_AnchoredPosition: {x: 130, y: -70}
m_SizeDelta: {x: 260, y: 60}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &191573677
......@@ -21196,22 +21196,22 @@ PrefabInstance:
- target: {fileID: 297434755436261067, guid: 6a1bc17fb471d834cae62b8b564a5c7b,
type: 3}
propertyPath: m_LocalRotation.w
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 297434755436261067, guid: 6a1bc17fb471d834cae62b8b564a5c7b,
type: 3}
propertyPath: m_LocalRotation.x
value: -0
value: 0
objectReference: {fileID: 0}
- target: {fileID: 297434755436261067, guid: 6a1bc17fb471d834cae62b8b564a5c7b,
type: 3}
propertyPath: m_LocalRotation.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 297434755436261067, guid: 6a1bc17fb471d834cae62b8b564a5c7b,
type: 3}
propertyPath: m_LocalRotation.z
value: -0
value: 0
objectReference: {fileID: 0}
- target: {fileID: 297434755436261067, guid: 6a1bc17fb471d834cae62b8b564a5c7b,
type: 3}
......@@ -21271,7 +21271,7 @@ PrefabInstance:
- target: {fileID: 1256487498514185834, guid: 6a1bc17fb471d834cae62b8b564a5c7b,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -190
value: -70
objectReference: {fileID: 0}
- target: {fileID: 2726835590094539403, guid: 6a1bc17fb471d834cae62b8b564a5c7b,
type: 3}
......@@ -30801,22 +30801,22 @@ PrefabInstance:
- target: {fileID: 297434755436261067, guid: 6a1bc17fb471d834cae62b8b564a5c7b,
type: 3}
propertyPath: m_LocalRotation.w
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 297434755436261067, guid: 6a1bc17fb471d834cae62b8b564a5c7b,
type: 3}
propertyPath: m_LocalRotation.x
value: -0
value: 0
objectReference: {fileID: 0}
- target: {fileID: 297434755436261067, guid: 6a1bc17fb471d834cae62b8b564a5c7b,
type: 3}
propertyPath: m_LocalRotation.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 297434755436261067, guid: 6a1bc17fb471d834cae62b8b564a5c7b,
type: 3}
propertyPath: m_LocalRotation.z
value: -0
value: 0
objectReference: {fileID: 0}
- target: {fileID: 297434755436261067, guid: 6a1bc17fb471d834cae62b8b564a5c7b,
type: 3}
......@@ -39032,7 +39032,7 @@ RectTransform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 695078113}
m_LocalRotation: {x: -0, y: 1, z: -0, w: 0}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
......@@ -45255,7 +45255,7 @@ RectTransform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 840334028}
m_LocalRotation: {x: -0, y: 1, z: -0, w: 0}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
......@@ -52345,7 +52345,7 @@ RectTransform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1020476331}
m_LocalRotation: {x: -0, y: 1, z: -0, w: 0}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
......@@ -52358,7 +52358,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 130, y: -130}
m_AnchoredPosition: {x: 130, y: -70}
m_SizeDelta: {x: 260, y: 60}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1020476333
......@@ -53771,7 +53771,7 @@ PrefabInstance:
- target: {fileID: 3618798334208590804, guid: 72c6cc24197ee2747bcb13d5cf8e28c3,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 28.00003
value: 28
objectReference: {fileID: 0}
- target: {fileID: 3618798334326697998, guid: 72c6cc24197ee2747bcb13d5cf8e28c3,
type: 3}
......@@ -63279,22 +63279,22 @@ PrefabInstance:
- target: {fileID: 297434755436261067, guid: 6a1bc17fb471d834cae62b8b564a5c7b,
type: 3}
propertyPath: m_LocalRotation.w
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 297434755436261067, guid: 6a1bc17fb471d834cae62b8b564a5c7b,
type: 3}
propertyPath: m_LocalRotation.x
value: -0
value: 0
objectReference: {fileID: 0}
- target: {fileID: 297434755436261067, guid: 6a1bc17fb471d834cae62b8b564a5c7b,
type: 3}
propertyPath: m_LocalRotation.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 297434755436261067, guid: 6a1bc17fb471d834cae62b8b564a5c7b,
type: 3}
propertyPath: m_LocalRotation.z
value: -0
value: 0
objectReference: {fileID: 0}
- target: {fileID: 297434755436261067, guid: 6a1bc17fb471d834cae62b8b564a5c7b,
type: 3}
......@@ -91710,22 +91710,22 @@ PrefabInstance:
- target: {fileID: 297434755436261067, guid: 6a1bc17fb471d834cae62b8b564a5c7b,
type: 3}
propertyPath: m_LocalRotation.w
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 297434755436261067, guid: 6a1bc17fb471d834cae62b8b564a5c7b,
type: 3}
propertyPath: m_LocalRotation.x
value: -0
value: 0
objectReference: {fileID: 0}
- target: {fileID: 297434755436261067, guid: 6a1bc17fb471d834cae62b8b564a5c7b,
type: 3}
propertyPath: m_LocalRotation.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 297434755436261067, guid: 6a1bc17fb471d834cae62b8b564a5c7b,
type: 3}
propertyPath: m_LocalRotation.z
value: -0
value: 0
objectReference: {fileID: 0}
- target: {fileID: 297434755436261067, guid: 6a1bc17fb471d834cae62b8b564a5c7b,
type: 3}
......@@ -95501,7 +95501,7 @@ RectTransform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1884722533}
m_LocalRotation: {x: -0, y: 1, z: -0, w: 0}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
......@@ -98001,22 +98001,22 @@ PrefabInstance:
- target: {fileID: 297434755436261067, guid: 6a1bc17fb471d834cae62b8b564a5c7b,
type: 3}
propertyPath: m_LocalRotation.w
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 297434755436261067, guid: 6a1bc17fb471d834cae62b8b564a5c7b,
type: 3}
propertyPath: m_LocalRotation.x
value: -0
value: 0
objectReference: {fileID: 0}
- target: {fileID: 297434755436261067, guid: 6a1bc17fb471d834cae62b8b564a5c7b,
type: 3}
propertyPath: m_LocalRotation.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 297434755436261067, guid: 6a1bc17fb471d834cae62b8b564a5c7b,
type: 3}
propertyPath: m_LocalRotation.z
value: -0
value: 0
objectReference: {fileID: 0}
- target: {fileID: 297434755436261067, guid: 6a1bc17fb471d834cae62b8b564a5c7b,
type: 3}
ProjectSettings/EditorBuildSettings.asset
View file @ 6a5e4c8b
......@@ -5,7 +5,7 @@ EditorBuildSettings:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Scenes:
- enabled: 0
- enabled: 1
path: Assets/_Scenes/1_Main.unity
guid: a1193329f89803b4f8a14f6c0b15d2c1
- enabled: 0
......@@ -14,7 +14,7 @@ EditorBuildSettings:
- enabled: 0
path: Assets/_Scenes/3_Main.unity
guid: 20c0c67e1155d7340be70873c2eb30f1
- enabled: 1
- enabled: 0
path: Assets/_Scenes/4_Main.unity
guid: da74b35adf3770040b51552fc0cb9a98
- enabled: 0
......
ProjectSettings/ProjectSettings.asset
View file @ 6a5e4c8b
......@@ -653,7 +653,7 @@ PlayerSettings:
webGLDebugSymbols: 0
webGLEmscriptenArgs:
webGLModulesDirectory:
webGLTemplate: PROJECT:ZeusWebGL
webGLTemplate: APPLICATION:Default
webGLAnalyzeBuildSize: 0
webGLUseEmbeddedResources: 0
webGLCompressionFormat: 2
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment