From 6f8ed2e37f8762fb3501a671d0dca40bcd68edae Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期日, 21 十月 2018 10:26:29 +0800
Subject: [PATCH] Merge branch 'master' into leonard
---
Assets/Resources/ScriptableObject/Config/FunctionButton_OpenServerActivity2.asset | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/Assets/Resources/ScriptableObject/Config/FunctionButton_OpenServerActivity2.asset b/Assets/Resources/ScriptableObject/Config/FunctionButton_OpenServerActivity2.asset
index cd75d02..02e01ec 100644
--- a/Assets/Resources/ScriptableObject/Config/FunctionButton_OpenServerActivity2.asset
+++ b/Assets/Resources/ScriptableObject/Config/FunctionButton_OpenServerActivity2.asset
@@ -17,7 +17,7 @@
fontSize: 22
selected:
iconKey: XT_KF_5
- 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
locked:
iconKey: SecondBtnUnSelect
--
Gitblit v1.8.0