From 93f67abd5fe45178f48ce7db675bbfe007bfc9e7 Mon Sep 17 00:00:00 2001
From: chenxin <chenxin6991@163.com>
Date: Wed, 18 Nov 2020 19:25:29 +0800
Subject: [PATCH] 按钮恢复成原来资源 打包
---
GemBattle/宝石塔防_Data/Managed/UnityEngine.UI.dll | 0
Assets/Scripts/TowerDefense/UI/HUD/GameUI.cs | 2 ++
GemBattle/宝石塔防_Data/Managed/Assembly-CSharp-firstpass.dll | 0
GemBattle/宝石塔防_Data/Managed/Unity.TextMeshPro.dll | 0
And/GemBattle.apk | 0
Assets/Scripts/TowerDefense/UI/HUD/EndlessRandomTower.cs | 33 +++------------------------------
GemBattle/宝石塔防_Data/globalgamemanagers | 0
Assets/Scripts/TowerDefense/UI/HUD/EndlessGameUI.cs | 2 ++
GemBattle/宝石塔防_Data/Managed/MoreMountains.NiceVibrations.Demos.dll | 0
GemBattle.zip | 0
Assets/Materials/UI/tileTowerVSMat.mat | 2 +-
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
15 files changed, 8 insertions(+), 31 deletions(-)
diff --git a/And/GemBattle.apk b/And/GemBattle.apk
index ca5251b..f272314 100644
--- a/And/GemBattle.apk
+++ b/And/GemBattle.apk
Binary files differ
diff --git a/Assets/Materials/UI/tileTowerVSMat.mat b/Assets/Materials/UI/tileTowerVSMat.mat
index 29c24ee..48d981d 100644
--- a/Assets/Materials/UI/tileTowerVSMat.mat
+++ b/Assets/Materials/UI/tileTowerVSMat.mat
@@ -40,7 +40,7 @@
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
- m_Texture: {fileID: 2800000, guid: 93f40a01d57fbff418fc0b54b6ab7d9f, type: 3}
+ m_Texture: {fileID: 2800000, guid: 8c9a3d26120e78f40aa4ef9ed23d573c, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
diff --git a/Assets/Scripts/TowerDefense/UI/HUD/EndlessGameUI.cs b/Assets/Scripts/TowerDefense/UI/HUD/EndlessGameUI.cs
index b2cc6cb..65f6203 100644
--- a/Assets/Scripts/TowerDefense/UI/HUD/EndlessGameUI.cs
+++ b/Assets/Scripts/TowerDefense/UI/HUD/EndlessGameUI.cs
@@ -1876,6 +1876,8 @@
/// <param name="val"></param>
public void generateBloodText(Vector3 wpos, float val, bool crit = false, bool doubleHit = false, bool poison = false)
{
+ if (Mathf.FloorToInt(val) == 0) return;
+
Vector3 spos = m_Camera.WorldToScreenPoint(wpos);
TextMoveDoTween tm;
if (crit)
diff --git a/Assets/Scripts/TowerDefense/UI/HUD/EndlessRandomTower.cs b/Assets/Scripts/TowerDefense/UI/HUD/EndlessRandomTower.cs
index 6305c3e..b096b3b 100644
--- a/Assets/Scripts/TowerDefense/UI/HUD/EndlessRandomTower.cs
+++ b/Assets/Scripts/TowerDefense/UI/HUD/EndlessRandomTower.cs
@@ -121,33 +121,6 @@
get { return this.towerArray; }
}
- /// <summary>
- /// 处理按钮升级相关.
- /// </summary>
- private void Update()
- {
- float gstime = EndlessUIStart.instance.GameStartTime;
- if (gstime <= 0) return;
-
- if ((!bCdTimeStart) && (LEVELUP_TOWER_TIME - gstime) <= JsonDataCenter.TOWERLVLUP_CDTIME)
- {
- bCdTimeStart = true;
- btnLvlUpCdTime = LEVELUP_TOWER_TIME - gstime;
- }
- if ((!bSetBuyLvlUp) && (gstime > LEVELUP_TOWER_TIME))
- {
- bSetBuyLvlUp = true;
- this.randomBtn.GetComponent<Image>().sprite = buyBtnLevelUp;
- }
-
- // 更新倒计时：
- if ((!bSetBuyLvlUp) && bCdTimeStart)
- {
- btnLvlUpCdTime -= Time.deltaTime;
- string distr = ((int)Math.Ceiling(btnLvlUpCdTime)).ToString() + "s";
- }
- }
-
public void actionTest()
{
multipara((str, strnew) => { Debug.Log(str + strnew); }, "Ying");
@@ -315,10 +288,10 @@
if (gameUI.isBuilding)
gameUI.CancelGhostPlacement();
- // if (level == -1)
- // level = Mathf.Min(EndlessGameUI.instance.MinLevel, 1);
+ if (level == -1)
+ level = Mathf.Min(EndlessGameUI.instance.MinLevel, 1);
- return gameUI.RandomPlaceTower(tower, posx, posy, 3, cost, false, isFirstAppear);
+ return gameUI.RandomPlaceTower(tower, posx, posy, level, cost, false, isFirstAppear);
}
/// <summary>
diff --git a/Assets/Scripts/TowerDefense/UI/HUD/GameUI.cs b/Assets/Scripts/TowerDefense/UI/HUD/GameUI.cs
index 418b456..b6459ae 100644
--- a/Assets/Scripts/TowerDefense/UI/HUD/GameUI.cs
+++ b/Assets/Scripts/TowerDefense/UI/HUD/GameUI.cs
@@ -1683,6 +1683,8 @@
/// <param name="val"></param>
public void generateBloodText(Vector3 wpos, float val, bool crit = false, bool doubleHit = false, bool poison = false)
{
+ if (Mathf.FloorToInt(val) == 0) return;
+
Vector3 spos = m_Camera.WorldToScreenPoint(wpos);
TextMoveDoTween tm;
if (crit)
diff --git a/GemBattle.zip b/GemBattle.zip
index 32aef5f..6727a60 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 55f14f2..f8da08a 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 8a08c4b..fb8f90d 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 b5eb50b..c573025 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 115fb32..ef9849d 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 1d7a2a2..a74ff0f 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/Unity.TextMeshPro.dll" "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/Managed/Unity.TextMeshPro.dll"
index e28a969..9251960 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 a179f07..607a055 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 b081e6e..bbc5b34 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 b3dcf20..36b5855 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
--
Gitblit v1.9.1