From 87606161553b0883e6a035ad32e2684d3971bd43 Mon Sep 17 00:00:00 2001
From: YangHua <1475658476@qq.com>
Date: Thu, 13 Jun 2024 13:16:47 +0800
Subject: [PATCH] 32311
---
.../Assets/Adam/Scripts/BiaoJiController.cs | 74 +++++--
.../Adam/Scripts/Components/NPCWaypoints.cs | 4 +-
.../GameAssets/Art/0任务书/MapFlowManager.cs | 2 +-
.../Art/0任务书/任务书动画Timeline.playable | 191 ++----------------
.../Prefeb/三相_无互感器_无光伏.prefab | 51 ++++-
.../Prefeb/单相_无互感器_无光伏.prefab | 174 +++++++++++++++-
.../Assets/StreamingAssets/Message.json | 2 +-
.../Assets/StreamingAssets/build_info.txt | 2 +-
8 files changed, 285 insertions(+), 215 deletions(-)
diff --git a/SXElectricalInspection/Assets/Adam/Scripts/BiaoJiController.cs b/SXElectricalInspection/Assets/Adam/Scripts/BiaoJiController.cs
index 491e4906..379adae6 100644
--- a/SXElectricalInspection/Assets/Adam/Scripts/BiaoJiController.cs
+++ b/SXElectricalInspection/Assets/Adam/Scripts/BiaoJiController.cs
@@ -55,17 +55,59 @@ namespace QianHuo
public ErrorObjs currentErrorObj;
public ErrorObjs currentCorrectObj;
public string[] abc;
+
public string warnningType;
public string onSite;
public string userState;
public bool isGuanFu = false;
+ public BiaoJIData biaoJiData = new BiaoJIData();
+ ///
+ /// 短接类型
+ ///
+ ///
+ public string ShortCircuitType()
+ {
+ switch (biaoJiData.warningType)
+ {
+ case "电流短接":
+ warnningType = "电流异常";
+ return "电能表U型环短接";
+ case "A相短接":
+ warnningType = "电流异常";
+ return "电能表U型环短接";
+ case "B相短接":
+ warnningType = "电流异常";
+ return "电能表U型环短接";
+ case "C相短接":
+ warnningType = "电流异常";
+ return "电能表U型环短接";
+ }
+ return "";
+ }
+
+ public string[] ABC()
+ {
+ switch (biaoJiData.warningType)
+ {
+ case "电流短接":
+ return new string[1] { "A" };
+ case "A相短接":
+ return new string[1] { "A" };
+ case "B相短接":
+ return new string[1] { "B" };
+ case "C相短接":
+ return new string[1] { "C" };
+ }
+ return null;
+ }
// Use this for initialization
private void Start()
{
+ biaoJiData = GlobalFlag.biaojiData;
//userState = GlobalFlag.biaojiData.userState;
//warnningType = GlobalFlag.biaojiData.warningType;
- //onSite = GlobalFlag.biaojiData.onSite;
+ onSite = ShortCircuitType();
//if (userState == "正常") return;
@@ -76,17 +118,17 @@ namespace QianHuo
if (isGuanFu)
{
- if (warnningType.Equals("电压异常"))
- {
- SwitchDianYaErrorObjs();
- SwitchDianYaCorrectObjs();
+ if (warnningType.Equals("电压异常"))
+ {
+ SwitchDianYaErrorObjs();
+ SwitchDianYaCorrectObjs();
- }
- else if (warnningType.Equals("电流异常"))
- {
- SwitchDianLiuErrorObjs();
- SwitchDianLiuCorrectObjs();
- }
+ }
+ else if (warnningType.Equals("电流异常"))
+ {
+ SwitchDianLiuErrorObjs();
+ SwitchDianLiuCorrectObjs();
+ }
}
else
{
@@ -123,7 +165,7 @@ namespace QianHuo
if (huganqiFengYing.GetComponent())
huganqiFengYing.GetComponent()._collider.enabled = true;
huganqiFengYing.SetActive(false);
-
+
}
break;
}
@@ -146,7 +188,7 @@ namespace QianHuo
///
public void SwitchDianLiuErrorObjs()
{
- string onSiteState = GlobalFlag.biaojiData.warningType;
+ string onSiteState = onSite;
for (int i = 0; i < errorObjs.Length; i++)
{
int index = i;
@@ -164,7 +206,7 @@ namespace QianHuo
///
public void SwitchDianLiuCorrectObjs()
{
- string onSiteState = GlobalFlag.biaojiData.warningType;
+ string onSiteState = onSite;
for (int i = 0; i < correctObjs.Length; i++)
{
int index = i;
@@ -179,8 +221,8 @@ namespace QianHuo
public void SwitchABC()
{
- //if (!string.IsNullOrEmpty(GlobalFlag.biaojiData.selectInfo))
- // abc = ToolUtility.GetInfos(GlobalFlag.biaojiData.selectInfo, '_');
+ if (ABC() != null)
+ abc = ABC();
for (int i = 0; i < currentErrorObj.objChildren.Length; i++)
{
diff --git a/SXElectricalInspection/Assets/Adam/Scripts/Components/NPCWaypoints.cs b/SXElectricalInspection/Assets/Adam/Scripts/Components/NPCWaypoints.cs
index 1bbfadee..ec19c49e 100644
--- a/SXElectricalInspection/Assets/Adam/Scripts/Components/NPCWaypoints.cs
+++ b/SXElectricalInspection/Assets/Adam/Scripts/Components/NPCWaypoints.cs
@@ -62,6 +62,8 @@ namespace Components
npcAnimator.SetBool("isWalk", false);
isMove = false;
isOnce = true;
+ transform.LookAt(GameManager.Instance.Player.transform.position);
+ transform.eulerAngles = new Vector3(0, transform.eulerAngles.y, 0);
}
}
}
@@ -73,7 +75,7 @@ namespace Components
private IEnumerator WaitMove()
{
- yield return new WaitForSeconds(3f);
+ yield return new WaitForSeconds(1f);
npcAnimator.SetBool("isWalk", true);
isMove = true;
isOnce = false;
diff --git a/SXElectricalInspection/Assets/GameAssets/Art/0任务书/MapFlowManager.cs b/SXElectricalInspection/Assets/GameAssets/Art/0任务书/MapFlowManager.cs
index fda6865c..bd6c7a71 100644
--- a/SXElectricalInspection/Assets/GameAssets/Art/0任务书/MapFlowManager.cs
+++ b/SXElectricalInspection/Assets/GameAssets/Art/0任务书/MapFlowManager.cs
@@ -11,7 +11,7 @@ public class MapFlowManager : MonoBehaviour
{
//XUIPanel.ShowPanel("Ѳ߹ǩ");
obj.SetActive(false);
- Invoke("Delay", 12f);
+ Invoke("Delay", 4f);
}
void Delay()
{
diff --git a/SXElectricalInspection/Assets/GameAssets/Art/0任务书/任务书动画Timeline.playable b/SXElectricalInspection/Assets/GameAssets/Art/0任务书/任务书动画Timeline.playable
index 20ec5d4c..4606705f 100644
--- a/SXElectricalInspection/Assets/GameAssets/Art/0任务书/任务书动画Timeline.playable
+++ b/SXElectricalInspection/Assets/GameAssets/Art/0任务书/任务书动画Timeline.playable
@@ -22,7 +22,7 @@ MonoBehaviour:
m_Children: []
m_Clips:
- m_Version: 1
- m_Start: 7.816666666666666
+ m_Start: 0
m_ClipIn: 14.383333333333333
m_Asset: {fileID: 6171090246085002100}
m_Duration: 15.31666666666667
@@ -30,7 +30,7 @@ MonoBehaviour:
m_ParentTrack: {fileID: -7291560160074582383}
m_EaseInDuration: 0
m_EaseOutDuration: 0
- m_BlendInDuration: 0.3500000000000014
+ m_BlendInDuration: -1
m_BlendOutDuration: -1
m_MixInCurve:
serializedVersion: 2
@@ -90,75 +90,6 @@ MonoBehaviour:
m_PostExtrapolationTime: Infinity
m_PreExtrapolationTime: 0
m_DisplayName: "\u770B\u624B\u673A"
- - m_Version: 1
- m_Start: 0
- m_ClipIn: 0
- m_Asset: {fileID: -2034170490325185282}
- m_Duration: 8.166666666666668
- m_TimeScale: 1
- m_ParentTrack: {fileID: -7291560160074582383}
- m_EaseInDuration: 0
- m_EaseOutDuration: 0
- m_BlendInDuration: -1
- m_BlendOutDuration: 0.3500000000000014
- m_MixInCurve:
- serializedVersion: 2
- m_Curve:
- - serializedVersion: 3
- time: 0
- value: 0
- inSlope: 0
- outSlope: 0
- tangentMode: 0
- weightedMode: 0
- inWeight: 0
- outWeight: 0
- - serializedVersion: 3
- time: 1
- value: 1
- inSlope: 0
- outSlope: 0
- tangentMode: 0
- weightedMode: 0
- inWeight: 0
- outWeight: 0
- m_PreInfinity: 2
- m_PostInfinity: 2
- m_RotationOrder: 4
- m_MixOutCurve:
- serializedVersion: 2
- m_Curve:
- - serializedVersion: 3
- time: 0
- value: 1
- inSlope: 0
- outSlope: 0
- tangentMode: 0
- weightedMode: 0
- inWeight: 0
- outWeight: 0
- - serializedVersion: 3
- time: 1
- value: 0
- inSlope: 0
- outSlope: 0
- tangentMode: 0
- weightedMode: 0
- inWeight: 0
- outWeight: 0
- m_PreInfinity: 2
- m_PostInfinity: 2
- m_RotationOrder: 4
- m_BlendInCurveMode: 0
- m_BlendOutCurveMode: 0
- m_ExposedParameterNames: []
- m_AnimationCurves: {fileID: 0}
- m_Recordable: 0
- m_PostExtrapolationMode: 1
- m_PreExtrapolationMode: 1
- m_PostExtrapolationTime: 0
- m_PreExtrapolationTime: 0
- m_DisplayName: Walk
m_Markers:
m_Objects: []
m_InfiniteClipPreExtrapolation: 0
@@ -213,7 +144,7 @@ MonoBehaviour:
m_Children: []
m_Clips:
- m_Version: 1
- m_Start: 8.933333333333334
+ m_Start: 1.116666666666667
m_ClipIn: 0
m_Asset: {fileID: -5929231508274949176}
m_Duration: 14.550000000000004
@@ -284,28 +215,6 @@ MonoBehaviour:
m_Markers:
m_Objects: []
m_PostPlaybackState: 3
---- !u!114 &-2034170490325185282
-MonoBehaviour:
- m_ObjectHideFlags: 1
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 0}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 030f85c3f73729f4f976f66ffb23b875, type: 3}
- m_Name: AnimationPlayableAsset
- m_EditorClassIdentifier:
- m_Clip: {fileID: -203655887218126122, guid: 57774d4c08522c94abd6fd1c36daae63, type: 3}
- m_Position: {x: 0, y: 0, z: 0}
- m_EulerAngles: {x: 0, y: 0, z: 0}
- m_UseTrackMatchFields: 1
- m_MatchTargetFields: 63
- m_RemoveStartOffset: 1
- m_ApplyFootIK: 1
- m_Loop: 0
- m_Version: 1
- m_Rotation: {x: 0, y: 0, z: 0, w: 1}
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -347,16 +256,7 @@ AnimationClip:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
- time: 0
- value: {x: 0.0599966, y: 0.0000618495, z: -8.080292e-11}
- inSlope: {x: 0, y: 0, z: 0}
- outSlope: {x: 0, y: 0, z: 0}
- tangentMode: 0
- weightedMode: 0
- inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- - serializedVersion: 3
- time: 11.983334
+ time: 2.9666667
value: {x: 0.0599966, y: 12.09206, z: -8.080292e-11}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
@@ -374,7 +274,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
- value: {x: 0.19482905, y: 0, z: -0.26730418}
+ value: {x: 2.8051033, y: 0, z: 11.78323}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
@@ -382,16 +282,7 @@ AnimationClip:
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
- time: 9.016666
- value: {x: 2.8051033, y: 0, z: 11.78323}
- inSlope: {x: 0, y: 0, z: 0.3925046}
- outSlope: {x: 0, y: 0, z: 0.3925046}
- tangentMode: 0
- weightedMode: 0
- inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- - serializedVersion: 3
- time: 11.983334
+ time: 2.9666667
value: {x: 2.0059242, y: -0.15399992, z: 12.959108}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
@@ -433,7 +324,7 @@ AnimationClip:
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
- m_StopTime: 11.983334
+ m_StopTime: 2.9666667
m_OrientationOffsetY: 0
m_Level: 0
m_CycleOffset: 0
@@ -454,15 +345,6 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
- value: 0.19482905
- inSlope: 0
- outSlope: 0
- tangentMode: 136
- weightedMode: 0
- inWeight: 0.33333334
- outWeight: 0.33333334
- - serializedVersion: 3
- time: 9.016666
value: 2.8051033
inSlope: 0
outSlope: 0
@@ -471,7 +353,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
- time: 11.983334
+ time: 2.9666667
value: 2.0059242
inSlope: 0
outSlope: 0
@@ -499,16 +381,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
- time: 9.016666
- value: 0
- inSlope: 0
- outSlope: 0
- tangentMode: 136
- weightedMode: 0
- inWeight: 0.33333334
- outWeight: 0.33333334
- - serializedVersion: 3
- time: 11.983334
+ time: 2.9666667
value: -0.15399992
inSlope: 0
outSlope: 0
@@ -528,7 +401,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
- value: -0.26730418
+ value: 11.78323
inSlope: 0
outSlope: 0
tangentMode: 136
@@ -536,16 +409,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
- time: 9.016666
- value: 11.78323
- inSlope: 0.3925046
- outSlope: 0.3925046
- tangentMode: 136
- weightedMode: 0
- inWeight: 0.33333334
- outWeight: 0.33333334
- - serializedVersion: 3
- time: 11.983334
+ time: 2.9666667
value: 12.959108
inSlope: 0
outSlope: 0
@@ -564,16 +428,7 @@ AnimationClip:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
- time: 0
- value: 0.0599966
- inSlope: 0
- outSlope: 0
- tangentMode: 136
- weightedMode: 0
- inWeight: 0.33333334
- outWeight: 0.33333334
- - serializedVersion: 3
- time: 11.983334
+ time: 2.9666667
value: 0.0599966
inSlope: 0
outSlope: 0
@@ -592,16 +447,7 @@ AnimationClip:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
- time: 0
- value: 0.0000618495
- inSlope: 0
- outSlope: 0
- tangentMode: 136
- weightedMode: 0
- inWeight: 0.33333334
- outWeight: 0.33333334
- - serializedVersion: 3
- time: 11.983334
+ time: 2.9666667
value: 12.09206
inSlope: 0
outSlope: 0
@@ -620,16 +466,7 @@ AnimationClip:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
- time: 0
- value: -8.080292e-11
- inSlope: 0
- outSlope: 0
- tangentMode: 136
- weightedMode: 0
- inWeight: 0.33333334
- outWeight: 0.33333334
- - serializedVersion: 3
- time: 11.983334
+ time: 2.9666667
value: -8.080292e-11
inSlope: 0
outSlope: 0
diff --git a/SXElectricalInspection/Assets/GameAssets/Models/电箱(new)/Prefeb/三相_无互感器_无光伏.prefab b/SXElectricalInspection/Assets/GameAssets/Models/电箱(new)/Prefeb/三相_无互感器_无光伏.prefab
index d50f3039..3ca580aa 100644
--- a/SXElectricalInspection/Assets/GameAssets/Models/电箱(new)/Prefeb/三相_无互感器_无光伏.prefab
+++ b/SXElectricalInspection/Assets/GameAssets/Models/电箱(new)/Prefeb/三相_无互感器_无光伏.prefab
@@ -661,7 +661,7 @@ MeshRenderer:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 438441254869505864}
- m_Enabled: 0
+ m_Enabled: 1
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
@@ -880,7 +880,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
isInteractive: 0
g1: {fileID: 346597898}
- name: "\u7528\u7535_AA2"
+ selChildName:
linearMeasure: 0
floats: []
Fuan: 0
@@ -1036,6 +1036,7 @@ MonoBehaviour:
isBlack: 0
VV: V
isok: 0
+ huishouBtn: {fileID: 0}
--- !u!1 &709423304660541860
GameObject:
m_ObjectHideFlags: 0
@@ -1267,7 +1268,6 @@ MonoBehaviour:
m_EditorClassIdentifier:
spriteRenderer: {fileID: 709423304780561668}
textMesh: {fileID: 709423304660541862}
- isFD: "\u4E0A\u7F51"
sprites:
- {fileID: 21300000, guid: 2cc1158dacf4188439f871079ec30ef1, type: 3}
- {fileID: 21300000, guid: ffa5fef008e78f6469e9a103886d9abc, type: 3}
@@ -1296,7 +1296,7 @@ MonoBehaviour:
- {fileID: 21300000, guid: 639f4b603bfc6874d9f3f23902177584, type: 3}
- {fileID: 21300000, guid: a007627423235514285d396e2b6a0520, type: 3}
infos: []
- ttpData: []
+ energylist: []
trainData:
state:
message:
@@ -1916,6 +1916,7 @@ MonoBehaviour:
isBlack: 0
VV: V
isok: 0
+ huishouBtn: {fileID: 0}
--- !u!1 &1241165713762030815
GameObject:
m_ObjectHideFlags: 0
@@ -2896,7 +2897,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
isInteractive: 0
g1: {fileID: 1601408198}
- name: "\u7528\u7535_CA3"
+ selChildName:
linearMeasure: 0
floats: []
Fuan: 0
@@ -3501,7 +3502,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 0
+ m_IsActive: 1
--- !u!4 &7236038948322683238
Transform:
m_ObjectHideFlags: 0
@@ -3621,7 +3622,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
isInteractive: 0
g1: {fileID: 1593461399}
- name: "\u7528\u7535_BA3"
+ selChildName:
linearMeasure: 0
floats: []
Fuan: 0
@@ -3961,7 +3962,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
isInteractive: 0
g1: {fileID: 372821878}
- name: "\u7528\u7535_BA2"
+ selChildName:
linearMeasure: 0
floats: []
Fuan: 0
@@ -4904,7 +4905,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
isInteractive: 0
g1: {fileID: 1595917109}
- name: "\u7528\u7535_AA2"
+ selChildName:
linearMeasure: 0
floats: []
Fuan: 0
@@ -5128,7 +5129,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
isInteractive: 0
g1: {fileID: 1082754022}
- name: "\u7528\u7535_CA2"
+ selChildName:
linearMeasure: 0
floats: []
Fuan: 0
@@ -5637,6 +5638,7 @@ MonoBehaviour:
isBlack: 1
VV: V
isok: 0
+ huishouBtn: {fileID: 0}
--- !u!1 &8644223648774417466
GameObject:
m_ObjectHideFlags: 0
@@ -5836,6 +5838,7 @@ MonoBehaviour:
isBlack: 0
VV: V
isok: 0
+ huishouBtn: {fileID: 0}
--- !u!1 &8686247563076990760
GameObject:
m_ObjectHideFlags: 0
@@ -5975,13 +5978,24 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
clampAmmetersInteractives: []
- Multimeter: []
+ multimeters: []
Three:
- {fileID: 0}
gameObjects:
- {fileID: 3934653765408794959}
- {fileID: 8888276792046749957}
DoolsPlayer: {fileID: 7441753607890645216}
+ biaoJiData:
+ warningType:
+ oneWayAA:
+ oneWayAV:
+ AA:
+ BA:
+ CA:
+ AV:
+ BV:
+ CV:
+ N:
--- !u!114 &4701684128038356618
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -6030,6 +6044,17 @@ MonoBehaviour:
onSite:
userState:
isGuanFu: 0
+ biaoJiData:
+ warningType:
+ oneWayAA:
+ oneWayAV:
+ AA:
+ BA:
+ CA:
+ AV:
+ BV:
+ CV:
+ N:
--- !u!1 &8888276792046749957
GameObject:
m_ObjectHideFlags: 0
@@ -6451,6 +6476,10 @@ PrefabInstance:
propertyPath: m_Name
value: "\u77ED\u63A5\u7EBF"
objectReference: {fileID: 0}
+ - target: {fileID: 919132149155446097, guid: 85cd87d3af2a1d74493ca13d9e796539, type: 3}
+ propertyPath: m_IsActive
+ value: 0
+ objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 85cd87d3af2a1d74493ca13d9e796539, type: 3}
--- !u!4 &2186378299090733799 stripped
diff --git a/SXElectricalInspection/Assets/GameAssets/Models/电箱(new)/Prefeb/单相_无互感器_无光伏.prefab b/SXElectricalInspection/Assets/GameAssets/Models/电箱(new)/Prefeb/单相_无互感器_无光伏.prefab
index 53b7356b..1dc21511 100644
--- a/SXElectricalInspection/Assets/GameAssets/Models/电箱(new)/Prefeb/单相_无互感器_无光伏.prefab
+++ b/SXElectricalInspection/Assets/GameAssets/Models/电箱(new)/Prefeb/单相_无互感器_无光伏.prefab
@@ -1,5 +1,37 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &113461318023910422
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 2211865403235525923}
+ m_Layer: 0
+ m_Name: "\u7535\u80FD\u8868U\u578B\u73AF\u77ED\u63A5"
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &2211865403235525923
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 113461318023910422}
+ m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+ m_LocalPosition: {x: 0.002, y: -0.047, z: -0.004}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_ConstrainProportionsScale: 0
+ m_Children:
+ - {fileID: 1195549360776525842}
+ m_Father: {fileID: 4605967598845068628}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &114332117599723596
GameObject:
m_ObjectHideFlags: 0
@@ -686,6 +718,89 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
+--- !u!1 &1364437943417904753
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1195549360776525842}
+ - component: {fileID: 1556395290636226018}
+ - component: {fileID: 158460825777548212}
+ m_Layer: 0
+ m_Name: A
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &1195549360776525842
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1364437943417904753}
+ m_LocalRotation: {x: 0.7071068, y: -0.00000005760116, z: 0.70710677, w: 0.000000057601163}
+ m_LocalPosition: {x: 0.0429, y: 0.1177, z: 0.0114}
+ m_LocalScale: {x: 1.495, y: 1.495, z: 1.495}
+ m_ConstrainProportionsScale: 0
+ m_Children: []
+ m_Father: {fileID: 2211865403235525923}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!33 &1556395290636226018
+MeshFilter:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1364437943417904753}
+ m_Mesh: {fileID: 6178732249614653945, guid: 3c10a05dd7008c34d837451c78491571, type: 3}
+--- !u!23 &158460825777548212
+MeshRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1364437943417904753}
+ m_Enabled: 1
+ m_CastShadows: 1
+ m_ReceiveShadows: 1
+ m_DynamicOccludee: 1
+ m_StaticShadowCaster: 0
+ m_MotionVectors: 1
+ m_LightProbeUsage: 1
+ m_ReflectionProbeUsage: 1
+ m_RayTracingMode: 2
+ m_RayTraceProcedural: 0
+ m_RenderingLayerMask: 1
+ m_RendererPriority: 0
+ m_Materials:
+ - {fileID: 2100000, guid: cf907e0a4dbda814194549c40f3498e5, type: 2}
+ m_StaticBatchInfo:
+ firstSubMesh: 0
+ subMeshCount: 0
+ m_StaticBatchRoot: {fileID: 0}
+ m_ProbeAnchor: {fileID: 0}
+ m_LightProbeVolumeOverride: {fileID: 0}
+ m_ScaleInLightmap: 1
+ m_ReceiveGI: 1
+ m_PreserveUVs: 0
+ m_IgnoreNormalsForChartDetection: 0
+ m_ImportantGI: 0
+ m_StitchLightmapSeams: 1
+ m_SelectedEditorRenderState: 3
+ m_MinimumChartSize: 4
+ m_AutoUVMaxDistance: 0.5
+ m_AutoUVMaxAngle: 89
+ m_LightmapParameters: {fileID: 0}
+ m_SortingLayerID: 0
+ m_SortingLayer: 0
+ m_SortingOrder: 0
+ m_AdditionalVertexStreams: {fileID: 0}
--- !u!1 &1404890077221992272
GameObject:
m_ObjectHideFlags: 0
@@ -1332,7 +1447,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
isInteractive: 0
g1: {fileID: 5588630746499621630}
- name: "\u7528\u7535_AA2"
+ selChildName:
linearMeasure: 0
floats: []
Fuan:
@@ -1484,6 +1599,7 @@ Transform:
- {fileID: 6533717690279802245}
- {fileID: 5615268475057450515}
- {fileID: 8263350345882245598}
+ - {fileID: 4605967598845068628}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -1500,11 +1616,22 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
clampAmmetersInteractives: []
- Multimeter: []
+ multimeters: []
Three:
- {fileID: 8263350345882245599}
gameObjects: []
DoolsPlayer: {fileID: 1741256891908648251}
+ biaoJiData:
+ warningType:
+ oneWayAA:
+ oneWayAV:
+ AA:
+ BA:
+ CA:
+ AV:
+ BV:
+ CV:
+ N:
--- !u!1 &4536213603823072826
GameObject:
m_ObjectHideFlags: 0
@@ -1717,7 +1844,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
isInteractive: 0
g1: {fileID: 7768802114381553643}
- name: "\u7528\u7535_AA2"
+ selChildName:
linearMeasure: 0
floats: []
Fuan:
@@ -2194,6 +2321,38 @@ MeshRenderer:
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
+--- !u!1 &5266181864752495439
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 4605967598845068628}
+ m_Layer: 0
+ m_Name: "\u9519\u8BEF\u9879\u76EE"
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &4605967598845068628
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5266181864752495439}
+ 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
+ m_Children:
+ - {fileID: 2211865403235525923}
+ m_Father: {fileID: 1281350692733807052}
+ m_RootOrder: 3
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &5356089587607357281
GameObject:
m_ObjectHideFlags: 0
@@ -2417,6 +2576,7 @@ MonoBehaviour:
isBlack: 1
VV: V
isok: 0
+ huishouBtn: {fileID: 0}
--- !u!1 &5982637422382916246
GameObject:
m_ObjectHideFlags: 0
@@ -3352,7 +3512,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
isInteractive: 0
g1: {fileID: 5160934536123890940}
- name: "\u7528\u7535_AA2"
+ selChildName:
linearMeasure: 0
floats: []
Fuan:
@@ -3685,7 +3845,6 @@ MonoBehaviour:
m_EditorClassIdentifier:
spriteRenderer: {fileID: 8263350345278846259}
textMesh: {fileID: 8263350345423038865}
- isFD: "\u4E0A\u7F51"
sprites:
- {fileID: 21300000, guid: de54528575cf97d429daaaf0c6b99894, type: 3}
- {fileID: 21300000, guid: c50676f5923ad8d44aeda6401bbf259d, type: 3}
@@ -3710,7 +3869,7 @@ MonoBehaviour:
- {fileID: 21300000, guid: 66fd4f7b20315764c8a7567692fec703, type: 3}
- {fileID: 21300000, guid: 4f9d6f62844cb83479e1d01ab7768302, type: 3}
infos: []
- ttpData: []
+ energylist: []
trainData:
state:
message:
@@ -3877,6 +4036,7 @@ MonoBehaviour:
isBlack: 0
VV: V
isok: 0
+ huishouBtn: {fileID: 0}
--- !u!1 &8755456981224617160
GameObject:
m_ObjectHideFlags: 0
@@ -4008,7 +4168,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
isInteractive: 0
g1: {fileID: 8291716159056416811}
- name: "\u7528\u7535_AA2"
+ selChildName:
linearMeasure: 0
floats: []
Fuan:
diff --git a/SXElectricalInspection/Assets/StreamingAssets/Message.json b/SXElectricalInspection/Assets/StreamingAssets/Message.json
index a7fb94fb..af3b1c1e 100644
--- a/SXElectricalInspection/Assets/StreamingAssets/Message.json
+++ b/SXElectricalInspection/Assets/StreamingAssets/Message.json
@@ -1,5 +1,5 @@
{
- "scenename": "室外型高供低计",
+ "scenename": "室外型低压公配变",
"questbooks": "任务书",
"userinformation": "用户基本信息",
"userList": [
diff --git a/SXElectricalInspection/Assets/StreamingAssets/build_info.txt b/SXElectricalInspection/Assets/StreamingAssets/build_info.txt
index 310c7e7f..6aa97e2c 100644
--- a/SXElectricalInspection/Assets/StreamingAssets/build_info.txt
+++ b/SXElectricalInspection/Assets/StreamingAssets/build_info.txt
@@ -1 +1 @@
-Build from ADAM at 2024/6/12 19:52:01
\ No newline at end of file
+Build from ADAM at 2024/6/13 13:15:38
\ No newline at end of file