From ee0afe478b60988008a2b4071ae7fe0b6705931b Mon Sep 17 00:00:00 2001 From: wanggang <76527413@qq.com> Date: Mon, 28 Oct 2019 16:50:06 +0800 Subject: [PATCH] update Former-commit-id: 5781b51bb346a5a896342f9b0f98f30043f2967c --- projects/IoTCenter/iotcenter.db | Bin 544768 -> 544768 bytes .../wwwroot/images/empty.png.meta | 7 ++ projects/IoTClient/Assets/images.meta | 8 ++ projects/IoTClient/Assets/images/iot.png | Bin 0 -> 5591 bytes projects/IoTClient/Assets/images/iot.png.meta | 88 ++++++++++++++++++ .../ProjectSettings/ProjectSettings.asset | 5 +- projects/IoTNode/iotnode.db | Bin 499712 -> 499712 bytes 7 files changed, 106 insertions(+), 2 deletions(-) create mode 100644 projects/IoTClient/Assets/StreamingAssets/wwwroot/images/empty.png.meta create mode 100644 projects/IoTClient/Assets/images.meta create mode 100644 projects/IoTClient/Assets/images/iot.png create mode 100644 projects/IoTClient/Assets/images/iot.png.meta diff --git a/projects/IoTCenter/iotcenter.db b/projects/IoTCenter/iotcenter.db index 0af35c327805b7ccfb022ea7c3df0d0c035cea7f..df198b6b78dbc59523123da0b0308bbdf4b2e103 100644 GIT binary patch delta 175 zcmZozpx6LJEsQNpEzB(}Ev#GE*c?2%8Tq^T#rf9qIr3iT&EjQd_{Y%AGlR#J`vi9a z*FUa_Txy(qIF&diamcXGXIEjHz$VJt#LB_4h{cBa8gl_N7t<0ZJH}g#C6g5eY}pHK zctROu#i!5kVKZa0w48q4hs|Vqj{}<>i?N=e+4ge|Y=^n0GyAg5V=^`0zSx&-JtK>S bp0VNdFn_iZCJW>CGyZHq%s%~$KZgkbGeIy} delta 174 zcmZozpx6LJEsQNpEzB(}Ev#GE*c?2182P*S#rf9qIr3iT&EjQd=;4{jqsD!hJB;fc zR}Ysw=N3*cjtv|N?5o&y**3Asu`Xs6V422ZzFFn47)8h9{IkR&@F#2R1WCi|MBv*i5D~`?Aer0;*W-%eJ18#Z=GC ZVtSZATM3h;QTrKxHXvr7e#W1}1ONm+FXjLM diff --git a/projects/IoTClient/Assets/StreamingAssets/wwwroot/images/empty.png.meta b/projects/IoTClient/Assets/StreamingAssets/wwwroot/images/empty.png.meta new file mode 100644 index 00000000..c5246aec --- /dev/null +++ b/projects/IoTClient/Assets/StreamingAssets/wwwroot/images/empty.png.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 1ec5930fe7836a945b4112014268a5e9 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/projects/IoTClient/Assets/images.meta b/projects/IoTClient/Assets/images.meta new file mode 100644 index 00000000..6614b7ac --- /dev/null +++ b/projects/IoTClient/Assets/images.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 1b4dac1977febe442adc6e186ba22457 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/projects/IoTClient/Assets/images/iot.png b/projects/IoTClient/Assets/images/iot.png new file mode 100644 index 0000000000000000000000000000000000000000..175dc1b75bd3c32224dda8aa43f8eba3e46433fb GIT binary patch literal 5591 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 literal 0 HcmV?d00001 diff --git a/projects/IoTClient/Assets/images/iot.png.meta b/projects/IoTClient/Assets/images/iot.png.meta new file mode 100644 index 00000000..35f2d618 --- /dev/null +++ b/projects/IoTClient/Assets/images/iot.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: 42fd4779920d2184c879bfeb42c52909 +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + 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 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: -1 + wrapV: -1 + wrapW: -1 + 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 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/projects/IoTClient/ProjectSettings/ProjectSettings.asset b/projects/IoTClient/ProjectSettings/ProjectSettings.asset index 7aae06ec..54ac7eb4 100644 --- a/projects/IoTClient/ProjectSettings/ProjectSettings.asset +++ b/projects/IoTClient/ProjectSettings/ProjectSettings.asset @@ -21,7 +21,7 @@ PlayerSettings: m_ShowUnitySplashLogo: 1 m_SplashScreenOverlayOpacity: 1 m_SplashScreenAnimation: 1 - m_SplashScreenLogoStyle: 1 + m_SplashScreenLogoStyle: 0 m_SplashScreenDrawMode: 0 m_SplashScreenBackgroundAnimationZoom: 1 m_SplashScreenLogoAnimationZoom: 1 @@ -40,7 +40,8 @@ PlayerSettings: width: 1 height: 1 m_SplashScreenLogos: [] - m_VirtualRealitySplashScreen: {fileID: 0} + m_VirtualRealitySplashScreen: {fileID: 2800000, guid: 42fd4779920d2184c879bfeb42c52909, + type: 3} m_HolographicTrackingLossScreen: {fileID: 0} defaultScreenWidth: 1024 defaultScreenHeight: 768 diff --git a/projects/IoTNode/iotnode.db b/projects/IoTNode/iotnode.db index ca74432911e5fb44c61eb501e231a57f1cd249b5..ea51df57e3c754bbb20a9196afe7c19dc843af1e 100644 GIT binary patch delta 176 zcmZoTAlCpyEsQNpEzB(}Ev#GEcG>b6BpX;7q#2~TB$gyjFSKV<-TvB^O;ME5Y&&l- zo5(c|V@m@Au-rincGc~En(TedycXsL7HQ@XJx0?fZUt)M(`A=dW@Ol|6~JD>#A2am zY&d;c5c@qQQ}gMJf$S#JcLlRMGFcc;{~OHyki}Tf&}{po5cXB#FE762Q}DLxBF?b_c8NY8UU3W7^Hy2jiyiB%BH%VPnTU;2C|z>-xbX6$Yg0W{ckY)Llz@FGn4I)LfBWaGgeIRjbSh5WGHAf Z=Luzy6`ejYhTVkORL^3&LoE9NCjj}1Go%0j