Sfoglia il codice sorgente

关闭教程星棒动画 使用Scale

LiuQilin 7 anni fa
parent
commit
9a7edd97b2

+ 0 - 25
Assets/Plugins/Alipay/IOS/AlipaySDK.framework.meta

@@ -1,25 +0,0 @@
-fileFormatVersion: 2
-guid: 786969225a8dc4e0eb4e00a91e7e1501
-folderAsset: yes
-timeCreated: 1502698138
-licenseType: Pro
-PluginImporter:
-  serializedVersion: 1
-  iconMap: {}
-  executionOrder: {}
-  isPreloaded: 0
-  isOverridable: 0
-  platformData:
-    Any:
-      enabled: 0
-      settings: {}
-    Editor:
-      enabled: 0
-      settings:
-        DefaultValueInitialized: true
-    iOS:
-      enabled: 1
-      settings: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 107 - 2
Assets/Resource/Logo.unity

@@ -585,6 +585,110 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d995bd93e747b4143812c28df116ed09, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+--- !u!1001 &1822613930
+Prefab:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_RootOrder
+      value: 4
+      objectReference: {fileID: 0}
+    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_SizeDelta.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_SizeDelta.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_AnchorMin.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_AnchorMax.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_Pivot.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_Pivot.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1948781497737682, guid: 8647d80b558fa724a84d05f9e6aee9bc, type: 2}
+      propertyPath: m_Name
+      value: Canvas (1)
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_ParentPrefab: {fileID: 100100000, guid: 8647d80b558fa724a84d05f9e6aee9bc, type: 2}
+  m_IsPrefabParent: 0
 --- !u!1 &1833966243
 GameObject:
   m_ObjectHideFlags: 0
@@ -613,9 +717,10 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   AuditEdition: 1
-  DebugMode: 0
+  DebugMode: 1
   CatchException: 1
-  DebugModeGo: {fileID: 0}
+  DebugModeGo: {fileID: 1264531325540048, guid: b22fd2d9abc702d43ac62a412537d4e9,
+    type: 2}
 --- !u!4 &1833966245
 Transform:
   m_ObjectHideFlags: 0

+ 24 - 4
Assets/Resource/Prefab/PrefabUI/Canvas.prefab

@@ -942,7 +942,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!1 &1053465316034782
 GameObject:
   m_ObjectHideFlags: 1
@@ -7567,6 +7567,7 @@ GameObject:
   - component: {fileID: 222346420980739554}
   - component: {fileID: 114454570523689572}
   - component: {fileID: 95514212100079890}
+  - component: {fileID: 223356781789287112}
   m_Layer: 5
   m_Name: N_ArrowIcon
   m_TagString: Untagged
@@ -18228,7 +18229,7 @@ Animator:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1407908126076172}
-  m_Enabled: 1
+  m_Enabled: 0
   m_Avatar: {fileID: 0}
   m_Controller: {fileID: 9100000, guid: dbd993449db28874bbc8c74f53b42448, type: 2}
   m_CullingMode: 0
@@ -64953,6 +64954,25 @@ CanvasRenderer:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1759871904516498}
+--- !u!223 &223356781789287112
+Canvas:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1407908126076172}
+  m_Enabled: 1
+  serializedVersion: 2
+  m_RenderMode: 2
+  m_Camera: {fileID: 0}
+  m_PlaneDistance: 100
+  m_PixelPerfect: 0
+  m_ReceivesEvents: 1
+  m_OverrideSorting: 1
+  m_OverridePixelPerfect: 0
+  m_SortingBucketNormalizedSize: 0
+  m_SortingLayerID: 0
+  m_SortingOrder: 1
+  m_TargetDisplay: 0
 --- !u!223 &223654869320677392
 Canvas:
   m_ObjectHideFlags: 1
@@ -66177,9 +66197,9 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 194.05, y: -19.719627}
+  m_AnchoredPosition: {x: 194.05006, y: -10.000008}
   m_SizeDelta: {x: 368.1, y: 19.439253}
-  m_Pivot: {x: 0.5, y: 0.5}
+  m_Pivot: {x: 0.5, y: 0.99999964}
 --- !u!224 &224050543774403100
 RectTransform:
   m_ObjectHideFlags: 1

+ 5 - 0
Assets/Script/Manage/DebugManager.cs

@@ -104,6 +104,11 @@ public class DebugManager : MonoBehaviour
         TutorialManager.VisitTutorial = true;
     }
 
+    public static void ResetMemoryGameTutorial()
+    {
+        TutorialManager.memoryMinigameTutorial = true;
+        TutorialManager.MemoryMinigameTutorial = true;
+    }
 
     public static void TryCatch(Action tryAction, Action catchAction)
     {

+ 96 - 9
Assets/Script/Manage/HttpManager.cs

@@ -178,23 +178,111 @@ public class HttpManager : Regist
 
     public void Awake()
     {
-        //GetConfigBySerialNumber("1801134288353834791", data => Debug.Log(data.ToJson()));
+        //URLRequestData urlData = new URLRequestData();
+        //urlData.Add("u", "Custom0");
+        //URLRequest.CreateURLRequest(false, LoginURL, urlData, data => Debug.Log(data.ToJson()), URLRequest.Method.POST);
+
+        //urlData = new URLRequestData();
+        //urlData.Add("u", "Custom1");
+        //URLRequest.CreateURLRequest(false, LoginURL, urlData, data => Debug.Log(data.ToJson()), URLRequest.Method.POST);
+
+        //urlData = new URLRequestData();
+        //urlData.Add("u", "Custom2");
+        //URLRequest.CreateURLRequest(false, LoginURL, urlData, data => Debug.Log(data.ToJson()), URLRequest.Method.POST);
+
+        //urlData = new URLRequestData();
+        //urlData.Add("u", "Custom3");
+        //URLRequest.CreateURLRequest(false, LoginURL, urlData, data => Debug.Log(data.ToJson()), URLRequest.Method.POST);
 
+        //URLRequestData urlData = new URLRequestData();
+        //urlData.Add("u", "Custom4");
+        //URLRequest.CreateURLRequest(false, LoginURL, urlData, data => Debug.Log(data.ToJson()), URLRequest.Method.POST);
+
+        //string number = "1803307948853454506";
         //GetConfigByID
         //(
-        //    "rr1WP4",
+        //    number,
         //    data =>
         //    {
-        //        //XmlDocument document = new XmlDocument();
-        //        string str = data["l"].ToString().Replace("HOCen5", "rr1WP4");
+        //        Debug.Log(data.ToJson());
+        //        string str = data["l"].ToString().Replace("<Version value=\"20\" />", "<Version value=\"16\" />");
         //        Debug.Log(str);
 
-        //        //document.LoadXml(data["l"].ToString());
-        //        //Debug.Log(document);
+        //        URLRequestData urlData = new URLRequestData();
+        //        urlData.Add("u", number);
+        //        urlData.Add("v", 0);
+        //        urlData.Add("l", str);
+        //        URLRequest.CreateStrURLRequest(false, SaveURL, urlData, d => { Debug.Log(d); }, URLRequest.Method.POST);
+        //    }
+        //);
+
+        //string number = "1803307802903811106";
+        //GetConfigByID
+        //(
+        //    number,
+        //    data =>
+        //    {
+        //        Debug.Log(data.ToJson());
+        //        string str = data["l"].ToString().Replace("<Version value=\"20\" />", "<Version value=\"16\" />");
+        //        Debug.Log(str);
 
         //        URLRequestData urlData = new URLRequestData();
-        //        urlData.Add("u", "1712103823186989213");
-        //        urlData.Add("v", 1);
+        //        urlData.Add("u", number);
+        //        urlData.Add("v", 0);
+        //        urlData.Add("l", str);
+        //        URLRequest.CreateStrURLRequest(false, SaveURL, urlData, d => { Debug.Log(d); }, URLRequest.Method.POST);
+        //    }
+        //);
+
+        //string number = "1803307802806938126";
+        //GetConfigByID
+        //(
+        //    number,
+        //    data =>
+        //    {
+        //        Debug.Log(data.ToJson());
+        //        string str = data["l"].ToString().Replace("<Version value=\"20\" />", "<Version value=\"16\" />");
+        //        Debug.Log(str);
+
+        //        URLRequestData urlData = new URLRequestData();
+        //        urlData.Add("u", number);
+        //        urlData.Add("v", 0);
+        //        urlData.Add("l", str);
+        //        URLRequest.CreateStrURLRequest(false, SaveURL, urlData, d => { Debug.Log(d); }, URLRequest.Method.POST);
+        //    }
+        //);
+
+        //string number = "1803307802805375072";
+        //GetConfigByID
+        //(
+        //    number,
+        //    data =>
+        //    {
+        //        Debug.Log(data.ToJson());
+        //        string str = data["l"].ToString().Replace("<Version value=\"20\" />", "<Version value=\"16\" />");
+        //        Debug.Log(str);
+
+        //        URLRequestData urlData = new URLRequestData();
+        //        urlData.Add("u", number);
+        //        urlData.Add("v", 0);
+        //        urlData.Add("l", str);
+        //        URLRequest.CreateStrURLRequest(false, SaveURL, urlData, d => { Debug.Log(d); }, URLRequest.Method.POST);
+        //    }
+        //);
+
+        //string number = "1803308184208195675";
+        //GetConfigByID
+        //(
+        //    number,
+        //    data =>
+        //    {
+        //        Debug.Log(data.ToJson());
+        //        string str = data["l"].ToString().Replace("<Version value=\"20\" />", "<Version value=\"16\" />");
+        //        Debug.Log(str);
+
+        //        urlData = new URLRequestData();
+        //        urlData.Add("u", number);
+        //        urlData.Add("v", 0);
         //        urlData.Add("l", str);
         //        URLRequest.CreateStrURLRequest(false, SaveURL, urlData, d => { Debug.Log(d); }, URLRequest.Method.POST);
         //    }
@@ -1020,7 +1108,6 @@ public class HttpManager : Regist
     private static void LoginCallback(JsonData jsonData)
     {
         Inited = true;
-
         if (jsonData.Inst_Object.ContainsKey("c"))
         {
             IsConnect = true;

+ 13 - 13
Assets/Script/Manage/TutorialManager.cs

@@ -823,12 +823,12 @@ public class TutorialManager : Regist
 
         ResourceManager.Get<ContentSizeFitter>(CanvasLabel.F_TipBK).SetLayoutVertical();
         ResourceManager.Get<ContentSizeFitter>(CanvasLabel.F_TipBK).SetLayoutHorizontal();
-        Tutorial.HightScreen(ResourceManager.Get(CanvasLabel.F_CoinLabArrow), ResourceManager.Get(CanvasLabel.F_TipBtn), 3);
+        Tutorial.HightScreen(ResourceManager.Get(CanvasLabel.F_CoinLabArrow), ResourceManager.Get(CanvasLabel.F_TipBtn), 3, false);
         Tutorial.HightScreen(ResourceManager.Get(CanvasLabel.F_CoinLabArrow), ResourceManager.Get(CanvasLabel.F_TipBK), 1);
-        Tutorial.HightScreen(ResourceManager.Get(CanvasLabel.F_CoinLabArrow), ResourceManager.Get(CanvasLabel.F_Tip), 2);
-        Tutorial.HightScreen(ResourceManager.Get(CanvasLabel.F_CoinLabArrow), ResourceManager.Get(CanvasLabel.F_DataB), 1);
-        Tutorial.HightScreen(ResourceManager.Get(CanvasLabel.F_CoinLabArrow), ResourceManager.Get(CanvasLabel.F_CoinLab), 2);
-        Tutorial.HightScreen(ResourceManager.Get(CanvasLabel.F_CoinLabArrow), ResourceManager.Get(CanvasLabel.F_DiamondLab), 2);
+        Tutorial.HightScreen(ResourceManager.Get(CanvasLabel.F_CoinLabArrow), ResourceManager.Get(CanvasLabel.F_Tip), 2, false);
+        Tutorial.HightScreen(ResourceManager.Get(CanvasLabel.F_CoinLabArrow), ResourceManager.Get(CanvasLabel.F_DataB), 1, false);
+        Tutorial.HightScreen(ResourceManager.Get(CanvasLabel.F_CoinLabArrow), ResourceManager.Get(CanvasLabel.F_CoinLab), 2, false);
+        Tutorial.HightScreen(ResourceManager.Get(CanvasLabel.F_CoinLabArrow), ResourceManager.Get(CanvasLabel.F_DiamondLab), 2, false);
     }
 
 
@@ -1007,7 +1007,7 @@ public class TutorialManager : Regist
 
         int index = MiniGameManager.GetMemoryGameButtonIndex(MiniGameManager.FindSoloGameIndexList[0]);
         Button button = MiniGameManager.D_MemoryGameBtns[index].GetComponent<Button>();
-        Tutorial.HightScreen(MiniGameManager.D_MemoryGameArrows[index], button.transform);
+        Tutorial.HightScreen(MiniGameManager.D_MemoryGameArrows[index], button.transform, 1, true, new Vector3(0.05f, 0.05f, 0.05f));
         button.AddButtonEventOnetime
         (
             () =>
@@ -1022,7 +1022,7 @@ public class TutorialManager : Regist
     {
         int index = MiniGameManager.GetMemoryGameButtonIndex(MiniGameManager.FindSoloGameIndexList[0]);
         Button button = MiniGameManager.D_MemoryGameBtns[index].GetComponent<Button>();
-        Tutorial.HightScreen(MiniGameManager.D_MemoryGameArrows[index], button.transform);
+        Tutorial.HightScreen(MiniGameManager.D_MemoryGameArrows[index], button.transform, 1, true, new Vector3(0.05f, 0.05f, 0.05f));
         button.AddButtonEventOnetime
         (
             () =>
@@ -1037,7 +1037,7 @@ public class TutorialManager : Regist
     {
         int index = MiniGameManager.GetMemoryGameButtonIndex(MiniGameManager.FindSoloGameIndexList[0]);
         Button button = MiniGameManager.D_MemoryGameBtns[index].GetComponent<Button>();
-        Tutorial.HightScreen(MiniGameManager.D_MemoryGameArrows[index], button.transform);
+        Tutorial.HightScreen(MiniGameManager.D_MemoryGameArrows[index], button.transform, 1, true, new Vector3(0.05f, 0.05f, 0.05f));
         button.AddButtonEventOnetime
         (
             () =>
@@ -1052,7 +1052,7 @@ public class TutorialManager : Regist
     {
         int index = MiniGameManager.GetMemoryGameButtonIndex(MiniGameManager.FindSoloGameIndexList[0]);
         Button button = MiniGameManager.D_MemoryGameBtns[index].GetComponent<Button>();
-        Tutorial.HightScreen(MiniGameManager.D_MemoryGameArrows[index], button.transform);
+        Tutorial.HightScreen(MiniGameManager.D_MemoryGameArrows[index], button.transform, 1, true, new Vector3(0.05f, 0.05f, 0.05f));
         button.AddButtonEventOnetime
         (
             () =>
@@ -1067,7 +1067,7 @@ public class TutorialManager : Regist
     {
         int index = MiniGameManager.GetMemoryGameButtonIndex(MiniGameManager.FindSoloGameIndexList[0]);
         Button button = MiniGameManager.D_MemoryGameBtns[index].GetComponent<Button>();
-        Tutorial.HightScreen(MiniGameManager.D_MemoryGameArrows[index], button.transform);
+        Tutorial.HightScreen(MiniGameManager.D_MemoryGameArrows[index], button.transform, 1, true, new Vector3(0.05f, 0.05f, 0.05f));
         button.AddButtonEventOnetime
         (
             () =>
@@ -1082,7 +1082,7 @@ public class TutorialManager : Regist
     {
         int index = MiniGameManager.GetMemoryGameButtonIndex(MiniGameManager.FindSoloGameIndexList[0]);
         Button button = MiniGameManager.D_MemoryGameBtns[index].GetComponent<Button>();
-        Tutorial.HightScreen(MiniGameManager.D_MemoryGameArrows[index], button.transform);
+        Tutorial.HightScreen(MiniGameManager.D_MemoryGameArrows[index], button.transform, 1, true, new Vector3(0.05f, 0.05f, 0.05f));
         button.AddButtonEventOnetime
         (
             () =>
@@ -1118,7 +1118,7 @@ public class TutorialManager : Regist
 
         ResourceManager.SetActive(CanvasLabel.N_Tutorial, true);
 
-        Tutorial.HightScreen(arrowTra, targetTra);
+        Tutorial.HightScreen(arrowTra, targetTra, 1, true, new Vector3(0.05f, 0.05f, 0.05f));
     }
 
 
@@ -1256,7 +1256,7 @@ public class TutorialManager : Regist
 
         ResourceManager.SetActive(CanvasLabel.N_Tutorial, true);
 
-        Tutorial.HightScreen(arrowTra, targetTra);
+        Tutorial.HightScreen(arrowTra, targetTra, 1, true, new Vector3(0.05f, 0.05f, 0.05f));
     }
 
 

+ 36 - 2
Assets/Script/Object/Tutorial.cs

@@ -32,6 +32,7 @@ public class Tutorial : Regist, IPointerClickHandler
     public static Transform Arrow;
 
     public static List<Transform> HighLightList = new List<Transform>();
+    private static List<TweenScale> hightAnims = new List<TweenScale>();
 
     #endregion
 
@@ -50,7 +51,7 @@ public class Tutorial : Regist, IPointerClickHandler
         PointScene(arrowPos.position, targetPos);
     }
 
-    public static void HightScreen(Transform arrowPos, Transform target, int order = 1)
+    public static void HightScreen(Transform arrowPos, Transform target, int order = 1, bool scale = true, Vector3? scaleVec = null)
     {
         target.AddComponent<GraphicRaycaster>();
 
@@ -65,11 +66,23 @@ public class Tutorial : Regist, IPointerClickHandler
 
         ResourceManager.Get(CanvasLabel.N_Mask).TweenForGra();
 
+        if (scaleVec == null)
+        {
+            scaleVec = new Vector3(0.2f, 0.2f, 0.2f);
+        }
+        if (scale)
+        {
+            TweenScale tweenScale = new TweenScale(target, target.localScale, target.localScale + scaleVec.Value, 0.5f, true, true, Curve.EaseOutQuad);
+            tweenScale.OnForwardFinish += () => tweenScale.StartBackward();
+            tweenScale.OnBackwardFinish += () => tweenScale.StartForward();
+            tweenScale.StartForward();
+            hightAnims.Add(tweenScale);
+        }
 
         HighLightList.Add(target);
     }
 
-    public static void HightScreen(Transform arrowPos, Transform targetPos, Transform target)
+    public static void HightScreen(Transform arrowPos, Transform targetPos, Transform target, bool scale = true, Vector3? scaleVec = null)
     {
         target.AddComponent<GraphicRaycaster>();
 
@@ -85,6 +98,18 @@ public class Tutorial : Regist, IPointerClickHandler
 
         ResourceManager.Get(CanvasLabel.N_Mask).TweenForGra();
 
+        if (scaleVec == null)
+        {
+            scaleVec = new Vector3(0.2f, 0.2f, 0.2f);
+        }
+        if (scale)
+        {
+            TweenScale tweenScale = new TweenScale(target, target.localScale, target.localScale + scaleVec.Value, 0.5f, true, true, Curve.EaseOutQuad);
+            tweenScale.OnForwardFinish += () => tweenScale.StartBackward();
+            tweenScale.OnBackwardFinish += () => tweenScale.StartForward();
+            tweenScale.StartForward();
+            hightAnims.Add(tweenScale);
+        }
 
         HighLightList.Add(target);
     }
@@ -102,6 +127,12 @@ public class Tutorial : Regist, IPointerClickHandler
 
         HighLightList = new List<Transform>();
 
+        foreach (var hightAnim in hightAnims)
+        {
+            hightAnim.Target.localScale = hightAnim.Origin;
+            hightAnim.Pause();
+        }
+        hightAnims = new List<TweenScale>();
 
         ResourceManager.Get(CanvasLabel.N_Mask).TweenBacGra();
         ResourceManager.Get(CanvasLabel.N_Arrow).TweenBacCG();
@@ -120,6 +151,9 @@ public class Tutorial : Regist, IPointerClickHandler
         
         HighLightList.RemoveAt(index);
 
+        hightAnims[index].Target.localScale = hightAnims[index].Origin;
+        hightAnims[index].Pause();
+        hightAnims.RemoveAt(index);
 
         if (hideArrow)
         {

+ 29 - 29
Assets/Script/Tool/Auxiliary.cs

@@ -154,35 +154,35 @@ public class Auxiliary : Regist
         //    RobotManager.DeactivateAllRobots(false);
         //}
 
-        //if (Input.GetKeyDown(KeyCode.Space))
-        //{
-        //    foreach (var skill in Manager.UsingSkillList)
-        //    {
-        //        skill.UseTimer = 0;
-        //    }
-        //    foreach (var skill in Manager.CoolSkillList)
-        //    {
-        //        skill.CoolTimer = 0;
-        //    }
-        //    HttpManager.GetTargetConfig
-        //    (
-        //        "1801134288353834791",
-        //        data =>
-        //        {
-        //            VisitManager.VisiteeSerialNumber = "1801134288353834791";
-        //            VisitManager.SavePulledConfig(data);
-        //        }
-        //    );
-        //    PlayerPrefManager.SaveBool(PlayerPrefManager.INTERACT_CONFIG, false);
-        //    Debug.Log(ResourceManager.Get<Canvas>(CanvasLabel.Canvas).scaleFactor);
-        //    RectTransform rectTransform = ResourceManager.Get<RectTransform>(CanvasLabel.P_ScreenShotRect);
-        //    Vector2 screenPosition = RectTransformUtility.WorldToScreenPoint(null, rectTransform.position);
-        //    Debug.Log(screenPosition);
-        //    Debug.Log(ConfigManager.ConfigRootNode.OuterXml);
-        //    DebugManager.ResetGardenLevel(22);
-        //    DebugManager.ResetVisitTutorial();
-        //    HttpManager.GetThanksGiftInfo(RechargeGiftManager.Init, () => Bubble.Show(null, Language.GetStr(LanguageLabel.UI__GetThanksGiftInfoFailed)));
-        //}
+        if (Input.GetKeyDown(KeyCode.Space))
+        {
+            //DebugManager.ResetGardenLevel(150);
+            //foreach (var skill in Manager.UsingSkillList)
+            //{
+            //    skill.UseTimer = 0;
+            //}
+            //foreach (var skill in Manager.CoolSkillList)
+            //{
+            //    skill.CoolTimer = 0;
+            //}
+            //HttpManager.GetTargetConfig
+            //(
+            //    "1801134288353834791",
+            //    data =>
+            //    {
+            //        VisitManager.VisiteeSerialNumber = "1801134288353834791";
+            //        VisitManager.SavePulledConfig(data);
+            //    }
+            //);
+            //PlayerPrefManager.SaveBool(PlayerPrefManager.INTERACT_CONFIG, false);
+            //Debug.Log(ResourceManager.Get<Canvas>(CanvasLabel.Canvas).scaleFactor);
+            //RectTransform rectTransform = ResourceManager.Get<RectTransform>(CanvasLabel.P_ScreenShotRect);
+            //Vector2 screenPosition = RectTransformUtility.WorldToScreenPoint(null, rectTransform.position);
+            //Debug.Log(screenPosition);
+            //Debug.Log(ConfigManager.ConfigRootNode.OuterXml);
+            DebugManager.ResetMemoryGameTutorial();
+            //HttpManager.GetThanksGiftInfo(RechargeGiftManager.Init, () => Bubble.Show(null, Language.GetStr(LanguageLabel.UI__GetThanksGiftInfoFailed)));
+        }
 
         //if (Input.GetKeyDown(KeyCode.A))
         //{