GemBattle.git - Gitblit

Merge branch 'master' of http://172.16.1.52:8090/r/GemBattle into master

liuzhiwei

2020-11-04 78e14d93c46238881339f33a56c81275c55d5089

refs
author	liuzhiwei <liuzhiwei@qq.com>
	Wednesday, November 4, 2020 14:02 +0800
committer	liuzhiwei <liuzhiwei@qq.com>
	Wednesday, November 4, 2020 14:02 +0800
commit	78e14d93c46238881339f33a56c81275c55d5089
tree	2d445c7592f5848684075cfc11ccd7a4e68bd30a tree \| zip \| gz
parent	7ccfa49f19b0e9a82f55d84e41b885d9d05d6bce view \| diff 99e9bdf463347aab62cddedbe05b679fd533a87c view \| diff

Merge branch 'master' of http://172.16.1.52:8090/r/GemBattle into master

# Conflicts:
#	Assets/00000/package/Materials/Glow_033.mat

3 files renamed

4 files copied

1 files deleted

105 files added

31 files modified

	Assets/Data/Agents/fireMonster.asset	2 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Data/Agents/woodMonster.asset	2 ●●●●● diff \| view \| raw \| blame \| history
	Assets/GabrielAguiarProductions/Unique_Projectiles_Volume_1/Scripts/CameraShakeSimpleScript.cs	5 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Materials/PVE/PVEBg.png.meta	6 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Materials/PVPTD/MonsterMat/NewMat/Fire 1.meta	8 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Materials/PVPTD/MonsterMat/NewMat/Fire 1/a_00000_0008.png	diff \| view \| raw \| blame \| history
	Assets/Materials/PVPTD/MonsterMat/NewMat/Fire 1/a_00000_0008.png.meta	94 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Materials/PVPTD/MonsterMat/NewMat/Fire 1/a_10000_0008.png	diff \| view \| raw \| blame \| history
	Assets/Materials/PVPTD/MonsterMat/NewMat/Fire 1/a_10000_0008.png.meta	94 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Materials/PVPTD/MonsterMat/NewMat/Fire 1/b_0000_0014.png	diff \| view \| raw \| blame \| history
	Assets/Materials/PVPTD/MonsterMat/NewMat/Fire 1/b_0000_0014.png.meta	94 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Materials/PVPTD/MonsterMat/NewMat/Fire 1/b_10000_0014.png	diff \| view \| raw \| blame \| history
	Assets/Materials/PVPTD/MonsterMat/NewMat/Fire 1/b_10000_0014.png.meta	94 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Materials/PVPTD/MonsterMat/NewMat/Fire 1/matAttack_Oppo.mat	81 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Materials/PVPTD/MonsterMat/NewMat/Fire 1/matAttack_Oppo.mat.meta	8 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Materials/PVPTD/MonsterMat/NewMat/Fire 1/matAttack_Self.mat	81 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Materials/PVPTD/MonsterMat/NewMat/Fire 1/matAttack_Self.mat.meta	8 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Materials/PVPTD/MonsterMat/NewMat/Fire 1/matDie_Oppo.mat	81 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Materials/PVPTD/MonsterMat/NewMat/Fire 1/matDie_Oppo.mat.meta	8 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Materials/PVPTD/MonsterMat/NewMat/Fire 1/matDie_Self.mat	81 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Materials/PVPTD/MonsterMat/NewMat/Fire 1/matDie_Self.mat.meta	8 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Materials/PVPTD/MonsterMat/NewMat/Fire 1/matGetHit_Oppo.mat	81 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Materials/PVPTD/MonsterMat/NewMat/Fire 1/matGetHit_Oppo.mat.meta	8 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Materials/PVPTD/MonsterMat/NewMat/Fire 1/matGetHit_Self.mat	81 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Materials/PVPTD/MonsterMat/NewMat/Fire 1/matGetHit_Self.mat.meta	8 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Materials/PVPTD/MonsterMat/NewMat/Fire 1/matMove_Oppo.mat	81 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Materials/PVPTD/MonsterMat/NewMat/Fire 1/matMove_Oppo.mat.meta	8 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Materials/PVPTD/MonsterMat/NewMat/Fire 1/matMove_Self.mat	81 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Materials/PVPTD/MonsterMat/NewMat/Fire 1/matMove_Self.mat.meta	8 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Materials/PVPTD/MonsterMat/NewMat/Fire 1/sw_0000_0018.png	diff \| view \| raw \| blame \| history
	Assets/Materials/PVPTD/MonsterMat/NewMat/Fire 1/sw_0000_0018.png.meta	94 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Materials/PVPTD/MonsterMat/NewMat/Fire 1/sw_10000_0018.png	diff \| view \| raw \| blame \| history
	Assets/Materials/PVPTD/MonsterMat/NewMat/Fire 1/sw_10000_0018.png.meta	94 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Materials/PVPTD/MonsterMat/NewMat/Fire 1/z_00000_0000.png	diff \| view \| raw \| blame \| history
	Assets/Materials/PVPTD/MonsterMat/NewMat/Fire 1/z_00000_0000.png.meta	94 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Materials/PVPTD/MonsterMat/NewMat/Fire 1/z_10000_0000.png	diff \| view \| raw \| blame \| history
	Assets/Materials/PVPTD/MonsterMat/NewMat/Fire 1/z_10000_0000.png.meta	94 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Materials/PVPTD/MonsterMat/NewMat/Wood 1.meta	8 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Materials/PVPTD/MonsterMat/NewMat/Wood 1/a_00000_0006 1.png	diff \| view \| raw \| blame \| history
	Assets/Materials/PVPTD/MonsterMat/NewMat/Wood 1/a_00000_0006 1.png.meta	94 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Materials/PVPTD/MonsterMat/NewMat/Wood 1/a_10000_0006 1.png	diff \| view \| raw \| blame \| history
	Assets/Materials/PVPTD/MonsterMat/NewMat/Wood 1/a_10000_0006 1.png.meta	94 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Materials/PVPTD/MonsterMat/NewMat/Wood 1/b_0000_0014 1.png	diff \| view \| raw \| blame \| history
	Assets/Materials/PVPTD/MonsterMat/NewMat/Wood 1/b_0000_0014 1.png.meta	94 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Materials/PVPTD/MonsterMat/NewMat/Wood 1/b_10000_0014 1.png	diff \| view \| raw \| blame \| history
	Assets/Materials/PVPTD/MonsterMat/NewMat/Wood 1/b_10000_0014 1.png.meta	94 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Materials/PVPTD/MonsterMat/NewMat/Wood 1/matAttack_Oppo.mat	81 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Materials/PVPTD/MonsterMat/NewMat/Wood 1/matAttack_Oppo.mat.meta	8 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Materials/PVPTD/MonsterMat/NewMat/Wood 1/matAttack_Self.mat	81 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Materials/PVPTD/MonsterMat/NewMat/Wood 1/matAttack_Self.mat.meta	8 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Materials/PVPTD/MonsterMat/NewMat/Wood 1/matDie_Oppo.mat	81 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Materials/PVPTD/MonsterMat/NewMat/Wood 1/matDie_Oppo.mat.meta	8 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Materials/PVPTD/MonsterMat/NewMat/Wood 1/matDie_Self.mat	81 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Materials/PVPTD/MonsterMat/NewMat/Wood 1/matDie_Self.mat.meta	8 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Materials/PVPTD/MonsterMat/NewMat/Wood 1/matGetHit_Oppo.mat	81 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Materials/PVPTD/MonsterMat/NewMat/Wood 1/matGetHit_Oppo.mat.meta	8 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Materials/PVPTD/MonsterMat/NewMat/Wood 1/matGetHit_Self.mat	81 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Materials/PVPTD/MonsterMat/NewMat/Wood 1/matGetHit_Self.mat.meta	8 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Materials/PVPTD/MonsterMat/NewMat/Wood 1/matMove_Oppo.mat	81 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Materials/PVPTD/MonsterMat/NewMat/Wood 1/matMove_Oppo.mat.meta	8 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Materials/PVPTD/MonsterMat/NewMat/Wood 1/matMove_Self.mat	81 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Materials/PVPTD/MonsterMat/NewMat/Wood 1/matMove_Self.mat.meta	8 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Materials/PVPTD/MonsterMat/NewMat/Wood 1/sw_0000_0019 1.png	diff \| view \| raw \| blame \| history
	Assets/Materials/PVPTD/MonsterMat/NewMat/Wood 1/sw_0000_0019 1.png.meta	94 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Materials/PVPTD/MonsterMat/NewMat/Wood 1/sw_10000_0019 1.png	diff \| view \| raw \| blame \| history
	Assets/Materials/PVPTD/MonsterMat/NewMat/Wood 1/sw_10000_0019 1.png.meta	94 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Materials/PVPTD/MonsterMat/NewMat/Wood 1/z_00000_0000 1.png	diff \| view \| raw \| blame \| history
	Assets/Materials/PVPTD/MonsterMat/NewMat/Wood 1/z_00000_0000 1.png.meta	94 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Materials/PVPTD/MonsterMat/NewMat/Wood 1/z_10000_0000 1.png	diff \| view \| raw \| blame \| history
	Assets/Materials/PVPTD/MonsterMat/NewMat/Wood 1/z_10000_0000 1.png.meta	94 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Materials/PVPTD/TowerMat/FireMat.meta	8 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Materials/PVPTD/TowerMat/FireMat/fire_oppo_attackMat.mat	81 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Materials/PVPTD/TowerMat/FireMat/fire_oppo_attackMat.mat.meta	8 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Materials/PVPTD/TowerMat/FireMat/fire_oppo_waitMat.mat	81 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Materials/PVPTD/TowerMat/FireMat/fire_oppo_waitMat.mat.meta	8 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Materials/PVPTD/TowerMat/FireMat/fire_self_attackMat.mat	81 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Materials/PVPTD/TowerMat/FireMat/fire_self_attackMat.mat.meta	8 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Materials/PVPTD/TowerMat/FireMat/fire_self_waitMat.mat	81 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Materials/PVPTD/TowerMat/FireMat/fire_self_waitMat.mat.meta	8 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Materials/PVPTD/TowerMat/FireMat/oppo_fire_attack.png	diff \| view \| raw \| blame \| history
	Assets/Materials/PVPTD/TowerMat/FireMat/oppo_fire_attack.png.meta	94 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Materials/PVPTD/TowerMat/FireMat/oppo_fire_wait.png	diff \| view \| raw \| blame \| history
	Assets/Materials/PVPTD/TowerMat/FireMat/oppo_fire_wait.png.meta	94 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Materials/PVPTD/TowerMat/FireMat/self_fire_attack.png	diff \| view \| raw \| blame \| history
	Assets/Materials/PVPTD/TowerMat/FireMat/self_fire_attack.png.meta	94 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Materials/PVPTD/TowerMat/FireMat/self_wood_wait.png	diff \| view \| raw \| blame \| history
	Assets/Materials/PVPTD/TowerMat/FireMat/self_wood_wait.png.meta	94 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Materials/PVPTD/TowerMat/WoodMat.meta	8 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Materials/PVPTD/TowerMat/WoodMat/oppo_wood_attack.png	diff \| view \| raw \| blame \| history
	Assets/Materials/PVPTD/TowerMat/WoodMat/oppo_wood_attack.png.meta	94 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Materials/PVPTD/TowerMat/WoodMat/oppo_wood_wait.png	diff \| view \| raw \| blame \| history
	Assets/Materials/PVPTD/TowerMat/WoodMat/oppo_wood_wait.png.meta	94 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Materials/PVPTD/TowerMat/WoodMat/self_wood_attack.png	diff \| view \| raw \| blame \| history
	Assets/Materials/PVPTD/TowerMat/WoodMat/self_wood_attack.png.meta	94 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Materials/PVPTD/TowerMat/WoodMat/self_wood_wait.png	diff \| view \| raw \| blame \| history
	Assets/Materials/PVPTD/TowerMat/WoodMat/self_wood_wait.png.meta	94 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Materials/PVPTD/TowerMat/WoodMat/wood_oppo_attackMat.mat	81 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Materials/PVPTD/TowerMat/WoodMat/wood_oppo_attackMat.mat.meta	8 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Materials/PVPTD/TowerMat/WoodMat/wood_oppo_waitMat.mat	81 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Materials/PVPTD/TowerMat/WoodMat/wood_oppo_waitMat.mat.meta	8 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Materials/PVPTD/TowerMat/WoodMat/wood_self_attackMat.mat	81 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Materials/PVPTD/TowerMat/WoodMat/wood_self_attackMat.mat.meta	8 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Materials/PVPTD/TowerMat/WoodMat/wood_self_waitMat.mat	81 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Materials/PVPTD/TowerMat/WoodMat/wood_self_waitMat.mat.meta	8 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Prefabs/Enemies/fire 1.prefab.meta	7 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Prefabs/Enemies/fire 2.prefab	24 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Prefabs/Enemies/fire 2.prefab.meta	2 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Prefabs/Enemies/wood 2.prefab	24 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Prefabs/Enemies/wood 2.prefab.meta	2 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Prefabs/Towers/Fire/GrowUpTower.prefab	8 ●●●●● diff \| view \| raw \| blame \| history
	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/WoodTower/BlinkTower.prefab	8 ●●●●● 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/Resources/UI/Props/EndlessDropEffect.prefab	116 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Resources/UI/Props/Icon.prefab	90 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Resources/UI/Props/Icon.prefab.meta	2 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Scenes/Levels/Battle/Endless.unity	2 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Scripts/Common/CommonDebugHelper.cs	30 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Scripts/Common/GameUtils.cs	10 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Scripts/Material/ChangeMat.cs	9 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Scripts/Net/NetExtends/Table.cs	114 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Scripts/TowerDefense/Agents/Agent.cs	14 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Scripts/TowerDefense/Level/EndlessDropManager.cs	61 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Scripts/TowerDefense/Towers/Placement/TowerPlacementGridEndless.cs	99 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Scripts/TowerDefense/Towers/Tower.cs	8 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Scripts/TowerDefense/Towers/TowerLevel.cs	78 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Scripts/TowerDefense/UI/EndlessDropReward.cs	33 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Scripts/TowerDefense/UI/EndlessPropIcon.cs	5 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Scripts/TowerDefense/UI/EndlessSettlementPropList.cs	59 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Scripts/TowerDefense/UI/EndlessUIStart.cs	2 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Scripts/UI/FlyImage.cs	132 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Scripts/UI/FlyImage.cs.meta	11 ●●●●● diff \| view \| raw \| blame \| history
	Assets/StreamingAssets/Table/boss_skill.json	1 ●●●●● diff \| view \| raw \| blame \| history
	Assets/StreamingAssets/Table/boss_skill.json.meta	4 ●●●●● diff \| view \| raw \| blame \| history
	Assets/StreamingAssets/Table/endless_boss.json	1 ●●●●● diff \| view \| raw \| blame \| history
	Assets/StreamingAssets/Table/endless_boss.json.meta	4 ●●●●● diff \| view \| raw \| blame \| history