chenxin
2020-11-05 d6161eec964b2eeb23bd93c84c29f8ffd3a2d06f
refs
author chenxin <chenxin6991@163.com>
Thursday, November 5, 2020 17:26 +0800
committer chenxin <chenxin6991@163.com>
Thursday, November 5, 2020 17:26 +0800
commitd6161eec964b2eeb23bd93c84c29f8ffd3a2d06f
tree b5bf1119d5dd475148407a3e422c0080f383b37f tree | zip | gz
parent ac7a95d834b4ef2f5904f54bd4173002b6ff52b7 view | diff
323055bb1b4c9b5669676dd799238050279b7d7a view | diff
Merge commit '323055bb1b4c9b5669676dd799238050279b7d7a' into master
4 files added
59 files modified
666 ■■■■ changed files
Assets/Prefabs/Towers/Fire/GrowUpTower_0.prefab 2 ●●● diff | view | raw | blame | history
Assets/Prefabs/Towers/Fire/GrowUpTower_1.prefab 2 ●●● diff | view | raw | blame | history
Assets/Prefabs/Towers/Fire/GrowUpTower_2.prefab 2 ●●● diff | view | raw | blame | history
Assets/Prefabs/Towers/Fire/GrowUpTower_3.prefab 2 ●●● diff | view | raw | blame | history
Assets/Prefabs/Towers/Fire/GrowUpTower_4.prefab 2 ●●● diff | view | raw | blame | history
Assets/Prefabs/Towers/Water/CopyCatTower_0.prefab 2 ●●● diff | view | raw | blame | history
Assets/Prefabs/Towers/Water/CopyCatTower_1.prefab 2 ●●● diff | view | raw | blame | history
Assets/Prefabs/Towers/Water/CopyCatTower_2.prefab 2 ●●● diff | view | raw | blame | history
Assets/Prefabs/Towers/Water/CopyCatTower_3.prefab 2 ●●● diff | view | raw | blame | history
Assets/Prefabs/Towers/Water/CopyCatTower_4.prefab 2 ●●● diff | view | raw | blame | history
Assets/Prefabs/Towers/WoodTower/BlinkTower_0.prefab 2 ●●● diff | view | raw | blame | history
Assets/Prefabs/Towers/WoodTower/BlinkTower_1.prefab 2 ●●● diff | view | raw | blame | history
Assets/Prefabs/Towers/WoodTower/BlinkTower_2.prefab 2 ●●● diff | view | raw | blame | history
Assets/Prefabs/Towers/WoodTower/BlinkTower_3.prefab 2 ●●● diff | view | raw | blame | history
Assets/Prefabs/Towers/WoodTower/BlinkTower_4.prefab 2 ●●● diff | view | raw | blame | history
Assets/Scenes/Levels/Battle/Endless.unity 275 ●●●●● diff | view | raw | blame | history
Assets/Scripts/ActionGameFramework/Health/Targetable.cs 4 ●●●● diff | view | raw | blame | history
Assets/Scripts/Data/EndlessBuffData.cs 3 ●●●●● diff | view | raw | blame | history
Assets/Scripts/Data/EndlessPortData.cs 1 ●●●● diff | view | raw | blame | history
Assets/Scripts/Enum/EndlessBossSkillState.cs 25 ●●●●● diff | view | raw | blame | history
Assets/Scripts/Enum/EndlessBossSkillState.cs.meta 11 ●●●●● diff | view | raw | blame | history
Assets/Scripts/Event/EventType.cs 6 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/Affectors/AttackAffector.cs 2 ●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/Agents/BubbleBombAgent.cs 1 ●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/Agents/HomeBaseAttacker.cs 8 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/Level/EndlessLevelManager.cs 2 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/Level/EndlessWaveManager.cs 7 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/Towers/Projectiles/BallisticAttack.cs 2 ●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/UI/EndlessBossCtrl.cs 3 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/UI/EndlessBossSkill/BossSkillBubbleBomb.cs 42 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/UI/EndlessBossSkill/BossSkillShieldWall.cs 5 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/UI/EndlessBossSkill/BossSkillWoodPile.cs 5 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/UI/EndlessBossSkill/EndlessBossSkillManager.cs 106 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/UI/EndlessBossSkillAI/EndlessBossSkillAI.cs 2 ●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/UI/EndlessBossSkillAI/NormalBossSkillAI.cs 2 ●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/UI/EndlessHomeBaseHPManager.cs 70 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/UI/EndlessHomeBaseHPManager.cs.meta 11 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/UI/HUD/EndlessGameUI.cs 33 ●●●●● diff | view | raw | blame | history
Assets/StreamingAssets/Table/battle.json 2 ●●● diff | view | raw | blame | history
Assets/StreamingAssets/Table/boss_skill.json 2 ●●● diff | view | raw | blame | history
Assets/StreamingAssets/Table/endless_boss.json 2 ●●● diff | view | raw | blame | history
Assets/StreamingAssets/Table/endless_enemy.json 2 ●●● diff | view | raw | blame | history
Assets/StreamingAssets/Table/endless_port.json 2 ●●● diff | view | raw | blame | history
GemBattle.zip diff | view | raw | blame | history
GemBattle/宝石塔防_Data/Managed/Assembly-CSharp-firstpass.dll diff | view | raw | blame | history
GemBattle/宝石塔防_Data/Managed/Assembly-CSharp.dll diff | view | raw | blame | history
GemBattle/宝石塔防_Data/Managed/MoreMountains.NiceVibrations.Demos.dll diff | view | raw | blame | history
GemBattle/宝石塔防_Data/Managed/MoreMountains.NiceVibrations.Haptics.dll diff | view | raw | blame | history
GemBattle/宝石塔防_Data/Managed/MoreMountains.NiceVibrations.dll diff | view | raw | blame | history
GemBattle/宝石塔防_Data/Managed/Unity.TextMeshPro.dll diff | view | raw | blame | history
GemBattle/宝石塔防_Data/Managed/Unity.Timeline.dll diff | view | raw | blame | history
GemBattle/宝石塔防_Data/Managed/UnityEngine.UI.dll diff | view | raw | blame | history
GemBattle/宝石塔防_Data/globalgamemanagers diff | view | raw | blame | history
GemBattle/宝石塔防_Data/globalgamemanagers.assets diff | view | raw | blame | history
GemBattle/宝石塔防_Data/level0 diff | view | raw | blame | history
GemBattle/宝石塔防_Data/level1 diff | view | raw | blame | history
GemBattle/宝石塔防_Data/level2 diff | view | raw | blame | history
GemBattle/宝石塔防_Data/level3 diff | view | raw | blame | history
GemBattle/宝石塔防_Data/resources.assets diff | view | raw | blame | history
GemBattle/宝石塔防_Data/sharedassets0.assets diff | view | raw | blame | history
GemBattle/宝石塔防_Data/sharedassets1.assets diff | view | raw | blame | history
GemBattle/宝石塔防_Data/sharedassets2.assets diff | view | raw | blame | history
GemBattle/宝石塔防_Data/sharedassets3.assets diff | view | raw | blame | history