~wxd/GemBattle.git

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

wangguan

2020-10-26 0e8a4a629f0db7d9dc7b8c3b9795a195c279f7b9

refs
author	wangguan <wangguan@kt007.com>
	Monday, October 26, 2020 14:25 +0800
committer	wangguan <wangguan@kt007.com>
	Monday, October 26, 2020 14:25 +0800
commit	0e8a4a629f0db7d9dc7b8c3b9795a195c279f7b9
tree	de58e01d4f70146f0b583dcc8a602a8e084b8b45 tree \| zip \| gz
parent	439510ca0d2da7fa0af0496d4a05096841f01f8f view \| diff 2fc3753ac9c591a01f0d966984abe659113fe57f view \| diff

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

3 files renamed

26 files copied

11 files deleted

74 files added

42 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_005 1.mat	80 ●●●●● diff \| view \| raw \| blame \| history
	Assets/00000/package/Materials/Glow_005 1.mat.meta	8 ●●●●● diff \| view \| raw \| blame \| history
	Assets/00000/package/Materials/Glow_005.mat	52 ●●●●● diff \| view \| raw \| blame \| history
	Assets/00000/package/Materials/Glow_005.mat.meta	2 ●●●●● 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_006.mat	54 ●●●●● diff \| view \| raw \| blame \| history
	Assets/00000/package/Materials/Glow_006.mat.meta	2 ●●●●● diff \| view \| raw \| blame \| history
	Assets/00000/package/Materials/Glow_007.mat	30 ●●●●● diff \| view \| raw \| blame \| history
	Assets/00000/package/Materials/Glow_007.mat.meta	8 ●●●●● diff \| view \| raw \| blame \| history
	Assets/00000/package/Materials/Glow_008.mat	30 ●●●●● diff \| view \| raw \| blame \| history
	Assets/00000/package/Materials/Glow_008.mat.meta	8 ●●●●● diff \| view \| raw \| blame \| history
	Assets/00000/package/Materials/Glow_009.mat	30 ●●●●● diff \| view \| raw \| blame \| history
	Assets/00000/package/Materials/Glow_009.mat.meta	8 ●●●●● diff \| view \| raw \| blame \| history
	Assets/00000/package/Materials/Glow_010.mat	30 ●●●●● diff \| view \| raw \| blame \| history
	Assets/00000/package/Materials/Glow_010.mat.meta	8 ●●●●● diff \| view \| raw \| blame \| history
	Assets/00000/package/Materials/Glow_011.mat	30 ●●●●● diff \| view \| raw \| blame \| history
	Assets/00000/package/Materials/Glow_011.mat.meta	8 ●●●●● diff \| view \| raw \| blame \| history
	Assets/00000/package/Materials/Glow_012.mat	30 ●●●●● diff \| view \| raw \| blame \| history
	Assets/00000/package/Materials/Glow_012.mat.meta	8 ●●●●● diff \| view \| raw \| blame \| history
	Assets/00000/package/Materials/Glow_013.mat	30 ●●●●● diff \| view \| raw \| blame \| history
	Assets/00000/package/Materials/Glow_013.mat.meta	8 ●●●●● diff \| view \| raw \| blame \| history
	Assets/00000/package/Materials/Glow_014.mat	30 ●●●●● diff \| view \| raw \| blame \| history
	Assets/00000/package/Materials/Glow_014.mat.meta	8 ●●●●● diff \| view \| raw \| blame \| history
	Assets/00000/package/Materials/Glow_015.mat	30 ●●●●● diff \| view \| raw \| blame \| history
	Assets/00000/package/Materials/Glow_015.mat.meta	8 ●●●●● diff \| view \| raw \| blame \| history
	Assets/00000/package/Materials/Glow_016.mat	30 ●●●●● diff \| view \| raw \| blame \| history
	Assets/00000/package/Materials/Glow_016.mat.meta	8 ●●●●● diff \| view \| raw \| blame \| history
	Assets/00000/package/Materials/Glow_017.mat	30 ●●●●● diff \| view \| raw \| blame \| history
	Assets/00000/package/Materials/Glow_017.mat.meta	8 ●●●●● diff \| view \| raw \| blame \| history
	Assets/00000/package/Materials/Glow_018.mat	30 ●●●●● diff \| view \| raw \| blame \| history
	Assets/00000/package/Materials/Glow_018.mat.meta	8 ●●●●● diff \| view \| raw \| blame \| history
	Assets/00000/package/Materials/Glow_019.mat	30 ●●●●● diff \| view \| raw \| blame \| history
	Assets/00000/package/Materials/Glow_019.mat.meta	8 ●●●●● diff \| view \| raw \| blame \| history
	Assets/00000/package/Materials/Glow_021.mat	30 ●●●●● diff \| view \| raw \| blame \| history
	Assets/00000/package/Materials/Glow_021.mat.meta	8 ●●●●● diff \| view \| raw \| blame \| history
	Assets/00000/package/Materials/Sequence_004_4X4.mat	30 ●●●●● diff \| view \| raw \| blame \| history
	Assets/00000/package/Materials/Sequence_004_4X4.mat.meta	8 ●●●●● diff \| view \| raw \| blame \| history
	Assets/00000/package/Prefab/Effect_baomihua_00.prefab	6 ●●●●● diff \| view \| raw \| blame \| history
	Assets/00000/package/Prefab/Effect_baomihua_03 1.prefab.meta	7 ●●●●● diff \| view \| raw \| blame \| history
	Assets/00000/package/Prefab/Effect_baoxiangdiaoluo.prefab	19310 ●●●●● diff \| view \| raw \| blame \| history
	Assets/00000/package/Prefab/Effect_baoxiangdiaoluo.prefab.meta	2 ●●●●● diff \| view \| raw \| blame \| history
	Assets/00000/package/Prefab/Effect_baoxiangliuguang.prefab	88005 ●●●●● diff \| view \| raw \| blame \| history
	Assets/00000/package/Prefab/Effect_baoxiangliuguang.prefab.meta	2 ●●●●● diff \| view \| raw \| blame \| history
	Assets/00000/package/Prefab/Effect_guaiwufazhen (1).prefab	14996 ●●●●● diff \| view \| raw \| blame \| history
	Assets/00000/package/Prefab/Effect_guaiwufazhen (1).prefab.meta	2 ●●●●● diff \| view \| raw \| blame \| history
	Assets/00000/package/Prefab/Effect_guaiwufazhen (2).prefab	14996 ●●●●● diff \| view \| raw \| blame \| history
	Assets/00000/package/Prefab/Effect_guaiwufazhen (2).prefab.meta	2 ●●●●● diff \| view \| raw \| blame \| history
	Assets/00000/package/Prefab/Effect_guaiwufazhen (3).prefab	14996 ●●●●● diff \| view \| raw \| blame \| history
	Assets/00000/package/Prefab/Effect_guaiwufazhen (3).prefab.meta	2 ●●●●● diff \| view \| raw \| blame \| history
	Assets/00000/package/Prefab/Effect_guaiwufazhen (4).prefab	14996 ●●●●● diff \| view \| raw \| blame \| history
	Assets/00000/package/Prefab/Effect_guaiwufazhen (4).prefab.meta	2 ●●●●● diff \| view \| raw \| blame \| history
	Assets/00000/package/Prefab/Effect_guaiwufazhen.prefab	14996 ●●●●● diff \| view \| raw \| blame \| history
	Assets/00000/package/Prefab/Effect_guaiwufazhen.prefab.meta	2 ●●●●● diff \| view \| raw \| blame \| history
	Assets/00000/package/Prefab/Effect_shengli.prefab	55110 ●●●●● diff \| view \| raw \| blame \| history
	Assets/00000/package/Prefab/Effect_shengli.prefab.meta	2 ●●●●● diff \| view \| raw \| blame \| history
	Assets/00000/package/Prefab/Effect_xuanze.prefab	78387 ●●●●● diff \| view \| raw \| blame \| history
	Assets/00000/package/Prefab/Effect_xuanze.prefab.meta	2 ●●●●● diff \| view \| raw \| blame \| history
	Assets/00000/package/Texture/Glow_005.png	diff \| view \| raw \| blame \| history
	Assets/00000/package/Texture/Glow_005.png.meta	2 ●●●●● diff \| view \| raw \| blame \| history
	Assets/00000/package/Texture/Glow_006.png	diff \| view \| raw \| blame \| history
	Assets/00000/package/Texture/Glow_006.png.meta	31 ●●●●● diff \| view \| raw \| blame \| history
	Assets/00000/package/Texture/Glow_007.png	diff \| view \| raw \| blame \| history
	Assets/00000/package/Texture/Glow_007.png.meta	106 ●●●●● diff \| view \| raw \| blame \| history
	Assets/00000/package/Texture/Glow_008.png	diff \| view \| raw \| blame \| history
	Assets/00000/package/Texture/Glow_008.png.meta	106 ●●●●● diff \| view \| raw \| blame \| history
	Assets/00000/package/Texture/Glow_009.png	diff \| view \| raw \| blame \| history
	Assets/00000/package/Texture/Glow_009.png.meta	106 ●●●●● diff \| view \| raw \| blame \| history
	Assets/00000/package/Texture/Glow_010.png	diff \| view \| raw \| blame \| history
	Assets/00000/package/Texture/Glow_010.png.meta	106 ●●●●● diff \| view \| raw \| blame \| history
	Assets/00000/package/Texture/Glow_011.png	diff \| view \| raw \| blame \| history
	Assets/00000/package/Texture/Glow_011.png.meta	127 ●●●●● diff \| view \| raw \| blame \| history
	Assets/00000/package/Texture/Glow_012.png	diff \| view \| raw \| blame \| history
	Assets/00000/package/Texture/Glow_012.png.meta	127 ●●●●● diff \| view \| raw \| blame \| history
	Assets/00000/package/Texture/Glow_013.png	diff \| view \| raw \| blame \| history
	Assets/00000/package/Texture/Glow_013.png.meta	106 ●●●●● diff \| view \| raw \| blame \| history
	Assets/00000/package/Texture/Glow_014.png	diff \| view \| raw \| blame \| history
	Assets/00000/package/Texture/Glow_014.png.meta	94 ●●●●● diff \| view \| raw \| blame \| history
	Assets/00000/package/Texture/Glow_015.png	diff \| view \| raw \| blame \| history
	Assets/00000/package/Texture/Glow_015.png.meta	127 ●●●●● diff \| view \| raw \| blame \| history
	Assets/00000/package/Texture/Glow_016.png	diff \| view \| raw \| blame \| history
	Assets/00000/package/Texture/Glow_016.png.meta	127 ●●●●● diff \| view \| raw \| blame \| history
	Assets/00000/package/Texture/Glow_017.png	diff \| view \| raw \| blame \| history
	Assets/00000/package/Texture/Glow_017.png.meta	106 ●●●●● diff \| view \| raw \| blame \| history
	Assets/00000/package/Texture/Glow_018.png	diff \| view \| raw \| blame \| history
	Assets/00000/package/Texture/Glow_018.png.meta	106 ●●●●● diff \| view \| raw \| blame \| history
	Assets/00000/package/Texture/Glow_019.png	diff \| view \| raw \| blame \| history
	Assets/00000/package/Texture/Glow_019.png.meta	130 ●●●●● diff \| view \| raw \| blame \| history
	Assets/00000/package/Texture/Glow_021.png	diff \| view \| raw \| blame \| history
	Assets/00000/package/Texture/Glow_021.png.meta	106 ●●●●● diff \| view \| raw \| blame \| history
	Assets/00000/package/Texture/Sequence_004_4X4.png	diff \| view \| raw \| blame \| history
	Assets/00000/package/Texture/Sequence_004_4X4.png.meta	130 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Prefabs/Towers/WoodTower/Effect_baomihua_00 1.prefab	24460 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Prefabs/Towers/WoodTower/Effect_baomihua_00 1.prefab.meta	2 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Prefabs/Towers/WoodTower/Effect_baomihua_02 1.prefab.meta	7 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Prefabs/Towers/WoodTower/WProjectile_0.prefab	6 ●●●●● 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/Props/AdvancedTreasure.prefab	185 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Prefabs/UI/Props/AdvancedTreasure.prefab.meta	7 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Prefabs/UI/Props/Gold.prefab	185 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Prefabs/UI/Props/Gold.prefab.meta	7 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Prefabs/UI/Props/MiddleTreasure.prefab	185 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Prefabs/UI/Props/MiddleTreasure.prefab.meta	7 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Prefabs/UI/Props/Money.prefab	185 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Prefabs/UI/Props/Money.prefab.meta	7 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Prefabs/UI/Props/PrimaryTreasure.prefab	185 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Resources/UI/Endless/Boss.meta	8 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Resources/UI/Endless/Boss/1.png	diff \| view \| raw \| blame \| history
	Assets/Resources/UI/Endless/Boss/1.png.meta	118 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Resources/UI/Endless/Boss/2.png	diff \| view \| raw \| blame \| history
	Assets/Resources/UI/Endless/Boss/2.png.meta	118 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Resources/UI/Endless/Tunel/1.png	diff \| view \| raw \| blame \| history
	Assets/Resources/UI/Endless/Tunel/1.png.meta	40 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Resources/UI/Endless/Tunel/2.png	diff \| view \| raw \| blame \| history
	Assets/Resources/UI/Endless/Tunel/2.png.meta	40 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Resources/UI/Endless/Tunel/3.png	diff \| view \| raw \| blame \| history
	Assets/Resources/UI/Endless/Tunel/3.png.meta	40 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Resources/UI/Endless/Tunel/4.png.meta	40 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Resources/UI/Endless/Tunel/5.png.meta	40 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Resources/UI/Endless/Tunel/EndlessFaZhen1.prefab	14996 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Resources/UI/Endless/Tunel/EndlessFaZhen1.prefab.meta	2 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Resources/UI/Endless/Tunel/EndlessFaZhen2.prefab	14996 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Resources/UI/Endless/Tunel/EndlessFaZhen2.prefab.meta	2 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Resources/UI/Endless/Tunel/EndlessFaZhen3.prefab	14996 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Resources/UI/Endless/Tunel/EndlessFaZhen3.prefab.meta	2 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Resources/UI/Endless/Tunel/EndlessFaZhen4.prefab	14996 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Resources/UI/Endless/Tunel/EndlessFaZhen4.prefab.meta	2 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Resources/UI/Endless/Tunel/EndlessFaZhen5.prefab	14996 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Resources/UI/Endless/Tunel/EndlessFaZhen5.prefab.meta	2 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Resources/UI/Endless/Tunel/tunel_1.mat	2 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Resources/UI/Endless/Tunel/tunel_2.mat	2 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Resources/UI/Endless/Tunel/tunel_3.mat	2 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Resources/UI/Endless/Tunel/tunel_4.mat	2 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Resources/UI/Endless/Tunel/tunel_5.mat	2 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Resources/UI/Props/5_1.png	diff \| view \| raw \| blame \| history
	Assets/Resources/UI/Props/5_1.png.meta	2 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Resources/UI/Props/5_2.png	diff \| view \| raw \| blame \| history
	Assets/Resources/UI/Props/5_2.png.meta	2 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Resources/UI/Props/5_3.png	diff \| view \| raw \| blame \| history
	Assets/Resources/UI/Props/5_3.png.meta	2 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Resources/UI/Props/EndlessDropEffect.prefab	296 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Resources/UI/Props/EndlessDropEffect.prefab.meta	2 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Scenes/Levels/Battle/Endless.unity	191 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Scripts/Data/EndlessPortData.cs	3 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Scripts/TowerDefense/Level/EndlessDropManager.cs	94 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Scripts/TowerDefense/Level/EndlessLevelManager.cs	1 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Scripts/TowerDefense/Level/EndlessWaveManager.cs	28 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Scripts/TowerDefense/Towers/Placement/TowerPlacementGridEndless.cs	101 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Scripts/TowerDefense/Towers/Tower.cs	3 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Scripts/TowerDefense/UI/EndlessBossHPManager.cs	18 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Scripts/TowerDefense/UI/EndlessDropReward.cs	40 ●●●●● diff \| view \| raw \| blame \| history