From c07ba438a06d56c8139fd89e623e0fb0ec3f6014 Mon Sep 17 00:00:00 2001 From: gaoxin Date: Tue, 4 Jan 2022 14:07:15 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E8=81=8C=E4=B8=9A=E7=AD=9B=E9=80=89?= =?UTF-8?q?=E3=80=91=E9=A2=9C=E8=89=B2=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ManagedResources/~Lua/Common/GlobalDefine.lua | 5 +++++ .../Modules/Formation/View/FightLevelFormation.lua | 14 +++++++------- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index a4c01e0036..756bb391bc 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -1254,6 +1254,11 @@ UIColor = { BTN_TEXT = Color.New(50/255, 50/255, 50/255, 1), PERPLE = Color.New(155/255, 20/255, 255/255, 1), BLUE = Color.New(20/255, 128/255, 255/255, 1), + + PURE_RED = Color.New(1, 0, 0, 1), + PURE_GREEN = Color.New(0, 1, 0, 1), + PURE_BLUE = Color.New(0, 0, 1, 1), + PURE_YELLOW = Color.New(1, 1, 0, 1), } UIColorStr = { RED = "#e25b58", diff --git a/Assets/ManagedResources/~Lua/Modules/Formation/View/FightLevelFormation.lua b/Assets/ManagedResources/~Lua/Modules/Formation/View/FightLevelFormation.lua index 3ee0b7f123..71ce89060a 100644 --- a/Assets/ManagedResources/~Lua/Modules/Formation/View/FightLevelFormation.lua +++ b/Assets/ManagedResources/~Lua/Modules/Formation/View/FightLevelFormation.lua @@ -162,13 +162,13 @@ end local _showConfig = { - [1] = {text="眩晕", color=UIColor.YELLOW}, - [2] = {text="沉默", color=UIColor.BLUE}, - [3] = {text="麻痹", color=UIColor.GRAY}, - [4] = {text="灼烧", color=UIColor.RED}, - [5] = {text="中毒", color=UIColor.PERPLE}, - [6] = {text="追击", color=UIColor.WRITE}, - [7] = {text="恢复", color=UIColor.GREEN}, + [1] = {text="眩晕", color=UIColor.PURE_RED}, + [2] = {text="沉默", color=UIColor.PURE_RED}, + [3] = {text="麻痹", color=UIColor.PURE_RED}, + [4] = {text="灼烧", color=UIColor.PURE_GREEN}, + [5] = {text="中毒", color=UIColor.PURE_GREEN}, + [6] = {text="追击", color=UIColor.PURE_YELLOW}, + [7] = {text="恢复", color=UIColor.PURE_YELLOW}, } local function loopFadeText(txt, highlight, data, index) Log("loopFadeText")