diff --git a/common/constant.go b/common/constant.go index a9de6f5..3c4f59c 100644 --- a/common/constant.go +++ b/common/constant.go @@ -77,7 +77,12 @@ const ( GameId_IceAge = 304 // 冰河世纪 GameId_TamQuoc = 305 // 百战成神 GameId_Fruits = 306 // 水果拉霸 - GameId_Richblessed = 307 // 多福多财 + GameId_Richblessed = 307 // 多福 + FortuneTiger = 308 // FortuneTiger + FortuneDragon = 309 // FortuneDragon + FortuneRabbit = 310 // FortuneRabbit + FortuneOx = 311 // FortuneOx + FortuneMouse = 312 // FortuneMouse __GameId_Fishing_Min__ = 400 //################捕鱼类################ GameId_HFishing = 401 //欢乐捕鱼 GameId_TFishing = 402 //天天捕鱼 diff --git a/data/DB_GameFree.dat b/data/DB_GameFree.dat index f91cbf9..10d42c9 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 c02ccb5..564a1f9 100644 --- a/data/DB_GameFree.json +++ b/data/DB_GameFree.json @@ -6491,10 +6491,175 @@ "PlayerWaterRate": 100, "BetWaterRate": 100 }, + { + "Id": 3080001, + "Name": "FortuneTiger", + "Title": "1", + "GameId": 308, + "GameRule": 30800, + "GameType": 3, + "SceneType": 1, + "Desc": "0", + "ShowType": 2, + "ShowId": 30800, + "BaseScore": 1000, + "Turn": 30800, + "BetDec": "1000", + "Ai": [ + 0 + ], + "OtherIntParams": [ + 0 + ], + "RobotNumRng": [ + 0 + ], + "SameIpLimit": 1, + "GameDif": "308", + "GameClass": 2, + "PlatformName": "越南棋牌", + "MaxBetCoin": [ + 0 + ], + "PlayerWaterRate": 100, + "BetWaterRate": 100 + }, + { + "Id": 3090001, + "Name": "FortuneDragon", + "Title": "1", + "GameId": 309, + "GameRule": 30900, + "GameType": 3, + "SceneType": 1, + "Desc": "0", + "ShowType": 2, + "ShowId": 30900, + "BaseScore": 1000, + "Turn": 30900, + "BetDec": "1000", + "Ai": [ + 0 + ], + "OtherIntParams": [ + 0 + ], + "RobotNumRng": [ + 0 + ], + "SameIpLimit": 1, + "GameDif": "309", + "GameClass": 2, + "PlatformName": "越南棋牌", + "MaxBetCoin": [ + 0 + ], + "PlayerWaterRate": 100, + "BetWaterRate": 100 + }, + { + "Id": 3100001, + "Name": "FortuneRabbit", + "Title": "1", + "GameId": 310, + "GameRule": 31000, + "GameType": 3, + "SceneType": 1, + "Desc": "0", + "ShowType": 2, + "ShowId": 31000, + "BaseScore": 1000, + "Turn": 31000, + "BetDec": "1000", + "Ai": [ + 0 + ], + "OtherIntParams": [ + 0 + ], + "RobotNumRng": [ + 0 + ], + "SameIpLimit": 1, + "GameDif": "310", + "GameClass": 2, + "PlatformName": "越南棋牌", + "MaxBetCoin": [ + 0 + ], + "PlayerWaterRate": 100, + "BetWaterRate": 100 + }, + { + "Id": 3110001, + "Name": "FortuneOx", + "Title": "1", + "GameId": 311, + "GameRule": 31100, + "GameType": 3, + "SceneType": 1, + "Desc": "0", + "ShowType": 2, + "ShowId": 31100, + "BaseScore": 1000, + "Turn": 31100, + "BetDec": "1000", + "Ai": [ + 0 + ], + "OtherIntParams": [ + 0 + ], + "RobotNumRng": [ + 0 + ], + "SameIpLimit": 1, + "GameDif": "311", + "GameClass": 2, + "PlatformName": "越南棋牌", + "MaxBetCoin": [ + 0 + ], + "PlayerWaterRate": 100, + "BetWaterRate": 100 + }, + { + "Id": 3120001, + "Name": "FortuneMouse", + "Title": "1", + "GameId": 312, + "GameRule": 31200, + "GameType": 3, + "SceneType": 1, + "Desc": "0", + "ShowType": 2, + "ShowId": 31200, + "BaseScore": 1000, + "Turn": 31200, + "BetDec": "1000", + "Ai": [ + 0 + ], + "OtherIntParams": [ + 0 + ], + "RobotNumRng": [ + 0 + ], + "SameIpLimit": 1, + "GameDif": "312", + "GameClass": 2, + "PlatformName": "越南棋牌", + "MaxBetCoin": [ + 0 + ], + "PlayerWaterRate": 100, + "BetWaterRate": 100 + }, { "Id": 6080001, "Name": "娃娃机", - "Title": "1", + "Title": "大娃娃场", "GameId": 608, "GameRule": 60800, "GameType": 1, @@ -6509,8 +6674,107 @@ 0 ], "OtherIntParams": [ + 1 + ], + "RobotNumRng": [ 0 ], + "SameIpLimit": 1, + "GameDif": "608", + "GameClass": 2, + "PlatformName": "越南棋牌", + "MaxBetCoin": [ + 0 + ], + "PlayerWaterRate": 100, + "BetWaterRate": 100 + }, + { + "Id": 6080002, + "Name": "娃娃机", + "Title": "大娃娃场", + "GameId": 608, + "GameRule": 60800, + "GameType": 1, + "SceneType": 2, + "Desc": "0", + "ShowType": 3, + "ShowId": 60800, + "BaseScore": 1000, + "Turn": 60800, + "BetDec": "1000", + "Ai": [ + 0 + ], + "OtherIntParams": [ + 1 + ], + "RobotNumRng": [ + 0 + ], + "SameIpLimit": 1, + "GameDif": "608", + "GameClass": 2, + "PlatformName": "越南棋牌", + "MaxBetCoin": [ + 0 + ], + "PlayerWaterRate": 100, + "BetWaterRate": 100 + }, + { + "Id": 6080003, + "Name": "娃娃机", + "Title": "中娃娃场", + "GameId": 608, + "GameRule": 60800, + "GameType": 1, + "SceneType": 3, + "Desc": "0", + "ShowType": 3, + "ShowId": 60800, + "BaseScore": 1000, + "Turn": 60800, + "BetDec": "1000", + "Ai": [ + 0 + ], + "OtherIntParams": [ + 2 + ], + "RobotNumRng": [ + 0 + ], + "SameIpLimit": 1, + "GameDif": "608", + "GameClass": 2, + "PlatformName": "越南棋牌", + "MaxBetCoin": [ + 0 + ], + "PlayerWaterRate": 100, + "BetWaterRate": 100 + }, + { + "Id": 6080004, + "Name": "娃娃机", + "Title": "中娃娃场", + "GameId": 608, + "GameRule": 60800, + "GameType": 1, + "SceneType": 4, + "Desc": "0", + "ShowType": 3, + "ShowId": 60800, + "BaseScore": 1000, + "Turn": 60800, + "BetDec": "1000", + "Ai": [ + 0 + ], + "OtherIntParams": [ + 2 + ], "RobotNumRng": [ 0 ], diff --git a/data/DB_GameRule.dat b/data/DB_GameRule.dat index 54c6015..01647d5 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 ec4d5e9..7c0c320 100644 --- a/data/DB_GameRule.json +++ b/data/DB_GameRule.json @@ -10,43 +10,43 @@ "Id": 20800, "Name": "Tienlen自由桌娱乐场-WTA", "GameId": 208, - "GameDif": "208" + "GameDif": "207" }, { "Id": 20900, "Name": "Tienlen自由桌经典场(打到底）", "GameId": 209, - "GameDif": "209" + "GameDif": "207" }, { "Id": 21000, "Name": "Tienlen自由桌娱乐场(打到底）", "GameId": 210, - "GameDif": "210" + "GameDif": "207" }, { "Id": 24000, "Name": "Tienlen经典场-WTA", "GameId": 240, - "GameDif": "240" + "GameDif": "207" }, { "Id": 24400, "Name": "Tienlen经典场（打到底）", "GameId": 244, - "GameDif": "244" + "GameDif": "207" }, { "Id": 24100, "Name": "Tienlen娱乐场-WTA", "GameId": 241, - "GameDif": "241" + "GameDif": "207" }, { "Id": 24500, "Name": "tienlen娱乐版（打到底）", "GameId": 245, - "GameDif": "245" + "GameDif": "207" }, { "Id": 40100, @@ -64,7 +64,7 @@ "Id": 52200, "Name": "ChessCambodianRobot", "GameId": 522, - "GameDif": "522" + "GameDif": "521" }, { "Id": 21100, @@ -90,7 +90,7 @@ 50, 0 ], - "GameDif": "212" + "GameDif": "211" }, { "Id": 21300, @@ -122,49 +122,49 @@ "Id": 24200, "Name": "Tienlen排位赛经典场-WTA", "GameId": 242, - "GameDif": "242" + "GameDif": "207" }, { "Id": 24600, "Name": "Tienlen排位赛经典场（打到底）", "GameId": 246, - "GameDif": "246" + "GameDif": "207" }, { "Id": 24300, "Name": "Tienlen排位赛娱乐场-WTA", "GameId": 243, - "GameDif": "243" + "GameDif": "207" }, { "Id": 24700, "Name": "tienlen排位赛娱乐（打到底）", "GameId": 247, - "GameDif": "247" + "GameDif": "207" }, { "Id": 21500, "Name": "tienlen房卡经典", "GameId": 215, - "GameDif": "215" + "GameDif": "207" }, { "Id": 21600, "Name": "tienlen房卡娱乐", "GameId": 216, - "GameDif": "216" + "GameDif": "207" }, { "Id": 21700, "Name": "tienlen房卡经典打到底", "GameId": 217, - "GameDif": "217" + "GameDif": "207" }, { "Id": 21800, "Name": "tienlen房卡娱乐打到底", "GameId": 218, - "GameDif": "218" + "GameDif": "207" }, { "Id": 60600, @@ -220,10 +220,41 @@ "GameId": 307, "GameDif": "307" }, + { + "Id": 30800, + "Name": "FortuneTiger", + "GameId": 308, + "GameDif": "308" + }, + { + "Id": 30900, + "Name": "FortuneDragon", + "GameId": 309, + "GameDif": "309" + }, + { + "Id": 31000, + "Name": "FortuneRabbit", + "GameId": 310, + "GameDif": "310" + }, + { + "Id": 31100, + "Name": "FortuneOx", + "GameId": 311, + "GameDif": "311" + }, + { + "Id": 31200, + "Name": "FortuneMouse", + "GameId": 312, + "GameDif": "312" + }, { "Id": 60800, "Name": "娃娃机", - "GameId": 608 + "GameId": 608, + "GameDif": "608" } ] } \ No newline at end of file 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 755ba11..da1a818 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 95caf6e..f4201d0 100644 Binary files a/data/DB_Task.dat and b/data/DB_Task.dat differ diff --git a/data/DB_VIPShow.dat b/data/DB_VIPShow.dat index d658f11..43a7165 100644 --- a/data/DB_VIPShow.dat +++ b/data/DB_VIPShow.dat @@ -3,5 +3,5 @@ VIPShow.t1  * VIPShow.t2 - * +ц * VIPShow.t3 \ No newline at end of file diff --git a/data/DB_VIPShow.json b/data/DB_VIPShow.json index a9d0ad8..e8f8840 100644 --- a/data/DB_VIPShow.json +++ b/data/DB_VIPShow.json @@ -16,7 +16,7 @@ { "Id": 3, "Type": 2, - "SkinId": 30001, + "SkinId": 50001, "VIPLevel": 6, "VIPDes": "VIPShow.t3" } diff --git a/data/gameconfig/fortunedragon.json b/data/gameconfig/fortunedragon.json new file mode 100644 index 0000000..746599c --- /dev/null +++ b/data/gameconfig/fortunedragon.json @@ -0,0 +1,10 @@ +{ + "GameName":"dragon", + "GameId":309, + "GameMode":[0], + "SceneType":[1,2,3,4], + "CanForceStart":true, + "DefaultPlayerCnt":1, + "DependentPlayerCnt":true, + "EnterAfterStart":true +} \ No newline at end of file diff --git a/data/gameconfig/fortunemouse.json b/data/gameconfig/fortunemouse.json new file mode 100644 index 0000000..a0a7da2 --- /dev/null +++ b/data/gameconfig/fortunemouse.json @@ -0,0 +1,10 @@ +{ + "GameName":"mouse", + "GameId":312, + "GameMode":[0], + "SceneType":[1,2,3,4], + "CanForceStart":true, + "DefaultPlayerCnt":1, + "DependentPlayerCnt":true, + "EnterAfterStart":true +} \ No newline at end of file diff --git a/data/gameconfig/fortuneox.json b/data/gameconfig/fortuneox.json new file mode 100644 index 0000000..4904a5d --- /dev/null +++ b/data/gameconfig/fortuneox.json @@ -0,0 +1,10 @@ +{ + "GameName":"ox", + "GameId":311, + "GameMode":[0], + "SceneType":[1,2,3,4], + "CanForceStart":true, + "DefaultPlayerCnt":1, + "DependentPlayerCnt":true, + "EnterAfterStart":true +} \ No newline at end of file diff --git a/data/gameconfig/fortunerabbit.json b/data/gameconfig/fortunerabbit.json new file mode 100644 index 0000000..9ae51a1 --- /dev/null +++ b/data/gameconfig/fortunerabbit.json @@ -0,0 +1,10 @@ +{ + "GameName":"rabbit", + "GameId":310, + "GameMode":[0], + "SceneType":[1,2,3,4], + "CanForceStart":true, + "DefaultPlayerCnt":1, + "DependentPlayerCnt":true, + "EnterAfterStart":true +} \ No newline at end of file diff --git a/data/gameconfig/fortunetiger.json b/data/gameconfig/fortunetiger.json new file mode 100644 index 0000000..64968fb --- /dev/null +++ b/data/gameconfig/fortunetiger.json @@ -0,0 +1,10 @@ +{ + "GameName":"tiger", + "GameId":308, + "GameMode":[0], + "SceneType":[1,2,3,4], + "CanForceStart":true, + "DefaultPlayerCnt":1, + "DependentPlayerCnt":true, + "EnterAfterStart":true +} \ No newline at end of file diff --git a/worldsrv/bagmgr.go b/worldsrv/bagmgr.go index 20c0f48..497c69d 100644 --- a/worldsrv/bagmgr.go +++ b/worldsrv/bagmgr.go @@ -142,18 +142,6 @@ func (this *BagMgr) GetItem(snid, itemId int32) *Item { return item } -type ItemParam struct { - P *Player - Change []*Item // 道具变化数量 - Cost []*model.ItemInfo // 获得道具时消耗的道具数量 - Add int64 // 加成数量 - GainWay int32 // 记录类型 - Operator, Remark string // 操作人，备注 - GameId, GameFreeId int64 // 游戏id,场次id - NoLog bool // 是否不记录日志 - LogId string // 撤销的id,道具兑换失败 -} - type AddItemParam struct { Cost []*model.Item // 获得道具时消耗的道具数量 LogId string diff --git a/xlsx/DB_GameFree.xlsx b/xlsx/DB_GameFree.xlsx index 79d48a3..f1116a6 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 4c48f53..8e4b993 100644 Binary files a/xlsx/DB_GameRule.xlsx and b/xlsx/DB_GameRule.xlsx differ diff --git a/xlsx/DB_VIPShow.xlsx b/xlsx/DB_VIPShow.xlsx index 7a8b23d..5e3be2e 100644 Binary files a/xlsx/DB_VIPShow.xlsx and b/xlsx/DB_VIPShow.xlsx differ