MainCanvas为Space，调整新手引导在Bottom上，还原魏哥UI适配代码，改为延迟执行

wangguan

2020-11-05 ac76c8913e3497e8789411105e541cb6afa189b2

MainCanvas为Space，调整新手引导在Bottom上，还原魏哥UI适配代码，改为延迟执行

 Assets/00000/package/Prefab/Effect_HuoJingLing_Hit.prefab

@@ -14529,6 +14529,8 @@
  serializedVersion: 6
  m_Component:
  - component: {fileID: 888029423927220660}
  - component: {fileID: 6602382368611891133}
  - component: {fileID: 79673683474851296}
  m_Layer: 0
  m_Name: Effect_HuoJingLing_Hit
  m_TagString: Untagged
@@ -14551,6 +14553,35 @@
  m_Father: {fileID: 0}
  m_RootOrder: 0
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &6602382368611891133
MonoBehaviour:
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 3684689283871175924}
  m_Enabled: 1
  m_EditorHideFlags: 0
  m_Script: {fileID: 11500000, guid: 59d007c1fe5e41c1888e4af3392f8676, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
  initialPoolCapacity: 10
--- !u!114 &79673683474851296
MonoBehaviour:
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 3684689283871175924}
  m_Enabled: 1
  m_EditorHideFlags: 0
  m_Script: {fileID: 11500000, guid: 2952db25fdd244f4a9981e4350b798e2, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
  time: 3
  death:
    m_PersistentCalls:
      m_Calls: []
--- !u!1 &5719334831681754455
GameObject:
  m_ObjectHideFlags: 0

 Assets/Scenes/Levels/Battle/Endless.unity

@@ -6380,7 +6380,7 @@
  m_GameObject: {fileID: 849284126}
  m_Enabled: 1
  serializedVersion: 3
  m_RenderMode: 1
  m_RenderMode: 0
  m_Camera: {fileID: 1340671930}
  m_PlaneDistance: 18
  m_PixelPerfect: 0
@@ -13145,7 +13145,6 @@
  m_Script: {fileID: 11500000, guid: 003fa822c2d516a488dcbbed96c8d9ab, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
  buyButtonScaler: 1.9
  placementTilePrefab: {fileID: 114496876178851720, guid: 8ce97201eea4a404b86d7d0906b89847,
    type: 3}
  placementTilePrefabMobile: {fileID: 114496876178851720, guid: 18a440af7ac5d46c8af359534286c4bf,

 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,51 +544,25 @@

            SetUpGrid();

            // 初始化格子对应的屏幕坐标数据
            preCalculateGridUIPos();
            // 初始化格子对应的屏幕坐标数据 延迟执行
            Invoke("preCalculateGridUIPos",0.3f);
            //preCalculateGridUIPos();
        }

        void resizeBuyButtonSize(float defaultVal=1.9f)
        /// <summary>
        /// OnGUI is called for rendering and handling GUI events.
        /// This function can be called multiple times per frame (one call per event).
        /// </summary>
        void OnGUI()
        {
          


            foreach(BuyButtonGroup bbg in this.mBuyButtons)
            if (GUILayout.Button("11111111111111111111111111111111111111111111111111"))
            {
                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;
                //AudioSourceManager.Ins.Play(AudioEnum.BGM1);
                preCalculateGridUIPos();
            }
            //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;

                   
            //    }
            //}

        void ResetPos(){

        }
        /// <summary>
@@ -628,7 +572,6 @@
        /// </summary>
        void preCalculateGridUIPos()
        {

            arrGridCentPos = new Vector2[dimensions.x, dimensions.y];

            Vector3 targetPos = GridToWorld(new IntVector2(0, 0), new IntVector2(1, 1));
@@ -647,7 +590,6 @@
                }
            }


            // 血条位置的设定
            PreCalculateTowerBloodUi();

@@ -663,17 +605,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 +623,6 @@
                    }
                }
            }

            this.resizeBuyButtonSize();
        }

        /// <summary>

 Assets/Scripts/TowerDefense/UI/EndlessUIStart.cs

@@ -78,7 +78,7 @@
            countDownTextNew.text = "";
            countDownTextNew.gameObject.SetActive(false);

            Instantiate(Resources.Load<GameObject>("UI/Guide/GuidePanel"), this.transform);
            Instantiate(Resources.Load<GameObject>("UI/Guide/GuidePanel"), GameObject.Find("BottomUI").transform);
            AddGuideEvent();
        }


 Assets/Scripts/TowerDefense/UI/MainMenuScene.cs

@@ -70,7 +70,8 @@
    /// </summary>
    public void cooperateBtnClick()
    {
        AudioSourceManager.Ins.Play(AudioEnum.UI);

        AudioSourceManager.Ins?.Play(AudioEnum.UI);

        combatBtn.transform.DOKill();
        combatBtn.transform.localScale = new Vector3(1.0f, 1.0f, 1.0f);
@@ -85,7 +86,7 @@
    /// </summary>
    public void StartGame()
    {
        AudioSourceManager.Ins.Play(AudioEnum.UI);
        AudioSourceManager.Ins?.Play(AudioEnum.UI);

        combatBtn.transform.DOKill();
        combatBtn.transform.localScale = new Vector3(1.0f, 1.0f, 1.0f);

 Assets/Scripts/TowerDefense/UI/TextMoveDoTween.cs

@@ -23,13 +23,15 @@
    {
    }

    private float scaleOffect = 1.5f;

    /// <summary>
    /// 当前的
    /// </summary>
    /// <param name="x"></param>
    /// <param name="y"></param>
    /// <param name="text"></param>
    public void moveBloodText( float x,float y,string text,bool crit = false )
    public void moveBloodText(float x, float y, string text, bool crit = false)
    {
        // 先设置Text的位置到一个标准位置
        Vector3 pos = bloodText.transform.position;
@@ -42,10 +44,10 @@
        sval.x = 1.0f;
        sval.y = 1.0f;
        sval.z = 1.0f;
        bloodText.transform.localScale = sval;
        bloodText.transform.localScale = sval * scaleOffect;

        bloodText.text = text;
        this.TextMove(bloodText,crit );
        this.TextMove(bloodText, crit);
    }

    /// <summary>
@@ -56,7 +58,7 @@
        Poolable.TryPool(gameObject);
    }

    private void TextMove( Graphic graphic,bool crit = false )
    private void TextMove(Graphic graphic, bool crit = false)
    {
        //获得Text的rectTransform，和颜色，并设置颜色微透明
        RectTransform rect = graphic.rectTransform;
@@ -75,12 +77,12 @@
        float baseTime = 0.3f;
        if (crit)
            baseTime = 0.2f;
        float scaleUp = 1.8f;
        float scaleUp = 1.8f * scaleOffect;
        if (crit)
            scaleUp = 2.2f;
            scaleUp = 2.2f * scaleOffect;
        float scaleVec = Screen.height / 2400f;
        int basey = rd.Next( (int)(100*scaleVec),(int)(180*scaleVec) );
        if( crit )
        int basey = rd.Next((int)(100 * scaleVec), (int)(180 * scaleVec));
        if (crit)
            basey = rd.Next((int)(150 * scaleVec), (int)(210 * scaleVec));

        int basex;
@@ -91,7 +93,7 @@

        Tweener textMove01 = rect.DOMoveY(rect.position.y + basey, baseTime);
        Tweener textMovex = rect.DOMoveX(rect.position.x + basex, baseTime);
        Tweener textMove02 = rect.DOMoveY(rect.position.y + basey + (int)(60*scaleVec), baseTime);
        Tweener textMove02 = rect.DOMoveY(rect.position.y + basey + (int)(60 * scaleVec), baseTime);
        Tweener textColor01 = graphic.DOColor(new Color(color.r, color.g, color.b, 1), baseTime);
        Tweener textColor02 = graphic.DOColor(new Color(color.r, color.g, color.b, 0), baseTime);
        Tweener textScale = rect.DOScale(scaleUp, 0.25f);
@@ -109,6 +111,6 @@
        textMoveSequence.Join(textColor02);
        textMoveSequence.Join(textScale);
        textMoveSequence.AppendCallback(Remove);
        

    }
}