This commit is contained in:
lujiajian 2025-02-10 14:18:22 +08:00
parent 2aa6aa3e63
commit ca3af10f61
7 changed files with 1385 additions and 127 deletions

View File

@ -70,9 +70,9 @@ Material:
- _OutlineWidth: 0 - _OutlineWidth: 0
- _PerspectiveFilter: 0.875 - _PerspectiveFilter: 0.875
- _Reflectivity: 10 - _Reflectivity: 10
- _ScaleRatioA: 1 - _ScaleRatioA: 0.8888889
- _ScaleRatioB: 1 - _ScaleRatioB: 0.7222222
- _ScaleRatioC: 1 - _ScaleRatioC: 0.7222222
- _ScaleX: 1 - _ScaleX: 1
- _ScaleY: 1 - _ScaleY: 1
- _ShaderFlags: 0 - _ShaderFlags: 0
@ -117,9 +117,9 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 71c1514a6bd24e1e882cebbe1904ce04, type: 3} m_Script: {fileID: 11500000, guid: 71c1514a6bd24e1e882cebbe1904ce04, type: 3}
m_Name: SourceHanSansCN-Bold SDF m_Name: SourceHanSansCN-Bold SDF
m_EditorClassIdentifier: m_EditorClassIdentifier:
hashCode: 0 hashCode: -88939327
material: {fileID: -9097114584365836468} material: {fileID: -9097114584365836468}
materialHashCode: 0 materialHashCode: -2074064319
m_Version: 1.1.0 m_Version: 1.1.0
m_SourceFontFileGUID: 4c1834c0ca0fc704d902f7495f3d2abd m_SourceFontFileGUID: 4c1834c0ca0fc704d902f7495f3d2abd
m_SourceFontFile_EditorRef: {fileID: 12800000, guid: 4c1834c0ca0fc704d902f7495f3d2abd, type: 3} m_SourceFontFile_EditorRef: {fileID: 12800000, guid: 4c1834c0ca0fc704d902f7495f3d2abd, type: 3}

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.6 KiB

View File

@ -0,0 +1,123 @@
fileFormatVersion: 2
guid: 44d0b0445cb1c3043a8556d1183acb1e
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 12
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
cookieLightType: 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: Android
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:

File diff suppressed because it is too large Load Diff

View File

@ -1,6 +1,7 @@
using System.Collections; using System.Collections;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using TMPro;
using UnityEngine; using UnityEngine;
using UnityEngine.EventSystems; using UnityEngine.EventSystems;
using UnityEngine.UIElements; using UnityEngine.UIElements;
@ -73,6 +74,10 @@ public class ClickModelType : MonoBehaviour
/// </summary> /// </summary>
public GameObject Oneclickmode; public GameObject Oneclickmode;
/// <summary> /// <summary>
/// ¹ÊÕÏÌáÊ¾Ãæ°å
/// </summary>
public GameObject TroubleshootingPanel;
/// <summary>
/// 当前区域类型 /// 当前区域类型
/// </summary> /// </summary>
public Transform regionType; public Transform regionType;
@ -114,6 +119,7 @@ public class ClickModelType : MonoBehaviour
TvPanel.SetActive(false); TvPanel.SetActive(false);
LinkPanel.SetActive(false); LinkPanel.SetActive(false);
Oneclickmode.SetActive(false); Oneclickmode.SetActive(false);
TroubleshootingPanel.SetActive(false);
Control_Light.Instance.LightsModel = new List<Transform>(); Control_Light.Instance.LightsModel = new List<Transform>();
List<ClickModelType> clickModelTypes = FindObjectsOfType<ClickModelType>().ToList(); List<ClickModelType> clickModelTypes = FindObjectsOfType<ClickModelType>().ToList();
for (int i = 0; i < clickModelTypes.Count; i++) for (int i = 0; i < clickModelTypes.Count; i++)
@ -134,6 +140,7 @@ public class ClickModelType : MonoBehaviour
CameraPanel.SetActive(false); CameraPanel.SetActive(false);
LinkPanel.SetActive(false); LinkPanel.SetActive(false);
Oneclickmode.SetActive(false); Oneclickmode.SetActive(false);
TroubleshootingPanel.SetActive(false);
Control_Curtain.Instance.curtain = transform; Control_Curtain.Instance.curtain = transform;
} }
else if (SelectModel.Instance.region == region && typeoffurniture == Typeoffurniture.) else if (SelectModel.Instance.region == region && typeoffurniture == Typeoffurniture.)
@ -147,6 +154,7 @@ public class ClickModelType : MonoBehaviour
CameraPanel.SetActive(false); CameraPanel.SetActive(false);
LinkPanel.SetActive(false); LinkPanel.SetActive(false);
Oneclickmode.SetActive(false); Oneclickmode.SetActive(false);
TroubleshootingPanel.SetActive(false);
} }
else if (SelectModel.Instance.region == region && typeoffurniture == Typeoffurniture.) else if (SelectModel.Instance.region == region && typeoffurniture == Typeoffurniture.)
{ {
@ -158,6 +166,7 @@ public class ClickModelType : MonoBehaviour
CameraPanel.SetActive(false); CameraPanel.SetActive(false);
LinkPanel.SetActive(false); LinkPanel.SetActive(false);
Oneclickmode.SetActive(false); Oneclickmode.SetActive(false);
TroubleshootingPanel.SetActive(false);
Control_Air.Instance.airobject = transform; Control_Air.Instance.airobject = transform;
} }
else if (SelectModel.Instance.region == region && typeoffurniture == Typeoffurniture.) else if (SelectModel.Instance.region == region && typeoffurniture == Typeoffurniture.)
@ -170,6 +179,7 @@ public class ClickModelType : MonoBehaviour
CameraPanel.SetActive(false); CameraPanel.SetActive(false);
LinkPanel.SetActive(false); LinkPanel.SetActive(false);
Oneclickmode.SetActive(false); Oneclickmode.SetActive(false);
TroubleshootingPanel.SetActive(false);
Control_Tv.Instance.Tv = transform; Control_Tv.Instance.Tv = transform;
} }
else if (SelectModel.Instance.region == region && typeoffurniture == Typeoffurniture.) else if (SelectModel.Instance.region == region && typeoffurniture == Typeoffurniture.)
@ -182,6 +192,7 @@ public class ClickModelType : MonoBehaviour
CameraPanel.SetActive(true); CameraPanel.SetActive(true);
LinkPanel.SetActive(false); LinkPanel.SetActive(false);
Oneclickmode.SetActive(false); Oneclickmode.SetActive(false);
TroubleshootingPanel.SetActive(false);
//Control_Camera.Instance.Tv = transform; //Control_Camera.Instance.Tv = transform;
} }
} }

View File

@ -0,0 +1,29 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.UI;
public class Troubleshooting : MonoBehaviour
{
/// <summary>
/// ÖØÆô°´Å¥
/// </summary>
public Button Rebootbt;
/// <summary>
/// ¹ÊÕÏÃæ°å
/// </summary>
public GameObject TroubleshootingPanel;
void Start()
{
Rebootbt.onClick.AddListener(() =>
{
Control_Tv.Instance.AudiosTalk("¿ªµçÊÓ");
Control_Tv.Instance.Tv.GetComponent<BoxCollider>().enabled = true;
TroubleshootingPanel.SetActive(false);
});
}
void Update()
{
}
}

View File

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 8a42f2e79e8885f4ba4e585ae872ea3f
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant: