宝石塔防
parent: 612023 | patch | commitdiff
chenxin
2020-10-31 a1f0653ec48d7787e0d57cabef0600b2a07355eb
refs
author chenxin <chenxin6991@163.com>
Saturday, October 31, 2020 17:03 +0800
committer chenxin <chenxin6991@163.com>
Saturday, October 31, 2020 17:03 +0800
commita1f0653ec48d7787e0d57cabef0600b2a07355eb
tree d449a76345150094a4ca3db46777a9d56cadd008 tree | zip | gz
parent 612023c0ca6bba2a4e4f0cd4d0f7ea35817b9917 view | diff
bc14626b98377c39db4d77029326389bb34484a8 view | diff 
解决冲突

# Conflicts:
#	Assets/Materials/Guide/RectGuidance.mat
#	Assets/Scripts/Event/EventType.cs
#	Assets/Scripts/TowerDefense/UI/EndlessBuffSelect.cs
41 files added
23 files modified
2849 ■■■■■ changed files
Assets/Animations/Endless.meta 8 ●●●●● diff | view | raw | blame | history
Assets/Animations/Endless/BossAniCtrl.controller 188 ●●●●● diff | view | raw | blame | history
Assets/Animations/Endless/BossAniCtrl.controller.meta 8 ●●●●● diff | view | raw | blame | history
Assets/Animations/Endless/Boss_Death.anim 53 ●●●●● diff | view | raw | blame | history
Assets/Animations/Endless/Boss_Death.anim.meta 8 ●●●●● diff | view | raw | blame | history
Assets/Animations/Endless/Boss_Standing.anim 77 ●●●●● diff | view | raw | blame | history
Assets/Animations/Endless/Boss_Standing.anim.meta 8 ●●●●● diff | view | raw | blame | history
Assets/Animations/Endless/Boss_Summon.anim 96 ●●●●● diff | view | raw | blame | history
Assets/Animations/Endless/Boss_Summon.anim.meta 8 ●●●●● diff | view | raw | blame | history
Assets/Materials/Guide/RectGuidance.mat 9 ●●●●● diff | view | raw | blame | history
Assets/Prefabs/Enemies/fire.prefab 6 ●●●●● diff | view | raw | blame | history
Assets/Scenes/Levels/Battle/Endless.unity 384 ●●●●● diff | view | raw | blame | history
Assets/Scripts/Common/CommonDebugHelper.cs 1 ●●●●● diff | view | raw | blame | history
Assets/Scripts/Enum/EndlessBossActionState.cs 19 ●●●●● diff | view | raw | blame | history
Assets/Scripts/Enum/EndlessBossActionState.cs.meta 11 ●●●●● diff | view | raw | blame | history
Assets/Scripts/Event/EventType.cs 2 ●●●●● diff | view | raw | blame | history
Assets/Scripts/Guide/GuidePanel.cs 1 ●●●●● diff | view | raw | blame | history
Assets/Scripts/Guide/Mask/RectGuidance.cs 4 ●●●●● diff | view | raw | blame | history
Assets/Scripts/Net/NetExtends/Table.cs 97 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/Input/TowerDefenseTouchInput.cs 48 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/Level/EndlessDropManager.cs 31 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/Level/EndlessLevelManager.cs 14 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/Level/EndlessWave.cs 5 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/Level/EndlessWaveManager.cs 117 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/UI/EndlessBossCtrl.cs 61 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/UI/EndlessBossCtrl.cs.meta 11 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/UI/EndlessBossHPManager.cs 12 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/UI/EndlessBuffSelect.cs 42 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/UI/EndlessSettlement.cs 23 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/UI/EndlessUIStart.cs 37 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/UI/HUD/EndlessRandomTower.cs 2 ●●●●● diff | view | raw | blame | history
Assets/StreamingAssets/Table/battle.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
Assets/StreamingAssets/Table/goldInfo.json 2 ●●●●● diff | view | raw | blame | history
Assets/UI/Endless.meta 8 ●●●●● diff | view | raw | blame | history
Assets/UI/Endless/boss.meta 8 ●●●●● diff | view | raw | blame | history
Assets/UI/Endless/boss/a_4.meta 8 ●●●●● diff | view | raw | blame | history
Assets/UI/Endless/boss/a_4/a_40000_0000.png diff | view | raw | blame | history
Assets/UI/Endless/boss/a_4/a_40000_0000.png.meta 118 ●●●●● diff | view | raw | blame | history
Assets/UI/Endless/boss/a_4/a_40000_0001.png diff | view | raw | blame | history
Assets/UI/Endless/boss/a_4/a_40000_0001.png.meta 118 ●●●●● diff | view | raw | blame | history
Assets/UI/Endless/boss/a_4/a_40000_0002.png diff | view | raw | blame | history
Assets/UI/Endless/boss/a_4/a_40000_0002.png.meta 118 ●●●●● diff | view | raw | blame | history
Assets/UI/Endless/boss/a_4/a_40000_0003.png diff | view | raw | blame | history
Assets/UI/Endless/boss/a_4/a_40000_0003.png.meta 118 ●●●●● diff | view | raw | blame | history
Assets/UI/Endless/boss/a_4/a_40000_0004.png diff | view | raw | blame | history
Assets/UI/Endless/boss/a_4/a_40000_0004.png.meta 118 ●●●●● diff | view | raw | blame | history
Assets/UI/Endless/boss/a_4/a_40000_0005.png diff | view | raw | blame | history
Assets/UI/Endless/boss/a_4/a_40000_0005.png.meta 118 ●●●●● diff | view | raw | blame | history
Assets/UI/Endless/boss/a_4/a_40000_0006.png diff | view | raw | blame | history
Assets/UI/Endless/boss/a_4/a_40000_0006.png.meta 118 ●●●●● diff | view | raw | blame | history
Assets/UI/Endless/boss/a_4/a_40000_0007.png diff | view | raw | blame | history
Assets/UI/Endless/boss/a_4/a_40000_0007.png.meta 118 ●●●●● diff | view | raw | blame | history
Assets/UI/Endless/boss/s_4.meta 8 ●●●●● diff | view | raw | blame | history
Assets/UI/Endless/boss/s_4/s_40000_0008.png diff | view | raw | blame | history
Assets/UI/Endless/boss/s_4/s_40000_0008.png.meta 118 ●●●●● diff | view | raw | blame | history
Assets/UI/Endless/boss/s_4/s_40000_0009.png diff | view | raw | blame | history
Assets/UI/Endless/boss/s_4/s_40000_0009.png.meta 118 ●●●●● diff | view | raw | blame | history
Assets/UI/Endless/boss/s_4/s_40000_0010.png diff | view | raw | blame | history
Assets/UI/Endless/boss/s_4/s_40000_0010.png.meta 118 ●●●●● diff | view | raw | blame | history
Assets/UI/Endless/boss/s_4/s_40000_0011.png diff | view | raw | blame | history
Assets/UI/Endless/boss/s_4/s_40000_0011.png.meta 118 ●●●●● diff | view | raw | blame | history