diff --git a/Assets/GameAssets/Materials.meta b/Assets/GameAssets/Materials.meta new file mode 100644 index 0000000..94a25d8 --- /dev/null +++ b/Assets/GameAssets/Materials.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 607d0ba6417b6b1478135e33f186d949 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameAssets/Materials/2、比例2倍.mat b/Assets/GameAssets/Materials/2、比例2倍.mat new file mode 100644 index 0000000..cdd2687 --- /dev/null +++ b/Assets/GameAssets/Materials/2、比例2倍.mat @@ -0,0 +1,80 @@ +%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: "2\u3001\u6BD4\u4F8B2\u500D" + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: 8697ada5fc2822c4a8bf9a26ef417b56, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + m_BuildTextureStacks: [] diff --git a/Assets/GameAssets/Materials/2、比例2倍.mat.meta b/Assets/GameAssets/Materials/2、比例2倍.mat.meta new file mode 100644 index 0000000..c65412b --- /dev/null +++ b/Assets/GameAssets/Materials/2、比例2倍.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b45a3f1f114bb234083b69acb231f7e8 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameAssets/Textures/2、比例2倍.jpg b/Assets/GameAssets/Textures/2、比例2倍.jpg new file mode 100644 index 0000000..9e2db8f Binary files /dev/null and b/Assets/GameAssets/Textures/2、比例2倍.jpg differ diff --git a/Assets/GameAssets/Textures/2、比例2倍.jpg.meta b/Assets/GameAssets/Textures/2、比例2倍.jpg.meta new file mode 100644 index 0000000..84725ba --- /dev/null +++ b/Assets/GameAssets/Textures/2、比例2倍.jpg.meta @@ -0,0 +1,135 @@ +fileFormatVersion: 2 +guid: 8697ada5fc2822c4a8bf9a26ef417b56 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + 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: 0 + wrapV: 0 + 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: 0 + spriteTessellationDetail: -1 + textureType: 0 + 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: WebGL + 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: diff --git a/Assets/GameAssets/Textures/比例2倍.png b/Assets/GameAssets/Textures/比例2倍.png new file mode 100644 index 0000000..c6f39c5 Binary files /dev/null and b/Assets/GameAssets/Textures/比例2倍.png differ diff --git a/Assets/GameAssets/Textures/比例2倍.png.meta b/Assets/GameAssets/Textures/比例2倍.png.meta new file mode 100644 index 0000000..db8c81b --- /dev/null +++ b/Assets/GameAssets/Textures/比例2倍.png.meta @@ -0,0 +1,135 @@ +fileFormatVersion: 2 +guid: bc67b51289f2ccc4ba750cedf16e3782 +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: WebGL + 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: diff --git a/Assets/Resources/UI/UIPanel/UI_TopTipPanel.prefab b/Assets/Resources/UI/UIPanel/UI_TopTipPanel.prefab index 3e0f8e2..733ec5b 100644 --- a/Assets/Resources/UI/UIPanel/UI_TopTipPanel.prefab +++ b/Assets/Resources/UI/UIPanel/UI_TopTipPanel.prefab @@ -282,7 +282,7 @@ GameObject: - component: {fileID: 584153514034556809} - component: {fileID: 7002883869800419636} m_Layer: 5 - m_Name: Image + m_Name: UI_TopTipPanelBG m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 diff --git a/Assets/Scenes/xianchang.unity b/Assets/Scenes/xianchang.unity index 6923a79..f524e0d 100644 --- a/Assets/Scenes/xianchang.unity +++ b/Assets/Scenes/xianchang.unity @@ -1126,6 +1126,7 @@ MonoBehaviour: Lights: {fileID: 44895514} LightPanel: {fileID: 1348712107} Devices: {fileID: 1505539334} + ComputerPanel: {fileID: 525703933} Highlights: - {fileID: 82777335} - {fileID: 2096931764} @@ -1146,8 +1147,8 @@ MonoBehaviour: - {fileID: 189223166} - {fileID: 849744632} - {fileID: 7587113396328959641} - - {fileID: 2112379065} - {fileID: 648595012} + - {fileID: 2112379065} Highlights_Backup: - {fileID: 82777335} - {fileID: 2096931764} @@ -1171,6 +1172,7 @@ MonoBehaviour: - {fileID: 2112379065} - {fileID: 648595012} hightindext: 0 + LineName: line1: line2: --- !u!114 &140014612 @@ -4874,6 +4876,82 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 517604011} m_Mesh: {fileID: 8418363027437880420, guid: e908463f3f6b7e54cb2ffaa2e941c53e, type: 3} +--- !u!1 &525703931 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 525703932} + - component: {fileID: 525703934} + - component: {fileID: 525703933} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &525703932 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 525703931} + 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: [] + m_Father: {fileID: 1451808846} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &525703933 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 525703931} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, 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_Sprite: {fileID: 21300000, guid: bc67b51289f2ccc4ba750cedf16e3782, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &525703934 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 525703931} + m_CullTransparentMesh: 1 --- !u!1 &527703067 GameObject: m_ObjectHideFlags: 0 @@ -7076,7 +7154,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 6282401d280c18d488e073bf54edbc11, type: 3} m_Name: m_EditorClassIdentifier: - interfaceType: 47 + interfaceType: 48 IsNotLine: 1 --- !u!65 &648595008 BoxCollider: @@ -12570,6 +12648,108 @@ PrefabInstance: m_RemovedComponents: - {fileID: 2399593117623680743, guid: 86a8666f9623b6b46b8f4b860a11546f, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 86a8666f9623b6b46b8f4b860a11546f, type: 3} +--- !u!1 &1451808842 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1451808846} + - component: {fileID: 1451808845} + - component: {fileID: 1451808844} + - component: {fileID: 1451808843} + m_Layer: 5 + m_Name: "\u7535\u8111\u5C4F\u5E55\u56FE\u5F62" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1451808843 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1451808842} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 4294967295 +--- !u!114 &1451808844 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1451808842} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UiScaleMode: 0 + m_ReferencePixelsPerUnit: 100 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 800, y: 600} + m_ScreenMatchMode: 0 + m_MatchWidthOrHeight: 0 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 + m_PresetInfoIsWorld: 1 +--- !u!223 &1451808845 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1451808842} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 2 + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 + m_AdditionalShaderChannelsFlag: 0 + m_SortingLayerID: 0 + m_SortingOrder: 0 + m_TargetDisplay: 0 +--- !u!224 &1451808846 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1451808842} + m_LocalRotation: {x: -0, y: 0.140564, z: -0, w: 0.9900716} + m_LocalPosition: {x: 0, y: 0, z: 0.226} + m_LocalScale: {x: 0.000091161, y: 0.000091161, z: 0.000091161} + m_ConstrainProportionsScale: 1 + m_Children: + - {fileID: 525703932} + m_Father: {fileID: 0} + m_RootOrder: 17 + m_LocalEulerAnglesHint: {x: 0, y: 16.161, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: -2.1846, y: -0.1548} + m_SizeDelta: {x: 4954.7593, y: 2800.1443} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1505539331 stripped GameObject: m_CorrespondingSourceObject: {fileID: -774007479218458089, guid: e908463f3f6b7e54cb2ffaa2e941c53e, type: 3} @@ -14121,10 +14301,10 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} m_Name: m_EditorClassIdentifier: - m_UiScaleMode: 0 + m_UiScaleMode: 1 m_ReferencePixelsPerUnit: 100 m_ScaleFactor: 1 - m_ReferenceResolution: {x: 800, y: 600} + m_ReferenceResolution: {x: 1920, y: 1080} m_ScreenMatchMode: 0 m_MatchWidthOrHeight: 0 m_PhysicalUnit: 3 @@ -15705,7 +15885,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 6282401d280c18d488e073bf54edbc11, type: 3} m_Name: m_EditorClassIdentifier: - interfaceType: 46 + interfaceType: 47 IsNotLine: 1 --- !u!65 &2112379061 BoxCollider: @@ -27999,7 +28179,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 6282401d280c18d488e073bf54edbc11, type: 3} m_Name: m_EditorClassIdentifier: - interfaceType: 0 + interfaceType: 46 IsNotLine: 0 --- !u!65 &7587113396328959640 BoxCollider: diff --git a/Assets/Scripts/Line/LineConnect.cs b/Assets/Scripts/Line/LineConnect.cs index 1488f1c..967aa4e 100644 --- a/Assets/Scripts/Line/LineConnect.cs +++ b/Assets/Scripts/Line/LineConnect.cs @@ -51,6 +51,7 @@ public enum InterfaceType III, AD1, AD2, + ͷ, , բ } diff --git a/Assets/Scripts/Line/LineManager.cs b/Assets/Scripts/Line/LineManager.cs index 9618a99..2b15dba 100644 --- a/Assets/Scripts/Line/LineManager.cs +++ b/Assets/Scripts/Line/LineManager.cs @@ -7,6 +7,7 @@ using System.Collections.Generic; using System.Drawing; using TMPro; using UnityEngine; +using UnityEngine.UI; public class LineManager : MonoBehaviour { @@ -22,11 +23,19 @@ public class LineManager : MonoBehaviour /// 塢 /// public HighlightEffect LightPanel, Devices; + /// + /// Ļʾͼ + /// + public Image ComputerPanel; public List Highlights = new List(); public List Highlights_Backup = new List(); public int hightindext = 0; + /// + /// ӿ + /// + public string LineName; public string line1; public string line2; @@ -82,9 +91,17 @@ public class LineManager : MonoBehaviour if (allline >= Models.Count && !isshow) { isshow = true; - TipTexts.text = "ȫӣ"; + TipTexts.text = "ȫӣȴ򿪵Դٴ򿪰ťأ"; StartCoroutine(WaitHide(Tips)); } + if (Highlights.Count <= 0) + { + ComputerPanel.gameObject.SetActive(true); + TipTexts.text = "ǰʵͼʾ"; + StartCoroutine(WaitHide(Tips)); + Highlights = Highlights_Backup; + Bootstrap.Instance.uiManager.HidePanel(); + } } /// /// @@ -92,6 +109,20 @@ public class LineManager : MonoBehaviour /// public void ClickPoint(Transform point) { + + if (Highlights.Count != 21 && Highlights.Count % 2 == 0) + { + for (int i = 0; i < Highlights.Count; i++) + { + for (int j = 0; j < Highlights_Backup.Count; j++) + { + if (!Highlights_Backup[j].name.Equals(Highlights[i].name)) + { + Highlights_Backup[j].GetComponent().enabled = false; + } + } + } + } //if (point1 != null) //{ // point2 = point; @@ -147,17 +178,24 @@ public class LineManager : MonoBehaviour { hightindext = i; Highlights[i].highlighted = false; + Highlights.Remove(Highlights[i]); break; } } if (hightindext < Highlights.Count) { + LineName = Highlights[hightindext].GetComponent().interfaceType.ToString(); Highlights[hightindext].highlighted = true; Highlights[hightindext].GetComponent().enabled = true; } LightPanel.highlighted = false; Devices.highlighted = false; + Bootstrap.Instance.uiManager.ShowPanel(this, E_UI_Layer.Top, + (panel) => + { + panel.Init("ʾ", "" + LineName+""); + }); } public IEnumerator Checkconnection(Transform transform, Transform transform2) @@ -276,6 +314,7 @@ public class LineManager : MonoBehaviour } LineShowModel.Instance.DeleteWiresByCollider(line1.gameObject); + return true; } } diff --git a/Assets/Scripts/UI/UIPanel/UI_TopTipPanel.cs b/Assets/Scripts/UI/UIPanel/UI_TopTipPanel.cs index 49a34c2..c2254ac 100644 --- a/Assets/Scripts/UI/UIPanel/UI_TopTipPanel.cs +++ b/Assets/Scripts/UI/UIPanel/UI_TopTipPanel.cs @@ -3,27 +3,27 @@ using System.Collections.Generic; using System.ComponentModel; using TMPro; using UnityEngine; +using UnityEngine.UI; public class UI_TopTipPanel : BasePanel { - public RectTransform bg; + public Image bg; public TextMeshProUGUI text_Content; public TextMeshProUGUI text_Title; - public void Init(string title, string content,bool isHide) + public void Init(string title, string content) { - GetControl("Text_Title").text = title; + text_Title = GetControl("Text_Title"); + text_Content = GetControl("Text_Content"); + bg = GetControl("UI_TopTipPanelBG"); + text_Title.text = title; text_Content.text = content; TextMeshProUGUI tempText = text_Title.preferredWidth > text_Content.preferredWidth ? text_Title : text_Content; - AdjustImageWidth(tempText, bg, 30, 21); - if (isHide) - { - Hide(); - } + AdjustImageWidth(tempText, bg.rectTransform, 30, 21); } /// /// ʧ /// - private void Hide() + public void Hide() { StopCoroutine(HideAsync(5)); StartCoroutine(HideAsync(5)); @@ -32,8 +32,6 @@ public class UI_TopTipPanel : BasePanel { yield return new WaitForSeconds(disappear); } - - public void AdjustImageWidth(TextMeshProUGUI contentText, RectTransform _bg, float width, float height) { float preferredWidth = contentText.preferredWidth;