From a740deaa6c30edf8a281ee68d3ed3cc146af079a Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期一, 20 八月 2018 20:12:03 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_client

---
 Assets/Resources/ScriptableObject/Config/FunctionButton_OpenServerActivity2.asset |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Assets/Resources/ScriptableObject/Config/FunctionButton_OpenServerActivity2.asset b/Assets/Resources/ScriptableObject/Config/FunctionButton_OpenServerActivity2.asset
index 43894a5..cd75d02 100644
--- a/Assets/Resources/ScriptableObject/Config/FunctionButton_OpenServerActivity2.asset
+++ b/Assets/Resources/ScriptableObject/Config/FunctionButton_OpenServerActivity2.asset
@@ -13,11 +13,11 @@
   m_EditorClassIdentifier: 
   normal:
     iconKey: XT_KF_4
-    fontColor: {r: 1, g: 0.95686275, b: 0.8039216, a: 1}
+    fontColor: {r: 0.2509804, g: 0.10980392, b: 0.023529412, a: 1}
     fontSize: 22
   selected:
     iconKey: XT_KF_5
-    fontColor: {r: 0.2509804, g: 0.10980392, b: 0.023529412, a: 1}
+    fontColor: {r: 1, g: 0.95686275, b: 0.8039216, a: 1}
     fontSize: 22
   locked:
     iconKey: SecondBtnUnSelect

--
Gitblit v1.8.0