diff --git a/meng_yao/Assets/Scenes/loading.unity b/meng_yao/Assets/Scenes/loading.unity index 37df1f0e5..4d9880b71 100644 --- a/meng_yao/Assets/Scenes/loading.unity +++ b/meng_yao/Assets/Scenes/loading.unity @@ -1226,6 +1226,7 @@ MonoBehaviour: sendCode: {fileID: 0} checkCode: {fileID: 0} register: {fileID: 0} + playerInfo: {fileID: 0} --- !u!1 &1352207951 GameObject: m_ObjectHideFlags: 0 diff --git a/meng_yao/Assets/Scenes/scene_Main.unity b/meng_yao/Assets/Scenes/scene_Main.unity index 8f476d444..b54e7dd1e 100644 --- a/meng_yao/Assets/Scenes/scene_Main.unity +++ b/meng_yao/Assets/Scenes/scene_Main.unity @@ -166,7 +166,6 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 187355377} - - {fileID: 219173395} - {fileID: 674598570} - {fileID: 215758796} m_Father: {fileID: 1599782375} @@ -17872,7 +17871,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 41994} - m_RootOrder: 3 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &215758797 SpriteRenderer: @@ -18327,90 +18326,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 218830870} m_CullTransparentMesh: 1 ---- !u!1 &219173394 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 219173395} - - component: {fileID: 219173396} - m_Layer: 0 - m_Name: bg - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!4 &219173395 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 219173394} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -12.74, y: 0, z: 2} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 41994} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &219173396 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 219173394} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 0 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 0 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_Sprite: {fileID: 21300000, guid: d9e6da7b302c6f34889577e2e31d8f1d, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 10.8, y: 19.2} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 --- !u!1 &221454624 GameObject: m_ObjectHideFlags: 0 @@ -30829,7 +30744,7 @@ PrefabInstance: objectReference: {fileID: 1553952863} - target: {fileID: 5988705925535344088, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_IsActive - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7017397590614610888, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target @@ -57047,12 +56962,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 674598569} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 3.78, z: 2} + m_LocalPosition: {x: 0, y: 3.71, z: 2} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 41994} - m_RootOrder: 2 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &674598571 SpriteRenderer: diff --git a/meng_yao/Assets/script/JumpScene/DepagodaBtn.cs b/meng_yao/Assets/script/JumpScene/DepagodaBtn.cs index 1fe80122a..7d9d9c871 100644 --- a/meng_yao/Assets/script/JumpScene/DepagodaBtn.cs +++ b/meng_yao/Assets/script/JumpScene/DepagodaBtn.cs @@ -43,4 +43,9 @@ public class DepagodaBtn : MonoBehaviour gotoscene.SetActive(true); nowScene.SetActive(false); } + + private void OnDestroy() + { + OnSceneMouseBTN -= JUmpScem; + } } diff --git a/meng_yao/Assets/script/JumpScene/DuanzaoBtn.cs b/meng_yao/Assets/script/JumpScene/DuanzaoBtn.cs index 708238f39..f073857cd 100644 --- a/meng_yao/Assets/script/JumpScene/DuanzaoBtn.cs +++ b/meng_yao/Assets/script/JumpScene/DuanzaoBtn.cs @@ -18,7 +18,6 @@ public class DuanzaoBtn : MonoBehaviour private void OnMouseDown() { - //SceneManager.LoadScene(JumpScene.cultivation_Jinsha_mine_slices); transform.DOScale(new Vector3(0.5f, 0.5f, 0.5f), 0.3f).SetEase(Ease.OutBack); StartCoroutine("Magnify"); } @@ -35,9 +34,12 @@ public class DuanzaoBtn : MonoBehaviour void JUmpScem() { - //Virtual_CameraManager.Instance.SwitchToCamera(1); gotoscene.SetActive(true); nowScene.SetActive(false); - //SceneManager.LoadScene(JumpScene.scene_forging); + } + + private void OnDestroy() + { + OnSceneMouseBTN -= JUmpScem; } } diff --git a/meng_yao/Assets/script/JumpScene/GameSceneBtn.cs b/meng_yao/Assets/script/JumpScene/GameSceneBtn.cs index 9b70274b4..04d2bbe0e 100644 --- a/meng_yao/Assets/script/JumpScene/GameSceneBtn.cs +++ b/meng_yao/Assets/script/JumpScene/GameSceneBtn.cs @@ -55,5 +55,8 @@ public class GameSceneBtn : MonoBehaviour } } - + private void OnDestroy() + { + OnSceneMouseBTN -= JUmpScem; + } } diff --git a/meng_yao/Assets/script/JumpScene/JinBidaoBtn.cs b/meng_yao/Assets/script/JumpScene/JinBidaoBtn.cs index 3e35fd6bf..70d379d9c 100644 --- a/meng_yao/Assets/script/JumpScene/JinBidaoBtn.cs +++ b/meng_yao/Assets/script/JumpScene/JinBidaoBtn.cs @@ -39,4 +39,9 @@ public class JinBidaoBtn : MonoBehaviour nowScene.SetActive(false); //SceneManager.LoadScene(JumpScene.cultivation_gold_coin_Island); } + + private void OnDestroy() + { + OnSceneMouseBTN -= JUmpScem; + } } diff --git a/meng_yao/Assets/script/JumpScene/LandBtn.cs b/meng_yao/Assets/script/JumpScene/LandBtn.cs index d7aae09da..811887521 100644 --- a/meng_yao/Assets/script/JumpScene/LandBtn.cs +++ b/meng_yao/Assets/script/JumpScene/LandBtn.cs @@ -37,4 +37,9 @@ public class LandBtn : MonoBehaviour gotoscene.SetActive(true); nowScene.SetActive(false); } + + private void OnDestroy() + { + OnSceneMouseBTN -= JUmpScem; + } } diff --git a/meng_yao/Assets/script/JumpScene/ZuanshiBtn.cs b/meng_yao/Assets/script/JumpScene/ZuanshiBtn.cs index 6372c1e44..86abad91d 100644 --- a/meng_yao/Assets/script/JumpScene/ZuanshiBtn.cs +++ b/meng_yao/Assets/script/JumpScene/ZuanshiBtn.cs @@ -40,4 +40,9 @@ public class ZuanshiBtn : MonoBehaviour nowScene.SetActive(false); //SceneManager.LoadScene(JumpScene.scene_baoshidao); } + + private void OnDestroy() + { + OnSceneMouseBTN -= JUmpScem; + } } diff --git a/meng_yao/Assets/script/Scene_baoshikuang/Baoshikuang_BTn.cs b/meng_yao/Assets/script/Scene_baoshikuang/Baoshikuang_BTn.cs index cc656d758..725f8b7fd 100644 --- a/meng_yao/Assets/script/Scene_baoshikuang/Baoshikuang_BTn.cs +++ b/meng_yao/Assets/script/Scene_baoshikuang/Baoshikuang_BTn.cs @@ -38,4 +38,9 @@ public class Baoshikuang_BTn : MonoBehaviour nowScene.SetActive(false); //SceneManager.LoadScene(JumpScene.cultivation_gold_coin_Island); } + + private void OnDestroy() + { + OnSceneMouseBTN -= JUmpScem; + } } diff --git a/meng_yao/Assets/script/scene_jinshakuang/Jinsha_BTn.cs b/meng_yao/Assets/script/scene_jinshakuang/Jinsha_BTn.cs index c86947659..23008a2bd 100644 --- a/meng_yao/Assets/script/scene_jinshakuang/Jinsha_BTn.cs +++ b/meng_yao/Assets/script/scene_jinshakuang/Jinsha_BTn.cs @@ -38,4 +38,9 @@ public class Jinsha_BTn : MonoBehaviour nowScene.SetActive(false); //SceneManager.LoadScene(JumpScene.cultivation_gold_coin_Island); } + + private void OnDestroy() + { + OnSceneMouseBTN -= JUmpScem; + } }