Skip to content

Commit d5a33d0

Browse files
authored
Merge pull request #16 from IJEMIN/update-to-unity-6-preview
upgrade to unity 6
2 parents b72b72b + ac78e11 commit d5a33d0

2,359 files changed

Lines changed: 125056 additions & 52390 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

06/Done/Dodge/Assets/Plane Color.mat

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,24 @@
22
%TAG !u! tag:unity3d.com,2011:
33
--- !u!21 &2100000
44
Material:
5-
serializedVersion: 6
5+
serializedVersion: 8
66
m_ObjectHideFlags: 0
77
m_CorrespondingSourceObject: {fileID: 0}
8-
m_PrefabInternal: {fileID: 0}
8+
m_PrefabInstance: {fileID: 0}
9+
m_PrefabAsset: {fileID: 0}
910
m_Name: Plane Color
1011
m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
11-
m_ShaderKeywords:
12+
m_Parent: {fileID: 0}
13+
m_ModifiedSerializedProperties: 0
14+
m_ValidKeywords: []
15+
m_InvalidKeywords: []
1216
m_LightmapFlags: 4
1317
m_EnableInstancingVariants: 0
1418
m_DoubleSidedGI: 0
1519
m_CustomRenderQueue: -1
1620
stringTagMap: {}
1721
disabledShaderPasses: []
22+
m_LockedProperties:
1823
m_SavedProperties:
1924
serializedVersion: 3
2025
m_TexEnvs:
@@ -54,6 +59,7 @@ Material:
5459
m_Texture: {fileID: 0}
5560
m_Scale: {x: 1, y: 1}
5661
m_Offset: {x: 0, y: 0}
62+
m_Ints: []
5763
m_Floats:
5864
- _BumpScale: 1
5965
- _Cutoff: 0.5
@@ -74,3 +80,5 @@ Material:
7480
m_Colors:
7581
- _Color: {r: 0, g: 0, b: 0, a: 1}
7682
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
83+
m_BuildTextureStacks: []
84+
m_AllowLocking: 1

06/Done/Dodge/Assets/Player Color.mat

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,24 @@
22
%TAG !u! tag:unity3d.com,2011:
33
--- !u!21 &2100000
44
Material:
5-
serializedVersion: 6
5+
serializedVersion: 8
66
m_ObjectHideFlags: 0
77
m_CorrespondingSourceObject: {fileID: 0}
8-
m_PrefabInternal: {fileID: 0}
8+
m_PrefabInstance: {fileID: 0}
9+
m_PrefabAsset: {fileID: 0}
910
m_Name: Player Color
1011
m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
11-
m_ShaderKeywords:
12+
m_Parent: {fileID: 0}
13+
m_ModifiedSerializedProperties: 0
14+
m_ValidKeywords: []
15+
m_InvalidKeywords: []
1216
m_LightmapFlags: 4
1317
m_EnableInstancingVariants: 0
1418
m_DoubleSidedGI: 0
1519
m_CustomRenderQueue: -1
1620
stringTagMap: {}
1721
disabledShaderPasses: []
22+
m_LockedProperties:
1823
m_SavedProperties:
1924
serializedVersion: 3
2025
m_TexEnvs:
@@ -54,6 +59,7 @@ Material:
5459
m_Texture: {fileID: 0}
5560
m_Scale: {x: 1, y: 1}
5661
m_Offset: {x: 0, y: 0}
62+
m_Ints: []
5763
m_Floats:
5864
- _BumpScale: 1
5965
- _Cutoff: 0.5
@@ -74,3 +80,5 @@ Material:
7480
m_Colors:
7581
- _Color: {r: 0, g: 0.39215687, b: 0.6431373, a: 1}
7682
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
83+
m_BuildTextureStacks: []
84+
m_AllowLocking: 1

06/Done/Dodge/Assets/PlayerController.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ void Update() {
2323
// Vector3 속도를 (xSpeed, 0, zSpeed)으로 생성
2424
Vector3 newVelocity = new Vector3(xSpeed, 0f, zSpeed);
2525
// 리지드바디의 속도에 newVelocity를 할당
26-
playerRigidbody.velocity = newVelocity;
26+
playerRigidbody.linearVelocity = newVelocity;
2727
}
2828

2929
public void Die() {

06/Done/Dodge/Assets/Scenes/SampleScene.unity

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,12 @@ RenderSettings:
3838
m_ReflectionIntensity: 1
3939
m_CustomReflection: {fileID: 0}
4040
m_Sun: {fileID: 0}
41-
m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1}
4241
m_UseRadianceAmbientProbe: 0
4342
--- !u!157 &3
4443
LightmapSettings:
4544
m_ObjectHideFlags: 0
46-
serializedVersion: 12
45+
serializedVersion: 13
46+
m_BakeOnSceneLoad: 0
4747
m_GISettings:
4848
serializedVersion: 2
4949
m_BounceScale: 1
@@ -229,6 +229,7 @@ MeshRenderer:
229229
m_RayTraceProcedural: 0
230230
m_RayTracingAccelStructBuildFlagsOverride: 0
231231
m_RayTracingAccelStructBuildFlags: 1
232+
m_SmallMeshCulling: 1
232233
m_RenderingLayerMask: 4294967295
233234
m_RendererPriority: 0
234235
m_Materials:
@@ -336,6 +337,7 @@ MeshRenderer:
336337
m_RayTraceProcedural: 0
337338
m_RayTracingAccelStructBuildFlagsOverride: 0
338339
m_RayTracingAccelStructBuildFlags: 1
340+
m_SmallMeshCulling: 1
339341
m_RenderingLayerMask: 4294967295
340342
m_RendererPriority: 0
341343
m_Materials:
@@ -445,8 +447,12 @@ Light:
445447
m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0}
446448
m_UseBoundingSphereOverride: 0
447449
m_UseViewFrustumForShadowCasterCull: 1
450+
m_ForceVisible: 0
448451
m_ShadowRadius: 0
449452
m_ShadowAngle: 0
453+
m_LightUnit: 1
454+
m_LuxAtDistance: 1
455+
m_EnableSpotReflector: 1
450456
--- !u!4 &170076735
451457
Transform:
452458
m_ObjectHideFlags: 0
@@ -614,6 +620,7 @@ MeshRenderer:
614620
m_RayTraceProcedural: 0
615621
m_RayTracingAccelStructBuildFlagsOverride: 0
616622
m_RayTracingAccelStructBuildFlags: 1
623+
m_SmallMeshCulling: 1
617624
m_RenderingLayerMask: 4294967295
618625
m_RendererPriority: 0
619626
m_Materials:
@@ -765,6 +772,7 @@ MeshRenderer:
765772
m_RayTraceProcedural: 0
766773
m_RayTracingAccelStructBuildFlagsOverride: 0
767774
m_RayTracingAccelStructBuildFlags: 1
775+
m_SmallMeshCulling: 1
768776
m_RenderingLayerMask: 4294967295
769777
m_RendererPriority: 0
770778
m_Materials:
@@ -887,6 +895,7 @@ MeshRenderer:
887895
m_RayTraceProcedural: 0
888896
m_RayTracingAccelStructBuildFlagsOverride: 0
889897
m_RayTracingAccelStructBuildFlags: 1
898+
m_SmallMeshCulling: 1
890899
m_RenderingLayerMask: 4294967295
891900
m_RendererPriority: 0
892901
m_Materials:
@@ -994,6 +1003,7 @@ MeshRenderer:
9941003
m_RayTraceProcedural: 0
9951004
m_RayTracingAccelStructBuildFlagsOverride: 0
9961005
m_RayTracingAccelStructBuildFlags: 1
1006+
m_SmallMeshCulling: 1
9971007
m_RenderingLayerMask: 4294967295
9981008
m_RendererPriority: 0
9991009
m_Materials:

06/Done/Dodge/Packages/manifest.json

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,12 @@
33
"com.unity.2d.sprite": "1.0.0",
44
"com.unity.2d.tilemap": "1.0.0",
55
"com.unity.analytics": "3.8.1",
6-
"com.unity.collab-proxy": "2.2.0",
7-
"com.unity.ide.rider": "3.0.26",
6+
"com.unity.collab-proxy": "2.6.0",
7+
"com.unity.ide.rider": "3.0.31",
88
"com.unity.ide.visualstudio": "2.0.22",
9-
"com.unity.test-framework": "1.3.9",
10-
"com.unity.timeline": "1.8.6",
9+
"com.unity.multiplayer.center": "1.0.0",
10+
"com.unity.test-framework": "1.4.5",
11+
"com.unity.timeline": "1.8.7",
1112
"com.unity.ugui": "2.0.0",
1213
"com.unity.modules.accessibility": "1.0.0",
1314
"com.unity.modules.ai": "1.0.0",

06/Done/Dodge/Packages/packages-lock.json

Lines changed: 22 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,13 @@
2020
"depth": 0,
2121
"source": "registry",
2222
"dependencies": {
23-
"com.unity.services.analytics": "1.0.4",
24-
"com.unity.ugui": "1.0.0"
23+
"com.unity.ugui": "1.0.0",
24+
"com.unity.services.analytics": "1.0.4"
2525
},
2626
"url": "https://packages.unity.com"
2727
},
2828
"com.unity.collab-proxy": {
29-
"version": "2.2.0",
29+
"version": "2.6.0",
3030
"depth": 0,
3131
"source": "registry",
3232
"dependencies": {},
@@ -40,7 +40,7 @@
4040
"url": "https://packages.unity.com"
4141
},
4242
"com.unity.ide.rider": {
43-
"version": "3.0.26",
43+
"version": "3.0.31",
4444
"depth": 0,
4545
"source": "registry",
4646
"dependencies": {
@@ -57,37 +57,45 @@
5757
},
5858
"url": "https://packages.unity.com"
5959
},
60+
"com.unity.multiplayer.center": {
61+
"version": "1.0.0",
62+
"depth": 0,
63+
"source": "builtin",
64+
"dependencies": {
65+
"com.unity.modules.uielements": "1.0.0"
66+
}
67+
},
6068
"com.unity.nuget.newtonsoft-json": {
6169
"version": "3.2.1",
62-
"depth": 2,
70+
"depth": 3,
6371
"source": "registry",
6472
"dependencies": {},
6573
"url": "https://packages.unity.com"
6674
},
6775
"com.unity.services.analytics": {
68-
"version": "4.4.0",
76+
"version": "6.0.1",
6977
"depth": 1,
7078
"source": "registry",
7179
"dependencies": {
7280
"com.unity.ugui": "1.0.0",
73-
"com.unity.services.core": "1.8.1",
74-
"com.unity.nuget.newtonsoft-json": "3.0.2"
81+
"com.unity.services.core": "1.12.4",
82+
"com.unity.modules.jsonserialize": "1.0.0"
7583
},
7684
"url": "https://packages.unity.com"
7785
},
7886
"com.unity.services.core": {
79-
"version": "1.12.0",
87+
"version": "1.14.0",
8088
"depth": 2,
8189
"source": "registry",
8290
"dependencies": {
83-
"com.unity.modules.unitywebrequest": "1.0.0",
91+
"com.unity.modules.androidjni": "1.0.0",
8492
"com.unity.nuget.newtonsoft-json": "3.2.1",
85-
"com.unity.modules.androidjni": "1.0.0"
93+
"com.unity.modules.unitywebrequest": "1.0.0"
8694
},
8795
"url": "https://packages.unity.com"
8896
},
8997
"com.unity.test-framework": {
90-
"version": "1.3.9",
98+
"version": "1.4.5",
9199
"depth": 0,
92100
"source": "registry",
93101
"dependencies": {
@@ -98,13 +106,13 @@
98106
"url": "https://packages.unity.com"
99107
},
100108
"com.unity.timeline": {
101-
"version": "1.8.6",
109+
"version": "1.8.7",
102110
"depth": 0,
103111
"source": "registry",
104112
"dependencies": {
113+
"com.unity.modules.audio": "1.0.0",
105114
"com.unity.modules.director": "1.0.0",
106115
"com.unity.modules.animation": "1.0.0",
107-
"com.unity.modules.audio": "1.0.0",
108116
"com.unity.modules.particlesystem": "1.0.0"
109117
},
110118
"url": "https://packages.unity.com"
Lines changed: 20 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,20 @@
1-
%YAML 1.1
2-
%TAG !u! tag:unity3d.com,2011:
3-
--- !u!11 &1
4-
AudioManager:
5-
m_ObjectHideFlags: 0
6-
m_Volume: 1
7-
Rolloff Scale: 1
8-
Doppler Factor: 1
9-
Default Speaker Mode: 2
10-
m_SampleRate: 0
11-
m_DSPBufferSize: 1024
12-
m_VirtualVoiceCount: 512
13-
m_RealVoiceCount: 32
14-
m_SpatializerPlugin:
15-
m_AmbisonicDecoderPlugin:
16-
m_DisableAudio: 0
17-
m_VirtualizeEffects: 1
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!11 &1
4+
AudioManager:
5+
m_ObjectHideFlags: 0
6+
serializedVersion: 2
7+
m_Volume: 1
8+
Rolloff Scale: 1
9+
Doppler Factor: 1
10+
Default Speaker Mode: 2
11+
m_SampleRate: 0
12+
m_DSPBufferSize: 1024
13+
m_VirtualVoiceCount: 512
14+
m_RealVoiceCount: 32
15+
m_EnableOutputSuspension: 1
16+
m_SpatializerPlugin:
17+
m_AmbisonicDecoderPlugin:
18+
m_DisableAudio: 0
19+
m_VirtualizeEffects: 1
20+
m_RequestedDSPBufferSize: 1024
Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +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: []
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!236 &1
4+
ClusterInputManager:
5+
m_ObjectHideFlags: 0
6+
m_Inputs: []
Lines changed: 36 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,36 @@
1-
%YAML 1.1
2-
%TAG !u! tag:unity3d.com,2011:
3-
--- !u!55 &1
4-
PhysicsManager:
5-
m_ObjectHideFlags: 0
6-
serializedVersion: 7
7-
m_Gravity: {x: 0, y: -9.81, z: 0}
8-
m_DefaultMaterial: {fileID: 0}
9-
m_BounceThreshold: 2
10-
m_SleepThreshold: 0.005
11-
m_DefaultContactOffset: 0.01
12-
m_DefaultSolverIterations: 6
13-
m_DefaultSolverVelocityIterations: 1
14-
m_QueriesHitBackfaces: 0
15-
m_QueriesHitTriggers: 1
16-
m_EnableAdaptiveForce: 0
17-
m_ClothInterCollisionDistance: 0
18-
m_ClothInterCollisionStiffness: 0
19-
m_ContactsGeneration: 1
20-
m_LayerCollisionMatrix: ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
21-
m_AutoSimulation: 1
22-
m_AutoSyncTransforms: 1
23-
m_ClothInterCollisionSettingsToggle: 0
24-
m_ContactPairsMode: 0
25-
m_BroadphaseType: 0
26-
m_WorldBounds:
27-
m_Center: {x: 0, y: 0, z: 0}
28-
m_Extent: {x: 250, y: 250, z: 250}
29-
m_WorldSubdivisions: 8
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!55 &1
4+
PhysicsManager:
5+
m_ObjectHideFlags: 0
6+
serializedVersion: 18
7+
m_Gravity: {x: 0, y: -9.81, z: 0}
8+
m_DefaultMaterial: {fileID: 0}
9+
m_BounceThreshold: 2
10+
m_DefaultMaxDepenetrationVelocity: 10
11+
m_SleepThreshold: 0.005
12+
m_DefaultContactOffset: 0.01
13+
m_DefaultSolverIterations: 6
14+
m_DefaultSolverVelocityIterations: 1
15+
m_QueriesHitBackfaces: 0
16+
m_QueriesHitTriggers: 1
17+
m_EnableAdaptiveForce: 0
18+
m_ClothInterCollisionDistance: 0
19+
m_ClothInterCollisionStiffness: 0
20+
m_LayerCollisionMatrix: ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
21+
m_SimulationMode: 0
22+
m_AutoSyncTransforms: 1
23+
m_ReuseCollisionCallbacks: 0
24+
m_InvokeCollisionCallbacks: 1
25+
m_ClothInterCollisionSettingsToggle: 0
26+
m_ClothGravity: {x: 0, y: -9.81, z: 0}
27+
m_ContactPairsMode: 0
28+
m_BroadphaseType: 0
29+
m_FrictionType: 0
30+
m_EnableEnhancedDeterminism: 0
31+
m_ImprovedPatchFriction: 0
32+
m_SolverType: 0
33+
m_DefaultMaxAngularSpeed: 7
34+
m_ScratchBufferChunkCount: 4
35+
m_CurrentBackendId: 4072204805
36+
m_FastMotionThreshold: 3.4028235e+38

0 commit comments

Comments
 (0)