From 5a0fb03ebfb17ebf0fa55c5bd4c81926377f063c Mon Sep 17 00:00:00 2001
From: wangguan <wangguan@kt007.com>
Date: Fri, 04 Dec 2020 19:45:44 +0800
Subject: [PATCH] Merge branch 'master' of http://172.16.1.52:8090/r/GemBattle
---
Assets/Resources/Prefabs/DropGold.prefab | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/Assets/Resources/Prefabs/DropGold.prefab b/Assets/Resources/Prefabs/DropGold.prefab
index eee34ff..f89396f 100644
--- a/Assets/Resources/Prefabs/DropGold.prefab
+++ b/Assets/Resources/Prefabs/DropGold.prefab
@@ -235,16 +235,16 @@
m_Calls: []
m_text: +3
m_isRightToLeft: 0
- m_fontAsset: {fileID: 11400000, guid: ab6cb5a1e931e504db18d921fb310d27, type: 2}
- m_sharedMaterial: {fileID: -3548855653558765056, guid: ab6cb5a1e931e504db18d921fb310d27,
+ m_fontAsset: {fileID: 11400000, guid: 572adb1c73f88e441a1bf998ca9f4ea5, type: 2}
+ m_sharedMaterial: {fileID: -3548855653558765056, guid: 572adb1c73f88e441a1bf998ca9f4ea5,
type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []
m_fontColor32:
serializedVersion: 2
- rgba: 4279034111
- m_fontColor: {r: 1, g: 0.8784314, b: 0.047058824, a: 1}
+ rgba: 4294967295
+ m_fontColor: {r: 1, g: 1, b: 1, a: 1}
m_enableVertexGradient: 0
m_colorMode: 3
m_fontColorGradient:
--
Gitblit v1.9.1