chenxin
2020-12-02 54181477c210344b037d88f17dbe2cddc5cbc930
refs
author chenxin <chenxin6991@163.com>
Wednesday, December 2, 2020 17:54 +0800
committer chenxin <chenxin6991@163.com>
Wednesday, December 2, 2020 17:54 +0800
commit54181477c210344b037d88f17dbe2cddc5cbc930
tree 3efa6d1937ecadd790967580831e6068ce7aea55 tree | zip | gz
parent 5af11edad0d1cba98ba30b2b89c7b1e24b982f72 view | diff
6bc45c691891dac88bece3483fb6f3cf2d7a00a4 view | diff
Merge branch 'master' of http://172.16.1.52:8090/r/GemBattle into master
3 files renamed
21 files copied
13 files deleted
24 files added
29 files modified
7254 ■■■■■ changed files
Assets/Prefabs/UI/GuideUI/BoxPanel.prefab 1959 ●●●●● diff | view | raw | blame | history
Assets/Prefabs/UI/GuideUI/BoxPanel.prefab.meta 7 ●●●●● diff | view | raw | blame | history
Assets/Prefabs/UI/GuideUI/MainUI.prefab 16 ●●●●● diff | view | raw | blame | history
Assets/Prefabs/UI/GuideUI/效果图.png diff | view | raw | blame | history
Assets/Prefabs/UI/GuideUI/效果图.png.meta 6 ●●●● diff | view | raw | blame | history
Assets/Prefabs/UI/GuideUI/效果图1.png diff | view | raw | blame | history
Assets/Prefabs/UI/GuideUI/效果图1.png.meta 6 ●●●● diff | view | raw | blame | history
Assets/Resources/UI/Final/FinalPanel.prefab 6 ●●●● diff | view | raw | blame | history
Assets/Resources/UI/Guide/GuidePanel.prefab 1924 ●●●●● diff | view | raw | blame | history
Assets/Scripts/Common/GameConfig.cs 3 ●●●●● diff | view | raw | blame | history
Assets/Scripts/Core/Camera/ViewPortAdj.cs 18 ●●●● diff | view | raw | blame | history
Assets/Scripts/Event/EventType.cs 23 ●●●●● diff | view | raw | blame | history
Assets/Scripts/Guide/CharForeach.cs 193 ●●●●● diff | view | raw | blame | history
Assets/Scripts/Guide/GuideBox.cs 145 ●●●●● diff | view | raw | blame | history
Assets/Scripts/Guide/GuideBox.cs.meta 2 ●●● diff | view | raw | blame | history
Assets/Scripts/Guide/GuideConfig.cs 2 ●●● diff | view | raw | blame | history
Assets/Scripts/Guide/GuideCtrl.cs 755 ●●●●● diff | view | raw | blame | history
Assets/Scripts/Guide/GuideImageBase.cs 17 ●●●●● diff | view | raw | blame | history
Assets/Scripts/Guide/GuideImageBase.cs.meta 2 ●●● diff | view | raw | blame | history
Assets/Scripts/Guide/GuidePanel.cs 138 ●●●●● diff | view | raw | blame | history
Assets/Scripts/Guide/GuidePanelNew.cs 847 ●●●●● diff | view | raw | blame | history
Assets/Scripts/Guide/GuidePanelNew.cs.meta 2 ●●● diff | view | raw | blame | history
Assets/Scripts/Guide/ImageFire1.cs 92 ●●●● diff | view | raw | blame | history
Assets/Scripts/Guide/ImageFire2.cs 18 ●●●● diff | view | raw | blame | history
Assets/Scripts/Guide/ImageSkill.cs.meta 11 ●●●●● diff | view | raw | blame | history
Assets/Scripts/Guide/ImageSkillRim.cs 31 ●●●●● diff | view | raw | blame | history
Assets/Scripts/Guide/ImageTowerPos.cs 17 ●●●●● diff | view | raw | blame | history
Assets/Scripts/Guide/ImageTowerPos2.cs 32 ●●●●● diff | view | raw | blame | history
Assets/Scripts/Guide/ImageTowerPos2.cs.meta 11 ●●●●● diff | view | raw | blame | history
Assets/Scripts/Guide/ImageWater.cs 13 ●●●● diff | view | raw | blame | history
Assets/Scripts/Guide/ImageWood.cs 129 ●●●●● diff | view | raw | blame | history
Assets/Scripts/Guide/ImageWood.cs.meta 2 ●●● diff | view | raw | blame | history
Assets/Scripts/Guide/ImageWood2.cs 38 ●●●●● diff | view | raw | blame | history
Assets/Scripts/Guide/ImageWood2.cs.meta 2 ●●● diff | view | raw | blame | history
Assets/Scripts/Guide/TestButton.cs 28 ●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/Affectors/AttackAffector.cs 2 ●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/Input/EndlessTowerDefenseKeyboardMouseInput.cs 2 ●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/Input/EndlessTowerDefenseTouchInput.cs 2 ●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/Level/EndlessLevelManager.cs 9 ●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/Level/EndlessWaveManager.cs 10 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/UI/EndlessTowerGridOpen.cs 18 ●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/UI/EndlessUIStart.cs 54 ●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/UI/HUD/EndlessGameUI.cs 2 ●●● diff | view | raw | blame | history
Assets/Scripts/UI/FinalPanel/FinalPanel.cs 54 ●●●● diff | view | raw | blame | history
Assets/Scripts/UI/FinalPanel/FinalPanelItem.cs 23 ●●●●● diff | view | raw | blame | history
Assets/StreamingAssets/Table/endless_port.json 2 ●●● diff | view | raw | blame | history
Assets/Tools/EnhancedScroller v2/Plugins/EnhancedScroller.cs 9 ●●●● diff | view | raw | blame | history
Assets/UI/GuideUser/SkillFire.png diff | view | raw | blame | history
Assets/UI/GuideUser/SkillFire.png.meta 118 ●●●●● diff | view | raw | blame | history
Assets/UI/GuideUser/sr.png diff | view | raw | blame | history
Assets/UI/GuideUser/sr.png.meta 6 ●●●● diff | view | raw | blame | history
Assets/UI/GuideUser/water.png diff | view | raw | blame | history
Assets/UI/GuideUser/water.png.meta 4 ●●●● diff | view | raw | blame | history
Assets/UI/GuideUser/元素标志1.png diff | view | raw | blame | history
Assets/UI/GuideUser/元素标志1.png.meta 6 ●●●● diff | view | raw | blame | history
Assets/UI/GuideUser/元素标志2.png diff | view | raw | blame | history
Assets/UI/GuideUser/元素标志2.png.meta 6 ●●●● diff | view | raw | blame | history
Assets/UI/GuideUser/元素标志3.png diff | view | raw | blame | history
Assets/UI/GuideUser/元素标志3.png.meta 6 ●●●● diff | view | raw | blame | history
Assets/UI/GuideUser/宝箱.png diff | view | raw | blame | history
Assets/UI/GuideUser/宝箱.png.meta 6 ●●●● diff | view | raw | blame | history
Assets/UI/GuideUser/引导效果图01.png diff | view | raw | blame | history
Assets/UI/GuideUser/引导效果图02.png diff | view | raw | blame | history
Assets/UI/GuideUser/引导效果图02.png.meta 118 ●●●●● diff | view | raw | blame | history
Assets/UI/GuideUser/引导效果图03.png diff | view | raw | blame | history
Assets/UI/GuideUser/引导效果图03.png.meta 118 ●●●●● diff | view | raw | blame | history
Assets/UI/GuideUser/彩带.png diff | view | raw | blame | history
Assets/UI/GuideUser/彩带.png.meta 6 ●●●● diff | view | raw | blame | history
Assets/UI/GuideUser/恭喜获得.png diff | view | raw | blame | history
Assets/UI/GuideUser/恭喜获得.png.meta 6 ●●●● diff | view | raw | blame | history
Assets/UI/GuideUser/愤怒小鸡.png diff | view | raw | blame | history
Assets/UI/GuideUser/愤怒小鸡.png.meta 6 ●●●● diff | view | raw | blame | history
Assets/UI/GuideUser/技能释放范围.png diff | view | raw | blame | history
Assets/UI/GuideUser/技能释放范围.png.meta 118 ●●●●● diff | view | raw | blame | history
Assets/UI/GuideUser/文字底.png diff | view | raw | blame | history
Assets/UI/GuideUser/文字底.png.meta 6 ●●●● diff | view | raw | blame | history
Assets/UI/GuideUser/玉米枪手.png diff | view | raw | blame | history
Assets/UI/GuideUser/玉米枪手.png.meta 6 ●●●● diff | view | raw | blame | history
Assets/UI/GuideUser/精灵宝箱.png diff | view | raw | blame | history
Assets/UI/GuideUser/精灵宝箱.png.meta 6 ●●●● diff | view | raw | blame | history
Assets/UI/GuideUser/背景光.png diff | view | raw | blame | history
Assets/UI/GuideUser/背景光.png.meta 6 ●●●● diff | view | raw | blame | history
Assets/UI/GuideUser/角色1.png diff | view | raw | blame | history
Assets/UI/GuideUser/角色1.png.meta 6 ●●●● diff | view | raw | blame | history
Assets/UI/GuideUser/角色2.png diff | view | raw | blame | history
Assets/UI/GuideUser/角色2.png.meta 6 ●●●● diff | view | raw | blame | history
Assets/UI/GuideUser/角色3.png diff | view | raw | blame | history
Assets/UI/GuideUser/角色3.png.meta 6 ●●●● diff | view | raw | blame | history
Assets/UI/GuideUser/雪糕投手.png diff | view | raw | blame | history
Assets/UI/GuideUser/雪糕投手.png.meta 6 ●●●● diff | view | raw | blame | history