宝石塔防
parent: c974db | patch | commitdiff
liuzhiwei
2020-12-26 56d95fa59a9f6dc12d0fc0723ea449e5b317f994
refs
author liuzhiwei <liuzhiwei@qq.com>
Saturday, December 26, 2020 14:05 +0800
committer liuzhiwei <liuzhiwei@qq.com>
Saturday, December 26, 2020 14:05 +0800
commit56d95fa59a9f6dc12d0fc0723ea449e5b317f994
tree 4a5e614c5ec87b4a6110f96351a3b65245f8bf14 tree | zip | gz
parent c974db0cc1bc623615d6efec26bec91a55ebc4ca view | diff
0403c8e069761b5f1520bd88d89ccbaa6309df6e view | diff 
Merge branch 'master' of http://47.95.218.140:8090/r/GemBattle into master
5 files deleted
11 files added
75 files modified
3348 ■■■■■ changed files
Assets/Materials/UI/tileGold.mat 78 ●●●●● diff | view | raw | blame | history
Assets/Materials/UI/tileGold.mat.meta 8 ●●●●● diff | view | raw | blame | history
Assets/Prefabs/Towers/Fire/TowerLevel.prefab 18 ●●●●● diff | view | raw | blame | history
Assets/Prefabs/Towers/Water/TowerLevel.prefab 18 ●●●●● diff | view | raw | blame | history
Assets/Prefabs/Towers/WoodTower/TowerLevel.prefab 20 ●●●●● diff | view | raw | blame | history
Assets/Prefabs/UI/Endless/BottomCanvas.prefab 419 ●●●●● diff | view | raw | blame | history
Assets/Prefabs/UI/EndlessTileGridBuyBtn.prefab 142 ●●●●● diff | view | raw | blame | history
Assets/Prefabs/UI/Main/MainPanel.prefab 718 ●●●●● diff | view | raw | blame | history
Assets/Resources/Prefabs/BuyMesh.prefab 285 ●●●●● diff | view | raw | blame | history
Assets/Resources/Prefabs/BuyMesh.prefab.meta 7 ●●●●● diff | view | raw | blame | history
Assets/Resources/UI/BuffPreview/BuffItem.prefab 100 ●●●●● diff | view | raw | blame | history
Assets/Resources/UI/Guide/GuidePanel.prefab 486 ●●●●● diff | view | raw | blame | history
Assets/Scenes/Loading.unity 393 ●●●●● diff | view | raw | blame | history
Assets/Scripts/ActionGameFramework/Health/DamageCollider.cs 2 ●●●●● diff | view | raw | blame | history
Assets/Scripts/ActionGameFramework/Health/Damager.cs 5 ●●●●● diff | view | raw | blame | history
Assets/Scripts/Event/EventType.cs 3 ●●●●● diff | view | raw | blame | history
Assets/Scripts/GameAnalytics_SDK/UI/LoginUI.cs 18 ●●●●● diff | view | raw | blame | history
Assets/Scripts/Guide/GuideCtrl.cs 6 ●●●●● diff | view | raw | blame | history
Assets/Scripts/Guide/ImageFire1.cs 5 ●●●●● diff | view | raw | blame | history
Assets/Scripts/Guide/ImageWater.cs 7 ●●●●● diff | view | raw | blame | history
Assets/Scripts/Guide/ImageWood.cs 5 ●●●●● diff | view | raw | blame | history
Assets/Scripts/Guide/ImageWood2.cs 7 ●●●●● diff | view | raw | blame | history
Assets/Scripts/Json/JsonDataCenter.cs 2 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/Level/AgentInsManager.cs 3 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/Towers/Placement/TowerPlacementGridEndless.cs 9 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/Towers/Projectiles/BallisticAttack.cs 16 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/Towers/TowerLevel.cs 2 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/UI/EndlessTowerGridOpen.cs 15 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/UI/EndlessUIStart.cs 6 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/UI/HUD/EndlessGameUI.cs 10 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/UI/HUD/PlacementTile.cs 17 ●●●●● diff | view | raw | blame | history
Assets/Scripts/UI/Main/Loading.cs 13 ●●●●● diff | view | raw | blame | history
Assets/Scripts/UI/Main/MainStartUI.cs 25 ●●●●● diff | view | raw | blame | history
Assets/StreamingAssets/Table/elf_info.json 2 ●●●●● diff | view | raw | blame | history
Assets/StreamingAssets/Table/elf_upgrade.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/gemcost.json 2 ●●●●● diff | view | raw | blame | history
Assets/StreamingAssets/Table/skilllevelinfo.json 2 ●●●●● diff | view | raw | blame | history
Assets/UI/GuideUser/Object_021 1.png diff | view | raw | blame | history
Assets/UI/GuideUser/Object_021 1.png.meta 118 ●●●●● diff | view | raw | blame | history
Assets/UI/GuideUser/Object_022 1.png diff | view | raw | blame | history
Assets/UI/GuideUser/Object_022 1.png.meta 118 ●●●●● diff | view | raw | blame | history
Assets/UI/GuideUser/Object_023 1.png diff | view | raw | blame | history
Assets/UI/GuideUser/Object_023 1.png.meta 118 ●●●●● diff | view | raw | blame | history
Assets/UI/Main/PVP-tu.png diff | view | raw | blame | history
Assets/UI/Main/button-01.png diff | view | raw | blame | history
Assets/UI/Main/button-02.png diff | view | raw | blame | history
Assets/UI/TowerLevel/星星4.png diff | view | raw | blame | history
USDKTest/.gradle/6.1.1/executionHistory/executionHistory.bin diff | view | raw | blame | history
USDKTest/.gradle/6.1.1/executionHistory/executionHistory.lock diff | view | raw | blame | history
USDKTest/.gradle/6.1.1/fileHashes/fileHashes.bin diff | view | raw | blame | history
USDKTest/.gradle/6.1.1/fileHashes/fileHashes.lock diff | view | raw | blame | history
USDKTest/.gradle/6.1.1/fileHashes/resourceHashesCache.bin diff | view | raw | blame | history
USDKTest/.gradle/6.1.1/javaCompile/classAnalysis.bin diff | view | raw | blame | history
USDKTest/.gradle/6.1.1/javaCompile/jarAnalysis.bin diff | view | raw | blame | history
USDKTest/.gradle/6.1.1/javaCompile/javaCompile.lock diff | view | raw | blame | history
USDKTest/.gradle/6.1.1/javaCompile/taskHistory.bin diff | view | raw | blame | history
USDKTest/.gradle/buildOutputCleanup/buildOutputCleanup.lock diff | view | raw | blame | history
USDKTest/.gradle/buildOutputCleanup/outputFiles.bin diff | view | raw | blame | history
USDKTest/.idea/caches/build_file_checksums.ser diff | view | raw | blame | history
USDKTest/.idea/libraries/Gradle__org_apache_http_legacy.xml 1 ●●●●● diff | view | raw | blame | history
USDKTest/.idea/workspace.xml 82 ●●●●● diff | view | raw | blame | history
USDKTest/launcher/release/launcher-release.apk diff | view | raw | blame | history
USDKTest/launcher/src/main/AndroidManifest.xml 2 ●●●●● diff | view | raw | blame | history
USDKTest/launcher/src/main/res/drawable-xhdpi/app_icon.png diff | view | raw | blame | history
USDKTest/launcher/src/main/res/mipmap-anydpi-v26/app_icon.xml 5 ●●●●● diff | view | raw | blame | history
USDKTest/launcher/src/main/res/mipmap-anydpi-v26/app_icon_round.xml 5 ●●●●● diff | view | raw | blame | history
USDKTest/launcher/src/main/res/mipmap-mdpi/app_icon.png diff | view | raw | blame | history
USDKTest/launcher/src/main/res/mipmap-mdpi/ic_launcher_background.png diff | view | raw | blame | history
USDKTest/launcher/src/main/res/mipmap-mdpi/ic_launcher_foreground.png diff | view | raw | blame | history
USDKTest/unityLibrary/src/main/assets/Table/elf_info.json 2 ●●●●● diff | view | raw | blame | history
USDKTest/unityLibrary/src/main/assets/Table/elf_upgrade.json 2 ●●●●● diff | view | raw | blame | history
USDKTest/unityLibrary/src/main/assets/Table/endless_buff.json 2 ●●●●● diff | view | raw | blame | history
USDKTest/unityLibrary/src/main/assets/Table/endless_enemy.json 2 ●●●●● diff | view | raw | blame | history
USDKTest/unityLibrary/src/main/assets/Table/endless_port.json 2 ●●●●● diff | view | raw | blame | history
USDKTest/unityLibrary/src/main/assets/Table/gemcost.json 2 ●●●●● diff | view | raw | blame | history
USDKTest/unityLibrary/src/main/assets/Table/skilllevelinfo.json 2 ●●●●● diff | view | raw | blame | history
USDKTest/unityLibrary/src/main/assets/bin/Data/Managed/Assembly-CSharp-firstpass.dll diff | view | raw | blame | history
USDKTest/unityLibrary/src/main/assets/bin/Data/Managed/Assembly-CSharp.dll diff | view | raw | blame | history
USDKTest/unityLibrary/src/main/assets/bin/Data/Managed/MoreMountains.NiceVibrations.Demos.dll diff | view | raw | blame | history
USDKTest/unityLibrary/src/main/assets/bin/Data/Managed/MoreMountains.NiceVibrations.Haptics.dll diff | view | raw | blame | history
USDKTest/unityLibrary/src/main/assets/bin/Data/Managed/MoreMountains.NiceVibrations.dll diff | view | raw | blame | history
USDKTest/unityLibrary/src/main/assets/bin/Data/Managed/Sirenix.OdinInspector.CompatibilityLayer.dll diff | view | raw | blame | history
USDKTest/unityLibrary/src/main/assets/bin/Data/Managed/Unity.TextMeshPro.dll diff | view | raw | blame | history
USDKTest/unityLibrary/src/main/assets/bin/Data/Managed/Unity.Timeline.dll diff | view | raw | blame | history
USDKTest/unityLibrary/src/main/assets/bin/Data/Managed/UnityEngine.UI.dll diff | view | raw | blame | history
USDKTest/unityLibrary/src/main/assets/bin/Data/boot.config 2 ●●●●● diff | view | raw | blame | history
USDKTest/unityLibrary/src/main/assets/bin/Data/data.unity3d diff | view | raw | blame | history
a.txt 1 ●●●●● diff | view | raw | blame | history