Skip to content

Commit 05d14d8

Browse files
veblushveblush
committed
Resave project with Unity 5.3.4
1 parent cef23fe commit 05d14d8

File tree

12 files changed

+260
-242
lines changed

12 files changed

+260
-242
lines changed

‎src/UnityPackage/Assets/Middlewares/UiManagerSample/UiManagerSample.unity‎

Lines changed: 159 additions & 139 deletions
Large diffs are not rendered by default.

‎src/UnityPackage/ProjectSettings/ClusterInputManager.asset‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!236 &1
4+
ClusterInputManager:
5+
m_ObjectHideFlags: 0
6+
m_Inputs: []

‎src/UnityPackage/ProjectSettings/DynamicsManager.asset‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
PhysicsManager:
55
m_ObjectHideFlags: 0
66
serializedVersion: 2
7-
m_Gravity: {x: 0, y: -9.81000042, z: 0}
7+
m_Gravity: {x: 0, y: -9.81, z: 0}
88
m_DefaultMaterial: {fileID: 0}
99
m_BounceThreshold: 2
10-
m_SleepThreshold: .00499999989
11-
m_DefaultContactOffset: .00999999978
10+
m_SleepThreshold: 0.005
11+
m_DefaultContactOffset: 0.01
1212
m_SolverIterationCount: 6
1313
m_QueriesHitTriggers: 1
1414
m_EnableAdaptiveForce: 0

‎src/UnityPackage/ProjectSettings/GraphicsSettings.asset‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
--- !u!30 &1
44
GraphicsSettings:
55
m_ObjectHideFlags: 0
6-
serializedVersion: 4
6+
serializedVersion: 5
77
m_Deferred:
88
m_Mode: 1
99
m_Shader: {fileID: 69, guid: 0000000000000000f000000000000000, type: 0}
@@ -21,14 +21,17 @@ GraphicsSettings:
2121
- {fileID: 10770, guid: 0000000000000000f000000000000000, type: 0}
2222
- {fileID: 10782, guid: 0000000000000000f000000000000000, type: 0}
2323
m_PreloadedShaders: []
24+
m_ShaderSettings:
25+
useScreenSpaceShadows: 1
26+
m_BuildTargetShaderSettings: []
2427
m_LightmapStripping: 0
28+
m_FogStripping: 0
2529
m_LightmapKeepPlain: 1
2630
m_LightmapKeepDirCombined: 1
2731
m_LightmapKeepDirSeparate: 1
2832
m_LightmapKeepDynamicPlain: 1
2933
m_LightmapKeepDynamicDirCombined: 1
3034
m_LightmapKeepDynamicDirSeparate: 1
31-
m_FogStripping: 0
3235
m_FogKeepLinear: 1
3336
m_FogKeepExp: 1
3437
m_FogKeepExp2: 1

‎src/UnityPackage/ProjectSettings/InputManager.asset‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ InputManager:
1414
altNegativeButton: a
1515
altPositiveButton: d
1616
gravity: 3
17-
dead: .00100000005
17+
dead: 0.001
1818
sensitivity: 3
1919
snap: 1
2020
invert: 0
@@ -30,7 +30,7 @@ InputManager:
3030
altNegativeButton: s
3131
altPositiveButton: w
3232
gravity: 3
33-
dead: .00100000005
33+
dead: 0.001
3434
sensitivity: 3
3535
snap: 1
3636
invert: 0
@@ -46,7 +46,7 @@ InputManager:
4646
altNegativeButton:
4747
altPositiveButton: mouse 0
4848
gravity: 1000
49-
dead: .00100000005
49+
dead: 0.001
5050
sensitivity: 1000
5151
snap: 0
5252
invert: 0
@@ -62,7 +62,7 @@ InputManager:
6262
altNegativeButton:
6363
altPositiveButton: mouse 1
6464
gravity: 1000
65-
dead: .00100000005
65+
dead: 0.001
6666
sensitivity: 1000
6767
snap: 0
6868
invert: 0
@@ -78,7 +78,7 @@ InputManager:
7878
altNegativeButton:
7979
altPositiveButton: mouse 2
8080
gravity: 1000
81-
dead: .00100000005
81+
dead: 0.001
8282
sensitivity: 1000
8383
snap: 0
8484
invert: 0
@@ -94,7 +94,7 @@ InputManager:
9494
altNegativeButton:
9595
altPositiveButton:
9696
gravity: 1000
97-
dead: .00100000005
97+
dead: 0.001
9898
sensitivity: 1000
9999
snap: 0
100100
invert: 0
@@ -111,7 +111,7 @@ InputManager:
111111
altPositiveButton:
112112
gravity: 0
113113
dead: 0
114-
sensitivity: .100000001
114+
sensitivity: 0.1
115115
snap: 0
116116
invert: 0
117117
type: 1
@@ -127,7 +127,7 @@ InputManager:
127127
altPositiveButton:
128128
gravity: 0
129129
dead: 0
130-
sensitivity: .100000001
130+
sensitivity: 0.1
131131
snap: 0
132132
invert: 0
133133
type: 1
@@ -143,7 +143,7 @@ InputManager:
143143
altPositiveButton:
144144
gravity: 0
145145
dead: 0
146-
sensitivity: .100000001
146+
sensitivity: 0.1
147147
snap: 0
148148
invert: 0
149149
type: 1
@@ -158,7 +158,7 @@ InputManager:
158158
altNegativeButton:
159159
altPositiveButton:
160160
gravity: 0
161-
dead: .189999998
161+
dead: 0.19
162162
sensitivity: 1
163163
snap: 0
164164
invert: 0
@@ -174,7 +174,7 @@ InputManager:
174174
altNegativeButton:
175175
altPositiveButton:
176176
gravity: 0
177-
dead: .189999998
177+
dead: 0.19
178178
sensitivity: 1
179179
snap: 0
180180
invert: 1
@@ -190,7 +190,7 @@ InputManager:
190190
altNegativeButton:
191191
altPositiveButton:
192192
gravity: 1000
193-
dead: .00100000005
193+
dead: 0.001
194194
sensitivity: 1000
195195
snap: 0
196196
invert: 0
@@ -206,7 +206,7 @@ InputManager:
206206
altNegativeButton:
207207
altPositiveButton:
208208
gravity: 1000
209-
dead: .00100000005
209+
dead: 0.001
210210
sensitivity: 1000
211211
snap: 0
212212
invert: 0
@@ -222,7 +222,7 @@ InputManager:
222222
altNegativeButton:
223223
altPositiveButton:
224224
gravity: 1000
225-
dead: .00100000005
225+
dead: 0.001
226226
sensitivity: 1000
227227
snap: 0
228228
invert: 0
@@ -238,7 +238,7 @@ InputManager:
238238
altNegativeButton:
239239
altPositiveButton:
240240
gravity: 1000
241-
dead: .00100000005
241+
dead: 0.001
242242
sensitivity: 1000
243243
snap: 0
244244
invert: 0
@@ -254,7 +254,7 @@ InputManager:
254254
altNegativeButton:
255255
altPositiveButton: joystick button 0
256256
gravity: 1000
257-
dead: .00100000005
257+
dead: 0.001
258258
sensitivity: 1000
259259
snap: 0
260260
invert: 0
@@ -270,7 +270,7 @@ InputManager:
270270
altNegativeButton:
271271
altPositiveButton: space
272272
gravity: 1000
273-
dead: .00100000005
273+
dead: 0.001
274274
sensitivity: 1000
275275
snap: 0
276276
invert: 0
@@ -286,7 +286,7 @@ InputManager:
286286
altNegativeButton:
287287
altPositiveButton: joystick button 1
288288
gravity: 1000
289-
dead: .00100000005
289+
dead: 0.001
290290
sensitivity: 1000
291291
snap: 0
292292
invert: 0

‎src/UnityPackage/ProjectSettings/Physics2DSettings.asset‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,20 @@
44
Physics2DSettings:
55
m_ObjectHideFlags: 0
66
serializedVersion: 2
7-
m_Gravity: {x: 0, y: -9.81000042}
7+
m_Gravity: {x: 0, y: -9.81}
88
m_DefaultMaterial: {fileID: 0}
99
m_VelocityIterations: 8
1010
m_PositionIterations: 3
1111
m_VelocityThreshold: 1
12-
m_MaxLinearCorrection: .200000003
12+
m_MaxLinearCorrection: 0.2
1313
m_MaxAngularCorrection: 8
1414
m_MaxTranslationSpeed: 100
1515
m_MaxRotationSpeed: 360
16-
m_MinPenetrationForPenalty: .00999999978
17-
m_BaumgarteScale: .200000003
18-
m_BaumgarteTimeOfImpactScale: .75
19-
m_TimeToSleep: .5
20-
m_LinearSleepTolerance: .00999999978
16+
m_MinPenetrationForPenalty: 0.01
17+
m_BaumgarteScale: 0.2
18+
m_BaumgarteTimeOfImpactScale: 0.75
19+
m_TimeToSleep: 0.5
20+
m_LinearSleepTolerance: 0.01
2121
m_AngularSleepTolerance: 2
2222
m_QueriesHitTriggers: 1
2323
m_QueriesStartInColliders: 1

‎src/UnityPackage/ProjectSettings/ProjectSettings.asset‎

Lines changed: 17 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,18 @@
33
--- !u!129 &1
44
PlayerSettings:
55
m_ObjectHideFlags: 0
6-
serializedVersion: 7
6+
serializedVersion: 8
77
AndroidProfiler: 0
88
defaultScreenOrientation: 4
99
targetDevice: 2
10-
targetResolution: 0
1110
useOnDemandResources: 0
1211
accelerometerFrequency: 60
1312
companyName: DefaultCompany
1413
productName: UnityPackage
1514
defaultCursor: {fileID: 0}
1615
cursorHotspot: {x: 0, y: 0}
1716
m_ShowUnitySplashScreen: 1
17+
m_VirtualRealitySplashScreen: {fileID: 0}
1818
defaultScreenWidth: 1024
1919
defaultScreenHeight: 768
2020
defaultScreenWidthWeb: 960
@@ -56,15 +56,19 @@ PlayerSettings:
5656
xboxEnableKinectAutoTracking: 0
5757
xboxEnableFitness: 0
5858
visibleInBackground: 0
59+
allowFullscreenSwitch: 1
5960
macFullscreenMode: 2
6061
d3d9FullscreenMode: 1
6162
d3d11FullscreenMode: 1
6263
xboxSpeechDB: 0
6364
xboxEnableHeadOrientation: 0
6465
xboxEnableGuest: 0
66+
xboxEnablePIXSampling: 0
6567
n3dsDisableStereoscopicView: 0
6668
n3dsEnableSharedListOpt: 1
6769
n3dsEnableVSync: 0
70+
uiUse16BitDepthBuffer: 0
71+
ignoreAlphaClear: 0
6872
xboxOneResolution: 0
6973
ps3SplashScreen: {fileID: 0}
7074
videoMemoryForVertexBuffers: 0
@@ -115,6 +119,7 @@ PlayerSettings:
115119
iPhoneTargetOSVersion: 22
116120
uIPrerenderedIcon: 0
117121
uIRequiresPersistentWiFi: 0
122+
uIRequiresFullScreen: 1
118123
uIStatusBarHidden: 1
119124
uIExitOnSuspend: 0
120125
uIStatusBarStyle: 0
@@ -128,6 +133,10 @@ PlayerSettings:
128133
iPadHighResPortraitSplashScreen: {fileID: 0}
129134
iPadLandscapeSplashScreen: {fileID: 0}
130135
iPadHighResLandscapeSplashScreen: {fileID: 0}
136+
appleTVSplashScreen: {fileID: 0}
137+
tvOSSmallIconLayers: []
138+
tvOSLargeIconLayers: []
139+
tvOSTopShelfImageLayers: []
131140
iOSLaunchScreenType: 0
132141
iOSLaunchScreenPortrait: {fileID: 0}
133142
iOSLaunchScreenLandscape: {fileID: 0}
@@ -255,7 +264,12 @@ PlayerSettings:
255264
playerPrefsSupport: 0
256265
ps4ReprojectionSupport: 0
257266
ps4UseAudio3dBackend: 0
267+
ps4SocialScreenEnabled: 0
258268
ps4Audio3dVirtualSpeakerCount: 14
269+
ps4attribCpuUsage: 0
270+
ps4PatchPkgPath:
271+
ps4PatchLatestPkgPath:
272+
ps4PatchChangeinfoPath:
259273
ps4attribUserManagement: 0
260274
ps4attribMoveSupport: 0
261275
ps4attrib3DSupport: 0
@@ -312,55 +326,14 @@ PlayerSettings:
312326
spritePackerPolicy:
313327
scriptingDefineSymbols: {}
314328
metroPackageName: UnityPackage
315-
metroPackageLogo:
316-
metroPackageLogo140:
317-
metroPackageLogo180:
318-
metroPackageLogo240:
319329
metroPackageVersion:
320330
metroCertificatePath:
321331
metroCertificatePassword:
322332
metroCertificateSubject:
323333
metroCertificateIssuer:
324334
metroCertificateNotAfter: 0000000000000000
325335
metroApplicationDescription: UnityPackage
326-
metroStoreTileLogo80:
327-
metroStoreTileLogo:
328-
metroStoreTileLogo140:
329-
metroStoreTileLogo180:
330-
metroStoreTileWideLogo80:
331-
metroStoreTileWideLogo:
332-
metroStoreTileWideLogo140:
333-
metroStoreTileWideLogo180:
334-
metroStoreTileSmallLogo80:
335-
metroStoreTileSmallLogo:
336-
metroStoreTileSmallLogo140:
337-
metroStoreTileSmallLogo180:
338-
metroStoreSmallTile80:
339-
metroStoreSmallTile:
340-
metroStoreSmallTile140:
341-
metroStoreSmallTile180:
342-
metroStoreLargeTile80:
343-
metroStoreLargeTile:
344-
metroStoreLargeTile140:
345-
metroStoreLargeTile180:
346-
metroStoreSplashScreenImage:
347-
metroStoreSplashScreenImage140:
348-
metroStoreSplashScreenImage180:
349-
metroPhoneAppIcon:
350-
metroPhoneAppIcon140:
351-
metroPhoneAppIcon240:
352-
metroPhoneSmallTile:
353-
metroPhoneSmallTile140:
354-
metroPhoneSmallTile240:
355-
metroPhoneMediumTile:
356-
metroPhoneMediumTile140:
357-
metroPhoneMediumTile240:
358-
metroPhoneWideTile:
359-
metroPhoneWideTile140:
360-
metroPhoneWideTile240:
361-
metroPhoneSplashScreenImage:
362-
metroPhoneSplashScreenImage140:
363-
metroPhoneSplashScreenImage240:
336+
wsaImages: {}
364337
metroTileShortName:
365338
metroCommandLineArgsFile:
366339
metroTileShowName: 0
@@ -476,7 +449,6 @@ PlayerSettings:
476449
WebGL::emscriptenArgs:
477450
WebGL::template: APPLICATION:Default
478451
additionalIl2CppArgs::additionalIl2CppArgs:
479-
firstStreamedSceneWithResources: 0
480452
cloudProjectId:
481453
projectName:
482454
organizationId:

‎src/UnityPackage/ProjectSettings/ProjectVersion.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
m_EditorVersion: 5.2.2f1
1+
m_EditorVersion: 5.3.4f1
22
m_StandardAssetsVersion: 0

0 commit comments

Comments
 (0)