tl_server_2
/
game_sync
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: tl_server_2:6923ed95f175f9f204cfa766d651bff2f85b8336
Branches Tags
tl_server_2:main
tl_server_2:dev_login
tl_server_2:develop
tl_server_2:dev_slots
tl_server_2:release
tl_server_2:dev_third
tl_server_2:dev_expireitem
tl_server_2:ma
tl_server_2:machine
..
compare: tl_server_2:53f6aae1c6d444e00590377d831ecc40f52066cd
Branches Tags
tl_server_2:dev_login
tl_server_2:develop
tl_server_2:dev_slots
tl_server_2:release
tl_server_2:dev_third
tl_server_2:dev_expireitem
tl_server_2:ma
tl_server_2:machine
tl_server_2:main

No commits in common. "6923ed95f175f9f204cfa766d651bff2f85b8336" and "53f6aae1c6d444e00590377d831ecc40f52066cd" have entirely different histories.
6923ed95f1 ... 53f6aae1c6

11 changed files with 28 additions and 169 deletions
Show Stats Expand all files Collapse all files

BIN
data/DB_GameFree.dat
View File

Binary file not shown.

137
data/DB_GameFree.json
View File

@ -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,
@ -6669,7 +6538,6 @@
"GameRule": 31300,
"GameType": 3,
"SceneType": 1,
"Desc": "0",
"ShowType": 2,
"ShowId": 31300,
"LimitCoin": 10000,
@ -6703,7 +6571,6 @@
"GameRule": 31400,
"GameType": 3,
"SceneType": 1,
"Desc": "0",
"ShowType": 2,
"ShowId": 31400,
"LimitCoin": 10000,
@ -6737,7 +6604,6 @@
"GameRule": 60800,
"GameType": 1,
"SceneType": 1,
"Desc": "0",
"ShowType": 3,
"ShowId": 60800,
"BaseScore": 1000,
@ -6770,7 +6636,6 @@
"GameRule": 60800,
"GameType": 1,
"SceneType": 2,
"Desc": "0",
"ShowType": 3,
"ShowId": 60800,
"BaseScore": 1000,
@ -6803,7 +6668,6 @@
"GameRule": 60800,
"GameType": 1,
"SceneType": 3,
"Desc": "0",
"ShowType": 3,
"ShowId": 60800,
"BaseScore": 1000,
@ -6836,7 +6700,6 @@
"GameRule": 60800,
"GameType": 1,
"SceneType": 4,
"Desc": "0",
"ShowType": 3,
"ShowId": 60800,
"BaseScore": 1000,

BIN
data/DB_GameItem.dat
View File

Binary file not shown.

8
data/DB_GameItem.json
View File

@ -6723,7 +6723,7 @@
"Describe": "可联系客服兑换实物奖励",
"Entity": 1,
"Compound": {
"30008": 10
"300008": 10
}
},
{
@ -6762,7 +6762,7 @@
"Describe": "可联系客服兑换实物奖励",
"Entity": 1,
"Compound": {
"30009": 10
"300009": 10
}
},
{
@ -6801,7 +6801,7 @@
"Describe": "可联系客服兑换实物奖励",
"Entity": 1,
"Compound": {
"30010": 10
"300010": 10
}
},
{
@ -6840,7 +6840,7 @@
"Describe": "可联系客服兑换实物奖励",
"Entity": 2,
"Compound": {
"30011": 10
"300011": 10
}
},
{

BIN
data/DB_PropExchange.dat
View File

Binary file not shown.

BIN
data/DB_Task.dat
View File

Binary file not shown.

38
protocol/server/pbdata.pb.go
View File

@ -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,

8
protocol/server/pbdata.proto
View File

@ -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;

6
worldsrv/welfmgr.go
View File

@ -113,10 +113,6 @@ func (this *WelfareMgr) GetReliefFund(p *Player, isVideo bool) {
mq.Write(log)
logger.Logger.Tracef("NewReliefFundLogEx WriteLog snid: %v Coin:%v", p.SnId, pack.Coin)
}
if !p.IsRob {
mq.Write(model.GenerateSystemFreeGive(p.SnId, p.Name, p.Platform, p.Channel,
model.SystemFreeGive_GiveType_ReliefFund, model.SystemFreeGive_CoinType_Coin, coin))
}
}
}
logger.Logger.Tracef("GetReliefFund snid: %v pack: %v", p.SnId, pack)
@ -1118,7 +1114,7 @@ func (this *WelfareMgr) BlindBoxInfo(p *Player, bid int32) {
if cyc == 1 || blindBox.Cycle == model.WelfareOpen {
p.WelfData.BlindBoxId = 0
}
} // == 1代表当日循环
} // == 1代表当日循环
if p.WelfData.BlindBoxId == 0 { // 未领取过发随机Date
idx := bid

BIN
xlsx/DB_GameFree.xlsx
View File

Binary file not shown.

BIN
xlsx/DB_GameItem.xlsx
View File

Binary file not shown.