From 70ddc7e6b252eb7dcc3340a74beb0b44d6ba8c40 Mon Sep 17 00:00:00 2001 From: "DESKTOP-45ANQ2C\\unis" <121212121@qq.com> Date: Mon, 25 Nov 2024 11:39:42 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E9=81=93=E5=85=B7=E8=A1=A8=E6=A0=BC?= =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data/DB_GameItem.dat | Bin 20409 -> 20409 bytes data/DB_GameItem.json | 8 ++++---- xlsx/DB_GameItem.xlsx | Bin 37444 -> 37420 bytes 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/data/DB_GameItem.dat b/data/DB_GameItem.dat index ad79ccced814bc4382870e8a840211461dfd10d8..5200952b65f12450294722faafe59bc9d7a1b00b 100644 GIT binary patch delta 42 ucmdlvpK<4W#tj1A%sXB&P8RkqWZns++kx~hApP6Bh diff --git a/data/DB_GameItem.json b/data/DB_GameItem.json index d9b867f..133fcf4 100644 --- a/data/DB_GameItem.json +++ b/data/DB_GameItem.json @@ -6723,7 +6723,7 @@ "Describe": "可联系客服兑换实物奖励", "Entity": 1, "Compound": { - "300008": 10 + "30008": 10 } }, { @@ -6762,7 +6762,7 @@ "Describe": "可联系客服兑换实物奖励", "Entity": 1, "Compound": { - "300009": 10 + "30009": 10 } }, { @@ -6801,7 +6801,7 @@ "Describe": "可联系客服兑换实物奖励", "Entity": 1, "Compound": { - "300010": 10 + "30010": 10 } }, { @@ -6840,7 +6840,7 @@ "Describe": "可联系客服兑换实物奖励", "Entity": 2, "Compound": { - "300011": 10 + "30011": 10 } }, { diff --git a/xlsx/DB_GameItem.xlsx b/xlsx/DB_GameItem.xlsx index c069f7c00460e14f5352df5b4ab9c01a349a65a8..5d613b4079a35acbbbdb0c634788e7d4ebea2733 100644 GIT binary patch delta 20749 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 TDTL9C3c?dhfFAf9zTy7?BP4^2 delta 20520 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 LhMF1yU+Dh>D6JeH From 51b946bc0b5a6c98724d55865016cb753cdf9678 Mon Sep 17 00:00:00 2001 From: "DESKTOP-45ANQ2C\\unis" <121212121@qq.com> Date: Sat, 7 Dec 2024 17:18:25 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=8D=81=E4=B8=89=E6=B0=B4=E6=B5=8B?= =?UTF-8?q?=E8=AF=95=E7=89=8C=E5=9E=8B=E6=AF=94=E7=8E=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gamerule/thirteen/logic_test.go | 66 +++++++++++++++++++++++++++++++++ 1 file changed, 66 insertions(+) diff --git a/gamerule/thirteen/logic_test.go b/gamerule/thirteen/logic_test.go index 729d406..da8a789 100644 --- a/gamerule/thirteen/logic_test.go +++ b/gamerule/thirteen/logic_test.go @@ -268,3 +268,69 @@ func TestLogic_CompareFive(t *testing.T) { func TestLogic_IsDP(t *testing.T) { } + +func TestStatisticsPokerType(t *testing.T) { + poker := NewPokers(1, false) + if poker == nil { + return + } + + logic := new(Logic) + + loop := 2000000 + allTypeData := make([]int, PokersTypeMax) + specialAllTypeData := make([]int, SpecialTypeMax) + + totalCnt := 0 + stotalCnt := 0 + + for i := 0; i < loop; i++ { + poker.Init() + cardsArr := make([][13]int, poker.N*4) + //cardsGroup := make([]map[int]*Group, poker.N*4) + + for k := range cardsArr { + + cardsArr[k] = poker.Get13Crads() + specialType := logic.GetSpecialType(cardsArr[k]) + specialAllTypeData[specialType]++ + stotalCnt++ + + //cardsGroup[k] = logic.Suggest(cardsArr[k]) + // + //cardsO := GetMaxCard(cardsGroup[k]) + // + //headType := logic.GetType(cardsO.Head[:]) + //midType := logic.GetType(cardsO.Mid[:]) + //endType := logic.GetType(cardsO.End[:]) + // + //allTypeData[headType]++ + //totalCnt++ + //allTypeData[midType]++ + //totalCnt++ + //allTypeData[endType]++ + //totalCnt++ + //t.Logf("头牌类型:%v 中牌类型: %v 尾牌类型: %v \n", PokersTypeName[headType], PokersTypeName[midType], PokersTypeName[endType]) + } + + } + + t.Logf("共%v次循环", loop) + //ccc := 0.0 + for pType, count := range allTypeData { + percent := (float64(count) / float64(totalCnt)) * 100 + // t.Logf("牌类型:%v 占百分比: %.2f \n", PokersTypeName[pType], percent) + t.Logf("%v %.2f\n", PokersTypeName[pType], percent) + //ccc += percent + } + + t.Logf("特殊牌型共%v次循环", loop) + //ccc := 0.0 + for pType, count := range specialAllTypeData { + percent := (float64(count) / float64(stotalCnt)) * 100 + // t.Logf("牌类型:%v 占百分比: %.2f \n", PokersTypeName[pType], percent) + t.Logf("%v %.10f\n", SpecialTypeName[pType], percent) + //ccc += percent + } + +} From 886bf444c3f8e7aa0089d64943b28069e9f56bb2 Mon Sep 17 00:00:00 2001 From: sk <123456@qq.com> Date: Mon, 9 Dec 2024 09:55:15 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=8D=81=E4=B8=89=E5=BC=A0=E8=8A=B1?= =?UTF-8?q?=E8=89=B2=E6=AF=94=E7=89=8C=E6=B7=BB=E5=8A=A0=E5=8D=95=E5=85=83?= =?UTF-8?q?=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gamerule/thirteen/logic_test.go | 91 +++++++++++++++++++++------------ 1 file changed, 59 insertions(+), 32 deletions(-) diff --git a/gamerule/thirteen/logic_test.go b/gamerule/thirteen/logic_test.go index 08cf3bb..3877501 100644 --- a/gamerule/thirteen/logic_test.go +++ b/gamerule/thirteen/logic_test.go @@ -165,29 +165,6 @@ func TestLogic_CompareHead(t *testing.T) { l.LaiZi = []int{52, 53} data := [][]int{ // 比花色的 - //{1, 27, 49, 50, 43, 42, 1}, - //{47, 20, 23, 29, 36, 42, -1}, - //{0, 2, 18, 31, 21, 29, -1}, - //{45, 7, 18, 13, 15, 29, 1}, - //{14, 4, 46, 9, 1, 11, -1}, - //{7, 3, 24, 43, 50, 44, 1}, - //{5, 4, 31, 15, 33, 14, 1}, - //{21, 21, 32, 31, 38, 28, 1}, - //{47, 38, 49, 30, 34, 23, 1}, - //{14, 10, 16, 29, 30, 35, 1}, - //// - //{0, 52, 8, 7, 8, 9, 1}, - //{0, 52, 52, 7, 8, 9, 1}, - //{0, 52, 52, 7, 51, 53, 1}, - //{0, 52, 51, 7, 51, 53, -1}, - //{8, 52, 51, 7, 51, 53, 1}, - //{7, 52, 51, 7, 51, 53, 0}, - //{7, 9, 22, 22, 7, 53, -1}, - //{7, 48, 22, 22, 7, 53, 1}, - //{7, 48, 22, 22, 6, 53, 1}, - //{7, 48, 22, 22, 20, 53, -1}, - - // 不比花色 {1, 27, 49, 50, 43, 42, 1}, {47, 20, 23, 29, 36, 42, -1}, {0, 2, 18, 31, 21, 29, -1}, @@ -205,10 +182,33 @@ func TestLogic_CompareHead(t *testing.T) { {0, 52, 51, 7, 51, 53, -1}, {8, 52, 51, 7, 51, 53, 1}, {7, 52, 51, 7, 51, 53, 0}, - {7, 9, 22, 22, 7, 53, 1}, + {7, 9, 22, 22, 7, 53, -1}, {7, 48, 22, 22, 7, 53, 1}, {7, 48, 22, 22, 6, 53, 1}, - {7, 48, 22, 22, 20, 53, 1}, + {7, 48, 22, 22, 20, 53, -1}, + + // 不比花色 + //{1, 27, 49, 50, 43, 42, 1}, + //{47, 20, 23, 29, 36, 42, -1}, + //{0, 2, 18, 31, 21, 29, -1}, + //{45, 7, 18, 13, 15, 29, 1}, + //{14, 4, 46, 9, 1, 11, -1}, + //{7, 3, 24, 43, 50, 44, 1}, + //{5, 4, 31, 15, 33, 14, 1}, + //{21, 21, 32, 31, 38, 28, 1}, + //{47, 38, 49, 30, 34, 23, 1}, + //{14, 10, 16, 29, 30, 35, 1}, + //// + //{0, 52, 8, 7, 8, 9, 1}, + //{0, 52, 52, 7, 8, 9, 1}, + //{0, 52, 52, 7, 51, 53, 1}, + //{0, 52, 51, 7, 51, 53, -1}, + //{8, 52, 51, 7, 51, 53, 1}, + //{7, 52, 51, 7, 51, 53, 0}, + //{7, 9, 22, 22, 7, 53, 1}, + //{7, 48, 22, 22, 7, 53, 1}, + //{7, 48, 22, 22, 6, 53, 1}, + //{7, 48, 22, 22, 20, 53, 1}, } for _, v := range data { @@ -233,6 +233,33 @@ func TestLogic_CompareFive(t *testing.T) { l := new(Logic) l.LaiZi = []int{52, 53} data := [][]int{ + // 不比花色 + //{5, 23, 10, 6, 1, 45, 41, 20, 1, 13, 1}, + //{29, 31, 26, 1, 39, 31, 44, 17, 9, 34, -1}, + //{24, 26, 9, 10, 0, 16, 30, 7, 37, 3, -1}, + //{31, 30, 11, 33, 7, 18, 1, 36, 9, 3, 1}, + //// 牌型不同 + //{2, 15, 28, 0, 6, 12, 0, 1, 2, 3, -1}, + //// 点数不同 + //{2, 15, 28, 0, 6, 2, 15, 28, 0, 6, 0}, + //{2, 15, 28, 0, 6, 2, 15, 28, 0, 7, -1}, + //{0, 13, 4, 17, 6, 0, 13, 4, 17, 5, 1}, + //{0, 13, 5, 18, 6, 0, 13, 4, 17, 6, 1}, + //{1, 14, 4, 17, 6, 0, 13, 4, 17, 5, 1}, + //// 花色不同 + //{2, 15, 28, 0, 6, 2, 15, 28, 0, 19, 0}, + //{41, 15, 28, 0, 6, 2, 15, 28, 0, 6, 0}, + //{2, 15, 28, 0, 6, 2, 15, 28, 13, 6, 0}, + //{3, 4, 5, 6, 52, 3, 52, 5, 6, 53, 1}, + //{3, 17, 5, 6, 52, 3, 52, 5, 6, 53, -1}, + //{3, 4, 5, 6, 7, 16, 52, 18, 19, 53, 1}, + //{3, 52, 5, 6, 20, 3, 17, 18, 19, 53, 0}, + //{3, 52, 5, 6, 46, 3, 17, 18, 19, 53, 0}, + //// 癞子数不同 + //{52, 52, 7, 20, 12, 52, 7, 20, 33, 25, -1}, + //{52, 33, 7, 20, 12, 52, 7, 20, 33, 25, 0}, + + // 比花色 {5, 23, 10, 6, 1, 45, 41, 20, 1, 13, 1}, {29, 31, 26, 1, 39, 31, 44, 17, 9, 34, -1}, {24, 26, 9, 10, 0, 16, 30, 7, 37, 3, -1}, @@ -246,17 +273,17 @@ func TestLogic_CompareFive(t *testing.T) { {0, 13, 5, 18, 6, 0, 13, 4, 17, 6, 1}, {1, 14, 4, 17, 6, 0, 13, 4, 17, 5, 1}, // 花色不同 - {2, 15, 28, 0, 6, 2, 15, 28, 0, 19, 0}, - {41, 15, 28, 0, 6, 2, 15, 28, 0, 6, 0}, - {2, 15, 28, 0, 6, 2, 15, 28, 13, 6, 0}, + {2, 15, 28, 0, 6, 2, 15, 28, 0, 19, -1}, + {41, 15, 28, 0, 6, 2, 15, 28, 0, 6, 1}, + {2, 15, 28, 0, 6, 2, 15, 28, 13, 6, -1}, {3, 4, 5, 6, 52, 3, 52, 5, 6, 53, 1}, {3, 17, 5, 6, 52, 3, 52, 5, 6, 53, -1}, - {3, 4, 5, 6, 7, 16, 52, 18, 19, 53, 1}, - {3, 52, 5, 6, 20, 3, 17, 18, 19, 53, 0}, - {3, 52, 5, 6, 46, 3, 17, 18, 19, 53, 0}, + {3, 4, 5, 6, 7, 16, 52, 18, 19, 53, -1}, + {3, 52, 5, 6, 20, 3, 17, 18, 19, 53, -1}, + {3, 52, 5, 6, 46, 3, 17, 18, 19, 53, -1}, // 癞子数不同 {52, 52, 7, 20, 12, 52, 7, 20, 33, 25, -1}, - {52, 33, 7, 20, 12, 52, 7, 20, 33, 25, 0}, + {52, 33, 7, 20, 12, 52, 7, 20, 33, 25, -1}, } for _, v := range data { From 4671d33f67b5e373657daa607e6c13335d74cfb1 Mon Sep 17 00:00:00 2001 From: by <123456@qq.com> Date: Mon, 9 Dec 2024 10:30:37 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=A8=83=E5=A8=83=E6=9C=BA=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- machine/machinedoll/command.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/machine/machinedoll/command.go b/machine/machinedoll/command.go index bbe2a0f..0e4bd33 100644 --- a/machine/machinedoll/command.go +++ b/machine/machinedoll/command.go @@ -394,14 +394,14 @@ var data = []byte{ 0x01, //11 强抓力电压占用位 0x80, //12 中抓力电压 0x01, //13 中抓力电压占用位 - 0x78, //14 弱抓力电压 + 0x64, //14 弱抓力电压 0x00, //15 弱抓力电压占用位 0xE0, //16 中奖电压 0x01, //17 中奖电压占用位 0xC8, //18 强抓力时间 0x00, //19 强抓力时间占用位 - 0x14, //20 放抓时间 + 0x0A, //20 放抓时间 0x32, //21 前后速度 0x32, //22 左右速度 0x50, //23 上下速度