diff --git a/common/constant.go b/common/constant.go index 0f35075..8be199c 100644 --- a/common/constant.go +++ b/common/constant.go @@ -566,7 +566,7 @@ const ( ItemIDVCard = 30001 // v卡 ItemIDJCard = 30002 // 金券 ItemDiamondScore = 100012 //钻石积分 - ItemDollCard = 74004 // 娃娃卡 + ItemDollCard = 40004 // 娃娃卡积分 ) func ToItemId(id int32) int32 { diff --git a/data/DB_GameItem.dat b/data/DB_GameItem.dat index 3c06c16..0c48cfb 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 1c84607..fef9b6c 100644 --- a/data/DB_GameItem.json +++ b/data/DB_GameItem.json @@ -5,7 +5,8 @@ "Name": "斗鸡碎片", "ShowLocation": [ 0, - 1 + 1, + 0 ], "Classify": [ 1, @@ -39,7 +40,8 @@ "Name": "技能碎片", "ShowLocation": [ 0, - 1 + 1, + 0 ], "Classify": [ 1, @@ -73,7 +75,8 @@ "Name": "酷帕碎片", "ShowLocation": [ 0, - 1 + 1, + 0 ], "Classify": [ 1, @@ -107,7 +110,8 @@ "Name": "蝶女碎片", "ShowLocation": [ 0, - 1 + 1, + 0 ], "Classify": [ 1, @@ -141,7 +145,8 @@ "Name": "魔术师碎片", "ShowLocation": [ 0, - 1 + 1, + 0 ], "Classify": [ 1, @@ -175,7 +180,8 @@ "Name": "V卡", "ShowLocation": [ 1, - 1 + 1, + 0 ], "Classify": [ 1, @@ -209,7 +215,8 @@ "Name": "金券", "ShowLocation": [ 1, - 1 + 1, + 0 ], "Classify": [ 1, @@ -242,6 +249,7 @@ "Id": 30003, "Name": "1元话费兑换码", "ShowLocation": [ + 0, 0, 0 ], @@ -275,6 +283,7 @@ "Id": 30004, "Name": "2元话费兑换码", "ShowLocation": [ + 0, 0, 0 ], @@ -308,6 +317,7 @@ "Id": 30005, "Name": "5元话费兑换码", "ShowLocation": [ + 0, 0, 0 ], @@ -341,6 +351,7 @@ "Id": 30006, "Name": "10元话费兑换码", "ShowLocation": [ + 0, 0, 0 ], @@ -374,6 +385,7 @@ "Id": 30007, "Name": "手机兑换券", "ShowLocation": [ + 0, 0, 0 ], @@ -407,7 +419,8 @@ "Name": "冠军赛门票", "ShowLocation": [ 1, - 1 + 1, + 0 ], "Classify": [ 1, @@ -440,7 +453,8 @@ "Name": "房卡", "ShowLocation": [ 1, - 1 + 1, + 0 ], "Classify": [ 1, @@ -473,7 +487,8 @@ "Name": "娃娃卡", "ShowLocation": [ 1, - 1 + 1, + 0 ], "Classify": [ 1, @@ -501,12 +516,48 @@ "Location": "0", "Describe": "作用：用于抓娃娃机抓娃娃；\n产出途径：商城购买\n" }, + { + "Id": 40004, + "Name": "娃娃积分", + "ShowLocation": [ + 0, + 0, + 1 + ], + "Classify": [ + 1, + 0, + 0 + ], + "Type": 25, + "Effect0": [ + 0, + 0, + 0, + 1, + 0 + ], + "Effect": [ + 0, + 0, + 0, + 1, + 0 + ], + "SaleType": 1, + "SaleGold": 5000, + "Composition": 1, + "CompositionMax": 9999, + "Location": "0", + "Describe": "用途：可在兑换商城中使用，兑换您想要的物品。" + }, { "Id": 50001, "Name": "碎片礼盒", "ShowLocation": [ 1, - 1 + 1, + 0 ], "Classify": [ 1, @@ -538,7 +589,8 @@ "Name": "集卡礼盒", "ShowLocation": [ 1, - 1 + 1, + 0 ], "Classify": [ 1, @@ -570,7 +622,8 @@ "Name": "M卡片红色", "ShowLocation": [ 1, - 1 + 1, + 0 ], "Classify": [ 1, @@ -604,7 +657,8 @@ "Name": "A卡片红色", "ShowLocation": [ 1, - 1 + 1, + 0 ], "Classify": [ 1, @@ -638,7 +692,8 @@ "Name": "N卡片红色", "ShowLocation": [ 1, - 1 + 1, + 0 ], "Classify": [ 1, @@ -672,7 +727,8 @@ "Name": "G卡片红色", "ShowLocation": [ 1, - 1 + 1, + 0 ], "Classify": [ 1, @@ -706,7 +762,8 @@ "Name": "O卡片红色", "ShowLocation": [ 1, - 1 + 1, + 0 ], "Classify": [ 1, @@ -740,7 +797,8 @@ "Name": "G卡片黄色", "ShowLocation": [ 1, - 1 + 1, + 0 ], "Classify": [ 1, @@ -774,7 +832,8 @@ "Name": "A卡片黄色", "ShowLocation": [ 1, - 1 + 1, + 0 ], "Classify": [ 1, @@ -808,7 +867,8 @@ "Name": "M卡片黄色", "ShowLocation": [ 1, - 1 + 1, + 0 ], "Classify": [ 1, @@ -842,7 +902,8 @@ "Name": "E卡片黄色", "ShowLocation": [ 1, - 1 + 1, + 0 ], "Classify": [ 1, @@ -876,7 +937,8 @@ "Name": "芒果卡片", "ShowLocation": [ 1, - 1 + 1, + 0 ], "Classify": [ 1, @@ -910,7 +972,8 @@ "Name": "龙币", "ShowLocation": [ 1, - 1 + 1, + 0 ], "Classify": [ 1, @@ -944,7 +1007,8 @@ "Name": "tienlen记牌器(1小时)", "ShowLocation": [ 1, - 1 + 1, + 0 ], "Classify": [ 0, @@ -976,7 +1040,8 @@ "Name": "tienlen记牌器(1天)", "ShowLocation": [ 1, - 1 + 1, + 0 ], "Classify": [ 0, @@ -1008,7 +1073,8 @@ "Name": "tienlen记牌器(3天)", "ShowLocation": [ 1, - 1 + 1, + 0 ], "Classify": [ 0, @@ -1040,7 +1106,8 @@ "Name": "tienlen记牌器(7天)", "ShowLocation": [ 1, - 1 + 1, + 0 ], "Classify": [ 0, @@ -1071,6 +1138,7 @@ "Id": 100001, "Name": "金币", "ShowLocation": [ + 0, 0, 0 ], @@ -1102,6 +1170,7 @@ "Id": 100002, "Name": "钻石", "ShowLocation": [ + 0, 0, 0 ], @@ -1133,6 +1202,7 @@ "Id": 100003, "Name": "金币池", "ShowLocation": [ + 0, 0, 0 ], @@ -1164,6 +1234,7 @@ "Id": 100004, "Name": "活跃积分", "ShowLocation": [ + 0, 0, 0 ], @@ -1195,6 +1266,7 @@ "Id": 100005, "Name": "VIP经验", "ShowLocation": [ + 0, 0, 0 ], @@ -1226,6 +1298,7 @@ "Id": 100006, "Name": "换手机积分", "ShowLocation": [ + 0, 0, 0 ], @@ -1257,6 +1330,7 @@ "Id": 100007, "Name": "点赞", "ShowLocation": [ + 0, 0, 0 ], @@ -1289,6 +1363,7 @@ "Id": 100008, "Name": "咖啡", "ShowLocation": [ + 0, 0, 0 ], @@ -1321,6 +1396,7 @@ "Id": 100009, "Name": "水桶", "ShowLocation": [ + 0, 0, 0 ], @@ -1353,6 +1429,7 @@ "Id": 100010, "Name": "拖鞋", "ShowLocation": [ + 0, 0, 0 ], @@ -1385,6 +1462,7 @@ "Id": 100011, "Name": "赛季积分", "ShowLocation": [ + 0, 0, 0 ], @@ -1416,6 +1494,7 @@ "Id": 100012, "Name": "钻石积分", "ShowLocation": [ + 0, 0, 0 ], @@ -1447,6 +1526,7 @@ "Id": 100135, "Name": "圣耀裁决", "ShowLocation": [ + 0, 0, 0 ], @@ -1478,6 +1558,7 @@ "Id": 100136, "Name": "紫电蝠王", "ShowLocation": [ + 0, 0, 0 ], @@ -1509,6 +1590,7 @@ "Id": 100137, "Name": "曜世冰雨", "ShowLocation": [ + 0, 0, 0 ], @@ -1540,6 +1622,7 @@ "Id": 100174, "Name": "虚空之翼", "ShowLocation": [ + 0, 0, 0 ], @@ -1571,6 +1654,7 @@ "Id": 100181, "Name": "横扫乾坤", "ShowLocation": [ + 0, 0, 0 ], @@ -1602,6 +1686,7 @@ "Id": 100182, "Name": "雷动九天", "ShowLocation": [ + 0, 0, 0 ], @@ -1634,7 +1719,8 @@ "Name": "电饭煲", "ShowLocation": [ 1, - 1 + 1, + 0 ], "Classify": [ 0, @@ -1667,7 +1753,8 @@ "Name": "热水壶", "ShowLocation": [ 1, - 1 + 1, + 0 ], "Classify": [ 0, @@ -1700,7 +1787,8 @@ "Name": "迷你小风扇", "ShowLocation": [ 1, - 1 + 1, + 0 ], "Classify": [ 0, @@ -1733,7 +1821,8 @@ "Name": "厨房炊具套装", "ShowLocation": [ 1, - 1 + 1, + 0 ], "Classify": [ 0, @@ -1766,7 +1855,8 @@ "Name": "睡衣", "ShowLocation": [ 1, - 1 + 1, + 0 ], "Classify": [ 0, @@ -1799,7 +1889,8 @@ "Name": "洗衣液", "ShowLocation": [ 1, - 1 + 1, + 0 ], "Classify": [ 0, @@ -1832,7 +1923,8 @@ "Name": "水杯", "ShowLocation": [ 1, - 1 + 1, + 0 ], "Classify": [ 0, @@ -1865,7 +1957,8 @@ "Name": "咖啡杯", "ShowLocation": [ 1, - 1 + 1, + 0 ], "Classify": [ 0, @@ -1898,7 +1991,8 @@ "Name": "哈奴曼啤酒", "ShowLocation": [ 1, - 1 + 1, + 0 ], "Classify": [ 0, @@ -1931,7 +2025,8 @@ "Name": "箱装纯净水", "ShowLocation": [ 1, - 1 + 1, + 0 ], "Classify": [ 0, @@ -1964,7 +2059,8 @@ "Name": "果汁箱装", "ShowLocation": [ 1, - 1 + 1, + 0 ], "Classify": [ 0, @@ -1997,7 +2093,8 @@ "Name": "可口可乐箱装", "ShowLocation": [ 1, - 1 + 1, + 0 ], "Classify": [ 0, @@ -2030,7 +2127,8 @@ "Name": "护肤品套装", "ShowLocation": [ 1, - 1 + 1, + 0 ], "Classify": [ 0, @@ -2063,7 +2161,8 @@ "Name": "洗发水", "ShowLocation": [ 1, - 1 + 1, + 0 ], "Classify": [ 0, @@ -2096,7 +2195,8 @@ "Name": "电动牙刷", "ShowLocation": [ 1, - 1 + 1, + 0 ], "Classify": [ 0, @@ -2129,7 +2229,8 @@ "Name": "香水", "ShowLocation": [ 1, - 1 + 1, + 0 ], "Classify": [ 0, @@ -2162,7 +2263,8 @@ "Name": "按摩带", "ShowLocation": [ 1, - 1 + 1, + 0 ], "Classify": [ 0, @@ -2195,7 +2297,8 @@ "Name": "护发素", "ShowLocation": [ 1, - 1 + 1, + 0 ], "Classify": [ 0, @@ -2228,7 +2331,8 @@ "Name": "瑜伽垫", "ShowLocation": [ 1, - 1 + 1, + 0 ], "Classify": [ 0, @@ -2261,7 +2365,8 @@ "Name": "跳绳", "ShowLocation": [ 1, - 1 + 1, + 0 ], "Classify": [ 0, @@ -2294,7 +2399,8 @@ "Name": "篮球", "ShowLocation": [ 1, - 1 + 1, + 0 ], "Classify": [ 0, @@ -2327,7 +2433,8 @@ "Name": "足球", "ShowLocation": [ 1, - 1 + 1, + 0 ], "Classify": [ 0, @@ -2360,7 +2467,8 @@ "Name": "健身手环", "ShowLocation": [ 1, - 1 + 1, + 0 ], "Classify": [ 0, @@ -2393,7 +2501,8 @@ "Name": "山地车", "ShowLocation": [ 1, - 1 + 1, + 0 ], "Classify": [ 0, @@ -2426,7 +2535,8 @@ "Name": "Tecno手机", "ShowLocation": [ 1, - 1 + 1, + 0 ], "Classify": [ 0, @@ -2459,7 +2569,8 @@ "Name": "平板电脑", "ShowLocation": [ 1, - 1 + 1, + 0 ], "Classify": [ 0, @@ -2492,7 +2603,8 @@ "Name": "耳机", "ShowLocation": [ 1, - 1 + 1, + 0 ], "Classify": [ 0, @@ -2525,7 +2637,8 @@ "Name": "智能手表", "ShowLocation": [ 1, - 1 + 1, + 0 ], "Classify": [ 0, @@ -2558,7 +2671,8 @@ "Name": "便携式音箱", "ShowLocation": [ 1, - 1 + 1, + 0 ], "Classify": [ 0, @@ -2591,7 +2705,8 @@ "Name": "红米手机", "ShowLocation": [ 1, - 1 + 1, + 0 ], "Classify": [ 0, @@ -2624,7 +2739,8 @@ "Name": "超市购物卡", "ShowLocation": [ 1, - 1 + 1, + 0 ], "Classify": [ 0, @@ -2657,7 +2773,8 @@ "Name": "餐厅用餐券", "ShowLocation": [ 1, - 1 + 1, + 0 ], "Classify": [ 0, @@ -2690,7 +2807,8 @@ "Name": "电影票", "ShowLocation": [ 1, - 1 + 1, + 0 ], "Classify": [ 0, @@ -2723,7 +2841,8 @@ "Name": "在线购物优惠券", "ShowLocation": [ 1, - 1 + 1, + 0 ], "Classify": [ 0, @@ -2756,7 +2875,8 @@ "Name": "按摩券", "ShowLocation": [ 1, - 1 + 1, + 0 ], "Classify": [ 0, @@ -2789,7 +2909,8 @@ "Name": "本地景点门票", "ShowLocation": [ 1, - 1 + 1, + 0 ], "Classify": [ 0, @@ -2822,7 +2943,8 @@ "Name": "宾馆票", "ShowLocation": [ 1, - 1 + 1, + 0 ], "Classify": [ 0, @@ -2855,7 +2977,8 @@ "Name": "游乐场门票", "ShowLocation": [ 1, - 1 + 1, + 0 ], "Classify": [ 0, @@ -2888,7 +3011,8 @@ "Name": "大米", "ShowLocation": [ 1, - 1 + 1, + 0 ], "Classify": [ 0, @@ -2921,7 +3045,8 @@ "Name": "食用油", "ShowLocation": [ 1, - 1 + 1, + 0 ], "Classify": [ 0, @@ -2954,7 +3079,8 @@ "Name": "盐", "ShowLocation": [ 1, - 1 + 1, + 0 ], "Classify": [ 0, @@ -2987,7 +3113,8 @@ "Name": "酱油", "ShowLocation": [ 1, - 1 + 1, + 0 ], "Classify": [ 0, @@ -3020,7 +3147,8 @@ "Name": "鸡蛋", "ShowLocation": [ 1, - 1 + 1, + 0 ], "Classify": [ 0, @@ -3053,7 +3181,8 @@ "Name": "游戏点卡", "ShowLocation": [ 1, - 1 + 1, + 0 ], "Classify": [ 0, @@ -3086,7 +3215,8 @@ "Name": "1元话费直兑券", "ShowLocation": [ 1, - 1 + 1, + 0 ], "Classify": [ 1, @@ -3118,7 +3248,8 @@ "Name": "2元话费直兑券", "ShowLocation": [ 1, - 1 + 1, + 0 ], "Classify": [ 1, @@ -3150,7 +3281,8 @@ "Name": "5元话费直兑券", "ShowLocation": [ 1, - 1 + 1, + 0 ], "Classify": [ 1, @@ -3182,7 +3314,8 @@ "Name": "10元话费直兑券", "ShowLocation": [ 1, - 1 + 1, + 0 ], "Classify": [ 1, @@ -3214,7 +3347,8 @@ "Name": "财神送福", "ShowLocation": [ 0, - 1 + 1, + 0 ], "Classify": [ 1, @@ -3249,7 +3383,8 @@ "Name": "活力-黄 碎片", "ShowLocation": [ 0, - 1 + 1, + 0 ], "Classify": [ 1, @@ -3283,7 +3418,8 @@ "Name": "财神送福碎片", "ShowLocation": [ 0, - 1 + 1, + 0 ], "Classify": [ 1, @@ -3317,7 +3453,8 @@ "Name": "活力-粉 碎片", "ShowLocation": [ 0, - 1 + 1, + 0 ], "Classify": [ 1, @@ -3351,7 +3488,8 @@ "Name": "活力-青 碎片", "ShowLocation": [ 0, - 1 + 1, + 0 ], "Classify": [ 1, @@ -3385,7 +3523,8 @@ "Name": "摇滚小子碎片", "ShowLocation": [ 0, - 1 + 1, + 0 ], "Classify": [ 1, @@ -3419,7 +3558,8 @@ "Name": "潜水员碎片", "ShowLocation": [ 0, - 1 + 1, + 0 ], "Classify": [ 1, @@ -3453,7 +3593,8 @@ "Name": "冲浪健将碎片", "ShowLocation": [ 0, - 1 + 1, + 0 ], "Classify": [ 1, @@ -3481,6 +3622,82 @@ "CompositionMax": 9999, "Location": "0", "Describe": "作用：解锁角色皮肤-财神送福，可在皮肤功能界面使用" + }, + { + "Id": 80001, + "Name": "皮卡丘娃娃", + "ShowLocation": [ + 0, + 0, + 1 + ], + "Classify": [ + 1, + 0, + 0 + ], + "Type": 26, + "Effect0": [ + 1, + 0, + 0, + 1, + 1 + ], + "Effect": [ + 1, + 0, + 0, + 1, + 1 + ], + "SaleType": 1, + "SaleGold": 5000, + "Composition": 1, + "CompositionMax": 9999, + "Location": "0", + "Describe": "可联系客服兑换实物奖励", + "Gain": { + "40004": 30 + } + }, + { + "Id": 80002, + "Name": "闪电猫咪", + "ShowLocation": [ + 0, + 0, + 1 + ], + "Classify": [ + 1, + 0, + 0 + ], + "Type": 26, + "Effect0": [ + 1, + 0, + 0, + 1, + 1 + ], + "Effect": [ + 1, + 0, + 0, + 1, + 1 + ], + "SaleType": 1, + "SaleGold": 5000, + "Composition": 1, + "CompositionMax": 9999, + "Location": "0", + "Describe": "可联系客服兑换实物奖励", + "Gain": { + "40004": 30 + } } ] } \ No newline at end of file diff --git a/data/DB_PropExchange.dat b/data/DB_PropExchange.dat index df99138..79f081e 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 9f7b037..1e4060f 100644 Binary files a/data/DB_Task.dat and b/data/DB_Task.dat differ diff --git a/data/DB_Task.json b/data/DB_Task.json index e427618..8cdf03e 100644 --- a/data/DB_Task.json +++ b/data/DB_Task.json @@ -11,7 +11,7 @@ "FinishTimes": 1, "Award": { "100001": 500000, - "100004": 5 + "100004": 20 }, "Position": [ 1, @@ -28,7 +28,7 @@ "TargetTimes": 1, "FinishTimes": 1, "Award": { - "100001": 100000, + "100001": 200000, "100004": 20 }, "Position": [ @@ -47,7 +47,7 @@ "FinishTimes": 1, "Award": { "100001": 50000, - "100004": 15 + "100004": 10 } }, { @@ -76,7 +76,7 @@ "FinishTimes": 1, "Award": { "100001": 100000, - "100004": 30 + "100004": 20 }, "GameType": 1 }, @@ -90,11 +90,47 @@ "TargetTimes": 1, "FinishTimes": 1, "Award": { - "100001": 100000, + "100001": 50000, "100004": 20 }, "GameType": 1 }, + { + "Id": 27, + "Order": 7, + "Name": "每日任务", + "Des": "累计充值$4.99", + "ActivityType": 1, + "TaskType": 7, + "TargetTimes": 499, + "FinishTimes": 1, + "Award": { + "100001": 1000000, + "100004": 30 + }, + "Position": [ + 1, + 1 + ] + }, + { + "Id": 28, + "Order": 8, + "Name": "每日任务", + "Des": "累计充值$9.99", + "ActivityType": 1, + "TaskType": 7, + "TargetTimes": 999, + "FinishTimes": 1, + "Award": { + "100001": 2000000, + "100004": 50 + }, + "Position": [ + 1, + 1 + ] + }, { "Id": 7, "Order": 1, @@ -116,7 +152,7 @@ "TargetTimes": 300, "FinishTimes": 1, "Award": { - "50001": 2 + "50001": 5 } }, { @@ -140,7 +176,7 @@ "TargetTimes": 500, "FinishTimes": 1, "Award": { - "50001": 5 + "50001": 10 } }, { @@ -149,10 +185,10 @@ "Name": "周活跃任务", "ActivityType": 2, "TaskType": 14, - "TargetTimes": 600, + "TargetTimes": 650, "FinishTimes": 1, "Award": { - "100002": 10 + "30008": 1 } }, { diff --git a/gamesrv/tienlen/scenedata_tienlen.go b/gamesrv/tienlen/scenedata_tienlen.go index e06b45f..d01ee18 100644 --- a/gamesrv/tienlen/scenedata_tienlen.go +++ b/gamesrv/tienlen/scenedata_tienlen.go @@ -163,7 +163,7 @@ func (this *TienLenSceneData) CanStart() bool { } if this.IsCustom() { - return this.IsAllReady() && this.GetPlayerCnt() >= this.GetPlayerNum() + return (this.IsAllReady() || this.GetNumOfGames() > 0) && this.GetPlayerCnt() >= this.GetPlayerNum() } // 房间人数>=2开始,并且有真人或者是预创建房间,并且有房主 diff --git a/gamesrv/tienlen/scenepolicy_tienlen.go b/gamesrv/tienlen/scenepolicy_tienlen.go index 2cbd208..cc47b8e 100644 --- a/gamesrv/tienlen/scenepolicy_tienlen.go +++ b/gamesrv/tienlen/scenepolicy_tienlen.go @@ -446,6 +446,9 @@ func TienLenCreateRoomInfoPacket(s *base.Scene, p *base.Player, sceneEx *TienLen if s.GetCustom().GetPassword() != "" { pack.NeedPassword = 1 } + if s.IsCustom() { + pack.MasterSnid = s.GetCreator() + } pack.IsMatch = int32(0) // 0.普通场 1.锦标赛 2.冠军赛 3.vip专属 if s.IsMatchScene() { @@ -603,6 +606,10 @@ func (this *SceneBaseStateTienLen) OnTick(s *base.Scene) { s.RandRobotCnt() s.SetTimerRandomRobot(s.GetRobotTime()) } + // 房卡房长时间没人解散房间 + if s.IsCustom() && s.GetRealPlayerCnt() == 0 && this.GetTimeout(s) > 5 { + s.Destroy(true) + } } // 发送玩家操作情况 @@ -719,7 +726,7 @@ func (this *SceneWaitPlayerStateTienLen) CanChangeTo(s base.SceneState) bool { // 当前状态能否换桌 func (this *SceneWaitPlayerStateTienLen) CanChangeCoinScene(s *base.Scene, p *base.Player) bool { - if s.IsMatchScene() { + if s.IsMatchScene() || (s.IsCustom() && s.GetNumOfGames() > 0) { return false } return true @@ -810,7 +817,7 @@ func (this *SceneWaitStartStateTienLen) CanChangeTo(s base.SceneState) bool { // 当前状态能否换桌 func (this *SceneWaitStartStateTienLen) CanChangeCoinScene(s *base.Scene, p *base.Player) bool { - if s.IsMatchScene() { + if s.IsMatchScene() || (s.IsCustom() && s.GetNumOfGames() > 0) { return false } return true diff --git a/gamesrv/transact/trascate_gamesrv.go b/gamesrv/transact/trascate_gamesrv.go index a56fc1a..ed74722 100644 --- a/gamesrv/transact/trascate_gamesrv.go +++ b/gamesrv/transact/trascate_gamesrv.go @@ -106,7 +106,7 @@ func init() { if err != nil { pack.Tag = webapiproto.TagCode_FAILED pack.Msg = "数据序列化失败" - return common.ResponseTag_Ok, pack + return common.ResponseTag_ParamError, pack } pack.Tag = webapiproto.TagCode_SUCCESS @@ -114,7 +114,7 @@ func init() { if scene == nil || scene.ExtraData == nil { pack.Tag = webapiproto.TagCode_NotFound pack.Msg = "房间没找到" - return common.ResponseTag_Ok, pack + return common.ResponseTag_NoFindRoom, pack } switch d := scene.ExtraData.(type) { @@ -140,11 +140,11 @@ func init() { } pack.List = append(pack.List, item) } - + return common.ResponseTag_Ok, pack default: pack.Tag = webapiproto.TagCode_FAILED pack.Msg = "未实现" } - return common.ResponseTag_Ok, pack + return common.ResponseTag_NoData, pack })) } diff --git a/mgrsrv/api/webapi_gamesrv.go b/mgrsrv/api/webapi_gamesrv.go index e7eea62..a38b156 100644 --- a/mgrsrv/api/webapi_gamesrv.go +++ b/mgrsrv/api/webapi_gamesrv.go @@ -173,8 +173,10 @@ func init() { }), OnChildRespWrapper: transact.OnChildRespWrapper(func(tNode *transact.TransNode, hChild transact.TransNodeID, retCode int, ud interface{}) transact.TransExeResult { logger.Logger.Tracef("GameSrvApi OnChildRespWrapper %v:%v", hChild, ud) - tNode.TransEnv.SetField(GAMESRVAPI_TRANSACTE_RESPONSE, ud) - return transact.TransExeResult(retCode) + if retCode == common.ResponseTag_Ok { + tNode.TransEnv.SetField(GAMESRVAPI_TRANSACTE_RESPONSE, ud) + } + return transact.TransExeResult_Success }), }) // 对局详情 diff --git a/protocol/webapi/common.pb.go b/protocol/webapi/common.pb.go index 2a22c2c..9a9b200 100644 --- a/protocol/webapi/common.pb.go +++ b/protocol/webapi/common.pb.go @@ -8275,6 +8275,9 @@ type MachineInfo struct { AppId int64 `protobuf:"varint,2,opt,name=AppId,proto3" json:"AppId,omitempty"` ServerSecret string `protobuf:"bytes,3,opt,name=ServerSecret,proto3" json:"ServerSecret,omitempty"` StreamId string `protobuf:"bytes,4,opt,name=StreamId,proto3" json:"StreamId,omitempty"` + CostItemNum int32 `protobuf:"varint,5,opt,name=CostItemNum,proto3" json:"CostItemNum,omitempty"` //消耗道具数量 + ItemId int32 `protobuf:"varint,6,opt,name=ItemId,proto3" json:"ItemId,omitempty"` //获得道具Id + ItemNum int32 `protobuf:"varint,7,opt,name=ItemNum,proto3" json:"ItemNum,omitempty"` //获得道具数量 } func (x *MachineInfo) Reset() { @@ -8337,6 +8340,27 @@ func (x *MachineInfo) GetStreamId() string { return "" } +func (x *MachineInfo) GetCostItemNum() int32 { + if x != nil { + return x.CostItemNum + } + return 0 +} + +func (x *MachineInfo) GetItemId() int32 { + if x != nil { + return x.ItemId + } + return 0 +} + +func (x *MachineInfo) GetItemNum() int32 { + if x != nil { + return x.ItemNum + } + return 0 +} + // etcd /game/match_audience type MatchAudience struct { state protoimpl.MessageState @@ -10019,7 +10043,7 @@ var file_common_proto_rawDesc = []byte{ 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x50, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x12, 0x27, 0x0a, 0x04, 0x49, 0x6e, 0x66, 0x6f, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x77, 0x65, 0x62, 0x61, 0x70, 0x69, 0x2e, 0x4d, 0x61, 0x63, 0x68, 0x69, 0x6e, 0x65, 0x49, - 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x49, 0x6e, 0x66, 0x6f, 0x22, 0x81, 0x01, 0x0a, 0x0b, 0x4d, 0x61, + 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x49, 0x6e, 0x66, 0x6f, 0x22, 0xd5, 0x01, 0x0a, 0x0b, 0x4d, 0x61, 0x63, 0x68, 0x69, 0x6e, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x1c, 0x0a, 0x09, 0x4d, 0x61, 0x63, 0x68, 0x69, 0x6e, 0x65, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x4d, 0x61, 0x63, 0x68, 0x69, 0x6e, 0x65, 0x49, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x41, 0x70, 0x70, 0x49, 0x64, @@ -10027,56 +10051,62 @@ var file_common_proto_rawDesc = []byte{ 0x0c, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x53, 0x65, 0x63, 0x72, 0x65, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x53, 0x65, 0x63, 0x72, 0x65, 0x74, 0x12, 0x1a, 0x0a, 0x08, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x49, 0x64, 0x18, 0x04, 0x20, - 0x01, 0x28, 0x09, 0x52, 0x08, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x49, 0x64, 0x22, 0x4f, 0x0a, - 0x0d, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x41, 0x75, 0x64, 0x69, 0x65, 0x6e, 0x63, 0x65, 0x12, 0x1a, - 0x0a, 0x08, 0x50, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x08, 0x50, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x12, 0x12, 0x0a, 0x04, 0x53, 0x6e, - 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x53, 0x6e, 0x49, 0x64, 0x12, 0x0e, - 0x0a, 0x02, 0x54, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x02, 0x54, 0x73, 0x22, 0x4c, - 0x0a, 0x0c, 0x53, 0x70, 0x69, 0x72, 0x69, 0x74, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x1a, - 0x0a, 0x08, 0x50, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x08, 0x50, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x12, 0x0e, 0x0a, 0x02, 0x4f, 0x6e, - 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x4f, 0x6e, 0x12, 0x10, 0x0a, 0x03, 0x55, 0x72, - 0x6c, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x55, 0x72, 0x6c, 0x22, 0x72, 0x0a, 0x08, - 0x52, 0x6f, 0x6f, 0x6d, 0x54, 0x79, 0x70, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x50, 0x6c, 0x61, 0x74, - 0x66, 0x6f, 0x72, 0x6d, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x50, 0x6c, 0x61, 0x74, - 0x66, 0x6f, 0x72, 0x6d, 0x12, 0x0e, 0x0a, 0x02, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, - 0x52, 0x02, 0x49, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, - 0x28, 0x09, 0x52, 0x04, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x0e, 0x0a, 0x02, 0x4f, 0x6e, 0x18, 0x04, - 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x4f, 0x6e, 0x12, 0x16, 0x0a, 0x06, 0x53, 0x6f, 0x72, 0x74, - 0x49, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x53, 0x6f, 0x72, 0x74, 0x49, 0x64, - 0x22, 0xcc, 0x03, 0x0a, 0x0a, 0x52, 0x6f, 0x6f, 0x6d, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, - 0x1a, 0x0a, 0x08, 0x50, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x18, 0x01, 0x20, 0x01, 0x28, - 0x09, 0x52, 0x08, 0x50, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x12, 0x0e, 0x0a, 0x02, 0x49, - 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x49, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x4e, - 0x61, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x4e, 0x61, 0x6d, 0x65, 0x12, - 0x1a, 0x0a, 0x08, 0x52, 0x6f, 0x6f, 0x6d, 0x54, 0x79, 0x70, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, - 0x05, 0x52, 0x08, 0x52, 0x6f, 0x6f, 0x6d, 0x54, 0x79, 0x70, 0x65, 0x12, 0x0e, 0x0a, 0x02, 0x4f, - 0x6e, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x4f, 0x6e, 0x12, 0x16, 0x0a, 0x06, 0x53, - 0x6f, 0x72, 0x74, 0x49, 0x64, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x53, 0x6f, 0x72, - 0x74, 0x49, 0x64, 0x12, 0x24, 0x0a, 0x04, 0x43, 0x6f, 0x73, 0x74, 0x18, 0x07, 0x20, 0x03, 0x28, - 0x0b, 0x32, 0x10, 0x2e, 0x77, 0x65, 0x62, 0x61, 0x70, 0x69, 0x2e, 0x49, 0x74, 0x65, 0x6d, 0x49, - 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x43, 0x6f, 0x73, 0x74, 0x12, 0x28, 0x0a, 0x06, 0x52, 0x65, 0x77, - 0x61, 0x72, 0x64, 0x18, 0x08, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x77, 0x65, 0x62, 0x61, - 0x70, 0x69, 0x2e, 0x49, 0x74, 0x65, 0x6d, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x06, 0x52, 0x65, 0x77, - 0x61, 0x72, 0x64, 0x12, 0x24, 0x0a, 0x0d, 0x4f, 0x6e, 0x43, 0x68, 0x61, 0x6e, 0x6e, 0x65, 0x6c, - 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x09, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0d, 0x4f, 0x6e, 0x43, 0x68, - 0x61, 0x6e, 0x6e, 0x65, 0x6c, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x47, 0x61, 0x6d, - 0x65, 0x46, 0x72, 0x65, 0x65, 0x49, 0x64, 0x18, 0x0a, 0x20, 0x03, 0x28, 0x05, 0x52, 0x0a, 0x47, - 0x61, 0x6d, 0x65, 0x46, 0x72, 0x65, 0x65, 0x49, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x52, 0x6f, 0x75, - 0x6e, 0x64, 0x18, 0x0b, 0x20, 0x03, 0x28, 0x05, 0x52, 0x05, 0x52, 0x6f, 0x75, 0x6e, 0x64, 0x12, - 0x1c, 0x0a, 0x09, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x4e, 0x75, 0x6d, 0x18, 0x0c, 0x20, 0x03, - 0x28, 0x05, 0x52, 0x09, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x4e, 0x75, 0x6d, 0x12, 0x22, 0x0a, - 0x0c, 0x4e, 0x65, 0x65, 0x64, 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x18, 0x0d, 0x20, - 0x01, 0x28, 0x05, 0x52, 0x0c, 0x4e, 0x65, 0x65, 0x64, 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, - 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x43, 0x6f, 0x73, 0x74, 0x54, 0x79, 0x70, 0x65, 0x18, 0x0e, 0x20, - 0x01, 0x28, 0x05, 0x52, 0x08, 0x43, 0x6f, 0x73, 0x74, 0x54, 0x79, 0x70, 0x65, 0x12, 0x14, 0x0a, - 0x05, 0x56, 0x6f, 0x69, 0x63, 0x65, 0x18, 0x0f, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x56, 0x6f, - 0x69, 0x63, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x49, 0x6d, 0x61, 0x67, 0x65, 0x55, 0x52, 0x49, 0x18, - 0x10, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x49, 0x6d, 0x61, 0x67, 0x65, 0x55, 0x52, 0x49, 0x42, - 0x26, 0x5a, 0x24, 0x6d, 0x6f, 0x6e, 0x67, 0x6f, 0x2e, 0x67, 0x61, 0x6d, 0x65, 0x73, 0x2e, 0x63, - 0x6f, 0x6d, 0x2f, 0x67, 0x61, 0x6d, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, - 0x2f, 0x77, 0x65, 0x62, 0x61, 0x70, 0x69, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x01, 0x28, 0x09, 0x52, 0x08, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x49, 0x64, 0x12, 0x20, 0x0a, + 0x0b, 0x43, 0x6f, 0x73, 0x74, 0x49, 0x74, 0x65, 0x6d, 0x4e, 0x75, 0x6d, 0x18, 0x05, 0x20, 0x01, + 0x28, 0x05, 0x52, 0x0b, 0x43, 0x6f, 0x73, 0x74, 0x49, 0x74, 0x65, 0x6d, 0x4e, 0x75, 0x6d, 0x12, + 0x16, 0x0a, 0x06, 0x49, 0x74, 0x65, 0x6d, 0x49, 0x64, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, + 0x06, 0x49, 0x74, 0x65, 0x6d, 0x49, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x49, 0x74, 0x65, 0x6d, 0x4e, + 0x75, 0x6d, 0x18, 0x07, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x49, 0x74, 0x65, 0x6d, 0x4e, 0x75, + 0x6d, 0x22, 0x4f, 0x0a, 0x0d, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x41, 0x75, 0x64, 0x69, 0x65, 0x6e, + 0x63, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x50, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x18, 0x01, + 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x50, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x12, 0x12, + 0x0a, 0x04, 0x53, 0x6e, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x53, 0x6e, + 0x49, 0x64, 0x12, 0x0e, 0x0a, 0x02, 0x54, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x02, + 0x54, 0x73, 0x22, 0x4c, 0x0a, 0x0c, 0x53, 0x70, 0x69, 0x72, 0x69, 0x74, 0x43, 0x6f, 0x6e, 0x66, + 0x69, 0x67, 0x12, 0x1a, 0x0a, 0x08, 0x50, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x18, 0x01, + 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x50, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x12, 0x0e, + 0x0a, 0x02, 0x4f, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x4f, 0x6e, 0x12, 0x10, + 0x0a, 0x03, 0x55, 0x72, 0x6c, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x55, 0x72, 0x6c, + 0x22, 0x72, 0x0a, 0x08, 0x52, 0x6f, 0x6f, 0x6d, 0x54, 0x79, 0x70, 0x65, 0x12, 0x1a, 0x0a, 0x08, + 0x50, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, + 0x50, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x12, 0x0e, 0x0a, 0x02, 0x49, 0x64, 0x18, 0x02, + 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x49, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x4e, 0x61, 0x6d, 0x65, + 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x0e, 0x0a, 0x02, + 0x4f, 0x6e, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x4f, 0x6e, 0x12, 0x16, 0x0a, 0x06, + 0x53, 0x6f, 0x72, 0x74, 0x49, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x53, 0x6f, + 0x72, 0x74, 0x49, 0x64, 0x22, 0xcc, 0x03, 0x0a, 0x0a, 0x52, 0x6f, 0x6f, 0x6d, 0x43, 0x6f, 0x6e, + 0x66, 0x69, 0x67, 0x12, 0x1a, 0x0a, 0x08, 0x50, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x18, + 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x50, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x12, + 0x0e, 0x0a, 0x02, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x49, 0x64, 0x12, + 0x12, 0x0a, 0x04, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x4e, + 0x61, 0x6d, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x52, 0x6f, 0x6f, 0x6d, 0x54, 0x79, 0x70, 0x65, 0x18, + 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x52, 0x6f, 0x6f, 0x6d, 0x54, 0x79, 0x70, 0x65, 0x12, + 0x0e, 0x0a, 0x02, 0x4f, 0x6e, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x4f, 0x6e, 0x12, + 0x16, 0x0a, 0x06, 0x53, 0x6f, 0x72, 0x74, 0x49, 0x64, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, + 0x06, 0x53, 0x6f, 0x72, 0x74, 0x49, 0x64, 0x12, 0x24, 0x0a, 0x04, 0x43, 0x6f, 0x73, 0x74, 0x18, + 0x07, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x77, 0x65, 0x62, 0x61, 0x70, 0x69, 0x2e, 0x49, + 0x74, 0x65, 0x6d, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x43, 0x6f, 0x73, 0x74, 0x12, 0x28, 0x0a, + 0x06, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x18, 0x08, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x10, 0x2e, + 0x77, 0x65, 0x62, 0x61, 0x70, 0x69, 0x2e, 0x49, 0x74, 0x65, 0x6d, 0x49, 0x6e, 0x66, 0x6f, 0x52, + 0x06, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x12, 0x24, 0x0a, 0x0d, 0x4f, 0x6e, 0x43, 0x68, 0x61, + 0x6e, 0x6e, 0x65, 0x6c, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x09, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0d, + 0x4f, 0x6e, 0x43, 0x68, 0x61, 0x6e, 0x6e, 0x65, 0x6c, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x1e, 0x0a, + 0x0a, 0x47, 0x61, 0x6d, 0x65, 0x46, 0x72, 0x65, 0x65, 0x49, 0x64, 0x18, 0x0a, 0x20, 0x03, 0x28, + 0x05, 0x52, 0x0a, 0x47, 0x61, 0x6d, 0x65, 0x46, 0x72, 0x65, 0x65, 0x49, 0x64, 0x12, 0x14, 0x0a, + 0x05, 0x52, 0x6f, 0x75, 0x6e, 0x64, 0x18, 0x0b, 0x20, 0x03, 0x28, 0x05, 0x52, 0x05, 0x52, 0x6f, + 0x75, 0x6e, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x4e, 0x75, 0x6d, + 0x18, 0x0c, 0x20, 0x03, 0x28, 0x05, 0x52, 0x09, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x4e, 0x75, + 0x6d, 0x12, 0x22, 0x0a, 0x0c, 0x4e, 0x65, 0x65, 0x64, 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, + 0x64, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0c, 0x4e, 0x65, 0x65, 0x64, 0x50, 0x61, 0x73, + 0x73, 0x77, 0x6f, 0x72, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x43, 0x6f, 0x73, 0x74, 0x54, 0x79, 0x70, + 0x65, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x43, 0x6f, 0x73, 0x74, 0x54, 0x79, 0x70, + 0x65, 0x12, 0x14, 0x0a, 0x05, 0x56, 0x6f, 0x69, 0x63, 0x65, 0x18, 0x0f, 0x20, 0x01, 0x28, 0x05, + 0x52, 0x05, 0x56, 0x6f, 0x69, 0x63, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x49, 0x6d, 0x61, 0x67, 0x65, + 0x55, 0x52, 0x49, 0x18, 0x10, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x49, 0x6d, 0x61, 0x67, 0x65, + 0x55, 0x52, 0x49, 0x42, 0x26, 0x5a, 0x24, 0x6d, 0x6f, 0x6e, 0x67, 0x6f, 0x2e, 0x67, 0x61, 0x6d, + 0x65, 0x73, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x67, 0x61, 0x6d, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, + 0x6f, 0x63, 0x6f, 0x6c, 0x2f, 0x77, 0x65, 0x62, 0x61, 0x70, 0x69, 0x62, 0x06, 0x70, 0x72, 0x6f, + 0x74, 0x6f, 0x33, } var ( diff --git a/protocol/webapi/common.proto b/protocol/webapi/common.proto index 3bec979..85c19f9 100644 --- a/protocol/webapi/common.proto +++ b/protocol/webapi/common.proto @@ -912,6 +912,9 @@ message MachineInfo{ int64 AppId = 2; string ServerSecret = 3; string StreamId = 4; + int32 CostItemNum = 5; //消耗道具数量 + int32 ItemId = 6; //获得道具Id + int32 ItemNum = 7; //获得道具数量 } // etcd /game/match_audience message MatchAudience { diff --git a/xlsx/DB_GameItem.xlsx b/xlsx/DB_GameItem.xlsx index c4fd104..ede0227 100644 Binary files a/xlsx/DB_GameItem.xlsx and b/xlsx/DB_GameItem.xlsx differ diff --git a/xlsx/DB_Task.xlsx b/xlsx/DB_Task.xlsx index 85ff4e2..94e4037 100644 Binary files a/xlsx/DB_Task.xlsx and b/xlsx/DB_Task.xlsx differ