From c5acee6ee51a8007a717c39d498dee4fc2092f6c Mon Sep 17 00:00:00 2001
From: wangguan <wangguan@kt007.com>
Date: Sat, 31 Oct 2020 18:08:59 +0800
Subject: [PATCH] Merge branch 'master' of ssh://172.16.1.52:8091/GemBattle
---
Assets/00000/package/Prefab/Effect_HuoJingLing_Atk.prefab | 2 +-
Assets/00000/package/Materials/Texmap_003.mat | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Assets/00000/package/Materials/Texmap_003.mat b/Assets/00000/package/Materials/Texmap_003.mat
index 480104f..2624077 100644
--- a/Assets/00000/package/Materials/Texmap_003.mat
+++ b/Assets/00000/package/Materials/Texmap_003.mat
@@ -41,5 +41,5 @@
m_Colors:
- _Color: {r: 0.1509434, g: 0.056959774, b: 0, a: 1}
- _ColorMain: {r: 0.6320754, g: 0.6320754, b: 0.6320754, a: 1}
- - _TintColor: {r: 0.16037738, g: 0, b: 0, a: 1}
+ - _TintColor: {r: 0.41509432, g: 0.17426129, b: 0.17426129, a: 1}
m_BuildTextureStacks: []
diff --git a/Assets/00000/package/Prefab/Effect_HuoJingLing_Atk.prefab b/Assets/00000/package/Prefab/Effect_HuoJingLing_Atk.prefab
index c0706ed..721dad2 100644
--- a/Assets/00000/package/Prefab/Effect_HuoJingLing_Atk.prefab
+++ b/Assets/00000/package/Prefab/Effect_HuoJingLing_Atk.prefab
@@ -14560,7 +14560,7 @@
ringBufferMode: 0
ringBufferLoopRange: {x: 0, y: 1}
looping: 1
- prewarm: 0
+ prewarm: 1
playOnAwake: 1
useUnscaledTime: 0
autoRandomSeed: 0
--
Gitblit v1.9.1