summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorchai <chaifix@163.com>2021-09-11 20:24:19 +0800
committerchai <chaifix@163.com>2021-09-11 20:24:19 +0800
commit9c6f901cfe2826ad6185bb73bf4712bdcf861732 (patch)
treea38d721575652b7c963475af8a5a6dd6a28ff171
parenta9d460f503f4d09a4c0e00164c6ca1ba3f8725dd (diff)
*misc
-rw-r--r--Assets/Bundle/Unit/PC/Erika/AnimationData/Attack_Jump_to_Air.asset8
-rw-r--r--Assets/Scenes/Demo/AnimationEditScene.unity3
-rw-r--r--Assets/Scripts/Test 1/TestCamera.cs3
3 files changed, 8 insertions, 6 deletions
diff --git a/Assets/Bundle/Unit/PC/Erika/AnimationData/Attack_Jump_to_Air.asset b/Assets/Bundle/Unit/PC/Erika/AnimationData/Attack_Jump_to_Air.asset
index fb1d508b..faa8def9 100644
--- a/Assets/Bundle/Unit/PC/Erika/AnimationData/Attack_Jump_to_Air.asset
+++ b/Assets/Bundle/Unit/PC/Erika/AnimationData/Attack_Jump_to_Air.asset
@@ -58,12 +58,12 @@ MonoBehaviour:
frames:
- frame: 11
active: 1
- position: {x: 0.66, y: 1.2, z: 0}
- size: {x: 1.38, y: 2.16, z: 1}
+ position: {x: 0.49, y: 1.2, z: 0}
+ size: {x: 2.71, y: 2.16, z: 1}
- frame: 24
active: 1
- position: {x: 0.74, y: 0.91, z: 0}
- size: {x: 1.62, y: 3.11, z: 1}
+ position: {x: 0.5, y: 0.91, z: 0}
+ size: {x: 2.77, y: 4.65, z: 1}
throwBoxes: []
blockBoxes: []
defendBoxes: []
diff --git a/Assets/Scenes/Demo/AnimationEditScene.unity b/Assets/Scenes/Demo/AnimationEditScene.unity
index 6282b4e9..b8632529 100644
--- a/Assets/Scenes/Demo/AnimationEditScene.unity
+++ b/Assets/Scenes/Demo/AnimationEditScene.unity
@@ -52995,7 +52995,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 861741897}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: 3.96, y: 1.48, z: -7.5}
+ m_LocalPosition: {x: 0, y: 1.48, z: -7.5}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
@@ -53073,6 +53073,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 43084247c2f8b3743845be21c5d86ab5, type: 3}
m_Name:
m_EditorClassIdentifier:
+ offset: {x: 0, y: 0.5, z: 0}
--- !u!1 &1036440312
GameObject:
m_ObjectHideFlags: 0
diff --git a/Assets/Scripts/Test 1/TestCamera.cs b/Assets/Scripts/Test 1/TestCamera.cs
index 6a6795bd..340a2eb5 100644
--- a/Assets/Scripts/Test 1/TestCamera.cs
+++ b/Assets/Scripts/Test 1/TestCamera.cs
@@ -4,6 +4,7 @@ using UnityEngine;
public class TestCamera : MonoBehaviour
{
+ public Vector3 offset = Vector3.zero;
// Start is called before the first frame update
void Start()
@@ -21,6 +22,6 @@ public class TestCamera : MonoBehaviour
Vector3 pos = transform.position;
pos.x = TestErika.Instance.erika.unitController.GetComponent<UnitController>().center.x;
pos.y = TestErika.Instance.erika.unitController.GetComponent<UnitController>().center.y;
- transform.position = pos;
+ transform.position = pos + offset;
}
}