Skip to content

山
山西检定流水线数字孪生项目
Commit ca83ae9e authored by 黄俊龙's avatar 黄俊龙
Browse files
Options

Merge branch 'master' of git@gitlab.sd-zeus.com:yangzeyu/SCVerificationPipelineDT.git

parents 676876f3 6a7ae96a
Hide whitespace changes
Inline Side-by-side
Showing with 62 additions and 47 deletions
Assets/Scripts/Components/AGV/DatabaseReader.cs
View file @ ca83ae9e
......@@ -129,6 +129,10 @@ public class DatabaseReader : MonoBehaviour
var msg = JsonMapper.ToObject(item.JsonValue, tt);
Manager.OnReceiveMsg.Invoke(msg, null);
}
if (item.DataType.Equals("FaultEventData"))
{
Debug.Log(item.JsonValue);
}
}
if (!em.MoveNext())
......
Assets/Scripts/Components/AGV/LoginManager.cs
View file @ ca83ae9e
......@@ -59,6 +59,7 @@ public class LoginManager : MonoBehaviour
FaultEventData faultEventData = (FaultEventData)data;
if (faultEventData.data != null && faultEventData.data.Length > 0)
{
//Debug.Log("有数据"+faultEventData.data);
IsFault = true;
Failure = faultEventData;
}
......@@ -146,7 +147,7 @@ public class LoginManager : MonoBehaviour
}
}
}
yield return new WaitForSeconds(60);
yield return new WaitForSeconds(5f);
}
}
}
......
Assets/_Scenes/1_Main.unity
View file @ ca83ae9e
......@@ -38,7 +38,7 @@ RenderSettings:
m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 0}
m_IndirectSpecularColor: {r: 0.27861485, g: 0.30078807, b: 0.36295882, a: 1}
m_IndirectSpecularColor: {r: 0.2786128, g: 0.30078742, b: 0.3628655, a: 1}
m_UseRadianceAmbientProbe: 0
--- !u!157 &3
LightmapSettings:
......@@ -13685,7 +13685,7 @@ MonoBehaviour:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 560685325}
m_Enabled: 1
m_Enabled: 0
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 61673f6590d0ff745805f9319090354c, type: 3}
m_Name:
......@@ -13710,7 +13710,7 @@ MonoBehaviour:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 560685325}
m_Enabled: 0
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 688aa349ad8f0444fa5e8033f6379dee, type: 3}
m_Name:
......@@ -18715,6 +18715,11 @@ PrefabInstance:
propertyPath: m_Delegates.Array.data[1].callback.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
value: OnSliderDragStart
objectReference: {fileID: 0}
- target: {fileID: 3618798332614272892, guid: 72c6cc24197ee2747bcb13d5cf8e28c3,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3618798332614272893, guid: 72c6cc24197ee2747bcb13d5cf8e28c3,
type: 3}
propertyPath: m_SizeDelta.x
......@@ -18848,22 +18853,22 @@ PrefabInstance:
- target: {fileID: 3618798334079683222, guid: 72c6cc24197ee2747bcb13d5cf8e28c3,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3618798334079683222, guid: 72c6cc24197ee2747bcb13d5cf8e28c3,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3618798334079683222, guid: 72c6cc24197ee2747bcb13d5cf8e28c3,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
value: 477
objectReference: {fileID: 0}
- target: {fileID: 3618798334079683222, guid: 72c6cc24197ee2747bcb13d5cf8e28c3,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
value: -306.34998
objectReference: {fileID: 0}
- target: {fileID: 3618798334079683223, guid: 72c6cc24197ee2747bcb13d5cf8e28c3,
type: 3}
......@@ -18913,22 +18918,22 @@ PrefabInstance:
- target: {fileID: 3618798334575208420, guid: 72c6cc24197ee2747bcb13d5cf8e28c3,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3618798334575208420, guid: 72c6cc24197ee2747bcb13d5cf8e28c3,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3618798334575208420, guid: 72c6cc24197ee2747bcb13d5cf8e28c3,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
value: 105
objectReference: {fileID: 0}
- target: {fileID: 3618798334575208420, guid: 72c6cc24197ee2747bcb13d5cf8e28c3,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
value: -306.34998
objectReference: {fileID: 0}
- target: {fileID: 3618798334575208421, guid: 72c6cc24197ee2747bcb13d5cf8e28c3,
type: 3}
......@@ -18948,42 +18953,42 @@ PrefabInstance:
- target: {fileID: 3992369889955778430, guid: 72c6cc24197ee2747bcb13d5cf8e28c3,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3992369889955778430, guid: 72c6cc24197ee2747bcb13d5cf8e28c3,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3992369889955778430, guid: 72c6cc24197ee2747bcb13d5cf8e28c3,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
value: 291
objectReference: {fileID: 0}
- target: {fileID: 3992369889955778430, guid: 72c6cc24197ee2747bcb13d5cf8e28c3,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
value: -306.34998
objectReference: {fileID: 0}
- target: {fileID: 4392102991719277207, guid: 72c6cc24197ee2747bcb13d5cf8e28c3,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4392102991719277207, guid: 72c6cc24197ee2747bcb13d5cf8e28c3,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4392102991719277207, guid: 72c6cc24197ee2747bcb13d5cf8e28c3,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
value: 18
objectReference: {fileID: 0}
- target: {fileID: 4392102991719277207, guid: 72c6cc24197ee2747bcb13d5cf8e28c3,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
value: -30
objectReference: {fileID: 0}
- target: {fileID: 4472384063604010404, guid: 72c6cc24197ee2747bcb13d5cf8e28c3,
type: 3}
......@@ -19040,22 +19045,22 @@ PrefabInstance:
- target: {fileID: 6362739256838486730, guid: 72c6cc24197ee2747bcb13d5cf8e28c3,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6362739256838486730, guid: 72c6cc24197ee2747bcb13d5cf8e28c3,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6362739256838486730, guid: 72c6cc24197ee2747bcb13d5cf8e28c3,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
value: 663
objectReference: {fileID: 0}
- target: {fileID: 6362739256838486730, guid: 72c6cc24197ee2747bcb13d5cf8e28c3,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
value: -306.34998
objectReference: {fileID: 0}
- target: {fileID: 6459680320303193160, guid: 72c6cc24197ee2747bcb13d5cf8e28c3,
type: 3}
......@@ -22289,7 +22294,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!224 &1371736656
RectTransform:
m_ObjectHideFlags: 0
......@@ -37222,7 +37227,7 @@ PrefabInstance:
- target: {fileID: 5222297752785051951, guid: e525963e80d07df418ccdd194c29ff2a,
type: 3}
propertyPath: AutoRotate
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5222297752785051951, guid: e525963e80d07df418ccdd194c29ff2a,
type: 3}
Assets/_Scenes/2_Main.unity
View file @ ca83ae9e
......@@ -38,7 +38,7 @@ RenderSettings:
m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 0}
m_IndirectSpecularColor: {r: 0.27861485, g: 0.30078807, b: 0.36295882, a: 1}
m_IndirectSpecularColor: {r: 0.2786128, g: 0.30078742, b: 0.3628655, a: 1}
m_UseRadianceAmbientProbe: 0
--- !u!157 &3
LightmapSettings:
......@@ -11189,6 +11189,11 @@ PrefabInstance:
propertyPath: m_Delegates.Array.data[1].callback.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
value: OnSliderDragStart
objectReference: {fileID: 0}
- target: {fileID: 3618798332614272892, guid: 72c6cc24197ee2747bcb13d5cf8e28c3,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3618798332614272893, guid: 72c6cc24197ee2747bcb13d5cf8e28c3,
type: 3}
propertyPath: m_SizeDelta.x
......@@ -11322,22 +11327,22 @@ PrefabInstance:
- target: {fileID: 3618798334079683222, guid: 72c6cc24197ee2747bcb13d5cf8e28c3,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3618798334079683222, guid: 72c6cc24197ee2747bcb13d5cf8e28c3,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3618798334079683222, guid: 72c6cc24197ee2747bcb13d5cf8e28c3,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
value: 477
objectReference: {fileID: 0}
- target: {fileID: 3618798334079683222, guid: 72c6cc24197ee2747bcb13d5cf8e28c3,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
value: -306.34998
objectReference: {fileID: 0}
- target: {fileID: 3618798334079683223, guid: 72c6cc24197ee2747bcb13d5cf8e28c3,
type: 3}
......@@ -11387,22 +11392,22 @@ PrefabInstance:
- target: {fileID: 3618798334575208420, guid: 72c6cc24197ee2747bcb13d5cf8e28c3,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3618798334575208420, guid: 72c6cc24197ee2747bcb13d5cf8e28c3,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3618798334575208420, guid: 72c6cc24197ee2747bcb13d5cf8e28c3,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
value: 105
objectReference: {fileID: 0}
- target: {fileID: 3618798334575208420, guid: 72c6cc24197ee2747bcb13d5cf8e28c3,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
value: -306.34998
objectReference: {fileID: 0}
- target: {fileID: 3618798334575208421, guid: 72c6cc24197ee2747bcb13d5cf8e28c3,
type: 3}
......@@ -11422,22 +11427,22 @@ PrefabInstance:
- target: {fileID: 3992369889955778430, guid: 72c6cc24197ee2747bcb13d5cf8e28c3,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3992369889955778430, guid: 72c6cc24197ee2747bcb13d5cf8e28c3,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3992369889955778430, guid: 72c6cc24197ee2747bcb13d5cf8e28c3,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
value: 291
objectReference: {fileID: 0}
- target: {fileID: 3992369889955778430, guid: 72c6cc24197ee2747bcb13d5cf8e28c3,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
value: -306.34998
objectReference: {fileID: 0}
- target: {fileID: 4392102991719277207, guid: 72c6cc24197ee2747bcb13d5cf8e28c3,
type: 3}
......@@ -11514,22 +11519,22 @@ PrefabInstance:
- target: {fileID: 6362739256838486730, guid: 72c6cc24197ee2747bcb13d5cf8e28c3,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6362739256838486730, guid: 72c6cc24197ee2747bcb13d5cf8e28c3,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6362739256838486730, guid: 72c6cc24197ee2747bcb13d5cf8e28c3,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
value: 663
objectReference: {fileID: 0}
- target: {fileID: 6362739256838486730, guid: 72c6cc24197ee2747bcb13d5cf8e28c3,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
value: -306.34998
objectReference: {fileID: 0}
- target: {fileID: 6459680320303193160, guid: 72c6cc24197ee2747bcb13d5cf8e28c3,
type: 3}
......@@ -14828,7 +14833,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!224 &1371736656
RectTransform:
m_ObjectHideFlags: 0
......@@ -25327,7 +25332,7 @@ PrefabInstance:
- target: {fileID: 5222297752785051951, guid: e525963e80d07df418ccdd194c29ff2a,
type: 3}
propertyPath: AutoRotate
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5222297752785051951, guid: e525963e80d07df418ccdd194c29ff2a,
type: 3}
......
Assets/_预设/UI/Canvas-3D跟随.prefab
View file @ ca83ae9e
......@@ -337,7 +337,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 3.5}
m_AnchoredPosition: {x: 0, y: 6}
m_SizeDelta: {x: 1920, y: 1080}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!223 &8325663825148103513
......
ProjectSettings/ProjectSettings.asset
View file @ ca83ae9e
......@@ -179,7 +179,7 @@ PlayerSettings:
CreateWallpaper: 0
APKExpansionFiles: 0
keepLoadedShadersAlive: 0
StripUnusedMeshComponents: 0
StripUnusedMeshComponents: 1
strictShaderVariantMatching: 0
VertexChannelCompressionMask: 4054
iPhoneSdkVersion: 988
......
一号线.db
View file @ ca83ae9e
No preview for this file type
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