missing in last commit

This commit is contained in:
Soulaha Balde 2022-10-29 20:24:53 -04:00
parent 061f6138b1
commit 758777b8ab
9 changed files with 3342 additions and 5 deletions

View File

@ -0,0 +1,134 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &8663551935946957054
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 8663551935946957053}
- component: {fileID: 8663551935946957055}
- component: {fileID: 8663551935946957050}
m_Layer: 0
m_Name: EnvChanger
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &8663551935946957053
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8663551935946957054}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 13.6, y: 6.07, z: 0}
m_LocalScale: {x: 0, y: 2.8058, z: 7.862}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 8663551936364023222}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!65 &8663551935946957055
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8663551935946957054}
m_Material: {fileID: 0}
m_IsTrigger: 1
m_Enabled: 1
serializedVersion: 2
m_Size: {x: 1, y: 1, z: 1}
m_Center: {x: 0, y: 0, z: 0}
--- !u!114 &8663551935946957050
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8663551935946957054}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 90baab3719135f24bb2f7611276bf3ab, type: 3}
m_Name:
m_EditorClassIdentifier:
linkedObj: {fileID: 0}
onEnter: 0
onStay: 0
OnExit: 1
enterEvent:
m_PersistentCalls:
m_Calls: []
stayEvent:
m_PersistentCalls:
m_Calls: []
exitEvent:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 8663551936364023209}
m_TargetAssemblyTypeName: EnvChanger, Assembly-CSharp
m_MethodName: ChangeEnvironnement
m_Mode: 1
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
--- !u!1 &8663551936364023208
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 8663551936364023222}
- component: {fileID: 8663551936364023209}
m_Layer: 0
m_Name: GameObject
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &8663551936364023222
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8663551936364023208}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 8663551935946957053}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &8663551936364023209
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8663551936364023208}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d472a146f9945154b9f33e0da19e3c69, type: 3}
m_Name:
m_EditorClassIdentifier:
targetAmbientIntensity: 0
targetRefIntensity: 0
enterFromLeft: 1
playerPos: {fileID: 0}

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: e17c6ec8444100a4cbefb113440fda78
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: c5b2dd5ab8d5a76409ef6eb463363c59
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,63 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
public class EnvChanger : MonoBehaviour
{
private float initAmbientIntensity;
private float initRefIntensity;
[SerializeField]
private float targetAmbientIntensity, targetRefIntensity;
[SerializeField]
private bool enterFromLeft = true;
[SerializeField]
private Transform playerPos;
private bool isInEnviro = false;
public void ChangeEnvironnement(){
if(ExitOnCorrectSide()){
isInEnviro = !isInEnviro;
if(isInEnviro){
initAmbientIntensity = RenderSettings.ambientIntensity;
initRefIntensity = RenderSettings.reflectionIntensity;
RenderSettings.ambientIntensity = targetAmbientIntensity;
RenderSettings.reflectionIntensity = targetRefIntensity;
}else{
RenderSettings.ambientIntensity = initAmbientIntensity;
RenderSettings.reflectionIntensity = initRefIntensity;
}
}
}
private bool ExitOnCorrectSide(){
if(enterFromLeft){
if(!isInEnviro){
if(playerPos.position.x > transform.position.x){
return true;
}
}else{
if(playerPos.position.x < transform.position.x){
return true;
}
}
}else{
if(!isInEnviro){
if(playerPos.position.x < transform.position.x){
return true;
}
}else{
if(playerPos.position.x > transform.position.x){
return true;
}
}
}
return false;
}
}

View File

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: d472a146f9945154b9f33e0da19e3c69
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -27,7 +27,7 @@ public class SlidingDoor : Triggerable
}
}
public override void TriggerEvent(){
public override void TriggerEvent(Collider other){
isOpen = !isOpen;
}

View File

@ -16,7 +16,7 @@ public class TriggerZone : MonoBehaviour
private void OnTriggerEnter(Collider other) {
if(!onEnter)return;
if(other.gameObject.tag.Equals("Player")){
linkedObj.TriggerEvent();
linkedObj?.TriggerEvent(other);
enterEvent?.Invoke();
}
}
@ -24,7 +24,7 @@ public class TriggerZone : MonoBehaviour
private void OnTriggerStay(Collider other) {
if(!onStay)return;
if(other.gameObject.tag.Equals("Player")){
linkedObj.TriggerEvent();
linkedObj?.TriggerEvent(other);
stayEvent?.Invoke();
}
}
@ -32,7 +32,7 @@ public class TriggerZone : MonoBehaviour
private void OnTriggerExit(Collider other) {
if(!OnExit)return;
if(other.gameObject.tag.Equals("Player")){
linkedObj.TriggerEvent();
linkedObj?.TriggerEvent(other);
exitEvent?.Invoke();
}
}

View File

@ -4,5 +4,5 @@ using UnityEngine;
public abstract class Triggerable : MonoBehaviour
{
public abstract void TriggerEvent();
public abstract void TriggerEvent(Collider other = null);
}