Merge branch 'master' of http://172.16.1.52:8090/r/GemBattle into master

liuzhiwei

2020-12-08 ae487b742c792c43b81cce6f060b881e5609d160

Merge branch 'master' of http://172.16.1.52:8090/r/GemBattle into master

 Assets/Prefabs/UI/PlacementTileMobile.prefab

@@ -609,12 +609,12 @@
    - target: {fileID: 5111904333056534619, guid: 19e5a86a7c5fc9e4ea8ff8768e0e368e,
        type: 3}
      propertyPath: m_LocalScale.x
      value: 0.12647022
      value: 0.0632351
      objectReference: {fileID: 0}
    - target: {fileID: 5111904333056534619, guid: 19e5a86a7c5fc9e4ea8ff8768e0e368e,
        type: 3}
      propertyPath: m_LocalScale.z
      value: 0.09259259
      value: 0.046296295
      objectReference: {fileID: 0}
    - target: {fileID: 6253864200620358922, guid: 19e5a86a7c5fc9e4ea8ff8768e0e368e,
        type: 3}

 Assets/Resources/UI/Final/FinalPanel.prefab

@@ -1124,10 +1124,10 @@
  - {fileID: 5748941952564637225}
  - {fileID: 5646961902762380150}
  - {fileID: 8431080647543519056}
  - {fileID: 197643528144310344}
  - {fileID: 7878479991277281519}
  - {fileID: 8441617594771339911}
  - {fileID: 1844543117816446403}
  - {fileID: 197643528144310344}
  - {fileID: 1818325968707775638}
  - {fileID: 8661324587580357946}
  - {fileID: 3492065258373943105}
@@ -2099,11 +2099,11 @@
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 4084473540632843494}
  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
  m_LocalPosition: {x: 0, y: 0, z: -1500}
  m_LocalScale: {x: 0.7, y: 0.7, z: 0.7}
  m_LocalPosition: {x: 0, y: 0, z: -1450}
  m_LocalScale: {x: 0, y: 0, z: 0}
  m_Children: []
  m_Father: {fileID: 5825945650563712391}
  m_RootOrder: 8
  m_RootOrder: 7
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0.5, y: 0.5}
  m_AnchorMax: {x: 0.5, y: 0.5}
@@ -2266,11 +2266,11 @@
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 4282407097951878964}
  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
  m_LocalPosition: {x: 0, y: 0, z: -1500}
  m_LocalScale: {x: 0.7, y: 0.7, z: 0.7}
  m_LocalPosition: {x: 0, y: 0, z: -1450}
  m_LocalScale: {x: 0, y: 0, z: 0}
  m_Children: []
  m_Father: {fileID: 5825945650563712391}
  m_RootOrder: 6
  m_RootOrder: 5
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0.5, y: 0.5}
  m_AnchorMax: {x: 0.5, y: 0.5}
@@ -2806,11 +2806,11 @@
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 5531562892244897489}
  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
  m_LocalPosition: {x: 0, y: 0, z: -1500}
  m_LocalScale: {x: 0.7, y: 0.7, z: 0.7}
  m_LocalPosition: {x: 0, y: 0, z: -1450}
  m_LocalScale: {x: 0, y: 0, z: 0}
  m_Children: []
  m_Father: {fileID: 5825945650563712391}
  m_RootOrder: 7
  m_RootOrder: 6
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0.5, y: 0.5}
  m_AnchorMax: {x: 0.5, y: 0.5}
@@ -4455,15 +4455,15 @@
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 8519968415981260941}
  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
  m_LocalPosition: {x: 0, y: 0, z: 0}
  m_LocalScale: {x: 0.7, y: 0.5, z: 0.5}
  m_LocalPosition: {x: 0, y: 0, z: -1450}
  m_LocalScale: {x: 0.7, y: 0.49999997, z: 0.49999997}
  m_Children: []
  m_Father: {fileID: 5825945650563712391}
  m_RootOrder: 5
  m_RootOrder: 8
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0.5, y: 1}
  m_AnchorMax: {x: 0.5, y: 1}
  m_AnchoredPosition: {x: -3.1, y: -563.2}
  m_AnchoredPosition: {x: -3.0999718, y: -563.2}
  m_SizeDelta: {x: 867, y: 242}
  m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4719901733496479003

 Assets/Scripts/Guide/GuidePanelNew.cs

@@ -140,6 +140,7 @@
        skillBtn.interactable = false;

        finishPS = transform.Find("Effect_UI_YinDaoJieShu/Particle System (3)").GetComponent<ParticleSystem>();
        towerBuyBtn.gameObject.SetActive(false);
    }


@@ -186,6 +187,8 @@
    {
        //关闭对话框
        SetGuideUI(false);
        towerBuyBtn.gameObject.SetActive(true);

        //开箱
        boxPanel.ChangeType(GuideBoxType.Wood, Step1Finish);
    }
@@ -217,6 +220,7 @@
    {
        strArray = str;
        tmpMask.enabled = false;

        AddButtonListener(towerBuyBtn, Step2_1);
        Image btnImg = towerBuyBtn.GetComponent<Image>();
        InitRectGuidance(btnImg, 159, 73.5f, Vector2.one);
@@ -268,6 +272,8 @@
            wood2PS2.Play();
            //fire2.enabled = false;
            DestoryButtonListener(towerBuyBtn);
            towerBuyBtn.gameObject.SetActive(false);

            SetRimActive(false);
            CloseGuidance();
            tmpMask.enabled = true;
@@ -355,6 +361,8 @@
    {
        //关闭对话框
        SetGuideUI(false);
        towerBuyBtn.gameObject.SetActive(true);

        //开箱
        boxPanel.ChangeType(GuideBoxType.Fire, cb);
    }
@@ -394,6 +402,8 @@
            firePS1.Play();
            firePS1.Play();
            RemoveButtonListener(towerBuyBtn);
            towerBuyBtn.gameObject.SetActive(false);

            Step4_2();
        }
    }
@@ -502,6 +512,8 @@
    {
        //关闭对话框
        SetGuideUI(false);
        towerBuyBtn.gameObject.SetActive(true);

        //开箱
        boxPanel.ChangeType(GuideBoxType.Water, cb);
    }
@@ -541,6 +553,8 @@
            waterPS1.Play();
            waterPS2.Play();
            RemoveButtonListener(towerBuyBtn);
            towerBuyBtn.gameObject.SetActive(false);

            Step6_2();
        }
    }

 Assets/Scripts/TowerDefense/Towers/Tower.cs

@@ -88,7 +88,7 @@
        /// <summary>
        /// The current level of the tower
        /// </summary>
        public int currentLevel { get; protected set; }
        public int currentLevel { get; set; }

        protected bool m_bInAttackMode = false;


 Assets/Scripts/TowerDefense/UI/EndlessUIStart.cs

@@ -612,6 +612,8 @@

    public bool IsGameRunning { get { return !isPause; } }

    private bool isUpgradeTowerLevel;

    // Update is called once per frame
    void Update()
    {
@@ -630,6 +632,13 @@
        if (bGameStart)
        {
            startTime += Time.deltaTime;

            if (!isUpgradeTowerLevel && startTime >= JsonDataCenter.DOUBLE_GEM_TIME)
            {
                EndlessGameUI.instance.UpgradeAllTowerMinLevel(1);
                isUpgradeTowerLevel = true;
            }

            timeTextNew.text = ConvertTime((float)Math.Ceiling(startTime));
        }


 Assets/Scripts/TowerDefense/UI/HUD/EndlessGameUI.cs

@@ -773,6 +773,26 @@
        }

        /// <summary>
        /// 提升所有塔的等级，如果现在塔的等级 < level，设置等级为 level，如果 > level 不做改变
        /// </summary>
        /// <param name="level">从0开始</param>
        public void UpgradeAllTowerMinLevel(int level)
        {
            if (level < 0 || level > ElfUpgradeData.MaxTowerLevel - 1) return;

            for (int i = 0; i < m_listTower.Count; ++i)
            {
                if (m_listTower[i].currentLevel < level)
                {
                    m_listTower[i].currentLevel = level;
                    m_listTower[i].CurrentTowerLevel.SetShowLevel(level + 1);
                    m_listTower[i].CurrentTowerLevel.SetScale(level + 1);
                    PlayUpgradeEffect(m_listTower[i]);
                }
            }
        }

        /// <summary>
        /// 成长骰子升级为高一级别的随机骰子.
        /// </summary>
        /// <param name="tower"></param>
@@ -1289,7 +1309,7 @@
                    newTower2.CheckCtrl();
                    //Debug.Log($"newTower1:{newTower1.towerName}  newTower2:{newTower2.towerName}");

                    TowerPlacementGridEndless.instance.PlayPutPs(newTower2.gridPosition.x,newTower2.gridPosition.y);
                    TowerPlacementGridEndless.instance.PlayPutPs(newTower2.gridPosition.x, newTower2.gridPosition.y);
                    return true;
                }
            }

 Assets/Scripts/UI/FinalPanel/FinalPanel.cs

@@ -209,17 +209,18 @@
        agentTweenSeq.Join(tsTiele.DOFade(1, 0.3f));

        Image Image1 = transform.Find("Image1").GetComponent<Image>();
        agentTweenSeq.Append(Image1.transform.DOScale(Vector3.one, 0.2f));//变化图片大小
        agentTweenSeq.Join(Image1.DOFade(1, 0.2f));
        float imageTime = 0.3f;
        agentTweenSeq.Append(Image1.transform.DOScale(Vector3.one, imageTime).SetEase(Ease.InOutBack));//变化图片大小
        agentTweenSeq.Join(Image1.DOFade(1, imageTime));
        agentTweenSeq.Join(waveText.DOText(_waveInfo, 0.2f));

        Image Image2 = transform.Find("Image2").GetComponent<Image>();
        agentTweenSeq.Append(Image2.transform.DOScale(Vector3.one, 0.2f));//变化图片大小
        agentTweenSeq.Join(Image2.DOFade(1, 0.2f));
        agentTweenSeq.Append(Image2.transform.DOScale(Vector3.one, imageTime).SetEase(Ease.InOutBack));//变化图片大小
        agentTweenSeq.Join(Image2.DOFade(1, imageTime));

        Image Image3 = transform.Find("Image3").GetComponent<Image>();
        agentTweenSeq.Append(Image3.transform.DOScale(Vector3.one, 0.2f));//变化图片大小
        agentTweenSeq.Join(Image3.DOFade(1, 0.2f));
        agentTweenSeq.Append(Image3.transform.DOScale(Vector3.one, imageTime).SetEase(Ease.InOutBack));//变化图片大小
        agentTweenSeq.Join(Image3.DOFade(1, imageTime));
        agentTweenSeq.Join(DOTween.To(delegate (float value)
        {
            var temp = Math.Floor(value);
@@ -292,7 +293,8 @@
    bool goonFade;
    private void ShowGoOnText()
    {
        goonText.DOFade(goonFade ? 0 : 1, 0.5f).OnComplete(ShowGoOnText);
        goonText.DOFade(goonFade ? 0 : 1, 0.8f).SetEase(Ease.InOutQuad).OnComplete(ShowGoOnText);
        goonText.transform.DOScale(goonFade ? 0.9f : 1.1f, 0.8f);
        goonFade = !goonFade;
    }


 Assets/StreamingAssets/Table/elf_upgrade.json

@@ -1 +1 @@
[[1,1000,1,0.65],[2,2000,1,0.75],[3,3000,2,0.85],[4,4000,2,1],[5,5000,3,1.1],[6,6000,3,1.1],[7,7000,4,1.1],[8,8000,4,1.1],[9,9000,5,1.2],[10,10000,5,1.2]]
[[1,1000,1,0.85],[2,2000,2,0.85],[3,3000,3,0.85],[4,4000,4,0.85],[5,5000,5,0.85],[6,6000,5,0.85],[7,7000,5,0.85],[8,8000,5,0.85],[9,9000,5,0.85],[10,10000,5,0.85]]

 Assets/StreamingAssets/Table/endless_buff.json

@@ -1 +1 @@
[["1","低级火灵之力",[3,101],[1,10,0],"-1","增加全体火精灵10%攻击力","6","8",10001,1,"99"],["2","低级水灵之力",[3,201],[1,12,0],-1,"增加全体水精灵12%攻击力",6,8,10002,1,"99"],["3","低级木灵之力",[3,301],[1,15,0],-1,"增加全体木精灵15%攻击力",6,8,10003,1,"99"],["4","攻击力增加",[1,0],[1,8,0],"-1","增加全体8%攻击力","0",5,"10005","1","99"],["5","意外收获",[0],[2,200,0],0,"增加200金币","0","5","10007","1","99"],["6","精灵魔盒",[0],[3,2,200],0,"随机获得一个2级精灵","2","4",10006,"1","10"],["7","暴击增加",[1,0],[5,50,0],-1,"全体暴击率+5%","0","3","10021","1","3"],["8","爆伤增加",[1,0],[6,80,0],-1,"全体暴击伤害+8%","0","3","10022","1","2"],["9","火灵之力",[3,101],[1,20,0],-1,"增加全体火精灵20%攻击力",9,12,10001,2,"99"],["10","水灵之力",[3,201],[1,24,0],-1,"增加全体水精灵24%攻击力",9,12,10002,2,"99"],["11","木灵之力",[3,301],[1,30,0],-1,"增加全体木精灵30%攻击力",9,12,10003,2,"99"],["12","精灵之力",[1,0],[1,50,0],2,"2波增加全体精灵50%攻击力","99",99,"10005",2,1],["13","飞来横财",[0],[2,400,0],0,"增加400金币","6","8","10008","2","99"],["14","超级精灵魔盒",[0],[3,3,400],0,"随机获得一个3级精灵","5","7",10006,"2","10"],["15","暴击增加",[1,0],[5,100,0],-1,"全体暴击率+10%","4","7","10021","2","3"],["16","爆伤增加",[1,0],[6,150,0],-1,"全体暴击伤害+15%","4","7","10022","2","2"],["17","攻速增加",[1,0],[4,0.1,0.5],"-1","全体攻速+10%","0","5","10023","2","1"],["18","弹夹扩容",[3,301],[7,2,0],-1,"玉米精灵高能子弹+1",6,99,"10016","2","1"],["19","爆裂狂怒",[3,101],[9,7,0],-1,"火鸟精灵充能后攻速+35%",6,99,"10026","2","1"],["20","高级火灵之力",[3,101],[1,30,0],-1,"增加全体火精灵30%攻击力","12","16","10001",3,"99"],["21","高级水灵之力",[3,201],[1,35,0],-1,"增加全体水精灵35%攻击力","12","16","10002",3,"99"],["22","高级木灵之力",[3,301],[1,40,0],-1,"增加全体木精灵40%攻击力","12","16","10003",3,"99"],["23","特级火灵之力",[3,101],[1,40,0],-1,"增加全体火精灵40%攻击力","15","99","10001","4","0"],["24","特级水灵之力",[3,201],[1,50,0],-1,"增加全体水精灵50%攻击力","15","99","10002","4","0"],["25","特级木灵之力",[3,301],[1,60,0],-1,"增加全体木精灵60%攻击力","15","99","10003","4","0"],["26","狂暴之力",[1,0],[1,65,0],2,"2波内增加全体精灵65%攻击力","99",99,10005,3,1],["27","攻速增加_水",[3,201],[4,0.25,0.5],-1,"水精灵攻速+25%","6",99,"10019",3,"2"],["28","攻速增加_火",[3,101],[4,0.3,0.5],-1,"火精灵攻速+30%","99",99,"10013",3,"2"],["29","攻速增加_木",[3,301],[4,0.2,0.5],-1,"木精灵攻速+20%",6,99,"10017",3,"2"],["30","暴击_木",[3,301],[5,300,0],-1,"木系精灵暴击率+30%",6,99,"10015",3,"2"],["31","暴怒_木",[3,301],[6,350,0],-1,"木系精灵暴击伤害+35%",6,99,"10014",3,"2"],["32","暴击_火",[3,101],[5,250,0],-1,"火系精灵暴击率+25%",6,99,"10012",3,"3"],["33","暴怒_火",[3,101],[6,300,0],-1,"火系精灵暴击伤害+30%",6,99,"10011",3,"2"],["34","暴击_水",[3,201],[5,300,0],-1,"水系精灵暴击率+30%",6,99,"10019",3,"2"],["35","暴怒_水",[3,201],[6,350,0],-1,"水系精灵暴击伤害+35%",6,99,"10020",3,"2"],["36","超级弹夹",[3,301],[7,3,0],-1,"玉米精灵高能子弹+2","9",99,"10016","4","1"],["37","超级爆裂狂怒",[3,101],[9,9,0],-1,"火鸟精灵充能后攻速+60%","9",99,"10026","4","1"],["38","技能提升",[4,0],[10,1,0],-1,"全体技能等级+1",6,99,"10005",3,"4"],["39","快速蓄能",[3,301],[11,0.3,0.8],-1,"玉米精灵蓄力时间-30%","7",99,"10018","4","3"],["40","中大奖",[0],[2,800,0],"-1","增加800金币","9",99,"10010","3","99"],["41","特级精灵魔盒",[0],[3,4,800],"-1","随机获得一个4级精灵","11","99","10006","4","2"],[42,"寒气_水",[3,201],[12,80,0],"-1","水精灵任意攻击冰冻概率+8%","4","99","10019",3,"3"],[43,"冻伤_水",[3,201],[13,300,0],"-1","水精灵对冰冻的敌人伤害+30%","6","99","10019",3,4],[44,"冰冻延时",[3,201],[14,1,0],"-1","水精灵冰冻时间+1秒","6","99","10020",3,3]]
[["1","低级火灵之力",[3,101],[1,10,0],"-1","增加愤怒小鸡10%攻击力","6","9","10024","2","99"],["2","低级水灵之力",[3,201],[1,12,0],-1,"增加雪糕投手12%攻击力",6,"9","10020","2","99"],["3","低级木灵之力",[3,301],[1,15,0],-1,"增加玉米枪手15%攻击力",6,"9","10025","2","99"],["4","攻击力增加",[1,0],[1,8,0],"-1","增加全体8%攻击力","0",5,"10005","1","99"],["5","意外收获",[0],[2,200,0],0,"增加200金币","0","5","10007","1","99"],["6","精灵魔盒",[0],[3,3,200],0,"随机获得一个3级精灵","2","4",10006,"1","10"],["7","暴击增加",[1,0],[5,50,0],-1,"全体暴击率+5%","0","3","10021","1","3"],["8","爆伤增加",[1,0],[6,80,0],-1,"全体暴击伤害+8%","0","3","10022","1","2"],["9","火灵之力",[3,101],[1,20,0],-1,"增加愤怒小鸡20%攻击力",9,"15","10024","3","99"],["10","水灵之力",[3,201],[1,24,0],-1,"增加雪糕投手24%攻击力",9,"15","10020","3","99"],["11","木灵之力",[3,301],[1,30,0],-1,"增加玉米枪手30%攻击力",9,"15","10025","3","99"],["12","精灵之力",[1,0],[1,50,0],2,"2波增加全体精灵50%攻击力","99",99,"10005",2,1],["13","飞来横财",[0],[2,400,0],0,"增加400金币","6","8","10008","2","99"],["14","超级精灵魔盒",[0],[3,4,400],0,"随机获得一个4级精灵","5","8",10006,"2","10"],["15","暴击增加",[1,0],[5,100,0],-1,"全体暴击率+10%","4","9","10021","2","3"],["16","爆伤增加",[1,0],[6,150,0],-1,"全体暴击伤害+15%","4","9","10022","2","2"],["17","攻速增加",[1,0],[4,0.1,0.5],"-1","全体攻速+10%","0","5","10023","2","1"],["18","弹夹扩容",[3,301],[7,2,0],-1,"玉米枪手高能子弹+1",6,99,"10016","2","1"],["19","爆裂狂怒",[3,101],[9,7,0],-1,"愤怒小鸡充能后攻速+30%",6,99,"10026","2","1"],["20","高级火灵之力",[3,101],[1,30,0],-1,"增加愤怒小鸡30%攻击力","12","99","10024","4","99"],["21","高级水灵之力",[3,201],[1,36,0],-1,"增加雪糕投手36%攻击力","12","99","10020","4","99"],["22","高级木灵之力",[3,301],[1,45,0],-1,"增加玉米枪手45%攻击力","12","99","10025","4","99"],["23","特级火灵之力",[3,101],[1,40,0],-1,"增加愤怒小鸡40%攻击力","99","99","10024","4","0"],["24","特级水灵之力",[3,201],[1,50,0],-1,"增加雪糕投手50%攻击力","99","99","10020","4","0"],["25","特级木灵之力",[3,301],[1,60,0],-1,"增加玉米枪手60%攻击力","99","99","10025","4","0"],["26","攻速增加_水",[3,201],[4,0.25,0.5],-1,"雪糕头说攻速+25%","6",99,"10019",3,"2"],["27","攻速增加_火",[3,101],[4,0.3,0.5],-1,"愤怒小鸡攻速+30%","99",99,"10013",3,"1"],["28","攻速增加_木",[3,301],[4,0.2,0.5],-1,"玉米枪手攻速+20%",6,99,"10017",3,"2"],["29","暴击_木",[3,301],[5,300,0],-1,"玉米枪手暴击率+30%",6,99,"10015",3,"2"],["30","暴怒_木",[3,301],[6,350,0],-1,"玉米枪手暴击伤害+35%",6,99,"10014",3,"2"],["31","暴击_火",[3,101],[5,250,0],-1,"愤怒小鸡暴击率+25%",6,99,"10012",3,"2"],["32","暴怒_火",[3,101],[6,300,0],-1,"愤怒小鸡暴击伤害+30%",6,99,"10011",3,"2"],["33","暴击_水",[3,201],[5,300,0],-1,"雪糕投手暴击率+30%",6,99,"10019",3,"2"],["34","暴怒_水",[3,201],[6,350,0],-1,"雪糕投手暴击伤害+35%",6,99,"10020",3,"2"],["35","超级弹夹",[3,301],[7,3,0],-1,"玉米枪手高能子弹+2","9",99,"10016","4","1"],["36","超级爆裂狂怒",[3,101],[9,8,0],-1,"愤怒小鸡充能后攻速+60%","9",99,"10026","4","1"],["37","技能提升",[4,0],[10,1,0],-1,"全体技能等级+1",6,99,"10005",3,"4"],["38","快速蓄能",[3,301],[11,0.3,0.8],-1,"玉米枪手蓄力时间-30%","7",99,"10018","4","3"],["39","中大奖",[0],[2,800,0],"0","增加800金币","9",99,"10010","3","99"],["40","一夜暴富",[0],[2,1500,0],"0","增加1500金币","11","99","10010","4","99"],["41","特级精灵魔盒",[0],[3,5,800],"-1","随机获得一个5级精灵","11","99","10006","4","2"],["42","寒气_水",[3,201],[12,80,0],"-1","雪糕投手攻击冰冻概率+8%","4","99","10019",3,"3"],["43","冻伤_水",[3,201],[13,300,0],"-1","雪糕投手对冰冻的敌人伤害+30%","6","99","10019",3,4],["44","冰冻延时",[3,201],[14,1,0],"-1","冰冻时间+1秒","6","99","10020",3,3]]