kingjuulian06/SquareDash
1
1
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases 3 Wiki Activity

Fixed Bugs

Browse Source
This commit is contained in:
kingjuulian06
2023-12-27 01:04:36 +01:00
parent e3d4c26944 5794762dc9
commit d503358f0a
1031 changed files with 418065 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/Scenes/Level_01.unity
+5907
View File
File diff suppressed because it is too large Load Diff
Assets/Scenes/Level_01.unity.meta
+4
View File
@@ -1,5 +1,9 @@
fileFormatVersion: 2
<<<<<<< HEAD
guid: 5e4df9c1caeb1c9489cdad15dc22816f
=======
guid: f31bc3f5439bc684194182ee640e22fa
>>>>>>> 5794762dc91d1f0d42c77a434b28d24af5d5a080
DefaultImporter:
externalObjects: {}
userData:
Assets/Scenes/Lobby.unity
+27
View File
@@ -241,6 +241,7 @@ Transform:
m_Children: []
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 90, y: -180, z: 0}
<<<<<<< HEAD
--- !u!1 &265231137
GameObject:
m_ObjectHideFlags: 0
@@ -377,6 +378,8 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 265231137}
m_CullTransparentMesh: 1
=======
>>>>>>> 5794762dc91d1f0d42c77a434b28d24af5d5a080
--- !u!1 &364318281
GameObject:
m_ObjectHideFlags: 0
@@ -588,6 +591,7 @@ MonoBehaviour:
m_TargetGraphic: {fileID: 591452200}
m_OnClick:
m_PersistentCalls:
<<<<<<< HEAD
m_Calls:
- m_Target: {fileID: 1475210315}
m_TargetAssemblyTypeName: CreateAndJoinLevel, Assembly-CSharp
@@ -601,6 +605,9 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
=======
m_Calls: []
>>>>>>> 5794762dc91d1f0d42c77a434b28d24af5d5a080
--- !u!114 &591452200
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -639,6 +646,7 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 591452197}
m_CullTransparentMesh: 1
<<<<<<< HEAD
--- !u!1 &793195726
GameObject:
m_ObjectHideFlags: 0
@@ -772,6 +780,8 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 793195726}
m_CullTransparentMesh: 1
=======
>>>>>>> 5794762dc91d1f0d42c77a434b28d24af5d5a080
--- !u!1 &821863274
GameObject:
m_ObjectHideFlags: 0
@@ -854,6 +864,7 @@ MonoBehaviour:
m_TargetGraphic: {fileID: 821863277}
m_OnClick:
m_PersistentCalls:
<<<<<<< HEAD
m_Calls:
- m_Target: {fileID: 1475210315}
m_TargetAssemblyTypeName: CreateAndJoinLevel, Assembly-CSharp
@@ -867,6 +878,9 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
=======
m_Calls: []
>>>>>>> 5794762dc91d1f0d42c77a434b28d24af5d5a080
--- !u!114 &821863277
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -1564,7 +1578,10 @@ GameObject:
- component: {fileID: 1475210312}
- component: {fileID: 1475210311}
- component: {fileID: 1475210315}
<<<<<<< HEAD
- component: {fileID: 1475210316}
=======
>>>>>>> 5794762dc91d1f0d42c77a434b28d24af5d5a080
m_Layer: 5
m_Name: Canvas
m_TagString: Untagged
@@ -1630,7 +1647,11 @@ Canvas:
m_OverridePixelPerfect: 0
m_SortingBucketNormalizedSize: 0
m_VertexColorAlwaysGammaSpace: 0
<<<<<<< HEAD
m_AdditionalShaderChannelsFlag: 25
=======
m_AdditionalShaderChannelsFlag: 0
>>>>>>> 5794762dc91d1f0d42c77a434b28d24af5d5a080
m_UpdateRectTransformForStandalone: 0
m_SortingLayerID: 0
m_SortingOrder: 0
@@ -1651,7 +1672,10 @@ RectTransform:
- {fileID: 1249853838}
- {fileID: 1567380254}
- {fileID: 1078275479}
<<<<<<< HEAD
- {fileID: 793195727}
=======
>>>>>>> 5794762dc91d1f0d42c77a434b28d24af5d5a080
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
@@ -1672,6 +1696,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
scroller: {fileID: 0}
<<<<<<< HEAD
--- !u!114 &1475210316
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -1684,6 +1709,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: f45f8d65074e2204aa0048bdf4b9784c, type: 3}
m_Name:
m_EditorClassIdentifier:
=======
>>>>>>> 5794762dc91d1f0d42c77a434b28d24af5d5a080
--- !u!1 &1567380253
GameObject:
m_ObjectHideFlags: 0
Assets/Scenes/Pause_Menu.unity
+125
View File
@@ -0,0 +1,125 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!29 &1
OcclusionCullingSettings:
m_ObjectHideFlags: 0
serializedVersion: 2
m_OcclusionBakeSettings:
smallestOccluder: 5
smallestHole: 0.25
backfaceThreshold: 100
m_SceneGUID: 00000000000000000000000000000000
m_OcclusionCullingData: {fileID: 0}
--- !u!104 &2
RenderSettings:
m_ObjectHideFlags: 0
serializedVersion: 10
m_Fog: 0
m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
m_FogMode: 3
m_FogDensity: 0.01
m_LinearFogStart: 0
m_LinearFogEnd: 300
m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1}
m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1}
m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1}
m_AmbientIntensity: 1
m_AmbientMode: 3
m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1}
m_SkyboxMaterial: {fileID: 0}
m_HaloStrength: 0.5
m_FlareStrength: 1
m_FlareFadeSpeed: 3
m_HaloTexture: {fileID: 0}
m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0}
m_DefaultReflectionMode: 0
m_DefaultReflectionResolution: 128
m_ReflectionBounces: 1
m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 0}
m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1}
m_UseRadianceAmbientProbe: 0
--- !u!157 &3
LightmapSettings:
m_ObjectHideFlags: 0
serializedVersion: 12
m_GISettings:
serializedVersion: 2
m_BounceScale: 1
m_IndirectOutputScale: 1
m_AlbedoBoost: 1
m_EnvironmentLightingMode: 0
m_EnableBakedLightmaps: 0
m_EnableRealtimeLightmaps: 0
m_LightmapEditorSettings:
serializedVersion: 12
m_Resolution: 2
m_BakeResolution: 40
m_AtlasSize: 1024
m_AO: 0
m_AOMaxDistance: 1
m_CompAOExponent: 1
m_CompAOExponentDirect: 0
m_ExtractAmbientOcclusion: 0
m_Padding: 2
m_LightmapParameters: {fileID: 0}
m_LightmapsBakeMode: 1
m_TextureCompression: 1
m_ReflectionCompression: 2
m_MixedBakeMode: 2
m_BakeBackend: 1
m_PVRSampling: 1
m_PVRDirectSampleCount: 32
m_PVRSampleCount: 512
m_PVRBounces: 2
m_PVREnvironmentSampleCount: 256
m_PVREnvironmentReferencePointCount: 2048
m_PVRFilteringMode: 1
m_PVRDenoiserTypeDirect: 1
m_PVRDenoiserTypeIndirect: 1
m_PVRDenoiserTypeAO: 1
m_PVRFilterTypeDirect: 0
m_PVRFilterTypeIndirect: 0
m_PVRFilterTypeAO: 0
m_PVREnvironmentMIS: 1
m_PVRCulling: 1
m_PVRFilteringGaussRadiusDirect: 1
m_PVRFilteringGaussRadiusIndirect: 5
m_PVRFilteringGaussRadiusAO: 2
m_PVRFilteringAtrousPositionSigmaDirect: 0.5
m_PVRFilteringAtrousPositionSigmaIndirect: 2
m_PVRFilteringAtrousPositionSigmaAO: 1
m_ExportTrainingData: 0
m_TrainingDataDestination: TrainingData
m_LightProbeSampleCountMultiplier: 4
m_LightingDataAsset: {fileID: 0}
m_LightingSettings: {fileID: 0}
--- !u!196 &4
NavMeshSettings:
serializedVersion: 2
m_ObjectHideFlags: 0
m_BuildSettings:
serializedVersion: 3
agentTypeID: 0
agentRadius: 0.5
agentHeight: 2
agentSlope: 45
agentClimb: 0.4
ledgeDropHeight: 0
maxJumpAcrossDistance: 0
minRegionArea: 2
manualCellSize: 0
cellSize: 0.16666667
manualTileSize: 0
tileSize: 256
buildHeightMesh: 0
maxJobWorkers: 0
preserveTilesOutsideBounds: 0
debug:
m_Flags: 0
m_NavMeshData: {fileID: 0}
--- !u!1660057539 &9223372036854775807
SceneRoots:
m_ObjectHideFlags: 0
m_Roots: []
Assets/Scenes/Pause_Menu.unity.meta
+7
View File
@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 87ca1619e6402204c9432061705dd240
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Assets/Scenes/Square Dash.unity
+1224
View File
File diff suppressed because it is too large Load Diff
Assets/Scenes/Start Menu.unity
+28
View File
@@ -431,7 +431,11 @@ RectTransform:
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
<<<<<<< HEAD
m_SizeDelta: {x: -100, y: 0}
=======
m_SizeDelta: {x: 0, y: 0}
>>>>>>> 5794762dc91d1f0d42c77a434b28d24af5d5a080
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1142606338
MonoBehaviour:
@@ -511,8 +515,13 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0}
<<<<<<< HEAD
m_AnchoredPosition: {x: 0, y: 590.5}
m_SizeDelta: {x: 500, y: 100}
=======
m_AnchoredPosition: {x: 0, y: 273.5}
m_SizeDelta: {x: 314.3567, y: 70.4371}
>>>>>>> 5794762dc91d1f0d42c77a434b28d24af5d5a080
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1181711358
MonoBehaviour:
@@ -590,8 +599,13 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
<<<<<<< HEAD
m_Sprite: {fileID: -2563248171097983681, guid: 19fe34bc253db7345bce7b2c72bbc593, type: 3}
m_Type: 0
=======
m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
m_Type: 1
>>>>>>> 5794762dc91d1f0d42c77a434b28d24af5d5a080
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
@@ -852,8 +866,13 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0}
<<<<<<< HEAD
m_AnchoredPosition: {x: 0, y: 460.21857}
m_SizeDelta: {x: 500, y: 100}
=======
m_AnchoredPosition: {x: 0, y: 174.21857}
m_SizeDelta: {x: 314.3567, y: 70.4371}
>>>>>>> 5794762dc91d1f0d42c77a434b28d24af5d5a080
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1522244528
MonoBehaviour:
@@ -931,8 +950,13 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
<<<<<<< HEAD
m_Sprite: {fileID: -2563248171097983681, guid: 19fe34bc253db7345bce7b2c72bbc593, type: 3}
m_Type: 0
=======
m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
m_Type: 1
>>>>>>> 5794762dc91d1f0d42c77a434b28d24af5d5a080
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
@@ -1106,7 +1130,11 @@ RectTransform:
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
<<<<<<< HEAD
m_SizeDelta: {x: -100, y: 0}
=======
m_SizeDelta: {x: 0, y: 0}
>>>>>>> 5794762dc91d1f0d42c77a434b28d24af5d5a080
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1904790921
MonoBehaviour: