diff --git a/data/DB_GameItem.dat b/data/DB_GameItem.dat index 0719886..bbab8b5 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 0f1d7ab..15b588a 100644 --- a/data/DB_GameItem.json +++ b/data/DB_GameItem.json @@ -437,7 +437,7 @@ "Composition": 1, "CompositionMax": 9999, "Location": "0", - "Describe": "作用：获取金币或道具奖励\n产出途径：集字活动" + "Describe": "集卡礼盒：开启后可获得奖励\n产出途径：集字活动" }, { "Id": 50004, @@ -467,7 +467,7 @@ "Composition": 1, "CompositionMax": 9999, "Location": "0", - "Describe": "集字活动兑换奖励" + "Describe": "可在集字活动中兑换物品" }, { "Id": 50005, @@ -497,7 +497,7 @@ "Composition": 1, "CompositionMax": 9999, "Location": "0", - "Describe": "集字活动兑换奖励" + "Describe": "可在集字活动中兑换物品" }, { "Id": 50006, @@ -527,7 +527,7 @@ "Composition": 1, "CompositionMax": 9999, "Location": "0", - "Describe": "集字活动兑换奖励" + "Describe": "可在集字活动中兑换物品" }, { "Id": 50007, @@ -557,7 +557,7 @@ "Composition": 1, "CompositionMax": 9999, "Location": "0", - "Describe": "集字活动兑换奖励" + "Describe": "可在集字活动中兑换物品" }, { "Id": 50008, @@ -587,7 +587,7 @@ "Composition": 1, "CompositionMax": 9999, "Location": "0", - "Describe": "集字活动兑换奖励" + "Describe": "可在集字活动中兑换物品" }, { "Id": 50009, @@ -617,7 +617,7 @@ "Composition": 1, "CompositionMax": 9999, "Location": "0", - "Describe": "集字活动兑换奖励" + "Describe": "可在集字活动中兑换物品" }, { "Id": 50010, @@ -647,7 +647,7 @@ "Composition": 1, "CompositionMax": 9999, "Location": "0", - "Describe": "集字活动兑换奖励" + "Describe": "可在集字活动中兑换物品" }, { "Id": 50011, @@ -677,7 +677,7 @@ "Composition": 1, "CompositionMax": 9999, "Location": "0", - "Describe": "集字活动兑换奖励" + "Describe": "可在集字活动中兑换物品" }, { "Id": 50012, @@ -707,7 +707,34 @@ "Composition": 1, "CompositionMax": 9999, "Location": "0", - "Describe": "集字活动兑换奖励" + "Describe": "可在集字活动中兑换物品" + }, + { + "Id": 60001, + "Name": "tienlen记牌器", + "ShowLocation": [ + 1, + 1 + ], + "Classify": [ + 1, + 1, + 0 + ], + "Type": 15, + "Effect0": [ + 0, + 0, + 0 + ], + "Effect": [ + 0, + 0, + 0 + ], + "Time": 1, + "Location": "0", + "Describe": "tienlen游戏记录打出过的牌" }, { "Id": 100001, @@ -1145,6 +1172,1153 @@ "Location": "0", "Describe": "测试描述雷动九天" }, - {} + { + "Id": 71001, + "Name": "电饭煲", + "ShowLocation": [ + 1, + 1 + ], + "Classify": [ + 1, + 1, + 0 + ], + "Type": 4, + "Effect0": [ + 0, + 1, + 0 + ], + "Effect": [ + 0, + 1, + 0 + ], + "Composition": 1, + "CompositionMax": 9999, + "Location": "0", + "Describe": "可联系客服兑换实物奖励" + }, + { + "Id": 71002, + "Name": "电热水壶", + "ShowLocation": [ + 1, + 1 + ], + "Classify": [ + 1, + 1, + 0 + ], + "Type": 4, + "Effect0": [ + 0, + 1, + 0 + ], + "Effect": [ + 0, + 1, + 0 + ], + "Composition": 1, + "CompositionMax": 9999, + "Location": "0", + "Describe": "可联系客服兑换实物奖励" + }, + { + "Id": 71003, + "Name": "便携式风扇", + "ShowLocation": [ + 1, + 1 + ], + "Classify": [ + 1, + 1, + 0 + ], + "Type": 4, + "Effect0": [ + 0, + 1, + 0 + ], + "Effect": [ + 0, + 1, + 0 + ], + "Composition": 1, + "CompositionMax": 9999, + "Location": "0", + "Describe": "可联系客服兑换实物奖励" + }, + { + "Id": 72001, + "Name": "厨房炊具套装", + "ShowLocation": [ + 1, + 1 + ], + "Classify": [ + 1, + 1, + 0 + ], + "Type": 4, + "Effect0": [ + 0, + 1, + 0 + ], + "Effect": [ + 0, + 1, + 0 + ], + "Composition": 1, + "CompositionMax": 9999, + "Location": "0", + "Describe": "可联系客服兑换实物奖励" + }, + { + "Id": 72002, + "Name": "床上用品套件", + "ShowLocation": [ + 1, + 1 + ], + "Classify": [ + 1, + 1, + 0 + ], + "Type": 4, + "Effect0": [ + 0, + 1, + 0 + ], + "Effect": [ + 0, + 1, + 0 + ], + "Composition": 1, + "CompositionMax": 9999, + "Location": "0", + "Describe": "可联系客服兑换实物奖励" + }, + { + "Id": 72003, + "Name": "洗衣液", + "ShowLocation": [ + 1, + 1 + ], + "Classify": [ + 1, + 1, + 0 + ], + "Type": 4, + "Effect0": [ + 0, + 1, + 0 + ], + "Effect": [ + 0, + 1, + 0 + ], + "Composition": 1, + "CompositionMax": 9999, + "Location": "0", + "Describe": "可联系客服兑换实物奖励" + }, + { + "Id": 72004, + "Name": "水杯", + "ShowLocation": [ + 1, + 1 + ], + "Classify": [ + 1, + 1, + 0 + ], + "Type": 4, + "Effect0": [ + 0, + 1, + 0 + ], + "Effect": [ + 0, + 1, + 0 + ], + "Composition": 1, + "CompositionMax": 9999, + "Location": "0", + "Describe": "可联系客服兑换实物奖励" + }, + { + "Id": 72005, + "Name": "咖啡杯", + "ShowLocation": [ + 1, + 1 + ], + "Classify": [ + 1, + 1, + 0 + ], + "Type": 4, + "Effect0": [ + 0, + 1, + 0 + ], + "Effect": [ + 0, + 1, + 0 + ], + "Composition": 1, + "CompositionMax": 9999, + "Location": "0", + "Describe": "可联系客服兑换实物奖励" + }, + { + "Id": 73001, + "Name": "啤酒", + "ShowLocation": [ + 1, + 1 + ], + "Classify": [ + 1, + 1, + 0 + ], + "Type": 4, + "Effect0": [ + 0, + 1, + 0 + ], + "Effect": [ + 0, + 1, + 0 + ], + "Composition": 1, + "CompositionMax": 9999, + "Location": "0", + "Describe": "可联系客服兑换实物奖励" + }, + { + "Id": 73002, + "Name": "矿泉水", + "ShowLocation": [ + 1, + 1 + ], + "Classify": [ + 1, + 1, + 0 + ], + "Type": 4, + "Effect0": [ + 0, + 1, + 0 + ], + "Effect": [ + 0, + 1, + 0 + ], + "Composition": 1, + "CompositionMax": 9999, + "Location": "0", + "Describe": "可联系客服兑换实物奖励" + }, + { + "Id": 73003, + "Name": "果汁", + "ShowLocation": [ + 1, + 1 + ], + "Classify": [ + 1, + 1, + 0 + ], + "Type": 4, + "Effect0": [ + 0, + 1, + 0 + ], + "Effect": [ + 0, + 1, + 0 + ], + "Composition": 1, + "CompositionMax": 9999, + "Location": "0", + "Describe": "可联系客服兑换实物奖励" + }, + { + "Id": 73004, + "Name": "可乐", + "ShowLocation": [ + 1, + 1 + ], + "Classify": [ + 1, + 1, + 0 + ], + "Type": 4, + "Effect0": [ + 0, + 1, + 0 + ], + "Effect": [ + 0, + 1, + 0 + ], + "Composition": 1, + "CompositionMax": 9999, + "Location": "0", + "Describe": "可联系客服兑换实物奖励" + }, + { + "Id": 74001, + "Name": "护肤品套装", + "ShowLocation": [ + 1, + 1 + ], + "Classify": [ + 1, + 1, + 0 + ], + "Type": 4, + "Effect0": [ + 0, + 1, + 0 + ], + "Effect": [ + 0, + 1, + 0 + ], + "Composition": 1, + "CompositionMax": 9999, + "Location": "0", + "Describe": "可联系客服兑换实物奖励" + }, + { + "Id": 74002, + "Name": "洗发水和护发素", + "ShowLocation": [ + 1, + 1 + ], + "Classify": [ + 1, + 1, + 0 + ], + "Type": 4, + "Effect0": [ + 0, + 1, + 0 + ], + "Effect": [ + 0, + 1, + 0 + ], + "Composition": 1, + "CompositionMax": 9999, + "Location": "0", + "Describe": "可联系客服兑换实物奖励" + }, + { + "Id": 74003, + "Name": "电动牙刷", + "ShowLocation": [ + 1, + 1 + ], + "Classify": [ + 1, + 1, + 0 + ], + "Type": 4, + "Effect0": [ + 0, + 1, + 0 + ], + "Effect": [ + 0, + 1, + 0 + ], + "Composition": 1, + "CompositionMax": 9999, + "Location": "0", + "Describe": "可联系客服兑换实物奖励" + }, + { + "Id": 74004, + "Name": "香水", + "ShowLocation": [ + 1, + 1 + ], + "Classify": [ + 1, + 1, + 0 + ], + "Type": 4, + "Effect0": [ + 0, + 1, + 0 + ], + "Effect": [ + 0, + 1, + 0 + ], + "Composition": 1, + "CompositionMax": 9999, + "Location": "0", + "Describe": "可联系客服兑换实物奖励" + }, + { + "Id": 74005, + "Name": "按摩器", + "ShowLocation": [ + 1, + 1 + ], + "Classify": [ + 1, + 1, + 0 + ], + "Type": 4, + "Effect0": [ + 0, + 1, + 0 + ], + "Effect": [ + 0, + 1, + 0 + ], + "Composition": 1, + "CompositionMax": 9999, + "Location": "0", + "Describe": "可联系客服兑换实物奖励" + }, + { + "Id": 75001, + "Name": "瑜伽垫", + "ShowLocation": [ + 1, + 1 + ], + "Classify": [ + 1, + 1, + 0 + ], + "Type": 4, + "Effect0": [ + 0, + 1, + 0 + ], + "Effect": [ + 0, + 1, + 0 + ], + "Composition": 1, + "CompositionMax": 9999, + "Location": "0", + "Describe": "可联系客服兑换实物奖励" + }, + { + "Id": 75002, + "Name": "跳绳", + "ShowLocation": [ + 1, + 1 + ], + "Classify": [ + 1, + 1, + 0 + ], + "Type": 4, + "Effect0": [ + 0, + 1, + 0 + ], + "Effect": [ + 0, + 1, + 0 + ], + "Composition": 1, + "CompositionMax": 9999, + "Location": "0", + "Describe": "可联系客服兑换实物奖励" + }, + { + "Id": 75003, + "Name": "篮球", + "ShowLocation": [ + 1, + 1 + ], + "Classify": [ + 1, + 1, + 0 + ], + "Type": 4, + "Effect0": [ + 0, + 1, + 0 + ], + "Effect": [ + 0, + 1, + 0 + ], + "Composition": 1, + "CompositionMax": 9999, + "Location": "0", + "Describe": "可联系客服兑换实物奖励" + }, + { + "Id": 75004, + "Name": "足球", + "ShowLocation": [ + 1, + 1 + ], + "Classify": [ + 1, + 1, + 0 + ], + "Type": 4, + "Effect0": [ + 0, + 1, + 0 + ], + "Effect": [ + 0, + 1, + 0 + ], + "Composition": 1, + "CompositionMax": 9999, + "Location": "0", + "Describe": "可联系客服兑换实物奖励" + }, + { + "Id": 75005, + "Name": "健身手环", + "ShowLocation": [ + 1, + 1 + ], + "Classify": [ + 1, + 1, + 0 + ], + "Type": 4, + "Effect0": [ + 0, + 1, + 0 + ], + "Effect": [ + 0, + 1, + 0 + ], + "Composition": 1, + "CompositionMax": 9999, + "Location": "0", + "Describe": "可联系客服兑换实物奖励" + }, + { + "Id": 75006, + "Name": "山地车", + "ShowLocation": [ + 1, + 1 + ], + "Classify": [ + 1, + 1, + 0 + ], + "Type": 4, + "Effect0": [ + 0, + 1, + 0 + ], + "Effect": [ + 0, + 1, + 0 + ], + "Composition": 1, + "CompositionMax": 9999, + "Location": "0", + "Describe": "可联系客服兑换实物奖励" + }, + { + "Id": 76001, + "Name": "智能手机", + "ShowLocation": [ + 1, + 1 + ], + "Classify": [ + 1, + 1, + 0 + ], + "Type": 4, + "Effect0": [ + 0, + 1, + 0 + ], + "Effect": [ + 0, + 1, + 0 + ], + "Composition": 1, + "CompositionMax": 9999, + "Location": "0", + "Describe": "可联系客服兑换实物奖励" + }, + { + "Id": 76002, + "Name": "平板电脑", + "ShowLocation": [ + 1, + 1 + ], + "Classify": [ + 1, + 1, + 0 + ], + "Type": 4, + "Effect0": [ + 0, + 1, + 0 + ], + "Effect": [ + 0, + 1, + 0 + ], + "Composition": 1, + "CompositionMax": 9999, + "Location": "0", + "Describe": "可联系客服兑换实物奖励" + }, + { + "Id": 76003, + "Name": "耳机", + "ShowLocation": [ + 1, + 1 + ], + "Classify": [ + 1, + 1, + 0 + ], + "Type": 4, + "Effect0": [ + 0, + 1, + 0 + ], + "Effect": [ + 0, + 1, + 0 + ], + "Composition": 1, + "CompositionMax": 9999, + "Location": "0", + "Describe": "可联系客服兑换实物奖励" + }, + { + "Id": 76004, + "Name": "智能手表", + "ShowLocation": [ + 1, + 1 + ], + "Classify": [ + 1, + 1, + 0 + ], + "Type": 4, + "Effect0": [ + 0, + 1, + 0 + ], + "Effect": [ + 0, + 1, + 0 + ], + "Composition": 1, + "CompositionMax": 9999, + "Location": "0", + "Describe": "可联系客服兑换实物奖励" + }, + { + "Id": 76005, + "Name": "便携式音箱", + "ShowLocation": [ + 1, + 1 + ], + "Classify": [ + 1, + 1, + 0 + ], + "Type": 4, + "Effect0": [ + 0, + 1, + 0 + ], + "Effect": [ + 0, + 1, + 0 + ], + "Composition": 1, + "CompositionMax": 9999, + "Location": "0", + "Describe": "可联系客服兑换实物奖励" + }, + { + "Id": 77001, + "Name": "超市购物卡", + "ShowLocation": [ + 1, + 1 + ], + "Classify": [ + 1, + 1, + 0 + ], + "Type": 4, + "Effect0": [ + 0, + 1, + 0 + ], + "Effect": [ + 0, + 1, + 0 + ], + "Composition": 1, + "CompositionMax": 9999, + "Location": "0", + "Describe": "可联系客服兑换实物奖励" + }, + { + "Id": 77002, + "Name": "餐厅用餐券", + "ShowLocation": [ + 1, + 1 + ], + "Classify": [ + 1, + 1, + 0 + ], + "Type": 4, + "Effect0": [ + 0, + 1, + 0 + ], + "Effect": [ + 0, + 1, + 0 + ], + "Composition": 1, + "CompositionMax": 9999, + "Location": "0", + "Describe": "可联系客服兑换实物奖励" + }, + { + "Id": 77003, + "Name": "电影票", + "ShowLocation": [ + 1, + 1 + ], + "Classify": [ + 1, + 1, + 0 + ], + "Type": 4, + "Effect0": [ + 0, + 1, + 0 + ], + "Effect": [ + 0, + 1, + 0 + ], + "Composition": 1, + "CompositionMax": 9999, + "Location": "0", + "Describe": "可联系客服兑换实物奖励" + }, + { + "Id": 77004, + "Name": "在线购物优惠券", + "ShowLocation": [ + 1, + 1 + ], + "Classify": [ + 1, + 1, + 0 + ], + "Type": 4, + "Effect0": [ + 0, + 1, + 0 + ], + "Effect": [ + 0, + 1, + 0 + ], + "Composition": 1, + "CompositionMax": 9999, + "Location": "0", + "Describe": "可联系客服兑换实物奖励" + }, + { + "Id": 77005, + "Name": "按摩和美容服务", + "ShowLocation": [ + 1, + 1 + ], + "Classify": [ + 1, + 1, + 0 + ], + "Type": 4, + "Effect0": [ + 0, + 1, + 0 + ], + "Effect": [ + 0, + 1, + 0 + ], + "Composition": 1, + "CompositionMax": 9999, + "Location": "0", + "Describe": "可联系客服兑换实物奖励" + }, + { + "Id": 78001, + "Name": "本地景点门票", + "ShowLocation": [ + 1, + 1 + ], + "Classify": [ + 1, + 1, + 0 + ], + "Type": 4, + "Effect0": [ + 0, + 1, + 0 + ], + "Effect": [ + 0, + 1, + 0 + ], + "Composition": 1, + "CompositionMax": 9999, + "Location": "0", + "Describe": "可联系客服兑换实物奖励" + }, + { + "Id": 78002, + "Name": "酒店住宿", + "ShowLocation": [ + 1, + 1 + ], + "Classify": [ + 1, + 1, + 0 + ], + "Type": 4, + "Effect0": [ + 0, + 1, + 0 + ], + "Effect": [ + 0, + 1, + 0 + ], + "Composition": 1, + "CompositionMax": 9999, + "Location": "0", + "Describe": "可联系客服兑换实物奖励" + }, + { + "Id": 78003, + "Name": "游乐场门票", + "ShowLocation": [ + 1, + 1 + ], + "Classify": [ + 1, + 1, + 0 + ], + "Type": 4, + "Effect0": [ + 0, + 1, + 0 + ], + "Effect": [ + 0, + 1, + 0 + ], + "Composition": 1, + "CompositionMax": 9999, + "Location": "0", + "Describe": "可联系客服兑换实物奖励" + }, + { + "Id": 79001, + "Name": "大米", + "ShowLocation": [ + 1, + 1 + ], + "Classify": [ + 1, + 1, + 0 + ], + "Type": 4, + "Effect0": [ + 0, + 1, + 0 + ], + "Effect": [ + 0, + 1, + 0 + ], + "Composition": 1, + "CompositionMax": 9999, + "Location": "0", + "Describe": "可联系客服兑换实物奖励" + }, + { + "Id": 79002, + "Name": "食用油", + "ShowLocation": [ + 1, + 1 + ], + "Classify": [ + 1, + 1, + 0 + ], + "Type": 4, + "Effect0": [ + 0, + 1, + 0 + ], + "Effect": [ + 0, + 1, + 0 + ], + "Composition": 1, + "CompositionMax": 9999, + "Location": "0", + "Describe": "可联系客服兑换实物奖励" + }, + { + "Id": 79003, + "Name": "盐", + "ShowLocation": [ + 1, + 1 + ], + "Classify": [ + 1, + 1, + 0 + ], + "Type": 4, + "Effect0": [ + 0, + 1, + 0 + ], + "Effect": [ + 0, + 1, + 0 + ], + "Composition": 1, + "CompositionMax": 9999, + "Location": "0", + "Describe": "可联系客服兑换实物奖励" + }, + { + "Id": 79004, + "Name": "酱油", + "ShowLocation": [ + 1, + 1 + ], + "Classify": [ + 1, + 1, + 0 + ], + "Type": 4, + "Effect0": [ + 0, + 1, + 0 + ], + "Effect": [ + 0, + 1, + 0 + ], + "Composition": 1, + "CompositionMax": 9999, + "Location": "0", + "Describe": "可联系客服兑换实物奖励" + }, + { + "Id": 79005, + "Name": "鸡蛋", + "ShowLocation": [ + 1, + 1 + ], + "Classify": [ + 1, + 1, + 0 + ], + "Type": 4, + "Effect0": [ + 0, + 1, + 0 + ], + "Effect": [ + 0, + 1, + 0 + ], + "Composition": 1, + "CompositionMax": 9999, + "Location": "0", + "Describe": "可联系客服兑换实物奖励" + } ] } \ No newline at end of file diff --git a/data/DB_PropExchange.dat b/data/DB_PropExchange.dat index f560293..5c67686 100644 --- a/data/DB_PropExchange.dat +++ b/data/DB_PropExchange.dat @@ -1,5 +1,5 @@ 6ӆԆՆֆ׆"= -.ۆ؆نچ"= -Wֆ׆؆ӆՆچۆԆن"  -]ԆՆֆ׆؆چӆۆ܆ن" \ No newline at end of file +.؆نچۆ"= +Wֆ׆؆ӆՆنچۆԆ"  +]ӆԆ׆نۆ܆Նֆ؆چ" \ No newline at end of file diff --git a/data/DB_Task.dat b/data/DB_Task.dat index 46903f3..5938af1 100644 Binary files a/data/DB_Task.dat and b/data/DB_Task.dat differ diff --git a/xlsx/DB_GameItem.xlsx b/xlsx/DB_GameItem.xlsx index 7f504b8..51a8a4f 100644 Binary files a/xlsx/DB_GameItem.xlsx and b/xlsx/DB_GameItem.xlsx differ