Skip to content

Commit 136723b

Browse files
authored
Merge branch 'main' into main
2 parents 698ccb6 + aa12839 commit 136723b

File tree

5 files changed

+554
-21
lines changed

5 files changed

+554
-21
lines changed

Assets/Scenes/Level1.unity

Lines changed: 113 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2186,7 +2186,7 @@ Transform:
21862186
m_GameObject: {fileID: 330585543}
21872187
serializedVersion: 2
21882188
m_LocalRotation: {x: 0.20314598, y: -0.001015736, z: 0.000210737, w: 0.9791479}
2189-
m_LocalPosition: {x: -21.85, y: 2.352, z: -21.66}
2189+
m_LocalPosition: {x: -21.85, y: 2.352, z: -22.08}
21902190
m_LocalScale: {x: 1, y: 1, z: 1}
21912191
m_ConstrainProportionsScale: 0
21922192
m_Children: []
@@ -10174,6 +10174,7 @@ GameObject:
1017410174
- component: {fileID: 1166695320}
1017510175
- component: {fileID: 1166695321}
1017610176
- component: {fileID: 1166695322}
10177+
- component: {fileID: 1166695323}
1017710178
m_Layer: 0
1017810179
m_Name: Player
1017910180
m_TagString: Player
@@ -10288,7 +10289,7 @@ Transform:
1028810289
m_GameObject: {fileID: 1166695311}
1028910290
serializedVersion: 2
1029010291
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
10291-
m_LocalPosition: {x: -21.86, y: 0.262, z: -16.84}
10292+
m_LocalPosition: {x: -21.86, y: 0.262, z: -17.26}
1029210293
m_LocalScale: {x: 1, y: 0.45452, z: 1}
1029310294
m_ConstrainProportionsScale: 0
1029410295
m_Children: []
@@ -10305,6 +10306,8 @@ Rigidbody:
1030510306
m_Mass: 1
1030610307
m_LinearDamping: 0
1030710308
m_AngularDamping: 0.05
10309+
m_Drag: 4
10310+
m_AngularDrag: 0.05
1030810311
m_CenterOfMass: {x: 0, y: 0, z: 0}
1030910312
m_InertiaTensor: {x: 1, y: 1, z: 1}
1031010313
m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1}
@@ -10437,6 +10440,113 @@ MonoBehaviour:
1043710440
sparkleDuration: 2
1043810441
sparkleColor: {r: 1, g: 0.92156863, b: 0.015686275, a: 1}
1043910442
sparkleSpread: 5
10443+
--- !u!96 &1166695323
10444+
TrailRenderer:
10445+
serializedVersion: 3
10446+
m_ObjectHideFlags: 0
10447+
m_CorrespondingSourceObject: {fileID: 0}
10448+
m_PrefabInstance: {fileID: 0}
10449+
m_PrefabAsset: {fileID: 0}
10450+
m_GameObject: {fileID: 1166695311}
10451+
m_Enabled: 1
10452+
m_CastShadows: 1
10453+
m_ReceiveShadows: 1
10454+
m_DynamicOccludee: 1
10455+
m_StaticShadowCaster: 0
10456+
m_MotionVectors: 0
10457+
m_LightProbeUsage: 0
10458+
m_ReflectionProbeUsage: 0
10459+
m_RayTracingMode: 0
10460+
m_RayTraceProcedural: 0
10461+
m_RayTracingAccelStructBuildFlagsOverride: 0
10462+
m_RayTracingAccelStructBuildFlags: 1
10463+
m_SmallMeshCulling: 1
10464+
m_RenderingLayerMask: 1
10465+
m_RendererPriority: 0
10466+
m_Materials:
10467+
- {fileID: 2100000, guid: c3557f85164610846910f37026cf4f89, type: 2}
10468+
m_StaticBatchInfo:
10469+
firstSubMesh: 0
10470+
subMeshCount: 0
10471+
m_StaticBatchRoot: {fileID: 0}
10472+
m_ProbeAnchor: {fileID: 0}
10473+
m_LightProbeVolumeOverride: {fileID: 0}
10474+
m_ScaleInLightmap: 1
10475+
m_ReceiveGI: 1
10476+
m_PreserveUVs: 0
10477+
m_IgnoreNormalsForChartDetection: 0
10478+
m_ImportantGI: 0
10479+
m_StitchLightmapSeams: 1
10480+
m_SelectedEditorRenderState: 3
10481+
m_MinimumChartSize: 4
10482+
m_AutoUVMaxDistance: 0.5
10483+
m_AutoUVMaxAngle: 89
10484+
m_LightmapParameters: {fileID: 0}
10485+
m_SortingLayerID: 0
10486+
m_SortingLayer: 0
10487+
m_SortingOrder: 0
10488+
m_Time: 0.5
10489+
m_PreviewTimeScale: 1
10490+
m_Parameters:
10491+
serializedVersion: 3
10492+
widthMultiplier: 1
10493+
widthCurve:
10494+
serializedVersion: 2
10495+
m_Curve:
10496+
- serializedVersion: 3
10497+
time: 0.09989166
10498+
value: 0.7800007
10499+
inSlope: 0
10500+
outSlope: 0
10501+
tangentMode: 0
10502+
weightedMode: 0
10503+
inWeight: 0.33333334
10504+
outWeight: 0.33333334
10505+
m_PreInfinity: 2
10506+
m_PostInfinity: 2
10507+
m_RotationOrder: 4
10508+
colorGradient:
10509+
serializedVersion: 2
10510+
key0: {r: 1, g: 1, b: 1, a: 1}
10511+
key1: {r: 1, g: 1, b: 1, a: 1}
10512+
key2: {r: 0, g: 0, b: 0, a: 0}
10513+
key3: {r: 0, g: 0, b: 0, a: 0}
10514+
key4: {r: 0, g: 0, b: 0, a: 0}
10515+
key5: {r: 0, g: 0, b: 0, a: 0}
10516+
key6: {r: 0, g: 0, b: 0, a: 0}
10517+
key7: {r: 0, g: 0, b: 0, a: 0}
10518+
ctime0: 0
10519+
ctime1: 65535
10520+
ctime2: 0
10521+
ctime3: 0
10522+
ctime4: 0
10523+
ctime5: 0
10524+
ctime6: 0
10525+
ctime7: 0
10526+
atime0: 0
10527+
atime1: 65535
10528+
atime2: 0
10529+
atime3: 0
10530+
atime4: 0
10531+
atime5: 0
10532+
atime6: 0
10533+
atime7: 0
10534+
m_Mode: 2
10535+
m_ColorSpace: 0
10536+
m_NumColorKeys: 2
10537+
m_NumAlphaKeys: 2
10538+
numCornerVertices: 0
10539+
numCapVertices: 0
10540+
alignment: 0
10541+
textureMode: 0
10542+
textureScale: {x: 1, y: 1}
10543+
shadowBias: 0.5
10544+
generateLightingData: 0
10545+
m_MinVertexDistance: 0.1
10546+
m_MaskInteraction: 0
10547+
m_Autodestruct: 0
10548+
m_Emitting: 1
10549+
m_ApplyActiveColorSpace: 1
1044010550
--- !u!1 &1192910350
1044110551
GameObject:
1044210552
m_ObjectHideFlags: 0
@@ -11491,7 +11601,7 @@ Transform:
1149111601
m_GameObject: {fileID: 1279311372}
1149211602
serializedVersion: 2
1149311603
m_LocalRotation: {x: 0.20314598, y: -0.0010157359, z: 0.00021073695, w: 0.9791479}
11494-
m_LocalPosition: {x: -21.85, y: 2.352, z: -21.66}
11604+
m_LocalPosition: {x: -21.85, y: 2.352, z: -22.08}
1149511605
m_LocalScale: {x: 1, y: 1, z: 1}
1149611606
m_ConstrainProportionsScale: 0
1149711607
m_Children: []

Assets/Scenes/Level2.unity

Lines changed: 108 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5692,6 +5692,7 @@ GameObject:
56925692
- component: {fileID: 945966554}
56935693
- component: {fileID: 945966555}
56945694
- component: {fileID: 945966556}
5695+
- component: {fileID: 945966557}
56955696
m_Layer: 0
56965697
m_Name: Player
56975698
m_TagString: Player
@@ -5955,6 +5956,113 @@ MonoBehaviour:
59555956
sparkleDuration: 2
59565957
sparkleColor: {r: 1, g: 0.92156863, b: 0.015686275, a: 1}
59575958
sparkleSpread: 5
5959+
--- !u!96 &945966557
5960+
TrailRenderer:
5961+
serializedVersion: 3
5962+
m_ObjectHideFlags: 0
5963+
m_CorrespondingSourceObject: {fileID: 0}
5964+
m_PrefabInstance: {fileID: 0}
5965+
m_PrefabAsset: {fileID: 0}
5966+
m_GameObject: {fileID: 945966544}
5967+
m_Enabled: 1
5968+
m_CastShadows: 1
5969+
m_ReceiveShadows: 1
5970+
m_DynamicOccludee: 1
5971+
m_StaticShadowCaster: 0
5972+
m_MotionVectors: 0
5973+
m_LightProbeUsage: 0
5974+
m_ReflectionProbeUsage: 0
5975+
m_RayTracingMode: 0
5976+
m_RayTraceProcedural: 0
5977+
m_RayTracingAccelStructBuildFlagsOverride: 0
5978+
m_RayTracingAccelStructBuildFlags: 1
5979+
m_SmallMeshCulling: 1
5980+
m_RenderingLayerMask: 1
5981+
m_RendererPriority: 0
5982+
m_Materials:
5983+
- {fileID: 2100000, guid: c3557f85164610846910f37026cf4f89, type: 2}
5984+
m_StaticBatchInfo:
5985+
firstSubMesh: 0
5986+
subMeshCount: 0
5987+
m_StaticBatchRoot: {fileID: 0}
5988+
m_ProbeAnchor: {fileID: 0}
5989+
m_LightProbeVolumeOverride: {fileID: 0}
5990+
m_ScaleInLightmap: 1
5991+
m_ReceiveGI: 1
5992+
m_PreserveUVs: 0
5993+
m_IgnoreNormalsForChartDetection: 0
5994+
m_ImportantGI: 0
5995+
m_StitchLightmapSeams: 1
5996+
m_SelectedEditorRenderState: 3
5997+
m_MinimumChartSize: 4
5998+
m_AutoUVMaxDistance: 0.5
5999+
m_AutoUVMaxAngle: 89
6000+
m_LightmapParameters: {fileID: 0}
6001+
m_SortingLayerID: 0
6002+
m_SortingLayer: 0
6003+
m_SortingOrder: 0
6004+
m_Time: 0.5
6005+
m_PreviewTimeScale: 1
6006+
m_Parameters:
6007+
serializedVersion: 3
6008+
widthMultiplier: 1
6009+
widthCurve:
6010+
serializedVersion: 2
6011+
m_Curve:
6012+
- serializedVersion: 3
6013+
time: 0.09989166
6014+
value: 0.7800007
6015+
inSlope: 0
6016+
outSlope: 0
6017+
tangentMode: 0
6018+
weightedMode: 0
6019+
inWeight: 0.33333334
6020+
outWeight: 0.33333334
6021+
m_PreInfinity: 2
6022+
m_PostInfinity: 2
6023+
m_RotationOrder: 4
6024+
colorGradient:
6025+
serializedVersion: 2
6026+
key0: {r: 1, g: 1, b: 1, a: 1}
6027+
key1: {r: 1, g: 1, b: 1, a: 1}
6028+
key2: {r: 0, g: 0, b: 0, a: 0}
6029+
key3: {r: 0, g: 0, b: 0, a: 0}
6030+
key4: {r: 0, g: 0, b: 0, a: 0}
6031+
key5: {r: 0, g: 0, b: 0, a: 0}
6032+
key6: {r: 0, g: 0, b: 0, a: 0}
6033+
key7: {r: 0, g: 0, b: 0, a: 0}
6034+
ctime0: 0
6035+
ctime1: 65535
6036+
ctime2: 0
6037+
ctime3: 0
6038+
ctime4: 0
6039+
ctime5: 0
6040+
ctime6: 0
6041+
ctime7: 0
6042+
atime0: 0
6043+
atime1: 65535
6044+
atime2: 0
6045+
atime3: 0
6046+
atime4: 0
6047+
atime5: 0
6048+
atime6: 0
6049+
atime7: 0
6050+
m_Mode: 2
6051+
m_ColorSpace: 0
6052+
m_NumColorKeys: 2
6053+
m_NumAlphaKeys: 2
6054+
numCornerVertices: 0
6055+
numCapVertices: 0
6056+
alignment: 0
6057+
textureMode: 0
6058+
textureScale: {x: 1, y: 1}
6059+
shadowBias: 0.5
6060+
generateLightingData: 0
6061+
m_MinVertexDistance: 0.1
6062+
m_MaskInteraction: 0
6063+
m_Autodestruct: 0
6064+
m_Emitting: 1
6065+
m_ApplyActiveColorSpace: 1
59586066
--- !u!1 &948847381
59596067
GameObject:
59606068
m_ObjectHideFlags: 0

0 commit comments

Comments
 (0)