liuzhiwei
2020-11-06 f44ad64eff5c66b711e2b8d28c44c85a92cbc393
refs
author liuzhiwei <liuzhiwei@qq.com>
Friday, November 6, 2020 10:08 +0800
committer liuzhiwei <liuzhiwei@qq.com>
Friday, November 6, 2020 10:08 +0800
commitf44ad64eff5c66b711e2b8d28c44c85a92cbc393
tree 5ef2409989665c0f911940d17cf4cf989f400796 tree | zip | gz
parent 214c88e9f74412d526e9903729797a5930ddd2d6 view | diff
fe4457c2ff07dcea1cccd6886188a334ef9c196b view | diff
Merge branch 'master' of http://172.16.1.52:8090/r/GemBattle into master
6 files added
88 files modified
1636 ■■■■ changed files
And/GemBattle.apk diff | view | raw | blame | history
Assets/00000/package/Prefab/Effect_HuoJingLing_Hit.prefab 31 ●●●●● diff | view | raw | blame | history
Assets/GabrielAguiarProductions/Unique_Projectiles_Volume_1/Scripts/New Render Texture.renderTexture 37 ●●●●● diff | view | raw | blame | history
Assets/GabrielAguiarProductions/Unique_Projectiles_Volume_1/Scripts/New Render Texture.renderTexture.meta 8 ●●●●● diff | view | raw | blame | history
Assets/Prefabs/Towers/Fire/GrowUpTower_0.prefab 2 ●●● diff | view | raw | blame | history
Assets/Prefabs/Towers/Fire/GrowUpTower_1.prefab 2 ●●● diff | view | raw | blame | history
Assets/Prefabs/Towers/Fire/GrowUpTower_2.prefab 2 ●●● diff | view | raw | blame | history
Assets/Prefabs/Towers/Fire/GrowUpTower_3.prefab 2 ●●● diff | view | raw | blame | history
Assets/Prefabs/Towers/Fire/GrowUpTower_4.prefab 2 ●●● diff | view | raw | blame | history
Assets/Prefabs/Towers/SkillEffect/ArcanePillarBlast.prefab 38 ●●●● diff | view | raw | blame | history
Assets/Prefabs/Towers/Water/CopyCatTower_0.prefab 2 ●●● diff | view | raw | blame | history
Assets/Prefabs/Towers/Water/CopyCatTower_1.prefab 2 ●●● diff | view | raw | blame | history
Assets/Prefabs/Towers/Water/CopyCatTower_2.prefab 2 ●●● diff | view | raw | blame | history
Assets/Prefabs/Towers/Water/CopyCatTower_3.prefab 2 ●●● diff | view | raw | blame | history
Assets/Prefabs/Towers/Water/CopyCatTower_4.prefab 2 ●●● diff | view | raw | blame | history
Assets/Prefabs/Towers/Water/WaterProjectile_0.prefab 5 ●●●●● diff | view | raw | blame | history
Assets/Prefabs/Towers/Water/WaterProjectile_1.prefab 5 ●●●●● diff | view | raw | blame | history
Assets/Prefabs/Towers/Water/WaterProjectile_2.prefab 5 ●●●●● diff | view | raw | blame | history
Assets/Prefabs/Towers/Water/WaterProjectile_3.prefab 5 ●●●●● diff | view | raw | blame | history
Assets/Prefabs/Towers/Water/WaterProjectile_4.prefab 5 ●●●●● diff | view | raw | blame | history
Assets/Prefabs/Towers/WoodTower/BlinkTower_0.prefab 2 ●●● diff | view | raw | blame | history
Assets/Prefabs/Towers/WoodTower/BlinkTower_1.prefab 2 ●●● diff | view | raw | blame | history
Assets/Prefabs/Towers/WoodTower/BlinkTower_2.prefab 2 ●●● diff | view | raw | blame | history
Assets/Prefabs/Towers/WoodTower/BlinkTower_3.prefab 2 ●●● diff | view | raw | blame | history
Assets/Prefabs/Towers/WoodTower/BlinkTower_4.prefab 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/Scenes/Levels/Battle/Endless.unity 374 ●●●● diff | view | raw | blame | history
Assets/Scenes/LoadingScene.unity 415 ●●●●● diff | view | raw | blame | history
Assets/Scripts/ActionGameFramework/Health/DamageCollider.cs 10 ●●●●● diff | view | raw | blame | history
Assets/Scripts/ActionGameFramework/Health/Targetable.cs 4 ●●●● diff | view | raw | blame | history
Assets/Scripts/ActionGameFramework/Projectiles/BallisticProjectile.cs 3 ●●●●● diff | view | raw | blame | history
Assets/Scripts/Data/EndlessBuffData.cs 3 ●●●●● diff | view | raw | blame | history
Assets/Scripts/Data/EndlessPortData.cs 1 ●●●● diff | view | raw | blame | history
Assets/Scripts/Enum/EndlessBossSkillState.cs 25 ●●●●● diff | view | raw | blame | history
Assets/Scripts/Enum/EndlessBossSkillState.cs.meta 11 ●●●●● diff | view | raw | blame | history
Assets/Scripts/Event/EventType.cs 6 ●●●●● diff | view | raw | blame | history
Assets/Scripts/GameAnalytics_SDK/UI/LoginUI.cs 48 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/Affectors/AttackAffector.cs 5 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/Agents/BubbleBombAgent.cs 1 ●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/Agents/HomeBaseAttacker.cs 8 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/Level/EndlessLevelManager.cs 4 ●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/Level/EndlessWaveLineManager.cs 8 ●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/Level/EndlessWaveManager.cs 7 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/Level/PlayerHomeBase.cs 2 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/Towers/Placement/TowerPlacementGridEndless.cs 104 ●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/Towers/Tower.cs 13 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/UI/EndlessBossCtrl.cs 3 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/UI/EndlessBossSkill/BossSkillBubbleBomb.cs 42 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/UI/EndlessBossSkill/BossSkillShieldWall.cs 5 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/UI/EndlessBossSkill/BossSkillWoodPile.cs 5 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/UI/EndlessBossSkill/EndlessBossSkillManager.cs 106 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/UI/EndlessBossSkillAI/EndlessBossSkillAI.cs 2 ●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/UI/EndlessBossSkillAI/NormalBossSkillAI.cs 2 ●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/UI/EndlessHomeBaseHPManager.cs 70 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/UI/EndlessHomeBaseHPManager.cs.meta 11 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/UI/EndlessUIStart.cs 2 ●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/UI/HUD/EndlessGameUI.cs 100 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/UI/MainMenuScene.cs 5 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/UI/TextMoveDoTween.cs 22 ●●●● diff | view | raw | blame | history
Assets/StreamingAssets/Table/battle.json 2 ●●● diff | view | raw | blame | history
Assets/StreamingAssets/Table/boss_skill.json 2 ●●● diff | view | raw | blame | history
Assets/StreamingAssets/Table/endless_boss.json 2 ●●● diff | view | raw | blame | history
Assets/StreamingAssets/Table/endless_enemy.json 2 ●●● diff | view | raw | blame | history
Assets/StreamingAssets/Table/endless_port.json 2 ●●● diff | view | raw | blame | history
GemBattle.zip diff | view | raw | blame | history
GemBattle/宝石塔防_Data/Managed/Assembly-CSharp-firstpass.dll diff | view | raw | blame | history
GemBattle/宝石塔防_Data/Managed/Assembly-CSharp.dll diff | view | raw | blame | history
GemBattle/宝石塔防_Data/Managed/MoreMountains.NiceVibrations.Demos.dll diff | view | raw | blame | history
GemBattle/宝石塔防_Data/Managed/MoreMountains.NiceVibrations.Haptics.dll diff | view | raw | blame | history
GemBattle/宝石塔防_Data/Managed/MoreMountains.NiceVibrations.dll diff | view | raw | blame | history
GemBattle/宝石塔防_Data/Managed/Unity.TextMeshPro.dll diff | view | raw | blame | history
GemBattle/宝石塔防_Data/Managed/Unity.Timeline.dll diff | view | raw | blame | history
GemBattle/宝石塔防_Data/Managed/UnityEngine.UI.dll diff | view | raw | blame | history
GemBattle/宝石塔防_Data/StreamingAssets/Table/battle.json 2 ●●● diff | view | raw | blame | history
GemBattle/宝石塔防_Data/StreamingAssets/Table/boss_skill.json 2 ●●● diff | view | raw | blame | history
GemBattle/宝石塔防_Data/StreamingAssets/Table/endless_boss.json 2 ●●● diff | view | raw | blame | history
GemBattle/宝石塔防_Data/StreamingAssets/Table/endless_enemy.json 2 ●●● diff | view | raw | blame | history
GemBattle/宝石塔防_Data/StreamingAssets/Table/endless_port.json 2 ●●● 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/resources.assets 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/sharedassets2.assets diff | view | raw | blame | history
GemBattle/宝石塔防_Data/sharedassets3.assets diff | view | raw | blame | history