Updates

-Boulder Prefab -Boulder Spawning -Plains Layout -Painted Terrain
2026-04-25 07:57:08 -05:00 · 2021-12-10 21:03:36 -06:00 · 2021-12-10 21:03:36 -06:00 · acdac8b00a
commit acdac8b00a
parent 6a8b1a6680
11 changed files with 15523 additions and 55 deletions
--- a/Textures/Materials/Materials/lava.mat
+++ b/Textures/Materials/Materials/lava.mat
@ -0,0 +1,78 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 6
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: lava
+  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
+  m_ShaderKeywords: 
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _BumpMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailAlbedoMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailMask:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 2800000, guid: a7df10549b8b7034d87aefa873526cac, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MetallicGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _OcclusionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ParallaxMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Floats:
+    - _BumpScale: 1
+    - _Cutoff: 0.5
+    - _DetailNormalMapScale: 1
+    - _DstBlend: 0
+    - _GlossMapScale: 1
+    - _Glossiness: 0.5
+    - _GlossyReflections: 1
+    - _Metallic: 0
+    - _Mode: 0
+    - _OcclusionStrength: 1
+    - _Parallax: 0.02
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _UVSec: 0
+    - _ZWrite: 1
+    m_Colors:
+    - _Color: {r: 1, g: 1, b: 1, a: 1}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+  m_BuildTextureStacks: []
--- a/Textures/Materials/Materials/lava.mat.meta
+++ b/Textures/Materials/Materials/lava.mat.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 3caf422534d820d4dbcaff68387e70d7
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Models/PlainsTerrain1.asset
+++ b/Assets/Models/PlainsTerrain1.asset
--- a/Assets/Models/PlainsTerrain2.asset
+++ b/Assets/Models/PlainsTerrain2.asset
--- a/Assets/Prefabs/Environment/Boulder.prefab
+++ b/Assets/Prefabs/Environment/Boulder.prefab
@ -0,0 +1,141 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &1705285893771051652
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1705285893771051651}
+  - component: {fileID: 1705285893771051648}
+  - component: {fileID: 1705285893771051649}
+  - component: {fileID: 1705285893771051654}
+  - component: {fileID: 1705285893771051655}
+  - component: {fileID: 3031846312447326290}
+  - component: {fileID: -1304216180615842640}
+  m_Layer: 0
+  m_Name: Boulder
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &1705285893771051651
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1705285893771051652}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 25, y: 25, z: 25}
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!33 &1705285893771051648
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1705285893771051652}
+  m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!23 &1705285893771051649
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1705285893771051652}
+  m_Enabled: 1
+  m_CastShadows: 1
+  m_ReceiveShadows: 1
+  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: 2100000, guid: 0b7271500f1e72b40b205fb8cf89b80a, 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!135 &1705285893771051654
+SphereCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1705285893771051652}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 1
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Radius: 0.5
+  m_Center: {x: 0, y: 0, z: 0}
+--- !u!114 &1705285893771051655
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1705285893771051652}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 502e1c22be3238645a39762fd220d3b4, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!54 &3031846312447326290
+Rigidbody:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1705285893771051652}
+  serializedVersion: 2
+  m_Mass: 1
+  m_Drag: 0
+  m_AngularDrag: 0.01
+  m_UseGravity: 1
+  m_IsKinematic: 0
+  m_Interpolate: 0
+  m_Constraints: 8
+  m_CollisionDetection: 0
+--- !u!135 &-1304216180615842640
+SphereCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1705285893771051652}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Radius: 0.5
+  m_Center: {x: 0, y: 0, z: 0}
--- a/Assets/Prefabs/Environment/Boulder.prefab.meta
+++ b/Assets/Prefabs/Environment/Boulder.prefab.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 3fd15f10e6c1a07419fdd6bf804b6541
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Scenes/Game-Mountain.unity
+++ b/Assets/Scenes/Game-Mountain.unity
--- a/Assets/Scripts/Environment/BoulderSpawn.cs
+++ b/Assets/Scripts/Environment/BoulderSpawn.cs
@ -0,0 +1,35 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class BoulderSpawn : MonoBehaviour
+{
+    [SerializeField] private float RespawnTimer = 10.0f;
+    private float currentTime = 0.0f;
+
+    [SerializeField] private Vector3 spawnForce;
+
+    [SerializeField] private Vector3 SpawnLocation;
+
+    [SerializeField] private Transform BoulderPrefab;
+    private GameObject boulderInScene;
+    // Start is called before the first frame update
+    void Start()
+    {
+        boulderInScene = Instantiate(BoulderPrefab, SpawnLocation, Quaternion.identity).gameObject;
+        boulderInScene.GetComponent<Rigidbody>().AddForce(spawnForce);
+    }
+
+    private void FixedUpdate()
+    {
+        currentTime += Time.fixedDeltaTime;
+        if (currentTime >= RespawnTimer)
+        {
+            currentTime = 0.0f;
+            Destroy(boulderInScene);
+            boulderInScene = Instantiate(BoulderPrefab, SpawnLocation, Quaternion.identity).gameObject;
+            boulderInScene.GetComponent<Rigidbody>().AddForce(spawnForce);
+        }
+    }
+
+}
--- a/Assets/Scripts/Environment/BoulderSpawn.cs.meta
+++ b/Assets/Scripts/Environment/BoulderSpawn.cs.meta
@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 18d4d5c56acc6924baed02e452b9d1d0
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Scripts/KingAbilities/Boulder.cs
+++ b/Assets/Scripts/KingAbilities/Boulder.cs
@ -12,11 +12,13 @@ public class Boulder : MonoBehaviour

    void OnTriggerEnter(Collider other) {
        if (other.tag == "Player") {
-            Debug.Log("Crunch");
+            //Debug.Log("Crunch");
            GameObject player = other.gameObject;//Turns the collider into a game object
            Vector3 Dir = boulder.velocity;//Finds the bolder's velocity
-            float Power = boulder.velocity.magnitude * 250;//Finds the power of the boulder by using it's velocity and a scaler
+            float Power = boulder.velocity.magnitude;// * 250;//Finds the power of the boulder by using it's velocity and a scaler
            Dir = Vector3.Normalize(Dir);//Normalizes the vector to be used as a knockback direction
+            //Knock the player a little to the side
+            Dir.z += Random.Range(-0.25f, 0.25f);
            player.GetComponent<dPlayerMovement>().GetHit(Dir, Power); //Ragdolls the player in the direction of the bolder depending on it's speed
        }
    }
--- a/UserSettings/EditorUserSettings.asset
+++ b/UserSettings/EditorUserSettings.asset
@ -6,35 +6,35 @@ EditorUserSettings:
  serializedVersion: 4
  m_ConfigSettings:
    RecentlyUsedScenePath-0:
-      value: 22424703114646680e0b0227036c6f02131b172b282d347e38271427fb
-      flags: 0
-    RecentlyUsedScenePath-1:
      value: 22424703114646680e0b0227036c7b151b180b650d262f3d192c0e27d1e33136e7a923e7ee2e26
      flags: 0
-    RecentlyUsedScenePath-2:
+    RecentlyUsedScenePath-1:
      value: 22424703114646680e0b0227036c7b151b180b6519016b0515163936efef2776f7e93ffdfe
      flags: 0
+    RecentlyUsedScenePath-2:
+      value: 22424703114646680e0b0227036c731f1415016439262f2434
+      flags: 0
    RecentlyUsedScenePath-3:
      value: 22424703114646680e0b0227036c731f1415016439262f2434
      flags: 0
    RecentlyUsedScenePath-4:
-      value: 22424703114646680e0b0227036c731f1415016439262f2434
+      value: 22424703114646680e0b0227036c7b151b180b652b3a27292f260573f1e33136e7a923e7ee2e26
      flags: 0
    RecentlyUsedScenePath-5:
-      value: 22424703114646680e0b0227036c78111b125507233d28242c20137df7ee3d2cfb
+      value: 22424703114646680e0b0227036c7b151b180b652b3a27292f260573f1e33136e7a923e7ee2e26
      flags: 0
    RecentlyUsedScenePath-6:
-      value: 22424703114646680e0b0227036c7b151b180b652b3a27292f260573f1e33136e7a923e7ee2e26
-      flags: 0
-    RecentlyUsedScenePath-7:
-      value: 22424703114646680e0b0227036c7b151b180b652b3a27292f260573f1e33136e7a923e7ee2e26
-      flags: 0
-    RecentlyUsedScenePath-8:
      value: 22424703114646680e0b0227036c7b151b180b650e3a233126281f3fe7c23837e1ec25a7f234362820
      flags: 0
-    RecentlyUsedScenePath-9:
+    RecentlyUsedScenePath-7:
      value: 22424703114646680e0b0227036c7b151b180b6501273035202c1327d1e33136e7a923e7ee2e26
      flags: 0
+    RecentlyUsedScenePath-8:
+      value: 22424703114646680e0b0227036c7b151b180b65072128370c2b143febf4312bd6e225fda92f31352d1b
+      flags: 0
+    RecentlyUsedScenePath-9:
+      value: 22424703114646680e0b0227036c78111b125507233d28242c20137df7ee3d2cfb
+      flags: 0
    UnityRemoteCompression:
      value: 337f73
      flags: 0