宝石塔防
parent: 2ae9ed | patch | commitdiff
chenxin
2020-11-04 ce7efae14eb31bcdfa0d540da6a1ef1457e046ab
refs
author chenxin <chenxin6991@163.com>
Wednesday, November 4, 2020 21:27 +0800
committer chenxin <chenxin6991@163.com>
Wednesday, November 4, 2020 21:27 +0800
commitce7efae14eb31bcdfa0d540da6a1ef1457e046ab
tree 89615f0f94704860f5cd04afb248cc0cbaaedc98 tree | zip | gz
parent 2ae9edd5bfd8b8baabb8cd995485f9ade4faebc9 view | diff
80b4237334a773b29bf69f38532a90ca659b3bfe view | diff 
Merge commit '80b4237334a773b29bf69f38532a90ca659b3bfe' into master

# Conflicts:
#	Assets/Scripts/TowerDefense/Affectors/AttackAffector.cs
1 files renamed
3 files deleted
44 files added
33 files modified
2860 ■■■■■ changed files
Assets/Prefabs/Enemies/BossAgent.prefab 2 ●●●●● diff | view | raw | blame | history
Assets/Prefabs/Enemies/fire 2.prefab 2 ●●●●● diff | view | raw | blame | history
Assets/Prefabs/Enemies/fire.prefab 18 ●●●●● diff | view | raw | blame | history
Assets/Prefabs/Enemies/water.prefab 2 ●●●●● diff | view | raw | blame | history
Assets/Prefabs/Enemies/wood 2.prefab 2 ●●●●● diff | view | raw | blame | history
Assets/Prefabs/Enemies/wood.prefab 2 ●●●●● diff | view | raw | blame | history
Assets/RPG Monster Wave PBR/Animators/TurtleShellMod.controller 6 ●●●●● diff | view | raw | blame | history
Assets/Resources/Prefabs.meta 8 ●●●●● diff | view | raw | blame | history
Assets/Resources/Prefabs/Endless.meta 8 ●●●●● diff | view | raw | blame | history
Assets/Resources/Prefabs/Endless/BubbleBomb.prefab 539 ●●●●● diff | view | raw | blame | history
Assets/Resources/Prefabs/Endless/BubbleBomb.prefab.meta 7 ●●●●● diff | view | raw | blame | history
Assets/Resources/UI/Endless/Boss/1.meta 8 ●●●●● diff | view | raw | blame | history
Assets/Resources/UI/Endless/Boss/1.png diff | view | raw | blame | history
Assets/Resources/UI/Endless/Boss/1.png.meta 118 ●●●●● diff | view | raw | blame | history
Assets/Resources/UI/Endless/Boss/1/New Folder.meta 8 ●●●●● diff | view | raw | blame | history
Assets/Resources/UI/Endless/Boss/2.meta 8 ●●●●● diff | view | raw | blame | history
Assets/Resources/UI/Endless/Boss/2.png diff | view | raw | blame | history
Assets/Resources/UI/Endless/bubbleBombTitle.png diff | view | raw | blame | history
Assets/Resources/UI/Endless/bubbleBombTitle.png.meta 6 ●●●●● diff | view | raw | blame | history
Assets/Scenes/Levels/Battle/Endless.unity 104 ●●●●● diff | view | raw | blame | history
Assets/Scripts/Common/GameUtils.cs 10 ●●●●● diff | view | raw | blame | history
Assets/Scripts/Core/Utilities/Timer.cs 181 ●●●●● diff | view | raw | blame | history
Assets/Scripts/Data/EndlessBossData.cs 36 ●●●●● diff | view | raw | blame | history
Assets/Scripts/Data/EndlessBossData.cs.meta 11 ●●●●● diff | view | raw | blame | history
Assets/Scripts/Data/EndlessBossSkillData.cs 34 ●●●●● diff | view | raw | blame | history
Assets/Scripts/Data/EndlessBossSkillData.cs.meta 11 ●●●●● diff | view | raw | blame | history
Assets/Scripts/Data/EndlessBuffData.cs 1 ●●●●● diff | view | raw | blame | history
Assets/Scripts/Data/EndlessPortData.cs 16 ●●●●● diff | view | raw | blame | history
Assets/Scripts/Enum/EndlessBossActionState.cs 5 ●●●●● diff | view | raw | blame | history
Assets/Scripts/Enum/EndlessBossSkillAIType.cs 15 ●●●●● diff | view | raw | blame | history
Assets/Scripts/Enum/EndlessBossSkillAIType.cs.meta 11 ●●●●● diff | view | raw | blame | history
Assets/Scripts/Enum/EndlessBossSkillAgentType.cs 15 ●●●●● diff | view | raw | blame | history
Assets/Scripts/Enum/EndlessBossSkillAgentType.cs.meta 11 ●●●●● diff | view | raw | blame | history
Assets/Scripts/Enum/EndlessBossSkillTowerType.cs 18 ●●●●● diff | view | raw | blame | history
Assets/Scripts/Enum/EndlessBossSkillTowerType.cs.meta 11 ●●●●● diff | view | raw | blame | history
Assets/Scripts/Enum/EndlessBossSkillTunelType.cs 21 ●●●●● diff | view | raw | blame | history
Assets/Scripts/Enum/EndlessBossSkillTunelType.cs.meta 11 ●●●●● diff | view | raw | blame | history
Assets/Scripts/Enum/EndlessBossSkillType.cs 21 ●●●●● diff | view | raw | blame | history
Assets/Scripts/Enum/EndlessBossSkillType.cs.meta 11 ●●●●● diff | view | raw | blame | history
Assets/Scripts/Enum/EndlessBossSkillUseTarget.cs 25 ●●●●● diff | view | raw | blame | history
Assets/Scripts/Enum/EndlessBossSkillUseTarget.cs.meta 11 ●●●●● diff | view | raw | blame | history
Assets/Scripts/Enum/SpawnAgentType.cs 19 ●●●●● diff | view | raw | blame | history
Assets/Scripts/Enum/SpawnAgentType.cs.meta 11 ●●●●● diff | view | raw | blame | history
Assets/Scripts/Event/EventType.cs 10 ●●●●● diff | view | raw | blame | history
Assets/Scripts/Json/JsonDataCenter.cs 2 ●●●●● diff | view | raw | blame | history
Assets/Scripts/Net/NetExtends/Table.cs 8 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/Affectors/AttackAffector.cs 21 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/Agents/Agent.cs 7 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/Agents/BubbleBombAgent.cs 101 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/Agents/BubbleBombAgent.cs.meta 11 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/Level/AgentInsManager.cs 91 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/Level/EndlessLevelManager.cs 61 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/Level/EndlessWave.cs 14 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/Level/EndlessWaveManager.cs 14 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/Towers/Placement/TowerPlacementGridEndless.cs 2 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/Towers/Projectiles/BallisticAttack.cs 33 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/UI/EndlessBossCtrl.cs 36 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/UI/EndlessBossSkill.meta 8 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/UI/EndlessBossSkill/BossSkillBubbleBomb.cs 409 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/UI/EndlessBossSkill/BossSkillBubbleBomb.cs.meta 11 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/UI/EndlessBossSkill/BossSkillShieldWall.cs 28 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/UI/EndlessBossSkill/BossSkillShieldWall.cs.meta 11 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/UI/EndlessBossSkill/BossSkillWoodPile.cs 28 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/UI/EndlessBossSkill/BossSkillWoodPile.cs.meta 11 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/UI/EndlessBossSkill/EndlessBossSkill.cs 132 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/UI/EndlessBossSkill/EndlessBossSkill.cs.meta 11 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/UI/EndlessBossSkill/EndlessBossSkillManager.cs 183 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/UI/EndlessBossSkill/EndlessBossSkillManager.cs.meta 11 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/UI/EndlessBossSkillAI.meta 8 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/UI/EndlessBossSkillAI/EndlessBossSkillAI.cs 86 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/UI/EndlessBossSkillAI/EndlessBossSkillAI.cs.meta 11 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/UI/EndlessBossSkillAI/NormalBossSkillAI.cs 65 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/UI/EndlessBossSkillAI/NormalBossSkillAI.cs.meta 11 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/UI/EndlessSettlementPropList.cs 30 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/UI/EndlessUIStart.cs 19 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/UI/HUD/EndlessGameUI.cs 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_buff.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