weixudong
2020-11-19 69e0fea6c92fd4e153d45e5f26ef89baecf0405a
refs
author weixudong <weixudong4700@ktgame.com>
Thursday, November 19, 2020 08:51 +0800
committer weixudong <weixudong4700@ktgame.com>
Thursday, November 19, 2020 08:51 +0800
commit69e0fea6c92fd4e153d45e5f26ef89baecf0405a
tree 3cf257690978d6e8546b39676eae96de9c5325d3 tree | zip | gz
parent 8b57dd2c92449dd326fff48f9d9e14415f9d0ccc view | diff
ea02e4ac5c7759d244a2fa34880e5260cc5666df view | diff
Merge branch 'master' of ssh://172.16.1.52:8091/GemBattle into master
40 files added
102 files modified
126466 ■■■■ changed files
And/GemBattle.apk diff | view | raw | blame | history
Assets/00000/package/Materials/EffectShader_Niuqu_002.mat 92 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Materials/EffectShader_Niuqu_002.mat.meta 8 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Materials/Object_004_02.mat 30 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Materials/Object_004_02.mat.meta 8 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Materials/Sequence_005_4X3_b.mat 30 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Materials/Sequence_005_4X3_b.mat.meta 8 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Model/dici.FBX diff | view | raw | blame | history
Assets/00000/package/Model/dici.FBX.meta 119 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Prefab/Effect_jiansu1026.prefab 14879 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Prefab/Prefab/Effect_Elf_Mu_Atk.prefab 4 ●●●● diff | view | raw | blame | history
Assets/00000/package/Prefab/Prefab/Effect_Elf_Mu_SpAtk.prefab 2 ●●● diff | view | raw | blame | history
Assets/00000/package/Prefab/Prefab/Effect_Elf_Mu_SpHit.prefab 20 ●●●● diff | view | raw | blame | history
Assets/00000/package/Prefab/Prefab/Effect_Elf_Shui_Buff.prefab 24297 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Prefab/Prefab/Effect_Elf_Shui_Buff.prefab.meta 7 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Prefab/Prefab/Effect_Elf_Shui_SpAtk.prefab 4 ●●●● diff | view | raw | blame | history
Assets/00000/package/Prefab/Prefab/Effect_Guai_SiWang.prefab 19435 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Prefab/Prefab/Effect_Guai_SiWang.prefab.meta 7 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Prefab/Prefab/Effect_JiNengBaoShi_Huo.prefab 24467 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Prefab/Prefab/Effect_UI_GongJiFanWei.prefab 8 ●●●● diff | view | raw | blame | history
Assets/00000/package/Texture/Object_004_02.png diff | view | raw | blame | history
Assets/00000/package/Texture/Object_004_02.png.meta 106 ●●●●● diff | view | raw | blame | history
Assets/Materials/PVE/1倍速.png diff | view | raw | blame | history
Assets/Materials/PVE/1倍速.png.meta 118 ●●●●● diff | view | raw | blame | history
Assets/Materials/PVE/2倍速.png diff | view | raw | blame | history
Assets/Materials/PVE/2倍速.png.meta 118 ●●●●● diff | view | raw | blame | history
Assets/Materials/PVE/BUFF.png diff | view | raw | blame | history
Assets/Materials/PVE/BUFF.png.meta 118 ●●●●● diff | view | raw | blame | history
Assets/Materials/UI/tileTowerVSMat.mat 2 ●●● diff | view | raw | blame | history
Assets/Prefabs/Enemies/fire 2.prefab 167 ●●●●● diff | view | raw | blame | history
Assets/Prefabs/Enemies/water 1.prefab 272 ●●●● diff | view | raw | blame | history
Assets/Prefabs/Enemies/wood 2.prefab 433 ●●●● diff | view | raw | blame | history
Assets/Prefabs/Towers/Fire/Effect_HuoJingLing_Atk 0.prefab 1 ●●●● diff | view | raw | blame | history
Assets/Prefabs/Towers/Fire/Effect_HuoJingLing_Atk 1.prefab 1 ●●●● diff | view | raw | blame | history
Assets/Prefabs/Towers/Fire/Effect_HuoJingLing_Atk 2.prefab 1 ●●●● diff | view | raw | blame | history
Assets/Prefabs/Towers/Fire/Effect_HuoJingLing_Atk 3.prefab 1 ●●●● diff | view | raw | blame | history
Assets/Prefabs/Towers/Fire/Effect_HuoJingLing_Atk 4.prefab 1 ●●●● diff | view | raw | blame | history
Assets/Prefabs/Towers/Fire/GrowUpTower_4.prefab 210 ●●●● diff | view | raw | blame | history
Assets/Prefabs/Towers/Water/WaterProjectile_0 1.prefab 3 ●●●● diff | view | raw | blame | history
Assets/Prefabs/Towers/Water/WaterProjectile_0.prefab 1 ●●●● diff | view | raw | blame | history
Assets/Prefabs/Towers/Water/WaterProjectile_1 1.prefab 3 ●●●● diff | view | raw | blame | history
Assets/Prefabs/Towers/Water/WaterProjectile_1.prefab 1 ●●●● diff | view | raw | blame | history
Assets/Prefabs/Towers/Water/WaterProjectile_2 1.prefab 3 ●●●● diff | view | raw | blame | history
Assets/Prefabs/Towers/Water/WaterProjectile_2.prefab 1 ●●●● diff | view | raw | blame | history
Assets/Prefabs/Towers/Water/WaterProjectile_3 1.prefab 3 ●●●● diff | view | raw | blame | history
Assets/Prefabs/Towers/Water/WaterProjectile_3.prefab 1 ●●●● diff | view | raw | blame | history
Assets/Prefabs/Towers/Water/WaterProjectile_4 1.prefab 3 ●●●● diff | view | raw | blame | history
Assets/Prefabs/Towers/Water/WaterProjectile_4.prefab 1 ●●●● diff | view | raw | blame | history
Assets/Prefabs/Towers/WoodTower/Effect_Elf_Mu_Hit.prefab 2 ●●● diff | view | raw | blame | history
Assets/Prefabs/Towers/WoodTower/Effect_Elf_Mu_SpHit.prefab 19294 ●●●● diff | view | raw | blame | history
Assets/Prefabs/Towers/WoodTower/WProjectile_0.prefab 1 ●●●● diff | view | raw | blame | history
Assets/Prefabs/Towers/WoodTower/WProjectile_1.prefab 1 ●●●● diff | view | raw | blame | history
Assets/Prefabs/Towers/WoodTower/WProjectile_2.prefab 1 ●●●● diff | view | raw | blame | history
Assets/Prefabs/Towers/WoodTower/WProjectile_3.prefab 1 ●●●● diff | view | raw | blame | history
Assets/Prefabs/Towers/WoodTower/WProjectile_4.prefab 1 ●●●● diff | view | raw | blame | history
Assets/Prefabs/Towers/WoodTower/WProjectile_Sp.prefab 1 ●●●● diff | view | raw | blame | history
Assets/Prefabs/UI/Endless/BottomCanvas.prefab 1164 ●●●● diff | view | raw | blame | history
Assets/Prefabs/UI/EndlessTileGridBuyBtn.prefab 4 ●●●● diff | view | raw | blame | history
Assets/Prefabs/UI/FreezeEnergy.prefab 2 ●●● diff | view | raw | blame | history
Assets/Prefabs/UI/Heart.prefab 6 ●●●● diff | view | raw | blame | history
Assets/Resources/Prefabs/Endless/AgentDeathEffect.prefab 19466 ●●●●● diff | view | raw | blame | history
Assets/Resources/Prefabs/Endless/AgentDeathEffect.prefab.meta 7 ●●●●● diff | view | raw | blame | history
Assets/Resources/UI/BuffPreview/BuffPreview.prefab 2 ●●● diff | view | raw | blame | history
Assets/Resources/UI/DoubleHit.meta 8 ●●●●● diff | view | raw | blame | history
Assets/Resources/UI/Guide/GuidePanel.prefab 26 ●●●● diff | view | raw | blame | history
Assets/Scenes/Levels/Battle/Endless2D.unity 54 ●●●●● diff | view | raw | blame | history
Assets/Scenes/LoadingScene.unity 4 ●●●● diff | view | raw | blame | history
Assets/Scripts/ActionGameFramework/Health/Damager.cs 13 ●●●● diff | view | raw | blame | history
Assets/Scripts/ActionGameFramework/Health/Targetable.cs 4 ●●●● diff | view | raw | blame | history
Assets/Scripts/Data/EndlessBuffData.cs 22 ●●●● diff | view | raw | blame | history
Assets/Scripts/GameAnalytics_SDK/UI/LoginUI.cs 11 ●●●●● diff | view | raw | blame | history
Assets/Scripts/Guide/GuidePanel.cs 30 ●●●● diff | view | raw | blame | history
Assets/Scripts/Manager/ManagerRoot.cs 24 ●●●●● diff | view | raw | blame | history
Assets/Scripts/Music/AudioSourceManager.cs 2 ●●● diff | view | raw | blame | history
Assets/Scripts/Net/NetExtends/Table.cs 4 ●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/Affectors/AttackAffector.cs 30 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/Agents/Agent.cs 34 ●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/Agents/HomeBaseAttacker.cs 2 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/Level/EndlessBuff/CritBulletAdd.cs 2 ●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/Level/EndlessBuff/CritDamageAdd.cs 5 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/Level/EndlessBuff/EndlessBuff.cs 10 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/Level/EndlessBuff/EndlessBuffManager.cs 1 ●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/Level/EndlessBuff/GoldAdd.cs 2 ●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/Level/EndlessBuff/ObtainTower.cs 4 ●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/Level/EndlessLevelManager.cs 8 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/Towers/Placement/TowerPlacementGridEndless.cs 15 ●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/Towers/Projectiles/BallisticAttack.cs 15 ●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/Towers/Projectiles/HitscanAttack.cs 2 ●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/Towers/TowerFireTrigger.cs 32 ●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/Towers/TowerLevel.cs 10 ●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/UI/BulletUICtl.cs 4 ●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/UI/EndlessBossSkill/BossSkillBubbleBomb.cs 5 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/UI/EndlessBuffPreview.cs 8 ●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/UI/EndlessBuffSelect.cs 3 ●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/UI/EndlessHomeBaseHPManager.cs 39 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/UI/FreezeBreath.cs 38 ●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/UI/HUD/EndlessCurrencyUI.cs 4 ●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/UI/HUD/EndlessGameUI.cs 53 ●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/UI/HUD/EndlessRandomTower.cs 53 ●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/UI/HUD/GameUI.cs 2 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/UI/HUD/SelectBuffIcon.cs 18 ●●●● diff | view | raw | blame | history
Assets/StreamingAssets/Table/endless_buff.json 2 ●●● diff | view | raw | blame | history
Assets/UI/Endless/Bottom.meta 8 ●●●●● diff | view | raw | blame | history
Assets/UI/Endless/Bottom/小按钮1.png diff | view | raw | blame | history
Assets/UI/Endless/Bottom/小按钮1.png.meta 94 ●●●●● diff | view | raw | blame | history
Assets/UI/Endless/Bottom/小按钮2.png diff | view | raw | blame | history
Assets/UI/Endless/Bottom/小按钮2.png.meta 94 ●●●●● diff | view | raw | blame | history
Assets/UI/Endless/Bottom/战斗效果图.png diff | view | raw | blame | history
Assets/UI/Endless/Bottom/战斗效果图.png.meta 118 ●●●●● diff | view | raw | blame | history
Assets/UI/Endless/Bottom/技能底.png diff | view | raw | blame | history
Assets/UI/Endless/Bottom/技能底.png.meta 118 ●●●●● diff | view | raw | blame | history
Assets/UI/Endless/Bottom/按钮.png diff | view | raw | blame | history
Assets/UI/Endless/Bottom/按钮.png.meta 118 ●●●●● diff | view | raw | blame | history
Assets/UI/Endless/Bottom/暂停.png diff | view | raw | blame | history
Assets/UI/Endless/Bottom/暂停.png.meta 118 ●●●●● diff | view | raw | blame | history
Assets/UI/Endless/Bottom/爱心金币底.png diff | view | raw | blame | history
Assets/UI/Endless/Bottom/爱心金币底.png.meta 118 ●●●●● diff | view | raw | blame | history
Assets/UI/Endless/Bottom/金币.png diff | view | raw | blame | history
Assets/UI/Endless/Bottom/金币.png.meta 118 ●●●●● diff | view | raw | blame | history
Assets/UI/Loading/LoadingBg.png diff | view | raw | blame | history
Assets/UI/Loading/LoadingBg.png.meta 10 ●●●● 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/endless_buff.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/resources.assets diff | view | raw | blame | history
GemBattle/宝石塔防_Data/resources.assets.resS diff | view | raw | blame | history
GemBattle/宝石塔防_Data/resources.resource 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