GemBattle.git - Gitblit

parent: c1143b4d | patch | commit | ignore whitespace

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

liuzhiwei

2020-11-18 254c3e4d509c586dc6620c681004eefd5d86182c

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

34 files modified

	And/GemBattle.apk	patch \| view \| raw \| blame \| history
	Assets/Materials/UI/tileTowerVSMat.mat	2 ●●●●● patch \| view \| raw \| blame \| history
	Assets/Prefabs/UI/Endless/BottomCanvas.prefab	14 ●●●●● patch \| view \| raw \| blame \| history
	Assets/Prefabs/UI/EndlessTileGridBuyBtn.prefab	6 ●●●●● patch \| view \| raw \| blame \| history
	Assets/Prefabs/UI/FreezeEnergy.prefab	2 ●●●●● patch \| view \| raw \| blame \| history
	Assets/Scenes/Levels/Battle/Endless2D.unity	28 ●●●●● patch \| view \| raw \| blame \| history
	Assets/Scenes/LoadingScene.unity	2 ●●●●● patch \| view \| raw \| blame \| history
	Assets/Scripts/TowerDefense/Affectors/AttackAffector.cs	15 ●●●●● patch \| view \| raw \| blame \| history
	Assets/Scripts/TowerDefense/Towers/Placement/TowerPlacementGridEndless.cs	16 ●●●●● patch \| view \| raw \| blame \| history
	Assets/Scripts/TowerDefense/UI/EndlessHomeBaseHPManager.cs	2 ●●●●● patch \| view \| raw \| blame \| history
	Assets/Scripts/TowerDefense/UI/FreezeBreath.cs	25 ●●●●● patch \| view \| raw \| blame \| history
	Assets/Scripts/TowerDefense/UI/HUD/EndlessCurrencyUI.cs	4 ●●●●● patch \| view \| raw \| blame \| history
	Assets/Scripts/TowerDefense/UI/HUD/EndlessGameUI.cs	36 ●●●●● patch \| view \| raw \| blame \| history
	Assets/StreamingAssets/Table/endless_buff.json	2 ●●●●● patch \| view \| raw \| blame \| history
	Assets/UI/Loading/LoadingBg.png	patch \| view \| raw \| blame \| history
	Assets/UI/Loading/LoadingBg.png.meta	10 ●●●●● patch \| view \| raw \| blame \| history
	GemBattle.zip	patch \| view \| raw \| blame \| history
	GemBattle/宝石塔防_Data/Managed/Assembly-CSharp-firstpass.dll	patch \| view \| raw \| blame \| history
	GemBattle/宝石塔防_Data/Managed/Assembly-CSharp.dll	patch \| view \| raw \| blame \| history
	GemBattle/宝石塔防_Data/Managed/MoreMountains.NiceVibrations.Demos.dll	patch \| view \| raw \| blame \| history
	GemBattle/宝石塔防_Data/Managed/MoreMountains.NiceVibrations.Haptics.dll	patch \| view \| raw \| blame \| history
	GemBattle/宝石塔防_Data/Managed/MoreMountains.NiceVibrations.dll	patch \| view \| raw \| blame \| history
	GemBattle/宝石塔防_Data/Managed/Unity.TextMeshPro.dll	patch \| view \| raw \| blame \| history
	GemBattle/宝石塔防_Data/Managed/Unity.Timeline.dll	patch \| view \| raw \| blame \| history
	GemBattle/宝石塔防_Data/Managed/UnityEngine.UI.dll	patch \| view \| raw \| blame \| history
	GemBattle/宝石塔防_Data/StreamingAssets/Table/endless_buff.json	2 ●●●●● patch \| view \| raw \| blame \| history
	GemBattle/宝石塔防_Data/globalgamemanagers	patch \| view \| raw \| blame \| history
	GemBattle/宝石塔防_Data/globalgamemanagers.assets	patch \| view \| raw \| blame \| history
	GemBattle/宝石塔防_Data/level0	patch \| view \| raw \| blame \| history
	GemBattle/宝石塔防_Data/level1	patch \| view \| raw \| blame \| history
	GemBattle/宝石塔防_Data/resources.assets	patch \| view \| raw \| blame \| history
	GemBattle/宝石塔防_Data/sharedassets0.assets	patch \| view \| raw \| blame \| history
	GemBattle/宝石塔防_Data/sharedassets0.assets.resS	patch \| view \| raw \| blame \| history
	GemBattle/宝石塔防_Data/sharedassets1.assets	patch \| view \| raw \| blame \| history

 And/GemBattle.apk

Binary files differ

 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: 8c9a3d26120e78f40aa4ef9ed23d573c, type: 3}
        m_Texture: {fileID: 2800000, guid: 93f40a01d57fbff418fc0b54b6ab7d9f, type: 3}
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    - _MetallicGlossMap:

 Assets/Prefabs/UI/Endless/BottomCanvas.prefab

@@ -113,7 +113,7 @@
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0.5, y: 0}
  m_AnchorMax: {x: 0.5, y: 0}
  m_AnchoredPosition: {x: -114, y: 98}
  m_AnchoredPosition: {x: -114, y: 128}
  m_SizeDelta: {x: 310, y: 140}
  m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5151289279430454484
@@ -708,7 +708,7 @@
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0.5, y: 0}
  m_AnchorMax: {x: 0.5, y: 0}
  m_AnchoredPosition: {x: 215, y: 98}
  m_AnchoredPosition: {x: 215, y: 128}
  m_SizeDelta: {x: 310, y: 140}
  m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4623057511312575047
@@ -2811,7 +2811,7 @@
  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: 316, y: -57}
  m_AnchoredPosition: {x: 316, y: -107}
  m_SizeDelta: {x: 100, y: 100}
  m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &4623057512101065368
@@ -4743,7 +4743,7 @@
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0.5, y: 0}
  m_AnchorMax: {x: 0.5, y: 0}
  m_AnchoredPosition: {x: -419, y: 89}
  m_AnchoredPosition: {x: -419, y: 119}
  m_SizeDelta: {x: 180, y: 40}
  m_Pivot: {x: 0.5, y: 1}
--- !u!222 &4623057513073301100
@@ -4939,7 +4939,7 @@
  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: 0, y: -341}
  m_AnchoredPosition: {x: 0, y: -391}
  m_SizeDelta: {x: 1080, y: 1080}
  m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4623057513214273139
@@ -5320,7 +5320,7 @@
  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: 22, y: -104}
  m_AnchoredPosition: {x: 22, y: -154}
  m_SizeDelta: {x: 100, y: 100}
  m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &4623057513414159487
@@ -7350,7 +7350,7 @@
    - target: {fileID: 162820266587863501, guid: 550ad0a7c16a47a49bfb36ef49a73a67,
        type: 3}
      propertyPath: m_AnchoredPosition.y
      value: 96
      value: 126
      objectReference: {fileID: 0}
    - target: {fileID: 162820266587863501, guid: 550ad0a7c16a47a49bfb36ef49a73a67,
        type: 3}

 Assets/Prefabs/UI/EndlessTileGridBuyBtn.prefab

@@ -262,8 +262,8 @@
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0.5, y: 0.5}
  m_AnchorMax: {x: 0.5, y: 0.5}
  m_AnchoredPosition: {x: 0, y: 0}
  m_SizeDelta: {x: 80, y: 80}
  m_AnchoredPosition: {x: 0, y: -10}
  m_SizeDelta: {x: 100, y: 100}
  m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1179723933380362119
CanvasRenderer:
@@ -286,7 +286,7 @@
  m_Name: 
  m_EditorClassIdentifier: 
  m_Material: {fileID: 0}
  m_Color: {r: 1, g: 1, b: 1, a: 0}
  m_Color: {r: 1, g: 1, b: 1, a: 1}
  m_RaycastTarget: 1
  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
  m_Maskable: 1

 Assets/Prefabs/UI/FreezeEnergy.prefab

@@ -90,7 +90,7 @@
  m_Name: 
  m_EditorClassIdentifier: 
  ProgressImg: {fileID: 4636030447972189695}
  FreezeJet: {fileID: 3459016936373460007, guid: ca3ce846fd72b2e4bbb24b3a46cc42d0,
  FreezeJet: {fileID: 313942322445951525, guid: d052efd0b42a0cd4e9b77f897a6ad84d,
    type: 3}
--- !u!1 &4636030447972189693
GameObject:

 Assets/Scenes/Levels/Battle/Endless2D.unity

@@ -6382,7 +6382,6 @@
  m_Component:
  - component: {fileID: 1340671931}
  - component: {fileID: 1340671930}
  - component: {fileID: 1340671929}
  - component: {fileID: 1340671928}
  - component: {fileID: 1340671927}
  - component: {fileID: 1340671925}
@@ -6490,19 +6489,6 @@
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 1340671924}
  m_Enabled: 1
--- !u!114 &1340671929
MonoBehaviour:
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 1340671924}
  m_Enabled: 1
  m_EditorHideFlags: 0
  m_Script: {fileID: 11500000, guid: 38f5f2cd2c401054e80686aac9879bb1, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
  bAdjViewPort: 0
--- !u!20 &1340671930
Camera:
  m_ObjectHideFlags: 0
@@ -6622,6 +6608,7 @@
  - component: {fileID: 1361392479}
  - component: {fileID: 1361392478}
  - component: {fileID: 1361392477}
  - component: {fileID: 1361392480}
  m_Layer: 0
  m_Name: SceneCamera3D
  m_TagString: Untagged
@@ -6694,6 +6681,19 @@
  m_Father: {fileID: 0}
  m_RootOrder: 9
  m_LocalEulerAnglesHint: {x: 60, y: 0, z: 0}
--- !u!114 &1361392480
MonoBehaviour:
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 1361392476}
  m_Enabled: 1
  m_EditorHideFlags: 0
  m_Script: {fileID: 11500000, guid: 38f5f2cd2c401054e80686aac9879bb1, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
  bAdjViewPort: 0
--- !u!1 &1384281165
GameObject:
  m_ObjectHideFlags: 0

 Assets/Scenes/LoadingScene.unity

@@ -302,7 +302,7 @@
  m_OnCullStateChanged:
    m_PersistentCalls:
      m_Calls: []
  m_Sprite: {fileID: 21300000, guid: d92d2a99b7830234da2e494f43c6d7f2, type: 3}
  m_Sprite: {fileID: 21300000, guid: e187cb70474cf834fb08574deefcb084, type: 3}
  m_Type: 0
  m_PreserveAspect: 0
  m_FillCenter: 1

 Assets/Scripts/TowerDefense/Affectors/AttackAffector.cs

@@ -132,7 +132,7 @@
        /// </summary>
        protected float freezeBreathCallTime = 0;

        protected float inFreezeBreath = 0;
        protected float inFreezeBreath;

        protected float freezeBreathBackTimer = 0;

@@ -405,22 +405,25 @@

                    if (processInt == (int)Mathf.Floor(FreezeBreath.ChargeTime))
                    {
                        inFreezeBreath = FreezeBreath.EffectTime;
                        inFreezeBreath = towerPtr.FreezeBreathCtrl.SkillTime;
                        towerPtr.FreezeBreathProgressOffset = 0;
                        towerPtr.PlayFreezeBreathEffect(true);
                        towerPtr.FreezeBreathCtrl.ReleaseCount = 1;
                        towerPtr.FreezeBreathCtrl.PlayFreezeEffect(waveLineID);
                        towerPtr.FreezeBreathCtrl.ReleaseFreeze(waveLineID, finalDamage, damager.alignmentProvider);
                    }
                }
                else
                {
                    inFreezeBreath -= Time.deltaTime;
                    int time = Mathf.FloorToInt(towerPtr.FreezeBreathCtrl.EffectTime / (towerPtr.FreezeBreathCtrl.DamageCount - 1) * 10);
                    int interval = Mathf.FloorToInt(inFreezeBreath * 10);
                    int offset = Mathf.FloorToInt(towerPtr.FreezeBreathCtrl.SkillTime * 10) - Mathf.FloorToInt(towerPtr.FreezeBreathCtrl.EffectTime * 10);

                    if (inFreezeBreath <= FreezeBreath.EffectTime / 2 && towerPtr.FreezeBreathCtrl.ReleaseCount != 2)
                    if (interval == time * (towerPtr.FreezeBreathCtrl.DamageCount - towerPtr.FreezeBreathCtrl.ReleaseCount - 1) + offset && towerPtr.FreezeBreathCtrl.ReleaseCount < towerPtr.FreezeBreathCtrl.DamageCount)
                    {
                        towerPtr.FreezeBreathCtrl.ReleaseCount = 2;
                        ++towerPtr.FreezeBreathCtrl.ReleaseCount;
                        towerPtr.FreezeBreathCtrl.ReleaseFreeze(waveLineID, finalDamage, damager.alignmentProvider);
                        return;
                    }

                    if (inFreezeBreath <= 0)
@@ -429,8 +432,6 @@
                        freezeBreathCallTime = 0;
                        towerPtr.FreezeBreathCtrl.SetProgress(0);
                        towerPtr.PlayFreezeBreathEffect(false);
                        towerPtr.FreezeBreathCtrl.ReleaseCount = 3;
                        towerPtr.FreezeBreathCtrl.ReleaseFreeze(waveLineID, finalDamage, damager.alignmentProvider);
                    }
                }
            }

 Assets/Scripts/TowerDefense/Towers/Placement/TowerPlacementGridEndless.cs

@@ -1028,14 +1028,14 @@
                    if (m_arrGridType[ix, y] == PlacementGridType.EGridOpen)
                    {
                        canPlace = true;
                        for (int i = 0; i < allTowerP.Count; i++)
                        {
                            if (allTowerP[i].x == ix && allTowerP[i].y == y)
                            {
                                canPlace = false;
                                break;
                            }
                        }
                        // for (int i = 0; i < allTowerP.Count; i++)
                        // {
                        //     if (allTowerP[i].x == ix && allTowerP[i].y == y)
                        //     {
                        //         canPlace = false;
                        //         break;
                        //     }
                        // }
                        m_Tiles[ix, y].CheckCanPlace(canPlace);
                    }
                }

 Assets/Scripts/TowerDefense/UI/EndlessHomeBaseHPManager.cs

@@ -70,7 +70,7 @@
                ++i;
            }

            ViewPortAdj.instance.cachedCamera.DOShakePosition(0.25f, 1.5f, 4);
            ViewPortAdj.instance.cachedCamera.DOShakePosition(0.25f, 1.5f, 4);//这里只可以震动3D场景中的东西
            MMVibrationManager.Haptic(HapticTypes.HeavyImpact);

            if (CurrentHP == 0)

 Assets/Scripts/TowerDefense/UI/FreezeBreath.cs

@@ -28,9 +28,20 @@
        public static float ChargeTime { get; private set; } = 10f;

        /// <summary>
        /// 技能持续时间
        /// 伤害时间
        /// </summary>
        public static float EffectTime { get; private set; } = 1f;
        public float EffectTime { get; private set; } = 2f;

        /// <summary>
        /// 伤害结算次数
        /// </summary>
        /// <value></value>
        public int DamageCount { get; private set; } = 6;

        /// <summary>
        /// 整个技能时间
        /// </summary>
        public float SkillTime { get; private set; } = 2.5f;

        /// <summary>
        /// 当前的充能进度
@@ -87,8 +98,6 @@
                agentList.Add(list[i]);
            }

            PlayFreezeEffect(waveLineId);

            while (agentList.Count > 0)
            {
                Agent agent = agentList[0];
@@ -103,8 +112,14 @@
            }
        }

        private void PlayFreezeEffect(int waveLineId)
        public void PlayFreezeEffect(int waveLineId)
        {
            WaveLineAgentInsMgr[] agentInsMgrs = AgentInsManager.instance.GetWaveLineList();
            WaveLineAgentInsMgr waveLineAgentInsMgr = agentInsMgrs[waveLineId];
            List<Agent> list = waveLineAgentInsMgr.listAgent;

            if (list.Count == 0) return;

            GameObject obj = Poolable.TryGetPoolable(FreezeJet);
            ParticleSystem ps = obj.GetComponent<ParticleSystem>();


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

@@ -45,7 +45,9 @@
        protected void UpdateDisplay()
        {
            int current = currency.currentCurrency;
            DisplayText.text = AddNumberSemi(current.ToString());
            //DisplayText.text = AddNumberSemi(current.ToString());
            DisplayText.text = current.ToString();

        }

        /// <summary>

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

@@ -882,29 +882,29 @@
            {
                if (m_CurrentTower.controller.towerFeature == EFeatureTower.NULL)
                {
                    List<IntVector2> allTowerP = new List<IntVector2>();
                    List<IntVector2> allPSTowerP = new List<IntVector2>();//需要播放升级动画的
                    // List<IntVector2> allTowerP = new List<IntVector2>();//排除不能合成的
                    // List<IntVector2> allPSTowerP = new List<IntVector2>();//需要播放升级动画的

                    for (int i = 0; i < m_listTower.Count; i++)
                    {
                        if (m_listTower[i].bInAttackMode && towerToMove && m_listTower[i].currentLevel == dragTowerLevel && m_listTower[i].towerName == towerToMove.towerName)
                        {
                            if (towerToMove.gridPosition != m_listTower[i].gridPosition)
                                //说明可以合成
                                allPSTowerP.Add(m_listTower[i].gridPosition);
                        }
                        else
                        {
                            //把不符合条件的传进去
                            allTowerP.Add(m_listTower[i].gridPosition);
                        }
                    }
                    // for (int i = 0; i < m_listTower.Count; i++)
                    // {
                    //     if (m_listTower[i].bInAttackMode && towerToMove && m_listTower[i].currentLevel == dragTowerLevel && m_listTower[i].towerName == towerToMove.towerName)
                    //     {
                    //         if (towerToMove.gridPosition != m_listTower[i].gridPosition)
                    //             //说明可以合成
                    //             allPSTowerP.Add(m_listTower[i].gridPosition);
                    //     }
                    //     else
                    //     {
                    //         //把不符合条件的传进去
                    //         allTowerP.Add(m_listTower[i].gridPosition);
                    //     }
                    // }
                    if (m_CurrentArea != null)
                    {
                        (m_CurrentArea as TowerPlacementGridEndless).CheckAllCanPlace(allTowerP);
                        //修改为只要开启格子都可以放
                        (m_CurrentArea as TowerPlacementGridEndless).CheckAllCanPlace(null);
                        //(m_CurrentArea as TowerPlacementGridEndless).PlayPS(allPSTowerP);
                    }


                }
                else if (m_CurrentTower.controller.towerFeature == EFeatureTower.Skill_Fire || m_CurrentTower.controller.towerFeature == EFeatureTower.Skill_Bomb)

 Assets/StreamingAssets/Table/endless_buff.json

@@ -1 +1 @@
[[1,"低级火灵之力",[2,1],[1,10,0],-1,"增加全体火精灵10%攻击力",0,99,10001,1,1],[2,"低级水灵之力",[2,2],[1,10,0],-1,"增加全体水精灵10%攻击力",0,99,10002,1,1],[3,"低级木灵之力",[2,3],[1,10,0],-1,"增加全体木精灵10%攻击力",0,99,10003,1,1],[4,"火灵之力",[2,1],[1,15,0],-1,"增加全体火精灵15%攻击力",4,99,10001,2,1],[5,"水灵之力",[2,2],[1,15,0],-1,"增加全体水精灵15%攻击力",4,99,10002,2,1],[6,"木灵之力",[2,3],[1,15,0],-1,"增加全体木精灵15%攻击力",4,99,10003,2,1],[7,"高级火灵之力",[2,1],[1,20,0],-1,"增加全体火精灵20%攻击力",7,99,10001,3,1],[8,"高级水灵之力",[2,2],[1,20,0],-1,"增加全体水精灵20%攻击力",7,99,10002,3,1],[9,"高级木灵之力",[2,3],[1,20,0],-1,"增加全体木精灵20%攻击力",7,99,10003,3,1],[10,"精灵之力",[1,0],[1,50,0],2,"2波增加全体精灵50%攻击力",3,99,10004,2,1],[11,"狂暴之力",[1,0],[1,65,0],2,"2波内增加全体精灵65%攻击力",3,99,10005,3,1],[12,"飞来横财",[0],[2,300,0],0,"增加300金币",0,99,10007,1,1],[13,"中大奖!",[0],[2,800,0],0,"增加800金币",4,99,10007,3,1],[14,"精灵魔盒",[0],[3,3,300],0,"随机获得一个3级精灵",99,99,10006,2,1],[15,"超级精灵魔盒",[0],[3,4,500],0,"随机获得一个4级精灵",99,99,10006,3,1],[16,"时空之力：水",[2,2],[4,0.2,0.5],-1,"水精灵攻速+25%",0,99,"10013",3,0],[17,"时空之力：火",[2,1],[4,0.2,0.5],-1,"火精灵攻速+25%",0,99,"10013",3,0],[18,"时空之力：木",[2,3],[4,0.2,0.5],-1,"木精灵攻速+25%",0,99,"10013",3,0],[19,"狂暴：玉米枪手",[3,109],[5,150,0],-1,"玉米精灵暴击率+15%",0,99,"10012",3,0],[20,"暴怒：玉米枪手",[3,109],[6,300,0],-1,"玉米精灵暴击伤害+30%",0,99,"10011",3,0],[21,"弹夹扩容：玉米枪手",[3,109],[7,2,0],-1,"玉米精灵高能子弹数量变为2颗",0,99,10008,3,0],[22,"爆裂狂怒：炸弹火鸟",[3,101],[9,10,0],-1,"火鸟精灵充能后变为10倍攻速",0,99,10009,3,0]]
[[1,"低级火灵之力",[2,1],[1,10,0],-1,"增加全体火精灵10%攻击力",0,99,10001,1,1],[2,"低级水灵之力",[2,2],[1,10,0],-1,"增加全体水精灵10%攻击力",0,99,10002,1,1],[3,"低级木灵之力",[2,3],[1,10,0],-1,"增加全体木精灵10%攻击力",0,99,10003,1,1],[4,"火灵之力",[2,1],[1,15,0],-1,"增加全体火精灵15%攻击力",4,99,10001,2,1],[5,"水灵之力",[2,2],[1,15,0],-1,"增加全体水精灵15%攻击力",4,99,10002,2,1],[6,"木灵之力",[2,3],[1,15,0],-1,"增加全体木精灵15%攻击力",4,99,10003,2,1],[7,"高级火灵之力",[2,1],[1,20,0],-1,"增加全体火精灵20%攻击力",7,99,10001,3,1],[8,"高级水灵之力",[2,2],[1,20,0],-1,"增加全体水精灵20%攻击力",7,99,10002,3,1],[9,"高级木灵之力",[2,3],[1,20,0],-1,"增加全体木精灵20%攻击力",7,99,10003,3,1],[10,"精灵之力",[1,0],[1,50,0],2,"2波增加全体精灵50%攻击力",3,99,10004,2,1],[11,"狂暴之力",[1,0],[1,65,0],2,"2波内增加全体精灵65%攻击力",3,99,10005,3,1],[12,"飞来横财",[0],[2,300,0],0,"增加300金币",0,99,10007,1,1],[13,"中大奖!",[0],[2,800,0],0,"增加800金币",4,99,10007,3,1],[14,"精灵魔盒",[0],[3,3,300],0,"随机获得一个3级精灵",99,99,10006,2,1],[15,"超级精灵魔盒",[0],[3,4,500],0,"随机获得一个4级精灵",99,99,10006,3,1],[16,"攻速增加_水",[2,2],[4,0.3,0.5],-1,"水精灵攻速+30%","4",99,"10013",3,0],[17,"攻速增加_火",[2,1],[4,0.3,0.5],-1,"火精灵攻速+30%","4",99,"10013",3,0],[18,"攻速增加_木",[2,3],[4,0.5,0.5],-1,"木精灵攻速+30%","4",99,"10013",3,0],[19,"暴击_木",[3,109],[5,150,0],-1,"木系精灵暴击率+15%","2",99,"10012",3,0],[20,"暴怒_木",[3,109],[6,300,0],-1,"木系精灵暴击伤害+30%","4",99,"10011",3,0],[21,"弹夹扩容",[3,109],[7,2,0],-1,"玉米精灵高能子弹+1","4",99,10008,3,0],[22,"爆裂狂怒",[3,101],[9,8,0],-1,"火鸟精灵充能后攻速+50%","4",99,10009,3,0],[23,"暴击_火",[3,101],[5,150,0],-1,"火系精灵暴击率+15%","2",99,"10012",3,0],[24,"暴怒_火",[3,101],[6,300,0],-1,"火系精灵暴击伤害+30%","4",99,"10011",3,0]]

 Assets/UI/Loading/LoadingBg.png



 Assets/UI/Loading/LoadingBg.png.meta

@@ -63,7 +63,7 @@
  platformSettings:
  - serializedVersion: 3
    buildTarget: DefaultTexturePlatform
    maxTextureSize: 2048
    maxTextureSize: 4096
    resizeAlgorithm: 0
    textureFormat: -1
    textureCompression: 1
@@ -75,7 +75,7 @@
    forceMaximumCompressionQuality_BC6H_BC7: 0
  - serializedVersion: 3
    buildTarget: Standalone
    maxTextureSize: 2048
    maxTextureSize: 4096
    resizeAlgorithm: 0
    textureFormat: -1
    textureCompression: 1
@@ -87,14 +87,14 @@
    forceMaximumCompressionQuality_BC6H_BC7: 0
  - serializedVersion: 3
    buildTarget: Android
    maxTextureSize: 2048
    maxTextureSize: 4096
    resizeAlgorithm: 0
    textureFormat: 4
    textureFormat: -1
    textureCompression: 1
    compressionQuality: 50
    crunchedCompression: 0
    allowsAlphaSplitting: 0
    overridden: 1
    overridden: 0
    androidETC2FallbackOverride: 0
    forceMaximumCompressionQuality_BC6H_BC7: 0
  spriteSheet:

 GemBattle.zip

Binary files differ

 GemBattle/宝石塔防_Data/Managed/Assembly-CSharp-firstpass.dll

Binary files differ

 GemBattle/宝石塔防_Data/Managed/Assembly-CSharp.dll

Binary files differ

 GemBattle/宝石塔防_Data/Managed/MoreMountains.NiceVibrations.Demos.dll

Binary files differ

 GemBattle/宝石塔防_Data/Managed/MoreMountains.NiceVibrations.Haptics.dll

Binary files differ

 GemBattle/宝石塔防_Data/Managed/MoreMountains.NiceVibrations.dll

Binary files differ

 GemBattle/宝石塔防_Data/Managed/Unity.TextMeshPro.dll

Binary files differ

 GemBattle/宝石塔防_Data/Managed/Unity.Timeline.dll

Binary files differ

 GemBattle/宝石塔防_Data/Managed/UnityEngine.UI.dll

Binary files differ

 GemBattle/宝石塔防_Data/StreamingAssets/Table/endless_buff.json

@@ -1 +1 @@
[[1,"低级火灵之力",[2,1],[1,10,0],-1,"增加全体火精灵10%攻击力",0,99,10001,1,1],[2,"低级水灵之力",[2,2],[1,10,0],-1,"增加全体水精灵10%攻击力",0,99,10002,1,1],[3,"低级木灵之力",[2,3],[1,10,0],-1,"增加全体木精灵10%攻击力",0,99,10003,1,1],[4,"火灵之力",[2,1],[1,15,0],-1,"增加全体火精灵15%攻击力",4,99,10001,2,1],[5,"水灵之力",[2,2],[1,15,0],-1,"增加全体水精灵15%攻击力",4,99,10002,2,1],[6,"木灵之力",[2,3],[1,15,0],-1,"增加全体木精灵15%攻击力",4,99,10003,2,1],[7,"高级火灵之力",[2,1],[1,20,0],-1,"增加全体火精灵20%攻击力",7,99,10001,3,1],[8,"高级水灵之力",[2,2],[1,20,0],-1,"增加全体水精灵20%攻击力",7,99,10002,3,1],[9,"高级木灵之力",[2,3],[1,20,0],-1,"增加全体木精灵20%攻击力",7,99,10003,3,1],[10,"精灵之力",[1,0],[1,50,0],2,"2波增加全体精灵50%攻击力",3,99,10004,2,1],[11,"狂暴之力",[1,0],[1,65,0],2,"2波内增加全体精灵65%攻击力",3,99,10005,3,1],[12,"飞来横财",[0],[2,300,0],0,"增加300金币",0,99,10007,1,1],[13,"中大奖!",[0],[2,800,0],0,"增加800金币",4,99,10007,3,1],[14,"精灵魔盒",[0],[3,3,300],0,"随机获得一个3级精灵",99,99,10006,2,1],[15,"超级精灵魔盒",[0],[3,4,500],0,"随机获得一个4级精灵",99,99,10006,3,1],[16,"时空之力：水",[2,2],[4,0.2,0.5],-1,"水精灵攻速+25%",0,99,"10013",3,0],[17,"时空之力：火",[2,1],[4,0.2,0.5],-1,"火精灵攻速+25%",0,99,"10013",3,0],[18,"时空之力：木",[2,3],[4,0.2,0.5],-1,"木精灵攻速+25%",0,99,"10013",3,0],[19,"狂暴：玉米枪手",[3,109],[5,150,0],-1,"玉米精灵暴击率+15%",0,99,"10012",3,0],[20,"暴怒：玉米枪手",[3,109],[6,300,0],-1,"玉米精灵暴击伤害+30%",0,99,"10011",3,0],[21,"弹夹扩容：玉米枪手",[3,109],[7,2,0],-1,"玉米精灵高能子弹数量变为2颗",0,99,10008,3,0],[22,"爆裂狂怒：炸弹火鸟",[3,101],[9,10,0],-1,"火鸟精灵充能后变为10倍攻速",0,99,10009,3,0]]
[[1,"低级火灵之力",[2,1],[1,10,0],-1,"增加全体火精灵10%攻击力",0,99,10001,1,1],[2,"低级水灵之力",[2,2],[1,10,0],-1,"增加全体水精灵10%攻击力",0,99,10002,1,1],[3,"低级木灵之力",[2,3],[1,10,0],-1,"增加全体木精灵10%攻击力",0,99,10003,1,1],[4,"火灵之力",[2,1],[1,15,0],-1,"增加全体火精灵15%攻击力",4,99,10001,2,1],[5,"水灵之力",[2,2],[1,15,0],-1,"增加全体水精灵15%攻击力",4,99,10002,2,1],[6,"木灵之力",[2,3],[1,15,0],-1,"增加全体木精灵15%攻击力",4,99,10003,2,1],[7,"高级火灵之力",[2,1],[1,20,0],-1,"增加全体火精灵20%攻击力",7,99,10001,3,1],[8,"高级水灵之力",[2,2],[1,20,0],-1,"增加全体水精灵20%攻击力",7,99,10002,3,1],[9,"高级木灵之力",[2,3],[1,20,0],-1,"增加全体木精灵20%攻击力",7,99,10003,3,1],[10,"精灵之力",[1,0],[1,50,0],2,"2波增加全体精灵50%攻击力",3,99,10004,2,1],[11,"狂暴之力",[1,0],[1,65,0],2,"2波内增加全体精灵65%攻击力",3,99,10005,3,1],[12,"飞来横财",[0],[2,300,0],0,"增加300金币",0,99,10007,1,1],[13,"中大奖!",[0],[2,800,0],0,"增加800金币",4,99,10007,3,1],[14,"精灵魔盒",[0],[3,3,300],0,"随机获得一个3级精灵",99,99,10006,2,1],[15,"超级精灵魔盒",[0],[3,4,500],0,"随机获得一个4级精灵",99,99,10006,3,1],[16,"攻速增加_水",[2,2],[4,0.3,0.5],-1,"水精灵攻速+30%","4",99,"10013",3,0],[17,"攻速增加_火",[2,1],[4,0.3,0.5],-1,"火精灵攻速+30%","4",99,"10013",3,0],[18,"攻速增加_木",[2,3],[4,0.5,0.5],-1,"木精灵攻速+30%","4",99,"10013",3,0],[19,"暴击_木",[3,109],[5,150,0],-1,"木系精灵暴击率+15%","2",99,"10012",3,0],[20,"暴怒_木",[3,109],[6,300,0],-1,"木系精灵暴击伤害+30%","4",99,"10011",3,0],[21,"弹夹扩容",[3,109],[7,2,0],-1,"玉米精灵高能子弹+1","4",99,10008,3,0],[22,"爆裂狂怒",[3,101],[9,8,0],-1,"火鸟精灵充能后攻速+50%","4",99,10009,3,0],[23,"暴击_火",[3,101],[5,150,0],-1,"火系精灵暴击率+15%","2",99,"10012",3,0],[24,"暴怒_火",[3,101],[6,300,0],-1,"火系精灵暴击伤害+30%","4",99,"10011",3,0]]

 GemBattle/宝石塔防_Data/globalgamemanagers

Binary files differ

 GemBattle/宝石塔防_Data/globalgamemanagers.assets

Binary files differ

 GemBattle/宝石塔防_Data/level0

Binary files differ

 GemBattle/宝石塔防_Data/level1

Binary files differ

 GemBattle/宝石塔防_Data/resources.assets

Binary files differ

 GemBattle/宝石塔防_Data/sharedassets0.assets

Binary files differ

 GemBattle/宝石塔防_Data/sharedassets0.assets.resS

Binary files differ

 GemBattle/宝石塔防_Data/sharedassets1.assets

Binary files differ

			@@ -40,7 +40,7 @@
			m_Scale: {x: 1, y: 1}
			m_Offset: {x: 0, y: 0}
			- _MainTex:
			m_Texture: {fileID: 2800000, guid: 8c9a3d26120e78f40aa4ef9ed23d573c, type: 3}
			m_Texture: {fileID: 2800000, guid: 93f40a01d57fbff418fc0b54b6ab7d9f, type: 3}
			m_Scale: {x: 1, y: 1}
			m_Offset: {x: 0, y: 0}
			- _MetallicGlossMap:

			@@ -113,7 +113,7 @@
			m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
			m_AnchorMin: {x: 0.5, y: 0}
			m_AnchorMax: {x: 0.5, y: 0}
			m_AnchoredPosition: {x: -114, y: 98}
			m_AnchoredPosition: {x: -114, y: 128}
			m_SizeDelta: {x: 310, y: 140}
			m_Pivot: {x: 0.5, y: 0.5}
			--- !u!222 &5151289279430454484
			@@ -708,7 +708,7 @@
			m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
			m_AnchorMin: {x: 0.5, y: 0}
			m_AnchorMax: {x: 0.5, y: 0}
			m_AnchoredPosition: {x: 215, y: 98}
			m_AnchoredPosition: {x: 215, y: 128}
			m_SizeDelta: {x: 310, y: 140}
			m_Pivot: {x: 0.5, y: 0.5}
			--- !u!222 &4623057511312575047
			@@ -2811,7 +2811,7 @@
			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: 316, y: -57}
			m_AnchoredPosition: {x: 316, y: -107}
			m_SizeDelta: {x: 100, y: 100}
			m_Pivot: {x: 0.5, y: 0.5}
			--- !u!114 &4623057512101065368
			@@ -4743,7 +4743,7 @@
			m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
			m_AnchorMin: {x: 0.5, y: 0}
			m_AnchorMax: {x: 0.5, y: 0}
			m_AnchoredPosition: {x: -419, y: 89}
			m_AnchoredPosition: {x: -419, y: 119}
			m_SizeDelta: {x: 180, y: 40}
			m_Pivot: {x: 0.5, y: 1}
			--- !u!222 &4623057513073301100
			@@ -4939,7 +4939,7 @@
			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: 0, y: -341}
			m_AnchoredPosition: {x: 0, y: -391}
			m_SizeDelta: {x: 1080, y: 1080}
			m_Pivot: {x: 0.5, y: 0.5}
			--- !u!222 &4623057513214273139
			@@ -5320,7 +5320,7 @@
			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: 22, y: -104}
			m_AnchoredPosition: {x: 22, y: -154}
			m_SizeDelta: {x: 100, y: 100}
			m_Pivot: {x: 0.5, y: 0.5}
			--- !u!114 &4623057513414159487
			@@ -7350,7 +7350,7 @@
			- target: {fileID: 162820266587863501, guid: 550ad0a7c16a47a49bfb36ef49a73a67,
			type: 3}
			propertyPath: m_AnchoredPosition.y
			value: 96
			value: 126
			objectReference: {fileID: 0}
			- target: {fileID: 162820266587863501, guid: 550ad0a7c16a47a49bfb36ef49a73a67,
			type: 3}

			@@ -262,8 +262,8 @@
			m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
			m_AnchorMin: {x: 0.5, y: 0.5}
			m_AnchorMax: {x: 0.5, y: 0.5}
			m_AnchoredPosition: {x: 0, y: 0}
			m_SizeDelta: {x: 80, y: 80}
			m_AnchoredPosition: {x: 0, y: -10}
			m_SizeDelta: {x: 100, y: 100}
			m_Pivot: {x: 0.5, y: 0.5}
			--- !u!222 &1179723933380362119
			CanvasRenderer:
			@@ -286,7 +286,7 @@
			m_Name:
			m_EditorClassIdentifier:
			m_Material: {fileID: 0}
			m_Color: {r: 1, g: 1, b: 1, a: 0}
			m_Color: {r: 1, g: 1, b: 1, a: 1}
			m_RaycastTarget: 1
			m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
			m_Maskable: 1

			@@ -90,7 +90,7 @@
			m_Name:
			m_EditorClassIdentifier:
			ProgressImg: {fileID: 4636030447972189695}
			FreezeJet: {fileID: 3459016936373460007, guid: ca3ce846fd72b2e4bbb24b3a46cc42d0,
			FreezeJet: {fileID: 313942322445951525, guid: d052efd0b42a0cd4e9b77f897a6ad84d,
			type: 3}
			--- !u!1 &4636030447972189693
			GameObject:

			@@ -6382,7 +6382,6 @@
			m_Component:
			- component: {fileID: 1340671931}
			- component: {fileID: 1340671930}
			- component: {fileID: 1340671929}
			- component: {fileID: 1340671928}
			- component: {fileID: 1340671927}
			- component: {fileID: 1340671925}
			@@ -6490,19 +6489,6 @@
			m_PrefabAsset: {fileID: 0}
			m_GameObject: {fileID: 1340671924}
			m_Enabled: 1
			--- !u!114 &1340671929
			MonoBehaviour:
			m_ObjectHideFlags: 0
			m_CorrespondingSourceObject: {fileID: 0}
			m_PrefabInstance: {fileID: 0}
			m_PrefabAsset: {fileID: 0}
			m_GameObject: {fileID: 1340671924}
			m_Enabled: 1
			m_EditorHideFlags: 0
			m_Script: {fileID: 11500000, guid: 38f5f2cd2c401054e80686aac9879bb1, type: 3}
			m_Name:
			m_EditorClassIdentifier:
			bAdjViewPort: 0
			--- !u!20 &1340671930
			Camera:
			m_ObjectHideFlags: 0
			@@ -6622,6 +6608,7 @@
			- component: {fileID: 1361392479}
			- component: {fileID: 1361392478}
			- component: {fileID: 1361392477}
			- component: {fileID: 1361392480}
			m_Layer: 0
			m_Name: SceneCamera3D
			m_TagString: Untagged
			@@ -6694,6 +6681,19 @@
			m_Father: {fileID: 0}
			m_RootOrder: 9
			m_LocalEulerAnglesHint: {x: 60, y: 0, z: 0}
			--- !u!114 &1361392480
			MonoBehaviour:
			m_ObjectHideFlags: 0
			m_CorrespondingSourceObject: {fileID: 0}
			m_PrefabInstance: {fileID: 0}
			m_PrefabAsset: {fileID: 0}
			m_GameObject: {fileID: 1361392476}
			m_Enabled: 1
			m_EditorHideFlags: 0
			m_Script: {fileID: 11500000, guid: 38f5f2cd2c401054e80686aac9879bb1, type: 3}
			m_Name:
			m_EditorClassIdentifier:
			bAdjViewPort: 0
			--- !u!1 &1384281165
			GameObject:
			m_ObjectHideFlags: 0

			@@ -302,7 +302,7 @@
			m_OnCullStateChanged:
			m_PersistentCalls:
			m_Calls: []
			m_Sprite: {fileID: 21300000, guid: d92d2a99b7830234da2e494f43c6d7f2, type: 3}
			m_Sprite: {fileID: 21300000, guid: e187cb70474cf834fb08574deefcb084, type: 3}
			m_Type: 0
			m_PreserveAspect: 0
			m_FillCenter: 1

			@@ -132,7 +132,7 @@
			/// </summary>
			protected float freezeBreathCallTime = 0;

			protected float inFreezeBreath = 0;
			protected float inFreezeBreath;

			protected float freezeBreathBackTimer = 0;

			@@ -405,22 +405,25 @@

			if (processInt == (int)Mathf.Floor(FreezeBreath.ChargeTime))
			{
			inFreezeBreath = FreezeBreath.EffectTime;
			inFreezeBreath = towerPtr.FreezeBreathCtrl.SkillTime;
			towerPtr.FreezeBreathProgressOffset = 0;
			towerPtr.PlayFreezeBreathEffect(true);
			towerPtr.FreezeBreathCtrl.ReleaseCount = 1;
			towerPtr.FreezeBreathCtrl.PlayFreezeEffect(waveLineID);
			towerPtr.FreezeBreathCtrl.ReleaseFreeze(waveLineID, finalDamage, damager.alignmentProvider);
			}
			}
			else
			{
			inFreezeBreath -= Time.deltaTime;
			int time = Mathf.FloorToInt(towerPtr.FreezeBreathCtrl.EffectTime / (towerPtr.FreezeBreathCtrl.DamageCount - 1) * 10);
			int interval = Mathf.FloorToInt(inFreezeBreath * 10);
			int offset = Mathf.FloorToInt(towerPtr.FreezeBreathCtrl.SkillTime * 10) - Mathf.FloorToInt(towerPtr.FreezeBreathCtrl.EffectTime * 10);

			if (inFreezeBreath <= FreezeBreath.EffectTime / 2 && towerPtr.FreezeBreathCtrl.ReleaseCount != 2)
			if (interval == time * (towerPtr.FreezeBreathCtrl.DamageCount - towerPtr.FreezeBreathCtrl.ReleaseCount - 1) + offset && towerPtr.FreezeBreathCtrl.ReleaseCount < towerPtr.FreezeBreathCtrl.DamageCount)
			{
			towerPtr.FreezeBreathCtrl.ReleaseCount = 2;
			++towerPtr.FreezeBreathCtrl.ReleaseCount;
			towerPtr.FreezeBreathCtrl.ReleaseFreeze(waveLineID, finalDamage, damager.alignmentProvider);
			return;
			}

			if (inFreezeBreath <= 0)
			@@ -429,8 +432,6 @@
			freezeBreathCallTime = 0;
			towerPtr.FreezeBreathCtrl.SetProgress(0);
			towerPtr.PlayFreezeBreathEffect(false);
			towerPtr.FreezeBreathCtrl.ReleaseCount = 3;
			towerPtr.FreezeBreathCtrl.ReleaseFreeze(waveLineID, finalDamage, damager.alignmentProvider);
			}
			}
			}

			@@ -1028,14 +1028,14 @@
			if (m_arrGridType[ix, y] == PlacementGridType.EGridOpen)
			{
			canPlace = true;
			for (int i = 0; i < allTowerP.Count; i++)
			{
			if (allTowerP[i].x == ix && allTowerP[i].y == y)
			{
			canPlace = false;
			break;
			}
			}
			// for (int i = 0; i < allTowerP.Count; i++)
			// {
			// if (allTowerP[i].x == ix && allTowerP[i].y == y)
			// {
			// canPlace = false;
			// break;
			// }
			// }
			m_Tiles[ix, y].CheckCanPlace(canPlace);
			}
			}

			@@ -70,7 +70,7 @@
			++i;
			}

			ViewPortAdj.instance.cachedCamera.DOShakePosition(0.25f, 1.5f, 4);
			ViewPortAdj.instance.cachedCamera.DOShakePosition(0.25f, 1.5f, 4);//这里只可以震动3D场景中的东西
			MMVibrationManager.Haptic(HapticTypes.HeavyImpact);

			if (CurrentHP == 0)

			@@ -28,9 +28,20 @@
			public static float ChargeTime { get; private set; } = 10f;

			/// <summary>
			/// 技能持续时间
			/// 伤害时间
			/// </summary>
			public static float EffectTime { get; private set; } = 1f;
			public float EffectTime { get; private set; } = 2f;

			/// <summary>
			/// 伤害结算次数
			/// </summary>
			/// <value></value>
			public int DamageCount { get; private set; } = 6;

			/// <summary>
			/// 整个技能时间
			/// </summary>
			public float SkillTime { get; private set; } = 2.5f;

			/// <summary>
			/// 当前的充能进度
			@@ -87,8 +98,6 @@
			agentList.Add(list[i]);
			}

			PlayFreezeEffect(waveLineId);

			while (agentList.Count > 0)
			{
			Agent agent = agentList[0];
			@@ -103,8 +112,14 @@
			}
			}

			private void PlayFreezeEffect(int waveLineId)
			public void PlayFreezeEffect(int waveLineId)
			{
			WaveLineAgentInsMgr[] agentInsMgrs = AgentInsManager.instance.GetWaveLineList();
			WaveLineAgentInsMgr waveLineAgentInsMgr = agentInsMgrs[waveLineId];
			List<Agent> list = waveLineAgentInsMgr.listAgent;

			if (list.Count == 0) return;

			GameObject obj = Poolable.TryGetPoolable(FreezeJet);
			ParticleSystem ps = obj.GetComponent<ParticleSystem>();

			@@ -45,7 +45,9 @@
			protected void UpdateDisplay()
			{
			int current = currency.currentCurrency;
			DisplayText.text = AddNumberSemi(current.ToString());
			//DisplayText.text = AddNumberSemi(current.ToString());
			DisplayText.text = current.ToString();

			}

			/// <summary>

			@@ -882,29 +882,29 @@
			{
			if (m_CurrentTower.controller.towerFeature == EFeatureTower.NULL)
			{
			List<IntVector2> allTowerP = new List<IntVector2>();
			List<IntVector2> allPSTowerP = new List<IntVector2>();//需要播放升级动画的
			// List<IntVector2> allTowerP = new List<IntVector2>();//排除不能合成的
			// List<IntVector2> allPSTowerP = new List<IntVector2>();//需要播放升级动画的

			for (int i = 0; i < m_listTower.Count; i++)
			{
			if (m_listTower[i].bInAttackMode && towerToMove && m_listTower[i].currentLevel == dragTowerLevel && m_listTower[i].towerName == towerToMove.towerName)
			{
			if (towerToMove.gridPosition != m_listTower[i].gridPosition)
			//说明可以合成
			allPSTowerP.Add(m_listTower[i].gridPosition);
			}
			else
			{
			//把不符合条件的传进去
			allTowerP.Add(m_listTower[i].gridPosition);
			}
			}
			// for (int i = 0; i < m_listTower.Count; i++)
			// {
			// if (m_listTower[i].bInAttackMode && towerToMove && m_listTower[i].currentLevel == dragTowerLevel && m_listTower[i].towerName == towerToMove.towerName)
			// {
			// if (towerToMove.gridPosition != m_listTower[i].gridPosition)
			// //说明可以合成
			// allPSTowerP.Add(m_listTower[i].gridPosition);
			// }
			// else
			// {
			// //把不符合条件的传进去
			// allTowerP.Add(m_listTower[i].gridPosition);
			// }
			// }
			if (m_CurrentArea != null)
			{
			(m_CurrentArea as TowerPlacementGridEndless).CheckAllCanPlace(allTowerP);
			//修改为只要开启格子都可以放
			(m_CurrentArea as TowerPlacementGridEndless).CheckAllCanPlace(null);
			//(m_CurrentArea as TowerPlacementGridEndless).PlayPS(allPSTowerP);
			}


			}
			else if (m_CurrentTower.controller.towerFeature == EFeatureTower.Skill_Fire \|\| m_CurrentTower.controller.towerFeature == EFeatureTower.Skill_Bomb)

			@@ -1 +1 @@
			[[1,"低级火灵之力",[2,1],[1,10,0],-1,"增加全体火精灵10%攻击力",0,99,10001,1,1],[2,"低级水灵之力",[2,2],[1,10,0],-1,"增加全体水精灵10%攻击力",0,99,10002,1,1],[3,"低级木灵之力",[2,3],[1,10,0],-1,"增加全体木精灵10%攻击力",0,99,10003,1,1],[4,"火灵之力",[2,1],[1,15,0],-1,"增加全体火精灵15%攻击力",4,99,10001,2,1],[5,"水灵之力",[2,2],[1,15,0],-1,"增加全体水精灵15%攻击力",4,99,10002,2,1],[6,"木灵之力",[2,3],[1,15,0],-1,"增加全体木精灵15%攻击力",4,99,10003,2,1],[7,"高级火灵之力",[2,1],[1,20,0],-1,"增加全体火精灵20%攻击力",7,99,10001,3,1],[8,"高级水灵之力",[2,2],[1,20,0],-1,"增加全体水精灵20%攻击力",7,99,10002,3,1],[9,"高级木灵之力",[2,3],[1,20,0],-1,"增加全体木精灵20%攻击力",7,99,10003,3,1],[10,"精灵之力",[1,0],[1,50,0],2,"2波增加全体精灵50%攻击力",3,99,10004,2,1],[11,"狂暴之力",[1,0],[1,65,0],2,"2波内增加全体精灵65%攻击力",3,99,10005,3,1],[12,"飞来横财",[0],[2,300,0],0,"增加300金币",0,99,10007,1,1],[13,"中大奖!",[0],[2,800,0],0,"增加800金币",4,99,10007,3,1],[14,"精灵魔盒",[0],[3,3,300],0,"随机获得一个3级精灵",99,99,10006,2,1],[15,"超级精灵魔盒",[0],[3,4,500],0,"随机获得一个4级精灵",99,99,10006,3,1],[16,"时空之力：水",[2,2],[4,0.2,0.5],-1,"水精灵攻速+25%",0,99,"10013",3,0],[17,"时空之力：火",[2,1],[4,0.2,0.5],-1,"火精灵攻速+25%",0,99,"10013",3,0],[18,"时空之力：木",[2,3],[4,0.2,0.5],-1,"木精灵攻速+25%",0,99,"10013",3,0],[19,"狂暴：玉米枪手",[3,109],[5,150,0],-1,"玉米精灵暴击率+15%",0,99,"10012",3,0],[20,"暴怒：玉米枪手",[3,109],[6,300,0],-1,"玉米精灵暴击伤害+30%",0,99,"10011",3,0],[21,"弹夹扩容：玉米枪手",[3,109],[7,2,0],-1,"玉米精灵高能子弹数量变为2颗",0,99,10008,3,0],[22,"爆裂狂怒：炸弹火鸟",[3,101],[9,10,0],-1,"火鸟精灵充能后变为10倍攻速",0,99,10009,3,0]]
			[[1,"低级火灵之力",[2,1],[1,10,0],-1,"增加全体火精灵10%攻击力",0,99,10001,1,1],[2,"低级水灵之力",[2,2],[1,10,0],-1,"增加全体水精灵10%攻击力",0,99,10002,1,1],[3,"低级木灵之力",[2,3],[1,10,0],-1,"增加全体木精灵10%攻击力",0,99,10003,1,1],[4,"火灵之力",[2,1],[1,15,0],-1,"增加全体火精灵15%攻击力",4,99,10001,2,1],[5,"水灵之力",[2,2],[1,15,0],-1,"增加全体水精灵15%攻击力",4,99,10002,2,1],[6,"木灵之力",[2,3],[1,15,0],-1,"增加全体木精灵15%攻击力",4,99,10003,2,1],[7,"高级火灵之力",[2,1],[1,20,0],-1,"增加全体火精灵20%攻击力",7,99,10001,3,1],[8,"高级水灵之力",[2,2],[1,20,0],-1,"增加全体水精灵20%攻击力",7,99,10002,3,1],[9,"高级木灵之力",[2,3],[1,20,0],-1,"增加全体木精灵20%攻击力",7,99,10003,3,1],[10,"精灵之力",[1,0],[1,50,0],2,"2波增加全体精灵50%攻击力",3,99,10004,2,1],[11,"狂暴之力",[1,0],[1,65,0],2,"2波内增加全体精灵65%攻击力",3,99,10005,3,1],[12,"飞来横财",[0],[2,300,0],0,"增加300金币",0,99,10007,1,1],[13,"中大奖!",[0],[2,800,0],0,"增加800金币",4,99,10007,3,1],[14,"精灵魔盒",[0],[3,3,300],0,"随机获得一个3级精灵",99,99,10006,2,1],[15,"超级精灵魔盒",[0],[3,4,500],0,"随机获得一个4级精灵",99,99,10006,3,1],[16,"攻速增加_水",[2,2],[4,0.3,0.5],-1,"水精灵攻速+30%","4",99,"10013",3,0],[17,"攻速增加_火",[2,1],[4,0.3,0.5],-1,"火精灵攻速+30%","4",99,"10013",3,0],[18,"攻速增加_木",[2,3],[4,0.5,0.5],-1,"木精灵攻速+30%","4",99,"10013",3,0],[19,"暴击_木",[3,109],[5,150,0],-1,"木系精灵暴击率+15%","2",99,"10012",3,0],[20,"暴怒_木",[3,109],[6,300,0],-1,"木系精灵暴击伤害+30%","4",99,"10011",3,0],[21,"弹夹扩容",[3,109],[7,2,0],-1,"玉米精灵高能子弹+1","4",99,10008,3,0],[22,"爆裂狂怒",[3,101],[9,8,0],-1,"火鸟精灵充能后攻速+50%","4",99,10009,3,0],[23,"暴击_火",[3,101],[5,150,0],-1,"火系精灵暴击率+15%","2",99,"10012",3,0],[24,"暴怒_火",[3,101],[6,300,0],-1,"火系精灵暴击伤害+30%","4",99,"10011",3,0]]

			@@ -63,7 +63,7 @@
			platformSettings:
			- serializedVersion: 3
			buildTarget: DefaultTexturePlatform
			maxTextureSize: 2048
			maxTextureSize: 4096
			resizeAlgorithm: 0
			textureFormat: -1
			textureCompression: 1
			@@ -75,7 +75,7 @@
			forceMaximumCompressionQuality_BC6H_BC7: 0
			- serializedVersion: 3
			buildTarget: Standalone
			maxTextureSize: 2048
			maxTextureSize: 4096
			resizeAlgorithm: 0
			textureFormat: -1
			textureCompression: 1
			@@ -87,14 +87,14 @@
			forceMaximumCompressionQuality_BC6H_BC7: 0
			- serializedVersion: 3
			buildTarget: Android
			maxTextureSize: 2048
			maxTextureSize: 4096
			resizeAlgorithm: 0
			textureFormat: 4
			textureFormat: -1
			textureCompression: 1
			compressionQuality: 50
			crunchedCompression: 0
			allowsAlphaSplitting: 0
			overridden: 1
			overridden: 0
			androidETC2FallbackOverride: 0
			forceMaximumCompressionQuality_BC6H_BC7: 0
			spriteSheet: