From a3d31beb8360d95df0da18e03d6b41e8f91ec5c8 Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期一, 13 八月 2018 13:42:17 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_client
---
ProjectSettings/ProjectSettings.asset | 50 +++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 49 insertions(+), 1 deletions(-)
diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset
index 2b55b02..e942fdf 100644
--- a/ProjectSettings/ProjectSettings.asset
+++ b/ProjectSettings/ProjectSettings.asset
@@ -72,6 +72,8 @@
captureSingleScreen: 0
muteOtherAudioSources: 0
Prepare IOS For Recording: 0
+ deferSystemGesturesMode: 0
+ hideHomeButton: 0
submitAnalytics: 1
usePlayerLog: 1
bakeCollisionMeshes: 0
@@ -101,6 +103,8 @@
n3dsEnableVSync: 0
ignoreAlphaClear: 0
xboxOneResolution: 0
+ xboxOneSResolution: 0
+ xboxOneXResolution: 3
xboxOneMonoLoggingLevel: 0
xboxOneLoggingLevel: 1
videoMemoryForVertexBuffers: 0
@@ -177,15 +181,21 @@
iPhone47inSplashScreen: {fileID: 0}
iPhone55inPortraitSplashScreen: {fileID: 0}
iPhone55inLandscapeSplashScreen: {fileID: 0}
+ iPhone58inPortraitSplashScreen: {fileID: 0}
+ iPhone58inLandscapeSplashScreen: {fileID: 0}
iPadPortraitSplashScreen: {fileID: 0}
iPadHighResPortraitSplashScreen: {fileID: 0}
iPadLandscapeSplashScreen: {fileID: 0}
iPadHighResLandscapeSplashScreen: {fileID: 0}
appleTVSplashScreen: {fileID: 0}
+ appleTVSplashScreen2x: {fileID: 0}
tvOSSmallIconLayers: []
+ tvOSSmallIconLayers2x: []
tvOSLargeIconLayers: []
tvOSTopShelfImageLayers: []
+ tvOSTopShelfImageLayers2x: []
tvOSTopShelfImageWideLayers: []
+ tvOSTopShelfImageWideLayers2x: []
iOSLaunchScreenType: 1
iOSLaunchScreenPortrait: {fileID: 2800000, guid: 179f9801f106906489c8b6bcc9896c8a,
type: 3}
@@ -235,97 +245,119 @@
- m_BuildTarget:
m_Icons:
- serializedVersion: 2
- m_Icon: {fileID: 2800000, guid: 0118954b3e1a44f4a8971d4be333ae29, type: 3}
+ m_Icon: {fileID: 2800000, guid: 1be2c50a8ed7cb7438062b4d15ff833a, type: 3}
m_Width: 128
m_Height: 128
+ m_Kind: 0
- m_BuildTarget: Android
m_Icons:
- serializedVersion: 2
m_Icon: {fileID: 2800000, guid: 0118954b3e1a44f4a8971d4be333ae29, type: 3}
m_Width: 192
m_Height: 192
+ m_Kind: 37245328
- serializedVersion: 2
m_Icon: {fileID: 2800000, guid: 0118954b3e1a44f4a8971d4be333ae29, type: 3}
m_Width: 144
m_Height: 144
+ m_Kind: 37245328
- serializedVersion: 2
m_Icon: {fileID: 2800000, guid: 0118954b3e1a44f4a8971d4be333ae29, type: 3}
m_Width: 96
m_Height: 96
+ m_Kind: 37245328
- serializedVersion: 2
m_Icon: {fileID: 2800000, guid: 0118954b3e1a44f4a8971d4be333ae29, type: 3}
m_Width: 72
m_Height: 72
+ m_Kind: 37245328
- serializedVersion: 2
m_Icon: {fileID: 2800000, guid: 0118954b3e1a44f4a8971d4be333ae29, type: 3}
m_Width: 48
m_Height: 48
+ m_Kind: 37245328
- serializedVersion: 2
m_Icon: {fileID: 2800000, guid: 0118954b3e1a44f4a8971d4be333ae29, type: 3}
m_Width: 36
m_Height: 36
+ m_Kind: 37245328
- m_BuildTarget: iPhone
m_Icons:
- serializedVersion: 2
m_Icon: {fileID: 0}
m_Width: 180
m_Height: 180
+ m_Kind: 37245328
- serializedVersion: 2
m_Icon: {fileID: 0}
m_Width: 167
m_Height: 167
+ m_Kind: 37245328
- serializedVersion: 2
m_Icon: {fileID: 0}
m_Width: 152
m_Height: 152
+ m_Kind: 37245328
- serializedVersion: 2
m_Icon: {fileID: 0}
m_Width: 144
m_Height: 144
+ m_Kind: 37245328
- serializedVersion: 2
m_Icon: {fileID: 0}
m_Width: 120
m_Height: 120
+ m_Kind: 37245328
- serializedVersion: 2
m_Icon: {fileID: 0}
m_Width: 114
m_Height: 114
+ m_Kind: 37245328
- serializedVersion: 2
m_Icon: {fileID: 0}
m_Width: 76
m_Height: 76
+ m_Kind: 37245328
- serializedVersion: 2
m_Icon: {fileID: 0}
m_Width: 72
m_Height: 72
+ m_Kind: 37245328
- serializedVersion: 2
m_Icon: {fileID: 0}
m_Width: 57
m_Height: 57
+ m_Kind: 37245328
- serializedVersion: 2
m_Icon: {fileID: 0}
m_Width: 120
m_Height: 120
+ m_Kind: 37245328
- serializedVersion: 2
m_Icon: {fileID: 0}
m_Width: 80
m_Height: 80
+ m_Kind: 37245328
- serializedVersion: 2
m_Icon: {fileID: 0}
m_Width: 40
m_Height: 40
+ m_Kind: 37245328
- serializedVersion: 2
m_Icon: {fileID: 0}
m_Width: 87
m_Height: 87
+ m_Kind: 37245328
- serializedVersion: 2
m_Icon: {fileID: 0}
m_Width: 58
m_Height: 58
+ m_Kind: 37245328
- serializedVersion: 2
m_Icon: {fileID: 0}
m_Width: 29
m_Height: 29
+ m_Kind: 37245328
m_BuildTargetBatching: []
m_BuildTargetGraphicsAPIs:
- m_BuildTarget: AndroidPlayer
@@ -388,6 +420,9 @@
switchTitleNames_9:
switchTitleNames_10:
switchTitleNames_11:
+ switchTitleNames_12:
+ switchTitleNames_13:
+ switchTitleNames_14:
switchPublisherNames_0:
switchPublisherNames_1:
switchPublisherNames_2:
@@ -400,6 +435,9 @@
switchPublisherNames_9:
switchPublisherNames_10:
switchPublisherNames_11:
+ switchPublisherNames_12:
+ switchPublisherNames_13:
+ switchPublisherNames_14:
switchIcons_0: {fileID: 0}
switchIcons_1: {fileID: 0}
switchIcons_2: {fileID: 0}
@@ -412,6 +450,9 @@
switchIcons_9: {fileID: 0}
switchIcons_10: {fileID: 0}
switchIcons_11: {fileID: 0}
+ switchIcons_12: {fileID: 0}
+ switchIcons_13: {fileID: 0}
+ switchIcons_14: {fileID: 0}
switchSmallIcons_0: {fileID: 0}
switchSmallIcons_1: {fileID: 0}
switchSmallIcons_2: {fileID: 0}
@@ -424,6 +465,9 @@
switchSmallIcons_9: {fileID: 0}
switchSmallIcons_10: {fileID: 0}
switchSmallIcons_11: {fileID: 0}
+ switchSmallIcons_12: {fileID: 0}
+ switchSmallIcons_13: {fileID: 0}
+ switchSmallIcons_14: {fileID: 0}
switchManualHTML:
switchAccessibleURLs:
switchLegalInformation:
@@ -465,6 +509,7 @@
switchLocalCommunicationIds_7:
switchParentalControl: 0
switchAllowsScreenshot: 1
+ switchAllowsVideoCapturing: 1
switchDataLossConfirmation: 0
switchSupportedNpadStyles: 3
switchSocketConfigEnabled: 0
@@ -475,6 +520,9 @@
switchUdpSendBufferSize: 9
switchUdpReceiveBufferSize: 42
switchSocketBufferEfficiency: 4
+ switchSocketInitializeEnabled: 1
+ switchNetworkInterfaceManagerInitializeEnabled: 1
+ switchPlayerConnectionEnabled: 1
ps4NPAgeRating: 12
ps4NPTitleSecret:
ps4NPTrophyPackPath:
--
Gitblit v1.8.0