From 52092d9849f900a0246d7d483835a438d3aee344 Mon Sep 17 00:00:00 2001 From: Melby Date: Sun, 1 May 2022 17:58:20 -0500 Subject: [PATCH 1/2] updated mountain scene --- Assets/Prefabs/King/KingHeadUVd.prefab | 6 +- Assets/Scenes/Game-Mountain.unity | 434 ++++++++++++++++++-- Assets/Scripts/Game/EndCollider.cs | 1 + Assets/Scripts/KingScripts/KingZoom.cs | 1 + Assets/Scripts/PlayerScripts/PlayerStats.cs | 2 +- UserSettings/EditorUserSettings.asset | 36 +- 6 files changed, 430 insertions(+), 50 deletions(-) diff --git a/Assets/Prefabs/King/KingHeadUVd.prefab b/Assets/Prefabs/King/KingHeadUVd.prefab index 7c1e8b9..bbf4227 100644 --- a/Assets/Prefabs/King/KingHeadUVd.prefab +++ b/Assets/Prefabs/King/KingHeadUVd.prefab @@ -850,15 +850,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6485432813017038358, guid: 330d811abd9d7094eb596cace80ae0ec, type: 3} propertyPath: m_LocalScale.x - value: 0.2 + value: 0.15 objectReference: {fileID: 0} - target: {fileID: 6485432813017038358, guid: 330d811abd9d7094eb596cace80ae0ec, type: 3} propertyPath: m_LocalScale.y - value: 0.2 + value: 0.15 objectReference: {fileID: 0} - target: {fileID: 6485432813017038358, guid: 330d811abd9d7094eb596cace80ae0ec, type: 3} propertyPath: m_LocalScale.z - value: 0.2 + value: 0.15 objectReference: {fileID: 0} - target: {fileID: 6485432813017038358, guid: 330d811abd9d7094eb596cace80ae0ec, type: 3} propertyPath: m_LocalPosition.x diff --git a/Assets/Scenes/Game-Mountain.unity b/Assets/Scenes/Game-Mountain.unity index 108f74a..d1f56c2 100644 --- a/Assets/Scenes/Game-Mountain.unity +++ b/Assets/Scenes/Game-Mountain.unity @@ -9433,7 +9433,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8808368135834717660, guid: 0d288120830514244bc113d85efa9b4d, type: 3} propertyPath: m_LocalPosition.y - value: 70 + value: 72 objectReference: {fileID: 0} - target: {fileID: 8808368135834717660, guid: 0d288120830514244bc113d85efa9b4d, type: 3} propertyPath: m_LocalPosition.z @@ -9493,7 +9493,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8808368135834717661, guid: 0d288120830514244bc113d85efa9b4d, type: 3} propertyPath: SpawnLocation.y - value: 72 + value: 78 objectReference: {fileID: 0} - target: {fileID: 8808368135834717661, guid: 0d288120830514244bc113d85efa9b4d, type: 3} propertyPath: SpawnLocation.z @@ -30244,11 +30244,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2150145139066044109, guid: daebaf6273c9a184baebfcc6b0894c9d, type: 3} propertyPath: m_LocalPosition.x - value: -4530 + value: -4562.6 objectReference: {fileID: 0} - target: {fileID: 2150145139066044109, guid: daebaf6273c9a184baebfcc6b0894c9d, type: 3} propertyPath: m_LocalPosition.y - value: 430 + value: 412.9 objectReference: {fileID: 0} - target: {fileID: 2150145139066044109, guid: daebaf6273c9a184baebfcc6b0894c9d, type: 3} propertyPath: m_LocalPosition.z @@ -39490,7 +39490,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 264324789} m_LocalRotation: {x: -0.03938714, y: 0.52191883, z: 0.06412122, w: 0.84966934} - m_LocalPosition: {x: -4788.9, y: 464.7, z: 421.8} + m_LocalPosition: {x: -4783.6, y: 474.4, z: 407.9} m_LocalScale: {x: 5, y: 5, z: 5} m_Children: - {fileID: 10316881} @@ -49762,11 +49762,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2150145139066044109, guid: daebaf6273c9a184baebfcc6b0894c9d, type: 3} propertyPath: m_LocalPosition.x - value: -4465 + value: -4530.1 objectReference: {fileID: 0} - target: {fileID: 2150145139066044109, guid: daebaf6273c9a184baebfcc6b0894c9d, type: 3} propertyPath: m_LocalPosition.y - value: 410 + value: 401 objectReference: {fileID: 0} - target: {fileID: 2150145139066044109, guid: daebaf6273c9a184baebfcc6b0894c9d, type: 3} propertyPath: m_LocalPosition.z @@ -49950,6 +49950,176 @@ Transform: m_CorrespondingSourceObject: {fileID: 3004578629252110241, guid: 966024719e0b1a6479c34b7a50e2a761, type: 3} m_PrefabInstance: {fileID: 351673736} m_PrefabAsset: {fileID: 0} +--- !u!1 &354853393 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 354853394} + - component: {fileID: 354853396} + - component: {fileID: 354853395} + m_Layer: 0 + m_Name: Text (TMP) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &354853394 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 354853393} + m_LocalRotation: {x: 0, y: 1, z: 0, w: 0} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1408378783} + m_RootOrder: 13 + m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 2024} + m_SizeDelta: {x: 9000, y: 1000} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &354853395 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 354853393} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9541d86e2fd84c1d9990edf0852d74ab, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: JUMP IN! + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: c9c6ab728bbf8974783d3354922a042f, type: 2} + m_sharedMaterial: {fileID: -1126714427571281196, guid: c9c6ab728bbf8974783d3354922a042f, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4278190080 + m_fontColor: {r: 0, g: 0, b: 0, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 10000 + m_fontSizeBase: 10000 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 0 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_renderer: {fileID: 354853396} + m_maskType: 0 + _SortingLayer: 0 + _SortingLayerID: 0 + _SortingOrder: 0 +--- !u!23 &354853396 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 354853393} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: -1126714427571281196, guid: c9c6ab728bbf8974783d3354922a042f, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!1 &355795705 GameObject: m_ObjectHideFlags: 0 @@ -58796,7 +58966,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &384194924 Transform: m_ObjectHideFlags: 0 @@ -58893,6 +59063,84 @@ Transform: m_CorrespondingSourceObject: {fileID: 4992850846068170912, guid: 8699c449cdb2031479bf81e812bfd845, type: 3} m_PrefabInstance: {fileID: 384866722} m_PrefabAsset: {fileID: 0} +--- !u!1001 &384986002 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 831253186} + m_Modifications: + - target: {fileID: 37135206619831039, guid: 979e3ced0c163134699b33647c779980, type: 3} + propertyPath: m_Name + value: 2x1x6_Blue (1) + objectReference: {fileID: 0} + - target: {fileID: 37135206619831039, guid: 979e3ced0c163134699b33647c779980, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 848997707011588165, guid: 979e3ced0c163134699b33647c779980, type: 3} + propertyPath: m_RootOrder + value: 72 + objectReference: {fileID: 0} + - target: {fileID: 848997707011588165, guid: 979e3ced0c163134699b33647c779980, type: 3} + propertyPath: m_LocalScale.x + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 848997707011588165, guid: 979e3ced0c163134699b33647c779980, type: 3} + propertyPath: m_LocalScale.y + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 848997707011588165, guid: 979e3ced0c163134699b33647c779980, type: 3} + propertyPath: m_LocalScale.z + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 848997707011588165, guid: 979e3ced0c163134699b33647c779980, type: 3} + propertyPath: m_LocalPosition.x + value: -4420.8 + objectReference: {fileID: 0} + - target: {fileID: 848997707011588165, guid: 979e3ced0c163134699b33647c779980, type: 3} + propertyPath: m_LocalPosition.y + value: 514.8 + objectReference: {fileID: 0} + - target: {fileID: 848997707011588165, guid: 979e3ced0c163134699b33647c779980, type: 3} + propertyPath: m_LocalPosition.z + value: 200.6 + objectReference: {fileID: 0} + - target: {fileID: 848997707011588165, guid: 979e3ced0c163134699b33647c779980, type: 3} + propertyPath: m_LocalRotation.w + value: 0.55622476 + objectReference: {fileID: 0} + - target: {fileID: 848997707011588165, guid: 979e3ced0c163134699b33647c779980, type: 3} + propertyPath: m_LocalRotation.x + value: 0.43659368 + objectReference: {fileID: 0} + - target: {fileID: 848997707011588165, guid: 979e3ced0c163134699b33647c779980, type: 3} + propertyPath: m_LocalRotation.y + value: 0.43659368 + objectReference: {fileID: 0} + - target: {fileID: 848997707011588165, guid: 979e3ced0c163134699b33647c779980, type: 3} + propertyPath: m_LocalRotation.z + value: 0.55622476 + objectReference: {fileID: 0} + - target: {fileID: 848997707011588165, guid: 979e3ced0c163134699b33647c779980, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 848997707011588165, guid: 979e3ced0c163134699b33647c779980, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 76.258 + objectReference: {fileID: 0} + - target: {fileID: 848997707011588165, guid: 979e3ced0c163134699b33647c779980, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 90 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 979e3ced0c163134699b33647c779980, type: 3} +--- !u!4 &384986003 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 848997707011588165, guid: 979e3ced0c163134699b33647c779980, type: 3} + m_PrefabInstance: {fileID: 384986002} + m_PrefabAsset: {fileID: 0} --- !u!1 &385253549 GameObject: m_ObjectHideFlags: 0 @@ -64097,7 +64345,7 @@ Transform: m_Children: - {fileID: 1642884612} m_Father: {fileID: 1884048514} - m_RootOrder: 85 + m_RootOrder: 86 m_LocalEulerAnglesHint: {x: 0, y: -105, z: 0} --- !u!23 &432384648 MeshRenderer: @@ -83836,7 +84084,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8808368135834717660, guid: 0d288120830514244bc113d85efa9b4d, type: 3} propertyPath: m_LocalPosition.y - value: 70 + value: 72 objectReference: {fileID: 0} - target: {fileID: 8808368135834717660, guid: 0d288120830514244bc113d85efa9b4d, type: 3} propertyPath: m_LocalPosition.z @@ -83896,7 +84144,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8808368135834717661, guid: 0d288120830514244bc113d85efa9b4d, type: 3} propertyPath: SpawnLocation.y - value: 73.5 + value: 78 objectReference: {fileID: 0} - target: {fileID: 8808368135834717661, guid: 0d288120830514244bc113d85efa9b4d, type: 3} propertyPath: SpawnLocation.z @@ -85061,6 +85309,52 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 571736093} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1001 &572009134 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1884048514} + m_Modifications: + - target: {fileID: 2150145139066044109, guid: daebaf6273c9a184baebfcc6b0894c9d, type: 3} + propertyPath: m_RootOrder + value: 82 + objectReference: {fileID: 0} + - target: {fileID: 2150145139066044109, guid: daebaf6273c9a184baebfcc6b0894c9d, type: 3} + propertyPath: m_LocalPosition.x + value: -4485.3 + objectReference: {fileID: 0} + - target: {fileID: 2150145139066044109, guid: daebaf6273c9a184baebfcc6b0894c9d, type: 3} + propertyPath: m_LocalPosition.y + value: 390.3 + objectReference: {fileID: 0} + - target: {fileID: 2150145139066044109, guid: daebaf6273c9a184baebfcc6b0894c9d, type: 3} + propertyPath: m_LocalPosition.z + value: 870 + objectReference: {fileID: 0} + - target: {fileID: 2150145139066044109, guid: daebaf6273c9a184baebfcc6b0894c9d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2150145139066044109, guid: daebaf6273c9a184baebfcc6b0894c9d, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2150145139066044109, guid: daebaf6273c9a184baebfcc6b0894c9d, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2150145139066044112, guid: daebaf6273c9a184baebfcc6b0894c9d, type: 3} + propertyPath: m_Name + value: Grappling Hook Point (8) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: daebaf6273c9a184baebfcc6b0894c9d, type: 3} +--- !u!4 &572009135 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 2150145139066044109, guid: daebaf6273c9a184baebfcc6b0894c9d, type: 3} + m_PrefabInstance: {fileID: 572009134} + m_PrefabAsset: {fileID: 0} --- !u!1001 &573206935 PrefabInstance: m_ObjectHideFlags: 0 @@ -102780,7 +103074,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8808368135834717660, guid: 0d288120830514244bc113d85efa9b4d, type: 3} propertyPath: m_LocalPosition.y - value: 70 + value: 72 objectReference: {fileID: 0} - target: {fileID: 8808368135834717660, guid: 0d288120830514244bc113d85efa9b4d, type: 3} propertyPath: m_LocalPosition.z @@ -102840,7 +103134,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8808368135834717661, guid: 0d288120830514244bc113d85efa9b4d, type: 3} propertyPath: SpawnLocation.y - value: 73.5 + value: 78 objectReference: {fileID: 0} - target: {fileID: 8808368135834717661, guid: 0d288120830514244bc113d85efa9b4d, type: 3} propertyPath: SpawnLocation.z @@ -102952,7 +103246,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8808368135834717660, guid: 0d288120830514244bc113d85efa9b4d, type: 3} propertyPath: m_LocalPosition.y - value: 70 + value: 72 objectReference: {fileID: 0} - target: {fileID: 8808368135834717660, guid: 0d288120830514244bc113d85efa9b4d, type: 3} propertyPath: m_LocalPosition.z @@ -103012,7 +103306,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8808368135834717661, guid: 0d288120830514244bc113d85efa9b4d, type: 3} propertyPath: SpawnLocation.y - value: 73.5 + value: 78 objectReference: {fileID: 0} - target: {fileID: 8808368135834717661, guid: 0d288120830514244bc113d85efa9b4d, type: 3} propertyPath: SpawnLocation.z @@ -130906,6 +131200,7 @@ Transform: - {fileID: 1372074013} - {fileID: 1612267450} - {fileID: 1357001572} + - {fileID: 384986003} m_Father: {fileID: 383171419} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -133162,7 +133457,7 @@ Transform: m_Children: - {fileID: 1890438312} m_Father: {fileID: 1884048514} - m_RootOrder: 82 + m_RootOrder: 83 m_LocalEulerAnglesHint: {x: -11.246, y: -120.65, z: 6.592} --- !u!23 &853558320 MeshRenderer: @@ -139393,7 +139688,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8808368135834717660, guid: 0d288120830514244bc113d85efa9b4d, type: 3} propertyPath: m_LocalPosition.y - value: 70 + value: 72 objectReference: {fileID: 0} - target: {fileID: 8808368135834717660, guid: 0d288120830514244bc113d85efa9b4d, type: 3} propertyPath: m_LocalPosition.z @@ -139453,7 +139748,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8808368135834717661, guid: 0d288120830514244bc113d85efa9b4d, type: 3} propertyPath: SpawnLocation.y - value: 73.5 + value: 78 objectReference: {fileID: 0} - target: {fileID: 8808368135834717661, guid: 0d288120830514244bc113d85efa9b4d, type: 3} propertyPath: SpawnLocation.z @@ -156731,7 +157026,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8808368135834717660, guid: 0d288120830514244bc113d85efa9b4d, type: 3} propertyPath: m_LocalPosition.y - value: 70 + value: 72 objectReference: {fileID: 0} - target: {fileID: 8808368135834717660, guid: 0d288120830514244bc113d85efa9b4d, type: 3} propertyPath: m_LocalPosition.z @@ -305856,6 +306151,7 @@ Transform: - {fileID: 349630636} - {fileID: 226530189} - {fileID: 1926694603} + - {fileID: 572009135} - {fileID: 853558319} - {fileID: 1898081549} - {fileID: 2081436691} @@ -307913,7 +308209,7 @@ Transform: m_Children: - {fileID: 1577660290} m_Father: {fileID: 1884048514} - m_RootOrder: 83 + m_RootOrder: 84 m_LocalEulerAnglesHint: {x: -11.246, y: -120.65, z: 6.592} --- !u!23 &1898081550 MeshRenderer: @@ -310634,11 +310930,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2150145139066044109, guid: daebaf6273c9a184baebfcc6b0894c9d, type: 3} propertyPath: m_LocalPosition.x - value: -4434 + value: -4435.06 objectReference: {fileID: 0} - target: {fileID: 2150145139066044109, guid: daebaf6273c9a184baebfcc6b0894c9d, type: 3} propertyPath: m_LocalPosition.y - value: 388.4 + value: 382.8 objectReference: {fileID: 0} - target: {fileID: 2150145139066044109, guid: daebaf6273c9a184baebfcc6b0894c9d, type: 3} propertyPath: m_LocalPosition.z @@ -313267,6 +313563,88 @@ Transform: m_CorrespondingSourceObject: {fileID: 3671806987858315597, guid: a6ac772743d99944ea0599227ccafdcd, type: 3} m_PrefabInstance: {fileID: 1950662193} m_PrefabAsset: {fileID: 0} +--- !u!1 &1951235671 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1951235672} + - component: {fileID: 1951235673} + m_Layer: 0 + m_Name: Square + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1951235672 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1951235671} + m_LocalRotation: {x: 0, y: 0, z: -0.7071068, w: 0.7071068} + m_LocalPosition: {x: 0, y: 678, z: 0} + m_LocalScale: {x: 200, y: 200, z: 200} + m_Children: [] + m_Father: {fileID: 1408378783} + m_RootOrder: 14 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: -90} +--- !u!212 &1951235673 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1951235671} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: -5830838052640825725, guid: c067be34ff13a6048b2907761017412d, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1, y: 1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1001 &1951724435 PrefabInstance: m_ObjectHideFlags: 0 @@ -313583,7 +313961,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &1953047925 Transform: m_ObjectHideFlags: 0 @@ -313597,7 +313975,7 @@ Transform: m_Children: - {fileID: 89349977} m_Father: {fileID: 1884048514} - m_RootOrder: 86 + m_RootOrder: 87 m_LocalEulerAnglesHint: {x: 0, y: 141.251, z: 0} --- !u!23 &1953047926 MeshRenderer: @@ -332563,12 +332941,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2081436690} m_LocalRotation: {x: -0, y: 0.9979552, z: 0.06391777, w: 0} - m_LocalPosition: {x: -4403.2, y: 391.1, z: 832.4} + m_LocalPosition: {x: -4279.4, y: 391.1, z: 738} m_LocalScale: {x: 5, y: 5, z: 5} m_Children: - {fileID: 356597571} m_Father: {fileID: 1884048514} - m_RootOrder: 84 + m_RootOrder: 85 m_LocalEulerAnglesHint: {x: -7.329, y: 180, z: 0} --- !u!23 &2081436692 MeshRenderer: @@ -341027,7 +341405,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8808368135834717660, guid: 0d288120830514244bc113d85efa9b4d, type: 3} propertyPath: m_LocalPosition.y - value: 70 + value: 72 objectReference: {fileID: 0} - target: {fileID: 8808368135834717660, guid: 0d288120830514244bc113d85efa9b4d, type: 3} propertyPath: m_LocalPosition.z @@ -341087,7 +341465,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8808368135834717661, guid: 0d288120830514244bc113d85efa9b4d, type: 3} propertyPath: SpawnLocation.y - value: 73.5 + value: 78 objectReference: {fileID: 0} - target: {fileID: 8808368135834717661, guid: 0d288120830514244bc113d85efa9b4d, type: 3} propertyPath: SpawnLocation.z diff --git a/Assets/Scripts/Game/EndCollider.cs b/Assets/Scripts/Game/EndCollider.cs index 6c2d6b5..73136d5 100644 --- a/Assets/Scripts/Game/EndCollider.cs +++ b/Assets/Scripts/Game/EndCollider.cs @@ -87,6 +87,7 @@ public class EndCollider : NetworkBehaviour { //GameHandler.FindGameObjectInChildWithTag(character, "UICam").GetComponent().enabled = true; GameHandler.FindGameObjectInChildWithTag(UICamera, "PlayerCam").GetComponent().enabled = true; + GameHandler.FindGameObjectInChildWithTag(UICamera, "PlayerCam").GetComponent().enabled = false; GameHandler.FindGameObjectInChildWithTag(UICamera, "PlayerCam").GetComponent().enabled = true; } } diff --git a/Assets/Scripts/KingScripts/KingZoom.cs b/Assets/Scripts/KingScripts/KingZoom.cs index ab90347..1ffdb49 100644 --- a/Assets/Scripts/KingScripts/KingZoom.cs +++ b/Assets/Scripts/KingScripts/KingZoom.cs @@ -32,6 +32,7 @@ public class KingZoom : MonoBehaviour { if (Zoomed == false) { + BaseRot = transform.rotation; cam.fieldOfView = 15;//Zooms in Panel.transform.localPosition = new Vector3(Panel.transform.localPosition.x, Panel.transform.localPosition.y, 4150f);//Moves the UI Text in with the zoom Text.transform.localPosition = new Vector3(Text.transform.localPosition.x, Text.transform.localPosition.y, 4150f); diff --git a/Assets/Scripts/PlayerScripts/PlayerStats.cs b/Assets/Scripts/PlayerScripts/PlayerStats.cs index 6f69b67..7b4fa9a 100644 --- a/Assets/Scripts/PlayerScripts/PlayerStats.cs +++ b/Assets/Scripts/PlayerScripts/PlayerStats.cs @@ -226,7 +226,7 @@ public class PlayerStats : MonoBehaviour case Weather.Rain:{ Debug.Log("Rain"); - tractionModification = .1f; + tractionModification = .28f; traction *= tractionModification; curTraction *= tractionModification; diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset index 45a5193..f164ce8 100644 --- a/UserSettings/EditorUserSettings.asset +++ b/UserSettings/EditorUserSettings.asset @@ -6,35 +6,35 @@ EditorUserSettings: serializedVersion: 4 m_ConfigSettings: RecentlyUsedScenePath-0: - value: 22424703114646680e0b0227036c7c021313113e3f66333e243d04 + value: 22424703114646680e0b0227036c7b151b180b651f3c272428041c30eae93a3dd6e225fda92f31352d1b flags: 0 RecentlyUsedScenePath-1: - value: 22424703114646680e0b0227036c7c1f18030a25203b68252320092a - flags: 0 - RecentlyUsedScenePath-2: - value: 22424703114646680e0b0227036c7b151b180b6501273035202c1327d1e33136e7a923e7ee2e26 - flags: 0 - RecentlyUsedScenePath-3: - value: 22424703114646680e0b0227036c7c1f18030a25203b68252320092a - flags: 0 - RecentlyUsedScenePath-4: value: 22424703114646680e0b0227036c6b19021b1d192f2d2835633c133af6f9 flags: 0 - RecentlyUsedScenePath-5: + RecentlyUsedScenePath-2: value: 22424703114646680e0b0227036c7000021e17243f66333e243d04 flags: 0 - RecentlyUsedScenePath-6: - value: 22424703114646680e0b0227036c6f1f05033f2b212d68252320092a + RecentlyUsedScenePath-3: + value: 22424703114646680e0b0227036c7c021313113e3f66333e243d04 flags: 0 - RecentlyUsedScenePath-7: - value: 22424703114646680e0b0227036c6f1f05033f2b212d68252320092a - flags: 0 - RecentlyUsedScenePath-8: + RecentlyUsedScenePath-4: value: 22424703114646680e0b0227036c7c1f18030a25203b68252320092a flags: 0 - RecentlyUsedScenePath-9: + RecentlyUsedScenePath-5: + value: 22424703114646680e0b0227036c7c1f18030a25203b68252320092a + flags: 0 + RecentlyUsedScenePath-6: + value: 22424703114646680e0b0227036c7b151b180b6501273035202c1327d1e33136e7a923e7ee2e26 + flags: 0 + RecentlyUsedScenePath-7: value: 22424703114646680e0b0227036c78111b125507233d28242c20137df7ee3d2cfb flags: 0 + RecentlyUsedScenePath-8: + value: 22424703114646680e0b0227036c78111b125507233d28242c20137df7ee3d2cfb + flags: 0 + RecentlyUsedScenePath-9: + value: 22424703114646680e0b0227036c6f02131b172b282d347e38271427fb + flags: 0 vcSharedLogLevel: value: 0d5e400f0650 flags: 0 From 10de2ebe0193b6b0192e005ef5f200c119cb9241 Mon Sep 17 00:00:00 2001 From: Melby Date: Sun, 1 May 2022 18:37:04 -0500 Subject: [PATCH 2/2] fixed hail --- Assets/Scripts/KingScripts/Hail.cs | 4 ++++ UserSettings/EditorUserSettings.asset | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Assets/Scripts/KingScripts/Hail.cs b/Assets/Scripts/KingScripts/Hail.cs index 061d360..1389c70 100644 --- a/Assets/Scripts/KingScripts/Hail.cs +++ b/Assets/Scripts/KingScripts/Hail.cs @@ -43,6 +43,10 @@ public class Hail : NetworkBehaviour [ServerRpc(RequireOwnership = false)] private void ScaleShadowServerRPC() { + if(ShadTemp == null || hail == null) + { + return; + } float y = -m * (hail.transform.position.y - ShadTemp.transform.position.y) + hail.transform.localScale.x;//Find the proper current size ScaleShadowClientRPC(shadowID, y); } diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset index f164ce8..b5d9852 100644 --- a/UserSettings/EditorUserSettings.asset +++ b/UserSettings/EditorUserSettings.asset @@ -24,13 +24,13 @@ EditorUserSettings: value: 22424703114646680e0b0227036c7c1f18030a25203b68252320092a flags: 0 RecentlyUsedScenePath-6: - value: 22424703114646680e0b0227036c7b151b180b6501273035202c1327d1e33136e7a923e7ee2e26 + value: 22424703114646680e0b0227036c78111b125507233d28242c20137df7ee3d2cfb flags: 0 RecentlyUsedScenePath-7: value: 22424703114646680e0b0227036c78111b125507233d28242c20137df7ee3d2cfb flags: 0 RecentlyUsedScenePath-8: - value: 22424703114646680e0b0227036c78111b125507233d28242c20137df7ee3d2cfb + value: 22424703114646680e0b0227036c7b151b180b6501273035202c1327d1e33136e7a923e7ee2e26 flags: 0 RecentlyUsedScenePath-9: value: 22424703114646680e0b0227036c6f02131b172b282d347e38271427fb