update
This commit is contained in:
8
.idea/.idea.BABA_YAGA/.idea/indexLayout.xml
generated
Normal file
8
.idea/.idea.BABA_YAGA/.idea/indexLayout.xml
generated
Normal file
@@ -0,0 +1,8 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<project version="4">
|
||||||
|
<component name="UserContentModel">
|
||||||
|
<attachedFolders />
|
||||||
|
<explicitIncludes />
|
||||||
|
<explicitExcludes />
|
||||||
|
</component>
|
||||||
|
</project>
|
||||||
56
.idea/.idea.BABA_YAGA/.idea/workspace.xml
generated
56
.idea/.idea.BABA_YAGA/.idea/workspace.xml
generated
@@ -6,23 +6,41 @@
|
|||||||
<component name="ChangeListManager">
|
<component name="ChangeListManager">
|
||||||
<list default="true" id="d308d1cb-09fc-4331-ba20-00f7b43d1576" name="Changes" comment="">
|
<list default="true" id="d308d1cb-09fc-4331-ba20-00f7b43d1576" name="Changes" comment="">
|
||||||
<change beforePath="$PROJECT_DIR$/.idea/.idea.BABA_YAGA/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/.idea.BABA_YAGA/.idea/workspace.xml" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/.idea/.idea.BABA_YAGA/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/.idea.BABA_YAGA/.idea/workspace.xml" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/Assets/Opsive.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Opsive.meta" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/Assets/Opsive/UltimateCharacterController/Demo/Demo.unity" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Opsive/UltimateCharacterController/Demo/Demo.unity" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/Assets/Opsive/Installer.meta" beforeDir="false" />
|
<change beforePath="$PROJECT_DIR$/Assets/Opsive/UltimateCharacterController/Demo/Materials/Items/Shooter/AssaultRifle/MuzzleFlash.mat" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Opsive/UltimateCharacterController/Demo/Materials/Items/Shooter/AssaultRifle/MuzzleFlash.mat" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/Assets/Opsive/Installer/UltimateCharacterController.meta" beforeDir="false" />
|
<change beforePath="$PROJECT_DIR$/Assets/Opsive/UltimateCharacterController/Demo/Materials/Scene/Black.mat" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Opsive/UltimateCharacterController/Demo/Materials/Scene/Black.mat" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/Assets/Opsive/Installer/UltimateCharacterController/Editor.meta" beforeDir="false" />
|
<change beforePath="$PROJECT_DIR$/Assets/Opsive/UltimateCharacterController/Demo/Materials/Scene/Blue.mat" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Opsive/UltimateCharacterController/Demo/Materials/Scene/Blue.mat" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/Assets/Opsive/Installer/UltimateCharacterController/Editor/CharacterControllerInstaller.cs" beforeDir="false" />
|
<change beforePath="$PROJECT_DIR$/Assets/Opsive/UltimateCharacterController/Demo/Materials/Scene/BlueEmissive.mat" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Opsive/UltimateCharacterController/Demo/Materials/Scene/BlueEmissive.mat" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/Assets/Opsive/Installer/UltimateCharacterController/Editor/CharacterControllerInstaller.cs.meta" beforeDir="false" />
|
<change beforePath="$PROJECT_DIR$/Assets/Opsive/UltimateCharacterController/Demo/Materials/Scene/Car/SkyCarBodyGrey.mat" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Opsive/UltimateCharacterController/Demo/Materials/Scene/Car/SkyCarBodyGrey.mat" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/Assets/Opsive/Installer/UltimateCharacterController/Editor/Icons.meta" beforeDir="false" />
|
<change beforePath="$PROJECT_DIR$/Assets/Opsive/UltimateCharacterController/Demo/Materials/Scene/Car/SkyCarWheelGrey.mat" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Opsive/UltimateCharacterController/Demo/Materials/Scene/Car/SkyCarWheelGrey.mat" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/Assets/Opsive/Installer/UltimateCharacterController/Editor/Icons/FailureDarkIcon.png" beforeDir="false" />
|
<change beforePath="$PROJECT_DIR$/Assets/Opsive/UltimateCharacterController/Demo/Materials/Scene/DarkBlue.mat" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Opsive/UltimateCharacterController/Demo/Materials/Scene/DarkBlue.mat" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/Assets/Opsive/Installer/UltimateCharacterController/Editor/Icons/FailureDarkIcon.png.meta" beforeDir="false" />
|
<change beforePath="$PROJECT_DIR$/Assets/Opsive/UltimateCharacterController/Demo/Materials/Scene/Exterior/ExteriorDarkGrid.mat" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Opsive/UltimateCharacterController/Demo/Materials/Scene/Exterior/ExteriorDarkGrid.mat" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/Assets/Opsive/Installer/UltimateCharacterController/Editor/Icons/FailureLightIcon.png" beforeDir="false" />
|
<change beforePath="$PROJECT_DIR$/Assets/Opsive/UltimateCharacterController/Demo/Materials/Scene/IndoorSphereEmissive.mat" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Opsive/UltimateCharacterController/Demo/Materials/Scene/IndoorSphereEmissive.mat" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/Assets/Opsive/Installer/UltimateCharacterController/Editor/Icons/FailureLightIcon.png.meta" beforeDir="false" />
|
<change beforePath="$PROJECT_DIR$/Assets/Opsive/UltimateCharacterController/Demo/Materials/Scene/Props/FastTimeOrbInner.mat" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Opsive/UltimateCharacterController/Demo/Materials/Scene/Props/FastTimeOrbInner.mat" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/Assets/Opsive/Installer/UltimateCharacterController/Editor/Icons/SuccessDarkIcon.png" beforeDir="false" />
|
<change beforePath="$PROJECT_DIR$/Assets/Opsive/UltimateCharacterController/Demo/Materials/Scene/Props/FastTimeOrbOuter.mat" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Opsive/UltimateCharacterController/Demo/Materials/Scene/Props/FastTimeOrbOuter.mat" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/Assets/Opsive/Installer/UltimateCharacterController/Editor/Icons/SuccessDarkIcon.png.meta" beforeDir="false" />
|
<change beforePath="$PROJECT_DIR$/Assets/Opsive/UltimateCharacterController/Demo/Materials/Scene/Props/SlowTimeOrbInner.mat" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Opsive/UltimateCharacterController/Demo/Materials/Scene/Props/SlowTimeOrbInner.mat" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/Assets/Opsive/Installer/UltimateCharacterController/Editor/Icons/SuccessLightIcon.png" beforeDir="false" />
|
<change beforePath="$PROJECT_DIR$/Assets/Opsive/UltimateCharacterController/Demo/Materials/Scene/Props/SlowTimeOrbOuter.mat" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Opsive/UltimateCharacterController/Demo/Materials/Scene/Props/SlowTimeOrbOuter.mat" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/Assets/Opsive/Installer/UltimateCharacterController/Editor/Icons/SuccessLightIcon.png.meta" beforeDir="false" />
|
<change beforePath="$PROJECT_DIR$/Assets/Opsive/UltimateCharacterController/Demo/Textures/Items/Shooter/AssaultRifle/FirstPersonScope.renderTexture" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Opsive/UltimateCharacterController/Demo/Textures/Items/Shooter/AssaultRifle/FirstPersonScope.renderTexture" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/ProjectSettings/QualitySettings.asset" beforeDir="false" afterPath="$PROJECT_DIR$/ProjectSettings/QualitySettings.asset" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/Assets/Opsive/UltimateCharacterController/Demo/Textures/Items/Shooter/AssaultRifle/ThirdPersonScope.renderTexture" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Opsive/UltimateCharacterController/Demo/Textures/Items/Shooter/AssaultRifle/ThirdPersonScope.renderTexture" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/ProjectSettings/URPProjectSettings.asset" beforeDir="false" afterPath="$PROJECT_DIR$/ProjectSettings/URPProjectSettings.asset" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/Assets/Plugins/Demigiant/DOTween/Editor/DOTweenUpgradeManager.XML" beforeDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/Assets/Plugins/Demigiant/DOTween/Editor/DOTweenUpgradeManager.XML.meta" beforeDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/Assets/Plugins/Demigiant/DOTween/Editor/DOTweenUpgradeManager.dll" beforeDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/Assets/Plugins/Demigiant/DOTween/Editor/DOTweenUpgradeManager.dll.meta" beforeDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/Assets/Resources/DOTweenSettings.asset" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Resources/DOTweenSettings.asset" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/Assets/Scripts/Camera/Prototype/CameraController.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/Camera/Prototype/CameraController.cs" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/Assets/Scripts/Camera/Prototype/CameraOcclusionTransparency.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/Camera/Prototype/CameraOcclusionTransparency.cs" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/Assets/Scripts/Camera/Prototype/CameraRotationHandler.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/Camera/Prototype/CameraRotationHandler.cs" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/Assets/Scripts/UI/BaseUIController.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/UI/BaseUIController.cs" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/Assets/Scripts/UI/HUDController.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/UI/HUDController.cs" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/Assets/Scripts/UI/LoginController.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/UI/LoginController.cs" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/Assets/Scripts/UI/MainMenuController.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/UI/MainMenuController.cs" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/Assets/Scripts/UI/SettingsController.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/UI/SettingsController.cs" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/Assets/Scripts/UI/UIManager.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/UI/UIManager.cs" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/Assets/TEST CUA TUAN/Free Wood Door Pack/Materials/Door_1_Materials/Door_1_Black.mat" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/TEST CUA TUAN/Free Wood Door Pack/Materials/Door_1_Materials/Door_1_Black.mat" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/Assets/TEST CUA TUAN/Free Wood Door Pack/Materials/Door_Knob_Material/Copper.mat" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/TEST CUA TUAN/Free Wood Door Pack/Materials/Door_Knob_Material/Copper.mat" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/Packages/manifest.json" beforeDir="false" afterPath="$PROJECT_DIR$/Packages/manifest.json" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/Packages/packages-lock.json" beforeDir="false" afterPath="$PROJECT_DIR$/Packages/packages-lock.json" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/ProjectSettings/ProjectSettings.asset" beforeDir="false" afterPath="$PROJECT_DIR$/ProjectSettings/ProjectSettings.asset" afterDir="false" />
|
||||||
</list>
|
</list>
|
||||||
<option name="SHOW_DIALOG" value="false" />
|
<option name="SHOW_DIALOG" value="false" />
|
||||||
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
||||||
@@ -94,7 +112,7 @@
|
|||||||
<option name="MIXED_MODE_DEBUG" value="0" />
|
<option name="MIXED_MODE_DEBUG" value="0" />
|
||||||
<method v="2" />
|
<method v="2" />
|
||||||
</configuration>
|
</configuration>
|
||||||
<configuration name="Attach to Unity Editor" type="UNITY_DEBUG_RUN_CONFIGURATION" factoryName="Unity Debug" show_console_on_std_err="false" show_console_on_std_out="false" port="50000" address="localhost" useMixedMode="false">
|
<configuration name="Attach to Unity Editor" type="UNITY_DEBUG_RUN_CONFIGURATION" factoryName="Unity Debug" show_console_on_std_err="false" show_console_on_std_out="false" port="50000" address="localhost">
|
||||||
<option name="allowRunningInParallel" value="false" />
|
<option name="allowRunningInParallel" value="false" />
|
||||||
<option name="listenPortForConnections" value="false" />
|
<option name="listenPortForConnections" value="false" />
|
||||||
<option name="pid" />
|
<option name="pid" />
|
||||||
@@ -105,6 +123,7 @@
|
|||||||
<option name="selectedOptions">
|
<option name="selectedOptions">
|
||||||
<list />
|
<list />
|
||||||
</option>
|
</option>
|
||||||
|
<option name="useMixedMode" value="false" />
|
||||||
<method v="2" />
|
<method v="2" />
|
||||||
</configuration>
|
</configuration>
|
||||||
<configuration name="Attach to" type="UnityDevicePlayer" factoryName="UnityAttachToDevicePlayer">
|
<configuration name="Attach to" type="UnityDevicePlayer" factoryName="UnityAttachToDevicePlayer">
|
||||||
@@ -125,6 +144,7 @@
|
|||||||
<workItem from="1781015858277" duration="4448000" />
|
<workItem from="1781015858277" duration="4448000" />
|
||||||
<workItem from="1781181289365" duration="2651000" />
|
<workItem from="1781181289365" duration="2651000" />
|
||||||
<workItem from="1781412609976" duration="4823000" />
|
<workItem from="1781412609976" duration="4823000" />
|
||||||
|
<workItem from="1781578060019" duration="4632000" />
|
||||||
</task>
|
</task>
|
||||||
<servers />
|
<servers />
|
||||||
</component>
|
</component>
|
||||||
|
|||||||
@@ -119008,13 +119008,13 @@ MonoBehaviour:
|
|||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
m_EnemyLayers:
|
m_EnemyLayers:
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
m_Bits: 100663296
|
m_Bits: 0
|
||||||
m_InvisibleLayers:
|
m_InvisibleLayers:
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
m_Bits: 1879048198
|
m_Bits: 1879048198
|
||||||
m_SolidObjectLayers:
|
m_SolidObjectLayers:
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
m_Bits: 2382364675
|
m_Bits: 2281701379
|
||||||
--- !u!114 &1278971606
|
--- !u!114 &1278971606
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@@ -135443,10 +135443,10 @@ TextMesh:
|
|||||||
m_GameObject: {fileID: 1485857039}
|
m_GameObject: {fileID: 1485857039}
|
||||||
m_Text: 'The Aim Assist Component can keep
|
m_Text: 'The Aim Assist Component can keep
|
||||||
|
|
||||||
your crosshairs centered on a
|
your crosshairs centered on a target
|
||||||
target
|
|
||||||
|
|
||||||
based on an influence factor'
|
based
|
||||||
|
on an influence factor'
|
||||||
m_OffsetZ: 0
|
m_OffsetZ: 0
|
||||||
m_CharacterSize: 1
|
m_CharacterSize: 1
|
||||||
m_LineSpacing: 1
|
m_LineSpacing: 1
|
||||||
@@ -171402,7 +171402,7 @@ MonoBehaviour:
|
|||||||
- m_Header: Movement Types
|
- m_Header: Movement Types
|
||||||
m_Description: 'The character and camera can change the way they interpret input.
|
m_Description: 'The character and camera can change the way they interpret input.
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
-
|
-
|
||||||
Press Escape to switch between the movement types.
|
Press Escape to switch between the movement types.
|
||||||
|
|||||||
@@ -81,6 +81,6 @@ Material:
|
|||||||
m_Colors:
|
m_Colors:
|
||||||
- _Color: {r: 1, g: 1, b: 1, a: 1}
|
- _Color: {r: 1, g: 1, b: 1, a: 1}
|
||||||
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
|
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
|
||||||
- _TintColor: {r: 1, g: 1, b: 1, a: 0}
|
- _TintColor: {r: 0, g: 0, b: 0, a: 0}
|
||||||
m_BuildTextureStacks: []
|
m_BuildTextureStacks: []
|
||||||
m_AllowLocking: 1
|
m_AllowLocking: 1
|
||||||
|
|||||||
@@ -119,7 +119,7 @@ Material:
|
|||||||
- _ZWrite: 1
|
- _ZWrite: 1
|
||||||
m_Colors:
|
m_Colors:
|
||||||
- _BaseColor: {r: 0.11764703, g: 0.11764703, b: 0.11764703, a: 1}
|
- _BaseColor: {r: 0.11764703, g: 0.11764703, b: 0.11764703, a: 1}
|
||||||
- _Color: {r: 0.117646985, g: 0.117646985, b: 0.117646985, a: 1}
|
- _Color: {r: 0.11764703, g: 0.11764703, b: 0.11764703, a: 1}
|
||||||
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
|
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
|
||||||
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
|
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
|
||||||
m_BuildTextureStacks: []
|
m_BuildTextureStacks: []
|
||||||
|
|||||||
@@ -120,7 +120,7 @@ Material:
|
|||||||
- _ZWrite: 1
|
- _ZWrite: 1
|
||||||
m_Colors:
|
m_Colors:
|
||||||
- _BaseColor: {r: 0.18101206, g: 0.61652833, b: 0.7941176, a: 1}
|
- _BaseColor: {r: 0.18101206, g: 0.61652833, b: 0.7941176, a: 1}
|
||||||
- _Color: {r: 0.18101203, g: 0.61652833, b: 0.7941176, a: 1}
|
- _Color: {r: 0.18101206, g: 0.61652833, b: 0.7941176, a: 1}
|
||||||
- _EmissionColor: {r: 0.05693069, g: 0.1943069, b: 0.25, a: 1}
|
- _EmissionColor: {r: 0.05693069, g: 0.1943069, b: 0.25, a: 1}
|
||||||
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
|
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
|
||||||
m_BuildTextureStacks: []
|
m_BuildTextureStacks: []
|
||||||
|
|||||||
@@ -133,7 +133,7 @@ Material:
|
|||||||
- _ZWrite: 1
|
- _ZWrite: 1
|
||||||
m_Colors:
|
m_Colors:
|
||||||
- _BaseColor: {r: 0, g: 0.26590908, b: 0.5735295, a: 1}
|
- _BaseColor: {r: 0, g: 0.26590908, b: 0.5735295, a: 1}
|
||||||
- _Color: {r: 0, g: 0.26590905, b: 0.5735295, a: 1}
|
- _Color: {r: 0, g: 0.26590908, b: 0.5735295, a: 1}
|
||||||
- _EmissionColor: {r: 0.585611, g: 1.1171656, b: 1.7207954, a: 1}
|
- _EmissionColor: {r: 0.585611, g: 1.1171656, b: 1.7207954, a: 1}
|
||||||
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
|
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
|
||||||
m_BuildTextureStacks: []
|
m_BuildTextureStacks: []
|
||||||
|
|||||||
@@ -155,7 +155,7 @@ Material:
|
|||||||
- _ZWrite: 1
|
- _ZWrite: 1
|
||||||
m_Colors:
|
m_Colors:
|
||||||
- _BaseColor: {r: 0.2641509, g: 0.06105373, b: 0.06105373, a: 1}
|
- _BaseColor: {r: 0.2641509, g: 0.06105373, b: 0.06105373, a: 1}
|
||||||
- _Color: {r: 0.26415086, g: 0.0610537, b: 0.0610537, a: 1}
|
- _Color: {r: 0.2641509, g: 0.06105373, b: 0.06105373, a: 1}
|
||||||
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
|
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
|
||||||
- _EmissionColorUI: {r: 0, g: 0, b: 0, a: 1}
|
- _EmissionColorUI: {r: 0, g: 0, b: 0, a: 1}
|
||||||
- _EmissionColorWithMapUI: {r: 0, g: 0, b: 0, a: 1}
|
- _EmissionColorWithMapUI: {r: 0, g: 0, b: 0, a: 1}
|
||||||
|
|||||||
@@ -150,7 +150,7 @@ Material:
|
|||||||
- _ZWrite: 1
|
- _ZWrite: 1
|
||||||
m_Colors:
|
m_Colors:
|
||||||
- _BaseColor: {r: 0.24528295, g: 0.24528295, b: 0.24528295, a: 1}
|
- _BaseColor: {r: 0.24528295, g: 0.24528295, b: 0.24528295, a: 1}
|
||||||
- _Color: {r: 0.24528292, g: 0.24528292, b: 0.24528292, a: 1}
|
- _Color: {r: 0.24528295, g: 0.24528295, b: 0.24528295, a: 1}
|
||||||
- _EmissionColor: {r: 0, g: 0, b: 0, a: 0}
|
- _EmissionColor: {r: 0, g: 0, b: 0, a: 0}
|
||||||
- _EmissionColorUI: {r: 0, g: 0, b: 0, a: 1}
|
- _EmissionColorUI: {r: 0, g: 0, b: 0, a: 1}
|
||||||
- _EmissionColorWithMapUI: {r: 0, g: 0, b: 0, a: 1}
|
- _EmissionColorWithMapUI: {r: 0, g: 0, b: 0, a: 1}
|
||||||
|
|||||||
@@ -133,7 +133,7 @@ Material:
|
|||||||
- _ZWrite: 1
|
- _ZWrite: 1
|
||||||
m_Colors:
|
m_Colors:
|
||||||
- _BaseColor: {r: 0.18039212, g: 0.49699998, b: 0.7921569, a: 1}
|
- _BaseColor: {r: 0.18039212, g: 0.49699998, b: 0.7921569, a: 1}
|
||||||
- _Color: {r: 0.18039209, g: 0.49699998, b: 0.7921569, a: 1}
|
- _Color: {r: 0.18039212, g: 0.49699998, b: 0.7921569, a: 1}
|
||||||
- _EmissionColor: {r: 0.05693069, g: 0.15717824, b: 0.25, a: 1}
|
- _EmissionColor: {r: 0.05693069, g: 0.15717824, b: 0.25, a: 1}
|
||||||
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
|
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
|
||||||
m_BuildTextureStacks: []
|
m_BuildTextureStacks: []
|
||||||
|
|||||||
@@ -120,7 +120,7 @@ Material:
|
|||||||
- _ZWrite: 1
|
- _ZWrite: 1
|
||||||
m_Colors:
|
m_Colors:
|
||||||
- _BaseColor: {r: 0.08490568, g: 0.08490568, b: 0.08490568, a: 1}
|
- _BaseColor: {r: 0.08490568, g: 0.08490568, b: 0.08490568, a: 1}
|
||||||
- _Color: {r: 0.08490565, g: 0.08490565, b: 0.08490565, a: 1}
|
- _Color: {r: 0.08490568, g: 0.08490568, b: 0.08490568, a: 1}
|
||||||
- _EmissionColor: {r: 0.63061863, g: 0.94044524, b: 1.6181911, a: 1}
|
- _EmissionColor: {r: 0.63061863, g: 0.94044524, b: 1.6181911, a: 1}
|
||||||
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
|
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
|
||||||
m_BuildTextureStacks: []
|
m_BuildTextureStacks: []
|
||||||
|
|||||||
@@ -133,7 +133,7 @@ Material:
|
|||||||
- _ZWrite: 1
|
- _ZWrite: 1
|
||||||
m_Colors:
|
m_Colors:
|
||||||
- _BaseColor: {r: 0, g: 0.26590908, b: 0.5735295, a: 1}
|
- _BaseColor: {r: 0, g: 0.26590908, b: 0.5735295, a: 1}
|
||||||
- _Color: {r: 0, g: 0.26590905, b: 0.5735295, a: 1}
|
- _Color: {r: 0, g: 0.26590908, b: 0.5735295, a: 1}
|
||||||
- _EmissionColor: {r: 0, g: 0.45371014, b: 0.69886, a: 1}
|
- _EmissionColor: {r: 0, g: 0.45371014, b: 0.69886, a: 1}
|
||||||
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
|
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
|
||||||
m_BuildTextureStacks: []
|
m_BuildTextureStacks: []
|
||||||
|
|||||||
@@ -133,7 +133,7 @@ Material:
|
|||||||
- _ZWrite: 1
|
- _ZWrite: 1
|
||||||
m_Colors:
|
m_Colors:
|
||||||
- _BaseColor: {r: 0, g: 1, b: 0.090196066, a: 0.36078432}
|
- _BaseColor: {r: 0, g: 1, b: 0.090196066, a: 0.36078432}
|
||||||
- _Color: {r: 0, g: 1, b: 0.09019602, a: 0.36078432}
|
- _Color: {r: 0, g: 1, b: 0.090196066, a: 0.36078432}
|
||||||
- _EmissionColor: {r: 0, g: 1, b: 0.09019608, a: 1}
|
- _EmissionColor: {r: 0, g: 1, b: 0.09019608, a: 1}
|
||||||
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
|
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
|
||||||
m_BuildTextureStacks: []
|
m_BuildTextureStacks: []
|
||||||
|
|||||||
@@ -125,7 +125,7 @@ Material:
|
|||||||
- _ZWrite: 0
|
- _ZWrite: 0
|
||||||
m_Colors:
|
m_Colors:
|
||||||
- _BaseColor: {r: 0, g: 1, b: 0.089654915, a: 0.359}
|
- _BaseColor: {r: 0, g: 1, b: 0.089654915, a: 0.359}
|
||||||
- _Color: {r: 0, g: 1, b: 0.089654885, a: 0.359}
|
- _Color: {r: 0, g: 1, b: 0.089654915, a: 0.359}
|
||||||
- _EmissionColor: {r: 0.315, g: 0.315, b: 0.315, a: 1}
|
- _EmissionColor: {r: 0.315, g: 0.315, b: 0.315, a: 1}
|
||||||
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
|
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
|
||||||
m_BuildTextureStacks: []
|
m_BuildTextureStacks: []
|
||||||
|
|||||||
@@ -133,7 +133,7 @@ Material:
|
|||||||
- _ZWrite: 1
|
- _ZWrite: 1
|
||||||
m_Colors:
|
m_Colors:
|
||||||
- _BaseColor: {r: 1, g: 0.17647055, b: 0.17647055, a: 0.36078432}
|
- _BaseColor: {r: 1, g: 0.17647055, b: 0.17647055, a: 0.36078432}
|
||||||
- _Color: {r: 1, g: 0.17647052, b: 0.17647052, a: 0.36078432}
|
- _Color: {r: 1, g: 0.17647055, b: 0.17647055, a: 0.36078432}
|
||||||
- _EmissionColor: {r: 1, g: 0.1764706, b: 0.1764706, a: 1}
|
- _EmissionColor: {r: 1, g: 0.1764706, b: 0.1764706, a: 1}
|
||||||
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
|
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
|
||||||
m_BuildTextureStacks: []
|
m_BuildTextureStacks: []
|
||||||
|
|||||||
@@ -125,7 +125,7 @@ Material:
|
|||||||
- _ZWrite: 0
|
- _ZWrite: 0
|
||||||
m_Colors:
|
m_Colors:
|
||||||
- _BaseColor: {r: 1, g: 0.17647055, b: 0.17647055, a: 0.359}
|
- _BaseColor: {r: 1, g: 0.17647055, b: 0.17647055, a: 0.359}
|
||||||
- _Color: {r: 1, g: 0.17647052, b: 0.17647052, a: 0.359}
|
- _Color: {r: 1, g: 0.17647055, b: 0.17647055, a: 0.359}
|
||||||
- _EmissionColor: {r: 0.315, g: 0.315, b: 0.315, a: 1}
|
- _EmissionColor: {r: 0.315, g: 0.315, b: 0.315, a: 1}
|
||||||
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
|
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
|
||||||
m_BuildTextureStacks: []
|
m_BuildTextureStacks: []
|
||||||
|
|||||||
@@ -1,14 +0,0 @@
|
|||||||
<?xml version="1.0"?>
|
|
||||||
<doc>
|
|
||||||
<assembly>
|
|
||||||
<name>DOTweenUpgradeManager</name>
|
|
||||||
</assembly>
|
|
||||||
<members>
|
|
||||||
<member name="T:DG.DOTweenUpgradeManager.Autorun">
|
|
||||||
<summary>
|
|
||||||
This class and its whole library are deleted the first time DOTween's setup is run after an upgrade (or after a new install).
|
|
||||||
NOTE: DidReloadScripts doesn't work on first install so it's useless, InitializeOnLoad is the only way
|
|
||||||
</summary>
|
|
||||||
</member>
|
|
||||||
</members>
|
|
||||||
</doc>
|
|
||||||
@@ -1,11 +0,0 @@
|
|||||||
fileFormatVersion: 2
|
|
||||||
guid: 3df9fdaadcb4c394e826a4d8d20bb952
|
|
||||||
TextScriptImporter:
|
|
||||||
userData:
|
|
||||||
AssetOrigin:
|
|
||||||
serializedVersion: 1
|
|
||||||
productId: 27676
|
|
||||||
packageName: DOTween (HOTween v2)
|
|
||||||
packageVersion: 1.2.825
|
|
||||||
assetPath: Assets/Plugins/Demigiant/DOTween/Editor/DOTweenUpgradeManager.XML
|
|
||||||
uploadId: 862444
|
|
||||||
Binary file not shown.
@@ -1,29 +0,0 @@
|
|||||||
fileFormatVersion: 2
|
|
||||||
guid: 2bf936a5d80799e4e88ec9270fea75a4
|
|
||||||
PluginImporter:
|
|
||||||
serializedVersion: 1
|
|
||||||
iconMap: {}
|
|
||||||
executionOrder: {}
|
|
||||||
isPreloaded: 0
|
|
||||||
platformData:
|
|
||||||
Any:
|
|
||||||
enabled: 0
|
|
||||||
settings: {}
|
|
||||||
Editor:
|
|
||||||
enabled: 1
|
|
||||||
settings:
|
|
||||||
DefaultValueInitialized: true
|
|
||||||
WindowsStoreApps:
|
|
||||||
enabled: 0
|
|
||||||
settings:
|
|
||||||
CPU: AnyCPU
|
|
||||||
userData:
|
|
||||||
assetBundleName:
|
|
||||||
assetBundleVariant:
|
|
||||||
AssetOrigin:
|
|
||||||
serializedVersion: 1
|
|
||||||
productId: 27676
|
|
||||||
packageName: DOTween (HOTween v2)
|
|
||||||
packageVersion: 1.2.825
|
|
||||||
assetPath: Assets/Plugins/Demigiant/DOTween/Editor/DOTweenUpgradeManager.dll
|
|
||||||
uploadId: 862444
|
|
||||||
@@ -135,6 +135,9 @@ namespace OnlyScove.Scripts
|
|||||||
if (followTarget == null) return;
|
if (followTarget == null) return;
|
||||||
HandleViewTransition();
|
HandleViewTransition();
|
||||||
|
|
||||||
|
// If we are in transition, HandleViewTransition takes full control of the camera transform
|
||||||
|
if (_inTransition) return;
|
||||||
|
|
||||||
if (inputReader != null)
|
if (inputReader != null)
|
||||||
{
|
{
|
||||||
// Input-related updates are handled differently based on view mode
|
// Input-related updates are handled differently based on view mode
|
||||||
@@ -165,28 +168,28 @@ namespace OnlyScove.Scripts
|
|||||||
targetDistance = collisionHandler.CheckCollision(focusPosition, rotationHandler.CurrentRotation, zoomHandler.CurrentDistance, zoomHandler.MinDistance);
|
targetDistance = collisionHandler.CheckCollision(focusPosition, rotationHandler.CurrentRotation, zoomHandler.CurrentDistance, zoomHandler.MinDistance);
|
||||||
characterFading.HandleCharacterFading(targetDistance);
|
characterFading.HandleCharacterFading(targetDistance);
|
||||||
occlusionTransparency.HandleTransparency(transform, focusPosition);
|
occlusionTransparency.HandleTransparency(transform, focusPosition);
|
||||||
|
|
||||||
|
// Reset near clip plane for TPV if needed
|
||||||
|
if (_cam.nearClipPlane < 0.1f) _cam.nearClipPlane = 0.3f;
|
||||||
}
|
}
|
||||||
else // FirstPerson
|
else // FirstPerson
|
||||||
{
|
{
|
||||||
// FPV specific calculations
|
// FPV specific calculations
|
||||||
// Player's horizontal rotation (body) follows mouse YAW
|
if (followTarget != null) followTarget.rotation = rotationHandler.PlanarRotation;
|
||||||
if (followTarget != null)
|
if (fpvTarget != null) fpvTarget.rotation = rotationHandler.CurrentRotation;
|
||||||
{
|
|
||||||
followTarget.rotation = rotationHandler.PlanarRotation; // Sync body to camera yaw
|
|
||||||
}
|
|
||||||
|
|
||||||
if (fpvTarget != null)
|
transform.rotation = rotationHandler.CurrentRotation;
|
||||||
{
|
|
||||||
fpvTarget.rotation = rotationHandler.CurrentRotation; // Sync head/eyes to full camera rotation
|
|
||||||
}
|
|
||||||
|
|
||||||
transform.rotation = rotationHandler.CurrentRotation; // Set camera rotation from handler (which includes vertical)
|
|
||||||
focusPosition = fpvTarget.position;
|
focusPosition = fpvTarget.position;
|
||||||
targetDistance = 0; // FPV has no distance to player
|
targetDistance = 0;
|
||||||
|
|
||||||
// Disable TPV-specific effects
|
// AGGRESSIVE DEBUG FIX:
|
||||||
characterFading.HandleCharacterFading(0); // Fully opaque character in FPV
|
_cam.nearClipPlane = 0.01f;
|
||||||
occlusionTransparency.HandleTransparency(transform, fpvTarget.position); // Can still have occlusion transparency for environment in FPV
|
_cam.farClipPlane = 2000f; // Ensure world isn't being cut off
|
||||||
|
_cam.cullingMask = -1; // Force camera to see EVERY LAYER
|
||||||
|
|
||||||
|
// Disable these temporarily to see if they are the cause
|
||||||
|
// characterFading.HandleCharacterFading(0.01f);
|
||||||
|
occlusionTransparency.ResetLastRenderer();
|
||||||
}
|
}
|
||||||
|
|
||||||
// Calculate target position using the currently set transform.rotation
|
// Calculate target position using the currently set transform.rotation
|
||||||
@@ -203,6 +206,23 @@ namespace OnlyScove.Scripts
|
|||||||
if (_inTransition) return; // Prevent multiple toggles during transition
|
if (_inTransition) return; // Prevent multiple toggles during transition
|
||||||
|
|
||||||
_targetViewMode = (_currentViewMode == CameraViewMode.ThirdPerson) ? CameraViewMode.FirstPerson : CameraViewMode.ThirdPerson;
|
_targetViewMode = (_currentViewMode == CameraViewMode.ThirdPerson) ? CameraViewMode.FirstPerson : CameraViewMode.ThirdPerson;
|
||||||
|
|
||||||
|
if (_targetViewMode == CameraViewMode.FirstPerson && fpvTarget == null)
|
||||||
|
{
|
||||||
|
Debug.LogWarning("[CameraController] Cannot switch to FPV: fpvTarget is not assigned!");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Initialize rotation handler immediately so PlanarRotation is correct during transition
|
||||||
|
if (_targetViewMode == CameraViewMode.FirstPerson)
|
||||||
|
{
|
||||||
|
rotationHandler.InitializeFPV(fpvTarget);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
rotationHandler.Initialize(transform);
|
||||||
|
}
|
||||||
|
|
||||||
Debug.Log($"[CameraController] Toggling view from {_currentViewMode} to {_targetViewMode}");
|
Debug.Log($"[CameraController] Toggling view from {_currentViewMode} to {_targetViewMode}");
|
||||||
_inTransition = true;
|
_inTransition = true;
|
||||||
_transitionTimer = 0f;
|
_transitionTimer = 0f;
|
||||||
@@ -217,11 +237,14 @@ namespace OnlyScove.Scripts
|
|||||||
t = Mathf.Clamp01(t); // Clamp t between 0 and 1
|
t = Mathf.Clamp01(t); // Clamp t between 0 and 1
|
||||||
|
|
||||||
// Smoothly interpolate parameters during transition
|
// Smoothly interpolate parameters during transition
|
||||||
if (_currentViewMode == CameraViewMode.ThirdPerson && _targetViewMode == CameraViewMode.FirstPerson)
|
if (_targetViewMode == CameraViewMode.FirstPerson)
|
||||||
{
|
{
|
||||||
// TPV -> FPV transition
|
// TPV -> FPV transition
|
||||||
// Interpolate FOV
|
// Interpolate FOV
|
||||||
_cam.fieldOfView = Mathf.Lerp(dynamicFOV.CurrentTpvBaseFOV, fpvFOV, t);
|
_cam.fieldOfView = Mathf.Lerp(dynamicFOV.CurrentTpvBaseFOV, fpvFOV, t);
|
||||||
|
|
||||||
|
// Adjust Near Clip Plane during transition to prevent blue screen (clipping)
|
||||||
|
_cam.nearClipPlane = Mathf.Lerp(0.3f, 0.01f, t);
|
||||||
|
|
||||||
// Rotate player body to match camera's intended horizontal look direction
|
// Rotate player body to match camera's intended horizontal look direction
|
||||||
if (followTarget != null)
|
if (followTarget != null)
|
||||||
@@ -230,14 +253,18 @@ namespace OnlyScove.Scripts
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Interpolate position and rotation
|
// Interpolate position and rotation
|
||||||
transform.position = Vector3.Lerp(transform.position, fpvTarget.position, t);
|
if (fpvTarget != null)
|
||||||
transform.rotation = Quaternion.Slerp(transform.rotation, fpvTarget.rotation, t);
|
{
|
||||||
|
transform.position = Vector3.Lerp(transform.position, fpvTarget.position, t);
|
||||||
|
transform.rotation = Quaternion.Slerp(transform.rotation, fpvTarget.rotation, t);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
else if (_currentViewMode == CameraViewMode.FirstPerson && _targetViewMode == CameraViewMode.ThirdPerson)
|
else
|
||||||
{
|
{
|
||||||
// FPV -> TPV transition
|
// FPV -> TPV transition
|
||||||
// Interpolate FOV
|
// Interpolate FOV
|
||||||
_cam.fieldOfView = Mathf.Lerp(fpvFOV, dynamicFOV.CurrentTpvBaseFOV, t);
|
_cam.fieldOfView = Mathf.Lerp(fpvFOV, dynamicFOV.CurrentTpvBaseFOV, t);
|
||||||
|
_cam.nearClipPlane = Mathf.Lerp(0.01f, 0.3f, t);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (t >= 1f)
|
if (t >= 1f)
|
||||||
@@ -245,19 +272,10 @@ namespace OnlyScove.Scripts
|
|||||||
_currentViewMode = _targetViewMode;
|
_currentViewMode = _targetViewMode;
|
||||||
Debug.Log($"[CameraController] View transition complete. Current mode: {_currentViewMode}");
|
Debug.Log($"[CameraController] View transition complete. Current mode: {_currentViewMode}");
|
||||||
_inTransition = false;
|
_inTransition = false;
|
||||||
|
|
||||||
// Initialize rotation handler based on new view mode
|
|
||||||
if (_currentViewMode == CameraViewMode.FirstPerson && fpvTarget != null)
|
|
||||||
{
|
|
||||||
rotationHandler.InitializeFPV(fpvTarget); // Initialize FPV rotation handler
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
rotationHandler.Initialize(transform); // Initialize TPV rotation handler
|
|
||||||
}
|
|
||||||
|
|
||||||
// Ensure FOV is set correctly at the end of transition
|
// Ensure final values are set correctly
|
||||||
_cam.fieldOfView = (_currentViewMode == CameraViewMode.FirstPerson) ? fpvFOV : dynamicFOV.CurrentTpvBaseFOV;
|
_cam.fieldOfView = (_currentViewMode == CameraViewMode.FirstPerson) ? fpvFOV : dynamicFOV.CurrentTpvBaseFOV;
|
||||||
|
_cam.nearClipPlane = (_currentViewMode == CameraViewMode.FirstPerson) ? 0.01f : 0.3f;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -23,6 +23,14 @@ namespace OnlyScove.Scripts
|
|||||||
|
|
||||||
Vector3 direction = focusPosition - cameraTransform.position;
|
Vector3 direction = focusPosition - cameraTransform.position;
|
||||||
float distanceToPlayer = direction.magnitude;
|
float distanceToPlayer = direction.magnitude;
|
||||||
|
|
||||||
|
// Prevent raycasting if we are too close (common in FPV)
|
||||||
|
if (distanceToPlayer < 0.1f)
|
||||||
|
{
|
||||||
|
ResetLastRenderer();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
RaycastHit hit;
|
RaycastHit hit;
|
||||||
|
|
||||||
if (Physics.Raycast(cameraTransform.position, direction.normalized, out hit, distanceToPlayer, transparencyLayers))
|
if (Physics.Raycast(cameraTransform.position, direction.normalized, out hit, distanceToPlayer, transparencyLayers))
|
||||||
@@ -46,7 +54,7 @@ namespace OnlyScove.Scripts
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void ResetLastRenderer()
|
public void ResetLastRenderer()
|
||||||
{
|
{
|
||||||
if (_lastFadedRenderer != null)
|
if (_lastFadedRenderer != null)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -36,8 +36,14 @@ namespace OnlyScove.Scripts
|
|||||||
// New method to initialize rotation specifically for FPV
|
// New method to initialize rotation specifically for FPV
|
||||||
public void InitializeFPV(Transform fpvTargetTransform)
|
public void InitializeFPV(Transform fpvTargetTransform)
|
||||||
{
|
{
|
||||||
_rotationX = fpvTargetTransform.localEulerAngles.x; // Use local rotation for vertical angle in FPV
|
Vector3 eulers = fpvTargetTransform.eulerAngles;
|
||||||
_rotationY = fpvTargetTransform.eulerAngles.y; // Use world rotation for horizontal angle
|
|
||||||
|
// Normalize angles to -180 to 180 range for clamping
|
||||||
|
_rotationX = eulers.x;
|
||||||
|
if (_rotationX > 180) _rotationX -= 360;
|
||||||
|
|
||||||
|
_rotationY = eulers.y;
|
||||||
|
|
||||||
_lastInputTime = Time.time;
|
_lastInputTime = Time.time;
|
||||||
CurrentRotation = fpvTargetTransform.rotation; // Camera starts matching fpvTarget rotation
|
CurrentRotation = fpvTargetTransform.rotation; // Camera starts matching fpvTarget rotation
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,6 +3,8 @@ using UnityEngine.UIElements;
|
|||||||
using PrimeTween;
|
using PrimeTween;
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
using DG.Tweening;
|
using DG.Tweening;
|
||||||
|
using Tween = PrimeTween.Tween;
|
||||||
|
using Ease = PrimeTween.Ease;
|
||||||
|
|
||||||
namespace Hallucinate.UI
|
namespace Hallucinate.UI
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -3,6 +3,8 @@ using UnityEngine.UIElements;
|
|||||||
using PrimeTween;
|
using PrimeTween;
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
using DG.Tweening;
|
using DG.Tweening;
|
||||||
|
using Tween = PrimeTween.Tween;
|
||||||
|
using Ease = PrimeTween.Ease;
|
||||||
|
|
||||||
namespace Hallucinate.UI
|
namespace Hallucinate.UI
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -3,6 +3,8 @@ using UnityEngine.UIElements;
|
|||||||
using PrimeTween;
|
using PrimeTween;
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
using DG.Tweening;
|
using DG.Tweening;
|
||||||
|
using Tween = PrimeTween.Tween;
|
||||||
|
using Ease = PrimeTween.Ease;
|
||||||
|
|
||||||
namespace Hallucinate.UI
|
namespace Hallucinate.UI
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -3,6 +3,8 @@ using UnityEngine.UIElements;
|
|||||||
using PrimeTween;
|
using PrimeTween;
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
using DG.Tweening;
|
using DG.Tweening;
|
||||||
|
using Tween = PrimeTween.Tween;
|
||||||
|
using Ease = PrimeTween.Ease;
|
||||||
|
|
||||||
namespace Hallucinate.UI
|
namespace Hallucinate.UI
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -10,6 +10,8 @@ using DG.Tweening;
|
|||||||
using OnlyScove.Scripts;
|
using OnlyScove.Scripts;
|
||||||
using Hallucinate.Audio;
|
using Hallucinate.Audio;
|
||||||
using PrimeTween;
|
using PrimeTween;
|
||||||
|
using Tween = PrimeTween.Tween;
|
||||||
|
using Ease = PrimeTween.Ease;
|
||||||
|
|
||||||
namespace Hallucinate.UI
|
namespace Hallucinate.UI
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -5,6 +5,8 @@ using DG.Tweening;
|
|||||||
using UnityEngine;
|
using UnityEngine;
|
||||||
using UnityEngine.UIElements;
|
using UnityEngine.UIElements;
|
||||||
using PrimeTween;
|
using PrimeTween;
|
||||||
|
using Tween = PrimeTween.Tween;
|
||||||
|
using Ease = PrimeTween.Ease;
|
||||||
using OnlyScove.Scripts;
|
using OnlyScove.Scripts;
|
||||||
#if UNITY_EDITOR
|
#if UNITY_EDITOR
|
||||||
using UnityEditor;
|
using UnityEditor;
|
||||||
|
|||||||
@@ -123,7 +123,7 @@ Material:
|
|||||||
- _ZWrite: 1
|
- _ZWrite: 1
|
||||||
m_Colors:
|
m_Colors:
|
||||||
- _BaseColor: {r: 0.051470563, g: 0.051470563, b: 0.051470563, a: 1}
|
- _BaseColor: {r: 0.051470563, g: 0.051470563, b: 0.051470563, a: 1}
|
||||||
- _Color: {r: 0.051470548, g: 0.051470548, b: 0.051470548, a: 1}
|
- _Color: {r: 0.051470563, g: 0.051470563, b: 0.051470563, a: 1}
|
||||||
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
|
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
|
||||||
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
|
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
|
||||||
m_BuildTextureStacks: []
|
m_BuildTextureStacks: []
|
||||||
|
|||||||
@@ -122,7 +122,7 @@ Material:
|
|||||||
- _ZWrite: 1
|
- _ZWrite: 1
|
||||||
m_Colors:
|
m_Colors:
|
||||||
- _BaseColor: {r: 0.75, g: 0.6228195, b: 0.5404411, a: 1}
|
- _BaseColor: {r: 0.75, g: 0.6228195, b: 0.5404411, a: 1}
|
||||||
- _Color: {r: 0.75, g: 0.6228195, b: 0.54044104, a: 1}
|
- _Color: {r: 0.75, g: 0.6228195, b: 0.5404411, a: 1}
|
||||||
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
|
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
|
||||||
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
|
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
|
||||||
m_BuildTextureStacks: []
|
m_BuildTextureStacks: []
|
||||||
|
|||||||
@@ -22,6 +22,7 @@
|
|||||||
"com.unity.ugui": "2.0.0",
|
"com.unity.ugui": "2.0.0",
|
||||||
"com.unity.visualeffectgraph": "17.3.0",
|
"com.unity.visualeffectgraph": "17.3.0",
|
||||||
"com.unity.visualscripting": "1.9.9",
|
"com.unity.visualscripting": "1.9.9",
|
||||||
|
"com.wooshii.foldericons": "https://github.com/WooshiiDev/Unity-Folder-Icons.git",
|
||||||
"com.unity.modules.accessibility": "1.0.0",
|
"com.unity.modules.accessibility": "1.0.0",
|
||||||
"com.unity.modules.adaptiveperformance": "1.0.0",
|
"com.unity.modules.adaptiveperformance": "1.0.0",
|
||||||
"com.unity.modules.ai": "1.0.0",
|
"com.unity.modules.ai": "1.0.0",
|
||||||
|
|||||||
@@ -273,6 +273,13 @@
|
|||||||
},
|
},
|
||||||
"url": "https://packages.unity.com"
|
"url": "https://packages.unity.com"
|
||||||
},
|
},
|
||||||
|
"com.wooshii.foldericons": {
|
||||||
|
"version": "https://github.com/WooshiiDev/Unity-Folder-Icons.git",
|
||||||
|
"depth": 0,
|
||||||
|
"source": "git",
|
||||||
|
"dependencies": {},
|
||||||
|
"hash": "201a18f355d3e9bc49b337e7c93423743ab42b2f"
|
||||||
|
},
|
||||||
"com.unity.modules.accessibility": {
|
"com.unity.modules.accessibility": {
|
||||||
"version": "1.0.0",
|
"version": "1.0.0",
|
||||||
"depth": 0,
|
"depth": 0,
|
||||||
|
|||||||
@@ -294,7 +294,196 @@ PlayerSettings:
|
|||||||
AndroidReportGooglePlayAppDependencies: 1
|
AndroidReportGooglePlayAppDependencies: 1
|
||||||
androidSymbolsSizeThreshold: 800
|
androidSymbolsSizeThreshold: 800
|
||||||
m_BuildTargetIcons: []
|
m_BuildTargetIcons: []
|
||||||
m_BuildTargetPlatformIcons: []
|
m_BuildTargetPlatformIcons:
|
||||||
|
- m_BuildTarget: iPhone
|
||||||
|
m_Icons:
|
||||||
|
- m_Textures: []
|
||||||
|
m_Width: 180
|
||||||
|
m_Height: 180
|
||||||
|
m_Kind: 0
|
||||||
|
m_SubKind: iPhone
|
||||||
|
- m_Textures: []
|
||||||
|
m_Width: 120
|
||||||
|
m_Height: 120
|
||||||
|
m_Kind: 0
|
||||||
|
m_SubKind: iPhone
|
||||||
|
- m_Textures: []
|
||||||
|
m_Width: 167
|
||||||
|
m_Height: 167
|
||||||
|
m_Kind: 0
|
||||||
|
m_SubKind: iPad
|
||||||
|
- m_Textures: []
|
||||||
|
m_Width: 152
|
||||||
|
m_Height: 152
|
||||||
|
m_Kind: 0
|
||||||
|
m_SubKind: iPad
|
||||||
|
- m_Textures: []
|
||||||
|
m_Width: 76
|
||||||
|
m_Height: 76
|
||||||
|
m_Kind: 0
|
||||||
|
m_SubKind: iPad
|
||||||
|
- m_Textures: []
|
||||||
|
m_Width: 120
|
||||||
|
m_Height: 120
|
||||||
|
m_Kind: 3
|
||||||
|
m_SubKind: iPhone
|
||||||
|
- m_Textures: []
|
||||||
|
m_Width: 80
|
||||||
|
m_Height: 80
|
||||||
|
m_Kind: 3
|
||||||
|
m_SubKind: iPhone
|
||||||
|
- m_Textures: []
|
||||||
|
m_Width: 80
|
||||||
|
m_Height: 80
|
||||||
|
m_Kind: 3
|
||||||
|
m_SubKind: iPad
|
||||||
|
- m_Textures: []
|
||||||
|
m_Width: 40
|
||||||
|
m_Height: 40
|
||||||
|
m_Kind: 3
|
||||||
|
m_SubKind: iPad
|
||||||
|
- m_Textures: []
|
||||||
|
m_Width: 87
|
||||||
|
m_Height: 87
|
||||||
|
m_Kind: 1
|
||||||
|
m_SubKind: iPhone
|
||||||
|
- m_Textures: []
|
||||||
|
m_Width: 58
|
||||||
|
m_Height: 58
|
||||||
|
m_Kind: 1
|
||||||
|
m_SubKind: iPhone
|
||||||
|
- m_Textures: []
|
||||||
|
m_Width: 29
|
||||||
|
m_Height: 29
|
||||||
|
m_Kind: 1
|
||||||
|
m_SubKind: iPhone
|
||||||
|
- m_Textures: []
|
||||||
|
m_Width: 58
|
||||||
|
m_Height: 58
|
||||||
|
m_Kind: 1
|
||||||
|
m_SubKind: iPad
|
||||||
|
- m_Textures: []
|
||||||
|
m_Width: 29
|
||||||
|
m_Height: 29
|
||||||
|
m_Kind: 1
|
||||||
|
m_SubKind: iPad
|
||||||
|
- m_Textures: []
|
||||||
|
m_Width: 60
|
||||||
|
m_Height: 60
|
||||||
|
m_Kind: 2
|
||||||
|
m_SubKind: iPhone
|
||||||
|
- m_Textures: []
|
||||||
|
m_Width: 40
|
||||||
|
m_Height: 40
|
||||||
|
m_Kind: 2
|
||||||
|
m_SubKind: iPhone
|
||||||
|
- m_Textures: []
|
||||||
|
m_Width: 40
|
||||||
|
m_Height: 40
|
||||||
|
m_Kind: 2
|
||||||
|
m_SubKind: iPad
|
||||||
|
- m_Textures: []
|
||||||
|
m_Width: 20
|
||||||
|
m_Height: 20
|
||||||
|
m_Kind: 2
|
||||||
|
m_SubKind: iPad
|
||||||
|
- m_Textures: []
|
||||||
|
m_Width: 1024
|
||||||
|
m_Height: 1024
|
||||||
|
m_Kind: 4
|
||||||
|
m_SubKind: App Store
|
||||||
|
- m_BuildTarget: Android
|
||||||
|
m_Icons:
|
||||||
|
- m_Textures: []
|
||||||
|
m_Width: 432
|
||||||
|
m_Height: 432
|
||||||
|
m_Kind: 2
|
||||||
|
m_SubKind:
|
||||||
|
- m_Textures: []
|
||||||
|
m_Width: 324
|
||||||
|
m_Height: 324
|
||||||
|
m_Kind: 2
|
||||||
|
m_SubKind:
|
||||||
|
- m_Textures: []
|
||||||
|
m_Width: 216
|
||||||
|
m_Height: 216
|
||||||
|
m_Kind: 2
|
||||||
|
m_SubKind:
|
||||||
|
- m_Textures: []
|
||||||
|
m_Width: 162
|
||||||
|
m_Height: 162
|
||||||
|
m_Kind: 2
|
||||||
|
m_SubKind:
|
||||||
|
- m_Textures: []
|
||||||
|
m_Width: 108
|
||||||
|
m_Height: 108
|
||||||
|
m_Kind: 2
|
||||||
|
m_SubKind:
|
||||||
|
- m_Textures: []
|
||||||
|
m_Width: 81
|
||||||
|
m_Height: 81
|
||||||
|
m_Kind: 2
|
||||||
|
m_SubKind:
|
||||||
|
- m_Textures: []
|
||||||
|
m_Width: 192
|
||||||
|
m_Height: 192
|
||||||
|
m_Kind: 1
|
||||||
|
m_SubKind:
|
||||||
|
- m_Textures: []
|
||||||
|
m_Width: 144
|
||||||
|
m_Height: 144
|
||||||
|
m_Kind: 1
|
||||||
|
m_SubKind:
|
||||||
|
- m_Textures: []
|
||||||
|
m_Width: 96
|
||||||
|
m_Height: 96
|
||||||
|
m_Kind: 1
|
||||||
|
m_SubKind:
|
||||||
|
- m_Textures: []
|
||||||
|
m_Width: 72
|
||||||
|
m_Height: 72
|
||||||
|
m_Kind: 1
|
||||||
|
m_SubKind:
|
||||||
|
- m_Textures: []
|
||||||
|
m_Width: 48
|
||||||
|
m_Height: 48
|
||||||
|
m_Kind: 1
|
||||||
|
m_SubKind:
|
||||||
|
- m_Textures: []
|
||||||
|
m_Width: 36
|
||||||
|
m_Height: 36
|
||||||
|
m_Kind: 1
|
||||||
|
m_SubKind:
|
||||||
|
- m_Textures: []
|
||||||
|
m_Width: 192
|
||||||
|
m_Height: 192
|
||||||
|
m_Kind: 0
|
||||||
|
m_SubKind:
|
||||||
|
- m_Textures: []
|
||||||
|
m_Width: 144
|
||||||
|
m_Height: 144
|
||||||
|
m_Kind: 0
|
||||||
|
m_SubKind:
|
||||||
|
- m_Textures: []
|
||||||
|
m_Width: 96
|
||||||
|
m_Height: 96
|
||||||
|
m_Kind: 0
|
||||||
|
m_SubKind:
|
||||||
|
- m_Textures: []
|
||||||
|
m_Width: 72
|
||||||
|
m_Height: 72
|
||||||
|
m_Kind: 0
|
||||||
|
m_SubKind:
|
||||||
|
- m_Textures: []
|
||||||
|
m_Width: 48
|
||||||
|
m_Height: 48
|
||||||
|
m_Kind: 0
|
||||||
|
m_SubKind:
|
||||||
|
- m_Textures: []
|
||||||
|
m_Width: 36
|
||||||
|
m_Height: 36
|
||||||
|
m_Kind: 0
|
||||||
|
m_SubKind:
|
||||||
m_BuildTargetBatching: []
|
m_BuildTargetBatching: []
|
||||||
m_BuildTargetShaderSettings: []
|
m_BuildTargetShaderSettings: []
|
||||||
m_BuildTargetGraphicsJobs: []
|
m_BuildTargetGraphicsJobs: []
|
||||||
@@ -584,7 +773,24 @@ PlayerSettings:
|
|||||||
webWasm2023: 0
|
webWasm2023: 0
|
||||||
webEnableSubmoduleStrippingCompatibility: 0
|
webEnableSubmoduleStrippingCompatibility: 0
|
||||||
scriptingDefineSymbols:
|
scriptingDefineSymbols:
|
||||||
Standalone: FUSION_WEAVER;FUSION2;FUSION_2;FUSION_2_0;FUSION_2_0_12;FUSION_2_OR_NEWER;FUSION_2_0_OR_NEWER;FUSION_LOGLEVEL_INFO;ODIN_INSPECTOR;ODIN_INSPECTOR_3;ODIN_INSPECTOR_3_1;ODIN_INSPECTOR_3_2;ODIN_INSPECTOR_3_3
|
Android: DOTWEEN
|
||||||
|
EmbeddedLinux: DOTWEEN
|
||||||
|
GameCoreScarlett: DOTWEEN
|
||||||
|
GameCoreXboxOne: DOTWEEN
|
||||||
|
Kepler: DOTWEEN
|
||||||
|
LinuxHeadlessSimulation: DOTWEEN
|
||||||
|
Nintendo Switch: DOTWEEN
|
||||||
|
Nintendo Switch 2: DOTWEEN
|
||||||
|
PS4: DOTWEEN
|
||||||
|
PS5: DOTWEEN
|
||||||
|
QNX: DOTWEEN
|
||||||
|
Standalone: FUSION_WEAVER;FUSION2;FUSION_2;FUSION_2_0;FUSION_2_0_12;FUSION_2_OR_NEWER;FUSION_2_0_OR_NEWER;FUSION_LOGLEVEL_INFO;ODIN_INSPECTOR;ODIN_INSPECTOR_3;ODIN_INSPECTOR_3_1;ODIN_INSPECTOR_3_2;ODIN_INSPECTOR_3_3;FIRST_PERSON_CONTROLLER;THIRD_PERSON_CONTROLLER;ULTIMATE_CHARACTER_CONTROLLER_SHOOTER;FIRST_PERSON_SHOOTER;ULTIMATE_CHARACTER_CONTROLLER_MELEE;FIRST_PERSON_MELEE;ULTIMATE_CHARACTER_CONTROLLER_UNIVERSALRP;INVECTOR_MELEE;INVECTOR_SHOOTER;INVECTOR_BASIC;DOTWEEN
|
||||||
|
VisionOS: DOTWEEN
|
||||||
|
WebGL: DOTWEEN
|
||||||
|
Windows Store Apps: DOTWEEN
|
||||||
|
XboxOne: DOTWEEN
|
||||||
|
iPhone: DOTWEEN
|
||||||
|
tvOS: DOTWEEN
|
||||||
additionalCompilerArguments: {}
|
additionalCompilerArguments: {}
|
||||||
platformArchitecture: {}
|
platformArchitecture: {}
|
||||||
scriptingBackend: {}
|
scriptingBackend: {}
|
||||||
|
|||||||
Reference in New Issue
Block a user