diff --git a/data/DB_GameItem.dat b/data/DB_GameItem.dat index 0c48cfb..ea158f6 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 fef9b6c..4725b72 100644 --- a/data/DB_GameItem.json +++ b/data/DB_GameItem.json @@ -3210,6 +3210,2624 @@ "Describe": "可联系客服兑换实物奖励", "Entity": 7 }, + { + "Id": 77007, + "Name": "MAMA 方便面", + "ShowLocation": [ + 1, + 1, + 0 + ], + "Classify": [ + 0, + 0, + 1 + ], + "Type": 16, + "Effect0": [ + 0, + 1, + 0, + 0, + 0 + ], + "Effect": [ + 0, + 1, + 0, + 0, + 0 + ], + "Composition": 1, + "CompositionMax": 9999, + "Location": "0", + "Describe": "可联系客服兑换实物奖励", + "Entity": 7 + }, + { + "Id": 77008, + "Name": "LED灯 5m", + "ShowLocation": [ + 1, + 1, + 0 + ], + "Classify": [ + 0, + 0, + 1 + ], + "Type": 16, + "Effect0": [ + 0, + 1, + 0, + 0, + 0 + ], + "Effect": [ + 0, + 1, + 0, + 0, + 0 + ], + "Composition": 1, + "CompositionMax": 9999, + "Location": "0", + "Describe": "可联系客服兑换实物奖励", + "Entity": 7 + }, + { + "Id": 77009, + "Name": "安全帽", + "ShowLocation": [ + 1, + 1, + 0 + ], + "Classify": [ + 0, + 0, + 1 + ], + "Type": 16, + "Effect0": [ + 0, + 1, + 0, + 0, + 0 + ], + "Effect": [ + 0, + 1, + 0, + 0, + 0 + ], + "Composition": 1, + "CompositionMax": 9999, + "Location": "0", + "Describe": "可联系客服兑换实物奖励", + "Entity": 7 + }, + { + "Id": 77010, + "Name": "电动车", + "ShowLocation": [ + 1, + 1, + 0 + ], + "Classify": [ + 0, + 0, + 1 + ], + "Type": 16, + "Effect0": [ + 0, + 1, + 0, + 0, + 0 + ], + "Effect": [ + 0, + 1, + 0, + 0, + 0 + ], + "Composition": 1, + "CompositionMax": 9999, + "Location": "0", + "Describe": "可联系客服兑换实物奖励", + "Entity": 7 + }, + { + "Id": 77011, + "Name": "游戏椅子", + "ShowLocation": [ + 1, + 1, + 0 + ], + "Classify": [ + 0, + 0, + 1 + ], + "Type": 16, + "Effect0": [ + 0, + 1, + 0, + 0, + 0 + ], + "Effect": [ + 0, + 1, + 0, + 0, + 0 + ], + "Composition": 1, + "CompositionMax": 9999, + "Location": "0", + "Describe": "可联系客服兑换实物奖励", + "Entity": 7 + }, + { + "Id": 77012, + "Name": "太阳墨镜", + "ShowLocation": [ + 1, + 1, + 0 + ], + "Classify": [ + 0, + 0, + 1 + ], + "Type": 16, + "Effect0": [ + 0, + 1, + 0, + 0, + 0 + ], + "Effect": [ + 0, + 1, + 0, + 0, + 0 + ], + "Composition": 1, + "CompositionMax": 9999, + "Location": "0", + "Describe": "可联系客服兑换实物奖励", + "Entity": 7 + }, + { + "Id": 77013, + "Name": "JOKO 充电宝 J2920Kmah", + "ShowLocation": [ + 1, + 1, + 0 + ], + "Classify": [ + 0, + 0, + 1 + ], + "Type": 16, + "Effect0": [ + 0, + 1, + 0, + 0, + 0 + ], + "Effect": [ + 0, + 1, + 0, + 0, + 0 + ], + "Composition": 1, + "CompositionMax": 9999, + "Location": "0", + "Describe": "可联系客服兑换实物奖励", + "Entity": 7 + }, + { + "Id": 77014, + "Name": "吸尘器SOKANY SK-3389", + "ShowLocation": [ + 1, + 1, + 0 + ], + "Classify": [ + 0, + 0, + 1 + ], + "Type": 16, + "Effect0": [ + 0, + 1, + 0, + 0, + 0 + ], + "Effect": [ + 0, + 1, + 0, + 0, + 0 + ], + "Composition": 1, + "CompositionMax": 9999, + "Location": "0", + "Describe": "可联系客服兑换实物奖励", + "Entity": 7 + }, + { + "Id": 77015, + "Name": "电视 4A 43\"", + "ShowLocation": [ + 1, + 1, + 0 + ], + "Classify": [ + 0, + 0, + 1 + ], + "Type": 16, + "Effect0": [ + 0, + 1, + 0, + 0, + 0 + ], + "Effect": [ + 0, + 1, + 0, + 0, + 0 + ], + "Composition": 1, + "CompositionMax": 9999, + "Location": "0", + "Describe": "可联系客服兑换实物奖励", + "Entity": 7 + }, + { + "Id": 77016, + "Name": "饮料 Sting 1 箱", + "ShowLocation": [ + 1, + 1, + 0 + ], + "Classify": [ + 0, + 0, + 1 + ], + "Type": 16, + "Effect0": [ + 0, + 1, + 0, + 0, + 0 + ], + "Effect": [ + 0, + 1, + 0, + 0, + 0 + ], + "Composition": 1, + "CompositionMax": 9999, + "Location": "0", + "Describe": "可联系客服兑换实物奖励", + "Entity": 7 + }, + { + "Id": 77017, + "Name": "土豆片 Mr.Potato", + "ShowLocation": [ + 1, + 1, + 0 + ], + "Classify": [ + 0, + 0, + 1 + ], + "Type": 16, + "Effect0": [ + 0, + 1, + 0, + 0, + 0 + ], + "Effect": [ + 0, + 1, + 0, + 0, + 0 + ], + "Composition": 1, + "CompositionMax": 9999, + "Location": "0", + "Describe": "可联系客服兑换实物奖励", + "Entity": 7 + }, + { + "Id": 77018, + "Name": "松下热水器", + "ShowLocation": [ + 1, + 1, + 0 + ], + "Classify": [ + 0, + 0, + 1 + ], + "Type": 16, + "Effect0": [ + 0, + 1, + 0, + 0, + 0 + ], + "Effect": [ + 0, + 1, + 0, + 0, + 0 + ], + "Composition": 1, + "CompositionMax": 9999, + "Location": "0", + "Describe": "可联系客服兑换实物奖励", + "Entity": 7 + }, + { + "Id": 77019, + "Name": "ROCKRIDER山地车", + "ShowLocation": [ + 1, + 1, + 0 + ], + "Classify": [ + 0, + 0, + 1 + ], + "Type": 16, + "Effect0": [ + 0, + 1, + 0, + 0, + 0 + ], + "Effect": [ + 0, + 1, + 0, + 0, + 0 + ], + "Composition": 1, + "CompositionMax": 9999, + "Location": "0", + "Describe": "可联系客服兑换实物奖励", + "Entity": 7 + }, + { + "Id": 77020, + "Name": "2 person pop-up tent - 2 Seconds", + "ShowLocation": [ + 1, + 1, + 0 + ], + "Classify": [ + 0, + 0, + 1 + ], + "Type": 16, + "Effect0": [ + 0, + 1, + 0, + 0, + 0 + ], + "Effect": [ + 0, + 1, + 0, + 0, + 0 + ], + "Composition": 1, + "CompositionMax": 9999, + "Location": "0", + "Describe": "可联系客服兑换实物奖励", + "Entity": 7 + }, + { + "Id": 77021, + "Name": "Razer Hydrator雷蛇游侠水壶", + "ShowLocation": [ + 1, + 1, + 0 + ], + "Classify": [ + 0, + 0, + 1 + ], + "Type": 16, + "Effect0": [ + 0, + 1, + 0, + 0, + 0 + ], + "Effect": [ + 0, + 1, + 0, + 0, + 0 + ], + "Composition": 1, + "CompositionMax": 9999, + "Location": "0", + "Describe": "可联系客服兑换实物奖励", + "Entity": 7 + }, + { + "Id": 77022, + "Name": "Bonmatic Mini 胶囊咖啡机", + "ShowLocation": [ + 1, + 1, + 0 + ], + "Classify": [ + 0, + 0, + 1 + ], + "Type": 16, + "Effect0": [ + 0, + 1, + 0, + 0, + 0 + ], + "Effect": [ + 0, + 1, + 0, + 0, + 0 + ], + "Composition": 1, + "CompositionMax": 9999, + "Location": "0", + "Describe": "可联系客服兑换实物奖励", + "Entity": 7 + }, + { + "Id": 77023, + "Name": "康奈尔电饭煲1.8L-CRCJP185D", + "ShowLocation": [ + 1, + 1, + 0 + ], + "Classify": [ + 0, + 0, + 1 + ], + "Type": 16, + "Effect0": [ + 0, + 1, + 0, + 0, + 0 + ], + "Effect": [ + 0, + 1, + 0, + 0, + 0 + ], + "Composition": 1, + "CompositionMax": 9999, + "Location": "0", + "Describe": "可联系客服兑换实物奖励", + "Entity": 7 + }, + { + "Id": 77024, + "Name": "SOUNDTEOH ACF-5 5 英寸空气循环风扇", + "ShowLocation": [ + 1, + 1, + 0 + ], + "Classify": [ + 0, + 0, + 1 + ], + "Type": 16, + "Effect0": [ + 0, + 1, + 0, + 0, + 0 + ], + "Effect": [ + 0, + 1, + 0, + 0, + 0 + ], + "Composition": 1, + "CompositionMax": 9999, + "Location": "0", + "Describe": "可联系客服兑换实物奖励", + "Entity": 7 + }, + { + "Id": 77025, + "Name": "哈瓦仕女士凉鞋 Slim Postcard", + "ShowLocation": [ + 1, + 1, + 0 + ], + "Classify": [ + 0, + 0, + 1 + ], + "Type": 16, + "Effect0": [ + 0, + 1, + 0, + 0, + 0 + ], + "Effect": [ + 0, + 1, + 0, + 0, + 0 + ], + "Composition": 1, + "CompositionMax": 9999, + "Location": "0", + "Describe": "可联系客服兑换实物奖励", + "Entity": 7 + }, + { + "Id": 77026, + "Name": "Xiaomi Band 9 手环", + "ShowLocation": [ + 1, + 1, + 0 + ], + "Classify": [ + 0, + 0, + 1 + ], + "Type": 16, + "Effect0": [ + 0, + 1, + 0, + 0, + 0 + ], + "Effect": [ + 0, + 1, + 0, + 0, + 0 + ], + "Composition": 1, + "CompositionMax": 9999, + "Location": "0", + "Describe": "可联系客服兑换实物奖励", + "Entity": 7 + }, + { + "Id": 77027, + "Name": "荔枝纹纯色双肩包(粉色)", + "ShowLocation": [ + 1, + 1, + 0 + ], + "Classify": [ + 0, + 0, + 1 + ], + "Type": 16, + "Effect0": [ + 0, + 1, + 0, + 0, + 0 + ], + "Effect": [ + 0, + 1, + 0, + 0, + 0 + ], + "Composition": 1, + "CompositionMax": 9999, + "Location": "0", + "Describe": "可联系客服兑换实物奖励", + "Entity": 7 + }, + { + "Id": 77028, + "Name": "飞利浦迷你电饭锅 0.7升", + "ShowLocation": [ + 1, + 1, + 0 + ], + "Classify": [ + 0, + 0, + 1 + ], + "Type": 16, + "Effect0": [ + 0, + 1, + 0, + 0, + 0 + ], + "Effect": [ + 0, + 1, + 0, + 0, + 0 + ], + "Composition": 1, + "CompositionMax": 9999, + "Location": "0", + "Describe": "可联系客服兑换实物奖励", + "Entity": 7 + }, + { + "Id": 77029, + "Name": "ENCH NATURELLE SHOWER GEL LAVENDER 510G", + "ShowLocation": [ + 1, + 1, + 0 + ], + "Classify": [ + 0, + 0, + 1 + ], + "Type": 16, + "Effect0": [ + 0, + 1, + 0, + 0, + 0 + ], + "Effect": [ + 0, + 1, + 0, + 0, + 0 + ], + "Composition": 1, + "CompositionMax": 9999, + "Location": "0", + "Describe": "可联系客服兑换实物奖励", + "Entity": 7 + }, + { + "Id": 77030, + "Name": "Iphone 16 pro max256G", + "ShowLocation": [ + 1, + 1, + 0 + ], + "Classify": [ + 0, + 0, + 1 + ], + "Type": 16, + "Effect0": [ + 0, + 1, + 0, + 0, + 0 + ], + "Effect": [ + 0, + 1, + 0, + 0, + 0 + ], + "Composition": 1, + "CompositionMax": 9999, + "Location": "0", + "Describe": "可联系客服兑换实物奖励", + "Entity": 7 + }, + { + "Id": 77031, + "Name": "冰桶", + "ShowLocation": [ + 1, + 1, + 0 + ], + "Classify": [ + 0, + 0, + 1 + ], + "Type": 16, + "Effect0": [ + 0, + 1, + 0, + 0, + 0 + ], + "Effect": [ + 0, + 1, + 0, + 0, + 0 + ], + "Composition": 1, + "CompositionMax": 9999, + "Location": "0", + "Describe": "可联系客服兑换实物奖励", + "Entity": 7 + }, + { + "Id": 77032, + "Name": "智能电视机", + "ShowLocation": [ + 1, + 1, + 0 + ], + "Classify": [ + 0, + 0, + 1 + ], + "Type": 16, + "Effect0": [ + 0, + 1, + 0, + 0, + 0 + ], + "Effect": [ + 0, + 1, + 0, + 0, + 0 + ], + "Composition": 1, + "CompositionMax": 9999, + "Location": "0", + "Describe": "可联系客服兑换实物奖励", + "Entity": 7 + }, + { + "Id": 77033, + "Name": "探衣服器", + "ShowLocation": [ + 1, + 1, + 0 + ], + "Classify": [ + 0, + 0, + 1 + ], + "Type": 16, + "Effect0": [ + 0, + 1, + 0, + 0, + 0 + ], + "Effect": [ + 0, + 1, + 0, + 0, + 0 + ], + "Composition": 1, + "CompositionMax": 9999, + "Location": "0", + "Describe": "可联系客服兑换实物奖励", + "Entity": 7 + }, + { + "Id": 77034, + "Name": "手表 Zinvo", + "ShowLocation": [ + 1, + 1, + 0 + ], + "Classify": [ + 0, + 0, + 1 + ], + "Type": 16, + "Effect0": [ + 0, + 1, + 0, + 0, + 0 + ], + "Effect": [ + 0, + 1, + 0, + 0, + 0 + ], + "Composition": 1, + "CompositionMax": 9999, + "Location": "0", + "Describe": "可联系客服兑换实物奖励", + "Entity": 7 + }, + { + "Id": 77035, + "Name": "方便面 indomie 1 箱", + "ShowLocation": [ + 1, + 1, + 0 + ], + "Classify": [ + 0, + 0, + 1 + ], + "Type": 16, + "Effect0": [ + 0, + 1, + 0, + 0, + 0 + ], + "Effect": [ + 0, + 1, + 0, + 0, + 0 + ], + "Composition": 1, + "CompositionMax": 9999, + "Location": "0", + "Describe": "可联系客服兑换实物奖励", + "Entity": 7 + }, + { + "Id": 77036, + "Name": "雨衣", + "ShowLocation": [ + 1, + 1, + 0 + ], + "Classify": [ + 0, + 0, + 1 + ], + "Type": 16, + "Effect0": [ + 0, + 1, + 0, + 0, + 0 + ], + "Effect": [ + 0, + 1, + 0, + 0, + 0 + ], + "Composition": 1, + "CompositionMax": 9999, + "Location": "0", + "Describe": "可联系客服兑换实物奖励", + "Entity": 7 + }, + { + "Id": 77037, + "Name": "JBL音箱", + "ShowLocation": [ + 1, + 1, + 0 + ], + "Classify": [ + 0, + 0, + 1 + ], + "Type": 16, + "Effect0": [ + 0, + 1, + 0, + 0, + 0 + ], + "Effect": [ + 0, + 1, + 0, + 0, + 0 + ], + "Composition": 1, + "CompositionMax": 9999, + "Location": "0", + "Describe": "可联系客服兑换实物奖励", + "Entity": 7 + }, + { + "Id": 77038, + "Name": "电炉SOKANY SK-5113", + "ShowLocation": [ + 1, + 1, + 0 + ], + "Classify": [ + 0, + 0, + 1 + ], + "Type": 16, + "Effect0": [ + 0, + 1, + 0, + 0, + 0 + ], + "Effect": [ + 0, + 1, + 0, + 0, + 0 + ], + "Composition": 1, + "CompositionMax": 9999, + "Location": "0", + "Describe": "可联系客服兑换实物奖励", + "Entity": 7 + }, + { + "Id": 77039, + "Name": "烤面包机SOKANY HJT-008S\"", + "ShowLocation": [ + 1, + 1, + 0 + ], + "Classify": [ + 0, + 0, + 1 + ], + "Type": 16, + "Effect0": [ + 0, + 1, + 0, + 0, + 0 + ], + "Effect": [ + 0, + 1, + 0, + 0, + 0 + ], + "Composition": 1, + "CompositionMax": 9999, + "Location": "0", + "Describe": "可联系客服兑换实物奖励", + "Entity": 7 + }, + { + "Id": 77040, + "Name": "手撕蟹", + "ShowLocation": [ + 1, + 1, + 0 + ], + "Classify": [ + 0, + 0, + 1 + ], + "Type": 16, + "Effect0": [ + 0, + 1, + 0, + 0, + 0 + ], + "Effect": [ + 0, + 1, + 0, + 0, + 0 + ], + "Composition": 1, + "CompositionMax": 9999, + "Location": "0", + "Describe": "可联系客服兑换实物奖励", + "Entity": 7 + }, + { + "Id": 77041, + "Name": "粉条 Good", + "ShowLocation": [ + 1, + 1, + 0 + ], + "Classify": [ + 0, + 0, + 1 + ], + "Type": 16, + "Effect0": [ + 0, + 1, + 0, + 0, + 0 + ], + "Effect": [ + 0, + 1, + 0, + 0, + 0 + ], + "Composition": 1, + "CompositionMax": 9999, + "Location": "0", + "Describe": "可联系客服兑换实物奖励", + "Entity": 7 + }, + { + "Id": 77042, + "Name": "香烟 mevius", + "ShowLocation": [ + 1, + 1, + 0 + ], + "Classify": [ + 0, + 0, + 1 + ], + "Type": 16, + "Effect0": [ + 0, + 1, + 0, + 0, + 0 + ], + "Effect": [ + 0, + 1, + 0, + 0, + 0 + ], + "Composition": 1, + "CompositionMax": 9999, + "Location": "0", + "Describe": "可联系客服兑换实物奖励", + "Entity": 7 + }, + { + "Id": 77043, + "Name": "水果搅拌机", + "ShowLocation": [ + 1, + 1, + 0 + ], + "Classify": [ + 0, + 0, + 1 + ], + "Type": 16, + "Effect0": [ + 0, + 1, + 0, + 0, + 0 + ], + "Effect": [ + 0, + 1, + 0, + 0, + 0 + ], + "Composition": 1, + "CompositionMax": 9999, + "Location": "0", + "Describe": "可联系客服兑换实物奖励", + "Entity": 7 + }, + { + "Id": 77044, + "Name": "手电筒", + "ShowLocation": [ + 1, + 1, + 0 + ], + "Classify": [ + 0, + 0, + 1 + ], + "Type": 16, + "Effect0": [ + 0, + 1, + 0, + 0, + 0 + ], + "Effect": [ + 0, + 1, + 0, + 0, + 0 + ], + "Composition": 1, + "CompositionMax": 9999, + "Location": "0", + "Describe": "可联系客服兑换实物奖励", + "Entity": 7 + }, + { + "Id": 77045, + "Name": "烧水壶 2L", + "ShowLocation": [ + 1, + 1, + 0 + ], + "Classify": [ + 0, + 0, + 1 + ], + "Type": 16, + "Effect0": [ + 0, + 1, + 0, + 0, + 0 + ], + "Effect": [ + 0, + 1, + 0, + 0, + 0 + ], + "Composition": 1, + "CompositionMax": 9999, + "Location": "0", + "Describe": "可联系客服兑换实物奖励", + "Entity": 7 + }, + { + "Id": 77046, + "Name": "衣架 2 袋", + "ShowLocation": [ + 1, + 1, + 0 + ], + "Classify": [ + 0, + 0, + 1 + ], + "Type": 16, + "Effect0": [ + 0, + 1, + 0, + 0, + 0 + ], + "Effect": [ + 0, + 1, + 0, + 0, + 0 + ], + "Composition": 1, + "CompositionMax": 9999, + "Location": "0", + "Describe": "可联系客服兑换实物奖励", + "Entity": 7 + }, + { + "Id": 77047, + "Name": "摩托车机油", + "ShowLocation": [ + 1, + 1, + 0 + ], + "Classify": [ + 0, + 0, + 1 + ], + "Type": 16, + "Effect0": [ + 0, + 1, + 0, + 0, + 0 + ], + "Effect": [ + 0, + 1, + 0, + 0, + 0 + ], + "Composition": 1, + "CompositionMax": 9999, + "Location": "0", + "Describe": "可联系客服兑换实物奖励", + "Entity": 7 + }, + { + "Id": 77048, + "Name": "PREDO 钱包", + "ShowLocation": [ + 1, + 1, + 0 + ], + "Classify": [ + 0, + 0, + 1 + ], + "Type": 16, + "Effect0": [ + 0, + 1, + 0, + 0, + 0 + ], + "Effect": [ + 0, + 1, + 0, + 0, + 0 + ], + "Composition": 1, + "CompositionMax": 9999, + "Location": "0", + "Describe": "可联系客服兑换实物奖励", + "Entity": 7 + }, + { + "Id": 77049, + "Name": "2.5升电热水壶 Sokany SH-1051", + "ShowLocation": [ + 1, + 1, + 0 + ], + "Classify": [ + 0, + 0, + 1 + ], + "Type": 16, + "Effect0": [ + 0, + 1, + 0, + 0, + 0 + ], + "Effect": [ + 0, + 1, + 0, + 0, + 0 + ], + "Composition": 1, + "CompositionMax": 9999, + "Location": "0", + "Describe": "可联系客服兑换实物奖励", + "Entity": 7 + }, + { + "Id": 77050, + "Name": "电烤炉​SOKANY SK-08026", + "ShowLocation": [ + 1, + 1, + 0 + ], + "Classify": [ + 0, + 0, + 1 + ], + "Type": 16, + "Effect0": [ + 0, + 1, + 0, + 0, + 0 + ], + "Effect": [ + 0, + 1, + 0, + 0, + 0 + ], + "Composition": 1, + "CompositionMax": 9999, + "Location": "0", + "Describe": "可联系客服兑换实物奖励", + "Entity": 7 + }, + { + "Id": 77051, + "Name": "Bacchus 1 箱", + "ShowLocation": [ + 1, + 1, + 0 + ], + "Classify": [ + 0, + 0, + 1 + ], + "Type": 16, + "Effect0": [ + 0, + 1, + 0, + 0, + 0 + ], + "Effect": [ + 0, + 1, + 0, + 0, + 0 + ], + "Composition": 1, + "CompositionMax": 9999, + "Location": "0", + "Describe": "可联系客服兑换实物奖励", + "Entity": 7 + }, + { + "Id": 77052, + "Name": "电风扇 Hatari 18寸", + "ShowLocation": [ + 1, + 1, + 0 + ], + "Classify": [ + 0, + 0, + 1 + ], + "Type": 16, + "Effect0": [ + 0, + 1, + 0, + 0, + 0 + ], + "Effect": [ + 0, + 1, + 0, + 0, + 0 + ], + "Composition": 1, + "CompositionMax": 9999, + "Location": "0", + "Describe": "可联系客服兑换实物奖励", + "Entity": 7 + }, + { + "Id": 77053, + "Name": "秤", + "ShowLocation": [ + 1, + 1, + 0 + ], + "Classify": [ + 0, + 0, + 1 + ], + "Type": 16, + "Effect0": [ + 0, + 1, + 0, + 0, + 0 + ], + "Effect": [ + 0, + 1, + 0, + 0, + 0 + ], + "Composition": 1, + "CompositionMax": 9999, + "Location": "0", + "Describe": "可联系客服兑换实物奖励", + "Entity": 7 + }, + { + "Id": 77054, + "Name": "煤气炉", + "ShowLocation": [ + 1, + 1, + 0 + ], + "Classify": [ + 0, + 0, + 1 + ], + "Type": 16, + "Effect0": [ + 0, + 1, + 0, + 0, + 0 + ], + "Effect": [ + 0, + 1, + 0, + 0, + 0 + ], + "Composition": 1, + "CompositionMax": 9999, + "Location": "0", + "Describe": "可联系客服兑换实物奖励", + "Entity": 7 + }, + { + "Id": 77055, + "Name": "鱼豆腐", + "ShowLocation": [ + 1, + 1, + 0 + ], + "Classify": [ + 0, + 0, + 1 + ], + "Type": 16, + "Effect0": [ + 0, + 1, + 0, + 0, + 0 + ], + "Effect": [ + 0, + 1, + 0, + 0, + 0 + ], + "Composition": 1, + "CompositionMax": 9999, + "Location": "0", + "Describe": "可联系客服兑换实物奖励", + "Entity": 7 + }, + { + "Id": 77056, + "Name": "拖地家居", + "ShowLocation": [ + 1, + 1, + 0 + ], + "Classify": [ + 0, + 0, + 1 + ], + "Type": 16, + "Effect0": [ + 0, + 1, + 0, + 0, + 0 + ], + "Effect": [ + 0, + 1, + 0, + 0, + 0 + ], + "Composition": 1, + "CompositionMax": 9999, + "Location": "0", + "Describe": "可联系客服兑换实物奖励", + "Entity": 7 + }, + { + "Id": 77057, + "Name": "打火机", + "ShowLocation": [ + 1, + 1, + 0 + ], + "Classify": [ + 0, + 0, + 1 + ], + "Type": 16, + "Effect0": [ + 0, + 1, + 0, + 0, + 0 + ], + "Effect": [ + 0, + 1, + 0, + 0, + 0 + ], + "Composition": 1, + "CompositionMax": 9999, + "Location": "0", + "Describe": "可联系客服兑换实物奖励", + "Entity": 7 + }, + { + "Id": 77058, + "Name": "多头充电器", + "ShowLocation": [ + 1, + 1, + 0 + ], + "Classify": [ + 0, + 0, + 1 + ], + "Type": 16, + "Effect0": [ + 0, + 1, + 0, + 0, + 0 + ], + "Effect": [ + 0, + 1, + 0, + 0, + 0 + ], + "Composition": 1, + "CompositionMax": 9999, + "Location": "0", + "Describe": "可联系客服兑换实物奖励", + "Entity": 7 + }, + { + "Id": 77059, + "Name": "小米67W快速充电器", + "ShowLocation": [ + 1, + 1, + 0 + ], + "Classify": [ + 0, + 0, + 1 + ], + "Type": 16, + "Effect0": [ + 0, + 1, + 0, + 0, + 0 + ], + "Effect": [ + 0, + 1, + 0, + 0, + 0 + ], + "Composition": 1, + "CompositionMax": 9999, + "Location": "0", + "Describe": "可联系客服兑换实物奖励", + "Entity": 7 + }, + { + "Id": 77060, + "Name": "咖啡机 0.6LSOKANY SK-516", + "ShowLocation": [ + 1, + 1, + 0 + ], + "Classify": [ + 0, + 0, + 1 + ], + "Type": 16, + "Effect0": [ + 0, + 1, + 0, + 0, + 0 + ], + "Effect": [ + 0, + 1, + 0, + 0, + 0 + ], + "Composition": 1, + "CompositionMax": 9999, + "Location": "0", + "Describe": "可联系客服兑换实物奖励", + "Entity": 7 + }, + { + "Id": 77061, + "Name": "空气炸锅SK-3011", + "ShowLocation": [ + 1, + 1, + 0 + ], + "Classify": [ + 0, + 0, + 1 + ], + "Type": 16, + "Effect0": [ + 0, + 1, + 0, + 0, + 0 + ], + "Effect": [ + 0, + 1, + 0, + 0, + 0 + ], + "Composition": 1, + "CompositionMax": 9999, + "Location": "0", + "Describe": "可联系客服兑换实物奖励", + "Entity": 7 + }, + { + "Id": 77062, + "Name": "泰国鱼罐头6盒", + "ShowLocation": [ + 1, + 1, + 0 + ], + "Classify": [ + 0, + 0, + 1 + ], + "Type": 16, + "Effect0": [ + 0, + 1, + 0, + 0, + 0 + ], + "Effect": [ + 0, + 1, + 0, + 0, + 0 + ], + "Composition": 1, + "CompositionMax": 9999, + "Location": "0", + "Describe": "可联系客服兑换实物奖励", + "Entity": 7 + }, + { + "Id": 77063, + "Name": "拖鞋 Crocs", + "ShowLocation": [ + 1, + 1, + 0 + ], + "Classify": [ + 0, + 0, + 1 + ], + "Type": 16, + "Effect0": [ + 0, + 1, + 0, + 0, + 0 + ], + "Effect": [ + 0, + 1, + 0, + 0, + 0 + ], + "Composition": 1, + "CompositionMax": 9999, + "Location": "0", + "Describe": "可联系客服兑换实物奖励", + "Entity": 7 + }, + { + "Id": 77064, + "Name": "摄像头", + "ShowLocation": [ + 1, + 1, + 0 + ], + "Classify": [ + 0, + 0, + 1 + ], + "Type": 16, + "Effect0": [ + 0, + 1, + 0, + 0, + 0 + ], + "Effect": [ + 0, + 1, + 0, + 0, + 0 + ], + "Composition": 1, + "CompositionMax": 9999, + "Location": "0", + "Describe": "可联系客服兑换实物奖励", + "Entity": 7 + }, + { + "Id": 77065, + "Name": "微波炉", + "ShowLocation": [ + 1, + 1, + 0 + ], + "Classify": [ + 0, + 0, + 1 + ], + "Type": 16, + "Effect0": [ + 0, + 1, + 0, + 0, + 0 + ], + "Effect": [ + 0, + 1, + 0, + 0, + 0 + ], + "Composition": 1, + "CompositionMax": 9999, + "Location": "0", + "Describe": "可联系客服兑换实物奖励", + "Entity": 7 + }, + { + "Id": 77066, + "Name": "剃须刀 phillip", + "ShowLocation": [ + 1, + 1, + 0 + ], + "Classify": [ + 0, + 0, + 1 + ], + "Type": 16, + "Effect0": [ + 0, + 1, + 0, + 0, + 0 + ], + "Effect": [ + 0, + 1, + 0, + 0, + 0 + ], + "Composition": 1, + "CompositionMax": 9999, + "Location": "0", + "Describe": "可联系客服兑换实物奖励", + "Entity": 7 + }, + { + "Id": 77067, + "Name": "labubu 哇哇", + "ShowLocation": [ + 1, + 1, + 0 + ], + "Classify": [ + 0, + 0, + 1 + ], + "Type": 16, + "Effect0": [ + 0, + 1, + 0, + 0, + 0 + ], + "Effect": [ + 0, + 1, + 0, + 0, + 0 + ], + "Composition": 1, + "CompositionMax": 9999, + "Location": "0", + "Describe": "可联系客服兑换实物奖励", + "Entity": 7 + }, + { + "Id": 77068, + "Name": "耳机 Razer Kraken V4", + "ShowLocation": [ + 1, + 1, + 0 + ], + "Classify": [ + 0, + 0, + 1 + ], + "Type": 16, + "Effect0": [ + 0, + 1, + 0, + 0, + 0 + ], + "Effect": [ + 0, + 1, + 0, + 0, + 0 + ], + "Composition": 1, + "CompositionMax": 9999, + "Location": "0", + "Describe": "可联系客服兑换实物奖励", + "Entity": 7 + }, + { + "Id": 77069, + "Name": "米家台灯2 CN", + "ShowLocation": [ + 1, + 1, + 0 + ], + "Classify": [ + 0, + 0, + 1 + ], + "Type": 16, + "Effect0": [ + 0, + 1, + 0, + 0, + 0 + ], + "Effect": [ + 0, + 1, + 0, + 0, + 0 + ], + "Composition": 1, + "CompositionMax": 9999, + "Location": "0", + "Describe": "可联系客服兑换实物奖励", + "Entity": 7 + }, + { + "Id": 77070, + "Name": "GoPro HERO12黑色版 (套装)", + "ShowLocation": [ + 1, + 1, + 0 + ], + "Classify": [ + 0, + 0, + 1 + ], + "Type": 16, + "Effect0": [ + 0, + 1, + 0, + 0, + 0 + ], + "Effect": [ + 0, + 1, + 0, + 0, + 0 + ], + "Composition": 1, + "CompositionMax": 9999, + "Location": "0", + "Describe": "可联系客服兑换实物奖励", + "Entity": 7 + }, + { + "Id": 77071, + "Name": "小米扫地机E5", + "ShowLocation": [ + 1, + 1, + 0 + ], + "Classify": [ + 0, + 0, + 1 + ], + "Type": 16, + "Effect0": [ + 0, + 1, + 0, + 0, + 0 + ], + "Effect": [ + 0, + 1, + 0, + 0, + 0 + ], + "Composition": 1, + "CompositionMax": 9999, + "Location": "0", + "Describe": "可联系客服兑换实物奖励", + "Entity": 7 + }, + { + "Id": 77072, + "Name": "韩国方便面 Samyang", + "ShowLocation": [ + 1, + 1, + 0 + ], + "Classify": [ + 0, + 0, + 1 + ], + "Type": 16, + "Effect0": [ + 0, + 1, + 0, + 0, + 0 + ], + "Effect": [ + 0, + 1, + 0, + 0, + 0 + ], + "Composition": 1, + "CompositionMax": 9999, + "Location": "0", + "Describe": "可联系客服兑换实物奖励", + "Entity": 7 + }, + { + "Id": 77073, + "Name": "键盘罗技G213 Prodigy", + "ShowLocation": [ + 1, + 1, + 0 + ], + "Classify": [ + 0, + 0, + 1 + ], + "Type": 16, + "Effect0": [ + 0, + 1, + 0, + 0, + 0 + ], + "Effect": [ + 0, + 1, + 0, + 0, + 0 + ], + "Composition": 1, + "CompositionMax": 9999, + "Location": "0", + "Describe": "可联系客服兑换实物奖励", + "Entity": 7 + }, + { + "Id": 77074, + "Name": "罗技 鼠标G502 HERO", + "ShowLocation": [ + 1, + 1, + 0 + ], + "Classify": [ + 0, + 0, + 1 + ], + "Type": 16, + "Effect0": [ + 0, + 1, + 0, + 0, + 0 + ], + "Effect": [ + 0, + 1, + 0, + 0, + 0 + ], + "Composition": 1, + "CompositionMax": 9999, + "Location": "0", + "Describe": "可联系客服兑换实物奖励", + "Entity": 7 + }, + { + "Id": 77075, + "Name": "无线蓝牙耳机", + "ShowLocation": [ + 1, + 1, + 0 + ], + "Classify": [ + 0, + 0, + 1 + ], + "Type": 16, + "Effect0": [ + 0, + 1, + 0, + 0, + 0 + ], + "Effect": [ + 0, + 1, + 0, + 0, + 0 + ], + "Composition": 1, + "CompositionMax": 9999, + "Location": "0", + "Describe": "可联系客服兑换实物奖励", + "Entity": 7 + }, + { + "Id": 77076, + "Name": "笔记本电脑华硕 TUF FA506NF", + "ShowLocation": [ + 1, + 1, + 0 + ], + "Classify": [ + 0, + 0, + 1 + ], + "Type": 16, + "Effect0": [ + 0, + 1, + 0, + 0, + 0 + ], + "Effect": [ + 0, + 1, + 0, + 0, + 0 + ], + "Composition": 1, + "CompositionMax": 9999, + "Location": "0", + "Describe": "可联系客服兑换实物奖励", + "Entity": 7 + }, + { + "Id": 77077, + "Name": "米家无线除螨吸尘器", + "ShowLocation": [ + 1, + 1, + 0 + ], + "Classify": [ + 0, + 0, + 1 + ], + "Type": 16, + "Effect0": [ + 0, + 1, + 0, + 0, + 0 + ], + "Effect": [ + 0, + 1, + 0, + 0, + 0 + ], + "Composition": 1, + "CompositionMax": 9999, + "Location": "0", + "Describe": "可联系客服兑换实物奖励", + "Entity": 7 + }, + { + "Id": 77078, + "Name": "Sony WH-1000XM5\n无线耳机", + "ShowLocation": [ + 1, + 1, + 0 + ], + "Classify": [ + 0, + 0, + 1 + ], + "Type": 16, + "Effect0": [ + 0, + 1, + 0, + 0, + 0 + ], + "Effect": [ + 0, + 1, + 0, + 0, + 0 + ], + "Composition": 1, + "CompositionMax": 9999, + "Location": "0", + "Describe": "可联系客服兑换实物奖励", + "Entity": 7 + }, + { + "Id": 77079, + "Name": "小米 空气净化器", + "ShowLocation": [ + 1, + 1, + 0 + ], + "Classify": [ + 0, + 0, + 1 + ], + "Type": 16, + "Effect0": [ + 0, + 1, + 0, + 0, + 0 + ], + "Effect": [ + 0, + 1, + 0, + 0, + 0 + ], + "Composition": 1, + "CompositionMax": 9999, + "Location": "0", + "Describe": "可联系客服兑换实物奖励", + "Entity": 7 + }, + { + "Id": 77080, + "Name": "米家 吹风机 H501 SE", + "ShowLocation": [ + 1, + 1, + 0 + ], + "Classify": [ + 0, + 0, + 1 + ], + "Type": 16, + "Effect0": [ + 0, + 1, + 0, + 0, + 0 + ], + "Effect": [ + 0, + 1, + 0, + 0, + 0 + ], + "Composition": 1, + "CompositionMax": 9999, + "Location": "0", + "Describe": "可联系客服兑换实物奖励", + "Entity": 7 + }, + { + "Id": 77081, + "Name": "K\u0026F KF13.098V1相机背包 L", + "ShowLocation": [ + 1, + 1, + 0 + ], + "Classify": [ + 0, + 0, + 1 + ], + "Type": 16, + "Effect0": [ + 0, + 1, + 0, + 0, + 0 + ], + "Effect": [ + 0, + 1, + 0, + 0, + 0 + ], + "Composition": 1, + "CompositionMax": 9999, + "Location": "0", + "Describe": "可联系客服兑换实物奖励", + "Entity": 7 + }, + { + "Id": 77082, + "Name": "平板 Y700", + "ShowLocation": [ + 1, + 1, + 0 + ], + "Classify": [ + 0, + 0, + 1 + ], + "Type": 16, + "Effect0": [ + 0, + 1, + 0, + 0, + 0 + ], + "Effect": [ + 0, + 1, + 0, + 0, + 0 + ], + "Composition": 1, + "CompositionMax": 9999, + "Location": "0", + "Describe": "可联系客服兑换实物奖励", + "Entity": 7 + }, + { + "Id": 77083, + "Name": "米家智能蒸发冷风扇", + "ShowLocation": [ + 1, + 1, + 0 + ], + "Classify": [ + 0, + 0, + 1 + ], + "Type": 16, + "Effect0": [ + 0, + 1, + 0, + 0, + 0 + ], + "Effect": [ + 0, + 1, + 0, + 0, + 0 + ], + "Composition": 1, + "CompositionMax": 9999, + "Location": "0", + "Describe": "可联系客服兑换实物奖励", + "Entity": 7 + }, { "Id": 30008, "Name": "1元话费直兑券", @@ -3625,7 +6243,7 @@ }, { "Id": 80001, - "Name": "皮卡丘娃娃", + "Name": "皮卡丘玩偶", "ShowLocation": [ 0, 0, diff --git a/data/DB_PropExchange.dat b/data/DB_PropExchange.dat index 79f081e..692c5d1 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 1e4060f..5c3030b 100644 Binary files a/data/DB_Task.dat and b/data/DB_Task.dat differ diff --git a/gamesrv/transact/trascate_gamesrv.go b/gamesrv/transact/trascate_gamesrv.go index ed74722..9c239fc 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_ParamError, pack + return common.ResponseTag_Ok, 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_NoFindRoom, pack + return common.ResponseTag_Ok, pack } switch d := scene.ExtraData.(type) { @@ -145,6 +145,6 @@ func init() { pack.Tag = webapiproto.TagCode_FAILED pack.Msg = "未实现" } - return common.ResponseTag_NoData, pack + return common.ResponseTag_Ok, pack })) } diff --git a/mgrsrv/api/webapi_gamesrv.go b/mgrsrv/api/webapi_gamesrv.go index a38b156..477dd19 100644 --- a/mgrsrv/api/webapi_gamesrv.go +++ b/mgrsrv/api/webapi_gamesrv.go @@ -6,8 +6,10 @@ import ( "encoding/json" "fmt" "io" - "mongo.games.com/game/common" - "mongo.games.com/game/model" + "net/http" + "sync/atomic" + "time" + "mongo.games.com/goserver/core" "mongo.games.com/goserver/core/admin" "mongo.games.com/goserver/core/logger" @@ -15,9 +17,10 @@ import ( "mongo.games.com/goserver/core/transact" "mongo.games.com/goserver/core/utils" "mongo.games.com/goserver/srvlib" - "net/http" - "sync/atomic" - "time" + + "mongo.games.com/game/common" + "mongo.games.com/game/model" + "mongo.games.com/game/protocol/webapi" ) const ( @@ -173,10 +176,11 @@ 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) - if retCode == common.ResponseTag_Ok { + msg, ok := ud.(*webapi.SARoomInfo) + if ok && msg.GetTag() == webapi.TagCode_SUCCESS { tNode.TransEnv.SetField(GAMESRVAPI_TRANSACTE_RESPONSE, ud) } - return transact.TransExeResult_Success + return transact.TransExeResult(retCode) }), }) // 对局详情 diff --git a/xlsx/DB_GameItem.xlsx b/xlsx/DB_GameItem.xlsx index ede0227..1e779cf 100644 Binary files a/xlsx/DB_GameItem.xlsx and b/xlsx/DB_GameItem.xlsx differ