cailean/drecon-unity
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

new changes week 1

Browse Source
This commit is contained in:
Cailean Finn
2024-05-23 14:19:36 +01:00
parent ee8e2e7bf2
commit 29b182200d
41 changed files with 28462 additions and 554 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Assets/8_Scripts/1_Managers/AudioManager.cs
View File

@@ -26,7 +26,7 @@ public class AudioManager : MonoBehaviour
{
if (!m_Soundtrack.IsNull)
{
//RuntimeManager.PlayOneShot(m_Soundtrack);
RuntimeManager.PlayOneShot(m_Soundtrack);
}
}
@@ -41,7 +41,6 @@ public class AudioManager : MonoBehaviour
public void PlayOneShotAttached(EventReference sound, GameObject obj, float force)
{
RuntimeManager.PlayOneShotAttached(sound, obj, 1f, 0.01f);
Debug.Log(force);
}
public void PlayOneShotAttachedBreathing(EventReference sound, GameObject obj, float force)

19
Assets/8_Scripts/1_Managers/CameraManager.cs
View File

@@ -146,9 +146,9 @@ public class CameraManager : MonoBehaviour
m_Rewards.SetActive(true);
break;
case "vc_Compare":
m_BrainPose.SetActive(true);
m_BrainPose.SetActive(false);
m_Camera.cullingMask = m_Compare;
m_PoseCanvas.SetActive(true);
m_PoseCanvas.SetActive(false);
m_Rewards.SetActive(true);
break;
}
@@ -222,11 +222,16 @@ public class CameraManager : MonoBehaviour
CinemachineBrain cmBrain = m_Brain.GetComponent<CinemachineBrain>();
float blendtime = (float)Random.Range(m_CameraBlendMin, m_CameraBlendMax);
if (AreDifferentPairs(pastCamera.tag, m_ActiveCamera.tag, "vc_Body", "vc_Agent") || AreDifferentPairs(pastCamera.tag, m_ActiveCamera.tag, "vc_Environment", "vc_Agent") || AreDifferentPairs(pastCamera.tag, m_ActiveCamera.tag, "vc_Environment", "vc_Body")
|| AreDifferentPairs(pastCamera.tag, m_ActiveCamera.tag, "vc_Environment", "vc_Environment") || AreDifferentPairs(pastCamera.tag, m_ActiveCamera.tag, "vc_Body", "vc_Body") || AreDifferentPairs(pastCamera.tag, m_ActiveCamera.tag, "vc_Actuations", "vc_Body")
|| AreDifferentPairs(pastCamera.tag, m_ActiveCamera.tag, "vc_Actuations", "vc_Environment") || AreDifferentPairs(pastCamera.tag, m_ActiveCamera.tag, "vc_Actuations", "vc_Agent") || AreDifferentPairs(pastCamera.tag, m_ActiveCamera.tag, "vc_Actuations", "vc_Actuations") || AreDifferentPairs(pastCamera.tag, m_ActiveCamera.tag, "vc_Actuations", "vc_Compare")
|| AreDifferentPairs(pastCamera.tag, m_ActiveCamera.tag, "vc_Compare", "vc_Compare") || AreDifferentPairs(pastCamera.tag, m_ActiveCamera.tag, "vc_Environment", "vc_Compare") || AreDifferentPairs(pastCamera.tag, m_ActiveCamera.tag, "vc_Body", "vc_Compare") || AreDifferentPairs(pastCamera.tag, m_ActiveCamera.tag, "vc_Agent", "vc_Compare"))
blendtime = 0;
if(!pastCamera.GetComponent<VirtualCameraSettings>().m_CameraSettings.cut
|| !m_ActiveCamera.GetComponent<VirtualCameraSettings>().m_CameraSettings.cut){
blendtime = 0;
}
// if (AreDifferentPairs(pastCamera.tag, m_ActiveCamera.tag, "vc_Body", "vc_Agent") || AreDifferentPairs(pastCamera.tag, m_ActiveCamera.tag, "vc_Environment", "vc_Agent") || AreDifferentPairs(pastCamera.tag, m_ActiveCamera.tag, "vc_Environment", "vc_Body")
// || AreDifferentPairs(pastCamera.tag, m_ActiveCamera.tag, "vc_Environment", "vc_Environment") || AreDifferentPairs(pastCamera.tag, m_ActiveCamera.tag, "vc_Body", "vc_Body") || AreDifferentPairs(pastCamera.tag, m_ActiveCamera.tag, "vc_Actuations", "vc_Body")
// || AreDifferentPairs(pastCamera.tag, m_ActiveCamera.tag, "vc_Actuations", "vc_Environment") || AreDifferentPairs(pastCamera.tag, m_ActiveCamera.tag, "vc_Actuations", "vc_Agent") || AreDifferentPairs(pastCamera.tag, m_ActiveCamera.tag, "vc_Actuations", "vc_Actuations") || AreDifferentPairs(pastCamera.tag, m_ActiveCamera.tag, "vc_Actuations", "vc_Compare")
// || AreDifferentPairs(pastCamera.tag, m_ActiveCamera.tag, "vc_Compare", "vc_Compare") || AreDifferentPairs(pastCamera.tag, m_ActiveCamera.tag, "vc_Environment", "vc_Compare") || AreDifferentPairs(pastCamera.tag, m_ActiveCamera.tag, "vc_Body", "vc_Compare") || AreDifferentPairs(pastCamera.tag, m_ActiveCamera.tag, "vc_Agent", "vc_Compare"))
// blendtime = 0;
cmBrain.m_DefaultBlend.m_Time = blendtime;
}

1
Assets/8_Scripts/2_General/Scriptable Objects/Camera/ActutationsCamera.asset generated
View File

@@ -14,3 +14,4 @@ MonoBehaviour:
m_EditorClassIdentifier:
cameraWeight: 0.4
cameraLayer: 0
cut: 1

1
Assets/8_Scripts/2_General/Scriptable Objects/Camera/BodyCamera.asset generated
View File

@@ -14,3 +14,4 @@ MonoBehaviour:
m_EditorClassIdentifier:
cameraWeight: 0.4
cameraLayer: 0
cut: 0

2
Assets/8_Scripts/2_General/Scriptable Objects/Camera/EnvironmentCamera.asset generated
View File

@@ -12,5 +12,5 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 0f7b5c8cb85f2ca47917380097e32b3f, type: 3}
m_Name: EnvironmentCamera
m_EditorClassIdentifier:
cameraWeight: 0.3
cameraWeight: 0.4
cameraLayer: 0

17
Assets/8_Scripts/2_General/Scriptable Objects/Camera/PoseCamera.asset generated Normal file
View File

@@ -0,0 +1,17 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 0f7b5c8cb85f2ca47917380097e32b3f, type: 3}
m_Name: PoseCamera
m_EditorClassIdentifier:
cameraWeight: 0.4
cameraLayer: 0
cut: 0

8
Assets/8_Scripts/2_General/Scriptable Objects/Camera/PoseCamera.asset.meta generated Normal file
View File

@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 7f36b7b6244259e4a84e393a6f9dc9c2
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:

1
Assets/8_Scripts/2_General/Scriptable Objects/CameraSettings.cs
View File

@@ -12,4 +12,5 @@ public class CameraSettings : ScriptableObject
[Range(0, 1)]
[Tooltip("Layer")]
public int cameraLayer = 0;
public bool cut = true;
}