From f44ad64eff5c66b711e2b8d28c44c85a92cbc393 Mon Sep 17 00:00:00 2001
From: liuzhiwei <liuzhiwei@qq.com>
Date: Fri, 06 Nov 2020 10:08:42 +0800
Subject: [PATCH] Merge branch 'master' of http://172.16.1.52:8090/r/GemBattle into master
---
Assets/Scripts/TowerDefense/Towers/Placement/TowerPlacementGridEndless.cs | 104 ++++++----------------------------------------------
1 files changed, 12 insertions(+), 92 deletions(-)
diff --git a/Assets/Scripts/TowerDefense/Towers/Placement/TowerPlacementGridEndless.cs b/Assets/Scripts/TowerDefense/Towers/Placement/TowerPlacementGridEndless.cs
index ea019ad..52ab28a 100644
--- a/Assets/Scripts/TowerDefense/Towers/Placement/TowerPlacementGridEndless.cs
+++ b/Assets/Scripts/TowerDefense/Towers/Placement/TowerPlacementGridEndless.cs
@@ -1,5 +1,4 @@
using System;
-using System.Collections.Generic;
using Core.Utilities;
using KTGMGemClient;
using TowerDefense.Level;
@@ -7,25 +6,8 @@
using UnityEngine;
using UnityEngine.UI;
-namespace TowerDefense.Towers.Placement {
-
-
-
- public class BuyButtonGroup
- {
- public BuyButtonGroup(Transform t,int x,int y)
- {
- this.button = t;
- this.x = x;
- this.y = y;
- }
-
-
- public Transform button;
- public int x;
- public int y;
- };
-
+namespace TowerDefense.Towers.Placement
+{
/// <summary>
/// A tower placement location made from a grid.
/// Its origin is centered in the middle of the lower-right cell. It can be oriented in any direction
@@ -33,10 +15,6 @@
[RequireComponent(typeof(BoxCollider))]
public class TowerPlacementGridEndless : MonoBehaviour, IPlacementArea
{
- [Range(0,100)]
- public float buyButtonScaler=1.9f;
-
- private List<BuyButtonGroup> mBuyButtons = new List<BuyButtonGroup>();
public static float GRID_OPENCASH = 100;
/// <summary>
@@ -341,15 +319,9 @@
}
}
}
- void FixedUpdate()
- {
- // this.resizeBuyButtonSize(this.buyButtonScaler);
- }
void Update()
{
-
-
if (m_arrCoinGenTime == null || !EndlessUIStart.instance.IsGameRunning) return;
float delta = Time.deltaTime;
@@ -557,8 +529,6 @@
m_AvailableCells = new bool[dimensions.x, dimensions.y];
opponent = false;
-
-
}
/// <summary>
@@ -574,53 +544,11 @@
SetUpGrid();
- // 初始化格子对应的屏幕坐标数据
- preCalculateGridUIPos();
+ // 初始化格子对应的屏幕坐标数据 延迟执行
+ Invoke("preCalculateGridUIPos",0.3f);
+ //preCalculateGridUIPos();
}
- void resizeBuyButtonSize(float defaultVal=1.9f)
- {
-
-
-
- foreach(BuyButtonGroup bbg in this.mBuyButtons)
- {
- Vector3 pos = bbg.button.position;
- pos.x = arrGridCentPos[bbg.x, bbg.y].x;
- pos.z = arrGridCentPos[bbg.x, bbg.y].y + (bbg.y - AttackRowNumbers) * defaultVal;
- pos.y = 30;
- bbg.button.position = pos;
- bbg.button.localRotation = Quaternion.identity;
- bbg.button.localScale = Vector3.one;
- }
- //for (int x = 0; x < dimensions.x; ++x)
- //{
- // for (int y = dimensions.y - AttackRowNumbers; y < dimensions.y; ++y)
- // {
- // if (m_arrGridType[x, y] != PlacementGridType.EGridWaitBuy) continue;
-
- // GameObject container = GameObject.Find("BuyButtonContainer");
- // Button buyButton = Instantiate(waitBuyBtnPrefab);
- // buyButton.transform.SetParent(container.transform);
-
-
- // mBuyButtons.Add(new BuyButtonGroup(buyButton.transform, x, y));
- // //Camera.main.WorldToViewportPoint()
-
- // Vector3 pos = buyButton.transform.position;
- // pos.x = arrGridCentPos[x, y].x;
- // pos.z = arrGridCentPos[x, y].y + (y - AttackRowNumbers) * 1.9f;
- // pos.y = 30;
- // buyButton.transform.position = pos;
- // buyButton.transform.localRotation = Quaternion.identity;
- // buyButton.transform.localScale = Vector3.one;
-
-
- // }
- //}
-
-
- }
/// <summary>
/// 预计算塔位格子对应的屏幕坐标以及塔位格子的屏幕尺寸
/// WORK START: 计算屏幕坐标，然后开搞屏幕相关的内容。下午要把塔位上显示界面搞出来。
@@ -628,7 +556,6 @@
/// </summary>
void preCalculateGridUIPos()
{
-
arrGridCentPos = new Vector2[dimensions.x, dimensions.y];
Vector3 targetPos = GridToWorld(new IntVector2(0, 0), new IntVector2(1, 1));
@@ -647,7 +574,6 @@
}
}
-
// 血条位置的设定
PreCalculateTowerBloodUi();
@@ -663,17 +589,13 @@
Button buyButton = Instantiate(waitBuyBtnPrefab);
buyButton.transform.SetParent(container.transform);
-
- mBuyButtons.Add(new BuyButtonGroup(buyButton.transform, x, y));
- //Camera.main.WorldToViewportPoint()
-
- //Vector3 pos = buyButton.transform.position;
- //pos.x = arrGridCentPos[x, y].x;
- //pos.z = arrGridCentPos[x, y].y + (y - AttackRowNumbers) * 1.9f;
- //pos.y = 30;
- //buyButton.transform.position = pos;
- //buyButton.transform.localRotation = Quaternion.identity;
- //buyButton.transform.localScale = Vector3.one;
+ Vector3 pos = buyButton.transform.position;
+ pos.x = arrGridCentPos[x, y].x;
+ pos.z = arrGridCentPos[x, y].y + (y - AttackRowNumbers) * 1.9f;
+ pos.y = 30;
+ buyButton.transform.position = pos;
+ buyButton.transform.localRotation = Quaternion.identity;
+ buyButton.transform.localScale = Vector3.one;
// 设置按钮对应的点击功能
EndlessTowerGridOpen tgo = buyButton.GetComponent<EndlessTowerGridOpen>();
@@ -685,8 +607,6 @@
}
}
}
-
- this.resizeBuyButtonSize();
}
/// <summary>
--
Gitblit v1.9.1