From ee8d59ea6ce3190e73fdcc97066765018d0ae0d7 Mon Sep 17 00:00:00 2001 From: YangHua <1475658476@qq.com> Date: Sat, 11 May 2024 13:05:56 +0800 Subject: [PATCH] =?UTF-8?q?=E5=89=94=E9=99=A4=E6=96=AD=E7=82=B9=E7=BB=AD?= =?UTF-8?q?=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Assets/Adam/Scenes/UI.unity | 54 +++++++++---------- .../Adam/Scripts/ExamusersController.cs | 3 +- .../DisconnectedReconnection/Disconnected.cs | 20 ++++--- .../GuYuan/ExaminationData/ExaminationLoad.cs | 34 ++++++------ .../Assets/GuYuan/GameManager/GameManager.cs | 2 +- .../Assets/GuYuan/KDLURL/follow.cs | 10 ++-- .../Assets/Scenes/农家乐.unity | 20 +++---- .../Assets/Scenes/农贸市场.unity | 32 ++++++----- .../Assets/Scenes/小商户.unity | 26 ++++----- .../Assets/Scenes/自建房.unity | 24 ++++----- .../Assets/StreamingAssets/2023920.json | 18 ------- .../Assets/StreamingAssets/2023920.json.meta | 7 --- .../Assets/StreamingAssets/2023921.json | 25 --------- .../Assets/StreamingAssets/2023921.json.meta | 7 --- .../Assets/StreamingAssets/2023922.json | 25 --------- .../Assets/StreamingAssets/2023922.json.meta | 7 --- .../Assets/StreamingAssets/build_info.txt | 2 +- SXElectricalInspection/Assets/Test.meta | 8 --- SXElectricalInspection/Assets/Test/JSON.meta | 8 --- .../Assets/Test/JSON/2023920_农家乐.json.meta | 8 --- 20 files changed, 117 insertions(+), 223 deletions(-) delete mode 100644 SXElectricalInspection/Assets/StreamingAssets/2023920.json delete mode 100644 SXElectricalInspection/Assets/StreamingAssets/2023920.json.meta delete mode 100644 SXElectricalInspection/Assets/StreamingAssets/2023921.json delete mode 100644 SXElectricalInspection/Assets/StreamingAssets/2023921.json.meta delete mode 100644 SXElectricalInspection/Assets/StreamingAssets/2023922.json delete mode 100644 SXElectricalInspection/Assets/StreamingAssets/2023922.json.meta delete mode 100644 SXElectricalInspection/Assets/Test.meta delete mode 100644 SXElectricalInspection/Assets/Test/JSON.meta delete mode 100644 SXElectricalInspection/Assets/Test/JSON/2023920_农家乐.json.meta diff --git a/SXElectricalInspection/Assets/Adam/Scenes/UI.unity b/SXElectricalInspection/Assets/Adam/Scenes/UI.unity index 66fb22c8..c8b1a9e5 100644 --- a/SXElectricalInspection/Assets/Adam/Scenes/UI.unity +++ b/SXElectricalInspection/Assets/Adam/Scenes/UI.unity @@ -1310,11 +1310,11 @@ RectTransform: m_Father: {fileID: 414392647} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -144.8, y: -12.900002} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 7.6, y: -17.154} m_SizeDelta: {x: 92.7526, y: 82.3988} - m_Pivot: {x: 0.5, y: 0.5} + m_Pivot: {x: 0, y: 1} --- !u!114 &103299763 MonoBehaviour: m_ObjectHideFlags: 0 @@ -5464,8 +5464,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 9, y: -60} - m_SizeDelta: {x: 416, y: 127} + m_AnchoredPosition: {x: 7.0999756, y: -90.7} + m_SizeDelta: {x: 355.4185, y: 108.5052} m_Pivot: {x: 0, y: 1} --- !u!114 &414392648 MonoBehaviour: @@ -16033,7 +16033,7 @@ RectTransform: m_GameObject: {fileID: 963964476} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalScale: {x: 0.1, y: 0.1, z: 0.1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 414392647} @@ -16041,8 +16041,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 151.2, y: -30.300003} - m_SizeDelta: {x: 238.84, y: 30} + m_AnchoredPosition: {x: 140.3, y: -30.3} + m_SizeDelta: {x: 2151.2, y: 287.304} m_Pivot: {x: 0, y: 0.5} --- !u!114 &963964478 MonoBehaviour: @@ -16085,11 +16085,11 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 20 + m_FontSize: 120 m_FontStyle: 0 m_BestFit: 0 - m_MinSize: 2 - m_MaxSize: 40 + m_MinSize: 1 + m_MaxSize: 124 m_Alignment: 3 m_AlignByGeometry: 0 m_RichText: 1 @@ -20109,7 +20109,7 @@ RectTransform: m_GameObject: {fileID: 1183006621} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalScale: {x: 0.1, y: 0.1, z: 0.1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 414392647} @@ -20117,8 +20117,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 151.2, y: 5.5} - m_SizeDelta: {x: 238.839, y: 30} + m_AnchoredPosition: {x: 140.3, y: 0.000015258789} + m_SizeDelta: {x: 2151.2, y: 287.3041} m_Pivot: {x: 0, y: 0.5} --- !u!114 &1183006623 MonoBehaviour: @@ -20142,11 +20142,11 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 20 + m_FontSize: 120 m_FontStyle: 0 m_BestFit: 0 - m_MinSize: 2 - m_MaxSize: 40 + m_MinSize: 1 + m_MaxSize: 124 m_Alignment: 3 m_AlignByGeometry: 0 m_RichText: 1 @@ -32909,7 +32909,7 @@ RectTransform: m_GameObject: {fileID: 1869687405} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalScale: {x: 0.1, y: 0.1, z: 0.1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 414392647} @@ -32917,8 +32917,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 151.2, y: 37.7} - m_SizeDelta: {x: 238.839, y: 30} + m_AnchoredPosition: {x: 140.3, y: 27.5} + m_SizeDelta: {x: 2151.2, y: 260.9137} m_Pivot: {x: 0, y: 0.5} --- !u!114 &1869687407 MonoBehaviour: @@ -32942,11 +32942,11 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 20 + m_FontSize: 120 m_FontStyle: 0 m_BestFit: 0 - m_MinSize: 2 - m_MaxSize: 40 + m_MinSize: 1 + m_MaxSize: 124 m_Alignment: 3 m_AlignByGeometry: 0 m_RichText: 1 @@ -33076,8 +33076,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: -38, y: -500} - m_SizeDelta: {x: 192, y: 52} + m_AnchoredPosition: {x: -38, y: -498.86795} + m_SizeDelta: {x: 207, y: 54} m_Pivot: {x: 1, y: 0.5} --- !u!114 &1876085499 MonoBehaviour: @@ -33099,7 +33099,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 1a1a05fbc35fd4b4caadc347926f139c, type: 3} + m_Sprite: {fileID: 21300000, guid: 3f3dad6f6a00af64895390d2c7a6ee53, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/SXElectricalInspection/Assets/Adam/Scripts/ExamusersController.cs b/SXElectricalInspection/Assets/Adam/Scripts/ExamusersController.cs index e6d25b39..a113cf91 100644 --- a/SXElectricalInspection/Assets/Adam/Scripts/ExamusersController.cs +++ b/SXElectricalInspection/Assets/Adam/Scripts/ExamusersController.cs @@ -93,8 +93,7 @@ namespace Adam /// public bool GetSceneState() { - bool sceneState = root.state; - return sceneState; + return root.state; } /// diff --git a/SXElectricalInspection/Assets/GuYuan/DisconnectedReconnection/Disconnected.cs b/SXElectricalInspection/Assets/GuYuan/DisconnectedReconnection/Disconnected.cs index 19ead26a..56ed84db 100644 --- a/SXElectricalInspection/Assets/GuYuan/DisconnectedReconnection/Disconnected.cs +++ b/SXElectricalInspection/Assets/GuYuan/DisconnectedReconnection/Disconnected.cs @@ -59,29 +59,27 @@ public class Disconnected : MonoBehaviour } private void OnTriggerEnter(Collider other) { - //if (UIManager.Instance.Reconnection.isDuanDianok) - //{ - if (other.name.Equals(name)) - { - Starts(); - } - //} + + if (other.name.Equals(name)) + { + //OnBackUp(); + } } private void OnTriggerExit(Collider other) { if (other.name.Equals(name)) { - UIManager.Instance.Reconnection.isDuanDianok = true; + //UIManager.Instance.Reconnection.isDuanDianok = true; } } - void Starts() + void OnBackUp() { //Debug.Log("ʼ"); DisconnectedData.toolsPos = new List(); DisconnectedData.toolsRot = new List(); int tempInt = UIManager.Instance.toolsItemManager.toolItems.Count; - for (int i = 0;i< tempInt;i++) + for (int i = 0; i < tempInt; i++) { pos pos = new pos(); pos.x = ToolsItemManager.Instance.toolItems[i].originPos.x; @@ -89,7 +87,7 @@ public class Disconnected : MonoBehaviour pos.z = ToolsItemManager.Instance.toolItems[i].originPos.z; DisconnectedData.toolsPos.Add(pos); } - for (int i = 0;i< tempInt;i++) + for (int i = 0; i < tempInt; i++) { pos pos = new pos(); pos.x = ToolsItemManager.Instance.toolItems[i].originAngle.x; diff --git a/SXElectricalInspection/Assets/GuYuan/ExaminationData/ExaminationLoad.cs b/SXElectricalInspection/Assets/GuYuan/ExaminationData/ExaminationLoad.cs index 9f7fe6d2..78f575b5 100644 --- a/SXElectricalInspection/Assets/GuYuan/ExaminationData/ExaminationLoad.cs +++ b/SXElectricalInspection/Assets/GuYuan/ExaminationData/ExaminationLoad.cs @@ -23,25 +23,27 @@ public class ExaminationLoad /// public IEnumerator LoadAsyncPost(string name, string id, string obj) { - Debug.Log("loadaasync Name" + name+" aksjgdkajs "+ id); - string url = WebIPAdress.Instance.dicAdresses["ϵ"]; - url += string.Format($"?action=writebreak&real_name={name}"); - Debug.Log("=========" + url); - WWWForm wWWForm = new WWWForm(); - //wWWForm.AddField("action", "writebreak"); - //wWWForm.AddField("real_name", name); - wWWForm.AddField("id_card", id); - wWWForm.AddField("data", obj); - WWW ww = new WWW(url, wWWForm); - yield return ww; - Debug.Log("======" + ww.url); - Debug.Log(ww.text); - //GetLoad(name,id); + //Debug.Log("loadaasync Name" + name+" aksjgdkajs "+ id); + //string url = WebIPAdress.Instance.dicAdresses["ϵ"]; + //url += string.Format($"?action=writebreak&real_name={name}"); + //Debug.Log("=========" + url); + //WWWForm wWWForm = new WWWForm(); + ////wWWForm.AddField("action", "writebreak"); + ////wWWForm.AddField("real_name", name); + //wWWForm.AddField("id_card", id); + //wWWForm.AddField("data", obj); + //WWW ww = new WWW(url, wWWForm); + //yield return ww; + //Debug.Log("======" + ww.url); + //Debug.Log(ww.text); + + yield return new WaitForEndOfFrame(); + } public async Task GetLoad(string name, string id) { - return await GetData(string.Format($"http://192.168.1.32:8080/Handler/ResultDetail.ashx?action=readbreak&real_name={name}&id_card={id}")); - + return await GetData(string.Format($"http://127.0.0.1:10013/Handler/ResultDetail.ashx?action=readbreak&real_name={name}&id_card={id}")); + } private async Task GetData(string url) { diff --git a/SXElectricalInspection/Assets/GuYuan/GameManager/GameManager.cs b/SXElectricalInspection/Assets/GuYuan/GameManager/GameManager.cs index 20ef7935..514bd06c 100644 --- a/SXElectricalInspection/Assets/GuYuan/GameManager/GameManager.cs +++ b/SXElectricalInspection/Assets/GuYuan/GameManager/GameManager.cs @@ -64,7 +64,7 @@ public class GameManager : MonoBehaviour SceneName = scene.name; if (UIManager.Instance.Reconnection.ison) { - init(); + //init(); } } // Start is called before the first frame update diff --git a/SXElectricalInspection/Assets/GuYuan/KDLURL/follow.cs b/SXElectricalInspection/Assets/GuYuan/KDLURL/follow.cs index e5e6aaa6..bbd0a4f4 100644 --- a/SXElectricalInspection/Assets/GuYuan/KDLURL/follow.cs +++ b/SXElectricalInspection/Assets/GuYuan/KDLURL/follow.cs @@ -52,11 +52,11 @@ public class follow : ToolBase } private async void show() { - if (!UIManager.Instance.ganTanHao.KeyGanTanHao.ContainsKey(GlobalFlag.userId)) - { - UIManager.Instance.ganTanHao.KeyGanTanHao.Add(GlobalFlag.userId, GameManager.Instance.SceneName); - gameObject.SetActive(false); - } + //if (!UIManager.Instance.ganTanHao.KeyGanTanHao.ContainsKey(GlobalFlag.userId)) + //{ + // UIManager.Instance.ganTanHao.KeyGanTanHao.Add(GlobalFlag.userId, GameManager.Instance.SceneName); + // gameObject.SetActive(false); + //} if (!UIManager.Instance.isChangJing && GameManager.Instance.GonZuoZheng) { await FractionManager.Instance.overAsync(3, 2, "֤"); diff --git a/SXElectricalInspection/Assets/Scenes/农家乐.unity b/SXElectricalInspection/Assets/Scenes/农家乐.unity index 542f5664..01bb1760 100644 --- a/SXElectricalInspection/Assets/Scenes/农家乐.unity +++ b/SXElectricalInspection/Assets/Scenes/农家乐.unity @@ -7509,7 +7509,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: c26dbd92e82cf5b4390ae97cf33a3938, type: 3} + m_Sprite: {fileID: 21300000, guid: 21839061cd4e51f438e69b12377cf32e, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -22638,7 +22638,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!65 &602827802 BoxCollider: m_ObjectHideFlags: 0 @@ -22648,7 +22648,7 @@ BoxCollider: m_GameObject: {fileID: 602827801} m_Material: {fileID: 0} m_IsTrigger: 1 - m_Enabled: 1 + m_Enabled: 0 serializedVersion: 2 m_Size: {x: 1, y: 1, z: 1} m_Center: {x: 0, y: 0, z: 0} @@ -22724,7 +22724,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 602827801} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: d316b244abf58744b96a54b3e2a0b192, type: 3} m_Name: @@ -22965,7 +22965,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 04c189674275c014fb9a01af6a288c56, type: 3} + m_Sprite: {fileID: 21300000, guid: 3f3dad6f6a00af64895390d2c7a6ee53, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -59924,7 +59924,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 04c189674275c014fb9a01af6a288c56, type: 3} + m_Sprite: {fileID: 21300000, guid: 3f3dad6f6a00af64895390d2c7a6ee53, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -60440,7 +60440,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!114 &1599525641 MonoBehaviour: m_ObjectHideFlags: 0 @@ -60448,7 +60448,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1599525640} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: d316b244abf58744b96a54b3e2a0b192, type: 3} m_Name: @@ -60492,7 +60492,7 @@ BoxCollider: m_GameObject: {fileID: 1599525640} m_Material: {fileID: 0} m_IsTrigger: 1 - m_Enabled: 1 + m_Enabled: 0 serializedVersion: 2 m_Size: {x: 1, y: 1, z: 1} m_Center: {x: 0, y: 0, z: 0} @@ -63301,7 +63301,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 30e501bfe66ef934eb01a02524bd336c, type: 3} propertyPath: m_LocalPosition.y - value: 0.15536118 + value: 0 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 30e501bfe66ef934eb01a02524bd336c, type: 3} propertyPath: m_LocalPosition.z diff --git a/SXElectricalInspection/Assets/Scenes/农贸市场.unity b/SXElectricalInspection/Assets/Scenes/农贸市场.unity index 2f78dad3..03d743e2 100644 --- a/SXElectricalInspection/Assets/Scenes/农贸市场.unity +++ b/SXElectricalInspection/Assets/Scenes/农贸市场.unity @@ -10309,6 +10309,10 @@ PrefabInstance: propertyPath: m_StaticEditorFlags value: 0 objectReference: {fileID: 0} + - target: {fileID: 5541222388820676128, guid: 088bc4aa5e5b4ef4c857f7b0929d2e66, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: d6c70abd19655db49a1d616b86cfbf79, type: 3} - target: {fileID: 5541222388820676134, guid: 088bc4aa5e5b4ef4c857f7b0929d2e66, type: 3} propertyPath: m_StaticEditorFlags value: 0 @@ -11370,7 +11374,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: c26dbd92e82cf5b4390ae97cf33a3938, type: 3} + m_Sprite: {fileID: 21300000, guid: 21839061cd4e51f438e69b12377cf32e, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -11883,6 +11887,10 @@ PrefabInstance: propertyPath: scorercontinuer value: 10 objectReference: {fileID: 0} + - target: {fileID: 5475814894711953179, guid: 74bae246c73626f4d80059eda580593f, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 21004a0ccc040014aad83a7a156ecd3f, type: 3} - target: {fileID: 5475814894836966472, guid: 74bae246c73626f4d80059eda580593f, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -25089,7 +25097,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!65 &493897965 BoxCollider: m_ObjectHideFlags: 0 @@ -25099,7 +25107,7 @@ BoxCollider: m_GameObject: {fileID: 493897964} m_Material: {fileID: 0} m_IsTrigger: 1 - m_Enabled: 1 + m_Enabled: 0 serializedVersion: 2 m_Size: {x: 1, y: 1, z: 1} m_Center: {x: 0, y: 0, z: 0} @@ -25175,7 +25183,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 493897964} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: d316b244abf58744b96a54b3e2a0b192, type: 3} m_Name: @@ -59445,7 +59453,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: cd34b7efa35ecc846b301324e969bd2e, type: 3} + m_Sprite: {fileID: 21300000, guid: d6c70abd19655db49a1d616b86cfbf79, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -64586,7 +64594,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 04c189674275c014fb9a01af6a288c56, type: 3} + m_Sprite: {fileID: 21300000, guid: 3f3dad6f6a00af64895390d2c7a6ee53, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -65052,7 +65060,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!65 &1212713348 BoxCollider: m_ObjectHideFlags: 0 @@ -65062,7 +65070,7 @@ BoxCollider: m_GameObject: {fileID: 1212713347} m_Material: {fileID: 0} m_IsTrigger: 1 - m_Enabled: 1 + m_Enabled: 0 serializedVersion: 2 m_Size: {x: 1, y: 1, z: 1} m_Center: {x: 0, y: 0, z: 0} @@ -65138,7 +65146,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1212713347} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: d316b244abf58744b96a54b3e2a0b192, type: 3} m_Name: @@ -82113,7 +82121,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!114 &1540742981 MonoBehaviour: m_ObjectHideFlags: 0 @@ -82121,7 +82129,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1540742980} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: d316b244abf58744b96a54b3e2a0b192, type: 3} m_Name: @@ -111386,7 +111394,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 919132148152496915} m_LocalRotation: {x: -0, y: 0.0892845, z: -0, w: 0.9960062} - m_LocalPosition: {x: -17.946, y: 0.177, z: 333.321} + m_LocalPosition: {x: -17.946, y: 0.1, z: 333.321} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: diff --git a/SXElectricalInspection/Assets/Scenes/小商户.unity b/SXElectricalInspection/Assets/Scenes/小商户.unity index fdfeddcc..0e06b8b6 100644 --- a/SXElectricalInspection/Assets/Scenes/小商户.unity +++ b/SXElectricalInspection/Assets/Scenes/小商户.unity @@ -11723,7 +11723,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: c26dbd92e82cf5b4390ae97cf33a3938, type: 3} + m_Sprite: {fileID: 21300000, guid: 21839061cd4e51f438e69b12377cf32e, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -24701,7 +24701,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 04c189674275c014fb9a01af6a288c56, type: 3} + m_Sprite: {fileID: 21300000, guid: 3f3dad6f6a00af64895390d2c7a6ee53, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -51767,7 +51767,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!65 &960906651 BoxCollider: m_ObjectHideFlags: 0 @@ -51777,7 +51777,7 @@ BoxCollider: m_GameObject: {fileID: 960906650} m_Material: {fileID: 0} m_IsTrigger: 1 - m_Enabled: 1 + m_Enabled: 0 serializedVersion: 2 m_Size: {x: 1, y: 1, z: 1} m_Center: {x: 0, y: 0, z: 0} @@ -51853,7 +51853,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 960906650} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: d316b244abf58744b96a54b3e2a0b192, type: 3} m_Name: @@ -66056,7 +66056,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &1207824788 RectTransform: m_ObjectHideFlags: 0 @@ -66174,7 +66174,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 04c189674275c014fb9a01af6a288c56, type: 3} + m_Sprite: {fileID: 21300000, guid: 3f3dad6f6a00af64895390d2c7a6ee53, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -69353,7 +69353,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 30e501bfe66ef934eb01a02524bd336c, type: 3} propertyPath: m_LocalPosition.y - value: 0.177 + value: 0.1 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 30e501bfe66ef934eb01a02524bd336c, type: 3} propertyPath: m_LocalPosition.z @@ -86312,7 +86312,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!114 &1574740454 MonoBehaviour: m_ObjectHideFlags: 0 @@ -86320,7 +86320,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1574740453} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: d316b244abf58744b96a54b3e2a0b192, type: 3} m_Name: @@ -111531,7 +111531,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &2069853184 Transform: m_ObjectHideFlags: 0 @@ -111556,7 +111556,7 @@ BoxCollider: m_GameObject: {fileID: 2069853183} m_Material: {fileID: 0} m_IsTrigger: 1 - m_Enabled: 1 + m_Enabled: 0 serializedVersion: 2 m_Size: {x: 1, y: 1, z: 1} m_Center: {x: 0, y: 0, z: 0} @@ -111617,7 +111617,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2069853183} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: d316b244abf58744b96a54b3e2a0b192, type: 3} m_Name: diff --git a/SXElectricalInspection/Assets/Scenes/自建房.unity b/SXElectricalInspection/Assets/Scenes/自建房.unity index 3e7ad172..e10cd76b 100644 --- a/SXElectricalInspection/Assets/Scenes/自建房.unity +++ b/SXElectricalInspection/Assets/Scenes/自建房.unity @@ -4746,7 +4746,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!114 &83384198 MonoBehaviour: m_ObjectHideFlags: 0 @@ -4754,7 +4754,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 83384197} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: d316b244abf58744b96a54b3e2a0b192, type: 3} m_Name: @@ -11209,7 +11209,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: c26dbd92e82cf5b4390ae97cf33a3938, type: 3} + m_Sprite: {fileID: 21300000, guid: 21839061cd4e51f438e69b12377cf32e, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -23694,7 +23694,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 04c189674275c014fb9a01af6a288c56, type: 3} + m_Sprite: {fileID: 21300000, guid: 3f3dad6f6a00af64895390d2c7a6ee53, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -59072,7 +59072,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!65 &1129413009 BoxCollider: m_ObjectHideFlags: 0 @@ -59082,7 +59082,7 @@ BoxCollider: m_GameObject: {fileID: 1129413008} m_Material: {fileID: 0} m_IsTrigger: 1 - m_Enabled: 1 + m_Enabled: 0 serializedVersion: 2 m_Size: {x: 1, y: 1, z: 1} m_Center: {x: 0, y: 0, z: 0} @@ -59158,7 +59158,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1129413008} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: d316b244abf58744b96a54b3e2a0b192, type: 3} m_Name: @@ -63856,7 +63856,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 04c189674275c014fb9a01af6a288c56, type: 3} + m_Sprite: {fileID: 21300000, guid: 3f3dad6f6a00af64895390d2c7a6ee53, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -66943,7 +66943,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 30e501bfe66ef934eb01a02524bd336c, type: 3} propertyPath: m_LocalPosition.y - value: 0.177 + value: 0 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 30e501bfe66ef934eb01a02524bd336c, type: 3} propertyPath: m_LocalPosition.z @@ -110953,7 +110953,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!65 &2142853812 BoxCollider: m_ObjectHideFlags: 0 @@ -110963,7 +110963,7 @@ BoxCollider: m_GameObject: {fileID: 2142853811} m_Material: {fileID: 0} m_IsTrigger: 1 - m_Enabled: 1 + m_Enabled: 0 serializedVersion: 2 m_Size: {x: 1, y: 1, z: 1} m_Center: {x: 0, y: 0, z: 0} @@ -111039,7 +111039,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2142853811} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: d316b244abf58744b96a54b3e2a0b192, type: 3} m_Name: diff --git a/SXElectricalInspection/Assets/StreamingAssets/2023920.json b/SXElectricalInspection/Assets/StreamingAssets/2023920.json deleted file mode 100644 index d9cd520d..00000000 --- a/SXElectricalInspection/Assets/StreamingAssets/2023920.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "SceneName": "小商户", - "PlayerPosition": { - "x": -19.220108, - "y": 0.861024439, - "z": 331.037323 - }, - "PlayerRotions": { - "x": 0.0, - "y": 154.568024, - "z": 0.0 - }, - "HandGameObject": "验电笔(Clone)", - "toolsName": [], - "keyValuePairs": { - "小商户": false - } -} \ No newline at end of file diff --git a/SXElectricalInspection/Assets/StreamingAssets/2023920.json.meta b/SXElectricalInspection/Assets/StreamingAssets/2023920.json.meta deleted file mode 100644 index b5b60f94..00000000 --- a/SXElectricalInspection/Assets/StreamingAssets/2023920.json.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 8f6a5487465e67a449c5c4e5b08f04a3 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/SXElectricalInspection/Assets/StreamingAssets/2023921.json b/SXElectricalInspection/Assets/StreamingAssets/2023921.json deleted file mode 100644 index b4f3e432..00000000 --- a/SXElectricalInspection/Assets/StreamingAssets/2023921.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "SceneName": "自建房", - "PlayerPosition": { - "x": -11.062, - "y": 0.8610245, - "z": 327.5634 - }, - "PlayerRotions": { - "x": 0.0, - "y": 94.4653854, - "z": 0.0 - }, - "HandGameObject": "钳形电流表(Clone)", - "toolsName": [ - "相位伏安表", - "服务器记录仪", - "万用表", - "钳形电流表", - "验电笔" - ], - "keyValuePairs": { - "自建房": false - }, - "Timer": 113 -} \ No newline at end of file diff --git a/SXElectricalInspection/Assets/StreamingAssets/2023921.json.meta b/SXElectricalInspection/Assets/StreamingAssets/2023921.json.meta deleted file mode 100644 index 995c7408..00000000 --- a/SXElectricalInspection/Assets/StreamingAssets/2023921.json.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: ccaa63ef3ec553d48baaaebda1484b7d -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/SXElectricalInspection/Assets/StreamingAssets/2023922.json b/SXElectricalInspection/Assets/StreamingAssets/2023922.json deleted file mode 100644 index b4f3e432..00000000 --- a/SXElectricalInspection/Assets/StreamingAssets/2023922.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "SceneName": "自建房", - "PlayerPosition": { - "x": -11.062, - "y": 0.8610245, - "z": 327.5634 - }, - "PlayerRotions": { - "x": 0.0, - "y": 94.4653854, - "z": 0.0 - }, - "HandGameObject": "钳形电流表(Clone)", - "toolsName": [ - "相位伏安表", - "服务器记录仪", - "万用表", - "钳形电流表", - "验电笔" - ], - "keyValuePairs": { - "自建房": false - }, - "Timer": 113 -} \ No newline at end of file diff --git a/SXElectricalInspection/Assets/StreamingAssets/2023922.json.meta b/SXElectricalInspection/Assets/StreamingAssets/2023922.json.meta deleted file mode 100644 index a5c62501..00000000 --- a/SXElectricalInspection/Assets/StreamingAssets/2023922.json.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: f0b1a4342548904429d40bff1c5c3ed9 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/SXElectricalInspection/Assets/StreamingAssets/build_info.txt b/SXElectricalInspection/Assets/StreamingAssets/build_info.txt index cfa44c4f..a417990f 100644 --- a/SXElectricalInspection/Assets/StreamingAssets/build_info.txt +++ b/SXElectricalInspection/Assets/StreamingAssets/build_info.txt @@ -1 +1 @@ -Build from ADAM at 2024/5/10 13:09:00 \ No newline at end of file +Build from ADAM at 2024/5/11 12:56:43 \ No newline at end of file diff --git a/SXElectricalInspection/Assets/Test.meta b/SXElectricalInspection/Assets/Test.meta deleted file mode 100644 index 6365727a..00000000 --- a/SXElectricalInspection/Assets/Test.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 6107372275cff604abd9e85b28312606 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/SXElectricalInspection/Assets/Test/JSON.meta b/SXElectricalInspection/Assets/Test/JSON.meta deleted file mode 100644 index 0cf8b4b7..00000000 --- a/SXElectricalInspection/Assets/Test/JSON.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: d89435c90bcb59843ac86349e5fca0f9 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/SXElectricalInspection/Assets/Test/JSON/2023920_农家乐.json.meta b/SXElectricalInspection/Assets/Test/JSON/2023920_农家乐.json.meta deleted file mode 100644 index af077d68..00000000 --- a/SXElectricalInspection/Assets/Test/JSON/2023920_农家乐.json.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: e49d68ad14484bb498e31940c53e24d2 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: