chenxin
2020-11-18 b8d221ed856544aec0ae376783e09f9814276722
小怪撞塔报错,
心碎特效调整
22 files modified
41 ■■■■■ changed files
And/GemBattle.apk patch | view | raw | blame | history
Assets/Prefabs/UI/Heart.prefab 6 ●●●● patch | view | raw | blame | history
Assets/Scripts/Json/JsonDataCenter.cs 3 ●●●● patch | view | raw | blame | history
Assets/Scripts/Manager/ManagerRoot.cs 2 ●●● patch | view | raw | blame | history
Assets/Scripts/TowerDefense/Agents/Agent.cs 22 ●●●●● patch | view | raw | blame | history
Assets/Scripts/TowerDefense/Agents/HomeBaseAttacker.cs 2 ●●●●● patch | view | raw | blame | history
Assets/Scripts/TowerDefense/Level/EndlessLevelManager.cs 1 ●●●● patch | view | raw | blame | history
Assets/Scripts/TowerDefense/UI/EndlessBossSkill/BossSkillBubbleBomb.cs 5 ●●●●● 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/globalgamemanagers patch | view | raw | blame | history
GemBattle/宝石塔防_Data/globalgamemanagers.assets patch | view | raw | blame | history
GemBattle/宝石塔防_Data/level1 patch | view | raw | blame | history
GemBattle/宝石塔防_Data/resources.assets patch | view | raw | blame | history
GemBattle/宝石塔防_Data/sharedassets1.assets patch | view | raw | blame | history
And/GemBattle.apk
Binary files differ
Assets/Prefabs/UI/Heart.prefab
@@ -141,7 +141,7 @@
    - target: {fileID: 3389300523282741961, guid: 296dddd14ba103e4aa483333fe748c6f,
        type: 3}
      propertyPath: m_LocalRotation.x
      value: 0
      value: -0.7071068
      objectReference: {fileID: 0}
    - target: {fileID: 3389300523282741961, guid: 296dddd14ba103e4aa483333fe748c6f,
        type: 3}
@@ -156,7 +156,7 @@
    - target: {fileID: 3389300523282741961, guid: 296dddd14ba103e4aa483333fe748c6f,
        type: 3}
      propertyPath: m_LocalRotation.w
      value: 1
      value: 0.7071068
      objectReference: {fileID: 0}
    - target: {fileID: 3389300523282741961, guid: 296dddd14ba103e4aa483333fe748c6f,
        type: 3}
@@ -166,7 +166,7 @@
    - target: {fileID: 3389300523282741961, guid: 296dddd14ba103e4aa483333fe748c6f,
        type: 3}
      propertyPath: m_LocalEulerAnglesHint.x
      value: 0
      value: -90
      objectReference: {fileID: 0}
    - target: {fileID: 3389300523282741961, guid: 296dddd14ba103e4aa483333fe748c6f,
        type: 3}
Assets/Scripts/Json/JsonDataCenter.cs
@@ -177,7 +177,8 @@
                            OpponentMgr.instance.ResetCurrency(currency);
                        if (EndlessLevelManager.instanceExists)
                            EndlessLevelManager.instance.ResetCurrency(currency);
                            // cx test
                            EndlessLevelManager.instance.ResetCurrency(5000000);
                        break;
                    case "skilltime":
                        // 设置技能塔出现时间
Assets/Scripts/Manager/ManagerRoot.cs
@@ -24,7 +24,7 @@
                root.AddComponent<TDAA_SDKManager>();
                root.AddComponent<AudioSourceManager>();
                root.AddComponent<ErrorLogOnGUIMyTools>();
                // root.AddComponent<ErrorLogOnGUIMyTools>();
            }
            //gameObject.AddComponent<JsonDataReader>();
Assets/Scripts/TowerDefense/Agents/Agent.cs
@@ -875,26 +875,6 @@
        }
        /// <summary>
        /// 检查自身血量
        /// </summary>
        private void CheckHealth()
        {
            if (this.healthVal <= 0.1)
            {
                Die();
                //Debug.Log("删除多余的攻击Agent.");
            }
        }
        private void Die()
        {
            // 统一管理器内删除当前的Agent:
            AgentInsManager.instance.removeAgent(this);
            this.Remove();
        }
        /// <summary>
        /// Updates the agent in its different states, 
        /// Reset destination when path is stale
        /// River: 更新的时候,加入离最终目标的距离数据.
@@ -1083,6 +1063,8 @@
        public override void PlayDeath()
        {
            if (bInDeathAct) return;
            if (isPoison)
            {
                isPoison = false;
Assets/Scripts/TowerDefense/Agents/HomeBaseAttacker.cs
@@ -92,6 +92,8 @@
                }
            }
            if (EndlessGameUI.instance.state == EndlessGameUI.State.GameOver) return;
            EventCenter.Ins.BroadCast((int)KTGMGemClient.EventType.EndlessAgentTaskDamage, agent.configuration.currentHealth);
            agent.Remove();
        }
Assets/Scripts/TowerDefense/Level/EndlessLevelManager.cs
@@ -627,7 +627,6 @@
        /// </summary>
        public void StopSecondWave()
        {
            Debug.LogError("--------------------- 停止第二关出怪 ---------------------");
            if (!isStopSecondWaveCompleted)
            {
                isStopSecondWaveCompleted = true;
Assets/Scripts/TowerDefense/UI/EndlessBossSkill/BossSkillBubbleBomb.cs
@@ -446,6 +446,11 @@
                        config.AttackTime = 0.65f;
                    }
                }
                else
                {
                    // cx test
                    Debug.Log("---------------------  ---------------------");
                }
            }
        }
    }
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/globalgamemanagers
Binary files differ
GemBattle/宝石塔防_Data/globalgamemanagers.assets
Binary files differ
GemBattle/宝石塔防_Data/level1
Binary files differ
GemBattle/宝石塔防_Data/resources.assets
Binary files differ
GemBattle/宝石塔防_Data/sharedassets1.assets
Binary files differ