From 701b03923f7c5d124b69dbcf2cddd5ab6a5bbd16 Mon Sep 17 00:00:00 2001
From: liuzhiwei <liuzhiwei@qq.com>
Date: Tue, 08 Dec 2020 10:13:32 +0800
Subject: [PATCH] 贴图材质替换
---
Assets/00000/package/Texture/Object_007.png | 0
Assets/00000/package/Texture/Object_006.png | 0
Assets/00000/package/Texture/Object_023.png | 0
Assets/00000/package/Materials/Object_033.mat | 2 +-
Assets/00000/package/Texture/Object_022.png | 0
Assets/00000/package/Prefab/Prefab/Effect_Elf_Mu_DengChang.prefab | 2 +-
Assets/00000/package/Texture/Object_008.png | 0
Assets/00000/package/Texture/Object_021.png | 0
Assets/00000/package/Prefab/Prefab/Effect_Elf_Huo_DengChang.prefab | 4 ++--
Assets/00000/package/Texture/Object_017.png | 0
Assets/00000/package/Materials/Object_018.mat | 2 +-
Assets/00000/package/Texture/Object_040.png | 0
Assets/00000/package/Prefab/Prefab/Effect_UI_KaPai_Huo.prefab | 14 +++++++-------
13 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/Assets/00000/package/Materials/Object_018.mat b/Assets/00000/package/Materials/Object_018.mat
index e2a3615..fe3fb01 100644
--- a/Assets/00000/package/Materials/Object_018.mat
+++ b/Assets/00000/package/Materials/Object_018.mat
@@ -20,7 +20,7 @@
serializedVersion: 3
m_TexEnvs:
- _MainTex:
- m_Texture: {fileID: 2800000, guid: dec169bca4f214d4ca6991dcb03a361d, type: 3}
+ m_Texture: {fileID: 2800000, guid: e0693b3a367501341a817d9754ed5ba3, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
diff --git a/Assets/00000/package/Materials/Object_033.mat b/Assets/00000/package/Materials/Object_033.mat
index 2d73b2f..a7194bc 100644
--- a/Assets/00000/package/Materials/Object_033.mat
+++ b/Assets/00000/package/Materials/Object_033.mat
@@ -20,7 +20,7 @@
serializedVersion: 3
m_TexEnvs:
- _MainTex:
- m_Texture: {fileID: 2800000, guid: 6896468f462645b438c6ac3feaf8e54f, type: 3}
+ m_Texture: {fileID: 2800000, guid: ea504d77875dbac4c88a324f6cf3d29e, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
diff --git a/Assets/00000/package/Prefab/Prefab/Effect_Elf_Huo_DengChang.prefab b/Assets/00000/package/Prefab/Prefab/Effect_Elf_Huo_DengChang.prefab
index 2e4fec2..994d5c3 100644
--- a/Assets/00000/package/Prefab/Prefab/Effect_Elf_Huo_DengChang.prefab
+++ b/Assets/00000/package/Prefab/Prefab/Effect_Elf_Huo_DengChang.prefab
@@ -4880,7 +4880,7 @@
m_Component:
- component: {fileID: 2096928484640207552}
m_Layer: 0
- m_Name: Effect_HuoJingLingDengChang
+ m_Name: Effect_Elf_Huo_DengChang
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@@ -14667,7 +14667,7 @@
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3700923938519127198}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: 8.9, y: 12.45, z: -22.1}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 8774971187302451673}
diff --git a/Assets/00000/package/Prefab/Prefab/Effect_Elf_Mu_DengChang.prefab b/Assets/00000/package/Prefab/Prefab/Effect_Elf_Mu_DengChang.prefab
index cc4dc10..4dd5980 100644
--- a/Assets/00000/package/Prefab/Prefab/Effect_Elf_Mu_DengChang.prefab
+++ b/Assets/00000/package/Prefab/Prefab/Effect_Elf_Mu_DengChang.prefab
@@ -9766,7 +9766,7 @@
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5837386670462447680}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: 53.1, y: 0, z: 0}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 5837386671528237174}
diff --git a/Assets/00000/package/Prefab/Prefab/Effect_UI_KaPai_Huo.prefab b/Assets/00000/package/Prefab/Prefab/Effect_UI_KaPai_Huo.prefab
index 611a2ea..dc34194 100644
--- a/Assets/00000/package/Prefab/Prefab/Effect_UI_KaPai_Huo.prefab
+++ b/Assets/00000/package/Prefab/Prefab/Effect_UI_KaPai_Huo.prefab
@@ -4852,7 +4852,7 @@
m_CameraVelocityScale: 0
m_VelocityScale: 0
m_LengthScale: 10
- m_SortingFudge: 2
+ m_SortingFudge: 0
m_NormalDirection: 1
m_ShadowBias: 0
m_RenderAlignment: 0
@@ -9642,7 +9642,7 @@
m_CameraVelocityScale: 0
m_VelocityScale: 0
m_LengthScale: 1
- m_SortingFudge: 1
+ m_SortingFudge: -1
m_NormalDirection: 1
m_ShadowBias: 0
m_RenderAlignment: 0
@@ -14548,7 +14548,7 @@
m_CameraVelocityScale: 0
m_VelocityScale: 0
m_LengthScale: 2
- m_SortingFudge: 0
+ m_SortingFudge: -2
m_NormalDirection: 1
m_ShadowBias: 0
m_RenderAlignment: 0
@@ -19328,7 +19328,7 @@
m_CameraVelocityScale: 0
m_VelocityScale: 0
m_LengthScale: 2
- m_SortingFudge: 1
+ m_SortingFudge: -1
m_NormalDirection: 1
m_ShadowBias: 0
m_RenderAlignment: 0
@@ -24198,7 +24198,7 @@
m_CameraVelocityScale: 0
m_VelocityScale: 0
m_LengthScale: 2
- m_SortingFudge: 0
+ m_SortingFudge: -2
m_NormalDirection: 1
m_ShadowBias: 0
m_RenderAlignment: 2
@@ -29068,7 +29068,7 @@
m_CameraVelocityScale: 0
m_VelocityScale: 0
m_LengthScale: 2
- m_SortingFudge: 0
+ m_SortingFudge: -2
m_NormalDirection: 1
m_ShadowBias: 0
m_RenderAlignment: 0
@@ -34010,7 +34010,7 @@
m_CameraVelocityScale: 0
m_VelocityScale: 0
m_LengthScale: 2
- m_SortingFudge: 0
+ m_SortingFudge: -2
m_NormalDirection: 1
m_ShadowBias: 0
m_RenderAlignment: 0
diff --git a/Assets/00000/package/Texture/Object_006.png b/Assets/00000/package/Texture/Object_006.png
index 45ea975..d3481b3 100644
--- a/Assets/00000/package/Texture/Object_006.png
+++ b/Assets/00000/package/Texture/Object_006.png
Binary files differ
diff --git a/Assets/00000/package/Texture/Object_007.png b/Assets/00000/package/Texture/Object_007.png
index a92c8cf..eb0d5bb 100644
--- a/Assets/00000/package/Texture/Object_007.png
+++ b/Assets/00000/package/Texture/Object_007.png
Binary files differ
diff --git a/Assets/00000/package/Texture/Object_008.png b/Assets/00000/package/Texture/Object_008.png
index 25fd492..c7e0802 100644
--- a/Assets/00000/package/Texture/Object_008.png
+++ b/Assets/00000/package/Texture/Object_008.png
Binary files differ
diff --git a/Assets/00000/package/Texture/Object_017.png b/Assets/00000/package/Texture/Object_017.png
index 845885d..0630dfc 100644
--- a/Assets/00000/package/Texture/Object_017.png
+++ b/Assets/00000/package/Texture/Object_017.png
Binary files differ
diff --git a/Assets/00000/package/Texture/Object_021.png b/Assets/00000/package/Texture/Object_021.png
index 334917a..d0ecfa3 100644
--- a/Assets/00000/package/Texture/Object_021.png
+++ b/Assets/00000/package/Texture/Object_021.png
Binary files differ
diff --git a/Assets/00000/package/Texture/Object_022.png b/Assets/00000/package/Texture/Object_022.png
index 4854216..d9863ec 100644
--- a/Assets/00000/package/Texture/Object_022.png
+++ b/Assets/00000/package/Texture/Object_022.png
Binary files differ
diff --git a/Assets/00000/package/Texture/Object_023.png b/Assets/00000/package/Texture/Object_023.png
index 89979a8..6f99fe2 100644
--- a/Assets/00000/package/Texture/Object_023.png
+++ b/Assets/00000/package/Texture/Object_023.png
Binary files differ
diff --git a/Assets/00000/package/Texture/Object_040.png b/Assets/00000/package/Texture/Object_040.png
index f17ae4f..ba3e467 100644
--- a/Assets/00000/package/Texture/Object_040.png
+++ b/Assets/00000/package/Texture/Object_040.png
Binary files differ
--
Gitblit v1.9.1