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

修改jobcard

This commit is contained in:
YangHua 2023-09-17 23:19:37 +08:00
parent 228070da3f
commit 98e448f34c
16 changed files with 372 additions and 189136 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Electrical_inspectionCompetitionSystem/Assets/Adam/Net/AsyncWebReq.cs
View File

@ -27,7 +27,7 @@ public static class AsyncWebReq
public static void SetValue(string jsonStr, out JObject _jbsx, out JObject _jsxx, out List<JObject> _jlzzxx)
{
var json = JsonConvert.DeserializeObject<Dictionary<string, object>>(jsonStr);
var data = json["datas"] as JObject;
var data = json["data"] as JObject;
var jbsxArr = data["jbsx"] as JArray;
var jbsx = jbsxArr[0] as JObject;

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

@ -155,7 +155,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: "\u4F7F\u7528\u4E0D\u5408\u683C\u7684\u4E2A\u4EBA\u9632\u62A4\u7528\u54C1\uFF0C\u6216\u4F7F\u7528\u7684\u9632\u62A4\u7528\u54C1\u4E0D\u9F50\u5168\u3002\u8FDB\u5165\u4F5C\u4E1A\u73B0\u573A\u672A\u6309\u89C4\u5B9A\u6B63\u786E\u4F69\u6234\u5B89\u5168\u5E3D\u3001\u7740\u88C5\u3002"
m_Text:
--- !u!1 &7841566711167579073
GameObject:
m_ObjectHideFlags: 0
@ -235,7 +235,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: 1
m_Text:
--- !u!1 &7841566712123838755
GameObject:
m_ObjectHideFlags: 0

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

File diff suppressed because it is too large Load Diff

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

@ -1,9 +1,12 @@
using HighlightingSystem;
using System.Collections;
using System.Collections.Generic;
using UnityEditor.SceneManagement;
using UnityEditor.SearchService;
using UnityEngine;
using UnityEngine.Events;
using UnityEngine.EventSystems;
using UnityEngine.SceneManagement;
//============================================================
//支持中文，文件使用UTF-8编码
//@author #AUTHOR#
@ -86,7 +89,9 @@ public class ToolModelClick : MonoBehaviour
if (EventSystem.current.IsPointerOverGameObject())
return;
onEnter?.Invoke();
UIManager.Instance.SetThreeDTip(gameObject.name);
var current = SceneManager.GetActiveScene();
if (current.name == "工具间场景")
UIManager.Instance.SetThreeDTip(gameObject.name);
//tip = Instantiate(tipPrefab);
//tip.GetComponentInChildren<TextMesh>().text = gameObject.name;
//tip.transform.localPosition = transform.localPosition;
@ -101,6 +106,7 @@ public class ToolModelClick : MonoBehaviour
return;
onDown?.Invoke();
ToolsItemManager.Instance.CreatToolItem(gameObject);
UIManager.Instance.SetThreeDTip("");
Destroy(gameObject);
}

8
Electrical_inspectionCompetitionSystem/Assets/Adam/Scripts/Data/JobCardData.cs
View File

@ -25,4 +25,12 @@ namespace JData
public string name;
public string adress;
}
[Serializable]
public class AQCSandFXDFX
{
public string state;
public string message;
public string[] data;
}
}

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

@ -16,7 +16,8 @@ namespace Adam
{
public class JobCardController : MonoBehaviour
{
public string url;
public string nameAndAdressUrl;
public string aqcsAndFxdfxUrl;
public InputField[] userIDs;
public InputField[] userNames;
public InputField[] workSpace;
@ -43,9 +44,14 @@ namespace Adam
GetValue(numb, index);
});
}
RiskPointAnalysisBtn.onClick.AddListener(() =>
{
OnClick(0);
});
SafetyMeasuresBtn.onClick.AddListener(() =>
{
OnClick(1);
});
jobCardPanel.SetActive(false);
jobChoiceQuestionPanel.SetActive(false);
}
@ -53,7 +59,7 @@ namespace Adam
public async void GetValue(string numb, int _index)
{
Debug.Log(numb);
string _url = url + numb;
string _url = nameAndAdressUrl + numb;
JobCardData jData = await AsyncWebReq.Get<JobCardData>(_url);
userNames[_index].text = jData.data.name;
workSpace[_index].text = jData.data.adress;
@ -68,16 +74,34 @@ namespace Adam
jobChoiceQuestionPanel.SetActive(true);
if (index == 0)
{
GetAQCSandFXDFX("FXDFX");
}
else if (index == 1)
{
GetAQCSandFXDFX("AQCS");
}
else
{
}
}
private async void GetAQCSandFXDFX(string name)
{
if (optionItemContent.childCount > 0)
{
for (int i = 0; i < optionItemContent.childCount; i++)
{
Destroy(optionItemContent.GetChild(i).gameObject);
}
}
AQCSandFXDFX af = await AsyncWebReq.Get<AQCSandFXDFX>(aqcsAndFxdfxUrl + name);
for (int i = 0; i < af.data.Length; i++)
{
int index = i;
OptionItem optionItemTemp = Instantiate(optionItemPrefab, optionItemContent);
optionItemTemp.SetValue(index.ToString(), af.data[i]);
}
}
}
}

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

@ -45,6 +45,8 @@ public class MobileTerminalController : MonoBehaviour
public JObject jbxx;
public List<JObject> jlzzxx = new List<JObject>();
public bool isOnLoad = false;
// Use this for initialization
private void Start()
{
@ -56,6 +58,14 @@ public class MobileTerminalController : MonoBehaviour
public async void OnUser()
{
if (userContent.childCount > 0)
{
for (int i = 0; i < userContent.childCount; i++)
{
Destroy(userContent.GetChild(i).gameObject);
}
}
isOnLoad = true;
string url = userViewUrl + number.text;
mData = await AsyncWebReq.Get<UserViewData>(url);
string jsonData = JsonConvert.SerializeObject(mData);
@ -84,10 +94,20 @@ public class MobileTerminalController : MonoBehaviour
itemTip.SetValue(info);
}
}
SwitchView(0);
isOnLoad = false;
}
public async void OnTable()
{
if (tapContent.childCount > 0)
{
for (int i = 0; i < tapContent.childCount; i++)
{
Destroy(tapContent.GetChild(i).gameObject);
}
}
isOnLoad = true;
string url = tabelViewUrl + number.text;
tData = await AsyncWebReq.Get<TableViewData>(url);
for (int i = 0; i < tData.data.Count; i++)
@ -95,6 +115,8 @@ public class MobileTerminalController : MonoBehaviour
MobileTerminalTipsItem itemTip = Instantiate(itemPrfab, tapContent);
itemTip.SetValue(tData.data[i]);
}
SwitchView(1);
isOnLoad = false;
}
@ -103,16 +125,20 @@ public class MobileTerminalController : MonoBehaviour
/// </summary>
public void OnElectricitView()
{
SwitchView(0);
if(isOnLoad ) return;
if (number.text == "") return;
OnUser();
}
/// <summary>
/// 表记数据
/// </summary>
public void OnOutsideView()
{
SwitchView(1);
if (isOnLoad) return;
if (number.text == "") return;
OnTable();
}

8
Electrical_inspectionCompetitionSystem/Assets/GameAssets/Shader.meta Normal file
View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 55c574ae4bf656946a6e26101141fce1
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

98
Electrical_inspectionCompetitionSystem/Assets/GameAssets/Shader/PBR Material Double.shader Normal file
View File

@ -0,0 +1,98 @@
// Made with Amplify Shader Editor
// Available at the Unity Asset Store - http://u3d.as/y3X
Shader "PBR Material Double"
{
Properties
{
_AlbedoTex("Albedo Tex", 2D) = "white" {}
_BaseCol("Base Col", Color) = (0,0,0,0)
_MetalRoughnessAo("Metal&Roughness&Ao", 2D) = "white" {}
_MetalInt("Metal Int", Range( 0 , 1)) = 0
_RoughnessInt("Roughness Int", Range( 0 , 1)) = 0
_NormalTex("Normal Tex", 2D) = "bump" {}
_NormalInt("Normal Int", Range( 0 , 3)) = 1
[HideInInspector] _texcoord( "", 2D ) = "white" {}
[HideInInspector] __dirty( "", Int ) = 1
}
SubShader
{
Tags{ "RenderType" = "Opaque" "Queue" = "Geometry+0" }
Cull Off
CGPROGRAM
#pragma target 3.0
#pragma surface surf Standard keepalpha addshadow fullforwardshadows
struct Input
{
float2 uv_texcoord;
};
uniform sampler2D _NormalTex;
uniform float4 _NormalTex_ST;
uniform float _NormalInt;
uniform sampler2D _AlbedoTex;
uniform float4 _AlbedoTex_ST;
uniform float4 _BaseCol;
uniform sampler2D _MetalRoughnessAo;
uniform float4 _MetalRoughnessAo_ST;
uniform float _MetalInt;
uniform float _RoughnessInt;
void surf( Input i , inout SurfaceOutputStandard o )
{
float2 uv_NormalTex = i.uv_texcoord * _NormalTex_ST.xy + _NormalTex_ST.zw;
float3 tex2DNode8 = UnpackNormal( tex2D( _NormalTex, uv_NormalTex ) );
float3 appendResult46 = (float3(( tex2DNode8.r * _NormalInt ) , ( tex2DNode8.g * _NormalInt ) , tex2DNode8.b));
o.Normal = appendResult46;
float2 uv_AlbedoTex = i.uv_texcoord * _AlbedoTex_ST.xy + _AlbedoTex_ST.zw;
o.Albedo = ( tex2D( _AlbedoTex, uv_AlbedoTex ) * _BaseCol ).rgb;
float2 uv_MetalRoughnessAo = i.uv_texcoord * _MetalRoughnessAo_ST.xy + _MetalRoughnessAo_ST.zw;
float4 tex2DNode20 = tex2D( _MetalRoughnessAo, uv_MetalRoughnessAo );
o.Metallic = ( tex2DNode20.r * _MetalInt );
o.Smoothness = ( ( 1.0 - tex2DNode20.g ) * _RoughnessInt );
o.Alpha = 1;
}
ENDCG
}
Fallback "Diffuse"
CustomEditor "ASEMaterialInspector"
}
/*ASEBEGIN
Version=18935
7;32;1906;957;1284.882;143.6796;1;True;True
Node;AmplifyShaderEditor.SamplerNode;20;-1241.862,645.8665;Inherit;True;Property;_MetalRoughnessAo;Metal&Roughness&Ao;2;0;Create;True;0;0;0;False;0;False;-1;None;None;True;0;False;white;Auto;False;Object;-1;Auto;Texture2D;8;0;SAMPLER2D;;False;1;FLOAT2;0,0;False;2;FLOAT;0;False;3;FLOAT2;0,0;False;4;FLOAT2;0,0;False;5;FLOAT;1;False;6;FLOAT;0;False;7;SAMPLERSTATE;;False;5;COLOR;0;FLOAT;1;FLOAT;2;FLOAT;3;FLOAT;4
Node;AmplifyShaderEditor.SamplerNode;8;-1234.574,144.0176;Inherit;True;Property;_NormalTex;Normal Tex;5;0;Create;True;0;0;0;False;0;False;-1;None;None;True;0;True;bump;Auto;True;Object;-1;Auto;Texture2D;8;0;SAMPLER2D;;False;1;FLOAT2;0,0;False;2;FLOAT;0;False;3;FLOAT2;0,0;False;4;FLOAT2;0,0;False;5;FLOAT;1;False;6;FLOAT;0;False;7;SAMPLERSTATE;;False;5;FLOAT3;0;FLOAT;1;FLOAT;2;FLOAT;3;FLOAT;4
Node;AmplifyShaderEditor.RangedFloatNode;9;-1128.477,366.8184;Inherit;False;Property;_NormalInt;Normal Int;6;0;Create;True;0;0;0;False;0;False;1;1;0;3;0;1;FLOAT;0
Node;AmplifyShaderEditor.ColorNode;26;-781.6854,-48.21597;Inherit;False;Property;_BaseCol;Base Col;1;0;Create;True;0;0;0;False;0;False;0,0,0,0;1,1,1,0;True;0;5;COLOR;0;FLOAT;1;FLOAT;2;FLOAT;3;FLOAT;4
Node;AmplifyShaderEditor.SamplerNode;6;-840.9681,-331.2638;Inherit;True;Property;_AlbedoTex;Albedo Tex;0;0;Create;True;0;0;0;False;0;False;-1;None;None;True;0;False;white;Auto;False;Object;-1;Auto;Texture2D;8;0;SAMPLER2D;;False;1;FLOAT2;0,0;False;2;FLOAT;0;False;3;FLOAT2;0,0;False;4;FLOAT2;0,0;False;5;FLOAT;1;False;6;FLOAT;0;False;7;SAMPLERSTATE;;False;5;COLOR;0;FLOAT;1;FLOAT;2;FLOAT;3;FLOAT;4
Node;AmplifyShaderEditor.OneMinusNode;22;-652.2739,715.7665;Inherit;True;1;0;FLOAT;0;False;1;FLOAT;0
Node;AmplifyShaderEditor.SimpleMultiplyOpNode;10;-796.6078,191.0359;Inherit;True;2;2;0;FLOAT;0;False;1;FLOAT;0;False;1;FLOAT;0
Node;AmplifyShaderEditor.SimpleMultiplyOpNode;47;-801.7852,346.0115;Inherit;True;2;2;0;FLOAT;0;False;1;FLOAT;0;False;1;FLOAT;0
Node;AmplifyShaderEditor.RangedFloatNode;24;-715.1262,633.2165;Inherit;False;Property;_MetalInt;Metal Int;3;0;Create;True;0;0;0;False;0;False;0;1;0;1;0;1;FLOAT;0
Node;AmplifyShaderEditor.RangedFloatNode;25;-885.366,951.3416;Inherit;False;Property;_RoughnessInt;Roughness Int;4;0;Create;True;0;0;0;False;0;False;0;1;0;1;0;1;FLOAT;0
Node;AmplifyShaderEditor.SimpleMultiplyOpNode;19;-484.0583,-129.0162;Inherit;False;2;2;0;COLOR;0,0,0,0;False;1;COLOR;0,0,0,0;False;1;COLOR;0
Node;AmplifyShaderEditor.SimpleMultiplyOpNode;23;-389.6737,734.6655;Inherit;False;2;2;0;FLOAT;0;False;1;FLOAT;0;False;1;FLOAT;0
Node;AmplifyShaderEditor.SimpleMultiplyOpNode;21;-399.323,562.252;Inherit;False;2;2;0;FLOAT;0;False;1;FLOAT;0;False;1;FLOAT;0
Node;AmplifyShaderEditor.DynamicAppendNode;46;-490.7852,261.0115;Inherit;True;FLOAT3;4;0;FLOAT;0;False;1;FLOAT;0;False;2;FLOAT;0;False;3;FLOAT;0;False;1;FLOAT3;0
Node;AmplifyShaderEditor.StandardSurfaceOutputNode;45;-42.33704,350.6596;Float;False;True;-1;2;ASEMaterialInspector;0;0;Standard;PBR Material alphamask;False;False;False;False;False;False;False;False;False;False;False;False;False;False;False;False;False;False;False;False;False;Off;0;False;-1;0;False;-1;False;0;False;-1;0;False;-1;False;0;Opaque;0.5;True;True;0;True;Opaque;;Geometry;All;18;all;True;True;True;True;0;False;-1;False;0;False;-1;255;False;-1;255;False;-1;0;False;-1;0;False;-1;0;False;-1;0;False;-1;0;False;-1;0;False;-1;0;False;-1;0;False;-1;False;2;15;10;25;False;0.5;True;0;0;False;-1;0;False;-1;0;0;False;-1;0;False;-1;0;False;-1;0;False;-1;0;False;0;0,0,0,0;VertexOffset;True;False;Cylindrical;False;True;Relative;0;;0;-1;-1;-1;0;False;0;0;False;-1;-1;0;False;-1;0;0;0;False;0.1;False;-1;0;False;-1;False;16;0;FLOAT3;0,0,0;False;1;FLOAT3;0,0,0;False;2;FLOAT3;0,0,0;False;3;FLOAT;0;False;4;FLOAT;0;False;5;FLOAT;0;False;6;FLOAT3;0,0,0;False;7;FLOAT3;0,0,0;False;8;FLOAT;0;False;9;FLOAT;0;False;10;FLOAT;0;False;13;FLOAT3;0,0,0;False;11;FLOAT3;0,0,0;False;12;FLOAT3;0,0,0;False;14;FLOAT4;0,0,0,0;False;15;FLOAT3;0,0,0;False;0
WireConnection;22;0;20;2
WireConnection;10;0;8;1
WireConnection;10;1;9;0
WireConnection;47;0;8;2
WireConnection;47;1;9;0
WireConnection;19;0;6;0
WireConnection;19;1;26;0
WireConnection;23;0;22;0
WireConnection;23;1;25;0
WireConnection;21;0;20;1
WireConnection;21;1;24;0
WireConnection;46;0;10;0
WireConnection;46;1;47;0
WireConnection;46;2;8;3
WireConnection;45;0;19;0
WireConnection;45;1;46;0
WireConnection;45;3;21;0
WireConnection;45;4;23;0
ASEEND*/
//CHKSM=D069092E7C6DE57D0C1B90DD8E564D89F8EEA8C7

10
Electrical_inspectionCompetitionSystem/Assets/GameAssets/Shader/PBR Material Double.shader.meta Normal file
View File

@ -0,0 +1,10 @@
fileFormatVersion: 2
guid: 516b27481105fed4aa34f2f6f76ee42d
ShaderImporter:
externalObjects: {}
defaultTextures: []
nonModifiableTextures: []
preprocessorOverride: 0
userData:
assetBundleName:
assetBundleVariant:

65
Electrical_inspectionCompetitionSystem/Assets/Models/工具/Material/STC_boot_a.mat
View File

@ -8,7 +8,7 @@ Material:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: STC_boot_a
m_Shader: {fileID: 47, guid: 0000000000000000f000000000000000, type: 0}
m_Shader: {fileID: 4800000, guid: 516b27481105fed4aa34f2f6f76ee42d, type: 3}
m_ValidKeywords: []
m_InvalidKeywords: []
m_LightmapFlags: 4
@ -20,6 +20,10 @@ Material:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _AlbedoTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _BumpMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
@ -44,10 +48,18 @@ Material:
m_Texture: {fileID: 2800000, guid: c17d3bf5879d0fa4a9c6d9c35f7cb934, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetalRoughnessAo:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _NormalTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _OcclusionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
@ -60,6 +72,42 @@ Material:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _SubTex_D:
m_Texture: {fileID: 2800000, guid: cf116e2af7b13fa47a1e004a385d5e65, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _SubTex_alpha:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _Tex_D:
m_Texture: {fileID: 2800000, guid: c17d3bf5879d0fa4a9c6d9c35f7cb934, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _Tex_E:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _Tex_MRao:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _Tex_N1:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _Tex_N2:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _texcoord:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _texcoord2:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _BumpScale: 1
@ -69,16 +117,31 @@ Material:
- _GlossMapScale: 1
- _Glossiness: 0.5
- _GlossyReflections: 1
- _Int_M: 1
- _Int_N1: 1
- _Int_N2: 1
- _Int_R: 1
- _Int_ao: 1
- _MetalInt: 0
- _Metallic: 0
- _Mode: 0
- _NormalInt: 1
- _OcclusionStrength: 1
- _Parallax: 0.02
- _RoughnessInt: 0
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
- _SubTex_alpha_Int: 1
- _UVRolate: 0
- _UVSec: 0
- _ZWrite: 1
- __dirty: 1
m_Colors:
- _BaseCol: {r: 0, g: 0, b: 0, a: 0}
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _Int_E: {r: 0, g: 0, b: 0, a: 0}
- _MainCol: {r: 1, g: 1, b: 1, a: 0}
- _SubCol: {r: 1, g: 1, b: 1, a: 0}
m_BuildTextureStacks: []

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

@ -3047,7 +3047,7 @@ RectTransform:
m_LocalScale: {x: 0, y: 0, z: 0}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 1374127874211543270}
- {fileID: 1214987529}
m_Father: {fileID: 0}
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -3068,6 +3068,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 2ef62ef58861f594ca67aff0391b0765, type: 3}
m_Name:
m_EditorClassIdentifier:
browser: {fileID: 0}
--- !u!1001 &379696848
PrefabInstance:
m_ObjectHideFlags: 0
@ -4813,6 +4814,11 @@ MeshCollider:
m_Convex: 0
m_CookingOptions: 30
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
GameObject:
m_ObjectHideFlags: 0
@ -5674,6 +5680,76 @@ Transform:
m_CorrespondingSourceObject: {fileID: 8218745123122009150, guid: 4b06ca5b0865ade40b27cf11a123ba5c, type: 3}
m_PrefabInstance: {fileID: 1172275066}
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
GameObject:
m_ObjectHideFlags: 0
@ -5911,8 +5987,8 @@ BoxCollider:
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 2
m_Size: {x: 1, y: 1, z: 1}
m_Center: {x: 0, y: 0, z: 0}
m_Size: {x: 0.43, y: 0.53, z: 1}
m_Center: {x: 0.17, y: 0.72, z: 0}
--- !u!23 &1265359518
MeshRenderer:
m_ObjectHideFlags: 0
@ -6053,7 +6129,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 936e1a57cc0a2944a89d7b1617875726, type: 3}
m_Name:
m_EditorClassIdentifier:
game: {fileID: 333646762}
game: {fileID: 786522454}
name: Computer
url: http://192.168.0.104:8089/
--- !u!1001 &1266954248
@ -9127,132 +9203,6 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 061d6d00bef6ce24d9995b7112c4d36c, type: 3}
--- !u!1001 &1374127874211543266
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 333646761}
m_Modifications:
- target: {fileID: 5863485535301246022, guid: 9d013d05025dab8428d976610feb0b7d, type: 3}
propertyPath: m_Pivot.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 5863485535301246022, guid: 9d013d05025dab8428d976610feb0b7d, type: 3}
propertyPath: m_Pivot.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 5863485535301246022, guid: 9d013d05025dab8428d976610feb0b7d, type: 3}
propertyPath: m_RootOrder
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5863485535301246022, guid: 9d013d05025dab8428d976610feb0b7d, type: 3}
propertyPath: m_AnchorMax.x
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5863485535301246022, guid: 9d013d05025dab8428d976610feb0b7d, type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5863485535301246022, guid: 9d013d05025dab8428d976610feb0b7d, type: 3}
propertyPath: m_AnchorMin.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5863485535301246022, guid: 9d013d05025dab8428d976610feb0b7d, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5863485535301246022, guid: 9d013d05025dab8428d976610feb0b7d, type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5863485535301246022, guid: 9d013d05025dab8428d976610feb0b7d, type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5863485535301246022, guid: 9d013d05025dab8428d976610feb0b7d, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5863485535301246022, guid: 9d013d05025dab8428d976610feb0b7d, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5863485535301246022, guid: 9d013d05025dab8428d976610feb0b7d, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5863485535301246022, guid: 9d013d05025dab8428d976610feb0b7d, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5863485535301246022, guid: 9d013d05025dab8428d976610feb0b7d, type: 3}
propertyPath: m_LocalRotation.x
value: -0
objectReference: {fileID: 0}
- target: {fileID: 5863485535301246022, guid: 9d013d05025dab8428d976610feb0b7d, type: 3}
propertyPath: m_LocalRotation.y
value: -0
objectReference: {fileID: 0}
- target: {fileID: 5863485535301246022, guid: 9d013d05025dab8428d976610feb0b7d, type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: 5863485535301246022, guid: 9d013d05025dab8428d976610feb0b7d, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5863485535301246022, guid: 9d013d05025dab8428d976610feb0b7d, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5863485535301246022, guid: 9d013d05025dab8428d976610feb0b7d, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5863485535301246022, guid: 9d013d05025dab8428d976610feb0b7d, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5863485535301246022, guid: 9d013d05025dab8428d976610feb0b7d, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5863485535301246023, guid: 9d013d05025dab8428d976610feb0b7d, type: 3}
propertyPath: _url
value: http://192.168.0.104:8089/index.html
objectReference: {fileID: 0}
- target: {fileID: 5863485535301246023, guid: 9d013d05025dab8428d976610feb0b7d, type: 3}
propertyPath: newWindowAction
value: 2
objectReference: {fileID: 0}
- target: {fileID: 5863485535301246023, guid: 9d013d05025dab8428d976610feb0b7d, type: 3}
propertyPath: allowContextMenuOn
value: 2
objectReference: {fileID: 0}
- target: {fileID: 5863485535498290377, guid: 9d013d05025dab8428d976610feb0b7d, type: 3}
propertyPath: m_Color.a
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5863485535498290377, guid: 9d013d05025dab8428d976610feb0b7d, type: 3}
propertyPath: m_Texture
value:
objectReference: {fileID: 2800000, guid: 30a28a853ae87d44bab2c4bdc861c40d, type: 3}
- target: {fileID: 5863485535498290381, guid: 9d013d05025dab8428d976610feb0b7d, type: 3}
propertyPath: m_Name
value: BrowserGUI
objectReference: {fileID: 0}
- target: {fileID: 5863485535498290381, guid: 9d013d05025dab8428d976610feb0b7d, type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 9d013d05025dab8428d976610feb0b7d, type: 3}
--- !u!224 &1374127874211543270 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 5863485535301246022, guid: 9d013d05025dab8428d976610feb0b7d, type: 3}
m_PrefabInstance: {fileID: 1374127874211543266}
m_PrefabAsset: {fileID: 0}
--- !u!4 &2215526161519943756 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 4784785834146791166, guid: 17cbfcd8168615542b3c8ec8aab874f3, type: 3}

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

@ -3,7 +3,7 @@ using UnityEngine.EventSystems;
public class newfollow : MonoBehaviour
{
[SerializeField] testURL game;
[SerializeField] GameObject game;
[SerializeField] string name;
public string url;
//[SerializeField] Dialogue dialogue;
@ -34,7 +34,7 @@ public class newfollow : MonoBehaviour
if (hit.transform.name.Equals(name))
{
Debug.Log(hit.transform.name);
//game.gameObject.SetActive(true);
game.SetActive(true);
//game.init(url);
}
}

14
Electrical_inspectionCompetitionSystem/Assets/Script/KDLURL/testURL.cs
View File

@ -2,13 +2,11 @@ using UnityEngine;
public class testURL : MonoBehaviour
{
//[SerializeField] Browser browser;
//public void init(string urls)
//{
// browser.gameObject.SetActive(true);
// browser.Url = urls;
[SerializeField] GameObject browser;
public void init(string urls)
{
browser.gameObject.SetActive(true);
// //Application.OpenURL(urls);
//}
//Application.OpenURL(urls);
}
}

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

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

6
Electrical_inspectionCompetitionSystem/ProjectSettings/EditorBuildSettings.asset
View File

@ -14,9 +14,6 @@ EditorBuildSettings:
- enabled: 1
path: "Assets/Scenes/\u5DE5\u5177\u95F4\u573A\u666F.unity"
guid: 9c3f2fccc37312b468a01a18ac50fcd9
- enabled: 1
path: "Assets/Scenes/\u519C\u5BB6\u4E50.unity"
guid: 078bf002eeddc4148b312262d92ea4a2
- enabled: 1
path: "Assets/Scenes/\u519C\u8D38\u5E02\u573A.unity"
guid: 8f5e8de28c5defb4cafaabb4ec174d27
@ -26,4 +23,7 @@ EditorBuildSettings:
- enabled: 1
path: "Assets/Scenes/\u5C45\u6C11\u81EA\u5EFA.unity"
guid: fe407f4f4fc16f84d875eb2e09717046
- enabled: 1
path: "Assets/Scenes/\u519C\u5BB6\u4E50.unity"
guid: de0336ee94e67ab4c833d43d5a4b97bc
m_configObjects: {}