宝石塔防
parent: 2d7cc1 | patch | commitdiff
liuzhiwei
2020-11-12 18f96c9313bf24d2296e615f44fc0ca005f2e872
refs
author liuzhiwei <liuzhiwei@qq.com>
Thursday, November 12, 2020 16:05 +0800
committer liuzhiwei <liuzhiwei@qq.com>
Thursday, November 12, 2020 16:05 +0800
commit18f96c9313bf24d2296e615f44fc0ca005f2e872
tree 163b49b950384d3aa964793d98f730ccc99a551d tree | zip | gz
parent 2d7cc1cd3df6e3880f3a2003d71886cae6b2c4d5 view | diff
74c18027fd6fc7ddb3720bf8f003baeb4daa505c view | diff 
Merge branch 'master' of http://172.16.1.52:8090/r/GemBattle into master
7 files renamed
1 files copied
6 files deleted
15 files added
136 files modified
4165 ■■■■■ changed files
And/GemBattle.apk diff | view | raw | blame | history
Assets/Materials/PVE/PVEBg.png diff | view | raw | blame | history
Assets/Materials/PVPTD/MonsterMat/NewMat/Water/a_00.png.meta 32 ●●●●● diff | view | raw | blame | history
Assets/Materials/PVPTD/MonsterMat/NewMat/Water/a_01.png.meta 32 ●●●●● diff | view | raw | blame | history
Assets/Materials/PVPTD/MonsterMat/NewMat/Water/b_00.png.meta 32 ●●●●● diff | view | raw | blame | history
Assets/Materials/PVPTD/MonsterMat/NewMat/Water/b_01.png.meta 32 ●●●●● diff | view | raw | blame | history
Assets/Materials/PVPTD/MonsterMat/NewMat/Water/sw_00.png.meta 32 ●●●●● diff | view | raw | blame | history
Assets/Materials/PVPTD/MonsterMat/NewMat/Water/sw_01.png.meta 32 ●●●●● diff | view | raw | blame | history
Assets/Materials/PVPTD/MonsterMat/NewMat/Water/z_00.png.meta 32 ●●●●● diff | view | raw | blame | history
Assets/Materials/PVPTD/MonsterMat/NewMat/Water/z_01.png.meta 32 ●●●●● diff | view | raw | blame | history
Assets/Materials/PVPTD/WaveLineBackGround.mat 2 ●●●●● diff | view | raw | blame | history
Assets/Materials/UI/tileTowerVSMat.mat 78 ●●●●● diff | view | raw | blame | history
Assets/Materials/UI/tileTowerVSMat.mat.meta 8 ●●●●● diff | view | raw | blame | history
Assets/Prefabs/Enemies/water 1.prefab 2 ●●●●● diff | view | raw | blame | history
Assets/Prefabs/UI/DoubleHit.prefab 208 ●●●●● diff | view | raw | blame | history
Assets/Prefabs/UI/DoubleHit.prefab.meta 7 ●●●●● diff | view | raw | blame | history
Assets/Prefabs/UI/PlacementTileMobile.prefab 86 ●●●●● diff | view | raw | blame | history
Assets/Resources/UI/BuffPreview.meta 8 ●●●●● diff | view | raw | blame | history
Assets/Resources/UI/BuffPreview/BuffPreview.prefab 981 ●●●●● diff | view | raw | blame | history
Assets/Resources/UI/BuffPreview/BuffPreview.prefab.meta 7 ●●●●● diff | view | raw | blame | history
Assets/Resources/UI/Endless/BuffPreviewIcon.meta 8 ●●●●● diff | view | raw | blame | history
Assets/Resources/UI/Endless/BuffPreviewIcon/buff_1.png diff | view | raw | blame | history
Assets/Resources/UI/Endless/BuffPreviewIcon/buff_1.png.meta 4 ●●●●● diff | view | raw | blame | history
Assets/Resources/UI/Endless/BuffPreviewIcon/buff_2.png diff | view | raw | blame | history
Assets/Resources/UI/Endless/BuffPreviewIcon/buff_2.png.meta 4 ●●●●● diff | view | raw | blame | history
Assets/Resources/UI/Endless/BuffPreviewIcon/buff_3.png diff | view | raw | blame | history
Assets/Resources/UI/Endless/BuffPreviewIcon/buff_3.png.meta 4 ●●●●● diff | view | raw | blame | history
Assets/Resources/UI/Final/FinalPanel.prefab 4 ●●●●● diff | view | raw | blame | history
Assets/Scenes/Levels/Battle/Endless.unity 1122 ●●●●● diff | view | raw | blame | history
Assets/Scenes/LoadingScene.unity 26 ●●●●● diff | view | raw | blame | history
Assets/Scripts/ActionGameFramework/Health/DamageCollider.cs 10 ●●●●● diff | view | raw | blame | history
Assets/Scripts/ActionGameFramework/Projectiles/BallisticProjectile.cs 5 ●●●●● diff | view | raw | blame | history
Assets/Scripts/Common/GameConfig.cs 21 ●●●●● diff | view | raw | blame | history
Assets/Scripts/Core/Health/Damageable.cs 2 ●●●●● diff | view | raw | blame | history
Assets/Scripts/Core/Health/DamageableBehaviour.cs 6 ●●●●● diff | view | raw | blame | history
Assets/Scripts/Data/EndlessPortData.cs 121 ●●●●● diff | view | raw | blame | history
Assets/Scripts/Data/EndlessScoreData.cs 52 ●●●●● diff | view | raw | blame | history
Assets/Scripts/Data/EndlessScoreData.cs.meta 11 ●●●●● diff | view | raw | blame | history
Assets/Scripts/Event/EventType.cs 10 ●●●●● diff | view | raw | blame | history
Assets/Scripts/Net/NetExtends/Table.cs 16 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/Agents/Agent.cs 7 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/Agents/HomeBaseAttacker.cs 1 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/Input/EndlessTowerDefenseKeyboardMouseInput.cs 16 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/Input/EndlessTowerDefenseTouchInput.cs 61 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/Level/AgentInsManager.cs 32 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/Level/EndlessBuffManager.cs 6 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/Level/EndlessDropManager.cs 20 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/Level/EndlessLevelManager.cs 18 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/Level/EndlessWave.cs 15 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/Level/EndlessWaveManager.cs 21 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/Towers/Placement/TowerPlacementGridEndless.cs 6 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/Towers/Projectiles/BallisticAttack.cs 14 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/Towers/TowerLevel.cs 17 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/UI/EndlessBossHPManager.cs 75 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/UI/EndlessBuffPreview.cs 95 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/UI/EndlessBuffPreview.cs.meta 11 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/UI/EndlessBuffSelect.cs 5 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/UI/EndlessScoreManager.cs 235 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/UI/EndlessScoreManager.cs.meta 11 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/UI/EndlessSettlement.cs 2 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/UI/EndlessUIStart.cs 16 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/UI/HUD/EndlessGameUI.cs 59 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/UI/HUD/EndlessRandomTower.cs 1 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/UI/HUD/PlacementTile.cs 86 ●●●●● 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/donateshop.json 2 ●●●●● diff | view | raw | blame | history
Assets/StreamingAssets/Table/endless_boss.json 2 ●●●●● diff | view | raw | blame | history
Assets/StreamingAssets/Table/endless_buff.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
Assets/StreamingAssets/Table/scoreshop.json 2 ●●●●● diff | view | raw | blame | history
Assets/StreamingAssets/Table/skilllevelinfo.json 2 ●●●●● diff | view | raw | blame | history
Assets/UI/Endless/Fire.png diff | view | raw | blame | history
Assets/UI/Endless/Fire.png.meta 2 ●●●●● diff | view | raw | blame | history
Assets/UI/Endless/Wood.png diff | view | raw | blame | history
Assets/UI/Endless/Wood.png.meta 2 ●●●●● diff | view | raw | blame | history
Assets/UI/Favorite/弹出.png.meta 4 ●●●●● diff | view | raw | blame | history
Assets/UI/Favorite/按钮1.png.meta 4 ●●●●● diff | view | raw | blame | history
Assets/UI/Favorite/按钮2.png.meta 4 ●●●●● diff | view | raw | blame | history
Assets/UI/Favorite/新玩法预告.png.meta 4 ●●●●● diff | view | raw | blame | history
Assets/UI/Fight/01效果图-战斗.jpg.meta 14 ●●●●● diff | view | raw | blame | history
Assets/UI/Fight/Hit.png.meta 4 ●●●●● diff | view | raw | blame | history
Assets/UI/Fight/buffIcon.png.meta 4 ●●●●● diff | view | raw | blame | history
Assets/UI/Fight/buffPrompt.png.meta 4 ●●●●● diff | view | raw | blame | history
Assets/UI/Fight/doubleHit.png.meta 4 ●●●●● diff | view | raw | blame | history
Assets/UI/Fight/score.png.meta 4 ●●●●● diff | view | raw | blame | history
Assets/UI/Fight/文字标注01.jpg.meta 4 ●●●●● diff | view | raw | blame | history
Assets/UI/Final/newRecord.png.meta 4 ●●●●● diff | view | raw | blame | history
Assets/UI/Final/rank_di_0.png.meta 4 ●●●●● diff | view | raw | blame | history
Assets/UI/Final/rank_di_1.png.meta 4 ●●●●● diff | view | raw | blame | history
Assets/UI/Final/rank_di_2.png.meta 4 ●●●●● diff | view | raw | blame | history
Assets/UI/Final/rank_di_3.png.meta 4 ●●●●● diff | view | raw | blame | history
Assets/UI/Final/rank_icon_0.png.meta 4 ●●●●● diff | view | raw | blame | history
Assets/UI/Final/rank_icon_1.png.meta 4 ●●●●● diff | view | raw | blame | history
Assets/UI/Final/rank_icon_2.png.meta 4 ●●●●● diff | view | raw | blame | history
Assets/UI/Final/role.png.meta 4 ●●●●● diff | view | raw | blame | history
Assets/UI/Final/scoreNum.png.meta 12 ●●●●● diff | view | raw | blame | history
Assets/UI/Final/selfScoreDi.png.meta 4 ●●●●● diff | view | raw | blame | history
Assets/UI/Final/settleMentTitle.png.meta 4 ●●●●● diff | view | raw | blame | history
Assets/UI/Final/文字标注02.jpg.meta 4 ●●●●● diff | view | raw | blame | history
Assets/UI/GuideUser/fire.png.meta 4 ●●●●● diff | view | raw | blame | history
Assets/UI/GuideUser/water.png.meta 4 ●●●●● diff | view | raw | blame | history
Assets/UI/GuideUser/半透黑框.png.meta 4 ●●●●● diff | view | raw | blame | history
Assets/UI/GuideUser/小话泡1.png.meta 4 ●●●●● diff | view | raw | blame | history
Assets/UI/GuideUser/引导效果图01.png.meta 4 ●●●●● diff | view | raw | blame | history
Assets/UI/GuideUser/引导效果图02.png.meta 4 ●●●●● diff | view | raw | blame | history
Assets/UI/GuideUser/引导效果图03.png.meta 4 ●●●●● diff | view | raw | blame | history
Assets/UI/GuideUser/技能释放范围.png.meta 4 ●●●●● diff | view | raw | blame | history
Assets/UI/GuideUser/拖动指针.png.meta 4 ●●●●● diff | view | raw | blame | history
Assets/UI/GuideUser/提示.png.meta 4 ●●●●● diff | view | raw | blame | history
Assets/UI/GuideUser/数字1.png.meta 4 ●●●●● diff | view | raw | blame | history
Assets/UI/GuideUser/数字2.png.meta 4 ●●●●● diff | view | raw | blame | history
Assets/UI/GuideUser/立绘形象.png.meta 4 ●●●●● diff | view | raw | blame | history
Assets/UI/GuideUser/话泡.png.meta 4 ●●●●● diff | view | raw | blame | history
Assets/UI/Loading/LOGO.png.meta 4 ●●●●● diff | view | raw | blame | history
Assets/UI/Loading/LoadingBg.png diff | view | raw | blame | history
Assets/UI/Loading/LoadingBg.png.meta 6 ●●●●● diff | view | raw | blame | history
Assets/UI/Loading/开始按钮.png.meta 4 ●●●●● diff | view | raw | blame | history
Assets/UI/Loading/按钮1.png.meta 4 ●●●●● diff | view | raw | blame | history
Assets/UI/Loading/按钮2.png.meta 4 ●●●●● diff | view | raw | blame | history
Assets/UI/Loading/效果图.png.meta 4 ●●●●● diff | view | raw | blame | history
Assets/UI/Loading/效果图1.png.meta 4 ●●●●● diff | view | raw | blame | history
Assets/UI/Loading/文字.png.meta 4 ●●●●● diff | view | raw | blame | history
Assets/UI/Loading/文字1.png.meta 4 ●●●●● diff | view | raw | blame | history
Assets/UI/Loading/背景.png.meta 4 ●●●●● diff | view | raw | blame | history
Assets/UI/Loading/进度底.png.meta 4 ●●●●● diff | view | raw | blame | history
Assets/UI/Loading/进度条.png.meta 4 ●●●●● diff | view | raw | blame | history
Assets/UI/timeBg.png.meta 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/donateshop.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_buff.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/StreamingAssets/Table/scoreshop.json 2 ●●●●● diff | view | raw | blame | history
GemBattle/宝石塔防_Data/StreamingAssets/Table/skilllevelinfo.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/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/sharedassets1.resource 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/sharedassets3.assets diff | view | raw | blame | history
GemBattle/宝石塔防_Data/sharedassets3.assets.resS diff | view | raw | blame | history
ProjectSettings/EditorBuildSettings.asset 4 ●●●●● diff | view | raw | blame | history