From fd1ac06475bf155996ac4aed6307eb43f9e04f53 Mon Sep 17 00:00:00 2001
From: wangguan <wangguan@kt007.com>
Date: Wed, 11 Nov 2020 14:38:13 +0800
Subject: [PATCH] 替换技能宝石特效位置
---
Assets/Data/Agents/waterMonster.asset | 2
Assets/Materials/PVPTD/MonsterMat/NewMat/Water/matDie_Oppo.mat | 6 +-
Assets/Scripts/TowerDefense/Towers/Placement/TowerPlacementGridEndless.cs | 3 +
Assets/Materials/PVPTD/MonsterMat/NewMat/Water/matMove_Oppo.mat | 8 ++--
Assets/Scenes/Levels/Battle/Endless.unity | 15 +++++--
Assets/Materials/PVPTD/MonsterMat/NewMat/Water/matDie_Self.mat | 6 +-
Assets/Materials/PVPTD/MonsterMat/NewMat/Water/matAttack_Oppo.mat | 6 +-
Assets/Materials/PVPTD/MonsterMat/NewMat/Water/matGetHit_Self.mat | 10 ++--
Assets/Materials/PVPTD/MonsterMat/NewMat/Water/matGetHit_Oppo.mat | 10 ++--
Assets/Materials/PVPTD/MonsterMat/NewMat/Water/matAttack_Self.mat | 6 +-
Assets/Materials/PVPTD/MonsterMat/NewMat/Water/matMove_Self.mat | 8 ++--
11 files changed, 43 insertions(+), 37 deletions(-)
diff --git a/Assets/Data/Agents/waterMonster.asset b/Assets/Data/Agents/waterMonster.asset
index 48a63d5..b9faabf 100644
--- a/Assets/Data/Agents/waterMonster.asset
+++ b/Assets/Data/Agents/waterMonster.asset
@@ -14,6 +14,6 @@
m_EditorClassIdentifier:
agentName: waterMonster
agentDescription:
- agentPrefab: {fileID: 8434816861478773454, guid: 2228e345d1dba294885d24aedbc63159,
+ agentPrefab: {fileID: 8434816861478773454, guid: 80adb71ca2b43ec41a298696a212cdcb,
type: 3}
healthScale: 1
diff --git a/Assets/Materials/PVPTD/MonsterMat/NewMat/Water/matAttack_Oppo.mat b/Assets/Materials/PVPTD/MonsterMat/NewMat/Water/matAttack_Oppo.mat
index 3d8237e..dab2f4a 100644
--- a/Assets/Materials/PVPTD/MonsterMat/NewMat/Water/matAttack_Oppo.mat
+++ b/Assets/Materials/PVPTD/MonsterMat/NewMat/Water/matAttack_Oppo.mat
@@ -7,7 +7,7 @@
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_Name: matAttack_Oppo 1
+ m_Name: matAttack_Oppo
m_Shader: {fileID: 4800000, guid: c00c30c0ead4b7541b8bd8219a17fcc0, type: 3}
m_ShaderKeywords:
m_LightmapFlags: 4
@@ -40,7 +40,7 @@
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
- m_Texture: {fileID: 2800000, guid: 4a573e3f9668b0845b3221b740bee3f7, type: 3}
+ m_Texture: {fileID: 2800000, guid: b10013eb9765f174c82300c713ea497b, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
@@ -71,7 +71,7 @@
- _Parallax: 0.02
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- - _Speed: 10
+ - _Speed: 8
- _SrcBlend: 1
- _UVSec: 0
- _VerticalAmount: 2
diff --git a/Assets/Materials/PVPTD/MonsterMat/NewMat/Water/matAttack_Self.mat b/Assets/Materials/PVPTD/MonsterMat/NewMat/Water/matAttack_Self.mat
index 23e7f20..b92c394 100644
--- a/Assets/Materials/PVPTD/MonsterMat/NewMat/Water/matAttack_Self.mat
+++ b/Assets/Materials/PVPTD/MonsterMat/NewMat/Water/matAttack_Self.mat
@@ -7,7 +7,7 @@
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_Name: matAttack_Self 1
+ m_Name: matAttack_Self
m_Shader: {fileID: 4800000, guid: c00c30c0ead4b7541b8bd8219a17fcc0, type: 3}
m_ShaderKeywords:
m_LightmapFlags: 4
@@ -40,7 +40,7 @@
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
- m_Texture: {fileID: 2800000, guid: 58bfe1d7b0c69f04094faa8350ee3fa1, type: 3}
+ m_Texture: {fileID: 2800000, guid: 6c1c1bab4d6ac8b48b3eb052e89df3d0, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
@@ -71,7 +71,7 @@
- _Parallax: 0.02
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- - _Speed: 10
+ - _Speed: 8
- _SrcBlend: 1
- _UVSec: 0
- _VerticalAmount: 2
diff --git a/Assets/Materials/PVPTD/MonsterMat/NewMat/Water/matDie_Oppo.mat b/Assets/Materials/PVPTD/MonsterMat/NewMat/Water/matDie_Oppo.mat
index f0364b5..b78a6ae 100644
--- a/Assets/Materials/PVPTD/MonsterMat/NewMat/Water/matDie_Oppo.mat
+++ b/Assets/Materials/PVPTD/MonsterMat/NewMat/Water/matDie_Oppo.mat
@@ -7,7 +7,7 @@
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_Name: matDie_Oppo 1
+ m_Name: matDie_Oppo
m_Shader: {fileID: 4800000, guid: c00c30c0ead4b7541b8bd8219a17fcc0, type: 3}
m_ShaderKeywords:
m_LightmapFlags: 4
@@ -40,7 +40,7 @@
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
- m_Texture: {fileID: 2800000, guid: 93ae3f9688001cc49966720703d2d26d, type: 3}
+ m_Texture: {fileID: 2800000, guid: bf27e3fac01b35b45b07d49724476fb3, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
@@ -71,7 +71,7 @@
- _Parallax: 0.02
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- - _Speed: 10
+ - _Speed: 8
- _SrcBlend: 1
- _UVSec: 0
- _VerticalAmount: 2
diff --git a/Assets/Materials/PVPTD/MonsterMat/NewMat/Water/matDie_Self.mat b/Assets/Materials/PVPTD/MonsterMat/NewMat/Water/matDie_Self.mat
index ee6eb5c..dae52bc 100644
--- a/Assets/Materials/PVPTD/MonsterMat/NewMat/Water/matDie_Self.mat
+++ b/Assets/Materials/PVPTD/MonsterMat/NewMat/Water/matDie_Self.mat
@@ -7,7 +7,7 @@
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_Name: matDie_Self 1
+ m_Name: matDie_Self
m_Shader: {fileID: 4800000, guid: c00c30c0ead4b7541b8bd8219a17fcc0, type: 3}
m_ShaderKeywords:
m_LightmapFlags: 4
@@ -40,7 +40,7 @@
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
- m_Texture: {fileID: 2800000, guid: 53651a09085e09247a5587372b0e3e49, type: 3}
+ m_Texture: {fileID: 2800000, guid: 992f7a780520dbf418767b85db66a148, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
@@ -71,7 +71,7 @@
- _Parallax: 0.02
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- - _Speed: 10
+ - _Speed: 8
- _SrcBlend: 1
- _UVSec: 0
- _VerticalAmount: 2
diff --git a/Assets/Materials/PVPTD/MonsterMat/NewMat/Water/matGetHit_Oppo.mat b/Assets/Materials/PVPTD/MonsterMat/NewMat/Water/matGetHit_Oppo.mat
index b63ded6..8bf9cf9 100644
--- a/Assets/Materials/PVPTD/MonsterMat/NewMat/Water/matGetHit_Oppo.mat
+++ b/Assets/Materials/PVPTD/MonsterMat/NewMat/Water/matGetHit_Oppo.mat
@@ -7,7 +7,7 @@
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_Name: matGetHit_Oppo 1
+ m_Name: matGetHit_Oppo
m_Shader: {fileID: 4800000, guid: c00c30c0ead4b7541b8bd8219a17fcc0, type: 3}
m_ShaderKeywords:
m_LightmapFlags: 4
@@ -40,7 +40,7 @@
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
- m_Texture: {fileID: 2800000, guid: 2ab645dd909e50b47a3e2f48dfa7bded, type: 3}
+ m_Texture: {fileID: 2800000, guid: 47102da6d0a37424696db58cb7019995, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
@@ -64,17 +64,17 @@
- _GlossMapScale: 1
- _Glossiness: 0.5
- _GlossyReflections: 1
- - _HorizontalAmount: 4
+ - _HorizontalAmount: 3
- _Metallic: 0
- _Mode: 0
- _OcclusionStrength: 1
- _Parallax: 0.02
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- - _Speed: 10
+ - _Speed: 6
- _SrcBlend: 1
- _UVSec: 0
- - _VerticalAmount: 1
+ - _VerticalAmount: 2
- _ZWrite: 1
m_Colors:
- _Color: {r: 1, g: 1, b: 1, a: 1}
diff --git a/Assets/Materials/PVPTD/MonsterMat/NewMat/Water/matGetHit_Self.mat b/Assets/Materials/PVPTD/MonsterMat/NewMat/Water/matGetHit_Self.mat
index a71c73e..6cbdacd 100644
--- a/Assets/Materials/PVPTD/MonsterMat/NewMat/Water/matGetHit_Self.mat
+++ b/Assets/Materials/PVPTD/MonsterMat/NewMat/Water/matGetHit_Self.mat
@@ -7,7 +7,7 @@
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_Name: matGetHit_Self 1
+ m_Name: matGetHit_Self
m_Shader: {fileID: 4800000, guid: c00c30c0ead4b7541b8bd8219a17fcc0, type: 3}
m_ShaderKeywords:
m_LightmapFlags: 4
@@ -40,7 +40,7 @@
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
- m_Texture: {fileID: 2800000, guid: f983f62a7c3f60a4590f6b658388ae5f, type: 3}
+ m_Texture: {fileID: 2800000, guid: 7767fa0af1713e74db9499875dd054c5, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
@@ -64,17 +64,17 @@
- _GlossMapScale: 1
- _Glossiness: 0.5
- _GlossyReflections: 1
- - _HorizontalAmount: 4
+ - _HorizontalAmount: 3
- _Metallic: 0
- _Mode: 0
- _OcclusionStrength: 1
- _Parallax: 0.02
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- - _Speed: 10
+ - _Speed: 6
- _SrcBlend: 1
- _UVSec: 0
- - _VerticalAmount: 1
+ - _VerticalAmount: 2
- _ZWrite: 1
m_Colors:
- _Color: {r: 1, g: 1, b: 1, a: 1}
diff --git a/Assets/Materials/PVPTD/MonsterMat/NewMat/Water/matMove_Oppo.mat b/Assets/Materials/PVPTD/MonsterMat/NewMat/Water/matMove_Oppo.mat
index b3d634e..a6616b2 100644
--- a/Assets/Materials/PVPTD/MonsterMat/NewMat/Water/matMove_Oppo.mat
+++ b/Assets/Materials/PVPTD/MonsterMat/NewMat/Water/matMove_Oppo.mat
@@ -7,7 +7,7 @@
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_Name: matMove_Oppo 1
+ m_Name: matMove_Oppo
m_Shader: {fileID: 4800000, guid: c00c30c0ead4b7541b8bd8219a17fcc0, type: 3}
m_ShaderKeywords:
m_LightmapFlags: 4
@@ -40,7 +40,7 @@
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
- m_Texture: {fileID: 2800000, guid: 83f5bb553d4fee94ebf866ab0ab424a4, type: 3}
+ m_Texture: {fileID: 2800000, guid: b9f287bf75f004144b0e9e2f046b4f98, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
@@ -64,14 +64,14 @@
- _GlossMapScale: 1
- _Glossiness: 0.5
- _GlossyReflections: 1
- - _HorizontalAmount: 3
+ - _HorizontalAmount: 4
- _Metallic: 0
- _Mode: 0
- _OcclusionStrength: 1
- _Parallax: 0.02
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- - _Speed: 10
+ - _Speed: 8
- _SrcBlend: 1
- _UVSec: 0
- _VerticalAmount: 2
diff --git a/Assets/Materials/PVPTD/MonsterMat/NewMat/Water/matMove_Self.mat b/Assets/Materials/PVPTD/MonsterMat/NewMat/Water/matMove_Self.mat
index 0cf037e..dab4a46 100644
--- a/Assets/Materials/PVPTD/MonsterMat/NewMat/Water/matMove_Self.mat
+++ b/Assets/Materials/PVPTD/MonsterMat/NewMat/Water/matMove_Self.mat
@@ -7,7 +7,7 @@
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_Name: matMove_Self 1
+ m_Name: matMove_Self
m_Shader: {fileID: 4800000, guid: c00c30c0ead4b7541b8bd8219a17fcc0, type: 3}
m_ShaderKeywords:
m_LightmapFlags: 4
@@ -40,7 +40,7 @@
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
- m_Texture: {fileID: 2800000, guid: a3f357e847c8669428c9391121ab6e33, type: 3}
+ m_Texture: {fileID: 2800000, guid: 7d0d0e0884d7579459f7c855da605bc1, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
@@ -64,14 +64,14 @@
- _GlossMapScale: 1
- _Glossiness: 0.5
- _GlossyReflections: 1
- - _HorizontalAmount: 3
+ - _HorizontalAmount: 4
- _Metallic: 0
- _Mode: 0
- _OcclusionStrength: 1
- _Parallax: 0.02
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- - _Speed: 10
+ - _Speed: 8
- _SrcBlend: 1
- _UVSec: 0
- _VerticalAmount: 2
diff --git a/Assets/Scenes/Levels/Battle/Endless.unity b/Assets/Scenes/Levels/Battle/Endless.unity
index d03225b..be894e6 100644
--- a/Assets/Scenes/Levels/Battle/Endless.unity
+++ b/Assets/Scenes/Levels/Battle/Endless.unity
@@ -1255,6 +1255,7 @@
m_Name:
m_EditorClassIdentifier:
waveLineId: 4
+ myPS: {fileID: 0}
--- !u!65 &167919694
BoxCollider:
m_ObjectHideFlags: 0
@@ -2803,6 +2804,7 @@
m_Name:
m_EditorClassIdentifier:
waveLineId: 0
+ myPS: {fileID: 0}
--- !u!65 &495435996
BoxCollider:
m_ObjectHideFlags: 0
@@ -3647,7 +3649,7 @@
- target: {fileID: 6294722403196809820, guid: 3b5552a18f3f1d342a697c60f35c66b5,
type: 3}
propertyPath: m_LocalPosition.z
- value: -4.72
+ value: -2.19
objectReference: {fileID: 0}
- target: {fileID: 6294722403196809820, guid: 3b5552a18f3f1d342a697c60f35c66b5,
type: 3}
@@ -3890,6 +3892,7 @@
m_Name:
m_EditorClassIdentifier:
waveLineId: 3
+ myPS: {fileID: 0}
--- !u!65 &618377765
BoxCollider:
m_ObjectHideFlags: 0
@@ -4563,7 +4566,7 @@
- target: {fileID: 6294722403196809820, guid: 3b5552a18f3f1d342a697c60f35c66b5,
type: 3}
propertyPath: m_LocalPosition.z
- value: -4.72
+ value: -2.19
objectReference: {fileID: 0}
- target: {fileID: 6294722403196809820, guid: 3b5552a18f3f1d342a697c60f35c66b5,
type: 3}
@@ -6600,7 +6603,7 @@
- target: {fileID: 6294722403196809820, guid: 3b5552a18f3f1d342a697c60f35c66b5,
type: 3}
propertyPath: m_LocalPosition.z
- value: -4.72
+ value: -2.19
objectReference: {fileID: 0}
- target: {fileID: 6294722403196809820, guid: 3b5552a18f3f1d342a697c60f35c66b5,
type: 3}
@@ -7881,6 +7884,7 @@
m_Name:
m_EditorClassIdentifier:
waveLineId: 1
+ myPS: {fileID: 0}
--- !u!65 &1172845529
BoxCollider:
m_ObjectHideFlags: 0
@@ -9561,7 +9565,7 @@
- target: {fileID: 6294722403196809820, guid: 3b5552a18f3f1d342a697c60f35c66b5,
type: 3}
propertyPath: m_LocalPosition.z
- value: -4.72
+ value: -2.19
objectReference: {fileID: 0}
- target: {fileID: 6294722403196809820, guid: 3b5552a18f3f1d342a697c60f35c66b5,
type: 3}
@@ -10769,7 +10773,7 @@
- target: {fileID: 6294722403196809820, guid: 3b5552a18f3f1d342a697c60f35c66b5,
type: 3}
propertyPath: m_LocalPosition.z
- value: -4.72
+ value: -2.19
objectReference: {fileID: 0}
- target: {fileID: 6294722403196809820, guid: 3b5552a18f3f1d342a697c60f35c66b5,
type: 3}
@@ -14250,6 +14254,7 @@
m_Name:
m_EditorClassIdentifier:
waveLineId: 2
+ myPS: {fileID: 0}
--- !u!65 &1977355537
BoxCollider:
m_ObjectHideFlags: 0
diff --git a/Assets/Scripts/TowerDefense/Towers/Placement/TowerPlacementGridEndless.cs b/Assets/Scripts/TowerDefense/Towers/Placement/TowerPlacementGridEndless.cs
index 6497aad..5d9a3bf 100644
--- a/Assets/Scripts/TowerDefense/Towers/Placement/TowerPlacementGridEndless.cs
+++ b/Assets/Scripts/TowerDefense/Towers/Placement/TowerPlacementGridEndless.cs
@@ -851,7 +851,8 @@
{
PlacementTile tileToUse;
#if UNITY_STANDALONE
- tileToUse = placementTilePrefab;
+ //tileToUse = placementTilePrefab;
+ tileToUse = placementTilePrefabMobile;
#else
tileToUse = placementTilePrefabMobile;
#endif
--
Gitblit v1.9.1