diff --git a/Electrical_inspectionCompetitionSystem/Assets/GameAssets/Models/电箱(new)/Prefeb/单相_无互感器_有光伏.prefab b/Electrical_inspectionCompetitionSystem/Assets/GameAssets/Models/电箱(new)/Prefeb/单相_无互感器_有光伏.prefab index de474449..223aac7d 100644 --- a/Electrical_inspectionCompetitionSystem/Assets/GameAssets/Models/电箱(new)/Prefeb/单相_无互感器_有光伏.prefab +++ b/Electrical_inspectionCompetitionSystem/Assets/GameAssets/Models/电箱(new)/Prefeb/单相_无互感器_有光伏.prefab @@ -1,5 +1,50 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &284864667639834943 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2919005314259790826} + - component: {fileID: 3028566126118351660} + m_Layer: 0 + m_Name: Cube + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2919005314259790826 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 284864667639834943} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -0.0355, y: 0.1087, z: -0.0021} + m_LocalScale: {x: 0.01, y: 0.01, z: 0.01} + m_ConstrainProportionsScale: 1 + m_Children: [] + m_Father: {fileID: 1434602599722766365} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &3028566126118351660 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 284864667639834943} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} --- !u!1 &699353602800155858 GameObject: m_ObjectHideFlags: 0 @@ -27,14 +72,14 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 699353602800155858} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: 0, y: -0.7071068, z: 0, w: 0.7071068} m_LocalPosition: {x: 0, y: -0.0606, z: -0.0304} m_LocalScale: {x: 0.009, y: 0.009, z: 0.009} m_ConstrainProportionsScale: 1 m_Children: [] m_Father: {fileID: 3029266579700243777} m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: -90, z: 0} --- !u!33 &1079285098349241717 MeshFilter: m_ObjectHideFlags: 0 @@ -453,14 +498,14 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1757676684949832639} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: 0, y: -0.7071068, z: 0, w: 0.7071068} m_LocalPosition: {x: 0, y: -0.0606, z: 0.0109} m_LocalScale: {x: 0.009, y: 0.009, z: 0.009} m_ConstrainProportionsScale: 1 m_Children: [] m_Father: {fileID: 3029266579700243777} m_RootOrder: 3 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: -90, z: 0} --- !u!33 &4628586173486354202 MeshFilter: m_ObjectHideFlags: 0 @@ -569,14 +614,14 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2692389484424302406} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: 0, y: -0.7071068, z: 0, w: 0.7071068} m_LocalPosition: {x: 0, y: -0.0499, z: 0.0109} m_LocalScale: {x: 0.009, y: 0.009, z: 0.009} m_ConstrainProportionsScale: 1 m_Children: [] m_Father: {fileID: 3029266579700243777} m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: -90, z: 0} --- !u!33 &6744837672508309354 MeshFilter: m_ObjectHideFlags: 0 @@ -774,6 +819,51 @@ MonoBehaviour: isBlack: 1 VV: isok: 0 +--- !u!1 &4314420011960450739 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3713615207994056577} + - component: {fileID: 646798572608906922} + m_Layer: 0 + m_Name: Cube (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3713615207994056577 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4314420011960450739} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0.02996826, y: 0.041280627, z: -0.00060272403} + m_LocalScale: {x: 0.009999999, y: 0.01, z: 0.009999999} + m_ConstrainProportionsScale: 1 + m_Children: [] + m_Father: {fileID: 1511290193069867435} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &646798572608906922 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4314420011960450739} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} --- !u!1 &4737607472722466619 GameObject: m_ObjectHideFlags: 0 @@ -948,14 +1038,14 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5244788499349936014} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: 0, y: -0.7071068, z: 0, w: 0.7071068} m_LocalPosition: {x: 0, y: -0.0499, z: -0.0304} m_LocalScale: {x: 0.009, y: 0.009, z: 0.009} m_ConstrainProportionsScale: 1 m_Children: [] m_Father: {fileID: 3029266579700243777} m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: -90, z: 0} --- !u!33 &8865059284243750522 MeshFilter: m_ObjectHideFlags: 0 @@ -1864,6 +1954,16 @@ MonoBehaviour: m_EditorClassIdentifier: name: "\u76D6\u5B50" ammeterSon: {fileID: 0} +--- !u!4 &1434602599722766365 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8601114846348070795, guid: 1d8bc851bde52b94c86fa0702f2d840b, type: 3} + m_PrefabInstance: {fileID: 1966393981994950760} + m_PrefabAsset: {fileID: 0} +--- !u!4 &1511290193069867435 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8092081753198403133, guid: 1d8bc851bde52b94c86fa0702f2d840b, type: 3} + m_PrefabInstance: {fileID: 1966393981994950760} + m_PrefabAsset: {fileID: 0} --- !u!1 &1643495785429700410 stripped GameObject: m_CorrespondingSourceObject: {fileID: -8249232922227904686, guid: 1d8bc851bde52b94c86fa0702f2d840b, type: 3} @@ -1993,20 +2093,6 @@ GameObject: m_CorrespondingSourceObject: {fileID: 3943071812045326304, guid: 1d8bc851bde52b94c86fa0702f2d840b, type: 3} m_PrefabInstance: {fileID: 1966393981994950760} m_PrefabAsset: {fileID: 0} ---- !u!114 &9095878145136858010 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3310869219693242248} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 1b7105d1f10415c419458fa7df96cb55, type: 3} - m_Name: - m_EditorClassIdentifier: - name: - ammeterSon: {fileID: 0} --- !u!64 &5080073445070454424 MeshCollider: m_ObjectHideFlags: 0 @@ -2021,6 +2107,20 @@ MeshCollider: m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 1128634411964411327, guid: 1d8bc851bde52b94c86fa0702f2d840b, type: 3} +--- !u!114 &9095878145136858010 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3310869219693242248} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1b7105d1f10415c419458fa7df96cb55, type: 3} + m_Name: + m_EditorClassIdentifier: + name: + ammeterSon: {fileID: 0} --- !u!4 &3556094348336752178 stripped Transform: m_CorrespondingSourceObject: {fileID: 3031978151336248922, guid: 1d8bc851bde52b94c86fa0702f2d840b, type: 3} @@ -2058,7 +2158,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: isInteractive: 0 - g1: {fileID: 0} + g1: {fileID: 284864667639834943} name: "\u7528\u7535_AA3" linearMeasure: 0 floats: [] @@ -2230,7 +2330,7 @@ MeshCollider: m_IsTrigger: 0 m_Enabled: 1 serializedVersion: 4 - m_Convex: 1 + m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 5425504016342940380, guid: 1d8bc851bde52b94c86fa0702f2d840b, type: 3} --- !u!114 &5025331774182887892 @@ -2284,25 +2384,6 @@ GameObject: m_CorrespondingSourceObject: {fileID: -784301737186689897, guid: 1d8bc851bde52b94c86fa0702f2d840b, type: 3} m_PrefabInstance: {fileID: 1966393981994950760} m_PrefabAsset: {fileID: 0} ---- !u!114 &5277972133745941679 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7950983445147393279} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 9771fe28a2d2ef14fb81137b5f350275, type: 3} - m_Name: - m_EditorClassIdentifier: - isInteractive: 0 - g1: {fileID: 0} - name: "\u7528\u7535_AA3" - linearMeasure: 0 - floats: [] - Fuan: - unit: --- !u!64 &4995171172867849594 MeshCollider: m_ObjectHideFlags: 0 @@ -2317,6 +2398,25 @@ MeshCollider: m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: -2815209688772521933, guid: 1d8bc851bde52b94c86fa0702f2d840b, type: 3} +--- !u!114 &5277972133745941679 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7950983445147393279} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9771fe28a2d2ef14fb81137b5f350275, type: 3} + m_Name: + m_EditorClassIdentifier: + isInteractive: 0 + g1: {fileID: 4314420011960450739} + name: "\u7528\u7535_AA3" + linearMeasure: 0 + floats: [] + Fuan: + unit: --- !u!1 &7983708125869743983 stripped GameObject: m_CorrespondingSourceObject: {fileID: -756080454203080953, guid: 1d8bc851bde52b94c86fa0702f2d840b, type: 3} diff --git a/Electrical_inspectionCompetitionSystem/Assets/Scenes/自建房.unity b/Electrical_inspectionCompetitionSystem/Assets/Scenes/自建房.unity index a213ca1c..5269f925 100644 --- a/Electrical_inspectionCompetitionSystem/Assets/Scenes/自建房.unity +++ b/Electrical_inspectionCompetitionSystem/Assets/Scenes/自建房.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.92655563, g: 0.9721449, b: 0.9455592, a: 1} + m_IndirectSpecularColor: {r: 0.91471344, g: 1.0185646, b: 0.94445914, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -98796,7 +98796,7 @@ MonoBehaviour: - {fileID: 7067006512732022887, guid: d5b330a2e78038440a252f22576f42a6, type: 3} - {fileID: 5869344655596831337, guid: 9d6d1b907a0e2f241b5ea21918dc1c57, type: 3} - {fileID: 4358485102403047296, guid: 0e90fa63ba3e56749b502a9a4e00b64f, type: 3} - - {fileID: 6770620356190950818, guid: 459f4a583dbdc294c8b8fe46bee0e180, type: 3} + - {fileID: 6770620356190950818, guid: 3f1b779e277f8e34f9589b937e2e1915, type: 3} trans: {fileID: 0} WanStopValve: {fileID: 1301637951} QianStopValve: {fileID: 634409734} diff --git a/Electrical_inspectionCompetitionSystem/Assets/Script/KDLURL/newfollow.cs b/Electrical_inspectionCompetitionSystem/Assets/Script/KDLURL/newfollow.cs index 46f276b3..eee149e9 100644 --- a/Electrical_inspectionCompetitionSystem/Assets/Script/KDLURL/newfollow.cs +++ b/Electrical_inspectionCompetitionSystem/Assets/Script/KDLURL/newfollow.cs @@ -1,3 +1,5 @@ +using System; +using System.Threading.Tasks; using UnityEngine; using UnityEngine.EventSystems; using Vuplex.WebView; @@ -42,7 +44,7 @@ public class newfollow : MonoBehaviour } } - private void CreatView() + private async void CreatView() { // Enable the native touch screen keyboard for Android and iOS. Web.SetTouchScreenKeyboardEnabled(true); @@ -99,6 +101,15 @@ public class newfollow : MonoBehaviour }; }; }; + await showAsync(); + } + async Task showAsync() + { + await Task.Delay(500); + await _focusedPrefab.WaitUntilInitialized(); + //await _focusedPrefab.WebView.WaitForNextPageLoadToFinish(); + var headerText = await _focusedPrefab.WebView.ExecuteJavaScript("toggleVisibility()"); + Debug.Log("H1 text: " + headerText); } const string NOT_SUPPORTED_HTML = @" diff --git a/Electrical_inspectionCompetitionSystem/ProjectSettings/EditorBuildSettings.asset b/Electrical_inspectionCompetitionSystem/ProjectSettings/EditorBuildSettings.asset index 01e5d9bd..0f988424 100644 --- a/Electrical_inspectionCompetitionSystem/ProjectSettings/EditorBuildSettings.asset +++ b/Electrical_inspectionCompetitionSystem/ProjectSettings/EditorBuildSettings.asset @@ -26,6 +26,9 @@ EditorBuildSettings: - enabled: 1 path: "Assets/Scenes/\u5DE5\u5177\u95F4_\u6B63\u786E.unity" guid: 162bd169aaa74c245aefc2a970e0012b + - enabled: 1 + path: "Assets/Scenes/\u81EA\u5EFA\u623F.unity" + guid: ccaf383122668df419071dd9064687f2 - enabled: 1 path: "Assets/Scenes/\u5DE5\u5177\u95F4\u573A\u666F.unity" guid: 9c3f2fccc37312b468a01a18ac50fcd9 diff --git a/Electrical_inspectionCompetitionSystem/ProjectSettings/ProjectVersion.txt b/Electrical_inspectionCompetitionSystem/ProjectSettings/ProjectVersion.txt index bc2ff943..cda402b2 100644 --- a/Electrical_inspectionCompetitionSystem/ProjectSettings/ProjectVersion.txt +++ b/Electrical_inspectionCompetitionSystem/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2021.3.10f1c2 -m_EditorVersionWithRevision: 2021.3.10f1c2 (5a059dbcdda5) +m_EditorVersion: 2021.3.15f1c1 +m_EditorVersionWithRevision: 2021.3.15f1c1 (080beb55ecda)