diff --git a/GQ_TongXin/Assets/GameAssets.meta b/GQ_TongXin/Assets/GameAssets.meta new file mode 100644 index 000000000..55243d18a --- /dev/null +++ b/GQ_TongXin/Assets/GameAssets.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 450e9a34d9d27bc4791b1bee636a0bc8 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/GQ_TongXin/Assets/GameAssets/Shaders.meta b/GQ_TongXin/Assets/GameAssets/Shaders.meta new file mode 100644 index 000000000..9306f42e2 --- /dev/null +++ b/GQ_TongXin/Assets/GameAssets/Shaders.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6783701eef3201b41b482930491659db +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/GQ_TongXin/Assets/GameAssets/Shaders/UIOverlay.shader b/GQ_TongXin/Assets/GameAssets/Shaders/UIOverlay.shader new file mode 100644 index 000000000..eaf5fb350 --- /dev/null +++ b/GQ_TongXin/Assets/GameAssets/Shaders/UIOverlay.shader @@ -0,0 +1,104 @@ +// UNITY_SHADER_NO_UPGRADE +Shader "UI/Overlay" +{ + Properties + { + [PerRendererData] _MainTex("Font Texture", 2D) = "white" {} + + _Color("Tint", Color) = (1,1,1,1) + + _StencilComp("Stencil Comparison", Float) = 8 + _Stencil("Stencil ID", Float) = 0 + _StencilOp("Stencil Operation", Float) = 0 + _StencilWriteMask("Stencil Write Mask", Float) = 255 + _StencilReadMask("Stencil Read Mask", Float) = 255 + + _ColorMask("Color Mask", Float) = 15 + } + + SubShader + { + LOD 100 + + Tags + { + "Queue" = "Transparent" + "IgnoreProjector" = "True" + "RenderType" = "Transparent" + "PreviewType" = "Plane" + "CanUseSpriteAtlas" = "True" + } + + Stencil + { + Ref[_Stencil] + Comp[_StencilComp] + Pass[_StencilOp] + ReadMask[_StencilReadMask] + WriteMask[_StencilWriteMask] + } + + Cull Off + Lighting Off + ZWrite Off + //ZTest[unity_GUIZTestMode] + ZTest Always + Offset -1, -1 + //Blend SrcAlpha OneMinusSrcAlpha + Blend SrcAlpha OneMinusSrcAlpha + ColorMask[_ColorMask] + + Pass + { + CGPROGRAM + #pragma vertex vert + #pragma fragment frag + #include "UnityCG.cginc" + #include "UnityUI.cginc" + + struct appdata_t + { + float4 vertex : POSITION; + float2 texcoord : TEXCOORD0; + float4 color : COLOR; + }; + + struct v2f + { + float4 vertex : SV_POSITION; + half2 texcoord : TEXCOORD0; + fixed4 color : COLOR; + }; + + sampler2D _MainTex; + float4 _MainTex_ST; + fixed4 _Color; + fixed4 _TextureSampleAdd; + + v2f vert(appdata_t v) + { + v2f o; + #if UNITY_VERSION >= 560 + o.vertex = UnityObjectToClipPos(v.vertex); + #else + o.vertex = mul(UNITY_MATRIX_MVP, v.vertex); + #endif + o.texcoord = TRANSFORM_TEX(v.texcoord, _MainTex); + o.color = v.color * _Color; + #ifdef UNITY_HALF_TEXEL_OFFSET + o.vertex.xy += (_ScreenParams.zw - 1.0)*float2(-1,1); + #endif + + return o; + } + + fixed4 frag(v2f i) : SV_Target + { + fixed4 col = (tex2D(_MainTex, i.texcoord) + _TextureSampleAdd) * i.color; + clip(col.a - 0.01); + return col; + } + ENDCG + } + } +} \ No newline at end of file diff --git a/GQ_TongXin/Assets/GameAssets/Shaders/UIOverlay.shader.meta b/GQ_TongXin/Assets/GameAssets/Shaders/UIOverlay.shader.meta new file mode 100644 index 000000000..e5f8219c3 --- /dev/null +++ b/GQ_TongXin/Assets/GameAssets/Shaders/UIOverlay.shader.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 4dfa86dbf58bdd44db74a50e1e7935b8 +ShaderImporter: + externalObjects: {} + defaultTextures: [] + nonModifiableTextures: [] + preprocessorOverride: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/GQ_TongXin/Assets/GameAssets/Shaders/UI_Overlay.mat b/GQ_TongXin/Assets/GameAssets/Shaders/UI_Overlay.mat new file mode 100644 index 000000000..387fdf4b1 --- /dev/null +++ b/GQ_TongXin/Assets/GameAssets/Shaders/UI_Overlay.mat @@ -0,0 +1,37 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: UI_Overlay + m_Shader: {fileID: 4800000, guid: 4dfa86dbf58bdd44db74a50e1e7935b8, type: 3} + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 2999 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _ColorMask: 15 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/GQ_TongXin/Assets/GameAssets/Shaders/UI_Overlay.mat.meta b/GQ_TongXin/Assets/GameAssets/Shaders/UI_Overlay.mat.meta new file mode 100644 index 000000000..f100eb03a --- /dev/null +++ b/GQ_TongXin/Assets/GameAssets/Shaders/UI_Overlay.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 3a3b5242babc65a4c898f644975a9f50 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/GQ_TongXin/Assets/Resources/Prefabs/温湿度图标/温湿度.prefab b/GQ_TongXin/Assets/Resources/Prefabs/温湿度图标/温湿度.prefab index cf9b3b95b..ca708455a 100644 --- a/GQ_TongXin/Assets/Resources/Prefabs/温湿度图标/温湿度.prefab +++ b/GQ_TongXin/Assets/Resources/Prefabs/温湿度图标/温湿度.prefab @@ -1,5 +1,85 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &70541696378742185 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 785272239001180448} + - component: {fileID: 1000062609473158365} + - component: {fileID: 3083355702494639820} + m_Layer: 5 + m_Name: Text (Legacy) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &785272239001180448 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 70541696378742185} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -0} + m_LocalScale: {x: 0.2, y: 0.2, z: 0.2} + m_ConstrainProportionsScale: 1 + m_Children: [] + m_Father: {fileID: 6206996800221561050} + m_RootOrder: 1 + 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: 20, y: -2} + m_SizeDelta: {x: 320, y: 120} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1000062609473158365 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 70541696378742185} + m_CullTransparentMesh: 1 +--- !u!114 &3083355702494639820 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 70541696378742185} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 2100000, guid: 3a3b5242babc65a4c898f644975a9f50, type: 2} + m_Color: {r: 0.54509807, g: 0.9254902, b: 0.7176471, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 100 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 1 + m_MaxSize: 100 + m_Alignment: 3 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "26\u2103" --- !u!1 &6206996799658441977 GameObject: m_ObjectHideFlags: 0 @@ -17,7 +97,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &6206996799658441976 RectTransform: m_ObjectHideFlags: 0 @@ -172,7 +252,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 52, y: 45} + m_SizeDelta: {x: 33, y: 28} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6206996799779127838 CanvasRenderer: @@ -233,6 +313,7 @@ MonoBehaviour: wendu_expand: {fileID: 21300000, guid: 5b1b5e55f3cd87f4886d3bb9c4f68651, type: 3} shidu_expand: {fileID: 21300000, guid: 103d978a53ab87c48b69a1bd50d86390, type: 3} textMeshPro: {fileID: 6206996799658441959} + text: {fileID: 0} --- !u!1 &6206996799886426827 GameObject: m_ObjectHideFlags: 0 @@ -311,6 +392,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 6206996799658441976} + - {fileID: 785272239001180448} m_Father: {fileID: 6206996800505932346} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -339,7 +421,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 0} + m_Material: {fileID: 2100000, guid: 3a3b5242babc65a4c898f644975a9f50, type: 2} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} @@ -378,6 +460,7 @@ MonoBehaviour: wendu_expand: {fileID: 21300000, guid: 5b1b5e55f3cd87f4886d3bb9c4f68651, type: 3} shidu_expand: {fileID: 21300000, guid: 103d978a53ab87c48b69a1bd50d86390, type: 3} textMeshPro: {fileID: 6206996799658441959} + text: {fileID: 3083355702494639820} --- !u!1 &6206996800505932347 GameObject: m_ObjectHideFlags: 0 diff --git a/GQ_TongXin/Assets/Scenes/MainScene_bkup.unity b/GQ_TongXin/Assets/Scenes/MainScene_bkup.unity index 445c8b3bc..50c7e9e0e 100644 --- a/GQ_TongXin/Assets/Scenes/MainScene_bkup.unity +++ b/GQ_TongXin/Assets/Scenes/MainScene_bkup.unity @@ -141538,6 +141538,7 @@ GameObject: - component: {fileID: 3383533715307974686} - component: {fileID: 3383533715307974658} - component: {fileID: 2089257545} + - component: {fileID: 3383533715307974688} m_Layer: 5 m_Name: "\u573A\u666FCanvas" m_TagString: Untagged @@ -141634,6 +141635,19 @@ MonoBehaviour: m_DefaultSpriteDPI: 96 m_DynamicPixelsPerUnit: 1 m_PresetInfoIsWorld: 0 +--- !u!114 &3383533715307974688 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3383533715307974681} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: cda9c274cf3ee2041baedb67c94f2b94, type: 3} + m_Name: + m_EditorClassIdentifier: + toggles: [] --- !u!114 &3383533715309498146 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/GQ_TongXin/Assets/Scripts/WJ/CabinetUIManager.cs b/GQ_TongXin/Assets/Scripts/WJ/CabinetUIManager.cs index f134e3202..3dbeb0f0d 100644 --- a/GQ_TongXin/Assets/Scripts/WJ/CabinetUIManager.cs +++ b/GQ_TongXin/Assets/Scripts/WJ/CabinetUIManager.cs @@ -7,19 +7,25 @@ using UnityEngine.Accessibility; public class CabinetUIManager : MonoBehaviour { + public static CabinetUIManager Instance; public Menu current_menu; public List cabinet_ui_base_list = new List(); + private void Awake() + { + Instance = this; + } + private void Start() { cabinet_ui_base_list = GetComponentsInChildren(true).ToList(); } - public void ChangeMenu(Menu menu) + public static void ChangeMenu(Menu menu) { - current_menu = menu; - cabinet_ui_base_list.ForEach(x => x.OnMenuChanged(menu)); + Instance.current_menu = menu; + Instance.cabinet_ui_base_list.ForEach(x => x.OnMenuChanged(menu)); //switch (menu) //{ // case Menu.M_ȫ_豸澯: diff --git a/GQ_TongXin/Assets/Scripts/WJ/SpUI.cs b/GQ_TongXin/Assets/Scripts/WJ/SpUI.cs index fc79fb389..f7c1c1f00 100644 --- a/GQ_TongXin/Assets/Scripts/WJ/SpUI.cs +++ b/GQ_TongXin/Assets/Scripts/WJ/SpUI.cs @@ -20,6 +20,7 @@ public class SpUI : MonoBehaviour, IPointerEnterHandler, IPointerExitHandler public Sprite shidu_expand; public TextMeshProUGUI textMeshPro; + public Text text; public void OnPointerEnter(PointerEventData eventData) { @@ -30,11 +31,13 @@ public class SpUI : MonoBehaviour, IPointerEnterHandler, IPointerExitHandler my_image.sprite = wendu_selected; expand_image.sprite = wendu_expand; textMeshPro.text = "26C"; + text.text = "26 "; break; case "ʪ": my_image.sprite = shidu_selected; expand_image.sprite = shidu_expand; textMeshPro.text = "40 %"; + text.text = "40 %"; break; default: break; diff --git a/GQ_TongXin/Assets/Scripts/WJ/UIToCabinet.cs b/GQ_TongXin/Assets/Scripts/WJ/UIToCabinet.cs new file mode 100644 index 000000000..c9ea2038b --- /dev/null +++ b/GQ_TongXin/Assets/Scripts/WJ/UIToCabinet.cs @@ -0,0 +1,74 @@ +using System.Collections; +using System.Collections.Generic; +using System.Linq; +using UnityEngine; +using UnityEngine.UI; + +public class UIToCabinet : MonoBehaviour +{ + public List toggles = new List(); + + // Start is called before the first frame update + void Start() + { + toggles = GetComponentsInChildren(true).ToList(); + for (int i = 0; i < toggles.Count; i++) + { + var index = i; + toggles[i].onValueChanged.AddListener((ison) => + { + if (ison) + { + Debug.Log("" + index); + + switch (toggles[index].name) + { + case "Toggle_豸澯": + CabinetUIManager.ChangeMenu(Menu.M_ȫ_豸澯); + break; + case "Toggle_ʪ": + CabinetUIManager.ChangeMenu(Menu.M_ȫ_¶); + break; + case "Toggle_״̬": + CabinetUIManager.ChangeMenu(Menu.M_ȫ_״̬); + break; + case "Toggle_": + CabinetUIManager.ChangeMenu(Menu.M_ȫ_); + break; + case "Toggle_ֳҵ": + CabinetUIManager.ChangeMenu(Menu.M_ȫ_ֳҵ); + break; + case "Toggle_ͷ": + CabinetUIManager.ChangeMenu(Menu.M_ȫ_ͷ); + break; + case "Toggle_": + CabinetUIManager.ChangeMenu(Menu.M__); + break; + case "Toggle_ӵ": + CabinetUIManager.ChangeMenu(Menu.M__ӵ); + break; + case "Toggle_": + CabinetUIManager.ChangeMenu(Menu.M___չʾ); + break; + case "Toggle_": + CabinetUIManager.ChangeMenu(Menu.M__); + break; + case "Toggle_Ѳ": + CabinetUIManager.ChangeMenu(Menu.M__Ѳ); + break; + default: + break; + } + } + }); + } + } + + // Update is called once per frame + void Update() + { + + } + + +} diff --git a/GQ_TongXin/Assets/Scripts/WJ/UIToCabinet.cs.meta b/GQ_TongXin/Assets/Scripts/WJ/UIToCabinet.cs.meta new file mode 100644 index 000000000..43513fcaf --- /dev/null +++ b/GQ_TongXin/Assets/Scripts/WJ/UIToCabinet.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: cda9c274cf3ee2041baedb67c94f2b94 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/GQ_TongXin/Assets/UI/古泉切图/全景监控/温度图标-选中.png b/GQ_TongXin/Assets/UI/古泉切图/全景监控/温度图标-选中.png index 1583d6591..7e64056ca 100644 Binary files a/GQ_TongXin/Assets/UI/古泉切图/全景监控/温度图标-选中.png and b/GQ_TongXin/Assets/UI/古泉切图/全景监控/温度图标-选中.png differ diff --git a/GQ_TongXin/Assets/UI/古泉切图/全景监控/温度图标.png b/GQ_TongXin/Assets/UI/古泉切图/全景监控/温度图标.png index 271a91a91..2dc892045 100644 Binary files a/GQ_TongXin/Assets/UI/古泉切图/全景监控/温度图标.png and b/GQ_TongXin/Assets/UI/古泉切图/全景监控/温度图标.png differ diff --git a/GQ_TongXin/Assets/UI/古泉切图/全景监控/湿度图标-选中.png b/GQ_TongXin/Assets/UI/古泉切图/全景监控/湿度图标-选中.png index 243555bec..51cd66dac 100644 Binary files a/GQ_TongXin/Assets/UI/古泉切图/全景监控/湿度图标-选中.png and b/GQ_TongXin/Assets/UI/古泉切图/全景监控/湿度图标-选中.png differ diff --git a/GQ_TongXin/Assets/UI/古泉切图/全景监控/湿度图标.png b/GQ_TongXin/Assets/UI/古泉切图/全景监控/湿度图标.png index 4a450bbe0..7a2b9fcd4 100644 Binary files a/GQ_TongXin/Assets/UI/古泉切图/全景监控/湿度图标.png and b/GQ_TongXin/Assets/UI/古泉切图/全景监控/湿度图标.png differ