add
This commit is contained in:
parent
a8e7ff771c
commit
a98c8de2eb
@ -737,10 +737,10 @@ MonoBehaviour:
|
|||||||
Type: 0
|
Type: 0
|
||||||
paths:
|
paths:
|
||||||
- pathPoints:
|
- pathPoints:
|
||||||
- {fileID: 6047004}
|
- {fileID: 347020761}
|
||||||
- {fileID: 44899767}
|
- {fileID: 44899767}
|
||||||
- pathPoints:
|
- pathPoints:
|
||||||
- {fileID: 866420153}
|
- {fileID: 347020761}
|
||||||
- {fileID: 44899767}
|
- {fileID: 44899767}
|
||||||
pathsNeedTimer: 30
|
pathsNeedTimer: 30
|
||||||
fishingNeedTimer: 30
|
fishingNeedTimer: 30
|
||||||
@ -2011,7 +2011,7 @@ Transform:
|
|||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
m_GameObject: {fileID: 347020760}
|
m_GameObject: {fileID: 347020760}
|
||||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
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_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
m_ConstrainProportionsScale: 0
|
m_ConstrainProportionsScale: 0
|
||||||
m_Children: []
|
m_Children: []
|
||||||
|
@ -533,19 +533,10 @@ MonoBehaviour:
|
|||||||
Type: 0
|
Type: 0
|
||||||
paths:
|
paths:
|
||||||
- pathPoints:
|
- pathPoints:
|
||||||
- {fileID: 78513529}
|
- {fileID: 423906224}
|
||||||
- {fileID: 1127531261}
|
|
||||||
- {fileID: 2043484084}
|
|
||||||
- {fileID: 1863374491}
|
|
||||||
- {fileID: 323654385}
|
|
||||||
- {fileID: 2079495230}
|
- {fileID: 2079495230}
|
||||||
- pathPoints:
|
- pathPoints:
|
||||||
- {fileID: 964032477}
|
- {fileID: 423906224}
|
||||||
- {fileID: 1935800548}
|
|
||||||
- {fileID: 258516099}
|
|
||||||
- {fileID: 1004232774}
|
|
||||||
- {fileID: 2133241629}
|
|
||||||
- {fileID: 2024839349}
|
|
||||||
- {fileID: 2079495230}
|
- {fileID: 2079495230}
|
||||||
pathsNeedTimer: 30
|
pathsNeedTimer: 30
|
||||||
fishingNeedTimer: 30
|
fishingNeedTimer: 30
|
||||||
@ -2400,7 +2391,7 @@ Transform:
|
|||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
m_GameObject: {fileID: 423906223}
|
m_GameObject: {fileID: 423906223}
|
||||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
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_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
m_ConstrainProportionsScale: 0
|
m_ConstrainProportionsScale: 0
|
||||||
m_Children: []
|
m_Children: []
|
||||||
@ -3166,20 +3157,10 @@ MonoBehaviour:
|
|||||||
Type: 0
|
Type: 0
|
||||||
paths:
|
paths:
|
||||||
- pathPoints:
|
- pathPoints:
|
||||||
- {fileID: 1752358036}
|
- {fileID: 1734571546}
|
||||||
- {fileID: 1082195120}
|
|
||||||
- {fileID: 2147345441}
|
|
||||||
- {fileID: 1445626387}
|
|
||||||
- {fileID: 339905144}
|
|
||||||
- {fileID: 736711439}
|
- {fileID: 736711439}
|
||||||
- pathPoints:
|
- pathPoints:
|
||||||
- {fileID: 211894328}
|
- {fileID: 1734571546}
|
||||||
- {fileID: 1607578808}
|
|
||||||
- {fileID: 207042482}
|
|
||||||
- {fileID: 56093340}
|
|
||||||
- {fileID: 1086483495}
|
|
||||||
- {fileID: 258008391}
|
|
||||||
- {fileID: 1576490689}
|
|
||||||
- {fileID: 736711439}
|
- {fileID: 736711439}
|
||||||
pathsNeedTimer: 30
|
pathsNeedTimer: 30
|
||||||
fishingNeedTimer: 30
|
fishingNeedTimer: 30
|
||||||
@ -4415,7 +4396,7 @@ Transform:
|
|||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
m_GameObject: {fileID: 964032476}
|
m_GameObject: {fileID: 964032476}
|
||||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
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_LocalScale: {x: 0.5, y: 0.5, z: 0.5}
|
||||||
m_ConstrainProportionsScale: 1
|
m_ConstrainProportionsScale: 1
|
||||||
m_Children: []
|
m_Children: []
|
||||||
@ -4919,20 +4900,10 @@ MonoBehaviour:
|
|||||||
Type: 0
|
Type: 0
|
||||||
paths:
|
paths:
|
||||||
- pathPoints:
|
- pathPoints:
|
||||||
- {fileID: 199805572}
|
- {fileID: 1067588907}
|
||||||
- {fileID: 827362920}
|
|
||||||
- {fileID: 1332269050}
|
|
||||||
- {fileID: 1626887113}
|
|
||||||
- {fileID: 729948191}
|
|
||||||
- {fileID: 1392929798}
|
- {fileID: 1392929798}
|
||||||
- pathPoints:
|
- pathPoints:
|
||||||
- {fileID: 914569106}
|
- {fileID: 1067588907}
|
||||||
- {fileID: 499830626}
|
|
||||||
- {fileID: 2063902009}
|
|
||||||
- {fileID: 1585686091}
|
|
||||||
- {fileID: 1328318913}
|
|
||||||
- {fileID: 2034494837}
|
|
||||||
- {fileID: 318175897}
|
|
||||||
- {fileID: 1392929798}
|
- {fileID: 1392929798}
|
||||||
pathsNeedTimer: 30
|
pathsNeedTimer: 30
|
||||||
fishingNeedTimer: 30
|
fishingNeedTimer: 30
|
||||||
@ -4968,7 +4939,7 @@ Transform:
|
|||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
m_GameObject: {fileID: 1067588906}
|
m_GameObject: {fileID: 1067588906}
|
||||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
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_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
m_ConstrainProportionsScale: 0
|
m_ConstrainProportionsScale: 0
|
||||||
m_Children: []
|
m_Children: []
|
||||||
@ -7938,7 +7909,7 @@ Transform:
|
|||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
m_GameObject: {fileID: 1734571545}
|
m_GameObject: {fileID: 1734571545}
|
||||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
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_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
m_ConstrainProportionsScale: 0
|
m_ConstrainProportionsScale: 0
|
||||||
m_Children: []
|
m_Children: []
|
||||||
|
@ -44,19 +44,19 @@ public class Cinemachine_2dCon : MonoBehaviour
|
|||||||
}
|
}
|
||||||
|
|
||||||
#if UNITY_EDITOR || UNITY_STANDALONE
|
#if UNITY_EDITOR || UNITY_STANDALONE
|
||||||
// 桌面端:鼠标按下时
|
//// 桌面端:鼠标按下时
|
||||||
if (Input.GetMouseButtonDown(0))
|
//if (Input.GetMouseButtonDown(0))
|
||||||
{
|
//{
|
||||||
m_fingerDown = true;
|
// m_fingerDown = true;
|
||||||
m_oneFingerDragStartPos = GetWorldPos(Input.mousePosition); // 获取鼠标按下的起始位置
|
// m_oneFingerDragStartPos = GetWorldPos(Input.mousePosition); // 获取鼠标按下的起始位置
|
||||||
}
|
//}
|
||||||
|
|
||||||
// 桌面端:鼠标松开时
|
//// 桌面端:鼠标松开时
|
||||||
if (Input.GetMouseButtonUp(0))
|
//if (Input.GetMouseButtonUp(0))
|
||||||
{
|
//{
|
||||||
m_fingerDown = false;
|
// m_fingerDown = false;
|
||||||
m_twoFingerLastDistance = -1;
|
// m_twoFingerLastDistance = -1;
|
||||||
}
|
//}
|
||||||
|
|
||||||
// 处理鼠标拖动
|
// 处理鼠标拖动
|
||||||
//if (m_fingerDown)
|
//if (m_fingerDown)
|
||||||
@ -108,12 +108,12 @@ public class Cinemachine_2dCon : MonoBehaviour
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
private void HandleFingerDragMove(Vector2 fingerPos)
|
private void HandleFingerDragMove(Vector2 fingerPos)
|
||||||
{
|
{
|
||||||
//滑动差
|
////滑动差
|
||||||
Vector3 cha = m_oneFingerDragStartPos - GetWorldPos(fingerPos);
|
//Vector3 cha = m_oneFingerDragStartPos - GetWorldPos(fingerPos);
|
||||||
Vector3 newP = m_cam.transform.position;
|
//Vector3 newP = m_cam.transform.position;
|
||||||
newP.x = newP.x + cha.x;
|
//newP.x = newP.x + cha.x;
|
||||||
newP.y = newP.y + cha.y;
|
//newP.y = newP.y + cha.y;
|
||||||
m_selfTrans.position = newP;
|
//m_selfTrans.position = newP;
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
@ -33,8 +33,6 @@ public class SceneGuodu : MonoBehaviour
|
|||||||
mask.transform.GetComponent<CircleDissolveEffect>().isTransitioning = true;
|
mask.transform.GetComponent<CircleDissolveEffect>().isTransitioning = true;
|
||||||
}
|
}
|
||||||
is_lock = false;
|
is_lock = false;
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
public async void SlideInAndLoadScene(string sceneName)
|
public async void SlideInAndLoadScene(string sceneName)
|
||||||
{
|
{
|
||||||
|
@ -134,7 +134,7 @@ public class landContorl_jinsha : MonoBehaviour
|
|||||||
|
|
||||||
private void OnMouseDown()
|
private void OnMouseDown()
|
||||||
{
|
{
|
||||||
OnClick();
|
//OnClick();
|
||||||
}
|
}
|
||||||
private void OnTouch()
|
private void OnTouch()
|
||||||
{
|
{
|
||||||
|
Loading…
Reference in New Issue
Block a user