From 8b6088ac4bc2a789f70fd7ac7b2bb0f73b68c753 Mon Sep 17 00:00:00 2001
From: liuzhiwei <liuzhiwei@qq.com>
Date: Mon, 07 Dec 2020 15:02:44 +0800
Subject: [PATCH] Merge branch 'master' of http://172.16.1.52:8090/r/GemBattle into master
---
GemBattle/宝石塔防_Data/Managed/UnityEngine.UI.dll | 0
Assets/Scripts/Guide/GuidePanelNew.cs | 51 ++++++++++++++++++++++++++++-----------------------
GemBattle/宝石塔防_Data/Managed/Assembly-CSharp-firstpass.dll | 0
GemBattle/宝石塔防_Data/Managed/Sirenix.OdinInspector.CompatibilityLayer.dll | 0
GemBattle/宝石塔防_Data/Managed/Unity.TextMeshPro.dll | 0
GemBattle/宝石塔防_Data/resources.assets | 0
And/GemBattle.apk | 0
GemBattle/宝石塔防_Data/sharedassets1.assets | 0
GemBattle/宝石塔防_Data/globalgamemanagers.assets | 0
GemBattle/宝石塔防_Data/globalgamemanagers | 0
GemBattle/宝石塔防_Data/Managed/MoreMountains.NiceVibrations.Demos.dll | 0
GemBattle.zip | 0
GemBattle/宝石塔防_Data/level1 | 0
GemBattle/宝石塔防_Data/Managed/Assembly-CSharp.dll | 0
GemBattle/宝石塔防_Data/Managed/MoreMountains.NiceVibrations.dll | 0
GemBattle/宝石塔防_Data/Managed/Unity.Timeline.dll | 0
GemBattle/宝石塔防_Data/Managed/MoreMountains.NiceVibrations.Haptics.dll | 0
17 files changed, 28 insertions(+), 23 deletions(-)
diff --git a/And/GemBattle.apk b/And/GemBattle.apk
index 06a5819..6bd6692 100644
--- a/And/GemBattle.apk
+++ b/And/GemBattle.apk
Binary files differ
diff --git a/Assets/Scripts/Guide/GuidePanelNew.cs b/Assets/Scripts/Guide/GuidePanelNew.cs
index 3f45779..6bd2924 100644
--- a/Assets/Scripts/Guide/GuidePanelNew.cs
+++ b/Assets/Scripts/Guide/GuidePanelNew.cs
@@ -230,9 +230,7 @@
private void Step2_1()
{
Wood1Appear();
- RemoveButtonListener(towerBuyBtn);
- AddButtonListener(towerBuyBtn, Step2_2);
- StartCoroutine(ShowRimTip(strArray[1]));
+
}
private void Wood1Appear()
@@ -244,6 +242,9 @@
wood1.enabled = false;
wood1PS1.Play();
wood1PS2.Play();
+ RemoveButtonListener(towerBuyBtn);
+ AddButtonListener(towerBuyBtn, Step2_2);
+ StartCoroutine(ShowRimTip(strArray[1]));
}
}
@@ -253,27 +254,28 @@
private void Step2_2()
{
Wood2Appear();
-
- offectBackground.SetActive(true);
- wood1.enabled = true;
- wood2.enabled = true;
- ShowDragPath(wood2.GetStartP, wood1.GetRect);
- RimWood2();
- image_Tip_Rect.gameObject.SetActive(false);
-
//StartCoroutine(ShowRimTip(strArray[2]));
}
private void Wood2Appear()
{
- wood2.gameObject.SetActive(true);
- wood2PS1.Play();
- wood2PS2.Play();
- //fire2.enabled = false;
- DestoryButtonListener(towerBuyBtn);
- SetRimActive(false);
- CloseGuidance();
- tmpMask.enabled = true;
+ if (!wood2.gameObject.activeSelf)
+ {
+ wood2.gameObject.SetActive(true);
+ wood2PS1.Play();
+ wood2PS2.Play();
+ //fire2.enabled = false;
+ DestoryButtonListener(towerBuyBtn);
+ SetRimActive(false);
+ CloseGuidance();
+ tmpMask.enabled = true;
+ offectBackground.SetActive(true);
+ wood1.enabled = true;
+ wood2.enabled = true;
+ ShowDragPath(wood2.GetStartP, wood1.GetRect);
+ RimWood2();
+ image_Tip_Rect.gameObject.SetActive(false);
+ }
}
@@ -379,8 +381,6 @@
private void Step4_1()
{
FireAppear();
- RemoveButtonListener(towerBuyBtn);
- Step4_2();
}
private void FireAppear()
@@ -392,6 +392,8 @@
fire.enabled = true;
firePS1.Play();
firePS1.Play();
+ RemoveButtonListener(towerBuyBtn);
+ Step4_2();
}
}
@@ -476,6 +478,8 @@
}
else if (currentIndex == 2)
{
+ tmpMask.enabled = true;
+
SetRimActive(false);
StopShowDragPath(true);
CloseGuidance();
@@ -524,8 +528,7 @@
private void Step6_1()
{
WaterAppear();
- RemoveButtonListener(towerBuyBtn);
- Step6_2();
+
}
private void WaterAppear()
@@ -537,6 +540,8 @@
water.enabled = true;
waterPS1.Play();
waterPS2.Play();
+ RemoveButtonListener(towerBuyBtn);
+ Step6_2();
}
}
/// <summary>
diff --git a/GemBattle.zip b/GemBattle.zip
index bc6c12d..1ce9552 100644
--- a/GemBattle.zip
+++ b/GemBattle.zip
Binary files differ
diff --git "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/Managed/Assembly-CSharp-firstpass.dll" "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/Managed/Assembly-CSharp-firstpass.dll"
index 46db7f8..be6d39b 100644
--- "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/Managed/Assembly-CSharp-firstpass.dll"
+++ "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/Managed/Assembly-CSharp-firstpass.dll"
Binary files differ
diff --git "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/Managed/Assembly-CSharp.dll" "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/Managed/Assembly-CSharp.dll"
index bcfa2f5..a817298 100644
--- "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/Managed/Assembly-CSharp.dll"
+++ "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/Managed/Assembly-CSharp.dll"
Binary files differ
diff --git "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/Managed/MoreMountains.NiceVibrations.Demos.dll" "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/Managed/MoreMountains.NiceVibrations.Demos.dll"
index cf43611..418f1ad 100644
--- "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/Managed/MoreMountains.NiceVibrations.Demos.dll"
+++ "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/Managed/MoreMountains.NiceVibrations.Demos.dll"
Binary files differ
diff --git "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/Managed/MoreMountains.NiceVibrations.Haptics.dll" "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/Managed/MoreMountains.NiceVibrations.Haptics.dll"
index f11502f..218bc63 100644
--- "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/Managed/MoreMountains.NiceVibrations.Haptics.dll"
+++ "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/Managed/MoreMountains.NiceVibrations.Haptics.dll"
Binary files differ
diff --git "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/Managed/MoreMountains.NiceVibrations.dll" "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/Managed/MoreMountains.NiceVibrations.dll"
index 303468a..458dda0 100644
--- "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/Managed/MoreMountains.NiceVibrations.dll"
+++ "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/Managed/MoreMountains.NiceVibrations.dll"
Binary files differ
diff --git "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/Managed/Sirenix.OdinInspector.CompatibilityLayer.dll" "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/Managed/Sirenix.OdinInspector.CompatibilityLayer.dll"
index e66a8f0..3de1977 100644
--- "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/Managed/Sirenix.OdinInspector.CompatibilityLayer.dll"
+++ "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/Managed/Sirenix.OdinInspector.CompatibilityLayer.dll"
Binary files differ
diff --git "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/Managed/Unity.TextMeshPro.dll" "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/Managed/Unity.TextMeshPro.dll"
index 15fd364..9c33533 100644
--- "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/Managed/Unity.TextMeshPro.dll"
+++ "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/Managed/Unity.TextMeshPro.dll"
Binary files differ
diff --git "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/Managed/Unity.Timeline.dll" "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/Managed/Unity.Timeline.dll"
index 45fad07..f9c187a 100644
--- "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/Managed/Unity.Timeline.dll"
+++ "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/Managed/Unity.Timeline.dll"
Binary files differ
diff --git "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/Managed/UnityEngine.UI.dll" "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/Managed/UnityEngine.UI.dll"
index 3caf635..f282237 100644
--- "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/Managed/UnityEngine.UI.dll"
+++ "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/Managed/UnityEngine.UI.dll"
Binary files differ
diff --git "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/globalgamemanagers" "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/globalgamemanagers"
index f6b1dd5..10428b8 100644
--- "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/globalgamemanagers"
+++ "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/globalgamemanagers"
Binary files differ
diff --git "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/globalgamemanagers.assets" "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/globalgamemanagers.assets"
index 284eb79..c6d978f 100644
--- "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/globalgamemanagers.assets"
+++ "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/globalgamemanagers.assets"
Binary files differ
diff --git "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/level1" "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/level1"
index 53a85f4..469628f 100644
--- "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/level1"
+++ "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/level1"
Binary files differ
diff --git "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/resources.assets" "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/resources.assets"
index 66cb401..59f63a3 100644
--- "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/resources.assets"
+++ "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/resources.assets"
Binary files differ
diff --git "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/sharedassets1.assets" "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/sharedassets1.assets"
index 8cface0..6639c48 100644
--- "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/sharedassets1.assets"
+++ "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/sharedassets1.assets"
Binary files differ
--
Gitblit v1.9.1