diff --git a/docs/演示方案.docx b/docs/演示方案.docx
new file mode 100644
index 00000000..9c1488b4
Binary files /dev/null and b/docs/演示方案.docx differ
diff --git a/docs/物联网管控平台.pptx b/docs/物联网管控平台.pptx
index debe15e6..af1e9e70 100644
Binary files a/docs/物联网管控平台.pptx and b/docs/物联网管控平台.pptx differ
diff --git a/docs/资料/东师理想职业教育智慧校园建设方案V_1.3.0.docx b/docs/资料/东师理想职业教育智慧校园建设方案V_1.3.0.docx
new file mode 100644
index 00000000..56c3a8f1
Binary files /dev/null and b/docs/资料/东师理想职业教育智慧校园建设方案V_1.3.0.docx differ
diff --git a/docs/资料/四川省中小学综合素质智能评价系统.pdf b/docs/资料/四川省中小学综合素质智能评价系统.pdf
new file mode 100644
index 00000000..9acb995e
Binary files /dev/null and b/docs/资料/四川省中小学综合素质智能评价系统.pdf differ
diff --git a/docs/资料/智慧校园总体框架(GBT_36342-2018)1_21(1).pdf b/docs/资料/智慧校园总体框架(GBT_36342-2018)1_21(1).pdf
new file mode 100644
index 00000000..f9667948
Binary files /dev/null and b/docs/资料/智慧校园总体框架(GBT_36342-2018)1_21(1).pdf differ
diff --git a/projects/IoTClient/Assembly-CSharp-Editor.csproj b/projects/IoTClient/Assembly-CSharp-Editor.csproj
index 78f77a07..c33ebd57 100644
--- a/projects/IoTClient/Assembly-CSharp-Editor.csproj
+++ b/projects/IoTClient/Assembly-CSharp-Editor.csproj
@@ -282,9 +282,6 @@
D:/ProgramFiles/Unity/2019.2.12f1/Editor/Data/PlaybackEngines/iOSSupport/UnityEditor.iOS.Extensions.dll
-
- C:/Program Files (x86)/Microsoft Visual Studio Tools for Unity/16.0/Editor/SyntaxTree.VisualStudio.Unity.Bridge.dll
-
D:/1.0/ZHXY/projects/IoTClient/Assets/Plugins/NetCoreSerial.dll
diff --git a/projects/IoTClient/ProjectSettings/ProjectSettings.asset b/projects/IoTClient/ProjectSettings/ProjectSettings.asset
index 54ac7eb4..3b1e69b2 100644
--- a/projects/IoTClient/ProjectSettings/ProjectSettings.asset
+++ b/projects/IoTClient/ProjectSettings/ProjectSettings.asset
@@ -3,7 +3,7 @@
--- !u!129 &1
PlayerSettings:
m_ObjectHideFlags: 0
- serializedVersion: 15
+ serializedVersion: 18
productGUID: b00ce4cc09f73064db35d3b1a79baf26
AndroidProfiler: 0
AndroidFilterTouchesWhenObscured: 0
@@ -53,8 +53,8 @@ PlayerSettings:
m_StackTraceTypes: 010000000100000001000000010000000100000001000000
iosShowActivityIndicatorOnLoading: -1
androidShowActivityIndicatorOnLoading: -1
- iosAppInBackgroundBehavior: 0
displayResolutionDialog: 1
+ iosUseCustomAppBackgroundBehavior: 0
iosAllowHTTPDownload: 1
allowedAutorotateToPortrait: 1
allowedAutorotateToPortraitUpsideDown: 1
@@ -66,6 +66,7 @@ PlayerSettings:
disableDepthAndStencilBuffers: 0
androidStartInFullscreen: 1
androidRenderOutsideSafeArea: 1
+ androidUseSwappy: 0
androidBlitType: 0
defaultIsNativeResolution: 1
macRetinaSupport: 1
@@ -80,6 +81,7 @@ PlayerSettings:
usePlayerLog: 1
bakeCollisionMeshes: 0
forceSingleInstance: 0
+ useFlipModelSwapchain: 1
resizableWindow: 0
useMacAppStoreValidation: 0
macAppStoreCategory: public.app-category.games
@@ -126,7 +128,6 @@ PlayerSettings:
m_HolographicPauseOnTrackingLoss: 1
xboxOneDisableKinectGpuReservation: 1
xboxOneEnable7thCore: 1
- isWsaHolographicRemotingEnabled: 0
vrSettings:
cardboard:
depthFormat: 0
@@ -141,10 +142,20 @@ PlayerSettings:
hololens:
depthFormat: 1
depthBufferSharingEnabled: 1
+ lumin:
+ depthFormat: 0
+ frameTiming: 2
+ enableGLCache: 0
+ glCacheMaxBlobSize: 524288
+ glCacheMaxFileSize: 8388608
oculus:
sharedDepthBuffer: 1
dashSupport: 1
+ lowOverheadMode: 0
+ protectedContext: 0
+ v2Signing: 0
enable360StereoCapture: 0
+ isWsaHolographicRemotingEnabled: 0
protectGraphicsMemory: 0
enableFrameTimingStats: 0
useHDRDisplay: 0
@@ -194,6 +205,10 @@ PlayerSettings:
iPadHighResPortraitSplashScreen: {fileID: 0}
iPadLandscapeSplashScreen: {fileID: 0}
iPadHighResLandscapeSplashScreen: {fileID: 0}
+ iPhone65inPortraitSplashScreen: {fileID: 0}
+ iPhone65inLandscapeSplashScreen: {fileID: 0}
+ iPhone61inPortraitSplashScreen: {fileID: 0}
+ iPhone61inLandscapeSplashScreen: {fileID: 0}
appleTVSplashScreen: {fileID: 0}
appleTVSplashScreen2x: {fileID: 0}
tvOSSmallIconLayers: []
@@ -242,10 +257,10 @@ PlayerSettings:
clonedFromGUID: c0afd0d1d80e3634a9dac47e8a0426ea
templatePackageId: com.unity.template.3d@1.3.0
templateDefaultScene: Assets/Scenes/SampleScene.unity
- AndroidTargetArchitectures: 5
+ AndroidTargetArchitectures: 1
AndroidSplashScreenScale: 0
androidSplashScreen: {fileID: 0}
- AndroidKeystoreName:
+ AndroidKeystoreName: '{inproject}: '
AndroidKeyaliasName:
AndroidBuildApkPerCpuArchitecture: 0
AndroidTVCompatibility: 1
@@ -253,11 +268,14 @@ PlayerSettings:
AndroidEnableTango: 0
androidEnableBanner: 1
androidUseLowAccuracyLocation: 0
+ androidUseCustomKeystore: 0
m_AndroidBanners:
- width: 320
height: 180
banner: {fileID: 0}
androidGamepadSupportLevel: 0
+ AndroidValidateAppBundleSize: 1
+ AndroidAppBundleSizeToValidate: 150
resolutionDialogBanner: {fileID: 0}
m_BuildTargetIcons: []
m_BuildTargetPlatformIcons:
@@ -388,9 +406,10 @@ PlayerSettings:
m_Devices:
- Oculus
- OpenVR
- m_BuildTargetEnableVuforiaSettings: []
openGLRequireES31: 0
openGLRequireES31AEP: 0
+ openGLRequireES32: 0
+ vuforiaEnabled: 0
m_TemplateCustomTags: {}
mobileMTRendering:
Android: 1
@@ -574,6 +593,7 @@ PlayerSettings:
ps4DownloadDataSize: 0
ps4GarlicHeapSize: 2048
ps4ProGarlicHeapSize: 2560
+ playerPrefsMaxSize: 32768
ps4Passcode: frAQBc8Wsa1xVPfvJcrgRYwTiizs2trQ
ps4pnSessions: 1
ps4pnPresence: 1
@@ -607,6 +627,7 @@ PlayerSettings:
monoEnv:
splashScreenBackgroundSourceLandscape: {fileID: 0}
splashScreenBackgroundSourcePortrait: {fileID: 0}
+ blurSplashScreenBackground: 1
spritePackerPolicy:
webGLMemorySize: 256
webGLExceptionSupport: 1
@@ -621,6 +642,7 @@ PlayerSettings:
webGLCompressionFormat: 1
webGLLinkerTarget: 1
webGLThreadsSupport: 0
+ webGLWasmStreaming: 0
scriptingDefineSymbols: {}
platformArchitecture: {}
scriptingBackend: {}
@@ -630,6 +652,8 @@ PlayerSettings:
allowUnsafeCode: 0
additionalIl2CppArgs:
scriptingRuntimeVersion: 1
+ gcIncremental: 0
+ gcWBarrierValidation: 0
apiCompatibilityLevelPerPlatform: {}
m_RenderingPath: 1
m_MobileRenderingPath: 1
@@ -660,7 +684,6 @@ PlayerSettings:
metroFTAName:
metroFTAFileTypes: []
metroProtocolName:
- metroCompilationOverrides: 1
XboxOneProductId:
XboxOneUpdateKey:
XboxOneSandboxId:
@@ -699,7 +722,7 @@ PlayerSettings:
m_PortalFolderPath:
luminCert:
m_CertPath:
- m_PrivateKeyPath:
+ m_SignPackage: 1
luminIsChannelApp: 0
luminVersion:
m_VersionCode: 1
diff --git a/projects/IoTClient/iotclient.apk.REMOVED.git-id b/projects/IoTClient/iotclient.apk.REMOVED.git-id
index a181c61b..6ab6878e 100644
--- a/projects/IoTClient/iotclient.apk.REMOVED.git-id
+++ b/projects/IoTClient/iotclient.apk.REMOVED.git-id
@@ -1 +1 @@
-673179e5fd56b5b53f1d943354fe091bbc1b040b
\ No newline at end of file
+c038646b49209909eb7b1e1404508403ab144ef0
\ No newline at end of file