宝石塔防
parent: 7f30cb | patch | commitdiff
chenxin
2020-10-28 56f231f1f6523d7920cf32f033f9bb6f0015550f
refs
author chenxin <chenxin6991@163.com>
Wednesday, October 28, 2020 18:05 +0800
committer chenxin <chenxin6991@163.com>
Wednesday, October 28, 2020 18:05 +0800
commit56f231f1f6523d7920cf32f033f9bb6f0015550f
tree bac17c1ce462786bf3c74c9c145af65dcf626f85 tree | zip | gz
parent 7f30cb05011c9334a5009cd6333a27d318b44cb9 view | diff
8380b3c000a04bd9bf6dfc11fd8337c1563ad265 view | diff 
Merge commit '8380b3c000a04bd9bf6dfc11fd8337c1563ad265' into master

# Conflicts:
#	GemBattle.zip
#	GemBattle/宝石塔防_Data/Managed/Assembly-CSharp.dll
#	GemBattle/宝石塔防_Data/globalgamemanagers
#	GemBattle/宝石塔防_Data/globalgamemanagers.assets
#	GemBattle/宝石塔防_Data/level0
#	GemBattle/宝石塔防_Data/level2
#	GemBattle/宝石塔防_Data/level3
#	GemBattle/宝石塔防_Data/resources.assets
#	GemBattle/宝石塔防_Data/sharedassets2.assets
#	GemBattle/宝石塔防_Data/sharedassets2.assets.resS
#	GemBattle/宝石塔防_Data/sharedassets3.assets
20 files added
53 files modified
100400 ■■■■■ changed files
Assets/00000/package/Materials/Glow_027.mat 30 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Materials/Glow_027.mat.meta 8 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Materials/Glow_028.mat 30 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Materials/Glow_028.mat.meta 8 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Materials/Object_002.mat 30 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Materials/Object_002.mat.meta 8 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Prefab/1027Effect_tuodong 1.prefab 38794 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Prefab/1027Effect_tuodong 1.prefab.meta 7 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Prefab/Effect_baoshishengji1026.prefab 22 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Prefab/Effect_baoxiangliuguang.prefab 64 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Prefab/Effect_bingdong1026.prefab 24 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Prefab/Effect_goumaibaoshi1026.prefab 102 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Prefab/Effect_jiansu1026.prefab 4 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Texture/Glow_027.png diff | view | raw | blame | history
Assets/00000/package/Texture/Glow_027.png.meta 106 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Texture/Glow_028.png diff | view | raw | blame | history
Assets/00000/package/Texture/Glow_028.png.meta 106 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Texture/Object_002.png diff | view | raw | blame | history
Assets/00000/package/Texture/Object_002.png.meta 106 ●●●●● diff | view | raw | blame | history
Assets/Prefabs/Enemies/BossAgent.prefab 211 ●●●●● diff | view | raw | blame | history
Assets/Prefabs/Enemies/fire.prefab 256 ●●●●● diff | view | raw | blame | history
Assets/Prefabs/Enemies/water.prefab 256 ●●●●● diff | view | raw | blame | history
Assets/Prefabs/Enemies/wood.prefab 416 ●●●●● diff | view | raw | blame | history
Assets/Prefabs/Towers/Fire/GrowUpTower_0.prefab 4 ●●●●● diff | view | raw | blame | history
Assets/Prefabs/Towers/Fire/GrowUpTower_1.prefab 4 ●●●●● diff | view | raw | blame | history
Assets/Prefabs/Towers/Fire/GrowUpTower_2.prefab 4 ●●●●● diff | view | raw | blame | history
Assets/Prefabs/Towers/Fire/GrowUpTower_3.prefab 4 ●●●●● diff | view | raw | blame | history
Assets/Prefabs/Towers/Fire/GrowUpTower_4.prefab 4 ●●●●● diff | view | raw | blame | history
Assets/Prefabs/Towers/SkillBomb/SkillBombTower_0.prefab 4 ●●●●● diff | view | raw | blame | history
Assets/Prefabs/Towers/SkillBomb/SkillBombTower_1.prefab 7 ●●●●● diff | view | raw | blame | history
Assets/Prefabs/Towers/SkillBomb/SkillBombTower_2.prefab 7 ●●●●● diff | view | raw | blame | history
Assets/Prefabs/Towers/SkillBomb/SkillBombTower_3.prefab 7 ●●●●● diff | view | raw | blame | history
Assets/Prefabs/Towers/SkillBomb/SkillBombTower_4.prefab 7 ●●●●● diff | view | raw | blame | history
Assets/Prefabs/Towers/SkillFire/SkillFireGhost.prefab 191 ●●●●● diff | view | raw | blame | history
Assets/Prefabs/Towers/SkillFire/SkillFireTower_0.prefab 4 ●●●●● diff | view | raw | blame | history
Assets/Prefabs/Towers/SkillFire/SkillFireTower_1.prefab 7 ●●●●● diff | view | raw | blame | history
Assets/Prefabs/Towers/SkillFire/SkillFireTower_2.prefab 7 ●●●●● diff | view | raw | blame | history
Assets/Prefabs/Towers/SkillFire/SkillFireTower_3.prefab 7 ●●●●● diff | view | raw | blame | history
Assets/Prefabs/Towers/SkillFire/SkillFireTower_4.prefab 7 ●●●●● diff | view | raw | blame | history
Assets/Prefabs/Towers/Water/CopyCatTower_0.prefab 4 ●●●●● diff | view | raw | blame | history
Assets/Prefabs/Towers/Water/CopyCatTower_1.prefab 4 ●●●●● diff | view | raw | blame | history
Assets/Prefabs/Towers/Water/CopyCatTower_2.prefab 4 ●●●●● diff | view | raw | blame | history
Assets/Prefabs/Towers/Water/CopyCatTower_3.prefab 4 ●●●●● diff | view | raw | blame | history
Assets/Prefabs/Towers/Water/CopyCatTower_4.prefab 4 ●●●●● diff | view | raw | blame | history
Assets/Prefabs/Towers/WoodTower/BlinkTower_0.prefab 4 ●●●●● diff | view | raw | blame | history
Assets/Prefabs/Towers/WoodTower/BlinkTower_1.prefab 4 ●●●●● diff | view | raw | blame | history
Assets/Prefabs/Towers/WoodTower/BlinkTower_2.prefab 4 ●●●●● diff | view | raw | blame | history
Assets/Prefabs/Towers/WoodTower/BlinkTower_3.prefab 4 ●●●●● diff | view | raw | blame | history
Assets/Prefabs/Towers/WoodTower/BlinkTower_4.prefab 4 ●●●●● diff | view | raw | blame | history
Assets/Prefabs/UI/PropIcon.prefab 171 ●●●●● diff | view | raw | blame | history
Assets/Resources/UI/ToBattle_101.prefab 14645 ●●●●● diff | view | raw | blame | history
Assets/Resources/UI/ToBattle_101.prefab.meta 7 ●●●●● diff | view | raw | blame | history
Assets/Resources/UI/ToBattle_105.prefab 14645 ●●●●● diff | view | raw | blame | history
Assets/Resources/UI/ToBattle_105.prefab.meta 7 ●●●●● diff | view | raw | blame | history
Assets/Resources/UI/ToBattle_109.prefab 29132 ●●●●● diff | view | raw | blame | history
Assets/Resources/UI/ToBattle_109.prefab.meta 7 ●●●●● diff | view | raw | blame | history
Assets/Scenes/Levels/Battle/Endless.unity 92 ●●●●● diff | view | raw | blame | history
Assets/Scenes/Levels/Battle/GemBattle.unity 16 ●●●●● diff | view | raw | blame | history
Assets/Scripts/ActionGameFramework/Health/Targetable.cs 20 ●●●●● diff | view | raw | blame | history
Assets/Scripts/Common/GameConfig.cs 3 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/Agents/Agent.cs 95 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/Level/EndlessWaveLineManager.cs 4 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/Level/EndlessWaveManager.cs 8 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/Level/WaveLineSelMgr.cs 5 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/Towers/TowerLevel.cs 486 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/UI/EndlessSettlementPropList.cs 3 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/UI/HUD/EndlessGameUI.cs 69 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/UI/HUD/GameUI.cs 68 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/UI/HUD/TowerPlacementGhost.cs 14 ●●●●● diff | view | raw | blame | history
GemBattle/宝石塔防_Data/level1 diff | view | raw | blame | history
GemBattle/宝石塔防_Data/resources.assets.resS diff | view | raw | blame | history
GemBattle/宝石塔防_Data/sharedassets1.assets diff | view | raw | blame | history
GemBattle/宝石塔防_Data/sharedassets3.assets.resS diff | view | raw | blame | history