宝石塔防
parent: 4fe7a2 | patch | commitdiff
River Jiang
2020-10-28 8637f933a9987b4b16dd9725189a1c6ee2685118
refs
author River Jiang <546213258@qq.com>
Wednesday, October 28, 2020 10:12 +0800
committer River Jiang <546213258@qq.com>
Wednesday, October 28, 2020 10:12 +0800
commit8637f933a9987b4b16dd9725189a1c6ee2685118
tree 0f070ef462beda73febee7a6699dbdcbfa5aca46 tree | zip | gz
parent 4fe7a27d965c1433c940d5b3eaa13930fa999621 view | diff
bac1e673b54b1e5f773c4bd098e1b4fe8981c62e view | diff 
提交充能条特效修改
Merge branch 'master' of http://172.16.1.52:8090/r/GemBattle into master

# Conflicts:
#	Assets/00000/package/Model.meta
#	Assets/00000/package/Prefab/Effect_chongnengtiao1026.prefab
#	Assets/00000/package/Prefab/Effect_jiansu1026.prefab
#	Assets/Scripts/TowerDefense/Towers/Placement/TowerPlacementGrid.cs
1 files renamed
16 files deleted
7 files added
49 files modified
58118 ■■■■■ changed files
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/Model.meta 2 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Prefab/Effect_chongnengtiao1026.prefab 9812 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Prefab/Effect_jiansu1026.prefab 4 ●●●●● 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/Materials/Guide/RectGuidance.mat 2 ●●●●● diff | view | raw | blame | history
Assets/Prefabs/EndlessEnemies.meta 8 ●●●●● diff | view | raw | blame | history
Assets/Prefabs/EndlessEnemies/BossAgent 1.prefab 44108 ●●●●● 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 1.prefab.meta 7 ●●●●● 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 32 ●●●●● 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/GameAnalytics_SDK/GA_SDK_Manager.cs 285 ●●●●● diff | view | raw | blame | history
Assets/Scripts/GameAnalytics_SDK/UI/LoginUI.cs 39 ●●●●● diff | view | raw | blame | history
Assets/Scripts/Guide/GuideCtrl.cs 19 ●●●●● 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/TowerPlacementGridEndless.cs 1 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/Towers/Projectiles/BallisticAttack.cs 2 ●●●●● 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 15 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/UI/HUD/EndlessGameUI.cs 8 ●●●●● 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