From 5990c6e74aea52595a23f484105157903be92570 Mon Sep 17 00:00:00 2001
From: liuzhiwei <liuzhiwei@qq.com>
Date: Mon, 07 Dec 2020 17:23:29 +0800
Subject: [PATCH] 贴图修改 火精灵攻击修改
---
Assets/00000/package/Texture/Object_031.png | 0
Assets/00000/package/Texture/Object_033.png.meta | 2 +-
Assets/00000/package/Texture/Object_033.png | 0
Assets/00000/package/Texture/Object_024_01.png | 0
Assets/00000/package/Texture/Object_024_02.png | 0
Assets/00000/package/Texture/Object_026.png | 0
Assets/00000/package/Texture/Object_027.png | 0
Assets/00000/package/Materials/Glow_046.mat | 2 +-
Assets/00000/package/Prefab/Prefab/Effect_Elf_Huo_Atk.prefab | 4 ++--
Assets/00000/package/Prefab/Prefab/Effect_Elf_Huo_Atk_old.prefab | 2 +-
Assets/00000/package/Materials/Somke_001.mat | 2 +-
Assets/00000/package/Materials/Texmap_015.mat | 11 +++++------
Assets/00000/package/Texture/Object_024.png | 0
Assets/00000/package/Texture/Object_025.png | 0
Assets/00000/package/Texture/Object_035.png | 0
Assets/00000/package/Prefab/Prefab/Effect_UI_DianJi.prefab | 2 +-
16 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/Assets/00000/package/Materials/Glow_046.mat b/Assets/00000/package/Materials/Glow_046.mat
index f6078f0..241166a 100644
--- a/Assets/00000/package/Materials/Glow_046.mat
+++ b/Assets/00000/package/Materials/Glow_046.mat
@@ -7,7 +7,7 @@
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_Name: Glow_028
+ m_Name: Glow_046
m_Shader: {fileID: 203, guid: 0000000000000000f000000000000000, type: 0}
m_ShaderKeywords:
m_LightmapFlags: 4
diff --git a/Assets/00000/package/Materials/Somke_001.mat b/Assets/00000/package/Materials/Somke_001.mat
index 03d7ed7..cd43d83 100644
--- a/Assets/00000/package/Materials/Somke_001.mat
+++ b/Assets/00000/package/Materials/Somke_001.mat
@@ -7,7 +7,7 @@
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_Name: Somke_0022
+ m_Name: Somke_001
m_Shader: {fileID: 203, guid: 0000000000000000f000000000000000, type: 0}
m_ShaderKeywords:
m_LightmapFlags: 4
diff --git a/Assets/00000/package/Materials/Texmap_015.mat b/Assets/00000/package/Materials/Texmap_015.mat
index 37a1371..4680b20 100644
--- a/Assets/00000/package/Materials/Texmap_015.mat
+++ b/Assets/00000/package/Materials/Texmap_015.mat
@@ -8,14 +8,13 @@
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Texmap_015
- m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
+ m_Shader: {fileID: 51, guid: 0000000000000000f000000000000000, type: 0}
m_ShaderKeywords: _ALPHATEST_ON _EMISSION
m_LightmapFlags: 0
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
- m_CustomRenderQueue: 2450
- stringTagMap:
- RenderType: TransparentCutout
+ m_CustomRenderQueue: -1
+ stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
@@ -41,7 +40,7 @@
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
- m_Texture: {fileID: 2800000, guid: a8e87540d4a5c52479d80166e091df37, type: 3}
+ m_Texture: {fileID: 2800000, guid: e2014ab9da50c764d998268020b0ce0a, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
@@ -102,7 +101,7 @@
- _buttomamount: 0.304952
m_Colors:
- _CameraFadeParams: {r: 0, g: Infinity, b: 0, a: 0}
- - _Color: {r: 1, g: 1, b: 1, a: 1}
+ - _Color: {r: 0.7075472, g: 0.7075472, b: 0.7075472, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0}
- _TintColor: {r: 1, g: 1, b: 1, a: 1}
diff --git a/Assets/00000/package/Prefab/Prefab/Effect_Elf_Huo_Atk.prefab b/Assets/00000/package/Prefab/Prefab/Effect_Elf_Huo_Atk.prefab
index 6fa0c42..db724be 100644
--- a/Assets/00000/package/Prefab/Prefab/Effect_Elf_Huo_Atk.prefab
+++ b/Assets/00000/package/Prefab/Prefab/Effect_Elf_Huo_Atk.prefab
@@ -10114,7 +10114,7 @@
startSize:
serializedVersion: 2
minMaxState: 0
- scalar: 5
+ scalar: 7
minScalar: 1
maxCurve:
serializedVersion: 2
@@ -29238,7 +29238,7 @@
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8634977511618669540}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: -0.441, y: 0.16, z: -2.277}
+ m_LocalPosition: {x: -0.63, y: 0.16, z: -3.26}
m_LocalScale: {x: 0.4, y: 0.4, z: 0.4}
m_Children:
- {fileID: 8634977509783586152}
diff --git a/Assets/00000/package/Prefab/Prefab/Effect_Elf_Huo_Atk_old.prefab b/Assets/00000/package/Prefab/Prefab/Effect_Elf_Huo_Atk_old.prefab
index c2c5d61..9c205e6 100644
--- a/Assets/00000/package/Prefab/Prefab/Effect_Elf_Huo_Atk_old.prefab
+++ b/Assets/00000/package/Prefab/Prefab/Effect_Elf_Huo_Atk_old.prefab
@@ -9695,7 +9695,7 @@
- component: {fileID: 8634977509999139403}
- component: {fileID: 8634977509999139400}
m_Layer: 0
- m_Name: Effect_Elf_Huo_Atk
+ m_Name: Effect_Elf_Huo_Atk_old
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
diff --git a/Assets/00000/package/Prefab/Prefab/Effect_UI_DianJi.prefab b/Assets/00000/package/Prefab/Prefab/Effect_UI_DianJi.prefab
index e0a98f7..1e5e4a5 100644
--- a/Assets/00000/package/Prefab/Prefab/Effect_UI_DianJi.prefab
+++ b/Assets/00000/package/Prefab/Prefab/Effect_UI_DianJi.prefab
@@ -38730,7 +38730,7 @@
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- - {fileID: 2100000, guid: 477185c24aaadbf49804b8bcc55f5a50, type: 2}
+ - {fileID: 0}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
diff --git a/Assets/00000/package/Texture/Object_024.png b/Assets/00000/package/Texture/Object_024.png
index 4034487..fae9caf 100644
--- a/Assets/00000/package/Texture/Object_024.png
+++ b/Assets/00000/package/Texture/Object_024.png
Binary files differ
diff --git a/Assets/00000/package/Texture/Object_024_01.png b/Assets/00000/package/Texture/Object_024_01.png
index 505863f..0c4ed88 100644
--- a/Assets/00000/package/Texture/Object_024_01.png
+++ b/Assets/00000/package/Texture/Object_024_01.png
Binary files differ
diff --git a/Assets/00000/package/Texture/Object_024_02.png b/Assets/00000/package/Texture/Object_024_02.png
index fd37394..bbec067 100644
--- a/Assets/00000/package/Texture/Object_024_02.png
+++ b/Assets/00000/package/Texture/Object_024_02.png
Binary files differ
diff --git a/Assets/00000/package/Texture/Object_025.png b/Assets/00000/package/Texture/Object_025.png
index 1a8d313..68bd735 100644
--- a/Assets/00000/package/Texture/Object_025.png
+++ b/Assets/00000/package/Texture/Object_025.png
Binary files differ
diff --git a/Assets/00000/package/Texture/Object_026.png b/Assets/00000/package/Texture/Object_026.png
index 1221d95..a8754b0 100644
--- a/Assets/00000/package/Texture/Object_026.png
+++ b/Assets/00000/package/Texture/Object_026.png
Binary files differ
diff --git a/Assets/00000/package/Texture/Object_027.png b/Assets/00000/package/Texture/Object_027.png
index 5029493..f443d60 100644
--- a/Assets/00000/package/Texture/Object_027.png
+++ b/Assets/00000/package/Texture/Object_027.png
Binary files differ
diff --git a/Assets/00000/package/Texture/Object_031.png b/Assets/00000/package/Texture/Object_031.png
index a6ccecf..ea468b6 100644
--- a/Assets/00000/package/Texture/Object_031.png
+++ b/Assets/00000/package/Texture/Object_031.png
Binary files differ
diff --git a/Assets/00000/package/Texture/Object_033.png b/Assets/00000/package/Texture/Object_033.png
index 7ab930a..df955e2 100644
--- a/Assets/00000/package/Texture/Object_033.png
+++ b/Assets/00000/package/Texture/Object_033.png
Binary files differ
diff --git a/Assets/00000/package/Texture/Object_033.png.meta b/Assets/00000/package/Texture/Object_033.png.meta
index 0d6596b..870d6c8 100644
--- a/Assets/00000/package/Texture/Object_033.png.meta
+++ b/Assets/00000/package/Texture/Object_033.png.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
-guid: 6896468f462645b438c6ac3feaf8e54f
+guid: ea504d77875dbac4c88a324f6cf3d29e
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
diff --git a/Assets/00000/package/Texture/Object_035.png b/Assets/00000/package/Texture/Object_035.png
index 82c3315..20446aa 100644
--- a/Assets/00000/package/Texture/Object_035.png
+++ b/Assets/00000/package/Texture/Object_035.png
Binary files differ
--
Gitblit v1.9.1