liuzhiwei
2020-11-11 10b5f44b36f3dd0d3bdc2fcc06aa13caaa611760
refs
author liuzhiwei <liuzhiwei@qq.com>
Wednesday, November 11, 2020 16:56 +0800
committer liuzhiwei <liuzhiwei@qq.com>
Wednesday, November 11, 2020 16:56 +0800
commit10b5f44b36f3dd0d3bdc2fcc06aa13caaa611760
tree d5805a9ddc9bb16532c8b83ea190b8f0916c8bb0 tree | zip | gz
parent 3ad09c0cf6b8a98432b330fab7f5b50d557798dd view | diff
01ff0c1a144674422225d16a541247bc88df11c7 view | diff
Merge branch 'master' of http://172.16.1.52:8090/r/GemBattle into master
51 files added
18 files modified
3957 ■■■■■ changed files
Assets/00000/package/Materials/EffectShader_AlphaBlendUvflow_001.mat 2 ●●● diff | view | raw | blame | history
Assets/00000/package/Materials/Glow_040.mat 2 ●●● diff | view | raw | blame | history
Assets/00000/package/Materials/Glow_043.mat 2 ●●● diff | view | raw | blame | history
Assets/00000/package/Materials/Object_015.mat 2 ●●● diff | view | raw | blame | history
Assets/00000/package/Prefab/Effect_GongJiLuJing.prefab 4 ●●●● diff | view | raw | blame | history
Assets/Data/Agents/waterMonster.asset 2 ●●● diff | view | raw | blame | history
Assets/Materials/PVPTD/Env.meta 8 ●●●●● diff | view | raw | blame | history
Assets/Materials/PVPTD/Env/SkillBackGround.mat 85 ●●●●● diff | view | raw | blame | history
Assets/Materials/PVPTD/Env/SkillBackGround.mat.meta 8 ●●●●● diff | view | raw | blame | history
Assets/Materials/PVPTD/MonsterMat/NewMat/Water.meta 8 ●●●●● diff | view | raw | blame | history
Assets/Materials/PVPTD/MonsterMat/NewMat/Water/a_00.png diff | view | raw | blame | history
Assets/Materials/PVPTD/MonsterMat/NewMat/Water/a_00.png.meta 94 ●●●●● diff | view | raw | blame | history
Assets/Materials/PVPTD/MonsterMat/NewMat/Water/a_01.png diff | view | raw | blame | history
Assets/Materials/PVPTD/MonsterMat/NewMat/Water/a_01.png.meta 94 ●●●●● diff | view | raw | blame | history
Assets/Materials/PVPTD/MonsterMat/NewMat/Water/b_00.png diff | view | raw | blame | history
Assets/Materials/PVPTD/MonsterMat/NewMat/Water/b_00.png.meta 94 ●●●●● diff | view | raw | blame | history
Assets/Materials/PVPTD/MonsterMat/NewMat/Water/b_01.png diff | view | raw | blame | history
Assets/Materials/PVPTD/MonsterMat/NewMat/Water/b_01.png.meta 94 ●●●●● diff | view | raw | blame | history
Assets/Materials/PVPTD/MonsterMat/NewMat/Water/matAttack_Oppo.mat 82 ●●●●● diff | view | raw | blame | history
Assets/Materials/PVPTD/MonsterMat/NewMat/Water/matAttack_Oppo.mat.meta 8 ●●●●● diff | view | raw | blame | history
Assets/Materials/PVPTD/MonsterMat/NewMat/Water/matAttack_Self.mat 82 ●●●●● diff | view | raw | blame | history
Assets/Materials/PVPTD/MonsterMat/NewMat/Water/matAttack_Self.mat.meta 8 ●●●●● diff | view | raw | blame | history
Assets/Materials/PVPTD/MonsterMat/NewMat/Water/matDie_Oppo.mat 82 ●●●●● diff | view | raw | blame | history
Assets/Materials/PVPTD/MonsterMat/NewMat/Water/matDie_Oppo.mat.meta 8 ●●●●● diff | view | raw | blame | history
Assets/Materials/PVPTD/MonsterMat/NewMat/Water/matDie_Self.mat 82 ●●●●● diff | view | raw | blame | history
Assets/Materials/PVPTD/MonsterMat/NewMat/Water/matDie_Self.mat.meta 8 ●●●●● diff | view | raw | blame | history
Assets/Materials/PVPTD/MonsterMat/NewMat/Water/matGetHit_Oppo.mat 82 ●●●●● diff | view | raw | blame | history
Assets/Materials/PVPTD/MonsterMat/NewMat/Water/matGetHit_Oppo.mat.meta 8 ●●●●● diff | view | raw | blame | history
Assets/Materials/PVPTD/MonsterMat/NewMat/Water/matGetHit_Self.mat 82 ●●●●● diff | view | raw | blame | history
Assets/Materials/PVPTD/MonsterMat/NewMat/Water/matGetHit_Self.mat.meta 8 ●●●●● diff | view | raw | blame | history
Assets/Materials/PVPTD/MonsterMat/NewMat/Water/matMove_Oppo.mat 82 ●●●●● diff | view | raw | blame | history
Assets/Materials/PVPTD/MonsterMat/NewMat/Water/matMove_Oppo.mat.meta 8 ●●●●● diff | view | raw | blame | history
Assets/Materials/PVPTD/MonsterMat/NewMat/Water/matMove_Self.mat 82 ●●●●● diff | view | raw | blame | history
Assets/Materials/PVPTD/MonsterMat/NewMat/Water/matMove_Self.mat.meta 8 ●●●●● diff | view | raw | blame | history
Assets/Materials/PVPTD/MonsterMat/NewMat/Water/sw_00.png diff | view | raw | blame | history
Assets/Materials/PVPTD/MonsterMat/NewMat/Water/sw_00.png.meta 94 ●●●●● diff | view | raw | blame | history
Assets/Materials/PVPTD/MonsterMat/NewMat/Water/sw_01.png diff | view | raw | blame | history
Assets/Materials/PVPTD/MonsterMat/NewMat/Water/sw_01.png.meta 94 ●●●●● diff | view | raw | blame | history
Assets/Materials/PVPTD/MonsterMat/NewMat/Water/z_00.png diff | view | raw | blame | history
Assets/Materials/PVPTD/MonsterMat/NewMat/Water/z_00.png.meta 94 ●●●●● diff | view | raw | blame | history
Assets/Materials/PVPTD/MonsterMat/NewMat/Water/z_01.png diff | view | raw | blame | history
Assets/Materials/PVPTD/MonsterMat/NewMat/Water/z_01.png.meta 94 ●●●●● diff | view | raw | blame | history
Assets/Materials/PVPTD/WaveLineBackGround.mat 85 ●●●●● diff | view | raw | blame | history
Assets/Materials/PVPTD/WaveLineBackGround.mat.meta 8 ●●●●● diff | view | raw | blame | history
Assets/Prefabs/Enemies/water 1.prefab 1129 ●●●●● diff | view | raw | blame | history
Assets/Prefabs/Enemies/water 1.prefab.meta 7 ●●●●● diff | view | raw | blame | history
Assets/Scenes/Levels/Battle/Endless.unity 496 ●●●●● diff | view | raw | blame | history
Assets/Scripts/Event/EventType.cs 2 ●●●●● diff | view | raw | blame | history
Assets/Scripts/GameAnalytics_SDK/TDAA_SDKManager.cs 1 ●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/Affectors/AttackAffector.cs 31 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/Env.meta 8 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/Env/SkillGround.cs 27 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/Env/SkillGround.cs.meta 11 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/Input/EndlessTowerDefenseKeyboardMouseInput.cs 20 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/Level/AgentInsManager.cs 2 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/Towers/Placement/TowerPlacementGridEndless.cs 11 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/Towers/Tower.cs 46 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/Towers/WaveLineSelEffect.cs 34 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/UI/EndlessUIStart.cs 13 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/UI/HUD/EndlessGameUI.cs 20 ●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/UI/HUD/PlacementTile.cs 11 ●●●● diff | view | raw | blame | history
Assets/UI/Endless/DarkGround.png diff | view | raw | blame | history
Assets/UI/Endless/DarkGround.png.meta 118 ●●●●● diff | view | raw | blame | history
Assets/UI/Endless/Fire.png diff | view | raw | blame | history
Assets/UI/Endless/Fire.png.meta 94 ●●●●● diff | view | raw | blame | history
Assets/UI/Endless/GreenGround.png diff | view | raw | blame | history
Assets/UI/Endless/GreenGround.png.meta 94 ●●●●● diff | view | raw | blame | history
Assets/UI/Endless/Wood.png diff | view | raw | blame | history
Assets/UI/Endless/Wood.png.meta 94 ●●●●● diff | view | raw | blame | history