GemBattle.git - Gitblit

refs
author	weixudong <weixudong4700@ktgame.com>
	Thursday, November 12, 2020 20:23 +0800
committer	weixudong <weixudong4700@ktgame.com>
	Thursday, November 12, 2020 20:23 +0800
commit	00d47de2f5c810542c1668c153f47f38122a47c6
tree	68930e96656353c54a80eae833ed9c17b8415385 tree \| zip \| gz
parent	643ee7b59dd05ce7eb6ced78233daa4028eb8759 view \| diff a7956acb794f93fc01e16963efe1f38743b110f9 view \| diff

Merge branch 'master' of ssh://172.16.1.52:8091/GemBattle into master

	Assets/00000/package/Materials/EffectShader_AddUvflow_002.mat	2 ●●●●● diff \| view \| raw \| blame \| history
	Assets/00000/package/Materials/EffectShader_AddUvflow_003.mat	2 ●●●●● diff \| view \| raw \| blame \| history
	Assets/00000/package/Materials/EffectShader_AddUvflow_004.mat	2 ●●●●● diff \| view \| raw \| blame \| history
	Assets/00000/package/Materials/EffectShader_AlphaUvflow_001.mat	2 ●●●●● diff \| view \| raw \| blame \| history
	Assets/00000/package/Materials/EffectShader_AlphaUvflow_002.mat	2 ●●●●● diff \| view \| raw \| blame \| history
	Assets/00000/package/Materials/EffectShader_AlphaUvflow_003.mat	2 ●●●●● diff \| view \| raw \| blame \| history
	Assets/00000/package/Materials/Glow_027_b.mat	2 ●●●●● diff \| view \| raw \| blame \| history
	Assets/00000/package/Materials/Object_016.mat	2 ●●●●● diff \| view \| raw \| blame \| history
	Assets/00000/package/Materials/Object_017.mat	2 ●●●●● diff \| view \| raw \| blame \| history
	Assets/00000/package/Materials/Object_018.mat	2 ●●●●● diff \| view \| raw \| blame \| history
	Assets/00000/package/Materials/Object_019.mat	2 ●●●●● diff \| view \| raw \| blame \| history
	Assets/00000/package/Materials/Object_020.mat	2 ●●●●● diff \| view \| raw \| blame \| history
	Assets/00000/package/Materials/Object_021.mat	2 ●●●●● diff \| view \| raw \| blame \| history
	Assets/00000/package/Materials/Object_022.mat	2 ●●●●● diff \| view \| raw \| blame \| history
	Assets/00000/package/Materials/Object_023.mat	2 ●●●●● diff \| view \| raw \| blame \| history
	Assets/00000/package/Materials/Object_024.mat	2 ●●●●● diff \| view \| raw \| blame \| history
	Assets/00000/package/Materials/Object_025.mat	2 ●●●●● diff \| view \| raw \| blame \| history
	Assets/00000/package/Materials/Object_028.mat	2 ●●●●● diff \| view \| raw \| blame \| history
	Assets/00000/package/Prefab/Prefab/Effect_UI_KaPai_Huo.prefab	6 ●●●●● diff \| view \| raw \| blame \| history
	Assets/00000/package/Prefab/Prefab/Effect_UI_KaPai_Huo_02.prefab	6 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Materials/UI/tileTowerVSMat.mat	2 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Prefabs/Towers/Fire/GrowUpTower_0.prefab	2 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Prefabs/UI/PlacementTileMobile.prefab	90 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Resources/UI/Effect_Elf_Huo_DengChang_101.prefab	34039 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Resources/UI/Effect_Elf_Huo_DengChang_101.prefab.meta	7 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Resources/UI/Effect_Elf_Mu_DengChang_109.prefab	29168 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Resources/UI/Effect_Elf_Mu_DengChang_109.prefab.meta	7 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Resources/UI/Effect_Elf_Shui_DengChang_105.prefab	34049 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Resources/UI/Effect_Elf_Shui_DengChang_105.prefab.meta	7 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Scenes/Levels/Battle/Endless.unity	22 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Scripts/TowerDefense/UI/HUD/EndlessGameUI.cs	95 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Scripts/TowerDefense/UI/HUD/EndlessRandomTower.cs	44 ●●●●● diff \| view \| raw \| blame \| history