diff --git a/Assets/3rdParty/FFmpegPlayer/Scripts/FFmpegTest.cs b/Assets/3rdParty/FFmpegPlayer/Scripts/FFmpegTest.cs index 889d892..6b44551 100644 --- a/Assets/3rdParty/FFmpegPlayer/Scripts/FFmpegTest.cs +++ b/Assets/3rdParty/FFmpegPlayer/Scripts/FFmpegTest.cs @@ -18,8 +18,12 @@ public class FFmpegTest : MonoBehaviour } void Start() { - //string liveUrl = "rtsp://" + cameraInfo.Username + ":" + cameraInfo.Password + "@" + cameraInfo.IP + ":8200/cam/realmonitor?channel=19&subtype=0&proto=Private3"; - string liveUrl = "rtsp://admin:pyss2017@221.214.127.18:8200/cam/realmonitor?channel=19&subtype=0&proto=Private3"; + string liveUrl = "rtsp://" + cameraInfo.Username + ":" + cameraInfo.Password + "@" + cameraInfo.IP + ":8200/cam/realmonitor?channel=19&subtype=0&proto=Private3"; + cameraInfo.Username = "admin"; + cameraInfo.Password = "Hik12345+"; + cameraInfo.IP = "172.16.1.143"; + //string liveUrl = "rtsp://" + cameraInfo.Username + ":" + cameraInfo.Password + "@" + cameraInfo.IP + ":554/Streaming/Channels/201"; + //string liveUrl = "rtsp://admin:Hik12345+@172.16.1.143:554/Streaming/Channels/201"; OnLoadVideo(liveUrl); } private void OnLoadVideo(string url) diff --git a/Assets/GameAssets/Materials/BYD宋Pro线框/BYD宋Pro线框4 2.mat b/Assets/GameAssets/Materials/BYD宋Pro线框/BYD宋Pro线框4 2.mat new file mode 100644 index 0000000..6810c0a --- /dev/null +++ b/Assets/GameAssets/Materials/BYD宋Pro线框/BYD宋Pro线框4 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: "BYD\u5B8BPro\u7EBF\u68464 2" + 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: 0} + 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 + - _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: 0.9669811, b: 0.9669811, a: 1} + - _EmissionColor: {r: 1024, g: 991.8745, b: 0, a: 1} + m_BuildTextureStacks: [] diff --git a/Assets/GameAssets/Materials/BYD宋Pro线框/BYD宋Pro线框4 2.mat.meta b/Assets/GameAssets/Materials/BYD宋Pro线框/BYD宋Pro线框4 2.mat.meta new file mode 100644 index 0000000..5b1dbf2 --- /dev/null +++ b/Assets/GameAssets/Materials/BYD宋Pro线框/BYD宋Pro线框4 2.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2077c2e10c58e964f906f292bd95a4f9 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameAssets/Model/Materials/Color_J02.mat b/Assets/GameAssets/Model/Materials/Color_J02.mat index 61a8608..8b7e7b8 100644 --- a/Assets/GameAssets/Model/Materials/Color_J02.mat +++ b/Assets/GameAssets/Model/Materials/Color_J02.mat @@ -15,7 +15,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 3005 + m_CustomRenderQueue: 3001 stringTagMap: RenderType: Transparent disabledShaderPasses: [] @@ -77,6 +77,6 @@ Material: - _UVSec: 0 - _ZWrite: 0 m_Colors: - - _Color: {r: 0.3019607, g: 0.5215685, b: 0.69803923, a: 0} + - _Color: {r: 0.3019606, g: 0.5215685, b: 0.69803923, a: 0} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/GameAssets/Model/Materials/Color_M07.mat b/Assets/GameAssets/Model/Materials/Color_M07.mat index 69d36d2..0fc0d02 100644 --- a/Assets/GameAssets/Model/Materials/Color_M07.mat +++ b/Assets/GameAssets/Model/Materials/Color_M07.mat @@ -15,7 +15,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 3001 + m_CustomRenderQueue: 3000 stringTagMap: RenderType: Transparent disabledShaderPasses: [] @@ -77,6 +77,6 @@ Material: - _UVSec: 0 - _ZWrite: 0 m_Colors: - - _Color: {r: 0.22745094, g: 0.22745094, b: 0.22745094, a: 0} + - _Color: {r: 0.22745088, g: 0.22745088, b: 0.22745088, a: 0} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/GameAssets/Model/Materials/Color_M08.mat b/Assets/GameAssets/Model/Materials/Color_M08.mat index 085eb41..d2a8138 100644 --- a/Assets/GameAssets/Model/Materials/Color_M08.mat +++ b/Assets/GameAssets/Model/Materials/Color_M08.mat @@ -77,6 +77,6 @@ Material: - _UVSec: 0 - _ZWrite: 0 m_Colors: - - _Color: {r: 0.11764703, g: 0.11764703, b: 0.11764703, a: 0} + - _Color: {r: 0.117646955, g: 0.117646955, b: 0.117646955, a: 0} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/GameAssets/Model/shader/HWSM.mat b/Assets/GameAssets/Model/shader/HWSM.mat index 2cb319d..a122bbd 100644 --- a/Assets/GameAssets/Model/shader/HWSM.mat +++ b/Assets/GameAssets/Model/shader/HWSM.mat @@ -34,7 +34,7 @@ Material: m_Offset: {x: 0, y: 0} - _Texturemask: m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} + m_Scale: {x: 0, y: 0} m_Offset: {x: 0, y: 0} - _Texturemask1: m_Texture: {fileID: 2800000, guid: 44efd0011d6a9bc4fb0b3a82753dac4e, type: 3} diff --git a/Assets/GameAssets/Model/shader/ZWSM.mat b/Assets/GameAssets/Model/shader/ZWSM.mat index 1aff74c..f014338 100644 --- a/Assets/GameAssets/Model/shader/ZWSM.mat +++ b/Assets/GameAssets/Model/shader/ZWSM.mat @@ -25,7 +25,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _TextureSample1: - m_Texture: {fileID: 2800000, guid: 03b20ba704dec374e84e469e312a6e1b, type: 3} + m_Texture: {fileID: 2800000, guid: 70a63179110046b468ad5aabecdd0221, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _TextureSample2: @@ -34,7 +34,7 @@ Material: m_Offset: {x: 0, y: 0} - _Texturemask: m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} + m_Scale: {x: 0, y: 0} m_Offset: {x: 0, y: 0} - _Texturemask1: m_Texture: {fileID: 2800000, guid: 44efd0011d6a9bc4fb0b3a82753dac4e, type: 3} diff --git a/Assets/GameAssets/Model/shader/dianchimashshu111.png b/Assets/GameAssets/Model/shader/dianchimashshu111.png new file mode 100644 index 0000000..bc80923 Binary files /dev/null and b/Assets/GameAssets/Model/shader/dianchimashshu111.png differ diff --git a/Assets/GameAssets/Model/shader/dianchimashshu111.png.meta b/Assets/GameAssets/Model/shader/dianchimashshu111.png.meta new file mode 100644 index 0000000..d265d51 --- /dev/null +++ b/Assets/GameAssets/Model/shader/dianchimashshu111.png.meta @@ -0,0 +1,111 @@ +fileFormatVersion: 2 +guid: 08a39bb6cff733047973f062912cd67b +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: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + 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 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameAssets/Model/shader/dianchimashshu222.png b/Assets/GameAssets/Model/shader/dianchimashshu222.png new file mode 100644 index 0000000..f920b24 Binary files /dev/null and b/Assets/GameAssets/Model/shader/dianchimashshu222.png differ diff --git a/Assets/GameAssets/Model/shader/dianchimashshu222.png.meta b/Assets/GameAssets/Model/shader/dianchimashshu222.png.meta new file mode 100644 index 0000000..e8a0c7c --- /dev/null +++ b/Assets/GameAssets/Model/shader/dianchimashshu222.png.meta @@ -0,0 +1,111 @@ +fileFormatVersion: 2 +guid: 70a63179110046b468ad5aabecdd0221 +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: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + 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 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameAssets/Model/shader/电池检测.mat b/Assets/GameAssets/Model/shader/电池检测.mat index 1a215c4..043cacb 100644 --- a/Assets/GameAssets/Model/shader/电池检测.mat +++ b/Assets/GameAssets/Model/shader/电池检测.mat @@ -25,7 +25,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _TextureSample1: - m_Texture: {fileID: 2800000, guid: 03b20ba704dec374e84e469e312a6e1b, type: 3} + m_Texture: {fileID: 2800000, guid: 08a39bb6cff733047973f062912cd67b, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _TextureSample2: diff --git a/Assets/Resources/Audios/声纹检测已完成.mp3 b/Assets/Resources/Audios/声纹检测已完成.mp3 new file mode 100644 index 0000000..f107fab Binary files /dev/null and b/Assets/Resources/Audios/声纹检测已完成.mp3 differ diff --git a/Assets/Resources/Audios/声纹检测已完成.mp3.meta b/Assets/Resources/Audios/声纹检测已完成.mp3.meta new file mode 100644 index 0000000..97e4162 --- /dev/null +++ b/Assets/Resources/Audios/声纹检测已完成.mp3.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: c009a8aa663422c47b8cf180e4260c8f +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Audios/声纹检测开始.mp3 b/Assets/Resources/Audios/声纹检测开始.mp3 new file mode 100644 index 0000000..710d073 Binary files /dev/null and b/Assets/Resources/Audios/声纹检测开始.mp3 differ diff --git a/Assets/Resources/Audios/声纹检测开始.mp3.meta b/Assets/Resources/Audios/声纹检测开始.mp3.meta new file mode 100644 index 0000000..e73ce4d --- /dev/null +++ b/Assets/Resources/Audios/声纹检测开始.mp3.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: b1c6b3f7b2ea336479f2bd55a7b56198 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Audios/多光谱探测已完成.mp3 b/Assets/Resources/Audios/多光谱探测已完成.mp3 new file mode 100644 index 0000000..9dad6f6 Binary files /dev/null and b/Assets/Resources/Audios/多光谱探测已完成.mp3 differ diff --git a/Assets/Resources/Audios/多光谱探测已完成.mp3.meta b/Assets/Resources/Audios/多光谱探测已完成.mp3.meta new file mode 100644 index 0000000..5d5e75f --- /dev/null +++ b/Assets/Resources/Audios/多光谱探测已完成.mp3.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 3394d5b55809a3041a9720efedb9833d +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Audios/多光谱探测开始.mp3 b/Assets/Resources/Audios/多光谱探测开始.mp3 new file mode 100644 index 0000000..ae04d55 Binary files /dev/null and b/Assets/Resources/Audios/多光谱探测开始.mp3 differ diff --git a/Assets/Resources/Audios/多光谱探测开始.mp3.meta b/Assets/Resources/Audios/多光谱探测开始.mp3.meta new file mode 100644 index 0000000..2d51f1f --- /dev/null +++ b/Assets/Resources/Audios/多光谱探测开始.mp3.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 7d49c53fe7a20394a853f916efe557e9 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Audios/待检车辆已入场.mp3 b/Assets/Resources/Audios/待检车辆已入场.mp3 new file mode 100644 index 0000000..ac1928a Binary files /dev/null and b/Assets/Resources/Audios/待检车辆已入场.mp3 differ diff --git a/Assets/Resources/Audios/待检车辆已入场.mp3.meta b/Assets/Resources/Audios/待检车辆已入场.mp3.meta new file mode 100644 index 0000000..12f7739 --- /dev/null +++ b/Assets/Resources/Audios/待检车辆已入场.mp3.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 127b2fb5a3d8892469bcb3f4f098932d +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Audios/智能预检已完成.mp3 b/Assets/Resources/Audios/智能预检已完成.mp3 new file mode 100644 index 0000000..9d5328d Binary files /dev/null and b/Assets/Resources/Audios/智能预检已完成.mp3 differ diff --git a/Assets/Resources/Audios/智能预检已完成.mp3.meta b/Assets/Resources/Audios/智能预检已完成.mp3.meta new file mode 100644 index 0000000..b387c19 --- /dev/null +++ b/Assets/Resources/Audios/智能预检已完成.mp3.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: f4603fa101c32b24c9321167a96ff54b +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Audios/智能预检开始.mp3 b/Assets/Resources/Audios/智能预检开始.mp3 new file mode 100644 index 0000000..bb67351 Binary files /dev/null and b/Assets/Resources/Audios/智能预检开始.mp3 differ diff --git a/Assets/Resources/Audios/智能预检开始.mp3.meta b/Assets/Resources/Audios/智能预检开始.mp3.meta new file mode 100644 index 0000000..93cf102 --- /dev/null +++ b/Assets/Resources/Audios/智能预检开始.mp3.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 1d1432530d36415469cbd489e4e3f720 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Audios/电池健康检测已完成.mp3 b/Assets/Resources/Audios/电池健康检测已完成.mp3 new file mode 100644 index 0000000..8f60e36 Binary files /dev/null and b/Assets/Resources/Audios/电池健康检测已完成.mp3 differ diff --git a/Assets/Resources/Audios/电池健康检测已完成.mp3.meta b/Assets/Resources/Audios/电池健康检测已完成.mp3.meta new file mode 100644 index 0000000..7572419 --- /dev/null +++ b/Assets/Resources/Audios/电池健康检测已完成.mp3.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 21db575177e886044bcb1c3dc5476ba0 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Audios/电池健康检测开始.mp3 b/Assets/Resources/Audios/电池健康检测开始.mp3 new file mode 100644 index 0000000..d9e38f6 Binary files /dev/null and b/Assets/Resources/Audios/电池健康检测开始.mp3 differ diff --git a/Assets/Resources/Audios/电池健康检测开始.mp3.meta b/Assets/Resources/Audios/电池健康检测开始.mp3.meta new file mode 100644 index 0000000..e97f6ec --- /dev/null +++ b/Assets/Resources/Audios/电池健康检测开始.mp3.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: da1a89f1e6a2a834b98d0a99d09fd987 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Audios/车体探伤已完成.mp3 b/Assets/Resources/Audios/车体探伤已完成.mp3 new file mode 100644 index 0000000..ef8eaea Binary files /dev/null and b/Assets/Resources/Audios/车体探伤已完成.mp3 differ diff --git a/Assets/Resources/Audios/车体探伤已完成.mp3.meta b/Assets/Resources/Audios/车体探伤已完成.mp3.meta new file mode 100644 index 0000000..d7b5454 --- /dev/null +++ b/Assets/Resources/Audios/车体探伤已完成.mp3.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 3bfed98f69d6e80468134a507debd41e +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Audios/车体探伤开始.mp3 b/Assets/Resources/Audios/车体探伤开始.mp3 new file mode 100644 index 0000000..b0ee373 Binary files /dev/null and b/Assets/Resources/Audios/车体探伤开始.mp3 differ diff --git a/Assets/Resources/Audios/车体探伤开始.mp3.meta b/Assets/Resources/Audios/车体探伤开始.mp3.meta new file mode 100644 index 0000000..2430f33 --- /dev/null +++ b/Assets/Resources/Audios/车体探伤开始.mp3.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 9fb1f475a59e96e458ef9bdb96bd5073 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Audios/车辆安全检测已全部完成.mp3 b/Assets/Resources/Audios/车辆安全检测已全部完成.mp3 new file mode 100644 index 0000000..cfb4a76 Binary files /dev/null and b/Assets/Resources/Audios/车辆安全检测已全部完成.mp3 differ diff --git a/Assets/Resources/Audios/车辆安全检测已全部完成.mp3.meta b/Assets/Resources/Audios/车辆安全检测已全部完成.mp3.meta new file mode 100644 index 0000000..37d031a --- /dev/null +++ b/Assets/Resources/Audios/车辆安全检测已全部完成.mp3.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 4a97d92b216e42c4ca3126ff2e4ce0c2 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Audios/车辆驶入检测区.mp3 b/Assets/Resources/Audios/车辆驶入检测区.mp3 new file mode 100644 index 0000000..567ef90 Binary files /dev/null and b/Assets/Resources/Audios/车辆驶入检测区.mp3 differ diff --git a/Assets/Resources/Audios/车辆驶入检测区.mp3.meta b/Assets/Resources/Audios/车辆驶入检测区.mp3.meta new file mode 100644 index 0000000..a50c2ba --- /dev/null +++ b/Assets/Resources/Audios/车辆驶入检测区.mp3.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 551e77f893b765941b0dc58c280ae57c +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Materials/Color_D05 (Instance).mat b/Assets/Resources/Materials/Color_D05 (Instance).mat new file mode 100644 index 0000000..1ae8c29 --- /dev/null +++ b/Assets/Resources/Materials/Color_D05 (Instance).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: Color_D05 (Instance) + 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: 0} + 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.4472136 + - _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: 0.7490196, b: 0, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + m_BuildTextureStacks: [] diff --git a/Assets/Resources/Materials/Color_D05 (Instance).mat.meta b/Assets/Resources/Materials/Color_D05 (Instance).mat.meta new file mode 100644 index 0000000..07c0db5 --- /dev/null +++ b/Assets/Resources/Materials/Color_D05 (Instance).mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6654d1b3c5499aa4a94e74059d55812a +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Materials/Color_J02 (Instance).mat b/Assets/Resources/Materials/Color_J02 (Instance).mat new file mode 100644 index 0000000..89d505d --- /dev/null +++ b/Assets/Resources/Materials/Color_J02 (Instance).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: Color_J02 (Instance) + 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: 0} + 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.4472136 + - _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: 0.30196062, g: 0.5215685, b: 0.69803923, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + m_BuildTextureStacks: [] diff --git a/Assets/Resources/Materials/Color_J02 (Instance).mat.meta b/Assets/Resources/Materials/Color_J02 (Instance).mat.meta new file mode 100644 index 0000000..d2be07d --- /dev/null +++ b/Assets/Resources/Materials/Color_J02 (Instance).mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: acebe5f8cabc86d488fa7ac113007433 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Materials/Color_M07 (Instance).mat b/Assets/Resources/Materials/Color_M07 (Instance).mat new file mode 100644 index 0000000..b0f3744 --- /dev/null +++ b/Assets/Resources/Materials/Color_M07 (Instance).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: Color_M07 (Instance) + 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: 0} + 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.4472136 + - _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: 0.2274509, g: 0.2274509, b: 0.2274509, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + m_BuildTextureStacks: [] diff --git a/Assets/Resources/Materials/Color_M07 (Instance).mat.meta b/Assets/Resources/Materials/Color_M07 (Instance).mat.meta new file mode 100644 index 0000000..0b6b370 --- /dev/null +++ b/Assets/Resources/Materials/Color_M07 (Instance).mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 09794f2834fe23c4b9780c8eb1a59294 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Materials/Color_M08 (Instance).mat b/Assets/Resources/Materials/Color_M08 (Instance).mat new file mode 100644 index 0000000..d127669 --- /dev/null +++ b/Assets/Resources/Materials/Color_M08 (Instance).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: Color_M08 (Instance) + 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: 0} + 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.4472136 + - _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: 0.117646985, g: 0.117646985, b: 0.117646985, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + m_BuildTextureStacks: [] diff --git a/Assets/Resources/Materials/Color_M08 (Instance).mat.meta b/Assets/Resources/Materials/Color_M08 (Instance).mat.meta new file mode 100644 index 0000000..be36695 --- /dev/null +++ b/Assets/Resources/Materials/Color_M08 (Instance).mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 88866369079fa094d89aa6b12c351ad0 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/UI/UIPanel/UI_BGPanel.prefab b/Assets/Resources/UI/UIPanel/UI_BGPanel.prefab index 0d1c83f..c293aa2 100644 --- a/Assets/Resources/UI/UIPanel/UI_BGPanel.prefab +++ b/Assets/Resources/UI/UIPanel/UI_BGPanel.prefab @@ -855,7 +855,7 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4294967295 + rgba: 4293777669 m_fontColor: {r: 0.019607844, g: 0.8509804, b: 0.92941177, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 @@ -990,7 +990,7 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4294967295 + rgba: 4293777669 m_fontColor: {r: 0.019607844, g: 0.8509804, b: 0.92941177, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 @@ -1246,7 +1246,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 0.27450982} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -1400,6 +1400,7 @@ MonoBehaviour: mediaPlayer4: {fileID: 7019923732807825193} mediaPlayerHW: {fileID: 7019923733199851177} mediaPlayerZW: {fileID: 7019923733737558074} + webViewPrefabZW: {fileID: 114949863631919233} --- !u!1 &5091667672139413992 GameObject: m_ObjectHideFlags: 0 @@ -1465,7 +1466,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 0.27450982} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -1538,6 +1539,7 @@ RectTransform: m_Children: - {fileID: 7019923733737558079} - {fileID: 1618858761} + - {fileID: 224179540791456951} m_Father: {fileID: 3071825273538588491} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1567,7 +1569,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 0.27450982} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -1986,6 +1988,135 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 7019923733507936420, guid: 29abca0a5de62fd46a97aa1e8df9be5d, type: 3} m_PrefabInstance: {fileID: 366067867} m_PrefabAsset: {fileID: 0} +--- !u!1001 &503914913 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 2571498225186387187} + m_Modifications: + - target: {fileID: 1535822479614194, guid: 3e10f3b6a733e441c8352020cff2f1f6, type: 3} + propertyPath: m_Name + value: CanvasWebViewPrefab + objectReference: {fileID: 0} + - target: {fileID: 1535822479614194, guid: 3e10f3b6a733e441c8352020cff2f1f6, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224179541092979990, guid: 3e10f3b6a733e441c8352020cff2f1f6, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 224179541092979990, guid: 3e10f3b6a733e441c8352020cff2f1f6, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 224179541092979990, guid: 3e10f3b6a733e441c8352020cff2f1f6, type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 224179541092979990, guid: 3e10f3b6a733e441c8352020cff2f1f6, type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 224179541092979990, guid: 3e10f3b6a733e441c8352020cff2f1f6, type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 224179541092979990, guid: 3e10f3b6a733e441c8352020cff2f1f6, type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 224179541092979990, guid: 3e10f3b6a733e441c8352020cff2f1f6, type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 224179541092979990, guid: 3e10f3b6a733e441c8352020cff2f1f6, type: 3} + propertyPath: m_SizeDelta.x + value: 787.15 + objectReference: {fileID: 0} + - target: {fileID: 224179541092979990, guid: 3e10f3b6a733e441c8352020cff2f1f6, type: 3} + propertyPath: m_SizeDelta.y + value: 463.89 + objectReference: {fileID: 0} + - target: {fileID: 224179541092979990, guid: 3e10f3b6a733e441c8352020cff2f1f6, type: 3} + propertyPath: m_LocalScale.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 224179541092979990, guid: 3e10f3b6a733e441c8352020cff2f1f6, type: 3} + propertyPath: m_LocalScale.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 224179541092979990, guid: 3e10f3b6a733e441c8352020cff2f1f6, type: 3} + propertyPath: m_LocalScale.z + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 224179541092979990, guid: 3e10f3b6a733e441c8352020cff2f1f6, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224179541092979990, guid: 3e10f3b6a733e441c8352020cff2f1f6, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224179541092979990, guid: 3e10f3b6a733e441c8352020cff2f1f6, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224179541092979990, guid: 3e10f3b6a733e441c8352020cff2f1f6, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 224179541092979990, guid: 3e10f3b6a733e441c8352020cff2f1f6, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 224179541092979990, guid: 3e10f3b6a733e441c8352020cff2f1f6, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 224179541092979990, guid: 3e10f3b6a733e441c8352020cff2f1f6, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 224179541092979990, guid: 3e10f3b6a733e441c8352020cff2f1f6, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0.0006904602 + objectReference: {fileID: 0} + - target: {fileID: 224179541092979990, guid: 3e10f3b6a733e441c8352020cff2f1f6, type: 3} + propertyPath: m_AnchoredPosition.y + value: -0.17719 + objectReference: {fileID: 0} + - target: {fileID: 224179541092979990, guid: 3e10f3b6a733e441c8352020cff2f1f6, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224179541092979990, guid: 3e10f3b6a733e441c8352020cff2f1f6, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224179541092979990, guid: 3e10f3b6a733e441c8352020cff2f1f6, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 3e10f3b6a733e441c8352020cff2f1f6, type: 3} +--- !u!114 &114949863631919233 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 114949863196309792, guid: 3e10f3b6a733e441c8352020cff2f1f6, type: 3} + m_PrefabInstance: {fileID: 503914913} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 879d31ebe92b040cbb3ef97e98278140, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!224 &224179540791456951 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 224179541092979990, guid: 3e10f3b6a733e441c8352020cff2f1f6, type: 3} + m_PrefabInstance: {fileID: 503914913} + m_PrefabAsset: {fileID: 0} --- !u!1001 &624311889 PrefabInstance: m_ObjectHideFlags: 0 @@ -1993,6 +2124,18 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 137097028423108035} m_Modifications: + - target: {fileID: 7019923732568046583, guid: 29abca0a5de62fd46a97aa1e8df9be5d, type: 3} + propertyPath: m_FontData.m_MinSize + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7019923732568046583, guid: 29abca0a5de62fd46a97aa1e8df9be5d, type: 3} + propertyPath: m_FontData.m_FontSize + value: 15 + objectReference: {fileID: 0} + - target: {fileID: 7019923732568046583, guid: 29abca0a5de62fd46a97aa1e8df9be5d, type: 3} + propertyPath: m_FontData.m_Alignment + value: 4 + objectReference: {fileID: 0} - target: {fileID: 7019923733507936420, guid: 29abca0a5de62fd46a97aa1e8df9be5d, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -2085,6 +2228,22 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: 7019923734445129623, guid: 29abca0a5de62fd46a97aa1e8df9be5d, type: 3} + propertyPath: m_LocalScale.x + value: 0.3 + objectReference: {fileID: 0} + - target: {fileID: 7019923734445129623, guid: 29abca0a5de62fd46a97aa1e8df9be5d, type: 3} + propertyPath: m_LocalScale.y + value: 0.3 + objectReference: {fileID: 0} + - target: {fileID: 7019923734445129623, guid: 29abca0a5de62fd46a97aa1e8df9be5d, type: 3} + propertyPath: m_LocalScale.z + value: 0.3 + objectReference: {fileID: 0} + - target: {fileID: 7019923734445129623, guid: 29abca0a5de62fd46a97aa1e8df9be5d, type: 3} + propertyPath: m_ConstrainProportionsScale + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 29abca0a5de62fd46a97aa1e8df9be5d, type: 3} --- !u!114 &7019923733995663088 stripped @@ -2110,6 +2269,18 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 137097028423108035} m_Modifications: + - target: {fileID: 7019923732568046583, guid: 29abca0a5de62fd46a97aa1e8df9be5d, type: 3} + propertyPath: m_FontData.m_MinSize + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7019923732568046583, guid: 29abca0a5de62fd46a97aa1e8df9be5d, type: 3} + propertyPath: m_FontData.m_FontSize + value: 15 + objectReference: {fileID: 0} + - target: {fileID: 7019923732568046583, guid: 29abca0a5de62fd46a97aa1e8df9be5d, type: 3} + propertyPath: m_FontData.m_Alignment + value: 4 + objectReference: {fileID: 0} - target: {fileID: 7019923733507936416, guid: 29abca0a5de62fd46a97aa1e8df9be5d, type: 3} propertyPath: url value: "D:\\Work\\UnityProjects\\FFmpegDemo\\Assets\\StreamingAssets\\360\u6444\u50CF\u5934_SMT\u8D34\u7247\u70B9\u4F4D.mp4" @@ -2234,6 +2405,22 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: 7019923734445129623, guid: 29abca0a5de62fd46a97aa1e8df9be5d, type: 3} + propertyPath: m_LocalScale.x + value: 0.3 + objectReference: {fileID: 0} + - target: {fileID: 7019923734445129623, guid: 29abca0a5de62fd46a97aa1e8df9be5d, type: 3} + propertyPath: m_LocalScale.y + value: 0.3 + objectReference: {fileID: 0} + - target: {fileID: 7019923734445129623, guid: 29abca0a5de62fd46a97aa1e8df9be5d, type: 3} + propertyPath: m_LocalScale.z + value: 0.3 + objectReference: {fileID: 0} + - target: {fileID: 7019923734445129623, guid: 29abca0a5de62fd46a97aa1e8df9be5d, type: 3} + propertyPath: m_ConstrainProportionsScale + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 29abca0a5de62fd46a97aa1e8df9be5d, type: 3} --- !u!224 &7019923734465098528 stripped @@ -2401,6 +2588,18 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 137097028423108035} m_Modifications: + - target: {fileID: 7019923732568046583, guid: 29abca0a5de62fd46a97aa1e8df9be5d, type: 3} + propertyPath: m_FontData.m_MinSize + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7019923732568046583, guid: 29abca0a5de62fd46a97aa1e8df9be5d, type: 3} + propertyPath: m_FontData.m_FontSize + value: 15 + objectReference: {fileID: 0} + - target: {fileID: 7019923732568046583, guid: 29abca0a5de62fd46a97aa1e8df9be5d, type: 3} + propertyPath: m_FontData.m_Alignment + value: 4 + objectReference: {fileID: 0} - target: {fileID: 7019923733507936416, guid: 29abca0a5de62fd46a97aa1e8df9be5d, type: 3} propertyPath: url value: "D:\\Work\\UnityProjects\\FFmpegDemo\\Assets\\StreamingAssets\\360\u6444\u50CF\u5934_SMT\u8D34\u7247\u70B9\u4F4D.mp4" @@ -2525,6 +2724,22 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: 7019923734445129623, guid: 29abca0a5de62fd46a97aa1e8df9be5d, type: 3} + propertyPath: m_LocalScale.x + value: 0.3 + objectReference: {fileID: 0} + - target: {fileID: 7019923734445129623, guid: 29abca0a5de62fd46a97aa1e8df9be5d, type: 3} + propertyPath: m_LocalScale.y + value: 0.3 + objectReference: {fileID: 0} + - target: {fileID: 7019923734445129623, guid: 29abca0a5de62fd46a97aa1e8df9be5d, type: 3} + propertyPath: m_LocalScale.z + value: 0.3 + objectReference: {fileID: 0} + - target: {fileID: 7019923734445129623, guid: 29abca0a5de62fd46a97aa1e8df9be5d, type: 3} + propertyPath: m_ConstrainProportionsScale + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 29abca0a5de62fd46a97aa1e8df9be5d, type: 3} --- !u!114 &7019923732621098976 stripped @@ -2550,6 +2765,18 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 137097028423108035} m_Modifications: + - target: {fileID: 7019923732568046583, guid: 29abca0a5de62fd46a97aa1e8df9be5d, type: 3} + propertyPath: m_FontData.m_MinSize + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7019923732568046583, guid: 29abca0a5de62fd46a97aa1e8df9be5d, type: 3} + propertyPath: m_FontData.m_FontSize + value: 15 + objectReference: {fileID: 0} + - target: {fileID: 7019923732568046583, guid: 29abca0a5de62fd46a97aa1e8df9be5d, type: 3} + propertyPath: m_FontData.m_Alignment + value: 4 + objectReference: {fileID: 0} - target: {fileID: 7019923733507936416, guid: 29abca0a5de62fd46a97aa1e8df9be5d, type: 3} propertyPath: url value: "D:\\Work\\UnityProjects\\FFmpegDemo\\Assets\\StreamingAssets\\360\u6444\u50CF\u5934_SMT\u8D34\u7247\u70B9\u4F4D.mp4" @@ -2674,6 +2901,22 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: 7019923734445129623, guid: 29abca0a5de62fd46a97aa1e8df9be5d, type: 3} + propertyPath: m_LocalScale.x + value: 0.3 + objectReference: {fileID: 0} + - target: {fileID: 7019923734445129623, guid: 29abca0a5de62fd46a97aa1e8df9be5d, type: 3} + propertyPath: m_LocalScale.y + value: 0.3 + objectReference: {fileID: 0} + - target: {fileID: 7019923734445129623, guid: 29abca0a5de62fd46a97aa1e8df9be5d, type: 3} + propertyPath: m_LocalScale.z + value: 0.3 + objectReference: {fileID: 0} + - target: {fileID: 7019923734445129623, guid: 29abca0a5de62fd46a97aa1e8df9be5d, type: 3} + propertyPath: m_ConstrainProportionsScale + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 29abca0a5de62fd46a97aa1e8df9be5d, type: 3} --- !u!114 &7019923732807825193 stripped diff --git a/Assets/Scenes/MainScene.unity b/Assets/Scenes/MainScene.unity index 0eeb1d0..291694d 100644 --- a/Assets/Scenes/MainScene.unity +++ b/Assets/Scenes/MainScene.unity @@ -903,6 +903,83 @@ GameObject: m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: a91785af13cf8b64aa24c612c66c301e, type: 3} m_PrefabInstance: {fileID: 587310923} m_PrefabAsset: {fileID: 0} +--- !u!1001 &651050087 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1534807135} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: bb52de7116b7eac49b68b635d420e9d7, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: bb52de7116b7eac49b68b635d420e9d7, type: 3} + propertyPath: m_LocalPosition.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: bb52de7116b7eac49b68b635d420e9d7, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: bb52de7116b7eac49b68b635d420e9d7, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: bb52de7116b7eac49b68b635d420e9d7, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: bb52de7116b7eac49b68b635d420e9d7, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: bb52de7116b7eac49b68b635d420e9d7, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: bb52de7116b7eac49b68b635d420e9d7, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: bb52de7116b7eac49b68b635d420e9d7, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: bb52de7116b7eac49b68b635d420e9d7, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: bb52de7116b7eac49b68b635d420e9d7, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -7511558181221131132, guid: bb52de7116b7eac49b68b635d420e9d7, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 6654d1b3c5499aa4a94e74059d55812a, type: 2} + - target: {fileID: -7511558181221131132, guid: bb52de7116b7eac49b68b635d420e9d7, type: 3} + propertyPath: m_Materials.Array.data[1] + value: + objectReference: {fileID: 2100000, guid: acebe5f8cabc86d488fa7ac113007433, type: 2} + - target: {fileID: -7511558181221131132, guid: bb52de7116b7eac49b68b635d420e9d7, type: 3} + propertyPath: m_Materials.Array.data[2] + value: + objectReference: {fileID: 2100000, guid: 09794f2834fe23c4b9780c8eb1a59294, type: 2} + - target: {fileID: -7511558181221131132, guid: bb52de7116b7eac49b68b635d420e9d7, type: 3} + propertyPath: m_Materials.Array.data[3] + value: + objectReference: {fileID: 2100000, guid: 88866369079fa094d89aa6b12c351ad0, type: 2} + - target: {fileID: 919132149155446097, guid: bb52de7116b7eac49b68b635d420e9d7, type: 3} + propertyPath: m_Name + value: chongdiantou + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: bb52de7116b7eac49b68b635d420e9d7, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: bb52de7116b7eac49b68b635d420e9d7, type: 3} --- !u!1 &705507993 GameObject: m_ObjectHideFlags: 0 @@ -2798,11 +2875,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2845195045386376595, guid: a9608ab9ede3ca145b7d5651df1fa2f2, type: 3} propertyPath: m_LocalPosition.x - value: 0.006104622 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2845195045386376595, guid: a9608ab9ede3ca145b7d5651df1fa2f2, type: 3} propertyPath: m_LocalPosition.y - value: 0.007204145 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2845195045386376595, guid: a9608ab9ede3ca145b7d5651df1fa2f2, type: 3} propertyPath: m_LocalPosition.z @@ -3172,6 +3249,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: -2026623702610460465, guid: 9f44edfd126fdf14c8e9feb0062b9dc6, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: -1795344466988573331, guid: 9f44edfd126fdf14c8e9feb0062b9dc6, type: 3} propertyPath: m_LocalRotation.w value: 1 @@ -3180,6 +3261,10 @@ PrefabInstance: propertyPath: m_Materials.Array.data[0] value: objectReference: {fileID: 2100000, guid: aeaf6e3e9d53c554ca3f9db65a7b64be, type: 2} + - target: {fileID: -224615744811500574, guid: 9f44edfd126fdf14c8e9feb0062b9dc6, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 919132149155446097, guid: 9f44edfd126fdf14c8e9feb0062b9dc6, type: 3} propertyPath: m_Name value: "BYD\u5B8BPro\u5145\u7535\u53E3" diff --git a/Assets/Scripts/CarControl.cs b/Assets/Scripts/CarControl.cs index a61b089..adbdc32 100644 --- a/Assets/Scripts/CarControl.cs +++ b/Assets/Scripts/CarControl.cs @@ -12,7 +12,7 @@ public class CarControl : MonoBehaviour if (Bootstrap.Instance != null) { Bootstrap.Instance.eventCenter.AddEventListener(Enum_EventType.ChangeCarSwitch, ChangeCarSwitch); - Bootstrap.Instance.eventCenter.AddEventListener(Enum_EventType.CanRotate, ChangeCarSwitch); + Bootstrap.Instance.eventCenter.AddEventListener(Enum_EventType.CanRotate, CanRotate); } } @@ -30,7 +30,7 @@ public class CarControl : MonoBehaviour if (testcar == null) return; await Task.Delay(2000); float a = 4f; - while (a <= 11) + while (a <= 9) { a += 0.1f; for (int i = 0; i < testcar.GetComponentsInChildren().Length; i++) @@ -62,7 +62,7 @@ public class CarControl : MonoBehaviour if (Bootstrap.Instance != null) { Bootstrap.Instance.eventCenter.RemoveEventListener(Enum_EventType.ChangeCarSwitch, ChangeCarSwitch); - Bootstrap.Instance.eventCenter.RemoveEventListener(Enum_EventType.CanRotate, ChangeCarSwitch); + Bootstrap.Instance.eventCenter.RemoveEventListener(Enum_EventType.CanRotate, CanRotate); } } } diff --git a/Assets/Scripts/ChangeObjMat.cs b/Assets/Scripts/ChangeObjMat.cs index 9a68634..43f4b60 100644 --- a/Assets/Scripts/ChangeObjMat.cs +++ b/Assets/Scripts/ChangeObjMat.cs @@ -4,12 +4,12 @@ using System.Collections; using System.Collections.Generic; using System.Linq; using UnityEngine; - public class ChangeObjMat : MonoBehaviour { public Material m_TM; public List m_RendererList; private List> m_RecordRendererList = new List>(); + #region /// /// /// @@ -66,7 +66,9 @@ public class ChangeObjMat : MonoBehaviour /// ǹ /// public GameObject m_gunObj; - + #endregion + private bool isPlay; + private Config config = new Config(); void Start() { m_RendererList = GetComponentsInChildren().ToList(); @@ -75,10 +77,28 @@ public class ChangeObjMat : MonoBehaviour { m_RecordRendererList.Add(m_RendererList[i].materials.ToList()); } - if (Bootstrap.Instance != null) Bootstrap.Instance.eventCenter.AddEventListener(Enum_EventType.ChangeChildrenMat, ChangeChildrenMat); - if (Bootstrap.Instance != null) Bootstrap.Instance.eventCenter.AddEventListener(Enum_EventType.StepSwitching, StepSwitching); + if (Bootstrap.Instance != null) + { + Bootstrap.Instance.eventCenter.AddEventListener(Enum_EventType.ChangeChildrenMat, ChangeChildrenMat); + Bootstrap.Instance.eventCenter.AddEventListener(Enum_EventType.StepSwitching, StepSwitching); + Bootstrap.Instance.eventCenter.AddEventListener(Enum_EventType.OnPlay, OnPlay); + } ChangeChildrenMat(true); - //StepSwitching(); + config = Bootstrap.LoadData("DataConfig"); + if (config.PlayBack.Contains("true")) + { + isPlay = false; + } + else + { + isPlay = true; + } + + } + + public void OnPlay() + { + isPlay = true; } public void ChangeChildrenMat(bool Change) { @@ -112,18 +132,189 @@ public class ChangeObjMat : MonoBehaviour } public void StepSwitching() { - StartCoroutine(StepSwitchingCoroutine()); + StartCoroutine(StepCoroutine()); } + IEnumerator StepCoroutine() + { + + Debug.Log("StepSwitching"); + #region 볡 + if (Bootstrap.UIMgr != null) Bootstrap.UIMgr.ShowPanel(this, E_UI_Layer.Top, (p) => + { + p.Init($"쳵볡!", 5); + Bootstrap.Instance.eventCenter.EventTrigger(Enum_EventType.AudioPlay, $"쳵볡"); + }); + yield return new WaitForSeconds(6); + #endregion + #region ʶ + if (Bootstrap.UIMgr != null) Bootstrap.UIMgr.ShowPanel(this, E_UI_Layer.Top, (p) => + { + p.Init($"Ԥ쿪ʼ!", 5); + Bootstrap.Instance.eventCenter.EventTrigger(Enum_EventType.AudioPlay, $"Ԥ쿪ʼ"); + }); + m_XKObj.SetActive(true); + m_Obj.SetActive(false); + m_CPObj.SetActive(true); + yield return new WaitForSeconds(6); + m_CPObj.SetActive(false); + if (Bootstrap.UIMgr != null) Bootstrap.UIMgr.ShowPanel(this, E_UI_Layer.Top, (p) => + { + p.Init($"⵽ƺΪ" + GetawayMqttClient.licensePlateData.LicensePlateNumber + "!", 5); + }); + WebViewController.Instance.CallGetButtonClickWithCode("ʶ"); + yield return new WaitForSeconds(6); + if (Bootstrap.UIMgr != null) Bootstrap.UIMgr.ShowPanel(this, E_UI_Layer.Top, (p) => + { + p.Init($"Ԥ!", 0); + Bootstrap.Instance.eventCenter.EventTrigger(Enum_EventType.AudioPlay, $"Ԥ"); + }); + yield return new WaitForSeconds(3); + #endregion + #region ǹ + m_Highlight.SetHighlighted(true); + transform.parent.DOLocalRotate(new Vector3(-90, 0, -320), 5); + yield return new WaitForSeconds(5); + + if (Bootstrap.UIMgr != null) Bootstrap.UIMgr.ShowPanel(this, E_UI_Layer.Top, (p) => + { + p.Init($"ʻ", 0); + Bootstrap.Instance.eventCenter.EventTrigger(Enum_EventType.AudioPlay, $"ʻ"); + }); + + Material[] tmpMat = m_gunObj.GetComponent().materials; + for (int i = 0; i < tmpMat.Length; i++) + { + tmpMat[i].DOFade(1, 2); + } + yield return new WaitForSeconds(2); + m_gunObj.transform.GetChild(0).gameObject.SetActive(true); + yield return new WaitForSeconds(2); + m_gunObj.GetComponent().DOPlayById("Gun"); + yield return new WaitForSeconds(5); + m_Highlight.SetHighlighted(false); + for (int i = 0; i < m_effectObj.Length; i++) + { + m_effectObj[i].SetActive(true); + } + yield return new WaitForSeconds(2); + m_gunObj.transform.GetChild(0).gameObject.SetActive(false); + for (int i = 0; i < tmpMat.Length; i++) + { + tmpMat[i].DOFade(0, 3); + } + yield return new WaitForSeconds(3); + yield return new WaitUntil(() => isPlay == true); + //WebViewController.Instance.CallGetButtonClickWithCode("ؼ"); + Bootstrap.Instance.eventCenter.EventTrigger(Enum_EventType.CanRotate); + yield return new WaitForSeconds(3); + #endregion + #region 360㳵̽ + if (Bootstrap.UIMgr != null) Bootstrap.UIMgr.ShowPanel(this, E_UI_Layer.Top, (p) => + { + p.Init($"360㳵̽˿ʼ!", 0); + Bootstrap.Instance.eventCenter.EventTrigger(Enum_EventType.AudioPlay, $"̽˿ʼ"); + }); + + if (Bootstrap.UIMgr != null) Bootstrap.UIMgr.GetPanel().OnLoadCSVideo(); + m_CSSMObj.SetActive(true); + yield return new WaitForSeconds(15); + m_CSSMObj.SetActive(false); + if (Bootstrap.UIMgr != null) Bootstrap.UIMgr.ShowPanel(this, E_UI_Layer.Top, (p) => + { + p.Init($"360㳵̽!", 5); + Bootstrap.Instance.eventCenter.EventTrigger(Enum_EventType.AudioPlay, $"̽"); + }); + yield return new WaitForSeconds(6); + #endregion + #region ؽȼ + if (Bootstrap.UIMgr != null) Bootstrap.UIMgr.ShowPanel(this, E_UI_Layer.Top, (p) => + { + p.Init($"ؽȼ⿪ʼ!", 5); + Bootstrap.Instance.eventCenter.EventTrigger(Enum_EventType.AudioPlay, $"ؽ⿪ʼ"); + WebViewController.Instance.CallGetButtonClickWithCode("ؼ"); + }); + + m_HighlightEffect.SetHighlighted(true); m_DCJCObj.SetActive(true); + yield return new WaitForSeconds(6); + //m_HighlightEffect.SetHighlighted(false); m_DCJCObj.SetActive(false); + + + #endregion + #region ̽ + if (Bootstrap.UIMgr != null) Bootstrap.UIMgr.ShowPanel(this, E_UI_Layer.Top, (p) => + { + p.Init($"̶ʧ̽⿪ʼ!", 5); + Bootstrap.Instance.eventCenter.EventTrigger(Enum_EventType.AudioPlay, $"̽⿪ʼ"); + if (Bootstrap.UIMgr != null) Bootstrap.UIMgr.GetPanel().OnLoadHWVideo(); + if (Bootstrap.UIMgr != null) Bootstrap.UIMgr.GetPanel().OnLoadZWVideo(); + }); + //m_HWSMObj.SetActive(true); m_ZWSMObj.SetActive(true); m_HighlightEffect.SetHighlighted(true); + m_HWSMObj.SetActive(true); m_ZWSMObj.SetActive(true); + yield return new WaitForSeconds(6); + //m_HWSMObj.SetActive(false); m_ZWSMObj.SetActive(false); m_HighlightEffect.SetHighlighted(false); + + #endregion + #region Ƽ + if (Bootstrap.UIMgr != null) Bootstrap.UIMgr.ShowPanel(this, E_UI_Layer.Top, (p) => + { + p.Init($"쳣񶯼⿪ʼ!", 5); + Bootstrap.Instance.eventCenter.EventTrigger(Enum_EventType.AudioPlay, $"Ƽ⿪ʼ"); + WebViewController.Instance.CallGetButtonClickWithCode("Ƽ"); + }); + m_SWSMObj.SetActive(true); m_SWJCObj.SetActive(true); + yield return new WaitForSeconds(config.WaitingTime); + //m_SWJCObj.SetActive(false); m_SWSMObj.SetActive(false); + + + + if (Bootstrap.UIMgr != null) Bootstrap.UIMgr.ShowPanel(this, E_UI_Layer.Top, (p) => + { + p.Init($"ؽ!", 5); + Bootstrap.Instance.eventCenter.EventTrigger(Enum_EventType.AudioPlay, $"ؽ"); + }); + m_DCJCObj.SetActive(false); + yield return new WaitForSeconds(6); + if (Bootstrap.UIMgr != null) Bootstrap.UIMgr.ShowPanel(this, E_UI_Layer.Top, (p) => + { + p.Init($"̶ʧ̽!", 5); + Bootstrap.Instance.eventCenter.EventTrigger(Enum_EventType.AudioPlay, $"̽"); + }); + m_HWSMObj.SetActive(false); m_ZWSMObj.SetActive(false); + yield return new WaitForSeconds(6); + if (Bootstrap.UIMgr != null) Bootstrap.UIMgr.ShowPanel(this, E_UI_Layer.Top, (p) => + { + p.Init($"쳣񶯼!", 5); + Bootstrap.Instance.eventCenter.EventTrigger(Enum_EventType.AudioPlay, $"Ƽ"); + }); + m_SWJCObj.SetActive(false); m_SWSMObj.SetActive(false); + yield return new WaitForSeconds(6); + #endregion + #region ȼⱨ + if (Bootstrap.UIMgr != null) Bootstrap.UIMgr.ShowPanel(this, E_UI_Layer.Top, (p) => + { + p.Init($"ȫȫ!", 0); + Bootstrap.Instance.eventCenter.EventTrigger(Enum_EventType.AudioPlay, $"ȫȫ"); + WebViewController.Instance.CallGetButtonClickWithCode("ά"); + }); + m_XKObj.SetActive(false); m_Obj.SetActive(true); m_HighlightEffect.SetHighlighted(false); + yield return new WaitForSeconds(5); + if (Bootstrap.UIMgr != null) Bootstrap.UIMgr.ShowPanel(this, E_UI_Layer.Top, (p) => + { + p.Init($"ⱨɣɨĻ½ǵĶάȡ!", 0); + }); + #endregion + } + + + IEnumerator StepSwitchingCoroutine() { - - Debug.Log("StepSwitchingCoroutine"); #region 볡 if (Bootstrap.UIMgr != null) Bootstrap.UIMgr.ShowPanel(this, E_UI_Layer.Top, (p) => { - p.Init($"İ볡", 3); + p.Init($"İ볡!", 3); Bootstrap.Instance.eventCenter.EventTrigger(Enum_EventType.AudioPlay, $"볡"); }); yield return new WaitForSeconds(3); @@ -137,7 +328,7 @@ public class ChangeObjMat : MonoBehaviour m_CPObj.SetActive(false); if (Bootstrap.UIMgr != null) Bootstrap.UIMgr.ShowPanel(this, E_UI_Layer.Top, (p) => { - p.Init($"⵽ƺΪ" + GetawayMqttClient.licensePlateData.LicensePlateNumber + "", 5); + p.Init($"⵽ƺΪ" + GetawayMqttClient.licensePlateData.LicensePlateNumber + "!", 5); }); WebViewController.Instance.CallGetButtonClickWithCode("ʶ"); yield return new WaitForSeconds(6); @@ -149,7 +340,7 @@ public class ChangeObjMat : MonoBehaviour Bootstrap.Instance.eventCenter.EventTrigger(Enum_EventType.AudioPlay, $"ǹ"); if (Bootstrap.UIMgr != null) Bootstrap.UIMgr.ShowPanel(this, E_UI_Layer.Top, (p) => { - p.Init($"1.ǹ", 0); + p.Init($"ǹ!", 0); }); Material[] tmpMat = m_gunObj.GetComponent().materials; @@ -159,36 +350,64 @@ public class ChangeObjMat : MonoBehaviour } yield return new WaitForSeconds(2); m_gunObj.GetComponent().DOPlayById("Gun"); - yield return new WaitForSeconds(2); + yield return new WaitForSeconds(5); m_Highlight.SetHighlighted(false); - m_gunObj.SetActive(false); for (int i = 0; i < m_effectObj.Length; i++) { m_effectObj[i].SetActive(true); } - yield return new WaitForSeconds(3); + yield return new WaitForSeconds(2); for (int i = 0; i < tmpMat.Length; i++) { - tmpMat[i].DOFade(0, 2); + tmpMat[i].DOFade(0, 3); } + yield return new WaitForSeconds(3); Bootstrap.Instance.eventCenter.EventTrigger(Enum_EventType.AudioPlay, $"һ"); if (Bootstrap.UIMgr != null) Bootstrap.UIMgr.ShowPanel(this, E_UI_Layer.Top, (p) => { - p.Init($"2.İѽг⣬һڴĻϲ鿴", 5); - }); - yield return new WaitUntil(() => Input.GetKeyDown(KeyCode.Space)); + p.Init($"İѽг⣬һڴĻϲ鿴!", 0); + }); + yield return new WaitUntil(() => isPlay == true); + yield return new WaitForSeconds(5); Bootstrap.Instance.eventCenter.EventTrigger(Enum_EventType.CanRotate); #endregion + #region ۼ + if (Bootstrap.UIMgr != null) Bootstrap.UIMgr.ShowPanel(this, E_UI_Layer.Top, (p) => + { + p.Init($"ڽ복ۼ⻷ڣȼѿʼ!", 5); + }); + yield return new WaitForSeconds(5); + Bootstrap.Instance.eventCenter.EventTrigger(Enum_EventType.AudioPlay, $"ۼ"); + if (Bootstrap.UIMgr != null) Bootstrap.UIMgr.ShowPanel(this, E_UI_Layer.Top, (p) => + { + p.Init($"ۼ⿪ʼ!", 3); + }); + if (Bootstrap.UIMgr != null) Bootstrap.UIMgr.GetPanel().OnLoadCSVideo(); + yield return new WaitForSeconds(3); + if (Bootstrap.UIMgr != null) Bootstrap.UIMgr.ShowPanel(this, E_UI_Layer.Top, (p) => + { + p.Init($"İڽгۼ...", 10); + }); + m_CSSMObj.SetActive(true); + yield return new WaitForSeconds(11); + m_CSSMObj.SetActive(false); + if (Bootstrap.UIMgr != null) Bootstrap.UIMgr.ShowPanel(this, E_UI_Layer.Top, (p) => + { + p.Init($"ۼ!", 5); + }); + yield return new WaitForSeconds(6); + #endregion #region ؼ if (Bootstrap.UIMgr != null) Bootstrap.UIMgr.ShowPanel(this, E_UI_Layer.Top, (p) => { - p.Init($"һ׼1.ؼѿʼ", 5); + p.Init($"һ׼ؼѿʼ!", 5); }); Bootstrap.Instance.eventCenter.EventTrigger(Enum_EventType.AudioPlay, $"ؼ"); yield return new WaitForSeconds(5); + WebViewController.Instance.CallGetButtonClickWithCode("ؼ"); if (Bootstrap.UIMgr != null) Bootstrap.UIMgr.ShowPanel(this, E_UI_Layer.Top, (p) => { - p.Init($"2.İеؼ...", 10); + p.Init($"İеؼ...", 10); }); m_HighlightEffect.SetHighlighted(true); m_DCJCObj.SetActive(true);//// @@ -197,47 +416,21 @@ public class ChangeObjMat : MonoBehaviour m_HighlightEffect.SetHighlighted(false); if (Bootstrap.UIMgr != null) Bootstrap.UIMgr.ShowPanel(this, E_UI_Layer.Top, (p) => { - p.Init($"3.ؼɣ", 3); + p.Init($"ؼ!", 3); }); yield return new WaitForSeconds(4); #endregion - #region ۼ - if (Bootstrap.UIMgr != null) Bootstrap.UIMgr.ShowPanel(this, E_UI_Layer.Top, (p) => - { - p.Init($"ڽ복ۼ⻷1.ȼѿʼ", 5); - }); - yield return new WaitForSeconds(5); - Bootstrap.Instance.eventCenter.EventTrigger(Enum_EventType.AudioPlay, $"ۼ"); - if (Bootstrap.UIMgr != null) Bootstrap.UIMgr.ShowPanel(this, E_UI_Layer.Top, (p) => - { - p.Init($"2.ۼ⿪ʼ", 3); - }); - if (Bootstrap.UIMgr != null) Bootstrap.UIMgr.GetPanel().OnLoadCSVideo(); - yield return new WaitForSeconds(3); - if (Bootstrap.UIMgr != null) Bootstrap.UIMgr.ShowPanel(this, E_UI_Layer.Top, (p) => - { - p.Init($"3.İгۼ...", 10); - }); - m_CSSMObj.SetActive(true); - yield return new WaitForSeconds(11); - m_CSSMObj.SetActive(false); - if (Bootstrap.UIMgr != null) Bootstrap.UIMgr.ShowPanel(this, E_UI_Layer.Top, (p) => - { - p.Init($"ۼɣ", 5); - }); - yield return new WaitForSeconds(6); - #endregion #region ʵʱ̽ if (Bootstrap.UIMgr != null) Bootstrap.UIMgr.ShowPanel(this, E_UI_Layer.Top, (p) => { - p.Init($"кʵʱ̽⣺1.ѿʼ", 3); + p.Init($"кʵʱ̽⣺ѿʼ!", 3); }); Bootstrap.Instance.eventCenter.EventTrigger(Enum_EventType.AudioPlay, $"ʵʱ̽"); if (Bootstrap.UIMgr != null) Bootstrap.UIMgr.GetPanel().OnLoadHWVideo(); yield return new WaitForSeconds(3); if (Bootstrap.UIMgr != null) Bootstrap.UIMgr.ShowPanel(this, E_UI_Layer.Top, (p) => { - p.Init($"2.İк...", 10); + p.Init($"İк...", 10); }); m_HighlightEffect.SetHighlighted(true); m_HWSMObj.SetActive(true);//// @@ -246,21 +439,21 @@ public class ChangeObjMat : MonoBehaviour m_HighlightEffect.SetHighlighted(false); if (Bootstrap.UIMgr != null) Bootstrap.UIMgr.ShowPanel(this, E_UI_Layer.Top, (p) => { - p.Init($"3.ɣ", 5); + p.Init($"!", 5); }); yield return new WaitForSeconds(6); #endregion #region ʵʱ̽ if (Bootstrap.UIMgr != null) Bootstrap.UIMgr.ShowPanel(this, E_UI_Layer.Top, (p) => { - p.Init($"ʵʱ̽⣺1.ѿʼ", 3); + p.Init($"ʵʱ̽⣺ѿʼ!", 3); }); if (Bootstrap.UIMgr != null) Bootstrap.UIMgr.GetPanel().OnLoadZWVideo(); Bootstrap.Instance.eventCenter.EventTrigger(Enum_EventType.AudioPlay, $"ʵʱ̽"); yield return new WaitForSeconds(3); if (Bootstrap.UIMgr != null) Bootstrap.UIMgr.ShowPanel(this, E_UI_Layer.Top, (p) => { - p.Init($"2.İ...", 10); + p.Init($"İ...", 10); }); m_HighlightEffect.SetHighlighted(true); m_ZWSMObj.SetActive(true);//// @@ -269,20 +462,21 @@ public class ChangeObjMat : MonoBehaviour m_HighlightEffect.SetHighlighted(false); if (Bootstrap.UIMgr != null) Bootstrap.UIMgr.ShowPanel(this, E_UI_Layer.Top, (p) => { - p.Init($"3.ɣ", 5); + p.Init($"!", 5); }); yield return new WaitForSeconds(6); #endregion #region Ƽ if (Bootstrap.UIMgr != null) Bootstrap.UIMgr.ShowPanel(this, E_UI_Layer.Top, (p) => { - p.Init($"Ƽ⣺1.Ƽѿʼ", 3); + p.Init($"Ƽ⣺Ƽѿʼ!", 3); }); Bootstrap.Instance.eventCenter.EventTrigger(Enum_EventType.AudioPlay, $"Ƽ"); yield return new WaitForSeconds(3); + WebViewController.Instance.CallGetButtonClickWithCode("Ƽ"); if (Bootstrap.UIMgr != null) Bootstrap.UIMgr.ShowPanel(this, E_UI_Layer.Top, (p) => { - p.Init($"2.İƼ...", 10); + p.Init($"İƼ...", 10); }); m_SWSMObj.SetActive(true);//// m_SWJCObj.SetActive(true);//// @@ -291,48 +485,48 @@ public class ChangeObjMat : MonoBehaviour m_SWSMObj.SetActive(false);//// if (Bootstrap.UIMgr != null) Bootstrap.UIMgr.ShowPanel(this, E_UI_Layer.Top, (p) => { - p.Init($"3.ƹۼɣ", 5); + p.Init($"ƹۼ!", 5); }); yield return new WaitForSeconds(6); #endregion #region ȼⱨ if (Bootstrap.UIMgr != null) Bootstrap.UIMgr.ShowPanel(this, E_UI_Layer.Top, (p) => { - p.Init($"4.ȼɣ", 5); + p.Init($"ȼ!", 5); }); yield return new WaitForSeconds(6); if (Bootstrap.UIMgr != null) Bootstrap.UIMgr.ShowPanel(this, E_UI_Layer.Top, (p) => { - p.Init($"5.ȼⱨɣɨĻ½ǵĶάȡ", 30); + p.Init($"ȼⱨɣɨĻ½ǵĶάȡ!", 0); }); Bootstrap.Instance.eventCenter.EventTrigger(Enum_EventType.AudioPlay, $"ȫ"); m_XKObj.SetActive(false); m_Obj.SetActive(true); WebViewController.Instance.CallGetButtonClickWithCode("ά"); - //UI_BGPanel.btn_h51.gameObject.SetActive(true); + //UI_BGPanel.btn_h5gameObject.SetActive(true); yield return new WaitForSeconds(31); #endregion #region ԤԼ - /* if (Bootstrap.UIMgr != null) Bootstrap.UIMgr.ShowPanel(this, E_UI_Layer.Top, (p) => - { - p.Init($"ԤԼؾԵ...", 30); - }); - Bootstrap.Instance.eventCenter.EventTrigger(Enum_EventType.AudioPlay, $"ԤԼ"); - m_HighlightEffect.SetHighlighted(true); - m_JHJCObj.SetActive(true); - yield return new WaitForSeconds(31); - m_JHJCObj.SetActive(false); - m_HighlightEffect.SetHighlighted(false);*/ + /* if (Bootstrap.UIMgr != null) Bootstrap.UIMgr.ShowPanel(this, E_UI_Layer.Top, (p) => + { + p.Init($"ԤԼؾԵ...", 30); + }); + Bootstrap.Instance.eventCenter.EventTrigger(Enum_EventType.AudioPlay, $"ԤԼ"); + m_HighlightEffect.SetHighlighted(true); + m_JHJCObj.SetActive(true); + yield return new WaitForSeconds(31); + m_JHJCObj.SetActive(false); + m_HighlightEffect.SetHighlighted(false);*/ #endregion #region ⱨ - /* if (Bootstrap.UIMgr != null) Bootstrap.UIMgr.ShowPanel(this, E_UI_Layer.Top, (p) => - { - p.Init($"ؾɣɨĻ½ǵĶάȡ\nⱨ棡лֺ֧ϣףһ·ƽ", 0); - }); - Bootstrap.Instance.eventCenter.EventTrigger(Enum_EventType.AudioPlay, $"⼰ȫ"); - m_XKObj.SetActive(false); - m_Obj.SetActive(true); - //UI_BGPanel.btn_h52.gameObject.SetActive(true);*/ + /* if (Bootstrap.UIMgr != null) Bootstrap.UIMgr.ShowPanel(this, E_UI_Layer.Top, (p) => + { + p.Init($"ؾɣɨĻ½ǵĶάȡ\nⱨ!лֺ֧ϣףһ·ƽ!", 0); + }); + Bootstrap.Instance.eventCenter.EventTrigger(Enum_EventType.AudioPlay, $"⼰ȫ"); + m_XKObj.SetActive(false); + m_Obj.SetActive(true); + //UI_BGPanel.btn_h5gameObject.SetActive(true);*/ #endregion } private void OnDisable() @@ -341,6 +535,7 @@ public class ChangeObjMat : MonoBehaviour { Bootstrap.Instance.eventCenter.RemoveEventListener(Enum_EventType.ChangeChildrenMat, ChangeChildrenMat); Bootstrap.Instance.eventCenter.RemoveEventListener(Enum_EventType.StepSwitching, StepSwitching); + Bootstrap.Instance.eventCenter.RemoveEventListener(Enum_EventType.OnPlay, OnPlay); } } } diff --git a/Assets/Scripts/GetawayMqttClient.cs b/Assets/Scripts/GetawayMqttClient.cs index 0217666..26ec04d 100644 --- a/Assets/Scripts/GetawayMqttClient.cs +++ b/Assets/Scripts/GetawayMqttClient.cs @@ -17,6 +17,7 @@ public class GetawayMqttClient : MonoBehaviour private MQTTInitData mqttInitData; private Queue reciveDatas = new Queue(); public static LicensePlateData licensePlateData = new LicensePlateData(); + public PlayData playData =new PlayData(); async void Start() { //ȴһͻ˶,û @@ -57,7 +58,7 @@ public class GetawayMqttClient : MonoBehaviour .Build();//չtopic await mqttClient.SubscribeAsync(topicFilter);//ĸ,ͨתϢ - string topic1 = "test";//һЭ + string topic1 = "PlayBack";//һЭ var topicFilter1 = new MqttTopicFilterBuilder()//⹹󹹽һ .WithTopic(topic1) .WithQualityOfServiceLevel(MQTTnet.Protocol.MqttQualityOfServiceLevel.ExactlyOnce) @@ -89,18 +90,35 @@ public class GetawayMqttClient : MonoBehaviour { string data = reciveDatas.Dequeue(); Debug.Log(data); - licensePlateData = JsonConvert.DeserializeObject(data); - - switch (licensePlateData.VehicleBrand) + if (data.Contains("LicensePlateNumber")) { - case "ǵ": - Bootstrap.Instance.eventCenter.EventTrigger(Enum_EventType.ChangeCarSwitch); - break; - case "BYD": - Bootstrap.Instance.eventCenter.EventTrigger(Enum_EventType.ChangeCarSwitch); - break; - default: - break; + licensePlateData = JsonConvert.DeserializeObject(data); + switch (licensePlateData.VehicleBrand) + { + case "ǵ": + Bootstrap.Instance.eventCenter.EventTrigger(Enum_EventType.ChangeCarSwitch); + break; + case "BYD": + Bootstrap.Instance.eventCenter.EventTrigger(Enum_EventType.ChangeCarSwitch); + break; + default: + break; + } + } + if (data.Contains("PlayBack")) + { + playData = JsonConvert.DeserializeObject(data); + switch (playData.PlayBack) + { + case "ʼ": + Bootstrap.Instance.eventCenter.EventTrigger(Enum_EventType.OnPlay); + break; + case "رղ": + + break; + default: + break; + } } } } @@ -173,4 +191,14 @@ public class LicensePlateData /// [JsonProperty("vehicleModel")] public string VehicleModel { get; set; } +} + +public class PlayData +{ + /// + /// ƺ + /// + [JsonProperty("playBack")] + public string PlayBack { get; set; } + } \ No newline at end of file diff --git a/Assets/Scripts/Manager/Bootstrap.cs b/Assets/Scripts/Manager/Bootstrap.cs index 08402d2..227fc0a 100644 --- a/Assets/Scripts/Manager/Bootstrap.cs +++ b/Assets/Scripts/Manager/Bootstrap.cs @@ -1,8 +1,8 @@ -using LitJson; +using Newtonsoft.Json; using System.Collections; using System.Collections.Generic; +using System.IO; using Unity.VisualScripting; -using Unity.VisualScripting.Antlr3.Runtime; using UnityEngine; using static InterfaceManager; public class Bootstrap : SingletonMono @@ -47,10 +47,28 @@ public class Bootstrap : SingletonMono yield return new WaitForSeconds(0.5f); StartCoroutine(PostString("", wWWForm, headers, "", data => { - Debug.Log("ύ:" + data); + Debug.Log("ύ:" + data); })); } + + public static T LoadData(string fileName) + { + var filePath = Path.Combine(Application.streamingAssetsPath, "StateTrendConfig", fileName)+".json"; + if (File.Exists(filePath)) + { + var jsonStr = File.ReadAllText(filePath); + Debug.Log("jsonStr:" + jsonStr); + return JsonConvert.DeserializeObject(jsonStr); + } + else + { + Debug.LogError(fileName + ".json not found"); + return default(T); + } + } + + // Update is called once per frame void Update() { diff --git a/Assets/Scripts/Manager/InterfaceManager.cs b/Assets/Scripts/Manager/InterfaceManager.cs index 733bc63..776f576 100644 --- a/Assets/Scripts/Manager/InterfaceManager.cs +++ b/Assets/Scripts/Manager/InterfaceManager.cs @@ -39,6 +39,7 @@ public static class InterfaceManager { //· string path = Application.streamingAssetsPath + "/" + fileName + ".json"; + Debug.Log(path); if (!File.Exists(path)) { path = Application.persistentDataPath + "/" + fileName + ".json"; diff --git a/Assets/Scripts/Manager/WebViewController.cs b/Assets/Scripts/Manager/WebViewController.cs index 9cc12c9..34e97fb 100644 --- a/Assets/Scripts/Manager/WebViewController.cs +++ b/Assets/Scripts/Manager/WebViewController.cs @@ -96,6 +96,18 @@ public class WebViewController : MonoBehaviour Bootstrap.Instance.eventCenter.EventTrigger(Enum_EventType.ChangeCarSwitch); } if (Input.GetKey(KeyCode.LeftShift) && Input.GetKeyDown(KeyCode.Alpha2)) + { + CallGetButtonClickWithCode("ά"); + } + if (Input.GetKey(KeyCode.LeftShift) && Input.GetKeyDown(KeyCode.Alpha3)) + { + CallGetButtonClickWithCode("ʶ"); + } + if (Input.GetKey(KeyCode.LeftShift) && Input.GetKeyDown(KeyCode.Alpha4)) + { + CallGetButtonClickWithCode("ؼ"); + } + if (Input.GetKey(KeyCode.LeftShift) && Input.GetKeyDown(KeyCode.Alpha5)) { CallGetButtonClickWithCode("Ƽ"); } diff --git a/Assets/Scripts/Project/ProjectBase/EventCenter/Enum_EventType.cs b/Assets/Scripts/Project/ProjectBase/EventCenter/Enum_EventType.cs index f04a2b9..94a0067 100644 --- a/Assets/Scripts/Project/ProjectBase/EventCenter/Enum_EventType.cs +++ b/Assets/Scripts/Project/ProjectBase/EventCenter/Enum_EventType.cs @@ -13,5 +13,6 @@ public enum Enum_EventType ChangeCarSwitch, ChangeChildrenMat, StepSwitching, - CanRotate + CanRotate, + OnPlay } diff --git a/Assets/Scripts/UI/UIPanel/UI_BGPanel.cs b/Assets/Scripts/UI/UIPanel/UI_BGPanel.cs index 75ca807..a141d9a 100644 --- a/Assets/Scripts/UI/UIPanel/UI_BGPanel.cs +++ b/Assets/Scripts/UI/UIPanel/UI_BGPanel.cs @@ -1,18 +1,23 @@ using Hanatric.Unity.Video.FFmpegPlayer; using Newtonsoft.Json; using System.IO; +using TMPro; using UnityEngine; using UnityEngine.UI; +using Vuplex.WebView; +using static UnityEngine.UIElements.UxmlAttributeDescription; public class UI_BGPanel : BasePanel { [HideInInspector] public Button btn_h51, btn_h52; + TextMeshProUGUI text1, text2, text3; public FFmpegPlayerBasicRawImage mediaPlayer1; public FFmpegPlayerBasicRawImage mediaPlayer2; public FFmpegPlayerBasicRawImage mediaPlayer3; public FFmpegPlayerBasicRawImage mediaPlayer4; public FFmpegPlayerBasicRawImage mediaPlayerHW; public FFmpegPlayerBasicRawImage mediaPlayerZW; + public CanvasWebViewPrefab webViewPrefabZW; private LiveUrlData liveUrlData; public RTSPUrlInfo rtspUrlInfo = new RTSPUrlInfo(); string liveurl1; @@ -21,7 +26,10 @@ public class UI_BGPanel : BasePanel base.Awake(); FFmpegPlayerMono.Init(Application.streamingAssetsPath + "/FFmpegNativeLib"); btn_h51 = GetControl