宝石塔防
parent: 57ac27 | patch | commitdiff
weixudong
2020-11-12 52fb8c663b1e74b2a36b79bc70a452ca73db6341
refs
author weixudong <weixudong4700@ktgame.com>
Thursday, November 12, 2020 17:20 +0800
committer weixudong <weixudong4700@ktgame.com>
Thursday, November 12, 2020 17:20 +0800
commit52fb8c663b1e74b2a36b79bc70a452ca73db6341
tree f7dcb8d46c11a4f871cc411b87dc06acefffe125 tree | zip | gz
parent 57ac271c6dc6c188c59f861154b7dca553a29d90 view | diff
bff0eaf7be58fda86448d0e1c0c7bbb17cbb8369 view | diff 
Merge branch 'master' of ssh://172.16.1.52:8091/GemBattle into master
148 files added
14 files modified
1077583 ■■■■■ changed files
Assets/00000/package/Materials/EffectShader_AddUvflow_002.mat 44 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Materials/EffectShader_AddUvflow_002.mat.meta 8 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Materials/EffectShader_AddUvflow_003.mat 38 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Materials/EffectShader_AddUvflow_003.mat.meta 8 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Materials/EffectShader_AddUvflow_004.mat 38 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Materials/EffectShader_AddUvflow_004.mat.meta 8 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Materials/EffectShader_AlphaUvflow_001.mat 94 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Materials/EffectShader_AlphaUvflow_001.mat.meta 8 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Materials/EffectShader_AlphaUvflow_002.mat 44 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Materials/EffectShader_AlphaUvflow_002.mat.meta 8 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Materials/EffectShader_AlphaUvflow_003.mat 44 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Materials/EffectShader_AlphaUvflow_003.mat.meta 8 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Materials/Glow_027_b.mat 30 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Materials/Glow_027_b.mat.meta 8 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Materials/Glow_040.mat 2 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Materials/Glow_041.mat 2 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Materials/Object_016.mat 30 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Materials/Object_016.mat.meta 8 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Materials/Object_017.mat 80 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Materials/Object_017.mat.meta 8 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Materials/Object_018.mat 30 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Materials/Object_018.mat.meta 8 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Materials/Object_019.mat 30 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Materials/Object_019.mat.meta 8 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Materials/Object_020.mat 30 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Materials/Object_020.mat.meta 8 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Materials/Object_021.mat 30 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Materials/Object_021.mat.meta 8 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Materials/Object_022.mat 30 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Materials/Object_022.mat.meta 8 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Materials/Object_023.mat 30 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Materials/Object_023.mat.meta 8 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Materials/Object_024.mat 30 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Materials/Object_024.mat.meta 8 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Materials/Object_025.mat 30 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Materials/Object_025.mat.meta 8 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Materials/Object_028.mat 30 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Materials/Object_028.mat.meta 8 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Prefab/Effect_HuoJingLing_Atk.prefab 14 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Prefab/Effect_baomihua.prefab 19 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Prefab/Prefab.meta 8 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Prefab/Prefab/Effect_Elf_Huo_Atk.prefab 28996 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Prefab/Prefab/Effect_Elf_Huo_Atk.prefab.meta 7 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Prefab/Prefab/Effect_Elf_Huo_DengChang.prefab 34039 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Prefab/Prefab/Effect_Elf_Huo_DengChang.prefab.meta 7 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Prefab/Prefab/Effect_Elf_Huo_Hit.prefab 38798 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Prefab/Prefab/Effect_Elf_Huo_Hit.prefab.meta 7 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Prefab/Prefab/Effect_Elf_Mu_Atk.prefab 4903 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Prefab/Prefab/Effect_Elf_Mu_Atk.prefab.meta 7 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Prefab/Prefab/Effect_Elf_Mu_Buff.prefab 53921 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Prefab/Prefab/Effect_Elf_Mu_Buff.prefab.meta 7 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Prefab/Prefab/Effect_Elf_Mu_Buff_02.prefab 9792 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Prefab/Prefab/Effect_Elf_Mu_Buff_02.prefab.meta 7 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Prefab/Prefab/Effect_Elf_Mu_DengChang.prefab 29168 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Prefab/Prefab/Effect_Elf_Mu_DengChang.prefab.meta 7 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Prefab/Prefab/Effect_Elf_Mu_Hit.prefab 14573 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Prefab/Prefab/Effect_Elf_Mu_Hit.prefab.meta 7 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Prefab/Prefab/Effect_Elf_Mu_SpAtk.prefab 19565 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Prefab/Prefab/Effect_Elf_Mu_SpAtk.prefab.meta 7 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Prefab/Prefab/Effect_Elf_Mu_SpHit.prefab 19354 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Prefab/Prefab/Effect_Elf_Mu_SpHit.prefab.meta 7 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Prefab/Prefab/Effect_Elf_Shui_Atk.prefab 33923 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Prefab/Prefab/Effect_Elf_Shui_Atk.prefab.meta 7 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Prefab/Prefab/Effect_Elf_Shui_DengChang.prefab 34049 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Prefab/Prefab/Effect_Elf_Shui_DengChang.prefab.meta 7 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Prefab/Prefab/Effect_Elf_Shui_Hit.prefab 29177 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Prefab/Prefab/Effect_Elf_Shui_Hit.prefab.meta 7 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Prefab/Prefab/Effect_JiNengBaoShi_Huo.prefab 34066 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Prefab/Prefab/Effect_JiNengBaoShi_Huo.prefab.meta 7 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Prefab/Prefab/Effect_JiNengBaoShi_Huo_Hit.prefab 19516 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Prefab/Prefab/Effect_JiNengBaoShi_Huo_Hit.prefab.meta 7 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Prefab/Prefab/Effect_TuoDong_Elf_Huo.prefab 53703 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Prefab/Prefab/Effect_TuoDong_Elf_Huo.prefab.meta 7 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Prefab/Prefab/Effect_TuoDong_Elf_Mu.prefab 53676 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Prefab/Prefab/Effect_TuoDong_Elf_Mu.prefab.meta 7 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Prefab/Prefab/Effect_TuoDong_Elf_Shui.prefab 53676 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Prefab/Prefab/Effect_TuoDong_Elf_Shui.prefab.meta 7 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Prefab/Prefab/Effect_TuoDong_JiNeng_Dian.prefab 43934 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Prefab/Prefab/Effect_TuoDong_JiNeng_Dian.prefab.meta 7 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Prefab/Prefab/Effect_TuoDong_JiNeng_Huo.prefab 43934 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Prefab/Prefab/Effect_TuoDong_JiNeng_Huo.prefab.meta 7 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Prefab/Prefab/Effect_UI_BaoShiShengJi.prefab 48476 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Prefab/Prefab/Effect_UI_BaoShiShengJi.prefab.meta 7 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Prefab/Prefab/Effect_UI_BaoShiShengJi_TiShi.prefab 9658 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Prefab/Prefab/Effect_UI_BaoShiShengJi_TiShi.prefab.meta 7 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Prefab/Prefab/Effect_UI_BuffKaPaiXuanZe.prefab 43260 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Prefab/Prefab/Effect_UI_BuffKaPaiXuanZe.prefab.meta 7 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Prefab/Prefab/Effect_UI_DianJi.prefab 48477 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Prefab/Prefab/Effect_UI_DianJi.prefab.meta 7 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Prefab/Prefab/Effect_UI_DiaoLuoBaoXiang.prefab 19310 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Prefab/Prefab/Effect_UI_DiaoLuoBaoXiang.prefab.meta 7 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Prefab/Prefab/Effect_UI_GongJiFanWei.prefab 9716 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Prefab/Prefab/Effect_UI_GongJiFanWei.prefab.meta 7 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Prefab/Prefab/Effect_UI_GouMaiBaoShi.prefab 9594 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Prefab/Prefab/Effect_UI_GouMaiBaoShi.prefab.meta 7 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Prefab/Prefab/Effect_UI_JiangLiLiuGuang.prefab 62342 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Prefab/Prefab/Effect_UI_JiangLiLiuGuang.prefab.meta 7 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Prefab/Prefab/Effect_UI_JieSuanShengLi.prefab 38593 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Prefab/Prefab/Effect_UI_JieSuanShengLi.prefab.meta 7 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Prefab/Prefab/Effect_UI_KaPai_Huo.prefab 9810 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Prefab/Prefab/Effect_UI_KaPai_Huo.prefab.meta 7 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Prefab/Prefab/Effect_UI_KaPai_Huo_02.prefab 9810 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Prefab/Prefab/Effect_UI_KaPai_Huo_02.prefab.meta 7 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Prefab/Prefab/Effect_UI_KaPai_Mu.prefab 34030 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Prefab/Prefab/Effect_UI_KaPai_Mu.prefab.meta 7 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Prefab/Prefab/Effect_UI_KaPai_Mu_02.prefab 9810 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Prefab/Prefab/Effect_UI_KaPai_Mu_02.prefab.meta 7 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Prefab/Prefab/Effect_UI_KaPai_Shui.prefab 34030 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Prefab/Prefab/Effect_UI_KaPai_Shui.prefab.meta 7 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Prefab/Prefab/Effect_UI_KaPai_Shui_02.prefab 9810 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Prefab/Prefab/Effect_UI_KaPai_Shui_02.prefab.meta 7 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Prefab/Prefab/Effect_UI_XinSui.prefab 24414 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Prefab/Prefab/Effect_UI_XinSui.prefab.meta 7 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Shader/EffectShader_AlphaBlendUvflow.shader 167 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Shader/EffectShader_AlphaBlendUvflow.shader.meta 9 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Texture/Glow_041.png diff | view | raw | blame | history
Assets/00000/package/Texture/Glow_041.png.meta 2 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Texture/Object_016.png diff | view | raw | blame | history
Assets/00000/package/Texture/Object_016.png.meta 106 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Texture/Object_017.png diff | view | raw | blame | history
Assets/00000/package/Texture/Object_017.png.meta 106 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Texture/Object_018.png diff | view | raw | blame | history
Assets/00000/package/Texture/Object_018.png.meta 106 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Texture/Object_019.png diff | view | raw | blame | history
Assets/00000/package/Texture/Object_019.png.meta 106 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Texture/Object_020.png diff | view | raw | blame | history
Assets/00000/package/Texture/Object_020.png.meta 106 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Texture/Object_021.png diff | view | raw | blame | history
Assets/00000/package/Texture/Object_021.png.meta 106 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Texture/Object_022.png diff | view | raw | blame | history
Assets/00000/package/Texture/Object_022.png.meta 106 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Texture/Object_023.png diff | view | raw | blame | history
Assets/00000/package/Texture/Object_023.png.meta 106 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Texture/Object_024.png diff | view | raw | blame | history
Assets/00000/package/Texture/Object_024.png.meta 106 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Texture/Object_025.png diff | view | raw | blame | history
Assets/00000/package/Texture/Object_025.png.meta 106 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Texture/Object_026.png diff | view | raw | blame | history
Assets/00000/package/Texture/Object_026.png.meta 94 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Texture/Object_027.png diff | view | raw | blame | history
Assets/00000/package/Texture/Object_027.png.meta 94 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Texture/Object_028.png diff | view | raw | blame | history
Assets/00000/package/Texture/Object_028.png.meta 130 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Texture/Sequence_011_4X4.png diff | view | raw | blame | history
Assets/00000/package/Texture/Sequence_011_4X4.png.meta 106 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Texture/Texmap_005.png diff | view | raw | blame | history
Assets/00000/package/Texture/Texmap_005.png.meta 127 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Texture/Texmap_006.png diff | view | raw | blame | history
Assets/00000/package/Texture/Texmap_006.png.meta 127 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Texture/Texmap_007.png diff | view | raw | blame | history
Assets/00000/package/Texture/Texmap_007.png.meta 127 ●●●●● diff | view | raw | blame | history
Assets/Materials/UI/tileTowerVSMat.mat 2 ●●●●● diff | view | raw | blame | history
Assets/Prefabs/Camera.meta 8 ●●●●● diff | view | raw | blame | history
Assets/Prefabs/Camera/ClearCamera.prefab 76 ●●●●● diff | view | raw | blame | history
Assets/Prefabs/Camera/ClearCamera.prefab.meta 7 ●●●●● diff | view | raw | blame | history
Assets/Resources/UI/Final/FinalPanel.prefab 135 ●●●●● diff | view | raw | blame | history
Assets/Resources/UI/Final/FinalPanelItem.prefab 40 ●●●●● diff | view | raw | blame | history
Assets/Scenes/LoadingScene.unity 79 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/Input/EndlessTowerDefenseKeyboardMouseInput.cs 1 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/UI/EndlessSettlement.cs 4 ●●●●● diff | view | raw | blame | history
Assets/Scripts/UI/FinalPanel/FinalPanel.cs 120 ●●●●● diff | view | raw | blame | history
Assets/Scripts/UI/FinalPanel/FinalPanelItem.cs 12 ●●●●● diff | view | raw | blame | history