Commit da824761 authored by 潘梓豪's avatar 潘梓豪

更新

parent 6a5e4c8b
No preview for this file type
No preview for this file type
...@@ -127,8 +127,6 @@ public class LoginManager : MonoBehaviour ...@@ -127,8 +127,6 @@ public class LoginManager : MonoBehaviour
{ {
jsonData = "{\"lineId\":\"" + lineID.text + "\"}"; jsonData = "{\"lineId\":\"" + lineID.text + "\"}";
Debug.Log(faultInterface.text +"=="+ jsonData);
using (UnityWebRequest request = UnityWebRequest.PostWwwForm(faultInterface.text, jsonData)) using (UnityWebRequest request = UnityWebRequest.PostWwwForm(faultInterface.text, jsonData))
{ {
// 设置请求头 // 设置请求头
...@@ -149,7 +147,7 @@ public class LoginManager : MonoBehaviour ...@@ -149,7 +147,7 @@ public class LoginManager : MonoBehaviour
{ {
// 解析响应数据 // 解析响应数据
string responseJson = request.downloadHandler.text; string responseJson = request.downloadHandler.text;
Debug.Log(responseJson);
// 使用 JsonUtility 解析 JSON 数据 // 使用 JsonUtility 解析 JSON 数据
faultData = JsonMapper.ToObject<FaultEventData>(responseJson); faultData = JsonMapper.ToObject<FaultEventData>(responseJson);
......
{ {
"productionlineID1": "http://193.168.200.161:8093/maintenance/jqrznxj/stt/getRobotPosition?lineId=EB6F0348492C181DE055000000000001", "productionlineID1": "http://193.168.200.161:8093/maintenance/jqrznxj/stt/getRobotPosition?lineId=EB6F0348492C181DE055000000000001",
"productionlineID2": "http://193.168.200.161:8093/maintenance/jqrznxj/stt/getRobotPosition?lineId=EB6F0348492C181DE055000000000002", "productionlineID2": "http://193.168.200.161:8093/maintenance/jqrznxj/stt/getRobotPosition?lineId=EB6F0348492C181DE055000000000002",
"faultInterface": "http://193.168.200.161:8093/maintenance/mtknowledgefaultevent/getRecentUnResolveEvent", "faultInterface": "http://127.0.0.1:4523/m1/3550441-2290997-default/maintenance/mtknowledgefaultevent/getRecentUnResolveEvent",
"lineID1": "EB6F0348492C181DE055000000000001", "lineID1": "EB6F0348492C181DE055000000000001",
"lineID2": "EB6F0348492C181DE055000000000002", "lineID2": "EB6F0348492C181DE055000000000002",
"post_url": "http://193.168.200.161:8093/maintenance/bigScreen/sensor/getThreeModelSensorData" "post_url": "http://193.168.200.161:8093/maintenance/bigScreen/sensor/getThreeModelSensorData"
......
...@@ -132095,11 +132095,26 @@ PrefabInstance: ...@@ -132095,11 +132095,26 @@ PrefabInstance:
propertyPath: m_IsActive propertyPath: m_IsActive
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4832972468405137911, guid: e525963e80d07df418ccdd194c29ff2a,
type: 3}
propertyPath: m_ClearFlags
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4832972468405137911, guid: e525963e80d07df418ccdd194c29ff2a, - target: {fileID: 4832972468405137911, guid: e525963e80d07df418ccdd194c29ff2a,
type: 3} type: 3}
propertyPath: field of view propertyPath: field of view
value: 60 value: 60
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4832972468405137911, guid: e525963e80d07df418ccdd194c29ff2a,
type: 3}
propertyPath: m_BackGroundColor.g
value: 0.2852434
objectReference: {fileID: 0}
- target: {fileID: 4832972468405137911, guid: e525963e80d07df418ccdd194c29ff2a,
type: 3}
propertyPath: m_BackGroundColor.r
value: 0.19215688
objectReference: {fileID: 0}
- target: {fileID: 5222297752785051951, guid: e525963e80d07df418ccdd194c29ff2a, - target: {fileID: 5222297752785051951, guid: e525963e80d07df418ccdd194c29ff2a,
type: 3} type: 3}
propertyPath: AutoRotate propertyPath: AutoRotate
...@@ -15720,7 +15720,7 @@ MonoBehaviour: ...@@ -15720,7 +15720,7 @@ MonoBehaviour:
AGVManager: {fileID: 1863911049} AGVManager: {fileID: 1863911049}
facilityManager: {fileID: 229087081} facilityManager: {fileID: 229087081}
AGVName: AGV1 AGVName: AGV1
ReportErrorsUI: {fileID: 9113711836560366625, guid: 1889a8584c0a52f4084308847b8cd4f6, ReportErrorsUI: {fileID: 9113711836560366625, guid: 937500ef87a8a634298e2149118bcba9,
type: 3} type: 3}
IsHasError: [] IsHasError: []
animator: {fileID: 0} animator: {fileID: 0}
...@@ -22059,7 +22059,7 @@ RectTransform: ...@@ -22059,7 +22059,7 @@ RectTransform:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 774785871} m_GameObject: {fileID: 774785871}
m_LocalRotation: {x: 0.000000012238061, y: 0.7319822, z: -0.0000000113911005, w: -0.68132377} m_LocalRotation: {x: 0.000000012238061, y: 0.7319822, z: -0.0000000113911005, w: -0.68132377}
m_LocalPosition: {x: 0, y: 0, z: 0.27871886} m_LocalPosition: {x: 0, y: 0, z: 0.34}
m_LocalScale: {x: 0.010000006, y: 0.01, z: 0.010000006} m_LocalScale: {x: 0.010000006, y: 0.01, z: 0.010000006}
m_ConstrainProportionsScale: 1 m_ConstrainProportionsScale: 1
m_Children: m_Children:
...@@ -22078,7 +22078,7 @@ RectTransform: ...@@ -22078,7 +22078,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: -3.741516, y: 2.906896} m_AnchoredPosition: {x: -2.76, y: 1.2}
m_SizeDelta: {x: 260, y: 0} m_SizeDelta: {x: 260, y: 0}
m_Pivot: {x: 0.5, y: 0} m_Pivot: {x: 0.5, y: 0}
--- !u!114 &774785873 --- !u!114 &774785873
...@@ -27701,7 +27701,7 @@ PrefabInstance: ...@@ -27701,7 +27701,7 @@ PrefabInstance:
- target: {fileID: 3618798332614272893, guid: 72c6cc24197ee2747bcb13d5cf8e28c3, - target: {fileID: 3618798332614272893, guid: 72c6cc24197ee2747bcb13d5cf8e28c3,
type: 3} type: 3}
propertyPath: m_SizeDelta.y propertyPath: m_SizeDelta.y
value: 753.2999 value: 649.2997
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 3618798332614272893, guid: 72c6cc24197ee2747bcb13d5cf8e28c3, - target: {fileID: 3618798332614272893, guid: 72c6cc24197ee2747bcb13d5cf8e28c3,
type: 3} type: 3}
...@@ -27711,7 +27711,7 @@ PrefabInstance: ...@@ -27711,7 +27711,7 @@ PrefabInstance:
- target: {fileID: 3618798332614272893, guid: 72c6cc24197ee2747bcb13d5cf8e28c3, - target: {fileID: 3618798332614272893, guid: 72c6cc24197ee2747bcb13d5cf8e28c3,
type: 3} type: 3}
propertyPath: m_AnchoredPosition.y propertyPath: m_AnchoredPosition.y
value: -602.35 value: -654.34985
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 3618798332700489311, guid: 72c6cc24197ee2747bcb13d5cf8e28c3, - target: {fileID: 3618798332700489311, guid: 72c6cc24197ee2747bcb13d5cf8e28c3,
type: 3} type: 3}
...@@ -27856,7 +27856,7 @@ PrefabInstance: ...@@ -27856,7 +27856,7 @@ PrefabInstance:
- target: {fileID: 3618798334208590804, guid: 72c6cc24197ee2747bcb13d5cf8e28c3, - target: {fileID: 3618798334208590804, guid: 72c6cc24197ee2747bcb13d5cf8e28c3,
type: 3} type: 3}
propertyPath: m_AnchoredPosition.x propertyPath: m_AnchoredPosition.x
value: 28 value: 28.00003
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 3618798334326697998, guid: 72c6cc24197ee2747bcb13d5cf8e28c3, - target: {fileID: 3618798334326697998, guid: 72c6cc24197ee2747bcb13d5cf8e28c3,
type: 3} type: 3}
...@@ -28521,7 +28521,7 @@ RectTransform: ...@@ -28521,7 +28521,7 @@ RectTransform:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1055180238} m_GameObject: {fileID: 1055180238}
m_LocalRotation: {x: -0, y: 0.7071068, z: -0, w: -0.7071068} m_LocalRotation: {x: -0, y: 0.7071068, z: -0, w: -0.7071068}
m_LocalPosition: {x: 0, y: 0, z: -2.7944078} m_LocalPosition: {x: 0, y: 0, z: -2.58}
m_LocalScale: {x: 0.009999997, y: 0.01, z: 0.009999997} m_LocalScale: {x: 0.009999997, y: 0.01, z: 0.009999997}
m_ConstrainProportionsScale: 1 m_ConstrainProportionsScale: 1
m_Children: m_Children:
...@@ -28540,7 +28540,7 @@ RectTransform: ...@@ -28540,7 +28540,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: -5.1940985, y: 2.7425008} m_AnchoredPosition: {x: -5.19, y: 1.61}
m_SizeDelta: {x: 260, y: 0} m_SizeDelta: {x: 260, y: 0}
m_Pivot: {x: 0.5, y: 0} m_Pivot: {x: 0.5, y: 0}
--- !u!114 &1055180240 --- !u!114 &1055180240
...@@ -39384,7 +39384,7 @@ RectTransform: ...@@ -39384,7 +39384,7 @@ RectTransform:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1385259356} m_GameObject: {fileID: 1385259356}
m_LocalRotation: {x: 0.000000012238061, y: 0.7319822, z: -0.0000000113911005, w: -0.68132377} m_LocalRotation: {x: 0.000000012238061, y: 0.7319822, z: -0.0000000113911005, w: -0.68132377}
m_LocalPosition: {x: 0, y: 0, z: -5.9391136} m_LocalPosition: {x: 0, y: 0, z: -5.942509}
m_LocalScale: {x: 0.010000006, y: 0.01, z: 0.010000006} m_LocalScale: {x: 0.010000006, y: 0.01, z: 0.010000006}
m_ConstrainProportionsScale: 1 m_ConstrainProportionsScale: 1
m_Children: m_Children:
...@@ -39403,7 +39403,7 @@ RectTransform: ...@@ -39403,7 +39403,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: -6.738553, y: 2.8576903} m_AnchoredPosition: {x: -6.738553, y: 1.7713569}
m_SizeDelta: {x: 260, y: 0} m_SizeDelta: {x: 260, y: 0}
m_Pivot: {x: 0.5, y: 0} m_Pivot: {x: 0.5, y: 0}
--- !u!114 &1385259358 --- !u!114 &1385259358
...@@ -40846,7 +40846,7 @@ RectTransform: ...@@ -40846,7 +40846,7 @@ RectTransform:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1417101453} m_GameObject: {fileID: 1417101453}
m_LocalRotation: {x: 0.000000012238061, y: 0.7319822, z: -0.0000000113911005, w: -0.68132377} m_LocalRotation: {x: 0.000000012238061, y: 0.7319822, z: -0.0000000113911005, w: -0.68132377}
m_LocalPosition: {x: 0, y: 0, z: -5.9412975} m_LocalPosition: {x: 0, y: 0, z: -5.88}
m_LocalScale: {x: 0.010000006, y: 0.01, z: 0.010000006} m_LocalScale: {x: 0.010000006, y: 0.01, z: 0.010000006}
m_ConstrainProportionsScale: 1 m_ConstrainProportionsScale: 1
m_Children: m_Children:
...@@ -40865,7 +40865,7 @@ RectTransform: ...@@ -40865,7 +40865,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: -3.6831837, y: 2.8576903} m_AnchoredPosition: {x: -2.85, y: 2.69}
m_SizeDelta: {x: 260, y: 0} m_SizeDelta: {x: 260, y: 0}
m_Pivot: {x: 0.5, y: 0} m_Pivot: {x: 0.5, y: 0}
--- !u!114 &1417101455 --- !u!114 &1417101455
...@@ -41847,8 +41847,8 @@ RectTransform: ...@@ -41847,8 +41847,8 @@ RectTransform:
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1457748335} m_GameObject: {fileID: 1457748335}
m_LocalRotation: {x: -0.0000000056064677, y: 0.7071068, z: 0.0000000056064677, w: -0.7071068} m_LocalRotation: {x: -0.000000017514632, y: 0.7337942, z: -0.000000016215646, w: 0.67937183}
m_LocalPosition: {x: 0, y: 0, z: 0.7933954} m_LocalPosition: {x: 0, y: 0, z: 3.05}
m_LocalScale: {x: 0.009999997, y: 0.01, z: 0.009999997} m_LocalScale: {x: 0.009999997, y: 0.01, z: 0.009999997}
m_ConstrainProportionsScale: 1 m_ConstrainProportionsScale: 1
m_Children: m_Children:
...@@ -41867,7 +41867,7 @@ RectTransform: ...@@ -41867,7 +41867,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: -5.1512833, y: 2.4463334} m_AnchoredPosition: {x: -3.9, y: 1.15}
m_SizeDelta: {x: 260, y: 0} m_SizeDelta: {x: 260, y: 0}
m_Pivot: {x: 0.5, y: 0} m_Pivot: {x: 0.5, y: 0}
--- !u!114 &1457748337 --- !u!114 &1457748337
...@@ -43484,7 +43484,7 @@ RectTransform: ...@@ -43484,7 +43484,7 @@ RectTransform:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1520822328} m_GameObject: {fileID: 1520822328}
m_LocalRotation: {x: 0.000000012238061, y: 0.7319822, z: -0.0000000113911005, w: -0.68132377} m_LocalRotation: {x: 0.000000012238061, y: 0.7319822, z: -0.0000000113911005, w: -0.68132377}
m_LocalPosition: {x: 0, y: 0, z: 5.9074235} m_LocalPosition: {x: 0, y: 0, z: 5.89}
m_LocalScale: {x: 0.010000006, y: 0.01, z: 0.010000006} m_LocalScale: {x: 0.010000006, y: 0.01, z: 0.010000006}
m_ConstrainProportionsScale: 1 m_ConstrainProportionsScale: 1
m_Children: m_Children:
...@@ -43503,7 +43503,7 @@ RectTransform: ...@@ -43503,7 +43503,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: -5.319586, y: 3.5972362} m_AnchoredPosition: {x: -5.57, y: 3.68}
m_SizeDelta: {x: 260, y: 0} m_SizeDelta: {x: 260, y: 0}
m_Pivot: {x: 0.5, y: 0} m_Pivot: {x: 0.5, y: 0}
--- !u!114 &1520822330 --- !u!114 &1520822330
...@@ -44497,7 +44497,7 @@ RectTransform: ...@@ -44497,7 +44497,7 @@ RectTransform:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1548369467} m_GameObject: {fileID: 1548369467}
m_LocalRotation: {x: 0.000000012238061, y: 0.7319822, z: -0.0000000113911005, w: -0.68132377} m_LocalRotation: {x: 0.000000012238061, y: 0.7319822, z: -0.0000000113911005, w: -0.68132377}
m_LocalPosition: {x: 0, y: 0, z: 4.87} m_LocalPosition: {x: 0, y: 0, z: 4.81}
m_LocalScale: {x: 0.010000006, y: 0.01, z: 0.010000006} m_LocalScale: {x: 0.010000006, y: 0.01, z: 0.010000006}
m_ConstrainProportionsScale: 1 m_ConstrainProportionsScale: 1
m_Children: m_Children:
...@@ -44516,7 +44516,7 @@ RectTransform: ...@@ -44516,7 +44516,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: -5.24, y: 2.27} m_AnchoredPosition: {x: -6.09, y: 1.95}
m_SizeDelta: {x: 260, y: 0} m_SizeDelta: {x: 260, y: 0}
m_Pivot: {x: 0.5, y: 0} m_Pivot: {x: 0.5, y: 0}
--- !u!114 &1548369469 --- !u!114 &1548369469
...@@ -54975,7 +54975,7 @@ RectTransform: ...@@ -54975,7 +54975,7 @@ RectTransform:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1861178689} m_GameObject: {fileID: 1861178689}
m_LocalRotation: {x: 0.000000012238061, y: 0.7319822, z: -0.0000000113911005, w: -0.68132377} m_LocalRotation: {x: 0.000000012238061, y: 0.7319822, z: -0.0000000113911005, w: -0.68132377}
m_LocalPosition: {x: 0, y: 0, z: 0.27571002} m_LocalPosition: {x: 0, y: 0, z: 0.27231464}
m_LocalScale: {x: 0.010000006, y: 0.01, z: 0.010000006} m_LocalScale: {x: 0.010000006, y: 0.01, z: 0.010000006}
m_ConstrainProportionsScale: 1 m_ConstrainProportionsScale: 1
m_Children: m_Children:
...@@ -54994,7 +54994,7 @@ RectTransform: ...@@ -54994,7 +54994,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: -6.750143, y: 2.906896} m_AnchoredPosition: {x: -6.750143, y: 1.8205627}
m_SizeDelta: {x: 260, y: 0} m_SizeDelta: {x: 260, y: 0}
m_Pivot: {x: 0.5, y: 0} m_Pivot: {x: 0.5, y: 0}
--- !u!114 &1861178691 --- !u!114 &1861178691
...@@ -60594,7 +60594,12 @@ PrefabInstance: ...@@ -60594,7 +60594,12 @@ PrefabInstance:
- target: {fileID: 1808383340561177724, guid: e525963e80d07df418ccdd194c29ff2a, - target: {fileID: 1808383340561177724, guid: e525963e80d07df418ccdd194c29ff2a,
type: 3} type: 3}
propertyPath: m_LocalPosition.x propertyPath: m_LocalPosition.x
value: -5.6 value: -5.2
objectReference: {fileID: 0}
- target: {fileID: 1808383340561177724, guid: e525963e80d07df418ccdd194c29ff2a,
type: 3}
propertyPath: m_LocalPosition.y
value: 1.11
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 1808383340561177724, guid: e525963e80d07df418ccdd194c29ff2a, - target: {fileID: 1808383340561177724, guid: e525963e80d07df418ccdd194c29ff2a,
type: 3} type: 3}
...@@ -60634,12 +60639,12 @@ PrefabInstance: ...@@ -60634,12 +60639,12 @@ PrefabInstance:
- target: {fileID: 3808107295801017191, guid: e525963e80d07df418ccdd194c29ff2a, - target: {fileID: 3808107295801017191, guid: e525963e80d07df418ccdd194c29ff2a,
type: 3} type: 3}
propertyPath: m_LocalPosition.x propertyPath: m_LocalPosition.x
value: -21.950653 value: -27.470718
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 3808107295801017191, guid: e525963e80d07df418ccdd194c29ff2a, - target: {fileID: 3808107295801017191, guid: e525963e80d07df418ccdd194c29ff2a,
type: 3} type: 3}
propertyPath: m_LocalPosition.y propertyPath: m_LocalPosition.y
value: 5.95115 value: 9.215877
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 3808107295801017191, guid: e525963e80d07df418ccdd194c29ff2a, - target: {fileID: 3808107295801017191, guid: e525963e80d07df418ccdd194c29ff2a,
type: 3} type: 3}
...@@ -60784,7 +60789,7 @@ PrefabInstance: ...@@ -60784,7 +60789,7 @@ PrefabInstance:
- target: {fileID: 8839179174577983911, guid: e525963e80d07df418ccdd194c29ff2a, - target: {fileID: 8839179174577983911, guid: e525963e80d07df418ccdd194c29ff2a,
type: 3} type: 3}
propertyPath: m_LocalPosition.z propertyPath: m_LocalPosition.z
value: -17.4 value: -23.7
objectReference: {fileID: 0} objectReference: {fileID: 0}
m_RemovedComponents: [] m_RemovedComponents: []
m_RemovedGameObjects: [] m_RemovedGameObjects: []
...@@ -60975,7 +60980,7 @@ Skybox: ...@@ -60975,7 +60980,7 @@ Skybox:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2030149298} m_GameObject: {fileID: 2030149298}
m_Enabled: 1 m_Enabled: 1
m_CustomSkybox: {fileID: 2100000, guid: db9f9c26bfe4ece4db00613b5638884d, type: 2} m_CustomSkybox: {fileID: 2100000, guid: de0aece4a3510fa42ba7ace4016913c8, type: 2}
--- !u!1 &2033314161 --- !u!1 &2033314161
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -52042,7 +52042,7 @@ PrefabInstance: ...@@ -52042,7 +52042,7 @@ PrefabInstance:
- target: {fileID: 3618798332614272893, guid: 72c6cc24197ee2747bcb13d5cf8e28c3, - target: {fileID: 3618798332614272893, guid: 72c6cc24197ee2747bcb13d5cf8e28c3,
type: 3} type: 3}
propertyPath: m_SizeDelta.y propertyPath: m_SizeDelta.y
value: 189.69992 value: 382.7997
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 3618798332614272893, guid: 72c6cc24197ee2747bcb13d5cf8e28c3, - target: {fileID: 3618798332614272893, guid: 72c6cc24197ee2747bcb13d5cf8e28c3,
type: 3} type: 3}
...@@ -52052,7 +52052,7 @@ PrefabInstance: ...@@ -52052,7 +52052,7 @@ PrefabInstance:
- target: {fileID: 3618798332614272893, guid: 72c6cc24197ee2747bcb13d5cf8e28c3, - target: {fileID: 3618798332614272893, guid: 72c6cc24197ee2747bcb13d5cf8e28c3,
type: 3} type: 3}
propertyPath: m_AnchoredPosition.y propertyPath: m_AnchoredPosition.y
value: -884.1499 value: -787.59985
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 3618798332700489311, guid: 72c6cc24197ee2747bcb13d5cf8e28c3, - target: {fileID: 3618798332700489311, guid: 72c6cc24197ee2747bcb13d5cf8e28c3,
type: 3} type: 3}
...@@ -105264,7 +105264,7 @@ Skybox: ...@@ -105264,7 +105264,7 @@ Skybox:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2030149298} m_GameObject: {fileID: 2030149298}
m_Enabled: 1 m_Enabled: 1
m_CustomSkybox: {fileID: 2100000, guid: db9f9c26bfe4ece4db00613b5638884d, type: 2} m_CustomSkybox: {fileID: 2100000, guid: de0aece4a3510fa42ba7ace4016913c8, type: 2}
--- !u!1 &2031304813 --- !u!1 &2031304813
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: "\u6E10\u53D8\u5929\u7A7A 1"
m_Shader: {fileID: 103, guid: 0000000000000000f000000000000000, type: 0}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords: []
m_InvalidKeywords:
- _MAPPING_LATITUDE_LONGITUDE_LAYOUT
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _BumpMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailAlbedoMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailMask:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailNormalMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _EmissionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 2800000, guid: d0066695a3f260848adf1606370745b5, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _OcclusionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ParallaxMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _Tex:
m_Texture: {fileID: 8900000, guid: 356df6f8fb797bd428b3892acbc252bc, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _BumpScale: 1
- _Cutoff: 0.5
- _DetailNormalMapScale: 1
- _DstBlend: 0
- _Exposure: 0.58
- _GlossMapScale: 1
- _Glossiness: 0.5
- _GlossyReflections: 1
- _ImageType: 0
- _Layout: 0
- _Mapping: 1
- _Metallic: 0
- _MirrorOnBack: 0
- _Mode: 0
- _OcclusionStrength: 1
- _Parallax: 0.02
- _Rotation: 99
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
- _UVSec: 0
- _ZWrite: 1
m_Colors:
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _Tint: {r: 1, g: 1, b: 1, a: 0.5}
m_BuildTextureStacks: []
fileFormatVersion: 2
guid: de0aece4a3510fa42ba7ace4016913c8
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 2100000
userData:
assetBundleName:
assetBundleVariant:
...@@ -605,7 +605,7 @@ RectTransform: ...@@ -605,7 +605,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: -2}
m_SizeDelta: {x: 1500, y: 1080} m_SizeDelta: {x: 1500, y: 1080}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8325663825292970736 --- !u!222 &8325663825292970736
......
This diff is collapsed.
fileFormatVersion: 2
guid: 937500ef87a8a634298e2149118bcba9
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
...@@ -313,6 +313,7 @@ GameObject: ...@@ -313,6 +313,7 @@ GameObject:
- component: {fileID: 8325663825148103512} - component: {fileID: 8325663825148103512}
- component: {fileID: 8325663825148103519} - component: {fileID: 8325663825148103519}
- component: {fileID: 9113711836560366625} - component: {fileID: 9113711836560366625}
- component: {fileID: 9071432618659809964}
m_Layer: 5 m_Layer: 5
m_Name: "Canvas-3D\u8DDF\u968F" m_Name: "Canvas-3D\u8DDF\u968F"
m_TagString: Untagged m_TagString: Untagged
...@@ -417,6 +418,18 @@ MonoBehaviour: ...@@ -417,6 +418,18 @@ MonoBehaviour:
m_EditorClassIdentifier: m_EditorClassIdentifier:
DeviceName: {fileID: 8325663825292103473} DeviceName: {fileID: 8325663825292103473}
ErrorType: {fileID: 8325663825776256382} ErrorType: {fileID: 8325663825776256382}
--- !u!114 &9071432618659809964
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8325663825148103517}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 3ed83d4864ee1f24cbbe26198a1e5210, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &8325663825292103479 --- !u!1 &8325663825292103479
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
......
...@@ -5,13 +5,13 @@ EditorBuildSettings: ...@@ -5,13 +5,13 @@ EditorBuildSettings:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
serializedVersion: 2 serializedVersion: 2
m_Scenes: m_Scenes:
- enabled: 1 - enabled: 0
path: Assets/_Scenes/1_Main.unity path: Assets/_Scenes/1_Main.unity
guid: a1193329f89803b4f8a14f6c0b15d2c1 guid: a1193329f89803b4f8a14f6c0b15d2c1
- enabled: 0 - enabled: 0
path: Assets/_Scenes/2_Main.unity path: Assets/_Scenes/2_Main.unity
guid: cd64cb8beb835d140bab25cca6c93dd5 guid: cd64cb8beb835d140bab25cca6c93dd5
- enabled: 0 - enabled: 1
path: Assets/_Scenes/3_Main.unity path: Assets/_Scenes/3_Main.unity
guid: 20c0c67e1155d7340be70873c2eb30f1 guid: 20c0c67e1155d7340be70873c2eb30f1
- enabled: 0 - enabled: 0
......
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