diff --git a/data/DB_GameFree.dat b/data/DB_GameFree.dat index 9ed5700..28559c2 100644 Binary files a/data/DB_GameFree.dat and b/data/DB_GameFree.dat differ diff --git a/data/DB_GameFree.json b/data/DB_GameFree.json index 1ecae87..2c148d0 100644 --- a/data/DB_GameFree.json +++ b/data/DB_GameFree.json @@ -9,7 +9,6 @@ "GameRule": 20700, "GameType": 2, "SceneType": 1, - "Desc": "0", "ShowType": 3, "ShowId": 44001, "LimitCoin": 200000, @@ -67,7 +66,6 @@ "GameRule": 20700, "GameType": 2, "SceneType": 2, - "Desc": "0", "ShowType": 3, "ShowId": 44001, "LimitCoin": 1000000, @@ -125,7 +123,6 @@ "GameRule": 20700, "GameType": 2, "SceneType": 3, - "Desc": "0", "ShowType": 3, "ShowId": 44001, "LimitCoin": 4000000, @@ -183,7 +180,6 @@ "GameRule": 20800, "GameType": 2, "SceneType": 1, - "Desc": "0", "ShowType": 3, "ShowId": 44001, "LimitCoin": 1000000, @@ -241,7 +237,6 @@ "GameRule": 20800, "GameType": 2, "SceneType": 2, - "Desc": "0", "ShowType": 3, "ShowId": 44001, "LimitCoin": 5000000, @@ -299,7 +294,6 @@ "GameRule": 20800, "GameType": 2, "SceneType": 3, - "Desc": "0", "ShowType": 3, "ShowId": 44001, "LimitCoin": 20000000, @@ -357,7 +351,6 @@ "GameRule": 20900, "GameType": 2, "SceneType": 1, - "Desc": "0", "ShowType": 3, "ShowId": 44001, "LimitCoin": 200000, @@ -415,7 +408,6 @@ "GameRule": 20900, "GameType": 2, "SceneType": 2, - "Desc": "0", "ShowType": 3, "ShowId": 44001, "LimitCoin": 1000000, @@ -473,7 +465,6 @@ "GameRule": 20900, "GameType": 2, "SceneType": 3, - "Desc": "0", "ShowType": 3, "ShowId": 44001, "LimitCoin": 4000000, @@ -531,7 +522,6 @@ "GameRule": 21000, "GameType": 2, "SceneType": 1, - "Desc": "0", "ShowType": 3, "ShowId": 44001, "LimitCoin": 200000, @@ -589,7 +579,6 @@ "GameRule": 21000, "GameType": 2, "SceneType": 2, - "Desc": "0", "ShowType": 3, "ShowId": 44001, "LimitCoin": 1000000, @@ -647,7 +636,6 @@ "GameRule": 21000, "GameType": 2, "SceneType": 3, - "Desc": "0", "ShowType": 3, "ShowId": 44001, "LimitCoin": 4000000, @@ -704,7 +692,6 @@ "GameRule": 24000, "GameType": 2, "SceneType": 1, - "Desc": "0", "ShowType": 3, "ShowId": 44001, "LimitCoin": 200000, @@ -761,7 +748,6 @@ "GameRule": 24000, "GameType": 2, "SceneType": 2, - "Desc": "0", "ShowType": 3, "ShowId": 44001, "LimitCoin": 1000000, @@ -818,7 +804,6 @@ "GameRule": 24000, "GameType": 2, "SceneType": 3, - "Desc": "0", "ShowType": 3, "ShowId": 44001, "LimitCoin": 4000000, @@ -874,7 +859,6 @@ "GameRule": 24000, "GameType": 2, "SceneType": 4, - "Desc": "0", "ShowType": 3, "ShowId": 44001, "LimitCoin": 20000000, @@ -929,7 +913,6 @@ "GameRule": 24000, "GameType": 2, "SceneType": 5, - "Desc": "0", "ShowType": 3, "ShowId": 44001, "LimitCoin": 100000000, @@ -984,7 +967,6 @@ "GameRule": 24000, "GameType": 2, "SceneType": 6, - "Desc": "0", "ShowType": 3, "ShowId": 44001, "LimitCoin": 400000000, @@ -1039,7 +1021,6 @@ "GameRule": 24400, "GameType": 2, "SceneType": 1, - "Desc": "0", "ShowType": 3, "ShowId": 44001, "LimitCoin": 200000, @@ -1096,7 +1077,6 @@ "GameRule": 24400, "GameType": 2, "SceneType": 2, - "Desc": "0", "ShowType": 3, "ShowId": 44001, "LimitCoin": 1000000, @@ -1153,7 +1133,6 @@ "GameRule": 24400, "GameType": 2, "SceneType": 3, - "Desc": "0", "ShowType": 3, "ShowId": 44001, "LimitCoin": 4000000, @@ -1209,7 +1188,6 @@ "GameRule": 24400, "GameType": 2, "SceneType": 4, - "Desc": "0", "ShowType": 3, "ShowId": 44001, "LimitCoin": 20000000, @@ -1264,7 +1242,6 @@ "GameRule": 24400, "GameType": 2, "SceneType": 5, - "Desc": "0", "ShowType": 3, "ShowId": 44001, "LimitCoin": 100000000, @@ -1319,7 +1296,6 @@ "GameRule": 24400, "GameType": 2, "SceneType": 6, - "Desc": "0", "ShowType": 3, "ShowId": 44001, "LimitCoin": 400000000, @@ -1374,7 +1350,6 @@ "GameRule": 24100, "GameType": 2, "SceneType": 1, - "Desc": "0", "ShowType": 3, "ShowId": 44001, "LimitCoin": 200000, @@ -1431,7 +1406,6 @@ "GameRule": 24100, "GameType": 2, "SceneType": 2, - "Desc": "0", "ShowType": 3, "ShowId": 44001, "LimitCoin": 1000000, @@ -1488,7 +1462,6 @@ "GameRule": 24100, "GameType": 2, "SceneType": 3, - "Desc": "0", "ShowType": 3, "ShowId": 44001, "LimitCoin": 4000000, @@ -1544,7 +1517,6 @@ "GameRule": 24100, "GameType": 2, "SceneType": 4, - "Desc": "0", "ShowType": 3, "ShowId": 44001, "LimitCoin": 20000000, @@ -1599,7 +1571,6 @@ "GameRule": 24100, "GameType": 2, "SceneType": 5, - "Desc": "0", "ShowType": 3, "ShowId": 44001, "LimitCoin": 100000000, @@ -1654,7 +1625,6 @@ "GameRule": 24100, "GameType": 2, "SceneType": 6, - "Desc": "0", "ShowType": 3, "ShowId": 44001, "LimitCoin": 400000000, @@ -1709,7 +1679,6 @@ "GameRule": 24500, "GameType": 2, "SceneType": 1, - "Desc": "0", "ShowType": 3, "ShowId": 44001, "LimitCoin": 200000, @@ -1766,7 +1735,6 @@ "GameRule": 24500, "GameType": 2, "SceneType": 2, - "Desc": "0", "ShowType": 3, "ShowId": 44001, "LimitCoin": 1000000, @@ -1823,7 +1791,6 @@ "GameRule": 24500, "GameType": 2, "SceneType": 3, - "Desc": "0", "ShowType": 3, "ShowId": 44001, "LimitCoin": 4000000, @@ -1879,7 +1846,6 @@ "GameRule": 24500, "GameType": 2, "SceneType": 4, - "Desc": "0", "ShowType": 3, "ShowId": 44001, "LimitCoin": 20000000, @@ -1934,7 +1900,6 @@ "GameRule": 24500, "GameType": 2, "SceneType": 5, - "Desc": "0", "ShowType": 3, "ShowId": 44001, "LimitCoin": 100000000, @@ -1989,7 +1954,6 @@ "GameRule": 24500, "GameType": 2, "SceneType": 6, - "Desc": "0", "ShowType": 3, "ShowId": 44001, "LimitCoin": 400000000, @@ -2046,7 +2010,6 @@ "SceneType": 1, "RankType": 1, "SceneAdd": 5, - "Desc": "0", "ShowType": 3, "ShowId": 44001, "LimitCoin": 200000, @@ -2105,7 +2068,6 @@ "SceneType": 2, "RankType": 1, "SceneAdd": 10, - "Desc": "0", "ShowType": 3, "ShowId": 44001, "LimitCoin": 1000000, @@ -2164,7 +2126,6 @@ "SceneType": 3, "RankType": 1, "SceneAdd": 15, - "Desc": "0", "ShowType": 3, "ShowId": 44001, "LimitCoin": 4000000, @@ -2222,7 +2183,6 @@ "SceneType": 4, "RankType": 1, "SceneAdd": 20, - "Desc": "0", "ShowType": 3, "ShowId": 44001, "LimitCoin": 20000000, @@ -2279,7 +2239,6 @@ "SceneType": 5, "RankType": 1, "SceneAdd": 30, - "Desc": "0", "ShowType": 3, "ShowId": 44001, "LimitCoin": 100000000, @@ -2336,7 +2295,6 @@ "SceneType": 6, "RankType": 1, "SceneAdd": 50, - "Desc": "0", "ShowType": 3, "ShowId": 44001, "LimitCoin": 400000000, @@ -2393,7 +2351,6 @@ "SceneType": 1, "RankType": 1, "SceneAdd": 5, - "Desc": "0", "ShowType": 3, "ShowId": 44001, "LimitCoin": 200000, @@ -2452,7 +2409,6 @@ "SceneType": 2, "RankType": 1, "SceneAdd": 10, - "Desc": "0", "ShowType": 3, "ShowId": 44001, "LimitCoin": 1000000, @@ -2511,7 +2467,6 @@ "SceneType": 3, "RankType": 1, "SceneAdd": 15, - "Desc": "0", "ShowType": 3, "ShowId": 44001, "LimitCoin": 4000000, @@ -2569,7 +2524,6 @@ "SceneType": 4, "RankType": 1, "SceneAdd": 20, - "Desc": "0", "ShowType": 3, "ShowId": 44001, "LimitCoin": 20000000, @@ -2626,7 +2580,6 @@ "SceneType": 5, "RankType": 1, "SceneAdd": 30, - "Desc": "0", "ShowType": 3, "ShowId": 44001, "LimitCoin": 100000000, @@ -2683,7 +2636,6 @@ "SceneType": 6, "RankType": 1, "SceneAdd": 50, - "Desc": "0", "ShowType": 3, "ShowId": 44001, "LimitCoin": 400000000, @@ -2740,7 +2692,6 @@ "SceneType": 1, "RankType": 1, "SceneAdd": 5, - "Desc": "0", "ShowType": 3, "ShowId": 44001, "LimitCoin": 200000, @@ -2799,7 +2750,6 @@ "SceneType": 2, "RankType": 1, "SceneAdd": 10, - "Desc": "0", "ShowType": 3, "ShowId": 44001, "LimitCoin": 1000000, @@ -2858,7 +2808,6 @@ "SceneType": 3, "RankType": 1, "SceneAdd": 15, - "Desc": "0", "ShowType": 3, "ShowId": 44001, "LimitCoin": 4000000, @@ -2916,7 +2865,6 @@ "SceneType": 4, "RankType": 1, "SceneAdd": 20, - "Desc": "0", "ShowType": 3, "ShowId": 44001, "LimitCoin": 20000000, @@ -2973,7 +2921,6 @@ "SceneType": 5, "RankType": 1, "SceneAdd": 30, - "Desc": "0", "ShowType": 3, "ShowId": 44001, "LimitCoin": 100000000, @@ -3030,7 +2977,6 @@ "SceneType": 6, "RankType": 1, "SceneAdd": 50, - "Desc": "0", "ShowType": 3, "ShowId": 44001, "LimitCoin": 400000000, @@ -3087,7 +3033,6 @@ "SceneType": 1, "RankType": 1, "SceneAdd": 5, - "Desc": "0", "ShowType": 3, "ShowId": 44001, "LimitCoin": 200000, @@ -3146,7 +3091,6 @@ "SceneType": 2, "RankType": 1, "SceneAdd": 10, - "Desc": "0", "ShowType": 3, "ShowId": 44001, "LimitCoin": 1000000, @@ -3205,7 +3149,6 @@ "SceneType": 3, "RankType": 1, "SceneAdd": 15, - "Desc": "0", "ShowType": 3, "ShowId": 44001, "LimitCoin": 4000000, @@ -3263,7 +3206,6 @@ "SceneType": 4, "RankType": 1, "SceneAdd": 20, - "Desc": "0", "ShowType": 3, "ShowId": 44001, "LimitCoin": 20000000, @@ -3320,7 +3262,6 @@ "SceneType": 5, "RankType": 1, "SceneAdd": 30, - "Desc": "0", "ShowType": 3, "ShowId": 44001, "LimitCoin": 100000000, @@ -3377,7 +3318,6 @@ "SceneType": 6, "RankType": 1, "SceneAdd": 50, - "Desc": "0", "ShowType": 3, "ShowId": 44001, "LimitCoin": 400000000, @@ -3432,7 +3372,6 @@ "GameRule": 21500, "GameType": 2, "SceneType": 1, - "Desc": "0", "ShowType": 3, "BaseScore": 10, "BetDec": "10", @@ -3457,7 +3396,6 @@ "GameRule": 21600, "GameType": 2, "SceneType": 1, - "Desc": "0", "ShowType": 3, "BaseScore": 10, "BetDec": "10", @@ -3482,7 +3420,6 @@ "GameRule": 21700, "GameType": 2, "SceneType": 1, - "Desc": "0", "ShowType": 3, "BaseScore": 10, "BetDec": "10", @@ -3507,7 +3444,6 @@ "GameRule": 21800, "GameType": 2, "SceneType": 1, - "Desc": "0", "ShowType": 3, "BaseScore": 10, "BetDec": "10", @@ -3532,7 +3468,6 @@ "GameRule": 20700, "GameType": 2, "SceneType": 1, - "Desc": "0", "ShowType": 3, "LimitCoin": 1000, "BaseScore": 10, @@ -3580,7 +3515,6 @@ "GameRule": 20900, "GameType": 2, "SceneType": 1, - "Desc": "0", "ShowType": 3, "LimitCoin": 1000, "BaseScore": 10, @@ -3628,7 +3562,6 @@ "GameRule": 40100, "GameType": 4, "SceneType": 1, - "Desc": "0", "ShowId": 23001, "LimitCoin": 1000000, "Turn": 23001, @@ -3692,7 +3625,6 @@ "GameRule": 40100, "GameType": 4, "SceneType": 2, - "Desc": "0", "ShowId": 23001, "LimitCoin": 10000000, "Turn": 23001, @@ -3756,7 +3688,6 @@ "GameRule": 40100, "GameType": 4, "SceneType": 3, - "Desc": "0", "ShowId": 23001, "LimitCoin": 100000000, "Turn": 23001, @@ -3820,7 +3751,6 @@ "GameRule": 40100, "GameType": 4, "SceneType": 4, - "Desc": "0", "ShowId": 23001, "LimitCoin": 1000000000, "Turn": 23001, @@ -3884,7 +3814,6 @@ "GameRule": 52100, "GameType": 2, "SceneType": 1, - "Desc": "0", "ShowType": 3, "ShowId": 44001, "LimitCoin": 1000, @@ -3942,7 +3871,6 @@ "GameRule": 52100, "GameType": 2, "SceneType": 2, - "Desc": "0", "ShowType": 3, "ShowId": 44001, "LimitCoin": 3000, @@ -4000,7 +3928,6 @@ "GameRule": 52100, "GameType": 2, "SceneType": 3, - "Desc": "0", "ShowType": 3, "ShowId": 44001, "LimitCoin": 10000, @@ -4058,7 +3985,6 @@ "GameRule": 52100, "GameType": 2, "SceneType": 4, - "Desc": "0", "ShowType": 3, "ShowId": 44001, "LimitCoin": 20000, @@ -4116,7 +4042,6 @@ "GameRule": 52100, "GameType": 2, "SceneType": 5, - "Desc": "0", "ShowType": 3, "ShowId": 44001, "LimitCoin": 50000, @@ -4174,7 +4099,6 @@ "GameRule": 52200, "GameType": 2, "SceneType": 1, - "Desc": "0", "ShowType": 3, "ShowId": 44001, "Turn": 47000, @@ -4225,7 +4149,6 @@ "GameRule": 52200, "GameType": 2, "SceneType": 2, - "Desc": "0", "ShowType": 3, "ShowId": 44001, "Turn": 47000, @@ -4276,7 +4199,6 @@ "GameRule": 52200, "GameType": 2, "SceneType": 3, - "Desc": "0", "ShowType": 3, "ShowId": 44001, "Turn": 47000, @@ -4327,7 +4249,6 @@ "GameRule": 52200, "GameType": 2, "SceneType": 4, - "Desc": "0", "ShowType": 3, "ShowId": 44001, "Turn": 47000, @@ -4378,7 +4299,6 @@ "GameRule": 52200, "GameType": 2, "SceneType": 5, - "Desc": "0", "ShowType": 3, "ShowId": 44001, "Turn": 47000, @@ -4429,7 +4349,6 @@ "GameRule": 21100, "GameType": 2, "SceneType": 1, - "Desc": "0", "ShowType": 3, "ShowId": 44001, "LimitCoin": 250000, @@ -4482,7 +4401,6 @@ "GameRule": 21100, "GameType": 2, "SceneType": 2, - "Desc": "0", "ShowType": 3, "ShowId": 44001, "LimitCoin": 1000000, @@ -4535,7 +4453,6 @@ "GameRule": 21100, "GameType": 2, "SceneType": 3, - "Desc": "0", "ShowType": 3, "ShowId": 44001, "LimitCoin": 5000000, @@ -4587,7 +4504,6 @@ "GameRule": 21100, "GameType": 2, "SceneType": 4, - "Desc": "0", "ShowType": 3, "ShowId": 44001, "LimitCoin": 25000000, @@ -4639,7 +4555,6 @@ "GameRule": 21100, "GameType": 2, "SceneType": 5, - "Desc": "0", "ShowType": 3, "ShowId": 44001, "LimitCoin": 100000000, @@ -4691,7 +4606,6 @@ "GameRule": 21100, "GameType": 2, "SceneType": 6, - "Desc": "0", "ShowType": 3, "ShowId": 44001, "LimitCoin": 500000000, @@ -4743,7 +4657,6 @@ "GameRule": 21200, "GameType": 2, "SceneType": 1, - "Desc": "0", "ShowType": 3, "ShowId": 44001, "LimitCoin": 250000, @@ -4796,7 +4709,6 @@ "GameRule": 21200, "GameType": 2, "SceneType": 2, - "Desc": "0", "ShowType": 3, "ShowId": 44001, "LimitCoin": 1000000, @@ -4849,7 +4761,6 @@ "GameRule": 21200, "GameType": 2, "SceneType": 3, - "Desc": "0", "ShowType": 3, "ShowId": 44001, "LimitCoin": 5000000, @@ -4901,7 +4812,6 @@ "GameRule": 21200, "GameType": 2, "SceneType": 4, - "Desc": "0", "ShowType": 3, "ShowId": 44001, "LimitCoin": 25000000, @@ -4953,7 +4863,6 @@ "GameRule": 21200, "GameType": 2, "SceneType": 5, - "Desc": "0", "ShowType": 3, "ShowId": 44001, "LimitCoin": 100000000, @@ -5005,7 +4914,6 @@ "GameRule": 21200, "GameType": 2, "SceneType": 6, - "Desc": "0", "ShowType": 3, "ShowId": 44001, "LimitCoin": 500000000, @@ -5058,7 +4966,6 @@ "GameRule": 21300, "GameType": 2, "SceneType": 1, - "Desc": "0", "ShowType": 3, "ShowId": 44001, "LimitCoin": 250000, @@ -5112,7 +5019,6 @@ "GameRule": 21300, "GameType": 2, "SceneType": 2, - "Desc": "0", "ShowType": 3, "ShowId": 44001, "LimitCoin": 1000000, @@ -5166,7 +5072,6 @@ "GameRule": 21300, "GameType": 2, "SceneType": 3, - "Desc": "0", "ShowType": 3, "ShowId": 44001, "LimitCoin": 5000000, @@ -5220,7 +5125,6 @@ "GameRule": 21400, "GameType": 2, "SceneType": 1, - "Desc": "0", "ShowType": 3, "ShowId": 44001, "LimitCoin": 250000, @@ -5274,7 +5178,6 @@ "GameRule": 21400, "GameType": 2, "SceneType": 2, - "Desc": "0", "ShowType": 3, "ShowId": 44001, "LimitCoin": 1000000, @@ -5328,7 +5231,6 @@ "GameRule": 21400, "GameType": 2, "SceneType": 3, - "Desc": "0", "ShowType": 3, "ShowId": 44001, "LimitCoin": 5000000, @@ -5381,7 +5283,6 @@ "GameRule": 60600, "GameType": 6, "SceneType": 1, - "Desc": "0", "ShowType": 3, "ShowId": 60600, "BetDec": "0", @@ -5425,7 +5326,6 @@ "GameRule": 60700, "GameType": 1, "SceneType": 1, - "Desc": "0", "ShowType": 3, "ShowId": 60700, "BaseScore": 1000000, @@ -5471,7 +5371,6 @@ "GameRule": 30100, "GameType": 3, "SceneType": 1, - "Desc": "0", "ShowType": 2, "ShowId": 79000, "LimitCoin": 1000000, @@ -5510,7 +5409,6 @@ "GameRule": 30100, "GameType": 3, "SceneType": 2, - "Desc": "0", "ShowType": 2, "ShowId": 79000, "LimitCoin": 25000000, @@ -5549,7 +5447,6 @@ "GameRule": 30100, "GameType": 3, "SceneType": 3, - "Desc": "0", "ShowType": 2, "ShowId": 79000, "LimitCoin": 125000000, @@ -5588,7 +5485,6 @@ "GameRule": 30100, "GameType": 3, "SceneType": 4, - "Desc": "0", "ShowType": 2, "ShowId": 79000, "LimitCoin": 250000000, @@ -5627,7 +5523,6 @@ "GameRule": 30200, "GameType": 3, "SceneType": 1, - "Desc": "0", "ShowType": 2, "ShowId": 80000, "LimitCoin": 1000000, @@ -5666,7 +5561,6 @@ "GameRule": 30200, "GameType": 3, "SceneType": 2, - "Desc": "0", "ShowType": 2, "ShowId": 80000, "LimitCoin": 25000000, @@ -5705,7 +5599,6 @@ "GameRule": 30200, "GameType": 3, "SceneType": 3, - "Desc": "0", "ShowType": 2, "ShowId": 80000, "LimitCoin": 125000000, @@ -5744,7 +5637,6 @@ "GameRule": 30200, "GameType": 3, "SceneType": 4, - "Desc": "0", "ShowType": 2, "ShowId": 80000, "LimitCoin": 250000000, @@ -5783,7 +5675,6 @@ "GameRule": 30300, "GameType": 3, "SceneType": 1, - "Desc": "0", "ShowType": 2, "ShowId": 81000, "LimitCoin": 1000000, @@ -5822,7 +5713,6 @@ "GameRule": 30300, "GameType": 3, "SceneType": 2, - "Desc": "0", "ShowType": 2, "ShowId": 81000, "LimitCoin": 25000000, @@ -5861,7 +5751,6 @@ "GameRule": 30300, "GameType": 3, "SceneType": 3, - "Desc": "0", "ShowType": 2, "ShowId": 81000, "LimitCoin": 125000000, @@ -5900,7 +5789,6 @@ "GameRule": 30300, "GameType": 3, "SceneType": 4, - "Desc": "0", "ShowType": 2, "ShowId": 81000, "LimitCoin": 250000000, @@ -5939,7 +5827,6 @@ "GameRule": 30400, "GameType": 3, "SceneType": 1, - "Desc": "0", "ShowType": 2, "ShowId": 82000, "LimitCoin": 1000000, @@ -5978,7 +5865,6 @@ "GameRule": 30400, "GameType": 3, "SceneType": 2, - "Desc": "0", "ShowType": 2, "ShowId": 82000, "LimitCoin": 100000000, @@ -6017,7 +5903,6 @@ "GameRule": 30400, "GameType": 3, "SceneType": 3, - "Desc": "0", "ShowType": 2, "ShowId": 82000, "LimitCoin": 200000000, @@ -6056,7 +5941,6 @@ "GameRule": 30500, "GameType": 3, "SceneType": 1, - "Desc": "0", "ShowType": 2, "ShowId": 83000, "LimitCoin": 1000000, @@ -6097,7 +5981,6 @@ "GameRule": 30500, "GameType": 3, "SceneType": 2, - "Desc": "0", "ShowType": 2, "ShowId": 83000, "LimitCoin": 125000000, @@ -6138,7 +6021,6 @@ "GameRule": 30500, "GameType": 3, "SceneType": 3, - "Desc": "0", "ShowType": 2, "ShowId": 83000, "LimitCoin": 250000000, @@ -6179,7 +6061,6 @@ "GameRule": 30600, "GameType": 3, "SceneType": 1, - "Desc": "0", "ShowType": 2, "ShowId": 33001, "LimitCoin": 10000, @@ -6219,7 +6100,6 @@ "GameRule": 30600, "GameType": 3, "SceneType": 2, - "Desc": "0", "ShowType": 2, "ShowId": 33001, "LimitCoin": 100000, @@ -6259,7 +6139,6 @@ "GameRule": 30600, "GameType": 3, "SceneType": 3, - "Desc": "0", "ShowType": 2, "ShowId": 33001, "LimitCoin": 1000000, @@ -6299,7 +6178,6 @@ "GameRule": 30600, "GameType": 3, "SceneType": 4, - "Desc": "0", "ShowType": 2, "ShowId": 33001, "LimitCoin": 10000000, @@ -6339,7 +6217,6 @@ "GameRule": 30700, "GameType": 3, "SceneType": 1, - "Desc": "0", "ShowType": 2, "ShowId": 34001, "LimitCoin": 10000, @@ -6379,7 +6256,6 @@ "GameRule": 30700, "GameType": 3, "SceneType": 2, - "Desc": "0", "ShowType": 2, "ShowId": 34001, "LimitCoin": 100000, @@ -6419,7 +6295,6 @@ "GameRule": 30700, "GameType": 3, "SceneType": 3, - "Desc": "0", "ShowType": 2, "ShowId": 34001, "LimitCoin": 1000000, @@ -6459,7 +6334,6 @@ "GameRule": 30700, "GameType": 3, "SceneType": 4, - "Desc": "0", "ShowType": 2, "ShowId": 34001, "LimitCoin": 10000000, @@ -6499,7 +6373,6 @@ "GameRule": 30800, "GameType": 3, "SceneType": 1, - "Desc": "0", "ShowType": 2, "ShowId": 30800, "LimitCoin": 10000, @@ -6533,7 +6406,6 @@ "GameRule": 30900, "GameType": 3, "SceneType": 1, - "Desc": "0", "ShowType": 2, "ShowId": 30900, "LimitCoin": 10000, @@ -6567,7 +6439,6 @@ "GameRule": 31000, "GameType": 3, "SceneType": 1, - "Desc": "0", "ShowType": 2, "ShowId": 31000, "LimitCoin": 10000, @@ -6601,7 +6472,6 @@ "GameRule": 31100, "GameType": 3, "SceneType": 1, - "Desc": "0", "ShowType": 2, "ShowId": 31100, "LimitCoin": 10000, @@ -6635,7 +6505,6 @@ "GameRule": 31200, "GameType": 3, "SceneType": 1, - "Desc": "0", "ShowType": 2, "ShowId": 31200, "LimitCoin": 10000, @@ -6661,6 +6530,72 @@ "PlayerWaterRate": 100, "BetWaterRate": 100 }, + { + "Id": 3130001, + "Name": "CashMania", + "Title": "1", + "GameId": 313, + "GameRule": 31300, + "GameType": 3, + "SceneType": 1, + "ShowType": 2, + "ShowId": 31300, + "LimitCoin": 10000, + "BaseScore": 1000, + "Turn": 31300, + "BetDec": "1000", + "Ai": [ + 0 + ], + "OtherIntParams": [ + 0 + ], + "RobotNumRng": [ + 0 + ], + "SameIpLimit": 1, + "GameDif": "313", + "GameClass": 2, + "PlatformName": "越南棋牌", + "MaxBetCoin": [ + 0 + ], + "PlayerWaterRate": 100, + "BetWaterRate": 100 + }, + { + "Id": 3140001, + "Name": "GatesOfOlympus", + "Title": "1", + "GameId": 314, + "GameRule": 31400, + "GameType": 3, + "SceneType": 1, + "ShowType": 2, + "ShowId": 31400, + "LimitCoin": 10000, + "BaseScore": 1000, + "Turn": 31400, + "BetDec": "1000", + "Ai": [ + 0 + ], + "OtherIntParams": [ + 0 + ], + "RobotNumRng": [ + 0 + ], + "SameIpLimit": 1, + "GameDif": "314", + "GameClass": 2, + "PlatformName": "越南棋牌", + "MaxBetCoin": [ + 0 + ], + "PlayerWaterRate": 100, + "BetWaterRate": 100 + }, { "Id": 6080001, "Name": "娃娃机", @@ -6669,7 +6604,6 @@ "GameRule": 60800, "GameType": 1, "SceneType": 1, - "Desc": "0", "ShowType": 3, "ShowId": 60800, "BaseScore": 1000, @@ -6702,7 +6636,6 @@ "GameRule": 60800, "GameType": 1, "SceneType": 2, - "Desc": "0", "ShowType": 3, "ShowId": 60800, "BaseScore": 1000, @@ -6735,7 +6668,6 @@ "GameRule": 60800, "GameType": 1, "SceneType": 3, - "Desc": "0", "ShowType": 3, "ShowId": 60800, "BaseScore": 1000, @@ -6768,7 +6700,6 @@ "GameRule": 60800, "GameType": 1, "SceneType": 4, - "Desc": "0", "ShowType": 3, "ShowId": 60800, "BaseScore": 1000, diff --git a/data/DB_GameRule.dat b/data/DB_GameRule.dat index c2dfcc4..5377feb 100644 Binary files a/data/DB_GameRule.dat and b/data/DB_GameRule.dat differ diff --git a/data/DB_GameRule.json b/data/DB_GameRule.json index 3975258..4860e87 100644 --- a/data/DB_GameRule.json +++ b/data/DB_GameRule.json @@ -71,7 +71,7 @@ "Name": "十三张(四人场)", "GameId": 211, "Params": [ - 0, + 4, 0, 30, 50, @@ -84,7 +84,7 @@ "Name": "十三张(八人场)", "GameId": 212, "Params": [ - 1, + 8, 0, 30, 50, @@ -97,7 +97,7 @@ "Name": "十三张(自由场经典场)", "GameId": 213, "Params": [ - 1, + 8, 0, 30, 50, @@ -110,7 +110,7 @@ "Name": "十三张(自由场癞子场)", "GameId": 214, "Params": [ - 1, + 8, 0, 30, 50, @@ -250,6 +250,18 @@ "GameId": 312, "GameDif": "312" }, + { + "Id": 31300, + "Name": "CashMania", + "GameId": 313, + "GameDif": "313" + }, + { + "Id": 31400, + "Name": "GatesOfOlympus", + "GameId": 314, + "GameDif": "314" + }, { "Id": 60800, "Name": "娃娃机", diff --git a/data/DB_GiftCard.dat b/data/DB_GiftCard.dat index 96640b0..1560036 100644 Binary files a/data/DB_GiftCard.dat and b/data/DB_GiftCard.dat differ diff --git a/data/DB_PropExchange.dat b/data/DB_PropExchange.dat index 804f106..8f64d81 100644 Binary files a/data/DB_PropExchange.dat and b/data/DB_PropExchange.dat differ diff --git a/data/DB_Task.dat b/data/DB_Task.dat index adeaa2c..c77b7fd 100644 Binary files a/data/DB_Task.dat and b/data/DB_Task.dat differ diff --git a/gamerule/thirteen/constants.go b/gamerule/thirteen/constants.go index 64d4508..d3eb482 100644 --- a/gamerule/thirteen/constants.go +++ b/gamerule/thirteen/constants.go @@ -34,6 +34,7 @@ const ( ThirteenWaterPlayerOpTest = 3 // test ThirteenWaterPlayerOpReset = 4 // 重新选牌 ThirteenWaterPlayerJoin = 5 // 加入游戏 + ThirteenWaterPlayerOpSelect = 6 // 预选牌 ) const ( ThirteenWaterSceneWaitTimeout = time.Second * 2 //等待倒计时 diff --git a/gamesrv/base/scene.go b/gamesrv/base/scene.go index cb10fac..7dfe670 100644 --- a/gamesrv/base/scene.go +++ b/gamesrv/base/scene.go @@ -1471,7 +1471,7 @@ func (this *Scene) SaveGameDetailedLog(param *SaveGameDetailedParam) { return } - if param.GameTime < 0 { + if param.GameTime <= 0 { param.GameTime = int64(time.Now().Sub(this.GameNowTime).Seconds()) } diff --git a/gamesrv/thirteen/player.go b/gamesrv/thirteen/player.go index f3d5a70..d59c380 100644 --- a/gamesrv/thirteen/player.go +++ b/gamesrv/thirteen/player.go @@ -12,6 +12,7 @@ type PlayerEx struct { cards [13]int //手牌信息 allGroup map[int]*thirteen.Group //玩家所有牌型 cardsO *thirteen.Group //确定的牌型信息 + preCardsO *thirteen.Group //预确定的牌型 isDP bool // 是否倒排 gainCoin int64 //本局赢的金币 taxCoin int64 //本局税收 @@ -36,6 +37,7 @@ func (this *PlayerEx) Clear() { } this.allGroup = make(map[int]*thirteen.Group) this.cardsO = &thirteen.Group{Head: [3]int{-1, -1, -1}, Mid: [5]int{-1, -1, -1, -1, -1}, End: [5]int{-1, -1, -1, -1, -1}, PokerType: -1} + this.preCardsO = &thirteen.Group{Head: [3]int{-1, -1, -1}, Mid: [5]int{-1, -1, -1, -1, -1}, End: [5]int{-1, -1, -1, -1, -1}, PokerType: -1} this.isDP = false this.gainCoin = 0 this.taxCoin = 0 diff --git a/gamesrv/thirteen/scenepolicy.go b/gamesrv/thirteen/scenepolicy.go index b7a3fd9..05d9b36 100644 --- a/gamesrv/thirteen/scenepolicy.go +++ b/gamesrv/thirteen/scenepolicy.go @@ -870,6 +870,7 @@ func (this *StateOp) OnPlayerOp(s *base.Scene, p *base.Player, opcode int, param } else { sceneEx.SendSelectCards(playerEx, int(params[0]), int64(opcode)) } + playerEx.preCardsO = &rule.Group{Head: [3]int{-1, -1, -1}, Mid: [5]int{-1, -1, -1, -1, -1}, End: [5]int{-1, -1, -1, -1, -1}, PokerType: -1} playerEx.Trusteeship = 0 playerEx.UnmarkFlag(base.PlayerState_Auto) playerEx.deterMine = true @@ -886,6 +887,34 @@ func (this *StateOp) OnPlayerOp(s *base.Scene, p *base.Player, opcode int, param //提前进入亮牌阶段 s.ChangeSceneState(rule.ThirteenWaterSceneStateShowCards) } + + case rule.ThirteenWaterPlayerOpSelect: + playerEx.deterMine = false + playerEx.cardsO = &rule.Group{Head: [3]int{-1, -1, -1}, Mid: [5]int{-1, -1, -1, -1, -1}, End: [5]int{-1, -1, -1, -1, -1}, PokerType: -1} + playerEx.Trusteeship = 0 + playerEx.UnmarkFlag(base.PlayerState_Auto) + pack := &thirteen.SCThirteenPlayerOp{ + OpRetCode: thirteen.OpResultCode_OPRC_Sucess, + OpCode: int32(opcode), + OpParam: params, + Pos: int32(playerEx.GetPos()), + } + if len(params) == 13 { + //校验牌 + a := rule.DelCards(playerEx.cards[:], common.Int64Toint(params)) + if len(a) != 0 { + logger.Logger.Error("the cards is error.") + returnFunc(thirteen.OpResultCode_OPRC_Error) + return true + } + //牌赋值 + copy(playerEx.preCardsO.Head[:], common.Int64Toint(params[:3])) + copy(playerEx.preCardsO.Mid[:], common.Int64Toint(params[3:8])) + copy(playerEx.preCardsO.End[:], common.Int64Toint(params[8:])) + playerEx.preCardsO.PokerType = 0 + } + playerEx.SendToClient(int(thirteen.TWMmoPacketID_PACKET_SCThirteenPlayerOp), pack) + case rule.ThirteenWaterPlayerOpReset: // 取消确认 playerEx.deterMine = false @@ -913,6 +942,11 @@ func (this *StateOp) OnLeave(s *base.Scene) { for _, player := range sceneEx.players { if player != nil && player.IsGameing() { + // 使用预选牌 + if player.preCardsO != nil && player.preCardsO.PokerType != -1 && (player.cardsO == nil || player.cardsO.PokerType == -1) { + player.cardsO = player.preCardsO + } + // 判断是否倒水 if player.cardsO != nil && player.cardsO.PokerType != -1 { if player.cardsO.PokerType < 1000000 { player.isDP = sceneEx.logic.IsDP(player.cardsO.Head, player.cardsO.Mid, player.cardsO.End) @@ -1234,11 +1268,8 @@ func (this *StateHit) OnEnter(s *base.Scene) { } } } - if sceneEx.isCanAllHitPos != -1 { - hitNum++ - } - // 每个打枪加1秒，全垒打再加1秒 - sceneEx.hitTime += time.Second * (time.Duration(hitNum)) + // 每个打枪加2秒，全垒打再加2秒 + sceneEx.hitTime += time.Second * 2 * (time.Duration(hitNum)) sceneEx.ShowCards() } } @@ -1334,7 +1365,7 @@ func (this *StateBilled) OnEnter(s *base.Scene) { RoomType: sceneEx.GetSceneType(), BaseScore: int32(sceneEx.GetBaseScore()), NowRound: int32(sceneEx.NumOfGames), - ClubRate: sceneEx.Scene.PumpCoin, + TaxRate: s.GetDBGameFree().GetTaxRate(), } var person []model.ThirteenWaterPerson for _, o_player := range sceneEx.players { diff --git a/model/gamelogtype.go b/model/gamelogtype.go index 4ca1a01..d9f4185 100644 --- a/model/gamelogtype.go +++ b/model/gamelogtype.go @@ -168,8 +168,8 @@ type ThirteenWaterType struct { NowRound int32 //当前局数 PlayerCount int //玩家数量 BaseScore int32 //底分 + TaxRate int32 //税率（万分比） PlayerData []ThirteenWaterPerson //玩家信息 - ClubRate int32 //俱乐部抽水比例 } type ThirteenWaterPoker struct { diff --git a/protocol/server/pbdata.pb.go b/protocol/server/pbdata.pb.go index ad646df..4175a82 100644 --- a/protocol/server/pbdata.pb.go +++ b/protocol/server/pbdata.pb.go @@ -4238,10 +4238,10 @@ type DB_GameFree struct { FreeMode int32 `protobuf:"varint,6,opt,name=FreeMode,proto3" json:"FreeMode,omitempty"` GameRule int32 `protobuf:"varint,7,opt,name=GameRule,proto3" json:"GameRule,omitempty"` GameType int32 `protobuf:"varint,8,opt,name=GameType,proto3" json:"GameType,omitempty"` - SceneType int32 `protobuf:"varint,9,opt,name=SceneType,proto3" json:"SceneType,omitempty"` - RankType int32 `protobuf:"varint,10,opt,name=RankType,proto3" json:"RankType,omitempty"` - SceneAdd int32 `protobuf:"varint,11,opt,name=SceneAdd,proto3" json:"SceneAdd,omitempty"` - Desc string `protobuf:"bytes,12,opt,name=Desc,proto3" json:"Desc,omitempty"` + Desc string `protobuf:"bytes,9,opt,name=Desc,proto3" json:"Desc,omitempty"` + SceneType int32 `protobuf:"varint,10,opt,name=SceneType,proto3" json:"SceneType,omitempty"` + RankType int32 `protobuf:"varint,11,opt,name=RankType,proto3" json:"RankType,omitempty"` + SceneAdd int32 `protobuf:"varint,12,opt,name=SceneAdd,proto3" json:"SceneAdd,omitempty"` ShowType int32 `protobuf:"varint,13,opt,name=ShowType,proto3" json:"ShowType,omitempty"` SubShowType int32 `protobuf:"varint,14,opt,name=SubShowType,proto3" json:"SubShowType,omitempty"` Flag int32 `protobuf:"varint,15,opt,name=Flag,proto3" json:"Flag,omitempty"` @@ -4393,6 +4393,13 @@ func (x *DB_GameFree) GetGameType() int32 { return 0 } +func (x *DB_GameFree) GetDesc() string { + if x != nil { + return x.Desc + } + return "" +} + func (x *DB_GameFree) GetSceneType() int32 { if x != nil { return x.SceneType @@ -4414,13 +4421,6 @@ func (x *DB_GameFree) GetSceneAdd() int32 { return 0 } -func (x *DB_GameFree) GetDesc() string { - if x != nil { - return x.Desc - } - return "" -} - func (x *DB_GameFree) GetShowType() int32 { if x != nil { return x.ShowType @@ -11426,14 +11426,14 @@ var file_protocol_server_pbdata_proto_rawDesc = []byte{ 0x65, 0x65, 0x4d, 0x6f, 0x64, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x47, 0x61, 0x6d, 0x65, 0x52, 0x75, 0x6c, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x47, 0x61, 0x6d, 0x65, 0x52, 0x75, 0x6c, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x47, 0x61, 0x6d, 0x65, 0x54, 0x79, 0x70, 0x65, 0x18, 0x08, - 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x47, 0x61, 0x6d, 0x65, 0x54, 0x79, 0x70, 0x65, 0x12, 0x1c, - 0x0a, 0x09, 0x53, 0x63, 0x65, 0x6e, 0x65, 0x54, 0x79, 0x70, 0x65, 0x18, 0x09, 0x20, 0x01, 0x28, - 0x05, 0x52, 0x09, 0x53, 0x63, 0x65, 0x6e, 0x65, 0x54, 0x79, 0x70, 0x65, 0x12, 0x1a, 0x0a, 0x08, - 0x52, 0x61, 0x6e, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, - 0x52, 0x61, 0x6e, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x53, 0x63, 0x65, 0x6e, - 0x65, 0x41, 0x64, 0x64, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x53, 0x63, 0x65, 0x6e, - 0x65, 0x41, 0x64, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x44, 0x65, 0x73, 0x63, 0x18, 0x0c, 0x20, 0x01, - 0x28, 0x09, 0x52, 0x04, 0x44, 0x65, 0x73, 0x63, 0x12, 0x1a, 0x0a, 0x08, 0x53, 0x68, 0x6f, 0x77, + 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x47, 0x61, 0x6d, 0x65, 0x54, 0x79, 0x70, 0x65, 0x12, 0x12, + 0x0a, 0x04, 0x44, 0x65, 0x73, 0x63, 0x18, 0x09, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x44, 0x65, + 0x73, 0x63, 0x12, 0x1c, 0x0a, 0x09, 0x53, 0x63, 0x65, 0x6e, 0x65, 0x54, 0x79, 0x70, 0x65, 0x18, + 0x0a, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x53, 0x63, 0x65, 0x6e, 0x65, 0x54, 0x79, 0x70, 0x65, + 0x12, 0x1a, 0x0a, 0x08, 0x52, 0x61, 0x6e, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x18, 0x0b, 0x20, 0x01, + 0x28, 0x05, 0x52, 0x08, 0x52, 0x61, 0x6e, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x12, 0x1a, 0x0a, 0x08, + 0x53, 0x63, 0x65, 0x6e, 0x65, 0x41, 0x64, 0x64, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, + 0x53, 0x63, 0x65, 0x6e, 0x65, 0x41, 0x64, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x53, 0x68, 0x6f, 0x77, 0x54, 0x79, 0x70, 0x65, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x53, 0x68, 0x6f, 0x77, 0x54, 0x79, 0x70, 0x65, 0x12, 0x20, 0x0a, 0x0b, 0x53, 0x75, 0x62, 0x53, 0x68, 0x6f, 0x77, 0x54, 0x79, 0x70, 0x65, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0b, 0x53, 0x75, 0x62, 0x53, 0x68, diff --git a/protocol/server/pbdata.proto b/protocol/server/pbdata.proto index 3995b67..a924516 100644 --- a/protocol/server/pbdata.proto +++ b/protocol/server/pbdata.proto @@ -709,13 +709,13 @@ message DB_GameFree { int32 GameType = 8; - int32 SceneType = 9; + string Desc = 9; - int32 RankType = 10; + int32 SceneType = 10; - int32 SceneAdd = 11; + int32 RankType = 11; - string Desc = 12; + int32 SceneAdd = 12; int32 ShowType = 13; diff --git a/worldsrv/friendmgr.go b/worldsrv/friendmgr.go index 4a8e394..c10caea 100644 --- a/worldsrv/friendmgr.go +++ b/worldsrv/friendmgr.go @@ -511,7 +511,7 @@ func (this *FriendMgr) FriendApply(p *Player, destP *model.BindFriend) { // p 同意者 // destP 申请者 func (this *FriendMgr) FriendAgree(p *Player, destP *model.BindFriend) { - var applyList []int32 + var applyList, meApplyList []int32 SendToClick := func(retCode friend.OpResultCode, self ...bool) { pack := &friend.SCFriendOp{ OpCode: proto.Int32(OpTypeAgree), @@ -534,6 +534,10 @@ func (this *FriendMgr) FriendAgree(p *Player, destP *model.BindFriend) { RoleId: int32(roleId), } p.SendToClient(int(friend.FriendPacketID_PACKET_SCFriendOp), pack) + if meApplyList != nil { + p.ApplyList = meApplyList + this.SendApplyList(p) + } } else { destPs := PlayerMgrSington.GetPlayerBySnId(destP.SnId) if destPs != nil && destPs.IsOnLine() { @@ -608,52 +612,73 @@ func (this *FriendMgr) FriendAgree(p *Player, destP *model.BindFriend) { } } - ret, err := model.QueryFriendApplyBySnid(p.Platform, p.SnId) - if err != nil { - return friend.OpResultCode_OPRC_Error - } - // 维护申请放和被申请方的申请列表 - //查看是否在申请列表 - if ret != nil { - if ret.ApplySnids != nil { - for i, as := range ret.ApplySnids { - if as.SnId == destP.SnId { - // 删除被申请者的申请列表 - ret.ApplySnids = append(ret.ApplySnids[:i], ret.ApplySnids[i+1:]...) - model.UpsertFriendApply(p.Platform, p.SnId, ret) - - // 删除发起方的申请列表 - data, err := model.QueryFriendApplyListBySnid(p.Platform, destP.SnId) - if err != nil { - logger.Logger.Errorf("QueryFriendApplyListBySnid err:%v", err) - } else { - if data == nil { - data = model.NewApplyList(destP.SnId) - } - for k, v := range data.List { - if v == p.SnId { - data.List = append(data.List[:k], data.List[k+1:]...) - model.UpsertApplyList(p.Platform, data) - applyList = data.List - break - } - } - } - - // 保存好友关系 - if friendDB != nil { - friendDB.BindFriend = append(friendDB.BindFriend, &model.BindFriend{ - SnId: p.SnId, - CreateTime: time.Now().Unix(), - }) - model.UpsertFriend(friendDB) - } - return nil + // 删除申请者的申请列表 + delApplyListFunc := func(plt string, snid int32, applySnid int32) friend.OpResultCode { + // 删除被申请者的申请列表 + list1, err := model.QueryFriendApplyBySnid(plt, snid) + if err != nil { + logger.Logger.Errorf("QueryFriendApplyBySnid %v error: %v", snid, err) + return friend.OpResultCode_OPRC_Error + } + if list1 != nil { + k := 0 + for k < len(list1.ApplySnids) { + if list1.ApplySnids[k].SnId == applySnid { + list1.ApplySnids = append(list1.ApplySnids[:k], list1.ApplySnids[k+1:]...) + model.UpsertFriendApply(plt, snid, list1) + } else { + k++ } } } + // 删除发起方的申请列表 + list2, err := model.QueryFriendApplyListBySnid(plt, applySnid) + if err != nil { + logger.Logger.Errorf("QueryFriendApplyListBySnid %v error: %v", applySnid, err) + return friend.OpResultCode_OPRC_Error + } + if list2 != nil { + k := 0 + for k < len(list2.List) { + if list2.List[k] == snid { + list2.List = append(list2.List[:k], list2.List[k+1:]...) + model.UpsertApplyList(plt, list2) + } else { + k++ + } + } + } + + if applySnid == destP.SnId && list2 != nil { + applyList = list2.List + } + + if applySnid == p.SnId && list2 != nil { + meApplyList = list2.List + } + + return friend.OpResultCode_OPRC_Sucess } - return friend.OpResultCode_OPRC_Error + + //查看是否在申请列表 + code := delApplyListFunc(p.Platform, p.SnId, destP.SnId) + if code != friend.OpResultCode_OPRC_Sucess { + return code + } + code = delApplyListFunc(p.Platform, destP.SnId, p.SnId) + if code != friend.OpResultCode_OPRC_Sucess { + return code + } + // 保存好友关系 + if friendDB != nil { + friendDB.BindFriend = append(friendDB.BindFriend, &model.BindFriend{ + SnId: p.SnId, + CreateTime: time.Now().Unix(), + }) + model.UpsertFriend(friendDB) + } + + return nil }), task.CompleteNotifyWrapper(func(data interface{}, tt task.Task) { if data != nil { logger.Logger.Error("FriendAgree data:", data) diff --git a/xlsx/DB_GameFree.xlsx b/xlsx/DB_GameFree.xlsx index 2e8f155..23f9d0c 100644 Binary files a/xlsx/DB_GameFree.xlsx and b/xlsx/DB_GameFree.xlsx differ diff --git a/xlsx/DB_GameRule.xlsx b/xlsx/DB_GameRule.xlsx index 1d7b71f..1c38755 100644 Binary files a/xlsx/DB_GameRule.xlsx and b/xlsx/DB_GameRule.xlsx differ