提交逻辑
This commit is contained in:
parent
8efe925d20
commit
fb47d96870
|
@ -175087,7 +175087,7 @@ MonoBehaviour:
|
|||
m_CaretColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
|
||||
m_CustomCaretColor: 0
|
||||
m_SelectionColor: {r: 0.65882355, g: 0.80784315, b: 1, a: 0.7529412}
|
||||
m_Text: 9600004109
|
||||
m_Text: 3004892662
|
||||
m_CaretBlinkRate: 0.85
|
||||
m_CaretWidth: 1
|
||||
m_ReadOnly: 0
|
||||
|
|
|
@ -55,6 +55,14 @@ public class ToolModelClick : MonoBehaviour
|
|||
public UnityEvent onDrag = new UnityEvent();
|
||||
public UnityEvent onExit = new UnityEvent();
|
||||
|
||||
public GameObject line;
|
||||
|
||||
private void Awake()
|
||||
{
|
||||
if (line != null)
|
||||
line.SetActive(false);
|
||||
}
|
||||
|
||||
private void OnMouseEnter()
|
||||
{
|
||||
if (EventSystem.current.IsPointerOverGameObject())
|
||||
|
|
|
@ -36,5 +36,18 @@ namespace Adam
|
|||
}
|
||||
return sceneInfo;
|
||||
}
|
||||
|
||||
public int GetPVWByUseNo(string useNo)
|
||||
{
|
||||
int pvw = 0;
|
||||
for (int i = 0; i < root.data.list.Count; i++)
|
||||
{
|
||||
int index = i;
|
||||
string userNoTemp = ToolUtility.GetEliminateInfo(root.data.list[index].user_no, "用户");
|
||||
if (useNo == userNoTemp)
|
||||
pvw = root.data.list[index].PVW;
|
||||
}
|
||||
return pvw;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -15,5 +15,13 @@ public class GlobalFlag
|
|||
{
|
||||
public static SceneInfoData sceneData;
|
||||
|
||||
public static string SceneInfo()
|
||||
{
|
||||
string info = sceneData.info0 + "_" + sceneData.info1 + "_" + sceneData.info2;
|
||||
return info;
|
||||
}
|
||||
|
||||
public static int pvw;
|
||||
|
||||
public static string userId = "9600004109";
|
||||
}
|
||||
|
|
|
@ -36,7 +36,7 @@ namespace Adam
|
|||
|
||||
SceneInfoData sceneInfoData = new SceneInfoData(tt[0], tt[1], tt[2]);
|
||||
GlobalFlag.sceneData = sceneInfoData;
|
||||
|
||||
GlobalFlag.pvw = ExamusersController.Instance.GetPVWByUseNo(userID.text);
|
||||
switch (tt[3])
|
||||
{
|
||||
case "自建房场景":
|
||||
|
|
|
@ -27,7 +27,7 @@ public class NameplateController : MonoSingleton<NameplateController>
|
|||
DictextMeshPro = new Dictionary<string, TextMeshProUGUI>();
|
||||
|
||||
DictextMeshPro.Add("低压互感器铭牌", NameplateTextUGUI[0]);
|
||||
DictextMeshPro.Add("光伏并网逆变器_铭牌", NameplateTextUGUI[1]);
|
||||
DictextMeshPro.Add("2号逆变器_铭牌_正确", NameplateTextUGUI[1]);
|
||||
DictextMeshPro.Add("光伏板_铭牌", NameplateTextUGUI[2]);
|
||||
|
||||
Obj_Nameplate = GameObject.FindGameObjectsWithTag("铭牌");
|
||||
|
|
|
@ -348,7 +348,7 @@ GameObject:
|
|||
- component: {fileID: 2131893627708546014}
|
||||
m_Layer: 0
|
||||
m_Name: "ND_\u4E07\u7528\u8868_02"
|
||||
m_TagString: Untagged
|
||||
m_TagString: "\u65CB\u8F6C"
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
|
@ -361,7 +361,7 @@ Transform:
|
|||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2131893628021684443}
|
||||
m_LocalRotation: {x: -0.5, y: -0.5, z: -0.5, w: 0.5}
|
||||
m_LocalPosition: {x: 0.0194, y: 0.03507, z: 0.0016}
|
||||
m_LocalPosition: {x: 0.0194, y: 0.0442, z: 0.0016}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 1
|
||||
m_Children: []
|
||||
|
@ -539,6 +539,7 @@ Transform:
|
|||
- {fileID: 2131893627910883965}
|
||||
- {fileID: 2131893627991473034}
|
||||
- {fileID: 2131893629604357092}
|
||||
- {fileID: 7583579917626380947}
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0}
|
||||
|
@ -643,6 +644,7 @@ MonoBehaviour:
|
|||
onExit:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
line: {fileID: 7094745485471664169}
|
||||
--- !u!1 &2131893628421216303
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -1011,3 +1013,78 @@ MeshRenderer:
|
|||
m_SortingLayer: 0
|
||||
m_SortingOrder: 0
|
||||
m_AdditionalVertexStreams: {fileID: 0}
|
||||
--- !u!1001 &7977265530582431096
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
m_TransformParent: {fileID: 2131893628021589511}
|
||||
m_Modifications:
|
||||
- target: {fileID: -8679921383154817045, guid: 3f50ac0d0b1b1604bb023538d43e1c8c, type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
value: 7
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: -8679921383154817045, guid: 3f50ac0d0b1b1604bb023538d43e1c8c, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: -0.0937
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: -8679921383154817045, guid: 3f50ac0d0b1b1604bb023538d43e1c8c, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: -0.2268
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: -8679921383154817045, guid: 3f50ac0d0b1b1604bb023538d43e1c8c, type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: -0.0853
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: -8679921383154817045, guid: 3f50ac0d0b1b1604bb023538d43e1c8c, type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: -8679921383154817045, guid: 3f50ac0d0b1b1604bb023538d43e1c8c, type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: -8679921383154817045, guid: 3f50ac0d0b1b1604bb023538d43e1c8c, type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: -8679921383154817045, guid: 3f50ac0d0b1b1604bb023538d43e1c8c, type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: -8679921383154817045, guid: 3f50ac0d0b1b1604bb023538d43e1c8c, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: -8679921383154817045, guid: 3f50ac0d0b1b1604bb023538d43e1c8c, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: -8679921383154817045, guid: 3f50ac0d0b1b1604bb023538d43e1c8c, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 919132149155446097, guid: 3f50ac0d0b1b1604bb023538d43e1c8c, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: "\u4E07\u7528\u8868\u7535\u538B\u6D4B\u91CF"
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 919132149155446097, guid: 3f50ac0d0b1b1604bb023538d43e1c8c, type: 3}
|
||||
propertyPath: m_IsActive
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 919132149155446097, guid: 3f50ac0d0b1b1604bb023538d43e1c8c, type: 3}
|
||||
propertyPath: m_TagString
|
||||
value: Line
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 3f50ac0d0b1b1604bb023538d43e1c8c, type: 3}
|
||||
--- !u!1 &7094745485471664169 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 3f50ac0d0b1b1604bb023538d43e1c8c, type: 3}
|
||||
m_PrefabInstance: {fileID: 7977265530582431096}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &7583579917626380947 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 3f50ac0d0b1b1604bb023538d43e1c8c, type: 3}
|
||||
m_PrefabInstance: {fileID: 7977265530582431096}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
|
@ -11,9 +11,10 @@ GameObject:
|
|||
- component: {fileID: 6539015997904997139}
|
||||
- component: {fileID: 8476362767614743788}
|
||||
- component: {fileID: 8052482939551060366}
|
||||
m_Layer: 0
|
||||
- component: {fileID: 1646795805}
|
||||
m_Layer: 7
|
||||
m_Name: polySurface10
|
||||
m_TagString: Untagged
|
||||
m_TagString: FuAn
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
|
@ -83,6 +84,19 @@ MeshRenderer:
|
|||
m_SortingLayer: 0
|
||||
m_SortingOrder: 0
|
||||
m_AdditionalVertexStreams: {fileID: 0}
|
||||
--- !u!65 &1646795805
|
||||
BoxCollider:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 32072668755501651}
|
||||
m_Material: {fileID: 0}
|
||||
m_IsTrigger: 0
|
||||
m_Enabled: 1
|
||||
serializedVersion: 2
|
||||
m_Size: {x: 0.091871016, y: 0.13160516, z: 0.024505764}
|
||||
m_Center: {x: -0.000030517578, y: 0, z: 0.0000076293945}
|
||||
--- !u!1 &965749294781705224
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -94,7 +108,7 @@ GameObject:
|
|||
- component: {fileID: 1131244986981442936}
|
||||
- component: {fileID: 6795272889377326132}
|
||||
- component: {fileID: 1449641519212438285}
|
||||
m_Layer: 0
|
||||
m_Layer: 7
|
||||
m_Name: polySurface5
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
|
@ -178,9 +192,9 @@ GameObject:
|
|||
- component: {fileID: 2095932101935723654}
|
||||
- component: {fileID: 8294673237149712167}
|
||||
- component: {fileID: 5368955186713773247}
|
||||
m_Layer: 0
|
||||
m_Layer: 7
|
||||
m_Name: "\u76F8\u4F4D\u4F0F\u5B89\u8868"
|
||||
m_TagString: Untagged
|
||||
m_TagString: FuAn
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
|
|
|
@ -9,7 +9,7 @@ GameObject:
|
|||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 4746120913896119046}
|
||||
m_Layer: 6
|
||||
m_Layer: 7
|
||||
m_Name: Group17
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
|
@ -41,7 +41,7 @@ GameObject:
|
|||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 8908368846004673723}
|
||||
m_Layer: 6
|
||||
m_Layer: 7
|
||||
m_Name: _U39_8
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
|
@ -74,7 +74,7 @@ GameObject:
|
|||
- component: {fileID: 1510498653468131571}
|
||||
- component: {fileID: 8083333804028303023}
|
||||
- component: {fileID: 8060894827574564018}
|
||||
m_Layer: 6
|
||||
m_Layer: 7
|
||||
m_Name: Mesh17
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
|
@ -156,7 +156,7 @@ GameObject:
|
|||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 8476607629018925953}
|
||||
m_Layer: 6
|
||||
m_Layer: 7
|
||||
m_Name: _U39_7
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
|
@ -187,7 +187,7 @@ GameObject:
|
|||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 5141020518187440115}
|
||||
m_Layer: 6
|
||||
m_Layer: 7
|
||||
m_Name: GameObject
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
|
@ -229,7 +229,7 @@ GameObject:
|
|||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 4569857264886921150}
|
||||
m_Layer: 6
|
||||
m_Layer: 7
|
||||
m_Name: _U39_2
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
|
@ -262,7 +262,7 @@ GameObject:
|
|||
- component: {fileID: 3593119658715885829}
|
||||
- component: {fileID: 8894608374412218228}
|
||||
- component: {fileID: 5902783392504266881}
|
||||
m_Layer: 6
|
||||
m_Layer: 7
|
||||
m_Name: Mesh14
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
|
@ -345,7 +345,7 @@ GameObject:
|
|||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 1412327515338934020}
|
||||
m_Layer: 6
|
||||
m_Layer: 7
|
||||
m_Name: _U39_5
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
|
@ -378,7 +378,7 @@ GameObject:
|
|||
- component: {fileID: 6863689414392290985}
|
||||
- component: {fileID: 8044578243574067465}
|
||||
- component: {fileID: 2995178057851021996}
|
||||
m_Layer: 6
|
||||
m_Layer: 7
|
||||
m_Name: Mesh11
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
|
@ -462,7 +462,7 @@ GameObject:
|
|||
- component: {fileID: 7166864065046920756}
|
||||
- component: {fileID: 8803119539513020876}
|
||||
- component: {fileID: 1323511220634850497}
|
||||
m_Layer: 6
|
||||
m_Layer: 7
|
||||
m_Name: Mesh16
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
|
@ -545,7 +545,7 @@ GameObject:
|
|||
- component: {fileID: 3744470472664545976}
|
||||
- component: {fileID: 4732807883570881695}
|
||||
- component: {fileID: 5267447848939407980}
|
||||
m_Layer: 6
|
||||
m_Layer: 7
|
||||
m_Name: Mesh13
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
|
@ -628,7 +628,7 @@ GameObject:
|
|||
- component: {fileID: 856354189508394070}
|
||||
- component: {fileID: 6185989547905503852}
|
||||
- component: {fileID: 6727731447967569148}
|
||||
m_Layer: 6
|
||||
m_Layer: 7
|
||||
m_Name: Mesh18
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
|
@ -710,7 +710,7 @@ GameObject:
|
|||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 7565062848938117245}
|
||||
m_Layer: 6
|
||||
m_Layer: 7
|
||||
m_Name: _U39_6
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
|
@ -741,7 +741,7 @@ GameObject:
|
|||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 3001571435648375146}
|
||||
m_Layer: 6
|
||||
m_Layer: 7
|
||||
m_Name: Group16
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
|
@ -783,8 +783,8 @@ GameObject:
|
|||
- component: {fileID: 7225766980221362327}
|
||||
- component: {fileID: 2642407967348639564}
|
||||
- component: {fileID: 712922406971046451}
|
||||
m_Layer: 6
|
||||
m_Name: Mesh19
|
||||
m_Layer: 7
|
||||
m_Name: "\u65CB\u8F6C"
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
|
@ -797,14 +797,14 @@ Transform:
|
|||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5363856005780046791}
|
||||
m_LocalRotation: {x: 0, y: -0, z: -0, w: 1}
|
||||
m_LocalRotation: {x: 0, y: 0.015532804, z: 0, w: 0.99987936}
|
||||
m_LocalPosition: {x: -0, y: 0, z: 0.25}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 4746120913896119046}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 1.78, z: 0}
|
||||
--- !u!33 &2642407967348639564
|
||||
MeshFilter:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -864,7 +864,7 @@ GameObject:
|
|||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 1250851749381091549}
|
||||
m_Layer: 6
|
||||
m_Layer: 7
|
||||
m_Name: Group14
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
|
@ -896,7 +896,7 @@ GameObject:
|
|||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 6176178018017224778}
|
||||
m_Layer: 6
|
||||
m_Layer: 7
|
||||
m_Name: _U39_1
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
|
@ -927,7 +927,7 @@ GameObject:
|
|||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 3558027010293232005}
|
||||
m_Layer: 6
|
||||
m_Layer: 7
|
||||
m_Name: __
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
|
@ -959,7 +959,7 @@ GameObject:
|
|||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 1318875288723816913}
|
||||
m_Layer: 6
|
||||
m_Layer: 7
|
||||
m_Name: ____1
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
|
@ -994,7 +994,7 @@ GameObject:
|
|||
- component: {fileID: 6158171241742345503}
|
||||
- component: {fileID: 6158171241742345500}
|
||||
- component: {fileID: 1304439518211024554}
|
||||
m_Layer: 6
|
||||
m_Layer: 7
|
||||
m_Name: "\u94B3\u5F62\u7535\u6D41\u8868"
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
|
@ -1127,7 +1127,7 @@ GameObject:
|
|||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 4381305327205380603}
|
||||
m_Layer: 6
|
||||
m_Layer: 7
|
||||
m_Name: Group13
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
|
@ -1161,7 +1161,7 @@ GameObject:
|
|||
- component: {fileID: 8815301766835690312}
|
||||
- component: {fileID: 640432348759470623}
|
||||
- component: {fileID: 3148247045032298343}
|
||||
m_Layer: 6
|
||||
m_Layer: 7
|
||||
m_Name: Mesh20
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
|
@ -1244,7 +1244,7 @@ GameObject:
|
|||
- component: {fileID: 8052766349307259215}
|
||||
- component: {fileID: 8077896581930785308}
|
||||
- component: {fileID: 8259873583255218498}
|
||||
m_Layer: 6
|
||||
m_Layer: 7
|
||||
m_Name: Mesh21
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
|
@ -1325,7 +1325,7 @@ GameObject:
|
|||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 798318469011142299}
|
||||
m_Layer: 6
|
||||
m_Layer: 7
|
||||
m_Name: _U39_3
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
|
@ -1358,7 +1358,7 @@ GameObject:
|
|||
- component: {fileID: 2479850269220612731}
|
||||
- component: {fileID: 6680923818199869575}
|
||||
- component: {fileID: 6705236448059270355}
|
||||
m_Layer: 6
|
||||
m_Layer: 7
|
||||
m_Name: Mesh15
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
|
@ -1441,7 +1441,7 @@ GameObject:
|
|||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 7775139103552558503}
|
||||
m_Layer: 6
|
||||
m_Layer: 7
|
||||
m_Name: Group15
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
|
@ -1473,7 +1473,7 @@ GameObject:
|
|||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 8927848855781106664}
|
||||
m_Layer: 6
|
||||
m_Layer: 7
|
||||
m_Name: ____2
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
|
@ -1505,7 +1505,7 @@ GameObject:
|
|||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 3045188933783192207}
|
||||
m_Layer: 6
|
||||
m_Layer: 7
|
||||
m_Name: Group12
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
|
@ -1537,7 +1537,7 @@ GameObject:
|
|||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 6714006973245369769}
|
||||
m_Layer: 6
|
||||
m_Layer: 7
|
||||
m_Name: Group11
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
|
@ -1569,7 +1569,7 @@ GameObject:
|
|||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 6229437332415234806}
|
||||
m_Layer: 6
|
||||
m_Layer: 7
|
||||
m_Name: ___1_1_1
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
|
@ -1601,7 +1601,7 @@ GameObject:
|
|||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 529358269224803276}
|
||||
m_Layer: 6
|
||||
m_Layer: 7
|
||||
m_Name: _U39_4
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
|
@ -1632,7 +1632,7 @@ GameObject:
|
|||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 5544607966390666044}
|
||||
m_Layer: 6
|
||||
m_Layer: 7
|
||||
m_Name: __1
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
|
@ -1666,7 +1666,7 @@ GameObject:
|
|||
- component: {fileID: 2284983111740971690}
|
||||
- component: {fileID: 7298726139806341806}
|
||||
- component: {fileID: 1528828075962168210}
|
||||
m_Layer: 6
|
||||
m_Layer: 7
|
||||
m_Name: Mesh12
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
|
|
|
@ -11,7 +11,7 @@ GameObject:
|
|||
- component: {fileID: 1042915213259079038}
|
||||
- component: {fileID: 1042915213259079036}
|
||||
- component: {fileID: 1042915213259079039}
|
||||
m_Layer: 0
|
||||
m_Layer: 7
|
||||
m_Name: Cube
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
|
@ -93,7 +93,7 @@ GameObject:
|
|||
m_Component:
|
||||
- component: {fileID: 4228206943469040965}
|
||||
- component: {fileID: 4228206943469040964}
|
||||
m_Layer: 0
|
||||
m_Layer: 7
|
||||
m_Name: Audio Source
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
|
@ -225,7 +225,7 @@ GameObject:
|
|||
- component: {fileID: 4228206944499231263}
|
||||
- component: {fileID: 6545336454578547337}
|
||||
- component: {fileID: 3220441723494787463}
|
||||
m_Layer: 0
|
||||
m_Layer: 7
|
||||
m_Name: "\u9A8C\u7535\u7B14"
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
|
@ -411,7 +411,7 @@ GameObject:
|
|||
- component: {fileID: 4228206944798740710}
|
||||
- component: {fileID: 4228206944798740709}
|
||||
- component: {fileID: 4228206944798740708}
|
||||
m_Layer: 0
|
||||
m_Layer: 7
|
||||
m_Name: "\u7B14\u5934"
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
|
@ -533,7 +533,7 @@ PrefabInstance:
|
|||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 919132149155446097, guid: ebabe5e4da57b8f4a8dd162633f5ccab, type: 3}
|
||||
propertyPath: m_Layer
|
||||
value: 0
|
||||
value: 7
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 919132149155446097, guid: ebabe5e4da57b8f4a8dd162633f5ccab, type: 3}
|
||||
propertyPath: m_IsActive
|
||||
|
@ -615,7 +615,7 @@ PrefabInstance:
|
|||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 919132149155446097, guid: ebabe5e4da57b8f4a8dd162633f5ccab, type: 3}
|
||||
propertyPath: m_Layer
|
||||
value: 0
|
||||
value: 7
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 919132149155446097, guid: ebabe5e4da57b8f4a8dd162633f5ccab, type: 3}
|
||||
propertyPath: m_IsActive
|
||||
|
|
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
|
@ -13,7 +13,7 @@ public class FractionManager : MonoBehaviour
|
|||
void Start()
|
||||
{
|
||||
Btn = GetComponent<Button>();
|
||||
Btn.onClick.AddListener(()=>over());
|
||||
Btn?.onClick.AddListener(()=>over());
|
||||
}
|
||||
|
||||
// Update is called once per frame
|
||||
|
|
|
@ -31,6 +31,7 @@ public class GameManager : MonoBehaviour
|
|||
public GameObject BlackWanYon;
|
||||
public GameObject FuAnBiao;
|
||||
public Interactive interactiveEnum = Interactive.none;
|
||||
public Transform biaojiPos;
|
||||
public void Awake()
|
||||
{
|
||||
if (ins != null)
|
||||
|
@ -42,31 +43,29 @@ public class GameManager : MonoBehaviour
|
|||
//Debug.Log(trans.GetComponent<interactive>()!=null?true:false);
|
||||
}
|
||||
// Start is called before the first frame update
|
||||
async void Start()
|
||||
private void Start()
|
||||
{
|
||||
await initAsync();
|
||||
for (int i = 0; i < SceneData.GFData; i++)
|
||||
int pvwCount = (GlobalFlag.pvw * 1000) / 295;
|
||||
for (int i = 0; i < pvwCount; i++)
|
||||
{
|
||||
GFGame[i].gameObject.SetActive(true);
|
||||
}
|
||||
//for (int i = 0; i < SceneData.inverterSum; i++)
|
||||
//{
|
||||
// //Inverter[i].gameObject.SetActive(true);
|
||||
//}
|
||||
//string sceneInfo = GlobalFlag.SceneInfo();
|
||||
string sceneInfo = "单项_无互感器_有光伏";
|
||||
Debug.Log(sceneInfo+ "2号逆变器_铭牌_正确======");
|
||||
for (int i = 0; i < Inverter.Count; i++)
|
||||
{
|
||||
if (sceneInfo.Equals(Inverter[i].name))
|
||||
{
|
||||
GameObject obj = Instantiate(Inverter[i]);
|
||||
obj.transform.localPosition = biaojiPos.localPosition;
|
||||
obj.transform.localEulerAngles = biaojiPos.localEulerAngles;
|
||||
}
|
||||
}
|
||||
//System.Diagnostics.Process.Start(Application.streamingAssetsPath+ "/ycxt2.0/index.html");
|
||||
UIManager.Instance.ToolsItemManager.ItemClick.AddListener(ToolsShow);
|
||||
}
|
||||
async Task initAsync()
|
||||
{
|
||||
try
|
||||
{
|
||||
Datas.Add(await HttpTool.GetJsonAsync<datas>($"http://111.229.30.246:10013/Handler/Taiqu.ashx?action=changjing&bianhao={dataStr}"));
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
Debug.LogError(ex.Message);
|
||||
}
|
||||
}
|
||||
|
||||
private void Update()
|
||||
{
|
||||
switch (interactiveEnum)
|
||||
|
@ -102,23 +101,28 @@ public class GameManager : MonoBehaviour
|
|||
{
|
||||
Destroy(temp.gameObject);
|
||||
}
|
||||
|
||||
temp = Instantiate(tools, Player.transform);
|
||||
temp.transform.localPosition = new Vector3(0.312f, 0.316f, 0.618f);
|
||||
UIManager.Instance.ToolsItemManager.currentTool = temp;
|
||||
string name = Filter(temp.name, TempChar);
|
||||
|
||||
|
||||
Debug.Log(name);
|
||||
switch (name)
|
||||
{
|
||||
case "ÍòÓñí":
|
||||
WanStopValve.gameObject.SetActive(true);
|
||||
QianStopValve.gameObject.SetActive(false);
|
||||
WanStopValve.trans = temp.transform;
|
||||
GameObject t2 = GameObject.FindGameObjectWithTag("旋转");
|
||||
WanStopValve.trans = t2.transform;
|
||||
temp.GetComponent<MultimeterManager>();
|
||||
temp.GetComponent<ToolModelClick>().line.SetActive(true);
|
||||
break;
|
||||
case "ǯÐεçÁ÷±í":
|
||||
interactiveEnum = Interactive.QianXing;
|
||||
temp.transform.localRotation = Quaternion.Euler(new Vector3(90, 180, 0));
|
||||
temp.transform.localPosition = new Vector3(0.312f, 0.316f, 0.618f);
|
||||
QianStopValve.trans = temp.transform;
|
||||
|
||||
QianStopValve.trans = temp.transform.Find("旋转");
|
||||
WanStopValve.gameObject.SetActive(false);
|
||||
QianStopValve.gameObject.SetActive(true);
|
||||
break;
|
||||
|
@ -127,8 +131,14 @@ public class GameManager : MonoBehaviour
|
|||
temp.transform.localPosition = new Vector3(0.307f, 0.504f, 0.654f);
|
||||
temp.AddComponent<TestPenInteractive>();
|
||||
break;
|
||||
case "相位伏安表":
|
||||
temp.transform.localEulerAngles = new Vector3(0, 180, 0);
|
||||
temp.AddComponent<AmpereMeter>();
|
||||
break;
|
||||
default:
|
||||
Insta(temp);
|
||||
WanStopValve.gameObject.SetActive(false);
|
||||
QianStopValve.gameObject.SetActive(false);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
@ -141,7 +151,7 @@ public class GameManager : MonoBehaviour
|
|||
/// </summary>
|
||||
public void Insta(GameObject GameObj)
|
||||
{
|
||||
GameObj.transform.localPosition = new Vector3(Player.transform.position.x+0.43f, Player.transform.position.y+0.66f, Player.transform.position.z+1.5f);
|
||||
GameObj.transform.localPosition = new Vector3(Player.transform.position.x + 0.43f, Player.transform.position.y + 0.66f, Player.transform.position.z + 1.5f);
|
||||
}
|
||||
}
|
||||
/// <summary>
|
||||
|
|
|
@ -9,10 +9,6 @@ public class Dialogue : MonoBehaviour
|
|||
[SerializeField] TextMeshProUGUI text;
|
||||
[SerializeField] Button Btn;
|
||||
// Start is called before the first frame update
|
||||
void Start()
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
public void init(string str)
|
||||
{
|
||||
|
|
|
@ -10,6 +10,9 @@ TagManager:
|
|||
- WanYon
|
||||
- RedWanYon
|
||||
- FuAn
|
||||
- "\u94ED\u724C"
|
||||
- Line
|
||||
- "\u65CB\u8F6C"
|
||||
layers:
|
||||
- Default
|
||||
- TransparentFX
|
||||
|
|
Loading…
Reference in New Issue