From a98c8de2eb8e022e8095269121e14253148fd97a Mon Sep 17 00:00:00 2001 From: shurongsen <1799096798@qq.com> Date: Fri, 8 Nov 2024 00:41:10 +0800 Subject: [PATCH] add --- .../cultivation_gem_island_slices.unity | 6 +-- .../Scenes/cultivation_gold_coin_Island.unity | 49 ++++--------------- .../communal/camera/Cinemachine_2dCon.cs | 36 +++++++------- .../Assets/script/JumpScene/SceneGuodu.cs | 2 - .../landContorl_jinsha.cs | 2 +- 5 files changed, 32 insertions(+), 63 deletions(-) diff --git a/meng_yao/Assets/Scenes/cultivation_gem_island_slices.unity b/meng_yao/Assets/Scenes/cultivation_gem_island_slices.unity index 268576504..8fad4b914 100644 --- a/meng_yao/Assets/Scenes/cultivation_gem_island_slices.unity +++ b/meng_yao/Assets/Scenes/cultivation_gem_island_slices.unity @@ -737,10 +737,10 @@ MonoBehaviour: Type: 0 paths: - pathPoints: - - {fileID: 6047004} + - {fileID: 347020761} - {fileID: 44899767} - pathPoints: - - {fileID: 866420153} + - {fileID: 347020761} - {fileID: 44899767} pathsNeedTimer: 30 fishingNeedTimer: 30 @@ -2011,7 +2011,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 347020760} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 5.11, y: -2.37, z: 0} + m_LocalPosition: {x: 0.57, y: -2.68, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] diff --git a/meng_yao/Assets/Scenes/cultivation_gold_coin_Island.unity b/meng_yao/Assets/Scenes/cultivation_gold_coin_Island.unity index 2443e48b7..b2c021bc6 100644 --- a/meng_yao/Assets/Scenes/cultivation_gold_coin_Island.unity +++ b/meng_yao/Assets/Scenes/cultivation_gold_coin_Island.unity @@ -533,19 +533,10 @@ MonoBehaviour: Type: 0 paths: - pathPoints: - - {fileID: 78513529} - - {fileID: 1127531261} - - {fileID: 2043484084} - - {fileID: 1863374491} - - {fileID: 323654385} + - {fileID: 423906224} - {fileID: 2079495230} - pathPoints: - - {fileID: 964032477} - - {fileID: 1935800548} - - {fileID: 258516099} - - {fileID: 1004232774} - - {fileID: 2133241629} - - {fileID: 2024839349} + - {fileID: 423906224} - {fileID: 2079495230} pathsNeedTimer: 30 fishingNeedTimer: 30 @@ -2400,7 +2391,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 423906223} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -2.8899994, y: -2.3699985, z: 0} + m_LocalPosition: {x: 4.93, y: -1.28, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -3166,20 +3157,10 @@ MonoBehaviour: Type: 0 paths: - pathPoints: - - {fileID: 1752358036} - - {fileID: 1082195120} - - {fileID: 2147345441} - - {fileID: 1445626387} - - {fileID: 339905144} + - {fileID: 1734571546} - {fileID: 736711439} - pathPoints: - - {fileID: 211894328} - - {fileID: 1607578808} - - {fileID: 207042482} - - {fileID: 56093340} - - {fileID: 1086483495} - - {fileID: 258008391} - - {fileID: 1576490689} + - {fileID: 1734571546} - {fileID: 736711439} pathsNeedTimer: 30 fishingNeedTimer: 30 @@ -4415,7 +4396,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 964032476} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -2.29, y: -2.97, z: 0} + m_LocalPosition: {x: 3.05, y: -2.48, z: 0} m_LocalScale: {x: 0.5, y: 0.5, z: 0.5} m_ConstrainProportionsScale: 1 m_Children: [] @@ -4919,20 +4900,10 @@ MonoBehaviour: Type: 0 paths: - pathPoints: - - {fileID: 199805572} - - {fileID: 827362920} - - {fileID: 1332269050} - - {fileID: 1626887113} - - {fileID: 729948191} + - {fileID: 1067588907} - {fileID: 1392929798} - pathPoints: - - {fileID: 914569106} - - {fileID: 499830626} - - {fileID: 2063902009} - - {fileID: 1585686091} - - {fileID: 1328318913} - - {fileID: 2034494837} - - {fileID: 318175897} + - {fileID: 1067588907} - {fileID: 1392929798} pathsNeedTimer: 30 fishingNeedTimer: 30 @@ -4968,7 +4939,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1067588906} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -2.0899997, y: -1.9799999, z: 0} + m_LocalPosition: {x: 3.78, y: -1.98, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -7938,7 +7909,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1734571545} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -1.46, y: -2.3580003, z: 0} + m_LocalPosition: {x: 1.87, y: -1.09, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] diff --git a/meng_yao/Assets/communal/camera/Cinemachine_2dCon.cs b/meng_yao/Assets/communal/camera/Cinemachine_2dCon.cs index 3ea4cd780..fbc9c44ef 100644 --- a/meng_yao/Assets/communal/camera/Cinemachine_2dCon.cs +++ b/meng_yao/Assets/communal/camera/Cinemachine_2dCon.cs @@ -44,19 +44,19 @@ public class Cinemachine_2dCon : MonoBehaviour } #if UNITY_EDITOR || UNITY_STANDALONE - // 桌面端：鼠标按下时 - if (Input.GetMouseButtonDown(0)) - { - m_fingerDown = true; - m_oneFingerDragStartPos = GetWorldPos(Input.mousePosition); // 获取鼠标按下的起始位置 - } + //// 桌面端：鼠标按下时 + //if (Input.GetMouseButtonDown(0)) + //{ + // m_fingerDown = true; + // m_oneFingerDragStartPos = GetWorldPos(Input.mousePosition); // 获取鼠标按下的起始位置 + //} - // 桌面端：鼠标松开时 - if (Input.GetMouseButtonUp(0)) - { - m_fingerDown = false; - m_twoFingerLastDistance = -1; - } + //// 桌面端：鼠标松开时 + //if (Input.GetMouseButtonUp(0)) + //{ + // m_fingerDown = false; + // m_twoFingerLastDistance = -1; + //} // 处理鼠标拖动 //if (m_fingerDown) @@ -108,12 +108,12 @@ public class Cinemachine_2dCon : MonoBehaviour /// private void HandleFingerDragMove(Vector2 fingerPos) { - //滑动差 - Vector3 cha = m_oneFingerDragStartPos - GetWorldPos(fingerPos); - Vector3 newP = m_cam.transform.position; - newP.x = newP.x + cha.x; - newP.y = newP.y + cha.y; - m_selfTrans.position = newP; + ////滑动差 + //Vector3 cha = m_oneFingerDragStartPos - GetWorldPos(fingerPos); + //Vector3 newP = m_cam.transform.position; + //newP.x = newP.x + cha.x; + //newP.y = newP.y + cha.y; + //m_selfTrans.position = newP; } /// diff --git a/meng_yao/Assets/script/JumpScene/SceneGuodu.cs b/meng_yao/Assets/script/JumpScene/SceneGuodu.cs index e3d829cec..683096133 100644 --- a/meng_yao/Assets/script/JumpScene/SceneGuodu.cs +++ b/meng_yao/Assets/script/JumpScene/SceneGuodu.cs @@ -33,8 +33,6 @@ public class SceneGuodu : MonoBehaviour mask.transform.GetComponent().isTransitioning = true; } is_lock = false; - - } public async void SlideInAndLoadScene(string sceneName) { diff --git a/meng_yao/Assets/script/cultivation_gold_gold_Island/landContorl_jinsha.cs b/meng_yao/Assets/script/cultivation_gold_gold_Island/landContorl_jinsha.cs index a4100e919..b006800a8 100644 --- a/meng_yao/Assets/script/cultivation_gold_gold_Island/landContorl_jinsha.cs +++ b/meng_yao/Assets/script/cultivation_gold_gold_Island/landContorl_jinsha.cs @@ -134,7 +134,7 @@ public class landContorl_jinsha : MonoBehaviour private void OnMouseDown() { - OnClick(); + //OnClick(); } private void OnTouch() {