zhuyayu
/
E_ElecCompetition
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compare commits

base: zhuyayu:2de18d75951234833ca2e24d662faca29a125ea1
Branches Tags
zhuyayu:master
zhuyayu:3d_latest
zhuyayu:E_vue
zhuyayu:后端
..
compare: zhuyayu:205ca154207915f02e2a07ce297fcf130fca4d06
Branches Tags
zhuyayu:3d_latest
zhuyayu:master
zhuyayu:E_vue
zhuyayu:后端

No commits in common. "2de18d75951234833ca2e24d662faca29a125ea1" and "205ca154207915f02e2a07ce297fcf130fca4d06" have entirely different histories.
2de18d7595 ... 205ca15420

23 changed files with 1060 additions and 1561 deletions
Show Stats Expand all files Collapse all files

46
Electrical_inspectionCompetitionSystem/Assets/Adam/Prefabs/Item/OptionItem.prefab
View File

@ -248,7 +248,6 @@ GameObject:
- component: {fileID: 7841566712123838780} - component: {fileID: 7841566712123838780}
- component: {fileID: 7841566712123838781} - component: {fileID: 7841566712123838781}
- component: {fileID: 7841566712123838783} - component: {fileID: 7841566712123838783}
- component: {fileID: -7945763279749003775}
m_Layer: 5 m_Layer: 5
m_Name: OptionItem m_Name: OptionItem
m_TagString: Untagged m_TagString: Untagged
@ -331,48 +330,3 @@ MonoBehaviour:
m_EditorClassIdentifier: m_EditorClassIdentifier:
ID: {fileID: 7841566711167579075} ID: {fileID: 7841566711167579075}
info: {fileID: 7841566711052037343} info: {fileID: 7841566711052037343}
selfBtn: {fileID: -7945763279749003775}
--- !u!114 &-7945763279749003775
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7841566712123838755}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Navigation:
m_Mode: 3
m_WrapAround: 0
m_SelectOnUp: {fileID: 0}
m_SelectOnDown: {fileID: 0}
m_SelectOnLeft: {fileID: 0}
m_SelectOnRight: {fileID: 0}
m_Transition: 1
m_Colors:
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
m_ColorMultiplier: 1
m_FadeDuration: 0.1
m_SpriteState:
m_HighlightedSprite: {fileID: 0}
m_PressedSprite: {fileID: 0}
m_SelectedSprite: {fileID: 0}
m_DisabledSprite: {fileID: 0}
m_AnimationTriggers:
m_NormalTrigger: Normal
m_HighlightedTrigger: Highlighted
m_PressedTrigger: Pressed
m_SelectedTrigger: Selected
m_DisabledTrigger: Disabled
m_Interactable: 1
m_TargetGraphic: {fileID: 7841566712123838781}
m_OnClick:
m_PersistentCalls:
m_Calls: []

983
Electrical_inspectionCompetitionSystem/Assets/Adam/Scenes/UI.unity
View File

File diff suppressed because it is too large Load Diff

1
Electrical_inspectionCompetitionSystem/Assets/Adam/Scripts/AssignmentController.cs
View File

@ -55,7 +55,6 @@ namespace Adam
closeBtn.gameObject.SetActive(true); closeBtn.gameObject.SetActive(true);
SwitchPanel(false); SwitchPanel(false);
SceneLoad.Instance.SceneChange("工具间场景"); SceneLoad.Instance.SceneChange("工具间场景");
} }
} }
} }

4
Electrical_inspectionCompetitionSystem/Assets/Adam/Scripts/BottomController.cs
View File

@ -18,7 +18,6 @@ namespace Adam
public GameObject[] panels; public GameObject[] panels;
public GameObject buttomPanel; public GameObject buttomPanel;
public Toggle BirdEyeView; public Toggle BirdEyeView;
public FirstPersonController firstPersonController;
// Use this for initialization // Use this for initialization
private void Start() private void Start()
{ {
@ -32,9 +31,6 @@ namespace Adam
toggles[index].onValueChanged.AddListener((isOn) => toggles[index].onValueChanged.AddListener((isOn) =>
{ {
panels[index].SetActive(isOn); panels[index].SetActive(isOn);
if (firstPersonController == null)
firstPersonController = GameObject.FindGameObjectWithTag("Player").GetComponent<FirstPersonController>();
firstPersonController.enabled = !isOn;
}); });
} }
SwitchPanel(false); SwitchPanel(false);

1
Electrical_inspectionCompetitionSystem/Assets/Adam/Scripts/Components/OptionItem.cs
View File

@ -16,7 +16,6 @@ namespace Components
{ {
public Text ID; public Text ID;
public Text info; public Text info;
public Button selfBtn;
public void SetValue(string _id, string _info) public void SetValue(string _id, string _info)
{ {
ID.text = _id; ID.text = _id;

13
Electrical_inspectionCompetitionSystem/Assets/Adam/Scripts/Components/ToolItem.cs
View File

@ -13,7 +13,7 @@ using UnityEngine.UI;
//@description: //@description:
//============================================================ //============================================================
public class ToolItem : MonoBehaviour, IPointerEnterHandler, IPointerExitHandler public class ToolItem : MonoBehaviour,IPointerEnterHandler,IPointerExitHandler
{ {
public string toolName; public string toolName;
public Button closeButton; public Button closeButton;
@ -39,7 +39,7 @@ public class ToolItem : MonoBehaviour, IPointerEnterHandler, IPointerExitHandler
{ {
toolName = name; toolName = name;
closeButton.onClick.AddListener(OnClose); closeButton.onClick.AddListener(OnClose);
Texture2D icon = Resources.Load<Texture2D>("New/UI/" + name); Texture2D icon = Resources.Load<Texture2D>("New/UI/" + name);
showIcon.sprite = ToSprite(icon); showIcon.sprite = ToSprite(icon);
originPos = modelTransform.localPosition; originPos = modelTransform.localPosition;
@ -51,10 +51,7 @@ public class ToolItem : MonoBehaviour, IPointerEnterHandler, IPointerExitHandler
public void SetState(bool isActive) public void SetState(bool isActive)
{ {
closeButton.gameObject.SetActive(isActive); closeButton.gameObject.SetActive(isActive);
if (toolName == "工作卡") selfButton.interactable = !isActive;
selfButton.interactable = isActive;
else
selfButton.interactable = !isActive;
} }
/// <summary> /// <summary>
@ -77,7 +74,7 @@ public class ToolItem : MonoBehaviour, IPointerEnterHandler, IPointerExitHandler
} }
} }
private Sprite ToSprite(Texture2D t) private Sprite ToSprite(Texture2D t)
{ {
@ -99,7 +96,7 @@ public class ToolItem : MonoBehaviour, IPointerEnterHandler, IPointerExitHandler
public void OnPointerEnter(PointerEventData eventData) public void OnPointerEnter(PointerEventData eventData)
{ {
showName.text = toolName; showName.text = toolName;
tips.transform.position = transform.position + new Vector3(0, 35, 0); tips.transform.position = transform.position + new Vector3(0,35 , 0);
tips.SetActive(true); tips.SetActive(true);
} }

17
Electrical_inspectionCompetitionSystem/Assets/Adam/Scripts/Components/ToolModelClick.cs
View File

@ -50,6 +50,7 @@ public enum RightAndWrong
public class ToolModelClick : MonoBehaviour public class ToolModelClick : MonoBehaviour
{ {
public Attribute attribute = Attribute.defaultModel; public Attribute attribute = Attribute.defaultModel;
public RightAndWrong rightAndWrong = RightAndWrong.defaultModel; public RightAndWrong rightAndWrong = RightAndWrong.defaultModel;
@ -63,6 +64,13 @@ public class ToolModelClick : MonoBehaviour
public Highlighter selfHighlighter; public Highlighter selfHighlighter;
//public GameObject tipPrefab;
//public GameObject tip;
//[ContextMenu("Set")]
//public void TTTTT()
//{
// tipPrefab = Resources.Load<GameObject>("ModelTips");
//}
private void Awake() private void Awake()
{ {
@ -84,14 +92,18 @@ public class ToolModelClick : MonoBehaviour
var current = SceneManager.GetActiveScene(); var current = SceneManager.GetActiveScene();
if (current.name == "工具间场景") if (current.name == "工具间场景")
UIManager.Instance.SetThreeDTip(gameObject.name); UIManager.Instance.SetThreeDTip(gameObject.name);
//tip = Instantiate(tipPrefab);
//tip.GetComponentInChildren<TextMesh>().text = gameObject.name;
//tip.transform.localPosition = transform.localPosition;
//tip.transform.localScale = Vector3.one;
//tip.transform.LookAt(Camera.main.transform.position);
//tip.transform.localEulerAngles = new Vector3(90f, 0, 0);
} }
private void OnMouseDown() private void OnMouseDown()
{ {
if (EventSystem.current.IsPointerOverGameObject()) if (EventSystem.current.IsPointerOverGameObject())
return; return;
var current = SceneManager.GetActiveScene();
if (current.name != "工具间场景") return;
onDown?.Invoke(); onDown?.Invoke();
ToolsItemManager.Instance.CreatToolItem(gameObject); ToolsItemManager.Instance.CreatToolItem(gameObject);
UIManager.Instance.SetThreeDTip(""); UIManager.Instance.SetThreeDTip("");
@ -112,5 +124,6 @@ public class ToolModelClick : MonoBehaviour
return; return;
onExit?.Invoke(); onExit?.Invoke();
UIManager.Instance.SetThreeDTip(""); UIManager.Instance.SetThreeDTip("");
//Destroy(tip);
} }
} }

486
Electrical_inspectionCompetitionSystem/Assets/Adam/Scripts/Data/ExamusersData.cs
View File

@ -1,275 +1,32 @@
using System; using System.Collections;
using System.Collections.Generic; using System.Collections.Generic;
using UnityEngine;
using System;
//============================================================
//支持中文，文件使用UTF-8编码
//@author YangHua
//@create 20230916
//@company QianHuo
//
//@description:
//============================================================
namespace EData namespace EData
{ {
[Serializable] [Serializable]
public class Exam public class Root
{ {
/// <summary> /// <summary>
/// ///
/// </summary> /// </summary>
public string id ; public string state;
/// <summary>
/// 试卷11
/// </summary>
public string exam_name ;
/// <summary>
/// 已发布
/// </summary>
public string state ;
/// <summary> /// <summary>
/// ///
/// </summary> /// </summary>
public string start_time ; public string message;
/// <summary> /// <summary>
/// ///
/// </summary> /// </summary>
public string end_time ; public Data data;
/// <summary>
///
/// </summary>
public string create_time ;
/// <summary>
///
/// </summary>
public string create_user_id ;
/// <summary>
///
/// </summary>
public string r1 ;
/// <summary>
///
/// </summary>
public string r2 ;
/// <summary>
///
/// </summary>
public string r3 ;
/// <summary>
///
/// </summary>
public string r4 ;
/// <summary>
///
/// </summary>
public string r5 ;
/// <summary>
///
/// </summary>
public string state_dsc ;
}
[Serializable]
public class ListItem
{
/// <summary>
///
/// </summary>
public string id ;
/// <summary>
///
/// </summary>
public string exam_id ;
/// <summary>
/// 用户9600001129
/// </summary>
public string user_no ;
/// <summary>
///
/// </summary>
public string Address ;
/// <summary>
/// 用户9600001129
/// </summary>
public string UserName ;
/// <summary>
///
/// </summary>
public string AreaID ;
/// <summary>
///
/// </summary>
public string AreaName ;
/// <summary>
/// 有光伏
/// </summary>
public string UserType ;
/// <summary>
/// 三相_无互感器_有光伏
/// </summary>
public string BiaoType ;
/// <summary>
/// 自建房场景
/// </summary>
public string Scene ;
/// <summary>
/// 异常
/// </summary>
public string UserState ;
/// <summary>
///
/// </summary>
public int A ;
/// <summary>
///
/// </summary>
public int V ;
/// <summary>
///
/// </summary>
public int AA ;
/// <summary>
///
/// </summary>
public string AA2 ;
/// <summary>
///
/// </summary>
public string AA3 ;
/// <summary>
///
/// </summary>
public int AV ;
/// <summary>
///
/// </summary>
public string AV2 ;
/// <summary>
///
/// </summary>
public string AV3 ;
/// <summary>
///
/// </summary>
public int BA ;
/// <summary>
///
/// </summary>
public string BA2 ;
/// <summary>
///
/// </summary>
public string BA3 ;
/// <summary>
///
/// </summary>
public int BV ;
/// <summary>
///
/// </summary>
public string BV2 ;
/// <summary>
///
/// </summary>
public string BV3 ;
/// <summary>
///
/// </summary>
public int CA ;
/// <summary>
///
/// </summary>
public string CA2 ;
/// <summary>
///
/// </summary>
public string CA3 ;
/// <summary>
///
/// </summary>
public int CV ;
/// <summary>
///
/// </summary>
public string CV2 ;
/// <summary>
///
/// </summary>
public string CV3 ;
/// <summary>
///
/// </summary>
public int Beilv ;
/// <summary>
///
/// </summary>
public int PVW ;
/// <summary>
///
/// </summary>
public int PVNumber ;
/// <summary>
///
/// </summary>
public int DCW ;
/// <summary>
/// 电流异常
/// </summary>
public string WarningType ;
/// <summary>
/// 电能表短接
/// </summary>
public string OnSite ;
/// <summary>
///
/// </summary>
public int Angle ;
/// <summary>
///
/// </summary>
public string IsChange ;
/// <summary>
///
/// </summary>
public string create_time ;
/// <summary>
///
/// </summary>
public string r1 ;
/// <summary>
///
/// </summary>
public string r2 ;
/// <summary>
///
/// </summary>
public string r3 ;
/// <summary>
///
/// </summary>
public string r4 ;
/// <summary>
///
/// </summary>
public string r5 ;
/// <summary>
///
/// </summary>
public int v1 ;
/// <summary>
///
/// </summary>
public int v2 ;
/// <summary>
///
/// </summary>
public int v3 ;
/// <summary>
///
/// </summary>
public int v4 ;
/// <summary>
///
/// </summary>
public int v5 ;
/// <summary>
///
/// </summary>
public string huhao ;
/// <summary>
///
/// </summary>
public string is_fd ;
} }
[Serializable] [Serializable]
public class Data public class Data
@ -277,26 +34,225 @@ namespace EData
/// <summary> /// <summary>
/// ///
/// </summary> /// </summary>
public Exam exam ; public ExamusersData exam;
/// <summary> /// <summary>
/// ///
/// </summary> /// </summary>
public List<ListItem> list ; public List<ListItem> list;
} }
[Serializable] [Serializable]
public class Root public class ListItem
{ {
/// <summary> /// <summary>
/// ///
/// </summary> /// </summary>
public string state ; public string id;
/// <summary> /// <summary>
/// ///
/// </summary> /// </summary>
public string message ; public string exam_id;
/// <summary>
/// 用户9600001129
/// </summary>
public string user_no;
/// <summary>
/// 仪征市弘桥路
/// </summary>
public string Address;
/// <summary>
/// 刘生萍
/// </summary>
public string UserName;
/// <summary> /// <summary>
/// ///
/// </summary> /// </summary>
public Data data ; public string AreaID;
/// <summary>
///
/// </summary>
public string AreaName;
/// <summary>
///
/// </summary>
public string UserType;
/// <summary>
///
/// </summary>
public string BiaoType;
/// <summary>
/// 自建房场景
/// </summary>
public string Scene;
/// <summary>
/// 干扰
/// </summary>
public string UserState;
/// <summary>
///
/// </summary>
public int A;
/// <summary>
///
/// </summary>
public int V;
/// <summary>
///
/// </summary>
public int AA;
/// <summary>
///
/// </summary>
public int AV;
/// <summary>
///
/// </summary>
public int BA;
/// <summary>
///
/// </summary>
public int BV;
/// <summary>
///
/// </summary>
public int CA;
/// <summary>
///
/// </summary>
public int CV;
/// <summary>
///
/// </summary>
public int Beilv;
/// <summary>
///
/// </summary>
public int PVW;
/// <summary>
///
/// </summary>
public int PVNumber;
/// <summary>
///
/// </summary>
public int DCW;
/// <summary>
/// 电流异常
/// </summary>
public string WarningType;
/// <summary>
/// 电能表短接
/// </summary>
public string OnSite;
/// <summary>
///
/// </summary>
public int Angle;
/// <summary>
///
/// </summary>
public string IsChange;
/// <summary>
///
/// </summary>
public string create_time;
/// <summary>
///
/// </summary>
public string r1;
/// <summary>
///
/// </summary>
public string r2;
/// <summary>
///
/// </summary>
public string r3;
/// <summary>
///
/// </summary>
public string r4;
/// <summary>
///
/// </summary>
public string r5;
/// <summary>
///
/// </summary>
public int v1;
/// <summary>
///
/// </summary>
public int v2;
/// <summary>
///
/// </summary>
public int v3;
/// <summary>
///
/// </summary>
public int v4;
/// <summary>
///
/// </summary>
public int v5;
} }
} [Serializable]
public class ExamusersData
{
/// <summary>
///
/// </summary>
public string id;
/// <summary>
/// 试卷11
/// </summary>
public string exam_name;
/// <summary>
/// 已发布
/// </summary>
public string state;
/// <summary>
///
/// </summary>
public string start_time;
/// <summary>
///
/// </summary>
public string end_time;
/// <summary>
///
/// </summary>
public string create_time;
/// <summary>
///
/// </summary>
public string create_user_id;
/// <summary>
///
/// </summary>
public string r1;
/// <summary>
///
/// </summary>
public string r2;
/// <summary>
///
/// </summary>
public string r3;
/// <summary>
///
/// </summary>
public string r4;
/// <summary>
///
/// </summary>
public string r5;
/// <summary>
///
/// </summary>
public string state_dsc;
}
}

353
Electrical_inspectionCompetitionSystem/Assets/Adam/Scripts/Data/UserViewData.cs
View File

@ -18,182 +18,181 @@ namespace MobileTerminal
{ {
public string state; public string state;
public string message; public string message;
public List<string> data; public Data data;
}
[Serializable]
public class Data
{
public JBSX[] jbsx;
public JBXX[] jbxx;
public JLZZXX[] jlzzxx;
}
[Serializable]
public class JBSX
{
/// <summary>
/// 周保林 用电户：3209600004110
/// </summary>
public string 名称;
/// <summary>
///
/// </summary>
public string 用户编号;
/// <summary>
/// 仪征市供电公司
/// </summary>
public string 供电单位;
/// <summary>
/// 考核
/// </summary>
public string 用户分类;
/// <summary>
/// 否
/// </summary>
public string 是否专线;
/// <summary>
/// 正常用电客户
/// </summary>
public string 用户状态;
/// <summary>
///
/// </summary>
public string 合同容量;
/// <summary>
///
/// </summary>
public string 运行容量;
/// <summary>
///
/// </summary>
public string 首次建档日期;
/// <summary>
/// 江苏省扬州市仪征市真州镇（仪征市区）镇解放东路12号
/// </summary>
public string 用电地址;
/// <summary>
/// 无转供
/// </summary>
public string 转供户信息;
}
[Serializable]
public class JBXX
{
/// <summary>
/// 周保林
/// </summary>
public string 用户名称;
/// <summary>
///
/// </summary>
public string 用户编号;
/// <summary>
/// 正常用电客户
/// </summary>
public string 用户状态;
/// <summary>
/// 考核
/// </summary>
public string 用户分类;
/// <summary>
/// 仪征市供电公司
/// </summary>
public string 供电单位;
/// <summary>
/// 太阳能发电
/// </summary>
public string 所属行业;
/// <summary>
///
/// </summary>
public string 合同容量;
/// <summary>
///
/// </summary>
public string 运行容量;
/// <summary>
///
/// </summary>
public string 电压等级;
/// <summary>
///
/// </summary>
public string 重要等级;
/// <summary>
/// 考核
/// </summary>
public string 用电类别;
/// <summary>
/// 否
/// </summary>
public string 是否重点用户;
/// <summary>
/// 否
/// </summary>
public string 是否专线;
/// <summary>
///
/// </summary>
public string 首次建档;
/// <summary>
/// 否
/// </summary>
public string 是否双电源;
/// <summary>
/// PMS_石桥146线
/// </summary>
public string 线路名称;
/// <summary>
/// 江苏省扬州市仪征市真州镇（仪征市区）镇解放东路12号
/// </summary>
public string 用电地址;
}
[Serializable]
public class JLZZXX
{
/// <summary>
///
/// </summary>
public string 序号;
/// <summary>
/// 上网计量点1
/// </summary>
public string 计量点名称;
/// <summary>
///
/// </summary>
public string 计量点ID;
/// <summary>
///
/// </summary>
public string 电表ID;
/// <summary>
///
/// </summary>
public string 电表资产编号;
/// <summary>
/// 否
/// </summary>
public string 是否参考表;
/// <summary>
/// 否
/// </summary>
public string 是否专线;
/// <summary>
/// 上网关口
/// </summary>
public string 主用途类型;
/// <summary>
///
/// </summary>
public string 计量点级数;
/// <summary>
/// 在用
/// </summary>
public string 状态;
/// <summary>
///
/// </summary>
public string 倍率;
} }
//[Serializable]
//public class Data
//{
// public JBSX[] jbsx;
// public JBXX[] jbxx;
// public JLZZXX[] jlzzxx;
//}
//[Serializable]
//public class JBSX
//{
// /// <summary>
// /// 周保林 用电户：3209600004110
// /// </summary>
// public string 名称;
// /// <summary>
// ///
// /// </summary>
// public string 用户编号;
// /// <summary>
// /// 仪征市供电公司
// /// </summary>
// public string 供电单位;
// /// <summary>
// /// 考核
// /// </summary>
// public string 用户分类;
// /// <summary>
// /// 否
// /// </summary>
// public string 是否专线;
// /// <summary>
// /// 正常用电客户
// /// </summary>
// public string 用户状态;
// /// <summary>
// ///
// /// </summary>
// public string 合同容量;
// /// <summary>
// ///
// /// </summary>
// public string 运行容量;
// /// <summary>
// ///
// /// </summary>
// public string 首次建档日期;
// /// <summary>
// /// 江苏省扬州市仪征市真州镇（仪征市区）镇解放东路12号
// /// </summary>
// public string 用电地址;
// /// <summary>
// /// 无转供
// /// </summary>
// public string 转供户信息;
//}
//[Serializable]
//public class JBXX
//{
// /// <summary>
// /// 周保林
// /// </summary>
// public string 用户名称;
// /// <summary>
// ///
// /// </summary>
// public string 用户编号;
// /// <summary>
// /// 正常用电客户
// /// </summary>
// public string 用户状态;
// /// <summary>
// /// 考核
// /// </summary>
// public string 用户分类;
// /// <summary>
// /// 仪征市供电公司
// /// </summary>
// public string 供电单位;
// /// <summary>
// /// 太阳能发电
// /// </summary>
// public string 所属行业;
// /// <summary>
// ///
// /// </summary>
// public string 合同容量;
// /// <summary>
// ///
// /// </summary>
// public string 运行容量;
// /// <summary>
// ///
// /// </summary>
// public string 电压等级;
// /// <summary>
// ///
// /// </summary>
// public string 重要等级;
// /// <summary>
// /// 考核
// /// </summary>
// public string 用电类别;
// /// <summary>
// /// 否
// /// </summary>
// public string 是否重点用户;
// /// <summary>
// /// 否
// /// </summary>
// public string 是否专线;
// /// <summary>
// ///
// /// </summary>
// public string 首次建档;
// /// <summary>
// /// 否
// /// </summary>
// public string 是否双电源;
// /// <summary>
// /// PMS_石桥146线
// /// </summary>
// public string 线路名称;
// /// <summary>
// /// 江苏省扬州市仪征市真州镇（仪征市区）镇解放东路12号
// /// </summary>
// public string 用电地址;
//}
//[Serializable]
//public class JLZZXX
//{
// /// <summary>
// ///
// /// </summary>
// public string 序号;
// /// <summary>
// /// 上网计量点1
// /// </summary>
// public string 计量点名称;
// /// <summary>
// ///
// /// </summary>
// public string 计量点ID;
// /// <summary>
// ///
// /// </summary>
// public string 电表ID;
// /// <summary>
// ///
// /// </summary>
// public string 电表资产编号;
// /// <summary>
// /// 否
// /// </summary>
// public string 是否参考表;
// /// <summary>
// /// 否
// /// </summary>
// public string 是否专线;
// /// <summary>
// /// 上网关口
// /// </summary>
// public string 主用途类型;
// /// <summary>
// ///
// /// </summary>
// public string 计量点级数;
// /// <summary>
// /// 在用
// /// </summary>
// public string 状态;
// /// <summary>
// ///
// /// </summary>
// public string 倍率;
//}
} }

19
Electrical_inspectionCompetitionSystem/Assets/Adam/Scripts/JobCardController.cs
View File

@ -103,28 +103,15 @@ namespace Adam
for (int i = 0; i < af.data.Length; i++) for (int i = 0; i < af.data.Length; i++)
{ {
int index = i; int index = i;
string infoTemp = af.data[index];
OptionItem optionItemTemp = Instantiate(optionItemPrefab, optionItemContent); OptionItem optionItemTemp = Instantiate(optionItemPrefab, optionItemContent);
optionItemTemp.SetValue(index.ToString(), infoTemp); optionItemTemp.SetValue(index.ToString(), af.data[i]);
optionItemTemp.selfBtn.onClick.AddListener(() =>
{
OnOptionItemClick(index, infoTemp, name);
});
} }
} }
private void OnOptionItemClick(int index, string info,string name) private void OnOptionItemClick(int index,string info)
{ {
if (name == "FXDFX") aqcss[index].text = info;
{
fxdfx[index].text = info;
}
else if (name == "AQCS")
{
aqcss[index].text = info;
}
} }
} }
} }

53
Electrical_inspectionCompetitionSystem/Assets/Adam/Scripts/MobileTerminalController.cs
View File

@ -18,8 +18,8 @@ using UnityEngine.UI;
public class MobileTerminalController : MonoBehaviour public class MobileTerminalController : MonoBehaviour
{ {
public string userViewUrl; public string userViewUrl = "http://111.229.30.246:10013/Handler/Taiqu.ashx?action=dianbianhao&bianhao=";
public string tabelViewUrl; public string tabelViewUrl = "http://111.229.30.246:10013/Handler/Taiqu.ashx?action=bianhaobiaoji&bianhao=";
public InputField number; public InputField number;
/// <summary> /// <summary>
/// 表记数据 /// 表记数据
@ -68,37 +68,32 @@ public class MobileTerminalController : MonoBehaviour
isOnLoad = true; isOnLoad = true;
string url = userViewUrl + number.text; string url = userViewUrl + number.text;
mData = await AsyncWebReq.Get<UserViewData>(url); mData = await AsyncWebReq.Get<UserViewData>(url);
for (int i = 0; i < mData.data.Count; i++) string jsonData = JsonConvert.SerializeObject(mData);
AsyncWebReq.SetValue(jsonData, out jbsx, out jbxx, out jlzzxx);
foreach (var item in jbsx)
{ {
MobileTerminalTipsItem itemTip = Instantiate(itemPrfab, userContent); MobileTerminalTipsItem itemTip = Instantiate(itemPrfab, userContent);
itemTip.SetValue(mData.data[i]); string info = item.Key + ": " + item.Value;
itemTip.SetValue(info);
} }
//string jsonData = JsonConvert.SerializeObject(mData);
//AsyncWebReq.SetValue(jsonData, out jbsx, out jbxx, out jlzzxx);
//foreach (var item in jbsx) foreach (var item in jbxx)
//{ {
// MobileTerminalTipsItem itemTip = Instantiate(itemPrfab, userContent); MobileTerminalTipsItem itemTip = Instantiate(itemPrfab, userContent);
// string info = item.Key + ": " + item.Value; string info = item.Key + ": " + item.Value;
// itemTip.SetValue(info); itemTip.SetValue(info);
//} }
//foreach (var item in jbxx) for (int i = 0; i < jlzzxx.Count; i++)
//{ {
// MobileTerminalTipsItem itemTip = Instantiate(itemPrfab, userContent); foreach (var item in jlzzxx[i])
// string info = item.Key + ": " + item.Value; {
// itemTip.SetValue(info); MobileTerminalTipsItem itemTip = Instantiate(itemPrfab, userContent);
//} string info = item.Key + ": " + item.Value;
itemTip.SetValue(info);
//for (int i = 0; i < jlzzxx.Count; i++) }
//{ }
// foreach (var item in jlzzxx[i])
// {
// MobileTerminalTipsItem itemTip = Instantiate(itemPrfab, userContent);
// string info = item.Key + ": " + item.Value;
// itemTip.SetValue(info);
// }
//}
SwitchView(0); SwitchView(0);
isOnLoad = false; isOnLoad = false;
} }
@ -130,7 +125,7 @@ public class MobileTerminalController : MonoBehaviour
/// </summary> /// </summary>
public void OnElectricitView() public void OnElectricitView()
{ {
if (isOnLoad) return; if(isOnLoad ) return;
if (number.text == "") return; if (number.text == "") return;
OnUser(); OnUser();

9
Electrical_inspectionCompetitionSystem/Assets/Adam/Scripts/ToolModelManager.cs
View File

@ -12,12 +12,5 @@ using UnityEngine;
public class ToolModelManager : MonoBehaviour public class ToolModelManager : MonoBehaviour
{ {
public ToolModelClick[] toolModelClicks;
public void GetAllToolModels()
{
GameObject toolContent = GameObject.FindGameObjectWithTag("AllTools");
toolModelClicks = toolContent.transform.GetComponentsInChildren<ToolModelClick>();
}
} }

9
Electrical_inspectionCompetitionSystem/Assets/Adam/Scripts/ToolsItemManager.cs
View File

@ -128,15 +128,6 @@ public class ToolsItemManager : MonoSingleton<ToolsItemManager>
} }
} }
public void ResetState()
{
for (int i = 0; i < toolItems.Count; i++)
{
toolItems[i].SetState(true);
}
}
public IEnumerator WaitShowServerRecorderPanel() public IEnumerator WaitShowServerRecorderPanel()
{ {
ServerRecorderPanel.gameObject.SetActive(true); ServerRecorderPanel.gameObject.SetActive(true);

26
Electrical_inspectionCompetitionSystem/Assets/Adam/Scripts/UIManager.cs
View File

@ -1,7 +1,6 @@
using Adam; using Adam;
using System.Collections; using System.Collections;
using System.Collections.Generic; using System.Collections.Generic;
using System.Threading.Tasks;
using UnityEngine; using UnityEngine;
using UnityEngine.UI; using UnityEngine.UI;
//============================================================ //============================================================
@ -21,7 +20,6 @@ public class UIManager : MonoSingleton<UIManager>
public BottomController bottomCotroller; public BottomController bottomCotroller;
public JobCardController jobCardController; public JobCardController jobCardController;
public ExitCheckController exitCheckController; public ExitCheckController exitCheckController;
public ToolModelManager toolModelManager;
public Button exitBtn; public Button exitBtn;
public Button backToToolBtn; public Button backToToolBtn;
public Text threeDTip; public Text threeDTip;
@ -41,34 +39,14 @@ public class UIManager : MonoSingleton<UIManager>
} }
}); });
exitBtn.gameObject.SetActive(false); exitBtn.gameObject.SetActive(false);
backToToolBtn.onClick.AddListener(() => backToToolBtn.onClick.AddListener(BackToTool);
{
ToolsItemManager.recoverEvent.RemoveAllListeners();
ToolsItemManager.ResetState();
backToToolBtn.gameObject.SetActive(false);
bottomCotroller.BirdEyeView.gameObject.SetActive(false);
BackToTool();
});
backToToolBtn.gameObject.SetActive(false); backToToolBtn.gameObject.SetActive(false);
DontDestroyOnLoad(this); DontDestroyOnLoad(this);
} }
private async void BackToTool() private void BackToTool()
{ {
SceneLoad.Instance.SceneChange("工具间场景"); SceneLoad.Instance.SceneChange("工具间场景");
await Task.Delay(500);
toolModelManager.GetAllToolModels();
for (int i = 0; i < ToolsItemManager.toolItems.Count; i++)
{
for (int j = 0; j < toolModelManager.toolModelClicks.Length; j++)
{
if (ToolsItemManager.toolItems[i].originPos == toolModelManager.toolModelClicks[j].transform.localPosition)
{
Destroy(toolModelManager.toolModelClicks[j].gameObject);
}
}
}
} }
public void SetThreeDTip(string name) public void SetThreeDTip(string name)

165
Electrical_inspectionCompetitionSystem/Assets/Scenes/工具间场景.unity
View File

@ -185,39 +185,6 @@ Transform:
m_CorrespondingSourceObject: {fileID: 3822654451255398218, guid: 2ac06dd92c2069f4db98276a4465b943, type: 3} m_CorrespondingSourceObject: {fileID: 3822654451255398218, guid: 2ac06dd92c2069f4db98276a4465b943, type: 3}
m_PrefabInstance: {fileID: 1875591} m_PrefabInstance: {fileID: 1875591}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
--- !u!1 &2400468
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2400469}
m_Layer: 0
m_Name: "All\u5DE5\u5177\u5668"
m_TagString: AllTools
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &2400469
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2400468}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 1873, y: 1024.4, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 865266376}
- {fileID: 1233633457}
m_Father: {fileID: 0}
m_RootOrder: 8
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &15887556 --- !u!1 &15887556
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -878,7 +845,7 @@ Transform:
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: [] m_Children: []
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 4 m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &214298342 --- !u!1 &214298342
GameObject: GameObject:
@ -2999,6 +2966,7 @@ GameObject:
- component: {fileID: 333646760} - component: {fileID: 333646760}
- component: {fileID: 333646759} - component: {fileID: 333646759}
- component: {fileID: 333646758} - component: {fileID: 333646758}
- component: {fileID: 333646762}
m_Layer: 5 m_Layer: 5
m_Name: Canvas m_Name: Canvas
m_TagString: Untagged m_TagString: Untagged
@ -3039,7 +3007,7 @@ MonoBehaviour:
m_ReferencePixelsPerUnit: 100 m_ReferencePixelsPerUnit: 100
m_ScaleFactor: 1 m_ScaleFactor: 1
m_ReferenceResolution: {x: 1920, y: 1080} m_ReferenceResolution: {x: 1920, y: 1080}
m_ScreenMatchMode: 0 m_ScreenMatchMode: 1
m_MatchWidthOrHeight: 0 m_MatchWidthOrHeight: 0
m_PhysicalUnit: 3 m_PhysicalUnit: 3
m_FallbackScreenDPI: 96 m_FallbackScreenDPI: 96
@ -3065,7 +3033,7 @@ Canvas:
m_SortingBucketNormalizedSize: 0 m_SortingBucketNormalizedSize: 0
m_AdditionalShaderChannelsFlag: 0 m_AdditionalShaderChannelsFlag: 0
m_SortingLayerID: 0 m_SortingLayerID: 0
m_SortingOrder: 3 m_SortingOrder: 0
m_TargetDisplay: 0 m_TargetDisplay: 0
--- !u!224 &333646761 --- !u!224 &333646761
RectTransform: RectTransform:
@ -3078,15 +3046,29 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0, y: 0, z: 0}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: [] m_Children:
- {fileID: 1214987529}
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 3 m_RootOrder: 5
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: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0, y: 0} m_Pivot: {x: 0, y: 0}
--- !u!114 &333646762
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 333646757}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 2ef62ef58861f594ca67aff0391b0765, type: 3}
m_Name:
m_EditorClassIdentifier:
browser: {fileID: 0}
--- !u!1001 &379696848 --- !u!1001 &379696848
PrefabInstance: PrefabInstance:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -4832,6 +4814,11 @@ MeshCollider:
m_Convex: 0 m_Convex: 0
m_CookingOptions: 30 m_CookingOptions: 30
m_Mesh: {fileID: 7974993928628611473, guid: 20ffa010543df1a46896595ac300588e, type: 3} m_Mesh: {fileID: 7974993928628611473, guid: 20ffa010543df1a46896595ac300588e, type: 3}
--- !u!1 &786522454 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 324364665315715516, guid: 99da977971c2c1343a37bbcc6d10f2ef, type: 3}
m_PrefabInstance: {fileID: 1214987528}
m_PrefabAsset: {fileID: 0}
--- !u!1 &809465737 --- !u!1 &809465737
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -5082,7 +5069,7 @@ Transform:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 865266375} m_GameObject: {fileID: 865266375}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -1873, y: -1024.4, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: m_Children:
@ -5128,8 +5115,8 @@ Transform:
- {fileID: 6166402648483344093} - {fileID: 6166402648483344093}
- {fileID: 3190690649765978568} - {fileID: 3190690649765978568}
- {fileID: 485612229} - {fileID: 485612229}
m_Father: {fileID: 2400469} m_Father: {fileID: 0}
m_RootOrder: 0 m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &1039716617 --- !u!1001 &1039716617
PrefabInstance: PrefabInstance:
@ -5140,7 +5127,7 @@ PrefabInstance:
m_Modifications: m_Modifications:
- target: {fileID: 3350233854110697392, guid: 5a7d7e9bd76f93b418b1f916781feb6a, type: 3} - target: {fileID: 3350233854110697392, guid: 5a7d7e9bd76f93b418b1f916781feb6a, type: 3}
propertyPath: m_RootOrder propertyPath: m_RootOrder
value: 5 value: 7
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 3350233854110697392, guid: 5a7d7e9bd76f93b418b1f916781feb6a, type: 3} - target: {fileID: 3350233854110697392, guid: 5a7d7e9bd76f93b418b1f916781feb6a, type: 3}
propertyPath: m_LocalPosition.x propertyPath: m_LocalPosition.x
@ -5346,7 +5333,7 @@ Transform:
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: [] m_Children: []
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 2 m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 4.747, y: 249.743, z: 439.425} m_LocalEulerAnglesHint: {x: 4.747, y: 249.743, z: 439.425}
--- !u!1 &1096617073 --- !u!1 &1096617073
GameObject: GameObject:
@ -5693,6 +5680,76 @@ Transform:
m_CorrespondingSourceObject: {fileID: 8218745123122009150, guid: 4b06ca5b0865ade40b27cf11a123ba5c, type: 3} m_CorrespondingSourceObject: {fileID: 8218745123122009150, guid: 4b06ca5b0865ade40b27cf11a123ba5c, type: 3}
m_PrefabInstance: {fileID: 1172275066} m_PrefabInstance: {fileID: 1172275066}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
--- !u!1001 &1214987528
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 333646761}
m_Modifications:
- target: {fileID: 324364665315715489, guid: 99da977971c2c1343a37bbcc6d10f2ef, type: 3}
propertyPath: InstructionMessage
value:
objectReference: {fileID: 333646757}
- target: {fileID: 324364665315715491, guid: 99da977971c2c1343a37bbcc6d10f2ef, type: 3}
propertyPath: m_RootOrder
value: 1
objectReference: {fileID: 0}
- target: {fileID: 324364665315715491, guid: 99da977971c2c1343a37bbcc6d10f2ef, type: 3}
propertyPath: m_LocalPosition.x
value: -960
objectReference: {fileID: 0}
- target: {fileID: 324364665315715491, guid: 99da977971c2c1343a37bbcc6d10f2ef, type: 3}
propertyPath: m_LocalPosition.y
value: -538.8
objectReference: {fileID: 0}
- target: {fileID: 324364665315715491, guid: 99da977971c2c1343a37bbcc6d10f2ef, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 324364665315715491, guid: 99da977971c2c1343a37bbcc6d10f2ef, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 324364665315715491, guid: 99da977971c2c1343a37bbcc6d10f2ef, type: 3}
propertyPath: m_LocalRotation.x
value: -0
objectReference: {fileID: 0}
- target: {fileID: 324364665315715491, guid: 99da977971c2c1343a37bbcc6d10f2ef, type: 3}
propertyPath: m_LocalRotation.y
value: -0
objectReference: {fileID: 0}
- target: {fileID: 324364665315715491, guid: 99da977971c2c1343a37bbcc6d10f2ef, type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: 324364665315715491, guid: 99da977971c2c1343a37bbcc6d10f2ef, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 324364665315715491, guid: 99da977971c2c1343a37bbcc6d10f2ef, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 324364665315715491, guid: 99da977971c2c1343a37bbcc6d10f2ef, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 324364665315715516, guid: 99da977971c2c1343a37bbcc6d10f2ef, type: 3}
propertyPath: m_Name
value: SceneManager
objectReference: {fileID: 0}
- target: {fileID: 324364665315715516, guid: 99da977971c2c1343a37bbcc6d10f2ef, type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 99da977971c2c1343a37bbcc6d10f2ef, type: 3}
--- !u!4 &1214987529 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 324364665315715491, guid: 99da977971c2c1343a37bbcc6d10f2ef, type: 3}
m_PrefabInstance: {fileID: 1214987528}
m_PrefabAsset: {fileID: 0}
--- !u!1 &1233633456 --- !u!1 &1233633456
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -5704,7 +5761,7 @@ GameObject:
- component: {fileID: 1233633457} - component: {fileID: 1233633457}
m_Layer: 0 m_Layer: 0
m_Name: "\u5DE5\u5668\u5177" m_Name: "\u5DE5\u5668\u5177"
m_TagString: AllTools m_TagString: Untagged
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
@ -5716,8 +5773,8 @@ Transform:
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1233633456} m_GameObject: {fileID: 1233633456}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -1873, y: -1024.4, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: m_Children:
@ -5750,8 +5807,8 @@ Transform:
- {fileID: 1284012090} - {fileID: 1284012090}
- {fileID: 1850070997} - {fileID: 1850070997}
- {fileID: 643759145} - {fileID: 643759145}
m_Father: {fileID: 2400469} m_Father: {fileID: 0}
m_RootOrder: 1 m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1234414489 --- !u!1 &1234414489
GameObject: GameObject:
@ -5996,7 +6053,7 @@ Transform:
m_Children: m_Children:
- {fileID: 2059769794} - {fileID: 2059769794}
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 6 m_RootOrder: 8
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1265359521 --- !u!114 &1265359521
MonoBehaviour: MonoBehaviour:
@ -6072,9 +6129,9 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 936e1a57cc0a2944a89d7b1617875726, type: 3} m_Script: {fileID: 11500000, guid: 936e1a57cc0a2944a89d7b1617875726, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
_name: Computer game: {fileID: 786522454}
_focusedPrefab: {fileID: 0} name: Computer
_canvas: {fileID: 333646757} url: http://192.168.0.104:8089/
--- !u!1001 &1266954248 --- !u!1001 &1266954248
PrefabInstance: PrefabInstance:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -7080,7 +7137,7 @@ PrefabInstance:
m_Modifications: m_Modifications:
- target: {fileID: 962704353483637904, guid: eba75dd16d820074fbba9f43892bc9a8, type: 3} - target: {fileID: 962704353483637904, guid: eba75dd16d820074fbba9f43892bc9a8, type: 3}
propertyPath: m_RootOrder propertyPath: m_RootOrder
value: 7 value: 9
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 962704353483637904, guid: eba75dd16d820074fbba9f43892bc9a8, type: 3} - target: {fileID: 962704353483637904, guid: eba75dd16d820074fbba9f43892bc9a8, type: 3}
propertyPath: m_LocalPosition.x propertyPath: m_LocalPosition.x
@ -7272,7 +7329,7 @@ Transform:
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: [] m_Children: []
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 1 m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &1532770825 --- !u!1001 &1532770825
PrefabInstance: PrefabInstance:

129
Electrical_inspectionCompetitionSystem/Assets/Script/KDLURL/newfollow.cs
View File

@ -1,16 +1,20 @@
using UnityEngine; using UnityEngine;
using UnityEngine.EventSystems; using UnityEngine.EventSystems;
using Vuplex.WebView;
public class newfollow : MonoBehaviour public class newfollow : MonoBehaviour
{ {
[SerializeField] string _name; [SerializeField] GameObject game;
public CanvasWebViewPrefab _focusedPrefab; [SerializeField] string name;
public GameObject _canvas; public string url;
private void Start() //[SerializeField] Dialogue dialogue;
{ // Start is called before the first frame update
//void Start()
//{
// //EventTriggerListener.Get(transform.gameObject).onClick += g =>
// //{
} // //};
//}
private void Update() private void Update()
{ {
// 鼠标左键按下 // 鼠标左键按下
@ -27,113 +31,18 @@ public class newfollow : MonoBehaviour
if (res) if (res)
{ {
// 如果产生了碰撞 // 如果产生了碰撞
if (hit.transform.name.Equals(_name)) if (hit.transform.name.Equals(name))
{ {
Debug.Log(hit.transform.name); Debug.Log(hit.transform.name);
CreatView(); game.SetActive(true);
//game.init(url);
} }
} }
} }
if (Input.GetKeyDown(KeyCode.Escape))
{
if (_focusedPrefab != null)
Destroy(_focusedPrefab.gameObject);
}
} }
//// Update is called once per frame
private void CreatView() //private void FixedUpdate()
{ //{
// Enable the native touch screen keyboard for Android and iOS. // transform.LookAt(game);
Web.SetTouchScreenKeyboardEnabled(true); //}
//_canvas = GameObject.Find("Canvas");
// Create a webview for the main content.
var mainWebViewPrefab = CanvasWebViewPrefab.Instantiate();
mainWebViewPrefab.transform.SetParent(_canvas.transform, false);
var rectTransform = mainWebViewPrefab.transform as RectTransform;
rectTransform.anchoredPosition3D = Vector3.zero;
rectTransform.offsetMin = Vector2.zero;
rectTransform.offsetMax = Vector2.zero;
mainWebViewPrefab.transform.localScale = Vector3.one;
_focusedPrefab = mainWebViewPrefab;
mainWebViewPrefab.Initialized += (s, e) =>
{
var webViewWithPopups = mainWebViewPrefab.WebView as IWithPopups;
if (webViewWithPopups == null)
{
mainWebViewPrefab.WebView.LoadHtml(NOT_SUPPORTED_HTML);
return;
}
WebViewLogger.Log("Loading Pinterest as an example because it uses popups for third party login. Click 'Login', then select Facebook or Google to open a popup for authentication.");
mainWebViewPrefab.WebView.LoadUrl("http://111.229.30.246:10015/");
webViewWithPopups.SetPopupMode(PopupMode.LoadInNewWebView);
webViewWithPopups.PopupRequested += (webView, eventArgs) =>
{
WebViewLogger.Log("Popup opened with URL: " + eventArgs.Url);
var popupPrefab = CanvasWebViewPrefab.Instantiate(eventArgs.WebView);
_focusedPrefab = popupPrefab;
popupPrefab.transform.SetParent(_canvas.transform, false);
var popupRectTransform = popupPrefab.transform as RectTransform;
popupRectTransform.anchoredPosition3D = Vector3.zero;
popupRectTransform.offsetMin = Vector2.zero;
popupRectTransform.offsetMax = Vector2.zero;
popupPrefab.transform.localScale = Vector3.one;
// Place the popup in front of the main webview.
var localPosition = popupPrefab.transform.localPosition;
localPosition.z = 0.1f;
popupPrefab.transform.localPosition = localPosition;
popupPrefab.Initialized += (sender, initializedEventArgs) =>
{
popupPrefab.WebView.CloseRequested += (popupWebView, closeEventArgs) =>
{
WebViewLogger.Log("Closing the popup");
_focusedPrefab = mainWebViewPrefab;
popupPrefab.Destroy();
};
};
};
};
}
const string NOT_SUPPORTED_HTML = @"
<body>
<style>
body {
font-family: sans-serif;
display: flex;
justify-content: center;
align-items: center;
line-height: 1.25;
}
div {
max-width: 80%;
}
li {
margin: 10px 0;
}
</style>
<div>
<p>
Sorry, but this 3D WebView package doesn't support yet the <a href='https://developer.vuplex.com/webview/IWithPopups'>IWithPopups</a> interface. Current packages that support popups:
</p>
<ul>
<li>
<a href='https://developer.vuplex.com/webview/StandaloneWebView'>3D WebView for Windows and macOS</a>
</li>
<li>
<a href='https://developer.vuplex.com/webview/AndroidWebView'>3D WebView for Android</a>
</li>
<li>
<a href='https://developer.vuplex.com/webview/AndroidGeckoWebView'>3D WebView for Android with Gecko Engine</a>
</li>
</ul>
</div>
</body>
";
} }

BIN
Electrical_inspectionCompetitionSystem/Assets/Textures/切图-2/底框-2.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 23 KiB

147
Electrical_inspectionCompetitionSystem/Assets/Textures/切图-2/底框-2.png.meta
View File

@ -1,147 +0,0 @@
fileFormatVersion: 2
guid: 82ea5eb356a6ccf4689b59042739154a
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 12
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMasterTextureLimit: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
cookieLightType: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Server
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: WebGL
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
nameFileIdTable: {}
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

BIN
Electrical_inspectionCompetitionSystem/Assets/Textures/底框-2.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 23 KiB

147
Electrical_inspectionCompetitionSystem/Assets/Textures/底框-2.png.meta
View File

@ -1,147 +0,0 @@
fileFormatVersion: 2
guid: 6bdaa1e1cf231284685da170dba13ee9
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 12
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMasterTextureLimit: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
cookieLightType: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Server
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: WebGL
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
nameFileIdTable: {}
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

8
Electrical_inspectionCompetitionSystem/Packages/packages-lock.json
View File

@ -35,12 +35,12 @@
"source": "builtin", "source": "builtin",
"dependencies": { "dependencies": {
"com.unity.ide.visualstudio": "2.0.16", "com.unity.ide.visualstudio": "2.0.16",
"com.unity.ide.rider": "3.0.15", "com.unity.ide.rider": "3.0.16",
"com.unity.ide.vscode": "1.2.5", "com.unity.ide.vscode": "1.2.5",
"com.unity.editorcoroutines": "1.0.0", "com.unity.editorcoroutines": "1.0.0",
"com.unity.performance.profile-analyzer": "1.1.1", "com.unity.performance.profile-analyzer": "1.1.1",
"com.unity.test-framework": "1.1.31", "com.unity.test-framework": "1.1.31",
"com.unity.testtools.codecoverage": "1.0.1" "com.unity.testtools.codecoverage": "1.2.2"
} }
}, },
"com.unity.ide.rider": { "com.unity.ide.rider": {
@ -92,7 +92,7 @@
"url": "https://packages.unity.cn" "url": "https://packages.unity.cn"
}, },
"com.unity.services.core": { "com.unity.services.core": {
"version": "1.4.2", "version": "1.6.0",
"depth": 1, "depth": 1,
"source": "registry", "source": "registry",
"dependencies": { "dependencies": {
@ -121,7 +121,7 @@
"url": "https://packages.unity.cn" "url": "https://packages.unity.cn"
}, },
"com.unity.testtools.codecoverage": { "com.unity.testtools.codecoverage": {
"version": "1.0.1", "version": "1.2.2",
"depth": 1, "depth": 1,
"source": "registry", "source": "registry",
"dependencies": { "dependencies": {

4
Electrical_inspectionCompetitionSystem/ProjectSettings/ProjectVersion.txt
View File

@ -1,2 +1,2 @@
m_EditorVersion: 2021.3.10f1c2 m_EditorVersion: 2021.3.15f1c1
m_EditorVersionWithRevision: 2021.3.10f1c2 (5a059dbcdda5) m_EditorVersionWithRevision: 2021.3.15f1c1 (080beb55ecda)

1
Electrical_inspectionCompetitionSystem/ProjectSettings/TagManager.asset
View File

@ -14,7 +14,6 @@ TagManager:
- Line - Line
- "\u65CB\u8F6C" - "\u65CB\u8F6C"
- FuAnBiao - FuAnBiao
- AllTools
layers: layers:
- Default - Default
- TransparentFX - TransparentFX