End of camera correction
This commit is contained in:
parent
57229cbc5c
commit
dbb4f0a59e
17
.idea/.idea.AwesomeRunner/.idea/.gitignore
generated
vendored
Normal file
17
.idea/.idea.AwesomeRunner/.idea/.gitignore
generated
vendored
Normal file
@ -0,0 +1,17 @@
|
||||
# Default ignored files
|
||||
/shelf/
|
||||
/workspace.xml
|
||||
|
||||
# Rider ignored files
|
||||
/.idea.AwesomeRunner.iml
|
||||
/modules.xml
|
||||
/contentModel.xml
|
||||
/projectSettingsUpdater.xml
|
||||
|
||||
# Editor-based HTTP Client requests
|
||||
/httpRequests/
|
||||
|
||||
# Datasource local storage ignored files
|
||||
/dataSources/
|
||||
/dataSources.local.xml
|
||||
|
4
.idea/.idea.AwesomeRunner/.idea/encodings.xml
generated
Normal file
4
.idea/.idea.AwesomeRunner/.idea/encodings.xml
generated
Normal file
@ -0,0 +1,4 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="Encoding" addBOMForNewFiles="with BOM under Windows, with no BOM otherwise" />
|
||||
</project>
|
8
.idea/.idea.AwesomeRunner/.idea/indexLayout.xml
generated
Normal file
8
.idea/.idea.AwesomeRunner/.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>
|
6
.idea/.idea.AwesomeRunner/.idea/inspectionProfiles/Project_Default.xml
generated
Normal file
6
.idea/.idea.AwesomeRunner/.idea/inspectionProfiles/Project_Default.xml
generated
Normal file
@ -0,0 +1,6 @@
|
||||
<component name="InspectionProjectProfileManager">
|
||||
<profile version="1.0">
|
||||
<option name="myName" value="Project Default" />
|
||||
<inspection_tool class="JadeTabsAndSpaces" enabled="true" level="ERROR" enabled_by_default="true" />
|
||||
</profile>
|
||||
</component>
|
6
.idea/.idea.AwesomeRunner/.idea/vcs.xml
generated
Normal file
6
.idea/.idea.AwesomeRunner/.idea/vcs.xml
generated
Normal file
@ -0,0 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="VcsDirectoryMappings">
|
||||
<mapping directory="" vcs="Git" />
|
||||
</component>
|
||||
</project>
|
@ -1,7 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 74ec3c5b307a41c4eac0e62ddf7311a7
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
@ -1935,13 +1935,13 @@ Transform:
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1053166407}
|
||||
serializedVersion: 2
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalRotation: {x: 0.13052616, y: 0, z: 0, w: 0.9914449}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 2033098991}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_LocalEulerAnglesHint: {x: 15, y: 0, z: 0}
|
||||
--- !u!114 &1053166411
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -1955,7 +1955,7 @@ MonoBehaviour:
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
target: {fileID: 2249596435903131709}
|
||||
defaultDistance: {x: 0, y: 5.99, z: -7}
|
||||
defaultDistance: {x: 0, y: 3, z: -4}
|
||||
distanceDamp: 0.15
|
||||
--- !u!114 &1053166413
|
||||
MonoBehaviour:
|
||||
|
@ -36,11 +36,11 @@ public class FollowingCamera : MonoBehaviour
|
||||
Vector3 moveVector = new Vector3(target.position.x, target.position.y, target.position.z);
|
||||
//Quaternion rotationVector = Quaternion.Euler(target.rotation.y, target.rotation.y, defaultTargetRotation.z);
|
||||
//float curveX = GameSession.Instance.Curver.CurveStrengthX;
|
||||
camTransform.rotation = target.rotation;
|
||||
//camTransform.rotation = target.rotation;
|
||||
Vector3 toPos = moveVector + (target.rotation * defaultDistance);
|
||||
//Vector3 toPos = target.position + (target.rotation * defaultDistance);
|
||||
Vector3 curPos = Vector3.SmoothDamp(camTransform.position, toPos, ref velocity, distanceDamp);
|
||||
camTransform.position = curPos;
|
||||
camTransform.LookAt(target, target.up);
|
||||
camTransform.LookAt(camTransform, target.up);
|
||||
}
|
||||
}
|
||||
|
File diff suppressed because one or more lines are too long
@ -1,8 +1,8 @@
|
||||
{
|
||||
"dependencies": {
|
||||
"com.unity.ai.navigation": "2.0.4",
|
||||
"com.unity.ai.navigation": "2.0.5",
|
||||
"com.unity.animation.rigging": "1.3.0",
|
||||
"com.unity.cinemachine": "2.10.2",
|
||||
"com.unity.cinemachine": "2.10.3",
|
||||
"com.unity.collab-proxy": "2.5.2",
|
||||
"com.unity.ext.nunit": "2.0.5",
|
||||
"com.unity.feature.development": "1.0.2",
|
||||
@ -15,7 +15,7 @@
|
||||
"com.unity.test-framework": "1.4.5",
|
||||
"com.unity.timeline": "1.8.7",
|
||||
"com.unity.ugui": "2.0.0",
|
||||
"com.unity.visualscripting": "1.9.4",
|
||||
"com.unity.visualscripting": "1.9.5",
|
||||
"com.unity.modules.accessibility": "1.0.0",
|
||||
"com.unity.modules.ai": "1.0.0",
|
||||
"com.unity.modules.androidjni": "1.0.0",
|
||||
|
@ -1,7 +1,7 @@
|
||||
{
|
||||
"dependencies": {
|
||||
"com.unity.ai.navigation": {
|
||||
"version": "2.0.4",
|
||||
"version": "2.0.5",
|
||||
"depth": 0,
|
||||
"source": "registry",
|
||||
"dependencies": {
|
||||
@ -39,7 +39,7 @@
|
||||
"url": "https://packages.unity.com"
|
||||
},
|
||||
"com.unity.cinemachine": {
|
||||
"version": "2.10.2",
|
||||
"version": "2.10.3",
|
||||
"depth": 0,
|
||||
"source": "registry",
|
||||
"dependencies": {
|
||||
@ -60,8 +60,8 @@
|
||||
"source": "registry",
|
||||
"dependencies": {
|
||||
"com.unity.burst": "1.8.17",
|
||||
"com.unity.nuget.mono-cecil": "1.11.4",
|
||||
"com.unity.test-framework": "1.4.5",
|
||||
"com.unity.nuget.mono-cecil": "1.11.4",
|
||||
"com.unity.test-framework.performance": "3.0.3"
|
||||
},
|
||||
"url": "https://packages.unity.com"
|
||||
@ -210,9 +210,9 @@
|
||||
"depth": 0,
|
||||
"source": "registry",
|
||||
"dependencies": {
|
||||
"com.unity.modules.audio": "1.0.0",
|
||||
"com.unity.modules.director": "1.0.0",
|
||||
"com.unity.modules.animation": "1.0.0",
|
||||
"com.unity.modules.audio": "1.0.0",
|
||||
"com.unity.modules.particlesystem": "1.0.0"
|
||||
},
|
||||
"url": "https://packages.unity.com"
|
||||
@ -227,7 +227,7 @@
|
||||
}
|
||||
},
|
||||
"com.unity.visualscripting": {
|
||||
"version": "1.9.4",
|
||||
"version": "1.9.5",
|
||||
"depth": 0,
|
||||
"source": "registry",
|
||||
"dependencies": {
|
||||
|
@ -1,2 +1,2 @@
|
||||
m_EditorVersion: 6000.0.26f1
|
||||
m_EditorVersionWithRevision: 6000.0.26f1 (ccb7c73d2c02)
|
||||
m_EditorVersion: 6000.0.29f1
|
||||
m_EditorVersionWithRevision: 6000.0.29f1 (9fafe5c9db65)
|
||||
|
Loading…
x
Reference in New Issue
Block a user