Skip to content
Snippets Groups Projects
Commit b162efe2 authored by AdamElf's avatar AdamElf
Browse files

reorganized folders and water cooler

Need Cat's help with damage
parent 53bddd36
No related branches found
No related tags found
No related merge requests found
Showing
with 5198 additions and 2 deletions
......@@ -129,7 +129,7 @@ Material:
- _ZWrite: 1
m_Colors:
- _BaseColor: {r: 0.34710208, g: 0.44117647, b: 0.35553634, a: 1}
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _Color: {r: 0.34710208, g: 0.44117647, b: 0.35553634, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1}
m_BuildTextureStacks: []
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1001 &4289914421904218903
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 100000, guid: 5f5c6baac71fa0a4bb9dd9d91c1b2c53, type: 3}
propertyPath: m_Name
value: mesh_waterCooler
objectReference: {fileID: 0}
- target: {fileID: 400000, guid: 5f5c6baac71fa0a4bb9dd9d91c1b2c53, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 400000, guid: 5f5c6baac71fa0a4bb9dd9d91c1b2c53, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 400000, guid: 5f5c6baac71fa0a4bb9dd9d91c1b2c53, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 400000, guid: 5f5c6baac71fa0a4bb9dd9d91c1b2c53, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 400000, guid: 5f5c6baac71fa0a4bb9dd9d91c1b2c53, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 400000, guid: 5f5c6baac71fa0a4bb9dd9d91c1b2c53, type: 3}
propertyPath: m_LocalRotation.y
value: -0
objectReference: {fileID: 0}
- target: {fileID: 400000, guid: 5f5c6baac71fa0a4bb9dd9d91c1b2c53, type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: 400000, guid: 5f5c6baac71fa0a4bb9dd9d91c1b2c53, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 400000, guid: 5f5c6baac71fa0a4bb9dd9d91c1b2c53, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 400000, guid: 5f5c6baac71fa0a4bb9dd9d91c1b2c53, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 5f5c6baac71fa0a4bb9dd9d91c1b2c53, type: 3}
fileFormatVersion: 2
guid: 37c6acf6dc3ff4241974168c9018ca93
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
......@@ -38,7 +38,7 @@ RenderSettings:
m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 705507994}
m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1}
m_IndirectSpecularColor: {r: 0.4366757, g: 0.48427194, b: 0.5645252, a: 1}
m_UseRadianceAmbientProbe: 0
--- !u!157 &3
LightmapSettings:
......@@ -123,6 +123,26 @@ NavMeshSettings:
debug:
m_Flags: 0
m_NavMeshData: {fileID: 0}
--- !u!1 &3724389 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 8219253482053481180, guid: 4464063657e217942921d354b9ce0ff1, type: 3}
m_PrefabInstance: {fileID: 110139796}
m_PrefabAsset: {fileID: 0}
--- !u!114 &3724390
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3724389}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: b1b9e4b57b26b0842a2fbe8cdceb0444, type: 3}
m_Name:
m_EditorClassIdentifier:
health: 1
destroyMode: 1
stateChangePrefab: {fileID: 3554791386960356925, guid: 7a091efb28770b94d99de0bcffc9997b, type: 3}
--- !u!1001 &34678033
PrefabInstance:
m_ObjectHideFlags: 0
......@@ -599,6 +619,10 @@ PrefabInstance:
propertyPath: m_Name
value: Player
objectReference: {fileID: 0}
- target: {fileID: 4099498095617253306, guid: ef6f3a50a67136d46b5c3a49ae69f317, type: 3}
propertyPath: m_TagString
value: Player
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
......@@ -849,6 +873,70 @@ Transform:
- {fileID: 1682176157}
m_Father: {fileID: 1530266982}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &110139796
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 8219253482053481180, guid: 4464063657e217942921d354b9ce0ff1, type: 3}
propertyPath: m_Name
value: mesh_waterCooler
objectReference: {fileID: 0}
- target: {fileID: 8219253482053481180, guid: 4464063657e217942921d354b9ce0ff1, type: 3}
propertyPath: m_TagString
value: Breaking
objectReference: {fileID: 0}
- target: {fileID: 8219253482053906172, guid: 4464063657e217942921d354b9ce0ff1, type: 3}
propertyPath: m_LocalPosition.x
value: -17.7
objectReference: {fileID: 0}
- target: {fileID: 8219253482053906172, guid: 4464063657e217942921d354b9ce0ff1, type: 3}
propertyPath: m_LocalPosition.y
value: 9.130721
objectReference: {fileID: 0}
- target: {fileID: 8219253482053906172, guid: 4464063657e217942921d354b9ce0ff1, type: 3}
propertyPath: m_LocalPosition.z
value: -9.5
objectReference: {fileID: 0}
- target: {fileID: 8219253482053906172, guid: 4464063657e217942921d354b9ce0ff1, type: 3}
propertyPath: m_LocalRotation.w
value: -0.7071068
objectReference: {fileID: 0}
- target: {fileID: 8219253482053906172, guid: 4464063657e217942921d354b9ce0ff1, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8219253482053906172, guid: 4464063657e217942921d354b9ce0ff1, type: 3}
propertyPath: m_LocalRotation.y
value: 0.7071068
objectReference: {fileID: 0}
- target: {fileID: 8219253482053906172, guid: 4464063657e217942921d354b9ce0ff1, type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: 8219253482053906172, guid: 4464063657e217942921d354b9ce0ff1, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8219253482053906172, guid: 4464063657e217942921d354b9ce0ff1, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 270
objectReference: {fileID: 0}
- target: {fileID: 8219253482053906172, guid: 4464063657e217942921d354b9ce0ff1, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents:
- targetCorrespondingSourceObject: {fileID: 8219253482053481180, guid: 4464063657e217942921d354b9ce0ff1, type: 3}
insertIndex: -1
addedObject: {fileID: 3724390}
m_SourcePrefab: {fileID: 100100000, guid: 4464063657e217942921d354b9ce0ff1, type: 3}
--- !u!1 &111971213
GameObject:
m_ObjectHideFlags: 0
......@@ -5982,6 +6070,9 @@ MonoBehaviour:
sprintMulti: 2
maxSprintBonus: 10
sprintDecayTime: 1
sprintPercentMin: 0.1
sprintTimeTotal: 3
sprintRecovery: 1
boostDecayTime: 1
boostDecay: 0
boostBonus: 0
......@@ -13117,6 +13208,18 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 233963122616429131, guid: 06692ad41b0a861469a27086300d9bd0, type: 3}
propertyPath: m_AnchorMax.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 233963122616429131, guid: 06692ad41b0a861469a27086300d9bd0, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 233963122616429131, guid: 06692ad41b0a861469a27086300d9bd0, type: 3}
propertyPath: m_AnchorMin.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 267049304060646192, guid: 06692ad41b0a861469a27086300d9bd0, type: 3}
propertyPath: m_Pivot.x
value: 0
......@@ -16846,3 +16949,4 @@ SceneRoots:
- {fileID: 1615970938}
- {fileID: 1790283309}
- {fileID: 1272788541}
- {fileID: 110139796}
This diff is collapsed.
fileFormatVersion: 2
guid: 7a091efb28770b94d99de0bcffc9997b
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 28fa180ec1fdf7a46a8496deba933ea5
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
File moved
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
public class WaterCooler : MonoBehaviour
{
[Range(10f,50f)]
public float upMult = 15;
private void OnTriggerStay(Collider other)
{
if (other.CompareTag("Player"))
{
other.GetComponent<Rigidbody>().AddForce(Vector3.up* upMult, ForceMode.Acceleration);
}
}
}
fileFormatVersion: 2
guid: addd258991608e74b902d8accde19749
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment