GemBattle.git - Gitblit

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

wangguan

2020-10-30 7f8b708e88b255f55e5cb1cebd2f45eb998bfaae

refs
author	wangguan <wangguan@kt007.com>
	Friday, October 30, 2020 14:36 +0800
committer	wangguan <wangguan@kt007.com>
	Friday, October 30, 2020 14:36 +0800
commit	7f8b708e88b255f55e5cb1cebd2f45eb998bfaae
tree	5a4b8116db22501d3656198620085a7627cfebdc tree \| zip \| gz
parent	57c50e4948f93e6bffcc8f18994696702ae25275 view \| diff 9f4059ebcbbab28b5df9225d2a329aa0ef704db6 view \| diff

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

1 files renamed

20 files copied

5 files deleted

78 files added

18 files modified

	Assets/00000/package/Glow_005.mat	80 ●●●●● diff \| view \| raw \| blame \| history
	Assets/00000/package/Glow_005.mat.meta	8 ●●●●● diff \| view \| raw \| blame \| history
	Assets/00000/package/Materials/Glow_002.mat	2 ●●●●● diff \| view \| raw \| blame \| history
	Assets/00000/package/Materials/Glow_003.mat	2 ●●●●● diff \| view \| raw \| blame \| history
	Assets/00000/package/Materials/Glow_005 1.mat	80 ●●●●● diff \| view \| raw \| blame \| history
	Assets/00000/package/Materials/Glow_006 1.mat	80 ●●●●● diff \| view \| raw \| blame \| history
	Assets/00000/package/Materials/Glow_006 1.mat.meta	8 ●●●●● diff \| view \| raw \| blame \| history
	Assets/00000/package/Materials/Glow_016.mat	2 ●●●●● diff \| view \| raw \| blame \| history
	Assets/00000/package/Materials/Glow_031.mat	30 ●●●●● diff \| view \| raw \| blame \| history
	Assets/00000/package/Materials/Glow_031.mat.meta	2 ●●●●● diff \| view \| raw \| blame \| history
	Assets/00000/package/Materials/Glow_032.mat	30 ●●●●● diff \| view \| raw \| blame \| history
	Assets/00000/package/Materials/Glow_032.mat.meta	2 ●●●●● diff \| view \| raw \| blame \| history
	Assets/00000/package/Materials/Object_003.mat	30 ●●●●● diff \| view \| raw \| blame \| history
	Assets/00000/package/Materials/Object_003.mat.meta	2 ●●●●● diff \| view \| raw \| blame \| history
	Assets/00000/package/Materials/Object_003_02.mat	65 ●●●●● diff \| view \| raw \| blame \| history
	Assets/00000/package/Materials/Object_003_02.mat.meta	2 ●●●●● diff \| view \| raw \| blame \| history
	Assets/00000/package/Materials/Object_003_02_b.mat	65 ●●●●● diff \| view \| raw \| blame \| history
	Assets/00000/package/Materials/Object_003_02_b.mat.meta	2 ●●●●● diff \| view \| raw \| blame \| history
	Assets/00000/package/Materials/Object_003_b.mat	30 ●●●●● diff \| view \| raw \| blame \| history
	Assets/00000/package/Materials/Object_003_b.mat.meta	2 ●●●●● diff \| view \| raw \| blame \| history
	Assets/00000/package/Materials/Sequence_019_4X4_b.mat	30 ●●●●● diff \| view \| raw \| blame \| history
	Assets/00000/package/Materials/Sequence_019_4X4_b.mat.meta	2 ●●●●● diff \| view \| raw \| blame \| history
	Assets/00000/package/Materials/Sequence_025_6X6_b.mat	30 ●●●●● diff \| view \| raw \| blame \| history
	Assets/00000/package/Materials/Sequence_025_6X6_b.mat.meta	2 ●●●●● diff \| view \| raw \| blame \| history
	Assets/00000/package/Materials/Sequence_035_4X4_02.mat	30 ●●●●● diff \| view \| raw \| blame \| history
	Assets/00000/package/Materials/Sequence_035_4X4_02.mat.meta	2 ●●●●● diff \| view \| raw \| blame \| history
	Assets/00000/package/Materials/Sequence_035_4X4_03.mat	30 ●●●●● diff \| view \| raw \| blame \| history
	Assets/00000/package/Materials/Sequence_035_4X4_03.mat.meta	2 ●●●●● diff \| view \| raw \| blame \| history
	Assets/00000/package/Materials/Sequence_038_3X3.mat	30 ●●●●● diff \| view \| raw \| blame \| history
	Assets/00000/package/Materials/Sequence_038_3X3.mat.meta	2 ●●●●● diff \| view \| raw \| blame \| history
	Assets/00000/package/Materials/Sequence_039_8X8.mat	30 ●●●●● diff \| view \| raw \| blame \| history
	Assets/00000/package/Materials/Sequence_039_8X8.mat.meta	2 ●●●●● diff \| view \| raw \| blame \| history
	Assets/00000/package/Materials/Sequence_040_2X4.mat	65 ●●●●● diff \| view \| raw \| blame \| history
	Assets/00000/package/Materials/Sequence_040_2X4.mat.meta	2 ●●●●● diff \| view \| raw \| blame \| history
	Assets/00000/package/Materials/Sequence_041_3X3.mat	30 ●●●●● diff \| view \| raw \| blame \| history
	Assets/00000/package/Materials/Sequence_041_3X3.mat.meta	2 ●●●●● diff \| view \| raw \| blame \| history
	Assets/00000/package/Materials/Sequence_042_2X2.mat	30 ●●●●● diff \| view \| raw \| blame \| history
	Assets/00000/package/Materials/Sequence_042_2X2.mat.meta	2 ●●●●● diff \| view \| raw \| blame \| history
	Assets/00000/package/Materials/Sequence_043_4X6.mat	30 ●●●●● diff \| view \| raw \| blame \| history
	Assets/00000/package/Materials/Sequence_043_4X6.mat.meta	2 ●●●●● diff \| view \| raw \| blame \| history
	Assets/00000/package/Materials/Sequence_043_4X6_b.mat	30 ●●●●● diff \| view \| raw \| blame \| history
	Assets/00000/package/Materials/Sequence_043_4X6_b.mat.meta	2 ●●●●● diff \| view \| raw \| blame \| history
	Assets/00000/package/Materials/Sequence_044_3X3.mat	30 ●●●●● diff \| view \| raw \| blame \| history
	Assets/00000/package/Materials/Sequence_044_3X3.mat.meta	2 ●●●●● diff \| view \| raw \| blame \| history
	Assets/00000/package/Materials/Texmap_002.mat	30 ●●●●● diff \| view \| raw \| blame \| history
	Assets/00000/package/Materials/Texmap_002.mat.meta	2 ●●●●● diff \| view \| raw \| blame \| history
	Assets/00000/package/Materials/Texmap_003.mat	45 ●●●●● diff \| view \| raw \| blame \| history
	Assets/00000/package/Materials/Texmap_003.mat.meta	2 ●●●●● diff \| view \| raw \| blame \| history
	Assets/00000/package/Model/bingkuai_01.FBX	diff \| view \| raw \| blame \| history
	Assets/00000/package/Model/bingkuai_01.FBX.meta	101 ●●●●● diff \| view \| raw \| blame \| history
	Assets/00000/package/Model/yuanhuan.FBX	diff \| view \| raw \| blame \| history
	Assets/00000/package/Model/yuanhuan.FBX.meta	95 ●●●●● diff \| view \| raw \| blame \| history
	Assets/00000/package/Model/zhayao.FBX	diff \| view \| raw \| blame \| history
	Assets/00000/package/Model/zhayao.FBX.meta	133 ●●●●● diff \| view \| raw \| blame \| history
	Assets/00000/package/Prefab/Effect_BaoShiShengJi.prefab	48476 ●●●●● diff \| view \| raw \| blame \| history
	Assets/00000/package/Prefab/Effect_BaoShiShengJi.prefab.meta	7 ●●●●● diff \| view \| raw \| blame \| history
	Assets/00000/package/Prefab/Effect_GouMaiBaoShi.prefab	9594 ●●●●● diff \| view \| raw \| blame \| history
	Assets/00000/package/Prefab/Effect_GouMaiBaoShi.prefab.meta	7 ●●●●● diff \| view \| raw \| blame \| history
	Assets/00000/package/Prefab/Effect_HuoJingLingDengChang.prefab	34039 ●●●●● diff \| view \| raw \| blame \| history
	Assets/00000/package/Prefab/Effect_HuoJingLingDengChang.prefab.meta	7 ●●●●● diff \| view \| raw \| blame \| history
	Assets/00000/package/Prefab/Effect_HuoJingLing_Atk.prefab	28996 ●●●●● diff \| view \| raw \| blame \| history
	Assets/00000/package/Prefab/Effect_HuoJingLing_Atk.prefab.meta	7 ●●●●● diff \| view \| raw \| blame \| history
	Assets/00000/package/Prefab/Effect_HuoJingLing_Hit.prefab	38767 ●●●●● diff \| view \| raw \| blame \| history
	Assets/00000/package/Prefab/Effect_HuoJingLing_Hit.prefab.meta	7 ●●●●● diff \| view \| raw \| blame \| history
	Assets/00000/package/Prefab/Effect_MuJingLingDengChang.prefab	29168 ●●●●● diff \| view \| raw \| blame \| history
	Assets/00000/package/Prefab/Effect_MuJingLingDengChang.prefab.meta	7 ●●●●● diff \| view \| raw \| blame \| history
	Assets/00000/package/Prefab/Effect_ShuiJingLingDengChang.prefab	29178 ●●●●● diff \| view \| raw \| blame \| history
	Assets/00000/package/Prefab/Effect_ShuiJingLingDengChang.prefab.meta	7 ●●●●● diff \| view \| raw \| blame \| history
	Assets/00000/package/Prefab/Effect_baomihua_00.prefab	4826 ●●●●● diff \| view \| raw \| blame \| history
	Assets/00000/package/Prefab/Effect_baomihua_04.prefab	4 ●●●●● diff \| view \| raw \| blame \| history
	Assets/00000/package/Prefab/Effect_huojinglingdengchang1026.prefab	4 ●●●●● diff \| view \| raw \| blame \| history
	Assets/00000/package/Prefab/Effect_xuanze.prefab	18 ●●●●● diff \| view \| raw \| blame \| history
	Assets/00000/package/Texture/Glow_015_b.png	diff \| view \| raw \| blame \| history
	Assets/00000/package/Texture/Glow_015_b.png.meta	106 ●●●●● diff \| view \| raw \| blame \| history
	Assets/00000/package/Texture/Glow_031.png	diff \| view \| raw \| blame \| history
	Assets/00000/package/Texture/Glow_031.png.meta	127 ●●●●● diff \| view \| raw \| blame \| history
	Assets/00000/package/Texture/Glow_032.png	diff \| view \| raw \| blame \| history
	Assets/00000/package/Texture/Glow_032.png.meta	127 ●●●●● diff \| view \| raw \| blame \| history
	Assets/00000/package/Texture/Object_003.png	diff \| view \| raw \| blame \| history
	Assets/00000/package/Texture/Object_003.png.meta	106 ●●●●● diff \| view \| raw \| blame \| history
	Assets/00000/package/Texture/Object_003_02.png	diff \| view \| raw \| blame \| history
	Assets/00000/package/Texture/Object_003_02.png.meta	106 ●●●●● diff \| view \| raw \| blame \| history
	Assets/00000/package/Texture/Sequence_019_4X4_b.png	diff \| view \| raw \| blame \| history
	Assets/00000/package/Texture/Sequence_019_4X4_b.png.meta	106 ●●●●● diff \| view \| raw \| blame \| history
	Assets/00000/package/Texture/Sequence_035_4X4.png.meta	14 ●●●●● diff \| view \| raw \| blame \| history
	Assets/00000/package/Texture/Sequence_035_4X4_02.jpeg	diff \| view \| raw \| blame \| history
	Assets/00000/package/Texture/Sequence_035_4X4_02.jpeg.meta	106 ●●●●● diff \| view \| raw \| blame \| history
	Assets/00000/package/Texture/Sequence_035_4X4_03.png	diff \| view \| raw \| blame \| history
	Assets/00000/package/Texture/Sequence_035_4X4_03.png.meta	106 ●●●●● diff \| view \| raw \| blame \| history
	Assets/00000/package/Texture/Sequence_038_3X3.png	diff \| view \| raw \| blame \| history
	Assets/00000/package/Texture/Sequence_038_3X3.png.meta	106 ●●●●● diff \| view \| raw \| blame \| history
	Assets/00000/package/Texture/Sequence_039_8X8.png	diff \| view \| raw \| blame \| history
	Assets/00000/package/Texture/Sequence_039_8X8.png.meta	127 ●●●●● diff \| view \| raw \| blame \| history
	Assets/00000/package/Texture/Sequence_040_2X4.png	diff \| view \| raw \| blame \| history
	Assets/00000/package/Texture/Sequence_040_2X4.png.meta	127 ●●●●● diff \| view \| raw \| blame \| history
	Assets/00000/package/Texture/Sequence_041_3X3.png	diff \| view \| raw \| blame \| history
	Assets/00000/package/Texture/Sequence_041_3X3.png.meta	127 ●●●●● diff \| view \| raw \| blame \| history
	Assets/00000/package/Texture/Sequence_042_2X2.png	diff \| view \| raw \| blame \| history
	Assets/00000/package/Texture/Sequence_042_2X2.png.meta	127 ●●●●● diff \| view \| raw \| blame \| history
	Assets/00000/package/Texture/Sequence_043_4X6.png	diff \| view \| raw \| blame \| history
	Assets/00000/package/Texture/Sequence_043_4X6.png.meta	127 ●●●●● diff \| view \| raw \| blame \| history
	Assets/00000/package/Texture/Sequence_044_3X3.png	diff \| view \| raw \| blame \| history
	Assets/00000/package/Texture/Sequence_044_3X3.png.meta	127 ●●●●● diff \| view \| raw \| blame \| history
	Assets/00000/package/Texture/Texmap_002.TGA	diff \| view \| raw \| blame \| history
	Assets/00000/package/Texture/Texmap_002.TGA.meta	106 ●●●●● diff \| view \| raw \| blame \| history
	Assets/00000/package/Texture/Texmap_003.png	diff \| view \| raw \| blame \| history
	Assets/00000/package/Texture/Texmap_003.png.meta	127 ●●●●● diff \| view \| raw \| blame \| history
	Assets/00000/package/Time.meta	8 ●●●●● diff \| view \| raw \| blame \| history
	Assets/00000/package/Time/Effect_HuoJingLingTimeline.playable	399 ●●●●● diff \| view \| raw \| blame \| history
	Assets/00000/package/Time/Effect_HuoJingLingTimeline.playable.meta	2 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Prefabs/Towers/WoodTower/WProjectile_0.prefab	4 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Prefabs/Towers/WoodTower/WProjectile_1.prefab	4 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Prefabs/Towers/WoodTower/WProjectile_2.prefab	4 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Prefabs/Towers/WoodTower/WProjectile_3.prefab	4 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Prefabs/Towers/WoodTower/WProjectile_4.prefab	4 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Prefabs/UI/BuffItem.prefab	156 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Scenes/Levels/Battle/Endless.unity	525 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Scripts/TowerDefense/UI/EndlessBuffSelect.cs	33 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Scripts/TowerDefense/UI/EndlessMaskUI.cs	25 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Scripts/TowerDefense/UI/EndlessMaskUI.cs.meta	11 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Scripts/TowerDefense/UI/EndlessUIStart.cs	1 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Scripts/TowerDefense/UI/HUD/SelectBuffIcon.cs	3 ●●●●● diff \| view \| raw \| blame \| history