From c4bd9d8c587bd1401f0fb2f60c34a4964d7afe20 Mon Sep 17 00:00:00 2001
From: asmrobot <asmrobot@hotmail.com>
Date: Sun, 27 Oct 2019 16:02:50 +0000
Subject: [PATCH] o
---
src/RichCreator.Utility/CV/SkillCVHelper.cs | 19 +++++++++++++------
1 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/src/RichCreator.Utility/CV/SkillCVHelper.cs b/src/RichCreator.Utility/CV/SkillCVHelper.cs
index ae83974..3cbedac 100644
--- a/src/RichCreator.Utility/CV/SkillCVHelper.cs
+++ b/src/RichCreator.Utility/CV/SkillCVHelper.cs
@@ -114,7 +114,11 @@
return true;
}
- private static ColorArray notificationText = ColorArray.FromHsvFloatString(0.002f, 0.002f, 0.002f, "661,316,255,255,255$658,306,255,255,255$658,308,255,255,255$657,309,255,255,255$657,310,255,255,255$660,311,255,255,255$660,310,255,255,255$659,313,255,255,255$659,312,255,255,255$656,316,255,255,255$657,316,255,255,255$658,316,255,255,255$659,316,255,255,255$660,316,255,255,255$664,316,255,255,255$668,316,255,255,255$668,317,255,255,255$668,313,255,255,255$676,313,255,255,255$676,317,255,255,255$676,311,255,255,255$672,311,255,255,255$668,311,255,255,255$668,309,255,255,255$669,308,255,255,255$672,306,255,255,255$672,308,255,255,255$672,310,255,255,255$673,308,255,255,255$675,308,255,255,255$676,308,255,255,255");
+ /// <summary>
+ /// 公告文字
+ /// </summary>
+ private static ColorArray notificationGrayText = ColorArray.FromHsvFloatString(0.002f, 0.002f, 0.002f, "645,296,170,170,170$630,291,0,0,0$631,291,170,170,170$632,291,0,0,0$634,291,0,0,0$635,291,170,170,170$636,291,0,0,0$641,291,0,0,0$644,291,0,0,0$645,291,170,170,170$646,291,0,0,0$651,296,0,0,0$650,296,170,170,170$640,296,170,170,170$639,296,0,0,0$638,296,0,0,0$637,296,170,170,170$636,296,0,0,0$634,296,0,0,0$633,296,170,170,170$632,296,0,0,0$630,296,0,0,0$629,296,170,170,170$628,296,0,0,0$628,301,0,0,0$629,301,170,170,170$633,301,170,170,170$637,301,170,170,170$638,301,0,0,0$640,301,0,0,0$641,301,170,170,170$646,301,170,170,170$648,301,170,170,170$649,301,170,170,170$650,301,0,0,0$645,301,170,170,170$645,300,0,0,0$645,299,0,0,0$645,298,170,170,170$645,297,0,0,0$645,296,170,170,170$645,293,170,170,170$645,291,170,170,170$645,290,0,0,0$633,294,0,0,0$633,295,170,170,170$633,296,170,170,170$633,297,0,0,0$633,300,0,0,0$633,302,0,0,0$633,301,170,170,170");
+ private static ColorArray notificationWhiteText = ColorArray.FromHsvFloatString(0.002f, 0.002f, 0.002f, "645,296,255,255,255$630,291,0,0,0$631,291,255,255,255$632,291,0,0,0$634,291,0,0,0$635,291,255,255,255$636,291,0,0,0$641,291,0,0,0$644,291,0,0,0$645,291,255,255,255$646,291,0,0,0$651,296,0,0,0$650,296,255,255,255$640,296,255,255,255$639,296,0,0,0$638,296,0,0,0$637,296,255,255,255$636,296,0,0,0$634,296,0,0,0$633,296,255,255,255$632,296,0,0,0$630,296,0,0,0$629,296,255,255,255$628,296,0,0,0$628,301,0,0,0$629,301,255,255,255$634,301,255,255,255$637,301,255,255,255$638,301,0,0,0$640,301,0,0,0$641,301,255,255,255$647,301,255,255,255$649,301,255,255,255$650,301,0,0,0$645,302,0,0,0$645,301,255,255,255$645,300,0,0,0$645,299,0,0,0$645,298,255,255,255$645,297,0,0,0$645,296,255,255,255$645,293,255,255,255$645,291,255,255,255$645,290,0,0,0$633,294,0,0,0$633,295,255,255,255$633,296,255,255,255$633,300,0,0,0$633,301,255,255,255$633,302,0,0,0");
/// <summary>
/// 是否存在公告文本
@@ -125,9 +129,12 @@
{
Image<Rgb, byte> image = ScreenCapture.Instance.CaptureScreenReturnImage();
- if (!CVHelper.FindColorArray(out notificationRect, image, notificationText, gameRect))
+ if (!CVHelper.FindColorArray(out notificationRect, image, notificationGrayText, gameRect))
{
- return false;
+ if (!CVHelper.FindColorArray(out notificationRect, image, notificationWhiteText, gameRect))
+ {
+ return false;
+ }
}
return true;
}
@@ -258,13 +265,13 @@
/// <summary>
- /// 已学技能文字
+ /// 技能栏后面的“已学”文字
/// 白色
/// 灰色
/// </summary>
private static ColorArray[] studayedText = new ColorArray[] {
- ColorArray.FromHsvFloatString(0.002f,0.002f,0.002f,"739,471,255,255,255$739,468,255,255,255$740,468,255,255,255$742,468,255,255,255$743,468,255,255,255$745,468,255,255,255$746,468,255,255,255$747,468,255,255,255$747,469,255,255,255$747,472,255,255,255$747,473,255,255,255$746,473,255,255,255$739,473,255,255,255$739,477,255,255,255$739,476,255,255,255$740,478,255,255,255$741,478,255,255,255$747,478,255,255,255$748,478,255,255,255$748,477,255,255,255$748,476,255,255,255$753,478,255,255,255$755,478,255,255,255$755,474,255,255,255$760,474,255,255,255$750,474,255,255,255$756,473,255,255,255$757,472,255,255,255$758,471,255,255,255$752,471,255,255,255$750,470,255,255,255$750,469,255,255,255$751,469,255,255,255$753,469,255,255,255$755,469,255,255,255$757,469,255,255,255$760,469,255,255,255$760,470,255,255,255"),
- ColorArray.FromHsvFloatString(0.002f,0.002f,0.002f,"739,476,170,170,170$739,468,170,170,170$740,468,170,170,170$743,468,170,170,170$744,468,170,170,170$747,468,170,170,170$747,469,170,170,170$747,472,170,170,170$747,473,170,170,170$746,473,170,170,170$742,473,170,170,170$740,473,170,170,170$739,473,170,170,170$739,472,170,170,170$739,471,170,170,170$739,477,170,170,170$740,478,170,170,170$741,478,170,170,170$744,478,170,170,170$748,478,170,170,170$748,477,170,170,170$748,476,170,170,170$753,478,170,170,170$754,478,170,170,170$755,478,170,170,170$755,477,170,170,170$755,474,170,170,170$750,474,170,170,170$751,474,170,170,170$760,474,170,170,170$759,474,170,170,170$756,473,170,170,170$757,472,170,170,170$758,471,170,170,170$756,471,170,170,170$752,471,170,170,170$750,470,170,170,170$750,469,170,170,170$751,469,170,170,170$757,469,170,170,170$759,469,170,170,170$760,469,170,170,170$760,470,170,170,170"),
+ ColorArray.FromHsvFloatString(0.002f,0.002f,0.002f,"710,457,0,0,0$692,457,0,0,0$693,457,255,255,255$696,457,255,255,255$698,457,255,255,255$700,457,255,255,255$701,457,255,255,255$702,457,0,0,0$705,457,0,0,0$706,457,255,255,255$707,457,0,0,0$708,457,0,0,0$709,457,255,255,255$711,457,0,0,0$712,457,255,255,255$713,457,0,0,0$713,460,0,0,0$712,460,255,255,255$709,460,255,255,255$706,460,255,255,255$705,460,0,0,0$702,460,0,0,0$701,460,255,255,255$700,460,0,0,0$694,460,0,0,0$693,460,255,255,255$692,460,0,0,0$692,462,0,0,0$693,462,255,255,255$697,462,255,255,255$701,462,255,255,255$702,462,0,0,0$709,462,0,0,0$710,462,255,255,255$711,462,0,0,0$710,465,0,0,0$709,465,255,255,255$708,465,0,0,0$703,465,0,0,0$702,465,255,255,255$701,465,0,0,0$694,465,0,0,0$693,465,255,255,255$692,465,0,0,0"),//白色
+ ColorArray.FromHsvFloatString(0.002f,0.002f,0.002f,"712,457,170,170,170$692,457,0,0,0$693,457,170,170,170$696,457,170,170,170$698,457,170,170,170$701,457,170,170,170$702,457,0,0,0$705,457,0,0,0$706,457,170,170,170$707,457,0,0,0$708,457,0,0,0$709,457,170,170,170$710,457,0,0,0$711,457,0,0,0$713,457,0,0,0$715,459,0,0,0$714,459,170,170,170$713,459,0,0,0$705,459,0,0,0$704,459,170,170,170$703,459,0,0,0$702,459,0,0,0$701,459,170,170,170$700,459,0,0,0$693,467,0,0,0$694,467,170,170,170$697,467,170,170,170$699,467,170,170,170$702,467,170,170,170$703,467,0,0,0$706,467,0,0,0$707,467,170,170,170$708,467,170,170,170$709,467,170,170,170$710,467,0,0,0$708,468,0,0,0$708,467,170,170,170$708,466,0,0,0$708,464,0,0,0$708,463,170,170,170$708,461,0,0,0$708,460,170,170,170$708,459,0,0,0$708,458,170,170,170$697,456,0,0,0$697,457,170,170,170$697,458,0,0,0$697,461,0,0,0$697,462,170,170,170$697,463,0,0,0$697,466,0,0,0$697,467,170,170,170$697,468,0,0,0"),
};
/// <summary>
--
Gitblit v1.9.3