From 551101abeb1a997da1444ba4ed3059b4d878fb4a Mon Sep 17 00:00:00 2001
From: wangguan <wangguan@kt007.com>
Date: Tue, 17 Nov 2020 10:38:47 +0800
Subject: [PATCH] 拖拽点击UI后释放异常BUG 停止CommonDebugHelper输出

---
 Assets/Scripts/Guide/GuideCtrl.cs |  136 +++++++++++++++++++++++++++++++++++----------
 1 files changed, 106 insertions(+), 30 deletions(-)

diff --git a/Assets/Scripts/Guide/GuideCtrl.cs b/Assets/Scripts/Guide/GuideCtrl.cs
index 8d5cf15..c09fc1c 100644
--- a/Assets/Scripts/Guide/GuideCtrl.cs
+++ b/Assets/Scripts/Guide/GuideCtrl.cs
@@ -32,7 +32,9 @@
 
     private void Start()
     {
-        Init();
+        //int step = PlayerPrefs.GetInt("GemBattleGuide");
+
+        Init(0);
         EventCenter.Ins.Add((int)KTGMGemClient.EventType.AddCard, AddCard);
         EventCenter.Ins.Add((int)KTGMGemClient.EventType.CreateFireLv2, CreateFireLv2);
         EventCenter.Ins.Add((int)KTGMGemClient.EventType.ChargingEnd, ChargingEnd);
@@ -40,6 +42,7 @@
         EventCenter.Ins.Add((int)KTGMGemClient.EventType.GetOneTowerPos, GetOneTowerPos);
         EventCenter.Ins.Add((int)KTGMGemClient.EventType.CreateWaterLv1, CreateWaterLv1);
         EventCenter.Ins.Add((int)KTGMGemClient.EventType.SkillStep, SkillStep);
+        EventCenter.Ins.Add((int)KTGMGemClient.EventType.SkillRelease, SkillRelease);
         EventCenter.Ins.Add((int)KTGMGemClient.EventType.SkillReleaseDone, SkillReleaseDone);
 
     }
@@ -53,15 +56,34 @@
         EventCenter.Ins.Remove((int)KTGMGemClient.EventType.GetOneTowerPos, GetOneTowerPos);
         EventCenter.Ins.Remove((int)KTGMGemClient.EventType.CreateWaterLv1, CreateWaterLv1);
         EventCenter.Ins.Remove((int)KTGMGemClient.EventType.SkillStep, SkillStep);
+        EventCenter.Ins.Remove((int)KTGMGemClient.EventType.SkillRelease, SkillRelease);
         EventCenter.Ins.Remove((int)KTGMGemClient.EventType.SkillReleaseDone, SkillReleaseDone);
 
 
     }
-    public void Init()
+    public void Init(int step)
     {
         //Time.timeScale = 0;//游戏暂停,这样会导致协程停止了
-
         ChangeStep(GuideEnum.Step0);
+        GameConfig.CanOpenNewTower = false;
+        // switch (step)
+        // {
+        //     case 2:
+        //     case 3:
+        //         //生成两个火元素
+        //         break;
+        //     case 4:
+        //         //生成1个2级火元素,标记上阵位置
+
+        //         break;
+        //     case 5:
+        //         //生成2级火元素塔,第一关小怪出木元素小怪
+
+        //         break;
+
+        // }
+        // ChangeStep((GuideEnum)(step + 1));
+
     }
 
     /// <summary>
@@ -73,16 +95,16 @@
         allGuideDic.Add(GuideEnum.Step0, new string[] { GuideConfig.showWords[0], GuideConfig.showWords[1] });
         allGuideDic.Add(GuideEnum.Step1, new string[] { GuideConfig.showWords[2], GuideConfig.showWords[3] });
         allGuideDic.Add(GuideEnum.Step2, new string[] { GuideConfig.showWords[4], GuideConfig.showWords[5] });
-        allGuideDic.Add(GuideEnum.Step3, new string[] { GuideConfig.showWords[6], GuideConfig.showWords[7] });
-        allGuideDic.Add(GuideEnum.Step4, new string[] { GuideConfig.showWords[8] });
-        allGuideDic.Add(GuideEnum.Step5, new string[] { GuideConfig.showWords[9], GuideConfig.showWords[10] });
-        allGuideDic.Add(GuideEnum.Step6, new string[] { GuideConfig.showWords[11], GuideConfig.showWords[12] });
-        allGuideDic.Add(GuideEnum.Step7, new string[] { GuideConfig.showWords[13] });
-        allGuideDic.Add(GuideEnum.Step8, new string[] { GuideConfig.showWords[14], GuideConfig.showWords[15] });
-        allGuideDic.Add(GuideEnum.Step9, new string[] { GuideConfig.showWords[16], GuideConfig.showWords[17] });
-        allGuideDic.Add(GuideEnum.Step10, new string[] { GuideConfig.showWords[18], GuideConfig.showWords[19] });
-        allGuideDic.Add(GuideEnum.Step11, new string[] { GuideConfig.showWords[20], GuideConfig.showWords[21] });
-        allGuideDic.Add(GuideEnum.Step12, new string[] { GuideConfig.showWords[22], GuideConfig.showWords[23], GuideConfig.showWords[24] });
+        allGuideDic.Add(GuideEnum.Step3, new string[] { });
+        allGuideDic.Add(GuideEnum.Step4, new string[] { GuideConfig.showWords[6] });
+        allGuideDic.Add(GuideEnum.Step5, new string[] { GuideConfig.showWords[7], GuideConfig.showWords[8] });
+        allGuideDic.Add(GuideEnum.Step6, new string[] { GuideConfig.showWords[9], GuideConfig.showWords[10] });
+        allGuideDic.Add(GuideEnum.Step7, new string[] { GuideConfig.showWords[11] });
+        allGuideDic.Add(GuideEnum.Step8, new string[] { GuideConfig.showWords[12] });
+        allGuideDic.Add(GuideEnum.Step9, new string[] { });
+        allGuideDic.Add(GuideEnum.Step10, new string[] { GuideConfig.showWords[13], GuideConfig.showWords[14] });
+        allGuideDic.Add(GuideEnum.Step11, new string[] { GuideConfig.showWords[15] });
+        allGuideDic.Add(GuideEnum.Step12, new string[] { GuideConfig.showWords[16], GuideConfig.showWords[17] });
 
     }
 
@@ -154,6 +176,9 @@
         isShowing = true;
         if (currentIndex == -1)//初始化本步
         {
+            CommonDebugHelper.DebugError("第1步开始");
+            TDAA_SDKManager.Ins.Statistics(5);//埋点
+
             currentIndex = 0;
             needIndex = 2;
             panel.SetGuideUI(true);
@@ -168,6 +193,10 @@
     {
         if (currentIndex == -1)
         {
+            CommonDebugHelper.DebugError("第2步开始");
+            TDAA_SDKManager.Ins.Statistics(6);//埋点
+            TDAA_SDKManager.Ins.GuideStep(1);//埋点
+
             currentIndex = 0;
             needIndex = 2;
             panel.SetGuideUI(false);
@@ -211,6 +240,9 @@
         isShowing = true;
         if (currentIndex == -1)
         {
+            CommonDebugHelper.DebugError("第3步开始");
+            TDAA_SDKManager.Ins.GuideStep(2);//埋点
+
             currentIndex = 0;
             needIndex = 2;
             panel.Step2(currentIndex);
@@ -230,28 +262,32 @@
     {
         if (currentIndex == -1)
         {
+            CommonDebugHelper.DebugError("第4步开始");
+            TDAA_SDKManager.Ins.GuideStep(3);//埋点
+
             currentIndex = 0;
             needIndex = 2;
-            panel.Step3(currentIndex, allGuideDic[currentStep][currentIndex]);
+            panel.Step3(currentIndex, "");
         }
     }
 
     //开始拖拽
     public void BeginDrag()
     {
-        panel.Step3_2(allGuideDic[currentStep][1]);
+        panel.Step3_2("");
     }
 
     //结束推拽 没有合成,回到上一步
     public void EndDrag()
     {
-        panel.Step3(0, allGuideDic[currentStep][0]);
+        panel.Step3(0, "");
     }
 
     //合成了卡牌,开始下一步
     private void AddCard()
     {
         currentIndex = -1;
+        panel.StopShowDragPath(false);
         ChangeStep(GuideEnum.Step4);
     }
 
@@ -259,7 +295,11 @@
     {
         if (currentIndex == -1)
         {
+            CommonDebugHelper.DebugError("第5步开始");
+            TDAA_SDKManager.Ins.GuideStep(4);//埋点
+
             currentIndex = 0;
+            panel.StopShowDragPath(true);
             panel.Step4(currentIndex, allGuideDic[currentStep][currentIndex]);
         }
     }
@@ -268,6 +308,7 @@
     private void CreateFireLv2()
     {
         currentIndex = -1;
+        panel.StopShowDragPath(true);
         ChangeStep(GuideEnum.Step5);
     }
 
@@ -276,6 +317,9 @@
     {
         if (currentIndex == -1)
         {
+            CommonDebugHelper.DebugError("第6步开始");
+            TDAA_SDKManager.Ins.GuideStep(5);//埋点
+
             EventCenter.Ins.BroadCast((int)KTGMGemClient.EventType.CreateFirstWave);
             panel.Step5(currentIndex, "");
         }
@@ -301,6 +345,9 @@
     {
         if (currentIndex == -1)
         {
+            CommonDebugHelper.DebugError("第7步开始");
+            TDAA_SDKManager.Ins.GuideStep(6);//埋点
+
             panel.SetGuideUI(false);
             //恢复出怪
             EventCenter.Ins.BroadCast((int)KTGMGemClient.EventType.RestartWave);
@@ -330,9 +377,13 @@
     {
         if (currentIndex == -1)
         {
+            CommonDebugHelper.DebugError("第8步开始");
+            TDAA_SDKManager.Ins.GuideStep(7);//埋点
+
             currentIndex = 0;
             needIndex = 1;
             panel.SetGuideUI(false);
+            GameConfig.CanOpenNewTower = true;
 
             //等待解锁塔
             panel.Step7(currentIndex, allGuideDic[currentStep][currentIndex]);
@@ -353,31 +404,35 @@
         isShowing = true;
         if (currentIndex == -1)//初始化本步
         {
-            currentIndex = 0;
-            needIndex = 2;
-            panel.Step8();
+            CommonDebugHelper.DebugError("第9步开始");
+            TDAA_SDKManager.Ins.GuideStep(8);//埋点
+            GameConfig.CanOpenNewTower = false;
 
-            panel.StartShowWord(allGuideDic[currentStep][currentIndex], ShowWordCallBack);
-        }
-        else if (currentIndex == 1)
-        {
+            currentIndex = 0;
+            needIndex = 1;
+            panel.Step8();
             panel.StartShowWord(allGuideDic[currentStep][currentIndex], ShowWordCallBack);
         }
 
     }
 
+
+
     private void Step9()
     {
         if (currentIndex == -1)
         {
+            CommonDebugHelper.DebugError("第10步开始");
+            TDAA_SDKManager.Ins.GuideStep(9);//埋点
+
             currentIndex = 0;
             needIndex = 2;
             panel.SetGuideUI(false);
-            panel.Step9(allGuideDic[currentStep][currentIndex], currentIndex, Step9_1);
+            panel.Step9("", currentIndex, Step9_1);
         }
         else if (currentIndex == 1)
         {
-            panel.Step9(allGuideDic[currentStep][currentIndex], currentIndex, null);
+            panel.Step9("", currentIndex, null);
         }
     }
 
@@ -393,6 +448,7 @@
     private void CreateWaterLv1()
     {
         panel.CleanMask();
+        panel.StopShowDragPath(true);
         EventCenter.Ins.BroadCast((int)KTGMGemClient.EventType.CreateSecondWave);//生成第二波小怪
     }
 
@@ -407,6 +463,9 @@
         isShowing = true;
         if (currentIndex == -1)//初始化本步
         {
+            CommonDebugHelper.DebugError("第11步开始");
+            TDAA_SDKManager.Ins.GuideStep(10);//埋点
+
             currentIndex = 0;
             needIndex = 2;
             panel.SetGuideUI(true);
@@ -424,6 +483,9 @@
     {
         if (currentIndex == -1)
         {
+            CommonDebugHelper.DebugError("第12步开始");
+            TDAA_SDKManager.Ins.GuideStep(11);//埋点
+
             currentIndex = 0;
             needIndex = 1;
 
@@ -435,14 +497,18 @@
     //开始拖拽
     public void BeginDrag11_1()
     {
-
-        panel.Step11(1, allGuideDic[currentStep][1]);
+        panel.Step11(1, "");
     }
 
     //结束推拽 没有合成,回到上一步
     public void EndDrag11_1()
     {
         panel.Step11(0, allGuideDic[currentStep][0]);
+    }
+
+    private void SkillRelease()
+    {
+        panel.SkillRelease();
     }
 
 
@@ -457,12 +523,14 @@
         isShowing = true;
         if (currentIndex == -1)//初始化本步
         {
+            CommonDebugHelper.DebugError("第13步开始");
+            TDAA_SDKManager.Ins.GuideStep(12);//埋点
+
             currentIndex = 0;
-            needIndex = 3;
+            needIndex = 2;
             panel.Step12();
 
             panel.StartShowWord(allGuideDic[currentStep][currentIndex], ShowWordCallBack);
-
         }
         else
         {
@@ -473,7 +541,15 @@
     private void Finish()
     {
         UnityEngine.Debug.Log("新手指导已经完成了");
-        gameObject.SetActive(false);
+        TDAA_SDKManager.Ins.GuideStep(13);//埋点
+
+        GameConfig.CanOpenNewTower = true;
+        GameConfig.CanBuyNewTower = true;
+
+        EventCenter.Ins.BroadCast((int)KTGMGemClient.EventType.GuideFinish);
+        PlayerPrefs.SetInt("GemBattleGuide", 1);
+        Destroy(gameObject);
+        //gameObject.SetActive(false);
     }
 
     #endregion

--
Gitblit v1.9.1