diff --git a/GQ_TongXin/Assets/Prefabs/Prefabs/容量图标/容量.prefab b/GQ_TongXin/Assets/Prefabs/Prefabs/容量图标/容量.prefab index 2f3fbb2d9..9faab98ff 100644 --- a/GQ_TongXin/Assets/Prefabs/Prefabs/容量图标/容量.prefab +++ b/GQ_TongXin/Assets/Prefabs/Prefabs/容量图标/容量.prefab @@ -196,6 +196,8 @@ MonoBehaviour: m_EditorClassIdentifier: targetCamera: {fileID: 0} distanceMultiplier: 0.05 + button: {fileID: 0} + text: {fileID: 0} --- !u!1 &6206996800505932347 GameObject: m_ObjectHideFlags: 0 @@ -374,7 +376,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: diff --git a/GQ_TongXin/Assets/Prefabs/Prefabs/摄像头/摄像头_web.prefab b/GQ_TongXin/Assets/Prefabs/Prefabs/摄像头/摄像头_web.prefab index 0204a37a8..24655e566 100644 --- a/GQ_TongXin/Assets/Prefabs/Prefabs/摄像头/摄像头_web.prefab +++ b/GQ_TongXin/Assets/Prefabs/Prefabs/摄像头/摄像头_web.prefab @@ -241,19 +241,19 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2012348084017257726} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 2958885068264779190} - {fileID: 7909258536741902972} - m_Father: {fileID: 6206996800505932346} + m_Father: {fileID: 8823023295836545626} 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: 0, y: 0} + m_AnchoredPosition: {x: -3.500061, y: 41.799896} m_SizeDelta: {x: 137, y: 87} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7634819666127899493 @@ -278,7 +278,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 2100000, guid: 3a3b5242babc65a4c898f644975a9f50, type: 2} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: @@ -392,7 +392,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4568529563820045235} - m_Enabled: 0 + m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} m_Name: @@ -471,7 +471,7 @@ MonoBehaviour: m_margin: {x: 0, y: 0, z: 0, w: 0} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 - m_hasFontAssetChanged: 1 + m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!1 &4981678722631788491 @@ -491,7 +491,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &7036184066493150729 RectTransform: m_ObjectHideFlags: 0 @@ -749,7 +749,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: @@ -814,7 +814,7 @@ MonoBehaviour: button: {fileID: 4332229852258479005} text: {fileID: 2224874554742167492} text1: {fileID: 5390959122517887407} - maodian: {fileID: 6206996800505932346} + maodian: {fileID: 8823023295836545626} --- !u!114 &7186680284490958309 MonoBehaviour: m_ObjectHideFlags: 0 @@ -937,10 +937,10 @@ RectTransform: m_GameObject: {fileID: 6206996800505932347} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.02, y: 0.019999998, z: 0.019999998} + m_LocalScale: {x: 0, y: 0, z: 0} m_ConstrainProportionsScale: 1 m_Children: - - {fileID: 5099096164770772711} + - {fileID: 8823023295836545626} - {fileID: 6206996799779127824} - {fileID: 6206996800221561050} m_Father: {fileID: 6206996799886426826} @@ -948,9 +948,9 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0.084800005, y: -0.6023998} - m_SizeDelta: {x: 1, y: 1} - m_Pivot: {x: 4.74, y: -29.62} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0, y: 0} --- !u!223 &6206996800505932326 Canvas: m_ObjectHideFlags: 0 @@ -960,7 +960,7 @@ Canvas: m_GameObject: {fileID: 6206996800505932347} m_Enabled: 1 serializedVersion: 3 - m_RenderMode: 2 + m_RenderMode: 0 m_Camera: {fileID: 0} m_PlaneDistance: 100 m_PixelPerfect: 0 @@ -1012,3 +1012,40 @@ MonoBehaviour: m_BlockingMask: serializedVersion: 2 m_Bits: 4294967295 +--- !u!1 &8503406481917361603 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8823023295836545626} + m_Layer: 5 + m_Name: maodian + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8823023295836545626 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8503406481917361603} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 5099096164770772711} + m_Father: {fileID: 6206996800505932346} + 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: 3.500061, y: -41.8} + m_SizeDelta: {x: 10, y: 10} + m_Pivot: {x: 0.5, y: 0.5} diff --git a/GQ_TongXin/Assets/Resources/emission.mat b/GQ_TongXin/Assets/Resources/emission.mat index f3b7b7264..702cd9525 100644 --- a/GQ_TongXin/Assets/Resources/emission.mat +++ b/GQ_TongXin/Assets/Resources/emission.mat @@ -116,7 +116,7 @@ Material: m_Colors: - _BaseColor: {r: 0, g: 0.74509805, b: 1, a: 1} - _Color: {r: 0, g: 0.74509805, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0.32599604, b: 0.32082152, a: 1} + - _EmissionColor: {r: 0, g: 0.6509804, b: 0.6431373, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] --- !u!114 &4586313418104410923 diff --git a/GQ_TongXin/Assets/Resources/emission.mat.meta b/GQ_TongXin/Assets/Resources/emission.mat.meta index 455d70c94..d65c8f8d3 100644 --- a/GQ_TongXin/Assets/Resources/emission.mat.meta +++ b/GQ_TongXin/Assets/Resources/emission.mat.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 38514db7389a60c48b975c7fe96a073c +guid: 61e67f4ecb09e00469ee46f5172ac7d6 NativeFormatImporter: externalObjects: {} mainObjectFileID: 2100000 diff --git a/GQ_TongXin/Assets/Scenes/SampleSceneG.unity b/GQ_TongXin/Assets/Scenes/SampleSceneG.unity index e350a7fe4..0b89e5ff4 100644 --- a/GQ_TongXin/Assets/Scenes/SampleSceneG.unity +++ b/GQ_TongXin/Assets/Scenes/SampleSceneG.unity @@ -490,6 +490,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: is_open: 0 + is_rotating: 0 close_angle: {x: 0, y: 0, z: 0} open_angle: {x: 0, y: 0, z: -90} another_door: {fileID: 0} @@ -1413,6 +1414,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: is_open: 0 + is_rotating: 0 close_angle: {x: 0, y: 0, z: 0} open_angle: {x: 0, y: 0, z: -90} another_door: {fileID: 0} @@ -5722,6 +5724,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: is_open: 0 + is_rotating: 0 close_angle: {x: 0, y: 0, z: 0} open_angle: {x: 0, y: 0, z: -90} another_door: {fileID: 0} @@ -12320,6 +12323,7 @@ MonoBehaviour: m_EditorClassIdentifier: clickEventLens: [] scaleUI: {fileID: 0} + lensUI_tranform: {fileID: 0} lensUI: {fileID: 0} button: {fileID: 0} text: {fileID: 0} @@ -13481,6 +13485,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: is_open: 0 + is_rotating: 0 close_angle: {x: 0, y: 0, z: 0} open_angle: {x: 0, y: 0, z: -90} another_door: {fileID: 0} @@ -15155,6 +15160,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: is_open: 0 + is_rotating: 0 close_angle: {x: 0, y: 0, z: 0} open_angle: {x: 0, y: 0, z: -90} another_door: {fileID: 0} @@ -15847,6 +15853,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: is_open: 0 + is_rotating: 0 close_angle: {x: 0, y: 0, z: 0} open_angle: {x: 0, y: 0, z: -90} another_door: {fileID: 0} @@ -16678,6 +16685,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: is_open: 0 + is_rotating: 0 close_angle: {x: 0, y: 0, z: 0} open_angle: {x: 0, y: 0, z: -90} another_door: {fileID: 0} @@ -18368,6 +18376,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: is_open: 0 + is_rotating: 0 close_angle: {x: -90, y: 0, z: 0} open_angle: {x: -90, y: 0, z: -90} another_door: {fileID: 177587018} @@ -18384,6 +18393,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: is_open: 0 + is_rotating: 0 close_angle: {x: -90, y: 0, z: 0} open_angle: {x: -90, y: 0, z: 90} another_door: {fileID: 177587017} @@ -25656,6 +25666,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: is_open: 0 + is_rotating: 0 close_angle: {x: 0, y: 0, z: 0} open_angle: {x: 0, y: 0, z: -90} another_door: {fileID: 0} @@ -27114,6 +27125,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: is_open: 0 + is_rotating: 0 close_angle: {x: 0, y: 0, z: 0} open_angle: {x: 0, y: 0, z: -90} another_door: {fileID: 0} @@ -28503,6 +28515,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: is_open: 0 + is_rotating: 0 close_angle: {x: 0, y: 0, z: 0} open_angle: {x: 0, y: 0, z: -90} another_door: {fileID: 0} @@ -29059,6 +29072,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: is_open: 0 + is_rotating: 0 close_angle: {x: 0, y: 0, z: 0} open_angle: {x: 0, y: 0, z: -90} another_door: {fileID: 0} @@ -33426,6 +33440,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: is_open: 0 + is_rotating: 0 close_angle: {x: 0, y: 0, z: 0} open_angle: {x: 0, y: 0, z: -90} another_door: {fileID: 0} @@ -34362,6 +34377,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: is_open: 0 + is_rotating: 0 close_angle: {x: 0, y: 0, z: 0} open_angle: {x: 0, y: 0, z: -90} another_door: {fileID: 0} @@ -34754,6 +34770,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: is_open: 0 + is_rotating: 0 close_angle: {x: 0, y: 0, z: 0} open_angle: {x: 0, y: 0, z: -90} another_door: {fileID: 0} @@ -36997,6 +37014,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: is_open: 0 + is_rotating: 0 close_angle: {x: 0, y: 0, z: 0} open_angle: {x: 0, y: 0, z: -90} another_door: {fileID: 0} @@ -40868,6 +40886,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: is_open: 0 + is_rotating: 0 close_angle: {x: -90, y: 0, z: 0} open_angle: {x: -90, y: 0, z: 90} another_door: {fileID: 1146465872} @@ -42644,6 +42663,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: is_open: 0 + is_rotating: 0 close_angle: {x: 0, y: 0, z: 0} open_angle: {x: 0, y: 0, z: -90} another_door: {fileID: 0} @@ -43310,6 +43330,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: is_open: 0 + is_rotating: 0 close_angle: {x: 0, y: 0, z: 0} open_angle: {x: 0, y: 0, z: -90} another_door: {fileID: 0} @@ -43362,6 +43383,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: is_open: 0 + is_rotating: 0 close_angle: {x: 0, y: 0, z: 0} open_angle: {x: 0, y: 0, z: -90} another_door: {fileID: 0} @@ -46446,6 +46468,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: is_open: 0 + is_rotating: 0 close_angle: {x: 0, y: 0, z: 0} open_angle: {x: 0, y: 0, z: -90} another_door: {fileID: 0} @@ -48848,6 +48871,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: is_open: 0 + is_rotating: 0 close_angle: {x: 0, y: 0, z: 0} open_angle: {x: 0, y: 0, z: -90} another_door: {fileID: 0} @@ -56897,6 +56921,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: is_open: 0 + is_rotating: 0 close_angle: {x: 0, y: 0, z: 0} open_angle: {x: 0, y: 0, z: -90} another_door: {fileID: 0} @@ -67265,6 +67290,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: is_open: 0 + is_rotating: 0 close_angle: {x: 0, y: 0, z: 0} open_angle: {x: 0, y: 0, z: -90} another_door: {fileID: 0} @@ -69137,6 +69163,11 @@ MonoBehaviour: ID: 0 instruct: {fileID: 55029763} uPosManager: {fileID: 0} +--- !u!1 &648510698 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 62768c305813eeb47b2e77173026ef48, type: 3} + m_PrefabInstance: {fileID: 1675120012} + m_PrefabAsset: {fileID: 0} --- !u!1 &648586373 stripped GameObject: m_CorrespondingSourceObject: {fileID: 7300452119179566621, guid: c8f09218a803c944e84c2336104ca2f9, type: 3} @@ -69554,6 +69585,7 @@ MonoBehaviour: m_EditorClassIdentifier: clickEventLens: [] scaleUI: {fileID: 0} + lensUI_tranform: {fileID: 0} lensUI: {fileID: 0} button: {fileID: 0} text: {fileID: 0} @@ -72065,6 +72097,7 @@ MonoBehaviour: m_EditorClassIdentifier: clickEventLens: [] scaleUI: {fileID: 0} + lensUI_tranform: {fileID: 0} lensUI: {fileID: 0} button: {fileID: 0} text: {fileID: 0} @@ -76743,6 +76776,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: is_open: 0 + is_rotating: 0 close_angle: {x: 0, y: 0, z: 0} open_angle: {x: 0, y: 0, z: -90} another_door: {fileID: 0} @@ -77039,6 +77073,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: is_open: 0 + is_rotating: 0 close_angle: {x: 0, y: 0, z: 0} open_angle: {x: 0, y: 0, z: -90} another_door: {fileID: 0} @@ -79757,6 +79792,7 @@ MonoBehaviour: m_EditorClassIdentifier: clickEventLens: [] scaleUI: {fileID: 0} + lensUI_tranform: {fileID: 0} lensUI: {fileID: 0} button: {fileID: 0} text: {fileID: 0} @@ -80270,6 +80306,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: is_open: 0 + is_rotating: 0 close_angle: {x: 0, y: 0, z: 0} open_angle: {x: 0, y: 0, z: -90} another_door: {fileID: 0} @@ -81424,6 +81461,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: is_open: 0 + is_rotating: 0 close_angle: {x: 0, y: 0, z: 0} open_angle: {x: 0, y: 0, z: -90} another_door: {fileID: 0} @@ -81898,6 +81936,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: is_open: 0 + is_rotating: 0 close_angle: {x: 0, y: 0, z: 0} open_angle: {x: 0, y: 0, z: -90} another_door: {fileID: 0} @@ -82032,6 +82071,11 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 65c073f1f8dbbe64da03bf56cea22ae7, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &754700592 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 62768c305813eeb47b2e77173026ef48, type: 3} + m_PrefabInstance: {fileID: 611096074} + m_PrefabAsset: {fileID: 0} --- !u!1 &754903910 stripped GameObject: m_CorrespondingSourceObject: {fileID: 6725408165822923276, guid: c8f09218a803c944e84c2336104ca2f9, type: 3} @@ -82089,6 +82133,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: is_open: 0 + is_rotating: 0 close_angle: {x: 0, y: 0, z: 0} open_angle: {x: 0, y: 0, z: -90} another_door: {fileID: 0} @@ -86597,6 +86642,7 @@ MonoBehaviour: m_EditorClassIdentifier: clickEventLens: [] scaleUI: {fileID: 0} + lensUI_tranform: {fileID: 0} lensUI: {fileID: 0} button: {fileID: 0} text: {fileID: 0} @@ -88948,6 +88994,7 @@ MonoBehaviour: m_EditorClassIdentifier: clickEventLens: [] scaleUI: {fileID: 0} + lensUI_tranform: {fileID: 0} lensUI: {fileID: 0} button: {fileID: 0} text: {fileID: 0} @@ -89616,6 +89663,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: is_open: 0 + is_rotating: 0 close_angle: {x: 0, y: 0, z: 0} open_angle: {x: 0, y: 0, z: -90} another_door: {fileID: 0} @@ -90063,6 +90111,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: is_open: 0 + is_rotating: 0 close_angle: {x: 0, y: 0, z: 0} open_angle: {x: 0, y: 0, z: -90} another_door: {fileID: 0} @@ -93288,6 +93337,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: is_open: 0 + is_rotating: 0 close_angle: {x: 0, y: 0, z: 0} open_angle: {x: 0, y: 0, z: -90} another_door: {fileID: 0} @@ -99076,6 +99126,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: is_open: 0 + is_rotating: 0 close_angle: {x: 0, y: 0, z: 0} open_angle: {x: 0, y: 0, z: -90} another_door: {fileID: 0} @@ -99880,6 +99931,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: is_open: 0 + is_rotating: 0 close_angle: {x: 0, y: 0, z: 0} open_angle: {x: 0, y: 0, z: -90} another_door: {fileID: 0} @@ -100802,6 +100854,7 @@ MonoBehaviour: m_EditorClassIdentifier: clickEventLens: [] scaleUI: {fileID: 0} + lensUI_tranform: {fileID: 0} lensUI: {fileID: 0} button: {fileID: 0} text: {fileID: 0} @@ -104742,6 +104795,8 @@ MonoBehaviour: - {fileID: 739408531} - {fileID: 1857144487} - {fileID: 1399501713} + - {fileID: 648510698} + - {fileID: 754700592} peiDianShi: - {fileID: 291230496} - {fileID: 1810368282} @@ -107634,6 +107689,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: is_open: 0 + is_rotating: 0 close_angle: {x: 0, y: 0, z: 0} open_angle: {x: 0, y: 0, z: -90} another_door: {fileID: 0} @@ -108078,6 +108134,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: is_open: 0 + is_rotating: 0 close_angle: {x: 0, y: 0, z: 0} open_angle: {x: 0, y: 0, z: -90} another_door: {fileID: 0} @@ -109285,6 +109342,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: is_open: 0 + is_rotating: 0 close_angle: {x: 0, y: 0, z: 0} open_angle: {x: 0, y: 0, z: -90} another_door: {fileID: 0} @@ -109895,6 +109953,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: is_open: 0 + is_rotating: 0 close_angle: {x: 0, y: 0, z: 0} open_angle: {x: 0, y: 0, z: -90} another_door: {fileID: 0} @@ -110273,6 +110332,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: is_open: 0 + is_rotating: 0 close_angle: {x: -90, y: 0, z: 0} open_angle: {x: -90, y: 0, z: 90} another_door: {fileID: 1460606174} @@ -111410,6 +111470,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: is_open: 0 + is_rotating: 0 close_angle: {x: 0, y: 0, z: 0} open_angle: {x: 0, y: 0, z: -90} another_door: {fileID: 0} @@ -111800,6 +111861,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: is_open: 0 + is_rotating: 0 close_angle: {x: 0, y: 0, z: 0} open_angle: {x: 0, y: 0, z: -90} another_door: {fileID: 0} @@ -115806,6 +115868,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: is_open: 0 + is_rotating: 0 close_angle: {x: 0, y: 0, z: 0} open_angle: {x: 0, y: 0, z: -90} another_door: {fileID: 0} @@ -119131,6 +119194,7 @@ MonoBehaviour: m_EditorClassIdentifier: clickEventLens: [] scaleUI: {fileID: 0} + lensUI_tranform: {fileID: 0} lensUI: {fileID: 0} button: {fileID: 0} text: {fileID: 0} @@ -121579,6 +121643,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: is_open: 0 + is_rotating: 0 close_angle: {x: 0, y: 0, z: 0} open_angle: {x: 0, y: 0, z: -90} another_door: {fileID: 0} @@ -122105,6 +122170,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: is_open: 0 + is_rotating: 0 close_angle: {x: 0, y: 0, z: 0} open_angle: {x: 0, y: 0, z: -90} another_door: {fileID: 0} @@ -123582,6 +123648,7 @@ MonoBehaviour: m_EditorClassIdentifier: clickEventLens: [] scaleUI: {fileID: 0} + lensUI_tranform: {fileID: 0} lensUI: {fileID: 0} button: {fileID: 0} text: {fileID: 0} @@ -124653,6 +124720,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: is_open: 0 + is_rotating: 0 close_angle: {x: -90, y: 0, z: 0} open_angle: {x: -90, y: 0, z: -90} another_door: {fileID: 393557833} @@ -124747,6 +124815,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: is_open: 0 + is_rotating: 0 close_angle: {x: 0, y: 0, z: 0} open_angle: {x: 0, y: 0, z: -90} another_door: {fileID: 0} @@ -127297,6 +127366,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: is_open: 0 + is_rotating: 0 close_angle: {x: 0, y: 0, z: 0} open_angle: {x: 0, y: 0, z: -90} another_door: {fileID: 0} @@ -129360,6 +129430,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: is_open: 0 + is_rotating: 0 close_angle: {x: 0, y: 0, z: 0} open_angle: {x: 0, y: 0, z: -90} another_door: {fileID: 0} @@ -134630,6 +134701,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: is_open: 0 + is_rotating: 0 close_angle: {x: 0, y: 0, z: 0} open_angle: {x: 0, y: 0, z: 90} another_door: {fileID: 1693561725} @@ -146633,6 +146705,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: is_open: 0 + is_rotating: 0 close_angle: {x: 0, y: 0, z: 0} open_angle: {x: 0, y: 0, z: -90} another_door: {fileID: 0} @@ -150205,6 +150278,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: is_open: 0 + is_rotating: 0 close_angle: {x: 0, y: 0, z: 0} open_angle: {x: 0, y: 0, z: -90} another_door: {fileID: 0} @@ -150495,6 +150569,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: is_open: 0 + is_rotating: 0 close_angle: {x: 0, y: 0, z: 0} open_angle: {x: 0, y: 0, z: -90} another_door: {fileID: 0} @@ -151858,6 +151933,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: is_open: 0 + is_rotating: 0 close_angle: {x: 0, y: 0, z: 0} open_angle: {x: 0, y: 0, z: -90} another_door: {fileID: 0} @@ -152584,6 +152660,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: is_open: 0 + is_rotating: 0 close_angle: {x: 0, y: 0, z: 0} open_angle: {x: 0, y: 0, z: -90} another_door: {fileID: 0} @@ -154859,6 +154936,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: is_open: 0 + is_rotating: 0 close_angle: {x: 0, y: 0, z: 0} open_angle: {x: 0, y: 0, z: -90} another_door: {fileID: 1461913098} @@ -156384,6 +156462,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: is_open: 0 + is_rotating: 0 close_angle: {x: -90, y: 0, z: 0} open_angle: {x: -90, y: 0, z: -90} another_door: {fileID: 1015953181} @@ -156515,6 +156594,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: is_open: 0 + is_rotating: 0 close_angle: {x: 0, y: 0, z: 0} open_angle: {x: 0, y: 0, z: 90} another_door: {fileID: 1447700244} @@ -160149,6 +160229,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: is_open: 0 + is_rotating: 0 close_angle: {x: 0, y: 0, z: 0} open_angle: {x: 0, y: 0, z: -90} another_door: {fileID: 0} @@ -163317,6 +163398,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: is_open: 0 + is_rotating: 0 close_angle: {x: 0, y: 0, z: 0} open_angle: {x: 0, y: 0, z: -90} another_door: {fileID: 0} @@ -165150,6 +165232,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: is_open: 0 + is_rotating: 0 close_angle: {x: 0, y: 0, z: 0} open_angle: {x: 0, y: 0, z: -90} another_door: {fileID: 0} @@ -165655,6 +165738,7 @@ MonoBehaviour: m_EditorClassIdentifier: clickEventLens: [] scaleUI: {fileID: 0} + lensUI_tranform: {fileID: 0} lensUI: {fileID: 0} button: {fileID: 0} text: {fileID: 0} @@ -172167,6 +172251,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: is_open: 0 + is_rotating: 0 close_angle: {x: 0, y: 0, z: 0} open_angle: {x: 0, y: 0, z: -90} another_door: {fileID: 0} @@ -179500,6 +179585,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: is_open: 0 + is_rotating: 0 close_angle: {x: 0, y: 0, z: 0} open_angle: {x: 0, y: 0, z: -90} another_door: {fileID: 0} @@ -180522,6 +180608,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: is_open: 0 + is_rotating: 0 close_angle: {x: 0, y: 0, z: 0} open_angle: {x: 0, y: 0, z: -90} another_door: {fileID: 1232806718} @@ -187604,6 +187691,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: is_open: 0 + is_rotating: 0 close_angle: {x: 0, y: 0, z: 0} open_angle: {x: 0, y: 0, z: -90} another_door: {fileID: 0} @@ -187976,6 +188064,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: is_open: 0 + is_rotating: 0 close_angle: {x: 0, y: 0, z: 0} open_angle: {x: 0, y: 0, z: -90} another_door: {fileID: 0} @@ -189615,6 +189704,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: is_open: 0 + is_rotating: 0 close_angle: {x: 0, y: 0, z: 0} open_angle: {x: 0, y: 0, z: -90} another_door: {fileID: 0} @@ -190425,6 +190515,7 @@ MonoBehaviour: m_EditorClassIdentifier: clickEventLens: [] scaleUI: {fileID: 0} + lensUI_tranform: {fileID: 0} lensUI: {fileID: 0} button: {fileID: 0} text: {fileID: 0} @@ -193928,6 +194019,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: is_open: 0 + is_rotating: 0 close_angle: {x: 0, y: 0, z: 0} open_angle: {x: 0, y: 0, z: -90} another_door: {fileID: 0} @@ -195178,6 +195270,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: is_open: 0 + is_rotating: 0 close_angle: {x: 0, y: 0, z: 0} open_angle: {x: 0, y: 0, z: -90} another_door: {fileID: 0} @@ -195428,7 +195521,7 @@ MonoBehaviour: xlz_sc: xllx_sc: arguments: - token: eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJleHAiOjE2OTQ2NTM0ODQsInVzZXJuYW1lIjoiMTgzMTIzNDU2NzgifQ.dhJdReSewAxx3MlRl5e-ZPRHal75VdcWcPFe94VYZYs + token: eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJleHAiOjE2OTQ2OTcxMjEsInVzZXJuYW1lIjoiMTgzMTIzNDU2NzgifQ.DU-CMUu87u2EZLScKoV5NIkoxfG013lNs9nrIh-HCZI heatThresholdValueMax: 38 heatThresholdValueMin: 26 humidityThresholdValueMax: 90 @@ -195571,6 +195664,7 @@ MonoBehaviour: stagingPanel: {fileID: 803679558} objectToShow: {fileID: 6712461312143127082} objectToShow_add: {fileID: 90559733} + roomDoors: [] --- !u!4 &1815567664 Transform: m_ObjectHideFlags: 0 @@ -196329,6 +196423,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: is_open: 0 + is_rotating: 0 close_angle: {x: 0, y: 0, z: 0} open_angle: {x: 0, y: 0, z: -90} another_door: {fileID: 0} @@ -198873,6 +198968,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: is_open: 0 + is_rotating: 0 close_angle: {x: 0, y: 0, z: 0} open_angle: {x: 0, y: 0, z: -90} another_door: {fileID: 0} @@ -199621,6 +199717,7 @@ MonoBehaviour: m_EditorClassIdentifier: clickEventLens: [] scaleUI: {fileID: 0} + lensUI_tranform: {fileID: 0} lensUI: {fileID: 0} button: {fileID: 0} text: {fileID: 0} @@ -199687,6 +199784,7 @@ MonoBehaviour: m_EditorClassIdentifier: clickEventLens: [] scaleUI: {fileID: 0} + lensUI_tranform: {fileID: 0} lensUI: {fileID: 0} button: {fileID: 0} text: {fileID: 0} @@ -201753,6 +201851,7 @@ MonoBehaviour: m_EditorClassIdentifier: clickEventLens: [] scaleUI: {fileID: 0} + lensUI_tranform: {fileID: 0} lensUI: {fileID: 0} button: {fileID: 0} text: {fileID: 0} @@ -202973,6 +203072,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: is_open: 0 + is_rotating: 0 close_angle: {x: 0, y: 0, z: 0} open_angle: {x: 0, y: 0, z: -90} another_door: {fileID: 0} @@ -207861,6 +207961,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: is_open: 0 + is_rotating: 0 close_angle: {x: 0, y: 0, z: 0} open_angle: {x: 0, y: 0, z: -90} another_door: {fileID: 0} @@ -208603,6 +208704,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: is_open: 0 + is_rotating: 0 close_angle: {x: 0, y: 0, z: 0} open_angle: {x: 0, y: 0, z: -90} another_door: {fileID: 0} @@ -212942,6 +213044,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: is_open: 0 + is_rotating: 0 close_angle: {x: 0, y: 0, z: 0} open_angle: {x: 0, y: 0, z: -90} another_door: {fileID: 0} @@ -213516,6 +213619,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: is_open: 0 + is_rotating: 0 close_angle: {x: 0, y: 0, z: 0} open_angle: {x: 0, y: 0, z: -90} another_door: {fileID: 0} @@ -213784,6 +213888,7 @@ MonoBehaviour: m_EditorClassIdentifier: clickEventLens: [] scaleUI: {fileID: 0} + lensUI_tranform: {fileID: 0} lensUI: {fileID: 0} button: {fileID: 0} text: {fileID: 0} @@ -215191,6 +215296,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: is_open: 0 + is_rotating: 0 close_angle: {x: 0, y: 0, z: 0} open_angle: {x: 0, y: 0, z: -90} another_door: {fileID: 0} @@ -220178,6 +220284,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: is_open: 0 + is_rotating: 0 close_angle: {x: 0, y: 0, z: 0} open_angle: {x: 0, y: 0, z: -90} another_door: {fileID: 0} @@ -221751,6 +221858,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: is_open: 0 + is_rotating: 0 close_angle: {x: 0, y: 0, z: 0} open_angle: {x: 0, y: 0, z: -90} another_door: {fileID: 0} @@ -222639,6 +222747,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: is_open: 0 + is_rotating: 0 close_angle: {x: 0, y: 0, z: 0} open_angle: {x: 0, y: 0, z: -90} another_door: {fileID: 0} @@ -223483,6 +223592,7 @@ MonoBehaviour: m_EditorClassIdentifier: clickEventLens: [] scaleUI: {fileID: 0} + lensUI_tranform: {fileID: 0} lensUI: {fileID: 0} button: {fileID: 0} text: {fileID: 0} @@ -224017,6 +224127,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: is_open: 0 + is_rotating: 0 close_angle: {x: 0, y: 0, z: 0} open_angle: {x: 0, y: 0, z: -90} another_door: {fileID: 0} @@ -226968,6 +227079,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: is_open: 0 + is_rotating: 0 close_angle: {x: 0, y: 0, z: 0} open_angle: {x: 0, y: 0, z: -90} another_door: {fileID: 0} @@ -229176,6 +229288,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: is_open: 0 + is_rotating: 0 close_angle: {x: 0, y: 0, z: 0} open_angle: {x: 0, y: 0, z: -90} another_door: {fileID: 0} @@ -292226,6 +292339,7 @@ MonoBehaviour: sb_bj_page: {fileID: 4362348816834021968} dk_xz_page: {fileID: 4362348817005860676} dk_bj_page: {fileID: 2126159577475600051} + huaXian: {fileID: 2126159576915401760} xianlan: {fileID: 1168817491} uiToCabinet: {fileID: 4362348816482923669} xunJianImg: {fileID: 1453142316} diff --git a/GQ_TongXin/Assets/Scripts/SearchName.cs b/GQ_TongXin/Assets/Scripts/SearchName.cs index 0a00a5785..cbd5a6107 100644 --- a/GQ_TongXin/Assets/Scripts/SearchName.cs +++ b/GQ_TongXin/Assets/Scripts/SearchName.cs @@ -217,7 +217,7 @@ public class SearchName : MonoBehaviour } //TransparentGlowManage.Inst.transparencyALL(t.ToArray()); - CreateLine createLine = PatternChoose.Inst.transform.Find("").GetComponent(); + CreateLine createLine = PatternChoose.Inst.huaXian; //var lines = createLine.xianLan.Find(objs[i].GetComponent().portList.remark).GetComponent().lines; @@ -350,7 +350,7 @@ public class SearchName : MonoBehaviour Dictionary dic = new Dictionary(); - CreateLine createLine = PatternChoose.Inst.transform.Find("").GetComponent(); + CreateLine createLine = PatternChoose.Inst.huaXian; for (int i = 0; i < createLine.list7.Count; i++) { diff --git a/GQ_TongXin/Assets/Scripts/WJ/RoomDoor.cs b/GQ_TongXin/Assets/Scripts/WJ/RoomDoor.cs index cb66e54b0..75a60f841 100644 --- a/GQ_TongXin/Assets/Scripts/WJ/RoomDoor.cs +++ b/GQ_TongXin/Assets/Scripts/WJ/RoomDoor.cs @@ -26,49 +26,83 @@ public class RoomDoor : MonoBehaviour private void OnMouseDown() { - if (!EventSystem.current.IsPointerOverGameObject() && is_open) + if (!EventSystem.current.IsPointerOverGameObject()) { - DoorClose(); - } - else - { - DoorOpen(); + if (is_open) + { + DoorClose(); + } + else + { + DoorOpen(); + } } } - public void DoorOpen() + /// + /// + /// + /// Ƿǿƴ + public void DoorOpen(bool _force_open = false) { - if (!is_rotating) + if (_force_open) { - Debug.Log("ʼ"); - //DOTween.Kill(transform, false); + DOTween.Kill(transform); is_rotating = true; //DOTween.To(() => transform.localEulerAngles, v => transform.localEulerAngles = v, open_angle, 0.5f).OnComplete(() => { is_rotating = false; is_open = true; }); transform.DOLocalRotate(open_angle, 0.5f).OnComplete(() => { - Debug.Log(""); is_rotating = false; is_open = true; }); if (another_door) another_door.DoorOpen(); } + else + { + if (!is_rotating) + { + //DOTween.Kill(transform, false); + is_rotating = true; + //DOTween.To(() => transform.localEulerAngles, v => transform.localEulerAngles = v, open_angle, 0.5f).OnComplete(() => { is_rotating = false; is_open = true; }); + transform.DOLocalRotate(open_angle, 0.5f).OnComplete(() => + { + is_rotating = false; is_open = true; + }); + if (another_door) + another_door.DoorOpen(); + } + } } - public void DoorClose() + public void DoorClose(bool _force_close = false) { - if (!is_rotating) + if (_force_close) { - Debug.Log("ؿʼ"); - //DOTween.Kill(transform, false); + DOTween.Kill(transform); is_rotating = true; //DOTween.To(() => transform.localEulerAngles, v => transform.localEulerAngles = v, close_angle, 0.5f).OnComplete(() => { is_rotating = false; is_open = false; }); transform.DOLocalRotate(close_angle, 0.5f).OnComplete(() => { - Debug.Log("ؽ"); is_rotating = false; is_open = false; }); if (another_door) another_door.DoorClose(); } + else + { + if (!is_rotating) + { + //DOTween.Kill(transform, false); + is_rotating = true; + //DOTween.To(() => transform.localEulerAngles, v => transform.localEulerAngles = v, close_angle, 0.5f).OnComplete(() => { is_rotating = false; is_open = false; }); + transform.DOLocalRotate(close_angle, 0.5f).OnComplete(() => + { + is_rotating = false; is_open = false; + }); + if (another_door) + another_door.DoorClose(); + } + + } } } diff --git a/GQ_TongXin/Assets/Scripts/WJ/UIToCabinet.cs b/GQ_TongXin/Assets/Scripts/WJ/UIToCabinet.cs index a3103f27c..3550720f1 100644 --- a/GQ_TongXin/Assets/Scripts/WJ/UIToCabinet.cs +++ b/GQ_TongXin/Assets/Scripts/WJ/UIToCabinet.cs @@ -70,7 +70,7 @@ public class UIToCabinet : MonoBehaviour return; if (ison) { - CreateLine createLine = PatternChoose.Inst.transform.Find("").GetComponent(); + CreateLine createLine = PatternChoose.Inst.huaXian; UI_init(); Debug.Log("" + index); @@ -203,7 +203,7 @@ public class UIToCabinet : MonoBehaviour { init(Menu.M___չʾ); //ExtendedFlycam.Inst.QuanJing(); - //CreateLine createLine = PatternChoose.Inst.transform.Find("").GetComponent(); + //CreateLine createLine = PatternChoose.Inst.huaXian; createLine.OnMenuChanged(Menu.M___չʾ); ExtendedFlycam.Inst.QieHuan(Menu.M___չʾ); CabinetUIManager.ChangeMenu(Menu.M___չʾ); @@ -213,7 +213,7 @@ public class UIToCabinet : MonoBehaviour { init(Menu.M__); //ExtendedFlycam.Inst.QuanJing(); - GameManager.Inst.power_open(); + //GameManager.Inst.power_open(); //GameManager.Inst.objectToShow_add.SetActive(true); var SN1 = GameManager.Inst.objectToShow_add.GetComponent(); SN1.hide_menu(); @@ -287,7 +287,7 @@ public class UIToCabinet : MonoBehaviour { init(Menu.M___); //ExtendedFlycam.Inst.QuanJing(); - GameManager.Inst.power_open(); + //GameManager.Inst.power_open(); ExtendedFlycam.Inst.QieHuan(Menu.M___); CabinetUIManager.ChangeMenu(Menu.M___); } @@ -392,7 +392,7 @@ public class UIToCabinet : MonoBehaviour if (WebInteraction.Inst.isWorkPlay && menu != Menu.M_ȫ_ֳҵ) WebInteraction.Inst.CloseTicket(); - CreateLine createLine = PatternChoose.Inst.transform.Find("").GetComponent(); + CreateLine createLine = PatternChoose.Inst.huaXian; if (!CheckAllChildrenActive(createLine.gameObject) && menu != Menu.M___չʾ) { for (int i = 0; i < createLine.transform.childCount; i++) diff --git a/GQ_TongXin/Assets/UI/新建-空白-画面.png b/GQ_TongXin/Assets/UI/新建-空白-画面.png new file mode 100644 index 000000000..25a36eedd Binary files /dev/null and b/GQ_TongXin/Assets/UI/新建-空白-画面.png differ diff --git a/GQ_TongXin/Assets/UI/新建-空白-画面.png.meta b/GQ_TongXin/Assets/UI/新建-空白-画面.png.meta new file mode 100644 index 000000000..b88bf9d83 --- /dev/null +++ b/GQ_TongXin/Assets/UI/新建-空白-画面.png.meta @@ -0,0 +1,134 @@ +fileFormatVersion: 2 +guid: 98491c35edffacc4db7b3b3979dbb7fa +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + 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: 0 + 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 + 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: 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: diff --git a/GQ_TongXin/Assets/UI/箭头标志_爱给网_aigei_com (1).png b/GQ_TongXin/Assets/UI/箭头标志_爱给网_aigei_com (1).png new file mode 100644 index 000000000..e938576d1 Binary files /dev/null and b/GQ_TongXin/Assets/UI/箭头标志_爱给网_aigei_com (1).png differ diff --git a/GQ_TongXin/Assets/UI/箭头标志_爱给网_aigei_com (1).png.meta b/GQ_TongXin/Assets/UI/箭头标志_爱给网_aigei_com (1).png.meta new file mode 100644 index 000000000..6d4d81475 --- /dev/null +++ b/GQ_TongXin/Assets/UI/箭头标志_爱给网_aigei_com (1).png.meta @@ -0,0 +1,134 @@ +fileFormatVersion: 2 +guid: 1831980f7ab6c1848b5dfb3a3cf2201a +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + 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: 0 + 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 + 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: 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: diff --git a/GQ_TongXin/Assets/UI/透明箭头.png b/GQ_TongXin/Assets/UI/透明箭头.png new file mode 100644 index 000000000..246e08d5c Binary files /dev/null and b/GQ_TongXin/Assets/UI/透明箭头.png differ diff --git a/GQ_TongXin/Assets/UI/透明箭头.png.meta b/GQ_TongXin/Assets/UI/透明箭头.png.meta new file mode 100644 index 000000000..c02a43fe4 --- /dev/null +++ b/GQ_TongXin/Assets/UI/透明箭头.png.meta @@ -0,0 +1,134 @@ +fileFormatVersion: 2 +guid: c6b95884f8672b84da447b6fe42c473a +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + 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: 0 + 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 + 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: 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: diff --git a/GQ_TongXin/Assets/script/GameManager.cs b/GQ_TongXin/Assets/script/GameManager.cs index afeb6815b..afd7060a4 100644 --- a/GQ_TongXin/Assets/script/GameManager.cs +++ b/GQ_TongXin/Assets/script/GameManager.cs @@ -1139,7 +1139,7 @@ public class GameManager : MonoBehaviour })/*.Select(item => item.gameObject).ToArray()*/; var P_list = FindObjectGroups(pqs.ToList()); - CreateLine createLine = PatternChoose.Inst.transform.Find("画线").GetComponent(); + CreateLine createLine = PatternChoose.Inst.huaXian.GetComponent(); createLine.list7.Clear(); foreach (var item in P_list) @@ -1514,7 +1514,8 @@ public class GameManager : MonoBehaviour for (int i = 0; i < roomDoors.Count; i++) { - roomDoors[i].DoorClose(); + if (roomDoors[i].is_open) + roomDoors[i].DoorClose(true); } } @@ -1558,7 +1559,8 @@ public class GameManager : MonoBehaviour for (int i = 0; i < roomDoors.Count; i++) { - roomDoors[i].DoorOpen(); + if(!roomDoors[i].is_open) + roomDoors[i].DoorOpen(true); } } @@ -1568,7 +1570,6 @@ public class GameManager : MonoBehaviour /// public void power_open(GameObject cabinet, string type) { - Debug.Log("开开始112312321"); #region old //if (type == "前门") //{ @@ -1627,31 +1628,31 @@ public class GameManager : MonoBehaviour { if (doors.Length > 2) { - cabinet.transform.GetChild(0).GetComponent().DoorOpen(); - cabinet.transform.GetChild(1).GetComponent().DoorOpen(); + cabinet.transform.GetChild(0).GetComponent().DoorOpen(true); + cabinet.transform.GetChild(1).GetComponent().DoorOpen(true); } else { - cabinet.transform.GetChild(0).GetComponent().DoorOpen(); + cabinet.transform.GetChild(0).GetComponent().DoorOpen(true); } } else if (type == "后门") { if (doors.Length > 2) { - cabinet.transform.GetChild(2).GetComponent().DoorOpen(); - cabinet.transform.GetChild(3).GetComponent().DoorOpen(); + cabinet.transform.GetChild(2).GetComponent().DoorOpen(true); + cabinet.transform.GetChild(3).GetComponent().DoorOpen(true); } else { - cabinet.transform.GetChild(1).GetComponent().DoorOpen(); + cabinet.transform.GetChild(1).GetComponent().DoorOpen(true); } } else if (type == "全开") { for (int i = 0; i < doors.Length; i++) { - doors[i].DoorOpen(); + doors[i].DoorOpen(true); } } } @@ -1724,31 +1725,31 @@ public class GameManager : MonoBehaviour { if (doors.Length > 2) { - cabinet.transform.GetChild(0).GetComponent().DoorClose(); - cabinet.transform.GetChild(1).GetComponent().DoorClose(); + cabinet.transform.GetChild(0).GetComponent().DoorClose(true); + cabinet.transform.GetChild(1).GetComponent().DoorClose(true); } else { - cabinet.transform.GetChild(0).GetComponent().DoorClose(); + cabinet.transform.GetChild(0).GetComponent().DoorClose(true); } } else if (type == "后门") { if (doors.Length > 2) { - cabinet.transform.GetChild(2).GetComponent().DoorClose(); - cabinet.transform.GetChild(3).GetComponent().DoorClose(); + cabinet.transform.GetChild(2).GetComponent().DoorClose(true); + cabinet.transform.GetChild(3).GetComponent().DoorClose(true); } else { - cabinet.transform.GetChild(1).GetComponent().DoorClose(); + cabinet.transform.GetChild(1).GetComponent().DoorClose(true); } } else if (type == " 全开") { for (int i = 0; i < doors.Length; i++) { - doors[i].DoorClose(); + doors[i].DoorClose(true); } } } diff --git a/GQ_TongXin/Assets/script/UI/PatternChoose.cs b/GQ_TongXin/Assets/script/UI/PatternChoose.cs index 15bcbead5..25aec0496 100644 --- a/GQ_TongXin/Assets/script/UI/PatternChoose.cs +++ b/GQ_TongXin/Assets/script/UI/PatternChoose.cs @@ -48,6 +48,7 @@ public class PatternChoose : MonoBehaviour /// 端口编辑窗口 /// public GameObject dk_bj_page; + public CreateLine huaXian; /// /// 线缆 /// diff --git a/GQ_TongXin/Assets/script/摄像头/ClickEventLens.cs b/GQ_TongXin/Assets/script/摄像头/ClickEventLens.cs index 1cb126f3f..5c329172f 100644 --- a/GQ_TongXin/Assets/script/摄像头/ClickEventLens.cs +++ b/GQ_TongXin/Assets/script/摄像头/ClickEventLens.cs @@ -9,7 +9,8 @@ public class ClickEventLens : MonoBehaviour { public List clickEventLens = new List(); public AutoScaleUI scaleUI; - public Transform lensUI; + public Transform lensUI_tranform; + public LensUI lensUI; public static Transform Camera; @@ -24,8 +25,9 @@ public class ClickEventLens : MonoBehaviour { mycollider = gameObject.GetComponent(); clickEventLens = GameObject.FindObjectsOfType().ToList(); - lensUI = transform.GetChild(0); - scaleUI = lensUI.GetComponent(); + lensUI_tranform = transform.GetChild(0); + lensUI = lensUI_tranform.GetComponent(); + scaleUI = lensUI_tranform.GetComponent(); button = scaleUI.button; text = scaleUI.text; material = GetComponent().materials[0]; @@ -45,19 +47,20 @@ public class ClickEventLens : MonoBehaviour else mycollider.enabled = false; } - lensUI.eulerAngles = Camera.eulerAngles; + lensUI_tranform.eulerAngles = Camera.eulerAngles; } private void OnMouseEnter() { - lensUI.gameObject.SetActive(true); + lensUI_tranform.gameObject.SetActive(true); + lensUI.maodian.position = Input.mousePosition; if (!isplay) ChangeMaterialColor(gameObject, 1); } private void OnMouseExit() { - lensUI.gameObject.SetActive(false); + lensUI_tranform.gameObject.SetActive(false); if (!isplay) ChangeMaterialColor(gameObject, 99); } diff --git a/GQ_TongXin/Assets/script/摄像头/LensUI.cs b/GQ_TongXin/Assets/script/摄像头/LensUI.cs index 03e6ab161..28347b074 100644 --- a/GQ_TongXin/Assets/script/摄像头/LensUI.cs +++ b/GQ_TongXin/Assets/script/摄像头/LensUI.cs @@ -41,7 +41,7 @@ public class LensUI : CabinetUIBase // Update is called once per frame void Update() { - maodian.transform.eulerAngles = Camera.eulerAngles; + //maodian.transform.eulerAngles = Camera.eulerAngles; } public override void OnMenuChanged(Menu menu) diff --git a/GQ_TongXin/Assets/script/点击/ClickEvent.cs b/GQ_TongXin/Assets/script/点击/ClickEvent.cs index 2cdcb5d64..28c153949 100644 --- a/GQ_TongXin/Assets/script/点击/ClickEvent.cs +++ b/GQ_TongXin/Assets/script/点击/ClickEvent.cs @@ -679,59 +679,70 @@ public class ClickEvent : MonoBehaviour if (Menu.M_ȫ_״̬ != CabinetUIManager.Instance.current_menu) { + #region old + //if (isZoomin) + //{ + // for (int i = 0; i < GameManager.Inst.Cabinets_go.Count; i++) + // { + // if (cabine == GameManager.Inst.Cabinets_go[i]) + // { + // if (cabine.transform.Find("Ű") == null || GameManager.Inst.Cabinets_go[i].transform.Find("Ű") == null) + // continue; + // var door = cabine.transform.Find("Ű").GetComponentInChildren(true); + + // GameManager.Inst.power_open(cabine, "ȫ"); + // //door.TextMeshProUGUI.text = ""; + // door.isopen = !door.isopen; + // } + // else if (cabine && cabine != GameManager.Inst.Cabinets_go[i]) + // { + // if (GameManager.Inst.Cabinets_go[i].transform.Find("Ű") == null || + // !GameManager.Inst.Cabinets_go[i].activeSelf) + // continue; + // var door = GameManager.Inst.Cabinets_go[i].transform.Find("Ű").GetComponentInChildren(true); + + + // GameManager.Inst.power_close(GameManager.Inst.Cabinets_go[i], "ȫ"); + // //door.TextMeshProUGUI.text = ""; + // door.isopen = !door.isopen; + // } + + // } + // for (int i = 0; i < GameManager.Inst.Racks_go.Count; i++) + // { + // if (!GameManager.Inst.Racks_go[i].activeSelf) + // continue; + // if (GameManager.Inst.Racks_go[i].GetComponent().deviceList.modelNum == "6" || + // GameManager.Inst.Racks_go[i].GetComponent().deviceList.modelNum == "7") + // GameManager.Inst.Racks_go[i].transform.Find("ǰ").gameObject.SetActive(false); + // } + //} + //else + //{ + // if (cabine && cabine == gameObject && cabine.transform.Find("Ű")) + // { + // var door = cabine.transform.Find("Ű").GetComponentInChildren(true); + // //if (door.TextMeshProUGUI.text == "") return; + // GameManager.Inst.power_close(cabine, "ȫ"); + // //door.TextMeshProUGUI.text = ""; + // door.isopen = !door.isopen; + // } + // for (int i = 0; i < GameManager.Inst.Racks_go.Count; i++) + // { + // if (GameManager.Inst.Racks_go[i].GetComponent().deviceList.modelNum == "6" || + // GameManager.Inst.Racks_go[i].GetComponent().deviceList.modelNum == "7") + // GameManager.Inst.Racks_go[i].transform.Find("ǰ").gameObject.SetActive(true); + // } + //} + #endregion if (isZoomin) { - for (int i = 0; i < GameManager.Inst.Cabinets_go.Count; i++) - { - if (cabine == GameManager.Inst.Cabinets_go[i]) - { - if (cabine.transform.Find("Ű") == null || GameManager.Inst.Cabinets_go[i].transform.Find("Ű") == null) - continue; - var door = cabine.transform.Find("Ű").GetComponentInChildren(true); - - GameManager.Inst.power_open(cabine, "ȫ"); - //door.TextMeshProUGUI.text = ""; - door.isopen = !door.isopen; - } - else if (cabine && cabine != GameManager.Inst.Cabinets_go[i]) - { - if (GameManager.Inst.Cabinets_go[i].transform.Find("Ű") == null || - !GameManager.Inst.Cabinets_go[i].activeSelf) - continue; - var door = GameManager.Inst.Cabinets_go[i].transform.Find("Ű").GetComponentInChildren(true); - - - GameManager.Inst.power_close(GameManager.Inst.Cabinets_go[i], "ȫ"); - //door.TextMeshProUGUI.text = ""; - door.isopen = !door.isopen; - } - - } - for (int i = 0; i < GameManager.Inst.Racks_go.Count; i++) - { - if (!GameManager.Inst.Racks_go[i].activeSelf) - continue; - if (GameManager.Inst.Racks_go[i].GetComponent().deviceList.modelNum == "6" || - GameManager.Inst.Racks_go[i].GetComponent().deviceList.modelNum == "7") - GameManager.Inst.Racks_go[i].transform.Find("ǰ").gameObject.SetActive(false); - } + GameManager.Inst.power_close(); + GameManager.Inst.power_open(cabine, "ȫ"); } else { - if (cabine && cabine == gameObject && cabine.transform.Find("Ű")) - { - var door = cabine.transform.Find("Ű").GetComponentInChildren(true); - //if (door.TextMeshProUGUI.text == "") return; - GameManager.Inst.power_close(cabine, "ȫ"); - //door.TextMeshProUGUI.text = ""; - door.isopen = !door.isopen; - } - for (int i = 0; i < GameManager.Inst.Racks_go.Count; i++) - { - if (GameManager.Inst.Racks_go[i].GetComponent().deviceList.modelNum == "6" || - GameManager.Inst.Racks_go[i].GetComponent().deviceList.modelNum == "7") - GameManager.Inst.Racks_go[i].transform.Find("ǰ").gameObject.SetActive(true); - } + GameManager.Inst.power_close(); } } } diff --git a/GQ_TongXin/Assets/script/画线/CreateLine.cs b/GQ_TongXin/Assets/script/画线/CreateLine.cs index e2db472e3..098de3ada 100644 --- a/GQ_TongXin/Assets/script/画线/CreateLine.cs +++ b/GQ_TongXin/Assets/script/画线/CreateLine.cs @@ -159,7 +159,7 @@ public class CreateLine : CabinetUIBase catch (Exception e) { Debug.Log("匹配线缆颜色错误 " + e.Message + "\n" + e.StackTrace); - return; + init(lineColor); } List vector3s = new List(); @@ -249,15 +249,12 @@ public class CreateLine : CabinetUIBase { init(x); }); - //HexToColor(PatternChoose.Inst.xianlan.lineCode_dic[p.portType], (x) => - //{ - // lineRenderer.endColor = x; - //}); + } catch (Exception e) { Debug.Log("匹配线缆颜色错误 " + e.Message + "\n" + e.StackTrace); - return; + init(lineColor); } List vector3s = new List(); diff --git a/GQ_TongXin/Assets/script/画线/LineInfor.cs b/GQ_TongXin/Assets/script/画线/LineInfor.cs index 92334717d..fec84719e 100644 --- a/GQ_TongXin/Assets/script/画线/LineInfor.cs +++ b/GQ_TongXin/Assets/script/画线/LineInfor.cs @@ -10,7 +10,7 @@ using UnityEngine.UI; [Serializable] public class LineInfor : MonoBehaviour { - InputField t; + //InputField t; [HideInInspector] public Root root; public List lines = new List(); @@ -20,9 +20,30 @@ public class LineInfor : MonoBehaviour LineRenderer lineRenderer; + public float speed = 1f; // 线流动的速度 + + private Material material; + private Vector2 tiling; + private Vector2 offset; + private int mainTexProperty; + // 线长 + [SerializeField] private float lineLen; + // 密度 + [SerializeField] + private float density = 2f; + // 定时器 + [SerializeField] private float timer = 0; + // 频率间隔 + [SerializeField] + private float frequency = 0.03f; + //爬行速度 + [SerializeField] + private float moveSpeed = 0.04f; + private void Awake() { lineRenderer = GetComponent(); + //if (PlayerPrefs.HasKey(this.root.myID)) //{ // string json = PlayerPrefs.GetString(root.myID); @@ -31,8 +52,36 @@ public class LineInfor : MonoBehaviour // this.root.otherID = myObject.otherID; //} } + + private void Start() + { + //// 缓存材质实例 + //material = lineRenderer.material; + //// 缓存属性id，防止下面设置属性的时候重复计算名字的哈希 + //mainTexProperty = Shader.PropertyToID("_MainTex"); + + //tiling = new Vector2(20, 0); + //offset = new Vector2(0, 0); + //// 设置Tiling + //material.SetTextureScale(mainTexProperty, tiling); + //// 设置Offset + //material.SetTextureOffset(mainTexProperty, offset); + + + //lineLen = (lineRenderer.GetPosition(1) - lineRenderer.GetPosition(0)).magnitude; + //// 根据线段长度计算Tiling + //tiling = new Vector2(lineLen * density, 0); + //// 设置Tiling + //material.SetTextureScale(mainTexProperty, tiling); + + } + private void Update() { + //if (portType == "电缆线") + //{ + // run_line(); + //} //if (!string.IsNullOrEmpty(root.otherID)) return; //root.otherID = t.text; //if (string.IsNullOrEmpty(root.otherID)) return; @@ -41,7 +90,7 @@ public class LineInfor : MonoBehaviour //PlayerPrefs.SetString(root.myID, json); //PlayerPrefs.Save(); - if (GameManager.Inst.magnifyState) + if (GameManager.Inst.magnifyState) { if (lineRenderer.startWidth == lineWidth_min) return; @@ -55,6 +104,27 @@ public class LineInfor : MonoBehaviour } } + + + public void run_line() + { + // 计算线长度 + lineLen = (lineRenderer.GetPosition(1) - lineRenderer.GetPosition(0)).magnitude; + // 根据线段长度计算Tiling + tiling = new Vector2(lineLen * density, 0); + + // 设置Tiling + material.SetTextureScale(mainTexProperty, tiling); + + timer += Time.deltaTime; + if (timer >= frequency) + { + timer = 0; + offset -= new Vector2(moveSpeed, 0); + material.SetTextureOffset(mainTexProperty, offset); + } + } + [ContextMenu("查看PlayerPrefs")] void PrintAllPlayerPrefs() { @@ -64,7 +134,7 @@ public class LineInfor : MonoBehaviour // 遍历所有的键 foreach (string key in keys) { - string value = PlayerPrefs.GetString(key); + string value = PlayerPrefs.GetString(key); Debug.Log("Key: " + key + ", Value: " + value); } } @@ -93,7 +163,7 @@ public class LineInfor : MonoBehaviour /// /// [ContextMenu("设置LineRenderer宽度")] - public void setLineWidth(float lineWidth) + public void setLineWidth(float lineWidth) { lineRenderer.startWidth = lineWidth; lineRenderer.endWidth = lineWidth;