~wxd/GemBattle.git

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

River Jiang

2020-10-22 45aacf1c3f93a53c3c885b0034b05c50a28ae2d4

refs
author	River Jiang <546213258@qq.com>
	Thursday, October 22, 2020 11:11 +0800
committer	River Jiang <546213258@qq.com>
	Thursday, October 22, 2020 11:11 +0800
commit	45aacf1c3f93a53c3c885b0034b05c50a28ae2d4
tree	257dd03910ae741f1dc81ac9f71906fb51b90c63 tree \| zip \| gz
parent	9ba26d8f5c0103d9f6bbc15ec76dde8ec935979b view \| diff 74d512da60864d2ece8c19edfc3bbe264ccb98f7 view \| diff

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

# Conflicts:
#	Assets/Prefabs/Towers/WoodTower/BlinkTower_0.prefab

2 files added

45 files modified

	Assets/00000/package/Materials/Glow_001.mat	2 ●●●●● diff \| view \| raw \| blame \| history
	Assets/00000/package/Prefab/Effect_baomihua.prefab	19646 ●●●●● diff \| view \| raw \| blame \| history
	Assets/00000/package/Prefab/Effect_baomihua.prefab.meta	7 ●●●●● diff \| view \| raw \| blame \| history
	Assets/GabrielAguiarProductions/Unique_Projectiles_Volume_1/Prefabs/Hits/Mobile/vfx_Hit_BubbleBlue_Mobile.prefab	8 ●●●●● diff \| view \| raw \| blame \| history
	Assets/GabrielAguiarProductions/Unique_Projectiles_Volume_1/Prefabs/Hits/Mobile/vfx_Hit_SpellOrange_Mobile.prefab	12 ●●●●● diff \| view \| raw \| blame \| history
	Assets/GabrielAguiarProductions/Unique_Projectiles_Volume_1/Prefabs/Muzzle/Mobile/vfx_Muzzle_Fire_Mobile.prefab	8 ●●●●● diff \| view \| raw \| blame \| history
	Assets/GabrielAguiarProductions/Unique_Projectiles_Volume_1/Prefabs/Muzzle/vfx_Muzzle_ArrowGreen.prefab	4 ●●●●● diff \| view \| raw \| blame \| history
	Assets/GabrielAguiarProductions/Unique_Projectiles_Volume_1/Prefabs/Muzzle/vfx_Muzzle_LaserBlue.prefab	6 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Materials/PVPTD/bgGrass.png	diff \| view \| raw \| blame \| history
	Assets/Prefabs/Towers/Fire/FireProjectile_0.prefab	12 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Prefabs/Towers/Fire/FireProjectile_1.prefab	12 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Prefabs/Towers/Fire/FireProjectile_2.prefab	12 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Prefabs/Towers/Fire/FireProjectile_3.prefab	12 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Prefabs/Towers/Fire/FireProjectile_4.prefab	12 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Prefabs/Towers/Water/WaterProjectile_0.prefab	6 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Prefabs/Towers/Water/WaterProjectile_1.prefab	6 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Prefabs/Towers/Water/WaterProjectile_2.prefab	6 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Prefabs/Towers/Water/WaterProjectile_3.prefab	6 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Prefabs/Towers/Water/WaterProjectile_4.prefab	6 ●●●●● 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/Prefabs/Towers/WoodTower/Projectile_0.prefab	4860 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Prefabs/Towers/WoodTower/Projectile_0.prefab.meta	2 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Prefabs/Towers/WoodTower/Projectile_1.prefab	4860 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Prefabs/Towers/WoodTower/Projectile_1.prefab.meta	2 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Prefabs/Towers/WoodTower/Projectile_2.prefab	4860 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Prefabs/Towers/WoodTower/Projectile_2.prefab.meta	2 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Prefabs/Towers/WoodTower/Projectile_3.prefab	4860 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Prefabs/Towers/WoodTower/Projectile_3.prefab.meta	2 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Prefabs/Towers/WoodTower/Projectile_4.prefab	4860 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Prefabs/Towers/WoodTower/Projectile_4.prefab.meta	2 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Prefabs/Towers/WoodTower/WoodHit.prefab	18 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Scenes/Levels/Battle/GemBattle.unity	26 ●●●●● diff \| view \| raw \| blame \| history
	GemBattle.zip	diff \| view \| raw \| blame \| history
	GemBattle/宝石塔防_Data/Managed/Assembly-CSharp.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/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/sharedassets2.assets	diff \| view \| raw \| blame \| history
	GemBattle/宝石塔防_Data/sharedassets2.assets.resS	diff \| view \| raw \| blame \| history
	GemBattle/宝石塔防_Data/sharedassets3.assets	diff \| view \| raw \| blame \| history
	ProjectSettings/TagManager.asset	3 ●●●●● diff \| view \| raw \| blame \| history