宝石塔防
parent: 1cc976 | patch | commitdiff
wangguan
2020-10-27 bac1e673b54b1e5f773c4bd098e1b4fe8981c62e
refs
author wangguan <wangguan@kt007.com>
Tuesday, October 27, 2020 20:39 +0800
committer wangguan <wangguan@kt007.com>
Tuesday, October 27, 2020 20:39 +0800
commitbac1e673b54b1e5f773c4bd098e1b4fe8981c62e
tree 0e6c9dc05fe9e4c19079c4641dc584e5ace3a787 tree | zip | gz
parent 1cc976d33bfbe7488c85df9d35f28aa6e4360294 view | diff
49f88e6493466a1723dd6b3967ff4c70f723db5d view | diff 
Merge branch 'master' of ssh://172.16.1.52:8091/GemBattle
4 files renamed
10 files copied
13 files deleted
103 files added
49 files modified
239722 ■■■■■ changed files
Assets/00000/package/Materials/Glow_022.mat 30 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Materials/Glow_022.mat.meta 8 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Materials/Glow_023.mat 30 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Materials/Glow_023.mat.meta 8 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Materials/Glow_024.mat 30 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Materials/Glow_024.mat.meta 8 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Materials/Glow_025.mat 30 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Materials/Glow_025.mat.meta 8 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Materials/Glow_026.mat 30 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Materials/Glow_026.mat.meta 8 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Materials/Object_001.mat 30 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Materials/Object_001.mat.meta 8 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Materials/Sequence_015_2X2.mat 30 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Materials/Sequence_015_2X2.mat.meta 8 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Materials/Sequence_016_2X2.mat 30 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Materials/Sequence_016_2X2.mat.meta 8 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Materials/Sequence_017_3X3.mat 30 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Materials/Sequence_017_3X3.mat.meta 8 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Materials/Sequence_018_2X4.mat 30 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Materials/Sequence_018_2X4.mat.meta 8 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Materials/Sequence_019_4X4.mat 30 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Materials/Sequence_019_4X4.mat.meta 8 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Materials/Sequence_020_2X4.mat 30 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Materials/Sequence_020_2X4.mat.meta 8 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Materials/Sequence_021_4X4.mat 30 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Materials/Sequence_021_4X4.mat.meta 8 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Materials/Sequence_022_4X4.mat 30 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Materials/Sequence_022_4X4.mat.meta 8 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Materials/Sequence_023_3X3.mat 30 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Materials/Sequence_023_3X3.mat.meta 8 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Materials/Sequence_024_9X8.mat 30 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Materials/Sequence_024_9X8.mat.meta 8 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Materials/Sequence_025_6X6.mat 30 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Materials/Sequence_025_6X6.mat.meta 8 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Materials/Sequence_026_4X4.mat 30 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Materials/Sequence_026_4X4.mat.meta 8 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Materials/Sequence_027_3X3.mat 30 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Materials/Sequence_027_3X3.mat.meta 8 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Materials/Sequence_028_4X2.mat 30 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Materials/Sequence_028_4X2.mat.meta 8 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Materials/Sequence_030_3X3.mat 30 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Materials/Sequence_030_3X3.mat.meta 8 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Materials/Texmap_001.mat 30 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Materials/Texmap_001.mat.meta 8 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Model.meta 2 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Model/bingkuai.FBX diff | view | raw | blame | history
Assets/00000/package/Model/bingkuai.FBX.meta 101 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Model/shitou02.FBX diff | view | raw | blame | history
Assets/00000/package/Model/shitou02.FBX.meta 164 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Prefab/Effect_baoshishengji1026.prefab 24004 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Prefab/Effect_baoshishengji1026.prefab.meta 2 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Prefab/Effect_bingdong1026.prefab 84350 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Prefab/Effect_bingdong1026.prefab.meta 2 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Prefab/Effect_bingdong1026_02.prefab 19516 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Prefab/Effect_bingdong1026_02.prefab.meta 2 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Prefab/Effect_chongnengtiao1026.prefab 9774 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Prefab/Effect_chongnengtiao1026.prefab.meta 2 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Prefab/Effect_goumaibaoshi1026.prefab 4903 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Prefab/Effect_goumaibaoshi1026.prefab.meta 2 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Prefab/Effect_huojinglingdengchang1026.prefab 14645 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Prefab/Effect_huojinglingdengchang1026.prefab.meta 2 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Prefab/Effect_jiansu1026.prefab 9684 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Prefab/Effect_jiansu1026.prefab.meta 2 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Prefab/Effect_mulingdengchang1026.prefab 40750 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Prefab/Effect_mulingdengchang1026.prefab.meta 2 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Prefab/Effect_penhuo1026.prefab 9783 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Prefab/Effect_penhuo1026.prefab.meta 2 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Prefab/Effect_shuijinglingdengchang1026.prefab 14645 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Prefab/Effect_shuijinglingdengchang1026.prefab.meta 2 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Texture/Glow_022.png diff | view | raw | blame | history
Assets/00000/package/Texture/Glow_022.png.meta 127 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Texture/Glow_023.png diff | view | raw | blame | history
Assets/00000/package/Texture/Glow_023.png.meta 127 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Texture/Glow_024.png diff | view | raw | blame | history
Assets/00000/package/Texture/Glow_024.png.meta 127 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Texture/Glow_025.png diff | view | raw | blame | history
Assets/00000/package/Texture/Glow_025.png.meta 127 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Texture/Glow_026.png diff | view | raw | blame | history
Assets/00000/package/Texture/Glow_026.png.meta 127 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Texture/Object_001.png diff | view | raw | blame | history
Assets/00000/package/Texture/Object_001.png.meta 118 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Texture/Sequence_015_2X2.png diff | view | raw | blame | history
Assets/00000/package/Texture/Sequence_015_2X2.png.meta 127 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Texture/Sequence_016_2X2.png diff | view | raw | blame | history
Assets/00000/package/Texture/Sequence_016_2X2.png.meta 127 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Texture/Sequence_017_3X3.png diff | view | raw | blame | history
Assets/00000/package/Texture/Sequence_017_3X3.png.meta 127 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Texture/Sequence_018_2X4.png diff | view | raw | blame | history
Assets/00000/package/Texture/Sequence_018_2X4.png.meta 106 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Texture/Sequence_019_4X4.png diff | view | raw | blame | history
Assets/00000/package/Texture/Sequence_019_4X4.png.meta 127 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Texture/Sequence_020_2X4.png diff | view | raw | blame | history
Assets/00000/package/Texture/Sequence_020_2X4.png.meta 106 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Texture/Sequence_021_4X4.png diff | view | raw | blame | history
Assets/00000/package/Texture/Sequence_021_4X4.png.meta 127 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Texture/Sequence_022_4X4.png diff | view | raw | blame | history
Assets/00000/package/Texture/Sequence_022_4X4.png.meta 127 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Texture/Sequence_023_3X3.png diff | view | raw | blame | history
Assets/00000/package/Texture/Sequence_023_3X3.png.meta 127 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Texture/Sequence_024_9X8.png diff | view | raw | blame | history
Assets/00000/package/Texture/Sequence_024_9X8.png.meta 106 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Texture/Sequence_025_6X6.tga diff | view | raw | blame | history
Assets/00000/package/Texture/Sequence_025_6X6.tga.meta 127 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Texture/Sequence_026_4X4.png diff | view | raw | blame | history
Assets/00000/package/Texture/Sequence_026_4X4.png.meta 127 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Texture/Sequence_027_3X3.png diff | view | raw | blame | history
Assets/00000/package/Texture/Sequence_027_3X3.png.meta 127 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Texture/Sequence_028_4X2.png diff | view | raw | blame | history
Assets/00000/package/Texture/Sequence_028_4X2.png.meta 127 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Texture/Sequence_030_3X3.png diff | view | raw | blame | history
Assets/00000/package/Texture/Sequence_030_3X3.png.meta 127 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Texture/Texmap_001.png diff | view | raw | blame | history
Assets/00000/package/Texture/Texmap_001.png.meta 127 ●●●●● diff | view | raw | blame | history
Assets/Prefabs/EndlessEnemies/BossAgent 1.prefab.meta 9 ●●●●● diff | view | raw | blame | history
Assets/Prefabs/EndlessEnemies/fire 1.prefab 578 ●●●●● diff | view | raw | blame | history
Assets/Prefabs/EndlessEnemies/fire 2.prefab 586 ●●●●● diff | view | raw | blame | history
Assets/Prefabs/EndlessEnemies/fire 2.prefab.meta 7 ●●●●● diff | view | raw | blame | history
Assets/Prefabs/EndlessEnemies/water 1.prefab 561 ●●●●● diff | view | raw | blame | history
Assets/Prefabs/EndlessEnemies/water 1.prefab.meta 7 ●●●●● diff | view | raw | blame | history
Assets/Prefabs/EndlessEnemies/water 2.prefab 561 ●●●●● diff | view | raw | blame | history
Assets/Prefabs/EndlessEnemies/water 2.prefab.meta 7 ●●●●● diff | view | raw | blame | history
Assets/Prefabs/EndlessEnemies/wood 1.prefab 636 ●●●●● diff | view | raw | blame | history
Assets/Prefabs/EndlessEnemies/wood 1.prefab.meta 7 ●●●●● diff | view | raw | blame | history
Assets/Prefabs/Towers/SkillFire/SkillFireTower_0.prefab 3 ●●●●● diff | view | raw | blame | history
Assets/Resources/UI/Guide/GuidePanel.prefab 4 ●●●●● diff | view | raw | blame | history
Assets/Scenes/Levels/Battle/Endless.unity 7 ●●●●● diff | view | raw | blame | history
Assets/Scenes/Levels/Battle/GemBattle.unity 116 ●●●●● diff | view | raw | blame | history
Assets/Scenes/LoadingScene.unity 4 ●●●●● diff | view | raw | blame | history
Assets/Scripts/Common/GameConfig.cs 30 ●●●●● diff | view | raw | blame | history
Assets/Scripts/Data/EndlessPortData.cs 106 ●●●●● diff | view | raw | blame | history
Assets/Scripts/Event/EventType.cs 6 ●●●●● diff | view | raw | blame | history
Assets/Scripts/Guide/GuideCtrl.cs 1 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/Affectors/AttackAffector.cs 3 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/Agents/Agent.cs 13 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/Agents/HomeBaseAttacker.cs 254 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/Level/EndlessLevelManager.cs 2 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/Level/EndlessWaveLineManager.cs 31 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/Level/EndlessWaveManager.cs 3 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/Level/WaveLineSelMgr.cs 84 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/Towers/Placement/TowerPlacementGrid.cs 2 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/Towers/Placement/TowerPlacementGridEndless.cs 1 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/Towers/Projectiles/BallisticAttack.cs 2 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/Towers/Tower.cs 78 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/UI/BulletUICtl.cs 20 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/UI/EndlessSettlement.cs 4 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/UI/EndlessTowerGridOpen.cs 1 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/UI/EndlessUIStart.cs 12 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/UI/EnergyUICtl.cs 28 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/UI/HUD/EndlessGameUI.cs 8 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/UI/HUD/GameUI.cs 29 ●●●●● diff | view | raw | blame | history
Assets/StreamingAssets/Table/endless_port.json 2 ●●●●● diff | view | raw | blame | history
Assets/StreamingAssets/Table/endless_teachport.json 2 ●●●●● 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/StreamingAssets/Table/battle.json 2 ●●●●● diff | view | raw | blame | history
GemBattle/宝石塔防_Data/StreamingAssets/Table/donaterule.json 1 ●●●●● diff | view | raw | blame | history
GemBattle/宝石塔防_Data/StreamingAssets/Table/endless_port.json 2 ●●●●● diff | view | raw | blame | history
GemBattle/宝石塔防_Data/StreamingAssets/Table/endless_teachport.json 1 ●●●●● 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/level1 diff | view | raw | blame | history
GemBattle/宝石塔防_Data/level2 diff | view | raw | blame | history
GemBattle/宝石塔防_Data/level3 diff | view | raw | blame | history
GemBattle/宝石塔防_Data/level4 diff | view | raw | blame | history
GemBattle/宝石塔防_Data/resources.assets diff | view | raw | blame | history
GemBattle/宝石塔防_Data/resources.assets.resS diff | view | raw | blame | history
GemBattle/宝石塔防_Data/sharedassets0.assets diff | view | raw | blame | history
GemBattle/宝石塔防_Data/sharedassets0.assets.resS diff | view | raw | blame | history
GemBattle/宝石塔防_Data/sharedassets1.assets diff | view | raw | blame | history
GemBattle/宝石塔防_Data/sharedassets1.assets.resS 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/sharedassets2.resource diff | view | raw | blame | history
GemBattle/宝石塔防_Data/sharedassets3.assets diff | view | raw | blame | history
GemBattle/宝石塔防_Data/sharedassets3.assets.resS diff | view | raw | blame | history
GemBattle/宝石塔防_Data/sharedassets4.assets diff | view | raw | blame | history
GemBattle/宝石塔防_Data/sharedassets4.assets.resS diff | view | raw | blame | history
ProjectSettings/EditorBuildSettings.asset 2 ●●●●● diff | view | raw | blame | history