diff --git a/ChuPiao.AutoPrint.Machine/Models/CaptureDataInfo.cs b/ChuPiao.AutoPrint.Machine/Models/CaptureDataInfo.cs index 76f2100592ca05f7d684b5f8f11aeba0f34b6a26..397b8ab5a45e8317ab0abdfb6ab8ba2970349ee9 100644 --- a/ChuPiao.AutoPrint.Machine/Models/CaptureDataInfo.cs +++ b/ChuPiao.AutoPrint.Machine/Models/CaptureDataInfo.cs @@ -23,11 +23,12 @@ namespace ChuPiao.AutoPrint.Machine.Models //æ¹–åŒ—å…ƒå—æœ‰ä¹±ç _captureDataString = _captureDataString.Replace(@"ç¶\?@\?", "å…ƒ").Replace("ç¶?@?", "å…ƒ"); - //å¹¿è¥¿â€œå…¶å®ƒâ€æœ‰ä¹±ç (3:3)@60.00å…ƒ+(å¹³ç¥?@渌?@175.0å…ƒ+(2:4)@60 (è´Ÿç¥?渌?)@50.00å…ƒ (å¹³ç¥?@渌?)@ - Regex re = new Regex(@"ç¥.*?渌.*?@"); - _captureDataString = re.Replace(_captureDataString, "其它)@"); + //放到比分玩法里é¢åŽ»æ›¿æ¢äº† + ////å¹¿è¥¿â€œå…¶å®ƒâ€æœ‰ä¹±ç (3:3)@60.00å…ƒ+(å¹³ç¥?@渌?@175.0å…ƒ+(2:4)@60 (è´Ÿç¥?渌?)@50.00å…ƒ (å¹³ç¥?@渌?)@ + //Regex re = new Regex(@"ç¥.*?渌.*?@"); + //_captureDataString = re.Replace(_captureDataString, "其它)@"); - //_captureDataString = _captureDataString.Replace(@"ç¥?@渌?", "其它)").Replace(@"ç¥?渌?", "其它"); + //_captureDataString = _captureDataString.Replace(@"祟?@?", "它"); //(平其祟?@?)@150.0å…ƒ } private byte[] _captureDataBytes; diff --git a/ChuPiao.AutoPrint.Machine/TjJingCaiV1/MacLotPlayMode/MacLotPlayModeJzBfService.cs b/ChuPiao.AutoPrint.Machine/TjJingCaiV1/MacLotPlayMode/MacLotPlayModeJzBfService.cs index 7d8cc332b3ec33f5af44a9c6e38379f1cb1c55bc..d58d560575ee71617872e1087380d09cff120bc5 100644 --- a/ChuPiao.AutoPrint.Machine/TjJingCaiV1/MacLotPlayMode/MacLotPlayModeJzBfService.cs +++ b/ChuPiao.AutoPrint.Machine/TjJingCaiV1/MacLotPlayMode/MacLotPlayModeJzBfService.cs @@ -246,6 +246,20 @@ namespace ChuPiao.AutoPrint.Machine.TjJingCaiV1.MacLotPlayMode /// <returns></returns> private string DealRateCode(string Istr) { + //(ƽÆî?@äË?@175.0Ôª + //(¸ºÆî?äË?)@50.00Ôª + //(ƽÆî?@äË?)@50.00Ôª + //(ƽÆäËî?@?)@150.0Ôª + Regex re = new Regex(@"[ʤƽ¸º](\D{1,})@\d{1,}.\d{1,}Ôª"); + MatchCollection mc = re.Matches(Istr); + foreach (Match ma in mc) + { + if (ma.Groups[1].Value != "ÆäËü)") + { + Istr = Istr.Replace(ma.Groups[1].Value, "ÆäËü)"); + } + } + Istr = Regex.Replace(Istr, @"[^():ʤƽ¸ºÆäËüÔª@.+\d]{1}", ""); string tmpstr = ""; diff --git a/ChuPiao_Linux.suo b/ChuPiao_Linux.suo index a11462098ad6fc2fa2fd52366640aaf780115eba..15f3679e4d561f015ce78ceb819e23a2f7722f6c 100644 Binary files a/ChuPiao_Linux.suo and b/ChuPiao_Linux.suo differ