diff --git a/data/DB_GameFree.dat b/data/DB_GameFree.dat index 28559c2..4b9a383 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 2c148d0..cdb6134 100644 --- a/data/DB_GameFree.json +++ b/data/DB_GameFree.json @@ -9,6 +9,7 @@ "GameRule": 20700, "GameType": 2, "SceneType": 1, + "Desc": "0", "ShowType": 3, "ShowId": 44001, "LimitCoin": 200000, @@ -66,6 +67,7 @@ "GameRule": 20700, "GameType": 2, "SceneType": 2, + "Desc": "0", "ShowType": 3, "ShowId": 44001, "LimitCoin": 1000000, @@ -123,6 +125,7 @@ "GameRule": 20700, "GameType": 2, "SceneType": 3, + "Desc": "0", "ShowType": 3, "ShowId": 44001, "LimitCoin": 4000000, @@ -180,6 +183,7 @@ "GameRule": 20800, "GameType": 2, "SceneType": 1, + "Desc": "0", "ShowType": 3, "ShowId": 44001, "LimitCoin": 1000000, @@ -237,6 +241,7 @@ "GameRule": 20800, "GameType": 2, "SceneType": 2, + "Desc": "0", "ShowType": 3, "ShowId": 44001, "LimitCoin": 5000000, @@ -294,6 +299,7 @@ "GameRule": 20800, "GameType": 2, "SceneType": 3, + "Desc": "0", "ShowType": 3, "ShowId": 44001, "LimitCoin": 20000000, @@ -351,6 +357,7 @@ "GameRule": 20900, "GameType": 2, "SceneType": 1, + "Desc": "0", "ShowType": 3, "ShowId": 44001, "LimitCoin": 200000, @@ -408,6 +415,7 @@ "GameRule": 20900, "GameType": 2, "SceneType": 2, + "Desc": "0", "ShowType": 3, "ShowId": 44001, "LimitCoin": 1000000, @@ -465,6 +473,7 @@ "GameRule": 20900, "GameType": 2, "SceneType": 3, + "Desc": "0", "ShowType": 3, "ShowId": 44001, "LimitCoin": 4000000, @@ -522,6 +531,7 @@ "GameRule": 21000, "GameType": 2, "SceneType": 1, + "Desc": "0", "ShowType": 3, "ShowId": 44001, "LimitCoin": 200000, @@ -579,6 +589,7 @@ "GameRule": 21000, "GameType": 2, "SceneType": 2, + "Desc": "0", "ShowType": 3, "ShowId": 44001, "LimitCoin": 1000000, @@ -636,6 +647,7 @@ "GameRule": 21000, "GameType": 2, "SceneType": 3, + "Desc": "0", "ShowType": 3, "ShowId": 44001, "LimitCoin": 4000000, @@ -692,6 +704,7 @@ "GameRule": 24000, "GameType": 2, "SceneType": 1, + "Desc": "0", "ShowType": 3, "ShowId": 44001, "LimitCoin": 200000, @@ -748,6 +761,7 @@ "GameRule": 24000, "GameType": 2, "SceneType": 2, + "Desc": "0", "ShowType": 3, "ShowId": 44001, "LimitCoin": 1000000, @@ -804,6 +818,7 @@ "GameRule": 24000, "GameType": 2, "SceneType": 3, + "Desc": "0", "ShowType": 3, "ShowId": 44001, "LimitCoin": 4000000, @@ -859,6 +874,7 @@ "GameRule": 24000, "GameType": 2, "SceneType": 4, + "Desc": "0", "ShowType": 3, "ShowId": 44001, "LimitCoin": 20000000, @@ -913,6 +929,7 @@ "GameRule": 24000, "GameType": 2, "SceneType": 5, + "Desc": "0", "ShowType": 3, "ShowId": 44001, "LimitCoin": 100000000, @@ -967,6 +984,7 @@ "GameRule": 24000, "GameType": 2, "SceneType": 6, + "Desc": "0", "ShowType": 3, "ShowId": 44001, "LimitCoin": 400000000, @@ -1021,6 +1039,7 @@ "GameRule": 24400, "GameType": 2, "SceneType": 1, + "Desc": "0", "ShowType": 3, "ShowId": 44001, "LimitCoin": 200000, @@ -1077,6 +1096,7 @@ "GameRule": 24400, "GameType": 2, "SceneType": 2, + "Desc": "0", "ShowType": 3, "ShowId": 44001, "LimitCoin": 1000000, @@ -1133,6 +1153,7 @@ "GameRule": 24400, "GameType": 2, "SceneType": 3, + "Desc": "0", "ShowType": 3, "ShowId": 44001, "LimitCoin": 4000000, @@ -1188,6 +1209,7 @@ "GameRule": 24400, "GameType": 2, "SceneType": 4, + "Desc": "0", "ShowType": 3, "ShowId": 44001, "LimitCoin": 20000000, @@ -1242,6 +1264,7 @@ "GameRule": 24400, "GameType": 2, "SceneType": 5, + "Desc": "0", "ShowType": 3, "ShowId": 44001, "LimitCoin": 100000000, @@ -1296,6 +1319,7 @@ "GameRule": 24400, "GameType": 2, "SceneType": 6, + "Desc": "0", "ShowType": 3, "ShowId": 44001, "LimitCoin": 400000000, @@ -1350,6 +1374,7 @@ "GameRule": 24100, "GameType": 2, "SceneType": 1, + "Desc": "0", "ShowType": 3, "ShowId": 44001, "LimitCoin": 200000, @@ -1406,6 +1431,7 @@ "GameRule": 24100, "GameType": 2, "SceneType": 2, + "Desc": "0", "ShowType": 3, "ShowId": 44001, "LimitCoin": 1000000, @@ -1462,6 +1488,7 @@ "GameRule": 24100, "GameType": 2, "SceneType": 3, + "Desc": "0", "ShowType": 3, "ShowId": 44001, "LimitCoin": 4000000, @@ -1517,6 +1544,7 @@ "GameRule": 24100, "GameType": 2, "SceneType": 4, + "Desc": "0", "ShowType": 3, "ShowId": 44001, "LimitCoin": 20000000, @@ -1571,6 +1599,7 @@ "GameRule": 24100, "GameType": 2, "SceneType": 5, + "Desc": "0", "ShowType": 3, "ShowId": 44001, "LimitCoin": 100000000, @@ -1625,6 +1654,7 @@ "GameRule": 24100, "GameType": 2, "SceneType": 6, + "Desc": "0", "ShowType": 3, "ShowId": 44001, "LimitCoin": 400000000, @@ -1679,6 +1709,7 @@ "GameRule": 24500, "GameType": 2, "SceneType": 1, + "Desc": "0", "ShowType": 3, "ShowId": 44001, "LimitCoin": 200000, @@ -1735,6 +1766,7 @@ "GameRule": 24500, "GameType": 2, "SceneType": 2, + "Desc": "0", "ShowType": 3, "ShowId": 44001, "LimitCoin": 1000000, @@ -1791,6 +1823,7 @@ "GameRule": 24500, "GameType": 2, "SceneType": 3, + "Desc": "0", "ShowType": 3, "ShowId": 44001, "LimitCoin": 4000000, @@ -1846,6 +1879,7 @@ "GameRule": 24500, "GameType": 2, "SceneType": 4, + "Desc": "0", "ShowType": 3, "ShowId": 44001, "LimitCoin": 20000000, @@ -1900,6 +1934,7 @@ "GameRule": 24500, "GameType": 2, "SceneType": 5, + "Desc": "0", "ShowType": 3, "ShowId": 44001, "LimitCoin": 100000000, @@ -1954,6 +1989,7 @@ "GameRule": 24500, "GameType": 2, "SceneType": 6, + "Desc": "0", "ShowType": 3, "ShowId": 44001, "LimitCoin": 400000000, @@ -2010,6 +2046,7 @@ "SceneType": 1, "RankType": 1, "SceneAdd": 5, + "Desc": "0", "ShowType": 3, "ShowId": 44001, "LimitCoin": 200000, @@ -2068,6 +2105,7 @@ "SceneType": 2, "RankType": 1, "SceneAdd": 10, + "Desc": "0", "ShowType": 3, "ShowId": 44001, "LimitCoin": 1000000, @@ -2126,6 +2164,7 @@ "SceneType": 3, "RankType": 1, "SceneAdd": 15, + "Desc": "0", "ShowType": 3, "ShowId": 44001, "LimitCoin": 4000000, @@ -2183,6 +2222,7 @@ "SceneType": 4, "RankType": 1, "SceneAdd": 20, + "Desc": "0", "ShowType": 3, "ShowId": 44001, "LimitCoin": 20000000, @@ -2239,6 +2279,7 @@ "SceneType": 5, "RankType": 1, "SceneAdd": 30, + "Desc": "0", "ShowType": 3, "ShowId": 44001, "LimitCoin": 100000000, @@ -2295,6 +2336,7 @@ "SceneType": 6, "RankType": 1, "SceneAdd": 50, + "Desc": "0", "ShowType": 3, "ShowId": 44001, "LimitCoin": 400000000, @@ -2351,6 +2393,7 @@ "SceneType": 1, "RankType": 1, "SceneAdd": 5, + "Desc": "0", "ShowType": 3, "ShowId": 44001, "LimitCoin": 200000, @@ -2409,6 +2452,7 @@ "SceneType": 2, "RankType": 1, "SceneAdd": 10, + "Desc": "0", "ShowType": 3, "ShowId": 44001, "LimitCoin": 1000000, @@ -2467,6 +2511,7 @@ "SceneType": 3, "RankType": 1, "SceneAdd": 15, + "Desc": "0", "ShowType": 3, "ShowId": 44001, "LimitCoin": 4000000, @@ -2524,6 +2569,7 @@ "SceneType": 4, "RankType": 1, "SceneAdd": 20, + "Desc": "0", "ShowType": 3, "ShowId": 44001, "LimitCoin": 20000000, @@ -2580,6 +2626,7 @@ "SceneType": 5, "RankType": 1, "SceneAdd": 30, + "Desc": "0", "ShowType": 3, "ShowId": 44001, "LimitCoin": 100000000, @@ -2636,6 +2683,7 @@ "SceneType": 6, "RankType": 1, "SceneAdd": 50, + "Desc": "0", "ShowType": 3, "ShowId": 44001, "LimitCoin": 400000000, @@ -2692,6 +2740,7 @@ "SceneType": 1, "RankType": 1, "SceneAdd": 5, + "Desc": "0", "ShowType": 3, "ShowId": 44001, "LimitCoin": 200000, @@ -2750,6 +2799,7 @@ "SceneType": 2, "RankType": 1, "SceneAdd": 10, + "Desc": "0", "ShowType": 3, "ShowId": 44001, "LimitCoin": 1000000, @@ -2808,6 +2858,7 @@ "SceneType": 3, "RankType": 1, "SceneAdd": 15, + "Desc": "0", "ShowType": 3, "ShowId": 44001, "LimitCoin": 4000000, @@ -2865,6 +2916,7 @@ "SceneType": 4, "RankType": 1, "SceneAdd": 20, + "Desc": "0", "ShowType": 3, "ShowId": 44001, "LimitCoin": 20000000, @@ -2921,6 +2973,7 @@ "SceneType": 5, "RankType": 1, "SceneAdd": 30, + "Desc": "0", "ShowType": 3, "ShowId": 44001, "LimitCoin": 100000000, @@ -2977,6 +3030,7 @@ "SceneType": 6, "RankType": 1, "SceneAdd": 50, + "Desc": "0", "ShowType": 3, "ShowId": 44001, "LimitCoin": 400000000, @@ -3033,6 +3087,7 @@ "SceneType": 1, "RankType": 1, "SceneAdd": 5, + "Desc": "0", "ShowType": 3, "ShowId": 44001, "LimitCoin": 200000, @@ -3091,6 +3146,7 @@ "SceneType": 2, "RankType": 1, "SceneAdd": 10, + "Desc": "0", "ShowType": 3, "ShowId": 44001, "LimitCoin": 1000000, @@ -3149,6 +3205,7 @@ "SceneType": 3, "RankType": 1, "SceneAdd": 15, + "Desc": "0", "ShowType": 3, "ShowId": 44001, "LimitCoin": 4000000, @@ -3206,6 +3263,7 @@ "SceneType": 4, "RankType": 1, "SceneAdd": 20, + "Desc": "0", "ShowType": 3, "ShowId": 44001, "LimitCoin": 20000000, @@ -3262,6 +3320,7 @@ "SceneType": 5, "RankType": 1, "SceneAdd": 30, + "Desc": "0", "ShowType": 3, "ShowId": 44001, "LimitCoin": 100000000, @@ -3318,6 +3377,7 @@ "SceneType": 6, "RankType": 1, "SceneAdd": 50, + "Desc": "0", "ShowType": 3, "ShowId": 44001, "LimitCoin": 400000000, @@ -3372,6 +3432,7 @@ "GameRule": 21500, "GameType": 2, "SceneType": 1, + "Desc": "0", "ShowType": 3, "BaseScore": 10, "BetDec": "10", @@ -3396,6 +3457,7 @@ "GameRule": 21600, "GameType": 2, "SceneType": 1, + "Desc": "0", "ShowType": 3, "BaseScore": 10, "BetDec": "10", @@ -3420,6 +3482,7 @@ "GameRule": 21700, "GameType": 2, "SceneType": 1, + "Desc": "0", "ShowType": 3, "BaseScore": 10, "BetDec": "10", @@ -3444,6 +3507,7 @@ "GameRule": 21800, "GameType": 2, "SceneType": 1, + "Desc": "0", "ShowType": 3, "BaseScore": 10, "BetDec": "10", @@ -3468,6 +3532,7 @@ "GameRule": 20700, "GameType": 2, "SceneType": 1, + "Desc": "0", "ShowType": 3, "LimitCoin": 1000, "BaseScore": 10, @@ -3515,6 +3580,7 @@ "GameRule": 20900, "GameType": 2, "SceneType": 1, + "Desc": "0", "ShowType": 3, "LimitCoin": 1000, "BaseScore": 10, @@ -3562,6 +3628,7 @@ "GameRule": 40100, "GameType": 4, "SceneType": 1, + "Desc": "0", "ShowId": 23001, "LimitCoin": 1000000, "Turn": 23001, @@ -3625,6 +3692,7 @@ "GameRule": 40100, "GameType": 4, "SceneType": 2, + "Desc": "0", "ShowId": 23001, "LimitCoin": 10000000, "Turn": 23001, @@ -3688,6 +3756,7 @@ "GameRule": 40100, "GameType": 4, "SceneType": 3, + "Desc": "0", "ShowId": 23001, "LimitCoin": 100000000, "Turn": 23001, @@ -3751,6 +3820,7 @@ "GameRule": 40100, "GameType": 4, "SceneType": 4, + "Desc": "0", "ShowId": 23001, "LimitCoin": 1000000000, "Turn": 23001, @@ -3814,6 +3884,7 @@ "GameRule": 52100, "GameType": 2, "SceneType": 1, + "Desc": "0", "ShowType": 3, "ShowId": 44001, "LimitCoin": 1000, @@ -3871,6 +3942,7 @@ "GameRule": 52100, "GameType": 2, "SceneType": 2, + "Desc": "0", "ShowType": 3, "ShowId": 44001, "LimitCoin": 3000, @@ -3928,6 +4000,7 @@ "GameRule": 52100, "GameType": 2, "SceneType": 3, + "Desc": "0", "ShowType": 3, "ShowId": 44001, "LimitCoin": 10000, @@ -3985,6 +4058,7 @@ "GameRule": 52100, "GameType": 2, "SceneType": 4, + "Desc": "0", "ShowType": 3, "ShowId": 44001, "LimitCoin": 20000, @@ -4042,6 +4116,7 @@ "GameRule": 52100, "GameType": 2, "SceneType": 5, + "Desc": "0", "ShowType": 3, "ShowId": 44001, "LimitCoin": 50000, @@ -4099,6 +4174,7 @@ "GameRule": 52200, "GameType": 2, "SceneType": 1, + "Desc": "0", "ShowType": 3, "ShowId": 44001, "Turn": 47000, @@ -4149,6 +4225,7 @@ "GameRule": 52200, "GameType": 2, "SceneType": 2, + "Desc": "0", "ShowType": 3, "ShowId": 44001, "Turn": 47000, @@ -4199,6 +4276,7 @@ "GameRule": 52200, "GameType": 2, "SceneType": 3, + "Desc": "0", "ShowType": 3, "ShowId": 44001, "Turn": 47000, @@ -4249,6 +4327,7 @@ "GameRule": 52200, "GameType": 2, "SceneType": 4, + "Desc": "0", "ShowType": 3, "ShowId": 44001, "Turn": 47000, @@ -4299,6 +4378,7 @@ "GameRule": 52200, "GameType": 2, "SceneType": 5, + "Desc": "0", "ShowType": 3, "ShowId": 44001, "Turn": 47000, @@ -4349,6 +4429,7 @@ "GameRule": 21100, "GameType": 2, "SceneType": 1, + "Desc": "0", "ShowType": 3, "ShowId": 44001, "LimitCoin": 250000, @@ -4401,6 +4482,7 @@ "GameRule": 21100, "GameType": 2, "SceneType": 2, + "Desc": "0", "ShowType": 3, "ShowId": 44001, "LimitCoin": 1000000, @@ -4453,6 +4535,7 @@ "GameRule": 21100, "GameType": 2, "SceneType": 3, + "Desc": "0", "ShowType": 3, "ShowId": 44001, "LimitCoin": 5000000, @@ -4504,6 +4587,7 @@ "GameRule": 21100, "GameType": 2, "SceneType": 4, + "Desc": "0", "ShowType": 3, "ShowId": 44001, "LimitCoin": 25000000, @@ -4555,6 +4639,7 @@ "GameRule": 21100, "GameType": 2, "SceneType": 5, + "Desc": "0", "ShowType": 3, "ShowId": 44001, "LimitCoin": 100000000, @@ -4606,6 +4691,7 @@ "GameRule": 21100, "GameType": 2, "SceneType": 6, + "Desc": "0", "ShowType": 3, "ShowId": 44001, "LimitCoin": 500000000, @@ -4657,6 +4743,7 @@ "GameRule": 21200, "GameType": 2, "SceneType": 1, + "Desc": "0", "ShowType": 3, "ShowId": 44001, "LimitCoin": 250000, @@ -4709,6 +4796,7 @@ "GameRule": 21200, "GameType": 2, "SceneType": 2, + "Desc": "0", "ShowType": 3, "ShowId": 44001, "LimitCoin": 1000000, @@ -4761,6 +4849,7 @@ "GameRule": 21200, "GameType": 2, "SceneType": 3, + "Desc": "0", "ShowType": 3, "ShowId": 44001, "LimitCoin": 5000000, @@ -4812,6 +4901,7 @@ "GameRule": 21200, "GameType": 2, "SceneType": 4, + "Desc": "0", "ShowType": 3, "ShowId": 44001, "LimitCoin": 25000000, @@ -4863,6 +4953,7 @@ "GameRule": 21200, "GameType": 2, "SceneType": 5, + "Desc": "0", "ShowType": 3, "ShowId": 44001, "LimitCoin": 100000000, @@ -4914,6 +5005,7 @@ "GameRule": 21200, "GameType": 2, "SceneType": 6, + "Desc": "0", "ShowType": 3, "ShowId": 44001, "LimitCoin": 500000000, @@ -4966,6 +5058,7 @@ "GameRule": 21300, "GameType": 2, "SceneType": 1, + "Desc": "0", "ShowType": 3, "ShowId": 44001, "LimitCoin": 250000, @@ -5019,6 +5112,7 @@ "GameRule": 21300, "GameType": 2, "SceneType": 2, + "Desc": "0", "ShowType": 3, "ShowId": 44001, "LimitCoin": 1000000, @@ -5072,6 +5166,7 @@ "GameRule": 21300, "GameType": 2, "SceneType": 3, + "Desc": "0", "ShowType": 3, "ShowId": 44001, "LimitCoin": 5000000, @@ -5125,6 +5220,7 @@ "GameRule": 21400, "GameType": 2, "SceneType": 1, + "Desc": "0", "ShowType": 3, "ShowId": 44001, "LimitCoin": 250000, @@ -5178,6 +5274,7 @@ "GameRule": 21400, "GameType": 2, "SceneType": 2, + "Desc": "0", "ShowType": 3, "ShowId": 44001, "LimitCoin": 1000000, @@ -5231,6 +5328,7 @@ "GameRule": 21400, "GameType": 2, "SceneType": 3, + "Desc": "0", "ShowType": 3, "ShowId": 44001, "LimitCoin": 5000000, @@ -5283,6 +5381,7 @@ "GameRule": 60600, "GameType": 6, "SceneType": 1, + "Desc": "0", "ShowType": 3, "ShowId": 60600, "BetDec": "0", @@ -5326,6 +5425,7 @@ "GameRule": 60700, "GameType": 1, "SceneType": 1, + "Desc": "0", "ShowType": 3, "ShowId": 60700, "BaseScore": 1000000, @@ -5371,6 +5471,7 @@ "GameRule": 30100, "GameType": 3, "SceneType": 1, + "Desc": "0", "ShowType": 2, "ShowId": 79000, "LimitCoin": 1000000, @@ -5409,6 +5510,7 @@ "GameRule": 30100, "GameType": 3, "SceneType": 2, + "Desc": "0", "ShowType": 2, "ShowId": 79000, "LimitCoin": 25000000, @@ -5447,6 +5549,7 @@ "GameRule": 30100, "GameType": 3, "SceneType": 3, + "Desc": "0", "ShowType": 2, "ShowId": 79000, "LimitCoin": 125000000, @@ -5485,6 +5588,7 @@ "GameRule": 30100, "GameType": 3, "SceneType": 4, + "Desc": "0", "ShowType": 2, "ShowId": 79000, "LimitCoin": 250000000, @@ -5523,6 +5627,7 @@ "GameRule": 30200, "GameType": 3, "SceneType": 1, + "Desc": "0", "ShowType": 2, "ShowId": 80000, "LimitCoin": 1000000, @@ -5561,6 +5666,7 @@ "GameRule": 30200, "GameType": 3, "SceneType": 2, + "Desc": "0", "ShowType": 2, "ShowId": 80000, "LimitCoin": 25000000, @@ -5599,6 +5705,7 @@ "GameRule": 30200, "GameType": 3, "SceneType": 3, + "Desc": "0", "ShowType": 2, "ShowId": 80000, "LimitCoin": 125000000, @@ -5637,6 +5744,7 @@ "GameRule": 30200, "GameType": 3, "SceneType": 4, + "Desc": "0", "ShowType": 2, "ShowId": 80000, "LimitCoin": 250000000, @@ -5675,6 +5783,7 @@ "GameRule": 30300, "GameType": 3, "SceneType": 1, + "Desc": "0", "ShowType": 2, "ShowId": 81000, "LimitCoin": 1000000, @@ -5713,6 +5822,7 @@ "GameRule": 30300, "GameType": 3, "SceneType": 2, + "Desc": "0", "ShowType": 2, "ShowId": 81000, "LimitCoin": 25000000, @@ -5751,6 +5861,7 @@ "GameRule": 30300, "GameType": 3, "SceneType": 3, + "Desc": "0", "ShowType": 2, "ShowId": 81000, "LimitCoin": 125000000, @@ -5789,6 +5900,7 @@ "GameRule": 30300, "GameType": 3, "SceneType": 4, + "Desc": "0", "ShowType": 2, "ShowId": 81000, "LimitCoin": 250000000, @@ -5827,6 +5939,7 @@ "GameRule": 30400, "GameType": 3, "SceneType": 1, + "Desc": "0", "ShowType": 2, "ShowId": 82000, "LimitCoin": 1000000, @@ -5865,6 +5978,7 @@ "GameRule": 30400, "GameType": 3, "SceneType": 2, + "Desc": "0", "ShowType": 2, "ShowId": 82000, "LimitCoin": 100000000, @@ -5903,6 +6017,7 @@ "GameRule": 30400, "GameType": 3, "SceneType": 3, + "Desc": "0", "ShowType": 2, "ShowId": 82000, "LimitCoin": 200000000, @@ -5941,6 +6056,7 @@ "GameRule": 30500, "GameType": 3, "SceneType": 1, + "Desc": "0", "ShowType": 2, "ShowId": 83000, "LimitCoin": 1000000, @@ -5981,6 +6097,7 @@ "GameRule": 30500, "GameType": 3, "SceneType": 2, + "Desc": "0", "ShowType": 2, "ShowId": 83000, "LimitCoin": 125000000, @@ -6021,6 +6138,7 @@ "GameRule": 30500, "GameType": 3, "SceneType": 3, + "Desc": "0", "ShowType": 2, "ShowId": 83000, "LimitCoin": 250000000, @@ -6061,6 +6179,7 @@ "GameRule": 30600, "GameType": 3, "SceneType": 1, + "Desc": "0", "ShowType": 2, "ShowId": 33001, "LimitCoin": 10000, @@ -6100,6 +6219,7 @@ "GameRule": 30600, "GameType": 3, "SceneType": 2, + "Desc": "0", "ShowType": 2, "ShowId": 33001, "LimitCoin": 100000, @@ -6139,6 +6259,7 @@ "GameRule": 30600, "GameType": 3, "SceneType": 3, + "Desc": "0", "ShowType": 2, "ShowId": 33001, "LimitCoin": 1000000, @@ -6178,6 +6299,7 @@ "GameRule": 30600, "GameType": 3, "SceneType": 4, + "Desc": "0", "ShowType": 2, "ShowId": 33001, "LimitCoin": 10000000, @@ -6217,6 +6339,7 @@ "GameRule": 30700, "GameType": 3, "SceneType": 1, + "Desc": "0", "ShowType": 2, "ShowId": 34001, "LimitCoin": 10000, @@ -6256,6 +6379,7 @@ "GameRule": 30700, "GameType": 3, "SceneType": 2, + "Desc": "0", "ShowType": 2, "ShowId": 34001, "LimitCoin": 100000, @@ -6295,6 +6419,7 @@ "GameRule": 30700, "GameType": 3, "SceneType": 3, + "Desc": "0", "ShowType": 2, "ShowId": 34001, "LimitCoin": 1000000, @@ -6334,6 +6459,7 @@ "GameRule": 30700, "GameType": 3, "SceneType": 4, + "Desc": "0", "ShowType": 2, "ShowId": 34001, "LimitCoin": 10000000, @@ -6373,6 +6499,7 @@ "GameRule": 30800, "GameType": 3, "SceneType": 1, + "Desc": "0", "ShowType": 2, "ShowId": 30800, "LimitCoin": 10000, @@ -6406,6 +6533,7 @@ "GameRule": 30900, "GameType": 3, "SceneType": 1, + "Desc": "0", "ShowType": 2, "ShowId": 30900, "LimitCoin": 10000, @@ -6439,6 +6567,7 @@ "GameRule": 31000, "GameType": 3, "SceneType": 1, + "Desc": "0", "ShowType": 2, "ShowId": 31000, "LimitCoin": 10000, @@ -6472,6 +6601,7 @@ "GameRule": 31100, "GameType": 3, "SceneType": 1, + "Desc": "0", "ShowType": 2, "ShowId": 31100, "LimitCoin": 10000, @@ -6505,6 +6635,7 @@ "GameRule": 31200, "GameType": 3, "SceneType": 1, + "Desc": "0", "ShowType": 2, "ShowId": 31200, "LimitCoin": 10000, @@ -6538,6 +6669,7 @@ "GameRule": 31300, "GameType": 3, "SceneType": 1, + "Desc": "0", "ShowType": 2, "ShowId": 31300, "LimitCoin": 10000, @@ -6571,6 +6703,7 @@ "GameRule": 31400, "GameType": 3, "SceneType": 1, + "Desc": "0", "ShowType": 2, "ShowId": 31400, "LimitCoin": 10000, @@ -6604,6 +6737,7 @@ "GameRule": 60800, "GameType": 1, "SceneType": 1, + "Desc": "0", "ShowType": 3, "ShowId": 60800, "BaseScore": 1000, @@ -6636,6 +6770,7 @@ "GameRule": 60800, "GameType": 1, "SceneType": 2, + "Desc": "0", "ShowType": 3, "ShowId": 60800, "BaseScore": 1000, @@ -6668,6 +6803,7 @@ "GameRule": 60800, "GameType": 1, "SceneType": 3, + "Desc": "0", "ShowType": 3, "ShowId": 60800, "BaseScore": 1000, @@ -6700,6 +6836,7 @@ "GameRule": 60800, "GameType": 1, "SceneType": 4, + "Desc": "0", "ShowType": 3, "ShowId": 60800, "BaseScore": 1000, diff --git a/data/DB_GameItem.dat b/data/DB_GameItem.dat index ad79ccc..5200952 100644 Binary files a/data/DB_GameItem.dat and b/data/DB_GameItem.dat differ 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/data/DB_PropExchange.dat b/data/DB_PropExchange.dat index 8f64d81..7ad9b2f 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 c77b7fd..9cf86c3 100644 Binary files a/data/DB_Task.dat and b/data/DB_Task.dat differ diff --git a/protocol/server/pbdata.pb.go b/protocol/server/pbdata.pb.go index 4175a82..ad646df 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"` - 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"` + 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"` 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,13 +4393,6 @@ 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 @@ -4421,6 +4414,13 @@ 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, 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, + 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, 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 a924516..3995b67 100644 --- a/protocol/server/pbdata.proto +++ b/protocol/server/pbdata.proto @@ -709,13 +709,13 @@ message DB_GameFree { int32 GameType = 8; - string Desc = 9; + int32 SceneType = 9; - int32 SceneType = 10; + int32 RankType = 10; - int32 RankType = 11; + int32 SceneAdd = 11; - int32 SceneAdd = 12; + string Desc = 12; int32 ShowType = 13; diff --git a/xlsx/DB_GameFree.xlsx b/xlsx/DB_GameFree.xlsx index 23f9d0c..b7c8e83 100644 Binary files a/xlsx/DB_GameFree.xlsx and b/xlsx/DB_GameFree.xlsx differ diff --git a/xlsx/DB_GameItem.xlsx b/xlsx/DB_GameItem.xlsx index c069f7c..5d613b4 100644 Binary files a/xlsx/DB_GameItem.xlsx and b/xlsx/DB_GameItem.xlsx differ