diff --git a/bin/json/game_rdtaskcondi.json b/bin/json/game_rdtaskcondi.json index a2c3c5c8e..7f48636a8 100644 --- a/bin/json/game_rdtaskcondi.json +++ b/bin/json/game_rdtaskcondi.json @@ -1937,8 +1937,1856 @@ { "id": 10810, "datatype": 2, + "type": 18, + "inited": [], + "data1": 1000, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 2008001, + "datatype": 2, "type": 8, "inited": [], + "data1": 1, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 2012001, + "datatype": 2, + "type": 12, + "inited": [], + "data1": 1, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 2018001, + "datatype": 2, + "type": 18, + "inited": [], + "data1": 1, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 2024001, + "datatype": 2, + "type": 24, + "inited": [], + "data1": 1, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 2047001, + "datatype": 2, + "type": 47, + "inited": [], + "data1": 1, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 2062001, + "datatype": 2, + "type": 62, + "inited": [], + "data1": 1, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 2064001, + "datatype": 2, + "type": 64, + "inited": [], + "data1": 1, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 2130001, + "datatype": 2, + "type": 130, + "inited": [], + "data1": 3, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 3008001, + "datatype": 2, + "type": 8, + "inited": [], + "data1": 10, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 3012001, + "datatype": 2, + "type": 12, + "inited": [], + "data1": 10, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 3018001, + "datatype": 2, + "type": 18, + "inited": [], + "data1": 5, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 3024001, + "datatype": 2, + "type": 24, + "inited": [], + "data1": 5, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 3047001, + "datatype": 2, + "type": 47, + "inited": [], + "data1": 7, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 3061001, + "datatype": 2, + "type": 62, + "inited": [], + "data1": 7, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 3064001, + "datatype": 2, + "type": 64, + "inited": [], + "data1": 7, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 3088001, + "datatype": 2, + "type": 88, + "inited": [], + "data1": 3, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 3105001, + "datatype": 2, + "type": 105, + "inited": [], + "data1": 10, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 3104001, + "datatype": 2, + "type": 104, + "inited": [], + "data1": 1000, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 3130001, + "datatype": 2, + "type": 130, + "inited": [], + "data1": 30, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 4008001, + "datatype": 1, + "type": 8, + "inited": [], + "data1": 3, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 4008002, + "datatype": 1, + "type": 8, + "inited": [], + "data1": 7, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 4008003, + "datatype": 1, + "type": 8, + "inited": [], + "data1": 30, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 4008004, + "datatype": 1, + "type": 8, + "inited": [], + "data1": 90, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 4008005, + "datatype": 1, + "type": 8, + "inited": [], + "data1": 180, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 4008006, + "datatype": 1, + "type": 8, + "inited": [], + "data1": 365, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 4008007, + "datatype": 1, + "type": 9, + "inited": [], + "data1": 3, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 4008008, + "datatype": 1, + "type": 9, + "inited": [], + "data1": 7, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 4008009, + "datatype": 1, + "type": 9, + "inited": [], + "data1": 14, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 4008010, + "datatype": 1, + "type": 9, + "inited": [], + "data1": 30, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 4010001, + "datatype": 1, + "type": 10, + "inited": [], + "data1": 1, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 4010002, + "datatype": 1, + "type": 10, + "inited": [], + "data1": 5, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 4010003, + "datatype": 1, + "type": 10, + "inited": [], + "data1": 10, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 4010004, + "datatype": 1, + "type": 10, + "inited": [], + "data1": 20, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 4010005, + "datatype": 1, + "type": 10, + "inited": [], + "data1": 30, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 4010006, + "datatype": 1, + "type": 10, + "inited": [], + "data1": 50, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 4011001, + "datatype": 1, + "type": 11, + "inited": [], + "data1": 5, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 4011002, + "datatype": 1, + "type": 11, + "inited": [], + "data1": 10, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 4011003, + "datatype": 1, + "type": 11, + "inited": [], + "data1": 30, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 4011004, + "datatype": 1, + "type": 11, + "inited": [], + "data1": 50, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 4011005, + "datatype": 1, + "type": 11, + "inited": [], + "data1": 100, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 4011006, + "datatype": 1, + "type": 11, + "inited": [], + "data1": 300, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 4011007, + "datatype": 1, + "type": 11, + "inited": [], + "data1": 500, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 4011008, + "datatype": 1, + "type": 11, + "inited": [], + "data1": 1000, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 4011009, + "datatype": 1, + "type": 11, + "inited": [], + "data1": 3000, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 4011010, + "datatype": 1, + "type": 11, + "inited": [], + "data1": 5000, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 4011011, + "datatype": 1, + "type": 11, + "inited": [], + "data1": 10000, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 4012001, + "datatype": 1, + "type": 12, + "inited": [], + "data1": 1, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 4012002, + "datatype": 1, + "type": 12, + "inited": [], + "data1": 5, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 4012003, + "datatype": 1, + "type": 12, + "inited": [], + "data1": 10, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 4012004, + "datatype": 1, + "type": 12, + "inited": [], + "data1": 30, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 4012005, + "datatype": 1, + "type": 12, + "inited": [], + "data1": 50, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 4012006, + "datatype": 1, + "type": 12, + "inited": [], + "data1": 100, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 4012007, + "datatype": 1, + "type": 12, + "inited": [], + "data1": 300, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 4012008, + "datatype": 1, + "type": 12, + "inited": [], + "data1": 500, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 4012009, + "datatype": 1, + "type": 12, + "inited": [], + "data1": 1000, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 4016001, + "datatype": 1, + "type": 16, + "inited": [], + "data1": 1, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 4016002, + "datatype": 1, + "type": 16, + "inited": [], + "data1": 2, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 4016003, + "datatype": 1, + "type": 16, + "inited": [], + "data1": 3, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 4016004, + "datatype": 1, + "type": 16, + "inited": [], + "data1": 5, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 4016005, + "datatype": 1, + "type": 16, + "inited": [], + "data1": 10, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 4016006, + "datatype": 1, + "type": 16, + "inited": [], + "data1": 15, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 4016007, + "datatype": 1, + "type": 16, + "inited": [], + "data1": 20, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 4016008, + "datatype": 1, + "type": 16, + "inited": [], + "data1": 30, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 4016009, + "datatype": 1, + "type": 16, + "inited": [], + "data1": 50, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 4018001, + "datatype": 1, + "type": 18, + "inited": [], + "data1": 10, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 4018002, + "datatype": 1, + "type": 18, + "inited": [], + "data1": 20, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 4018003, + "datatype": 1, + "type": 18, + "inited": [], + "data1": 30, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 4018004, + "datatype": 1, + "type": 18, + "inited": [], + "data1": 50, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 4018005, + "datatype": 1, + "type": 18, + "inited": [], + "data1": 100, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 4018006, + "datatype": 1, + "type": 18, + "inited": [], + "data1": 200, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 4018007, + "datatype": 1, + "type": 18, + "inited": [], + "data1": 300, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 4018008, + "datatype": 1, + "type": 18, + "inited": [], + "data1": 500, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 4018009, + "datatype": 1, + "type": 18, + "inited": [], + "data1": 1000, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 4018010, + "datatype": 1, + "type": 18, + "inited": [], + "data1": 2000, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 4018011, + "datatype": 1, + "type": 18, + "inited": [], + "data1": 5000, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 4018012, + "datatype": 1, + "type": 18, + "inited": [], + "data1": 10000, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 4020001, + "datatype": 1, + "type": 20, + "inited": [], + "data1": 10, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 4020002, + "datatype": 1, + "type": 20, + "inited": [], + "data1": 20, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 4020003, + "datatype": 1, + "type": 20, + "inited": [], + "data1": 30, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 4020004, + "datatype": 1, + "type": 20, + "inited": [], + "data1": 40, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 4020005, + "datatype": 1, + "type": 20, + "inited": [], + "data1": 50, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 4020006, + "datatype": 1, + "type": 20, + "inited": [], + "data1": 60, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 4043001, + "datatype": 1, + "type": 43, + "inited": [], + "data1": 1, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 4043002, + "datatype": 1, + "type": 43, + "inited": [], + "data1": 2, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 4043003, + "datatype": 1, + "type": 43, + "inited": [], + "data1": 4, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 4043004, + "datatype": 1, + "type": 43, + "inited": [], + "data1": 6, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 4043005, + "datatype": 1, + "type": 43, + "inited": [], + "data1": 12, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 4043006, + "datatype": 1, + "type": 43, + "inited": [], + "data1": 18, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 4043007, + "datatype": 1, + "type": 43, + "inited": [], + "data1": 24, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 4043008, + "datatype": 1, + "type": 43, + "inited": [], + "data1": 30, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 4043009, + "datatype": 1, + "type": 43, + "inited": [], + "data1": 60, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 4043010, + "datatype": 1, + "type": 43, + "inited": [], + "data1": 120, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 4047001, + "datatype": 1, + "type": 47, + "inited": [], + "data1": 10, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 4047002, + "datatype": 1, + "type": 47, + "inited": [], + "data1": 20, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 4047003, + "datatype": 1, + "type": 47, + "inited": [], + "data1": 30, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 4047004, + "datatype": 1, + "type": 47, + "inited": [], + "data1": 50, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 4047005, + "datatype": 1, + "type": 47, + "inited": [], + "data1": 100, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 4047006, + "datatype": 1, + "type": 47, + "inited": [], + "data1": 200, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 4047007, + "datatype": 1, + "type": 47, + "inited": [], + "data1": 300, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 4047008, + "datatype": 1, + "type": 47, + "inited": [], + "data1": 500, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 4047009, + "datatype": 1, + "type": 47, + "inited": [], + "data1": 1000, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 4047010, + "datatype": 1, + "type": 47, + "inited": [], + "data1": 2000, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 4047011, + "datatype": 1, + "type": 47, + "inited": [], + "data1": 3000, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 4047012, + "datatype": 1, + "type": 47, + "inited": [], + "data1": 5000, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 4047013, + "datatype": 1, + "type": 47, + "inited": [], + "data1": 10000, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 4064001, + "datatype": 1, + "type": 64, + "inited": [], + "data1": 5, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 4064002, + "datatype": 1, + "type": 64, + "inited": [], + "data1": 10, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 4064003, + "datatype": 1, + "type": 64, + "inited": [], + "data1": 20, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 4064004, + "datatype": 1, + "type": 64, + "inited": [], + "data1": 50, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 4064005, + "datatype": 1, + "type": 64, + "inited": [], + "data1": 100, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 4064006, + "datatype": 1, + "type": 64, + "inited": [], + "data1": 200, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 4064007, + "datatype": 1, + "type": 64, + "inited": [], + "data1": 500, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 4068001, + "datatype": 1, + "type": 68, + "inited": [], + "data1": 50000, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 4068002, + "datatype": 1, + "type": 68, + "inited": [], + "data1": 500000, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 4068003, + "datatype": 1, + "type": 68, + "inited": [], + "data1": 5000000, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 4068004, + "datatype": 1, + "type": 68, + "inited": [], + "data1": 50000000, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 4084001, + "datatype": 1, + "type": 84, + "inited": [], + "data1": 10, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 4084002, + "datatype": 1, + "type": 84, + "inited": [], + "data1": 20, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 4084003, + "datatype": 1, + "type": 84, + "inited": [], + "data1": 50, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 4084004, + "datatype": 1, + "type": 84, + "inited": [], + "data1": 100, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 4085001, + "datatype": 1, + "type": 85, + "inited": [], + "data1": 5, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 4085002, + "datatype": 1, + "type": 85, + "inited": [], + "data1": 10, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 4085003, + "datatype": 1, + "type": 85, + "inited": [], + "data1": 20, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 4085004, + "datatype": 1, + "type": 85, + "inited": [], + "data1": 30, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 4085005, + "datatype": 1, + "type": 85, + "inited": [], + "data1": 50, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 4096001, + "datatype": 1, + "type": 96, + "inited": [], + "data1": 10, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 4096002, + "datatype": 1, + "type": 96, + "inited": [], + "data1": 20, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 4096003, + "datatype": 1, + "type": 96, + "inited": [], + "data1": 50, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 4096004, + "datatype": 1, + "type": 96, + "inited": [], + "data1": 100, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 4096005, + "datatype": 1, + "type": 96, + "inited": [], + "data1": 200, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 4096006, + "datatype": 1, + "type": 96, + "inited": [], + "data1": 300, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 4096007, + "datatype": 1, + "type": 96, + "inited": [], + "data1": 500, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 4096008, + "datatype": 1, + "type": 96, + "inited": [], + "data1": 1000, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 4096009, + "datatype": 1, + "type": 96, + "inited": [], + "data1": 2000, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 4096010, + "datatype": 1, + "type": 96, + "inited": [], + "data1": 3000, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 4096011, + "datatype": 1, + "type": 96, + "inited": [], + "data1": 5000, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 4096012, + "datatype": 1, + "type": 96, + "inited": [], + "data1": 10000, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 4104001, + "datatype": 1, + "type": 104, + "inited": [], + "data1": 500, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 4104002, + "datatype": 1, + "type": 104, + "inited": [], + "data1": 1000, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 4104003, + "datatype": 1, + "type": 104, + "inited": [], + "data1": 3000, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 4104004, + "datatype": 1, + "type": 104, + "inited": [], + "data1": 5000, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 4104005, + "datatype": 1, + "type": 104, + "inited": [], + "data1": 10000, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 4104006, + "datatype": 1, + "type": 104, + "inited": [], + "data1": 20000, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 4104007, + "datatype": 1, + "type": 104, + "inited": [], + "data1": 30000, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 4104008, + "datatype": 1, + "type": 104, + "inited": [], + "data1": 50000, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 4104009, + "datatype": 1, + "type": 104, + "inited": [], + "data1": 100000, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 4104010, + "datatype": 1, + "type": 104, + "inited": [], + "data1": 200000, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 4104011, + "datatype": 1, + "type": 104, + "inited": [], + "data1": 500000, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 4128001, + "datatype": 1, + "type": 128, + "inited": [], + "data1": 1100, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 4128002, + "datatype": 1, + "type": 128, + "inited": [], + "data1": 1200, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 4128003, + "datatype": 1, + "type": 128, + "inited": [], + "data1": 1300, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 4128004, + "datatype": 1, + "type": 128, + "inited": [], + "data1": 1400, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 4128005, + "datatype": 1, + "type": 128, + "inited": [], + "data1": 1500, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 4128006, + "datatype": 1, + "type": 128, + "inited": [], + "data1": 1600, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 4128007, + "datatype": 1, + "type": 128, + "inited": [], + "data1": 1700, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 4128008, + "datatype": 1, + "type": 128, + "inited": [], + "data1": 1800, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 4128009, + "datatype": 1, + "type": 128, + "inited": [], + "data1": 1900, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 4128010, + "datatype": 1, + "type": 128, + "inited": [], + "data1": 2000, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 4131001, + "datatype": 1, + "type": 131, + "inited": [], + "data1": 5, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 4131002, + "datatype": 1, + "type": 131, + "inited": [], + "data1": 10, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 4131003, + "datatype": 1, + "type": 131, + "inited": [], + "data1": 20, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 4131004, + "datatype": 1, + "type": 131, + "inited": [], + "data1": 30, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 4131005, + "datatype": 1, + "type": 131, + "inited": [], + "data1": 50, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 4131006, + "datatype": 1, + "type": 131, + "inited": [], + "data1": 100, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 4131007, + "datatype": 1, + "type": 131, + "inited": [], + "data1": 200, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 4131008, + "datatype": 1, + "type": 131, + "inited": [], + "data1": 300, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 4131009, + "datatype": 1, + "type": 131, + "inited": [], + "data1": 500, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 4131010, + "datatype": 1, + "type": 131, + "inited": [], "data1": 1000, "data2": 0, "data3": 0, diff --git a/bin/json/game_worldtask.json b/bin/json/game_worldtask.json index 5f0c3ee48..723dba1c9 100644 --- a/bin/json/game_worldtask.json +++ b/bin/json/game_worldtask.json @@ -7,8 +7,6 @@ "group": 1, "des": 2, "icon": "", - "task_name": "新剧情10100", - "task_display": "新剧情文本10100", "npc": [ "scenes_ boundary_01", "杰克", @@ -42,11 +40,9 @@ "group": 1, "des": 2, "icon": "", - "task_name": "新剧情10101", - "task_display": "新剧情文本10101", "npc": [ "scenes_ boundary_01", - "邦尼兔组件名入场", + "邦尼兔组件名", "150" ], "getafter_event": [ @@ -66,8 +62,6 @@ "group": 1, "des": 2, "icon": "", - "task_name": "新剧情10102", - "task_display": "新剧情文本10102", "npc": [ "dreamwork_restaurant_01", "波比组件名", @@ -90,8 +84,6 @@ "group": 1, "des": 2, "icon": "", - "task_name": "新剧情10103", - "task_display": "新剧情文本10103", "npc": [ "dreamwork_restaurant_01", "波比组件名", @@ -114,8 +106,6 @@ "group": 1, "des": 2, "icon": "", - "task_name": "新剧情10104", - "task_display": "新剧情文本10104", "npc": [ "dreamwork_restaurant_01", "波比组件名", @@ -149,8 +139,6 @@ "group": 1, "des": 2, "icon": "", - "task_name": "新剧情10105", - "task_display": "新剧情文本10105", "npc": [ "scenes_ boundary_01", "杰克", @@ -173,8 +161,6 @@ "group": 1, "des": 2, "icon": "", - "task_name": "新剧情10106", - "task_display": "新剧情文本10106", "npc": [ "scenes_ boundary_01", "杰克", @@ -197,8 +183,6 @@ "group": 1, "des": 2, "icon": "", - "task_name": "新剧情10107", - "task_display": "新剧情文本10107", "npc": [ "scenes_ boundary_01", "杰克", @@ -221,8 +205,6 @@ "group": 1, "des": 2, "icon": "", - "task_name": "新剧情10108", - "task_display": "新剧情文本10108", "npc": [ "scenes_ boundary_01", "杰克", @@ -245,8 +227,6 @@ "group": 1, "des": 2, "icon": "", - "task_name": "新剧情10109", - "task_display": "新剧情文本10109", "npc": [ "scenes_ boundary_01", "戈伯组件名", @@ -269,8 +249,6 @@ "group": 1, "des": 2, "icon": "", - "task_name": "新剧情10110", - "task_display": "新剧情文本10110", "npc": [ "SmithyScene", "戈伯铁匠铺组件名", @@ -293,8 +271,6 @@ "group": 1, "des": 2, "icon": "", - "task_name": "新剧情10111", - "task_display": "新剧情文本10111", "npc": [ "scenes_ boundary_01", "阿宝铁匠铺出来模型", @@ -317,8 +293,6 @@ "group": 1, "des": 2, "icon": "", - "task_name": "新剧情10112", - "task_display": "新剧情文本10112", "npc": [ "scenes_ boundary_01", "瓜哥组件名", @@ -341,8 +315,6 @@ "group": 1, "des": 2, "icon": "", - "task_name": "新剧情10113", - "task_display": "新剧情文本10113", "npc": [ "test_library", "贫嘴驴组件名", @@ -365,8 +337,6 @@ "group": 1, "des": 2, "icon": "", - "task_name": "新剧情10114", - "task_display": "新剧情文本10114", "npc": [ "test_library", "贫嘴驴组件名", @@ -389,8 +359,6 @@ "group": 1, "des": 2, "icon": "", - "task_name": "新剧情10115", - "task_display": "新剧情文本10115", "npc": [ "scenes_boundary_02night", "瓜哥夜晚组件名", @@ -413,8 +381,6 @@ "group": 1, "des": 2, "icon": "", - "task_name": "新剧情10116", - "task_display": "新剧情文本10116", "npc": [ "scenes_boundary_02night", "杰克", @@ -437,8 +403,6 @@ "group": 1, "des": 2, "icon": "", - "task_name": "新剧情10117", - "task_display": "新剧情文本10117", "npc": [ "scenes_ boundary_01", "杰克", @@ -461,8 +425,6 @@ "group": 1, "des": 2, "icon": "", - "task_name": "新剧情10118", - "task_display": "新剧情文本10118", "npc": [ "scenes_ boundary_01", "杰克", @@ -485,8 +447,6 @@ "group": 1, "des": 2, "icon": "", - "task_name": "新剧情10119", - "task_display": "新剧情文本10119", "npc": [ "scenes_ boundary_01", "瓜哥维京区", @@ -509,8 +469,6 @@ "group": 1, "des": 2, "icon": "", - "task_name": "新剧情10120", - "task_display": "新剧情文本10120", "npc": [ "scenes_ boundary_01", "瓜哥维京区", @@ -533,8 +491,6 @@ "group": 1, "des": 2, "icon": "", - "task_name": "新剧情10121", - "task_display": "新剧情文本10121", "npc": [ "scenes_ boundary_01", "瓜哥维京区", @@ -557,8 +513,6 @@ "group": 1, "des": 2, "icon": "", - "task_name": "新剧情10122", - "task_display": "新剧情文本10122", "npc": [ "scenes_ boundary_01", "瓜哥维京区", @@ -581,8 +535,6 @@ "group": 1, "des": 2, "icon": "", - "task_name": "新剧情10123", - "task_display": "新剧情文本10123", "npc": [ "scenes_ boundary_01", "瓜哥维京区", @@ -605,8 +557,6 @@ "group": 1, "des": 2, "icon": "", - "task_name": "新剧情10124", - "task_display": "新剧情文本10124", "npc": [ "WuGuanScene", "武馆瓜哥", @@ -629,8 +579,6 @@ "group": 1, "des": 2, "icon": "", - "task_name": "新剧情10125", - "task_display": "新剧情文本10125", "npc": [ "WuGuanScene", "武馆瓜哥", @@ -653,8 +601,6 @@ "group": 1, "des": 2, "icon": "", - "task_name": "新剧情10126", - "task_display": "新剧情文本10126", "npc": [ "WuGuanScene", "武馆瓜哥", @@ -677,8 +623,6 @@ "group": 1, "des": 2, "icon": "", - "task_name": "新剧情10127", - "task_display": "新剧情文本10127", "npc": [ "WuGuanScene", "武馆瓜哥", @@ -701,8 +645,6 @@ "group": 1, "des": 2, "icon": "", - "task_name": "新剧情10128", - "task_display": "新剧情文本10128", "npc": [ "WuGuanScene", "武馆瓜哥", @@ -725,8 +667,6 @@ "group": 1, "des": 2, "icon": "", - "task_name": "新剧情10129", - "task_display": "新剧情文本10129", "npc": [ "WuGuanScene", "武馆瓜哥", @@ -749,8 +689,6 @@ "group": 1, "des": 2, "icon": "", - "task_name": "新剧情10130", - "task_display": "新剧情文本10130", "npc": [ "WuGuanScene", "武馆瓜哥", @@ -773,8 +711,6 @@ "group": 1, "des": 2, "icon": "", - "task_name": "新剧情10131", - "task_display": "新剧情文本10131", "npc": [ "scenes_ boundary_01", "瓜哥维京区", @@ -797,8 +733,6 @@ "group": 1, "des": 2, "icon": "", - "task_name": "新剧情10132", - "task_display": "新剧情文本10132", "npc": [ "scenes_ boundary_01", "杰克", @@ -821,8 +755,6 @@ "group": 1, "des": 2, "icon": "", - "task_name": "新剧情10133", - "task_display": "新剧情文本10133", "npc": [ "scenes_ boundary_01", "杰克", @@ -845,8 +777,6 @@ "group": 1, "des": 2, "icon": "", - "task_name": "新剧情10134", - "task_display": "新剧情文本10134", "npc": [ "scenes_ boundary_01", "杰克", @@ -869,8 +799,6 @@ "group": 1, "des": 2, "icon": "", - "task_name": "新剧情10135", - "task_display": "新剧情文本10135", "npc": [ "scenes_ boundary_01", "杰克", @@ -893,8 +821,6 @@ "group": 1, "des": 2, "icon": "", - "task_name": "新剧情10136", - "task_display": "新剧情文本10136", "npc": [ "scenes_ boundary_01", "瓜哥现代区", @@ -917,8 +843,6 @@ "group": 1, "des": 2, "icon": "", - "task_name": "新剧情10137", - "task_display": "新剧情文本10137", "npc": [ "WuGuanScene", "武馆瓜哥", @@ -941,8 +865,6 @@ "group": 1, "des": 2, "icon": "", - "task_name": "新剧情10138", - "task_display": "新剧情文本10138", "npc": [ "WuGuanScene", "武馆瓜哥", @@ -965,8 +887,6 @@ "group": 1, "des": 2, "icon": "", - "task_name": "新剧情10139", - "task_display": "新剧情文本10139", "npc": [ "scenes_ boundary_01", "瓜哥现代区", @@ -989,8 +909,6 @@ "group": 1, "des": 2, "icon": "", - "task_name": "新剧情10140", - "task_display": "新剧情文本10140", "npc": [ "scenes_ boundary_01", "瓜哥现代区", @@ -1013,8 +931,6 @@ "group": 1, "des": 2, "icon": "", - "task_name": "新剧情10141", - "task_display": "新剧情文本10141", "npc": [ "scenes_ boundary_01", "瓜哥现代区", @@ -1037,8 +953,6 @@ "group": 1, "des": 2, "icon": "", - "task_name": "新剧情10142", - "task_display": "新剧情文本10142", "npc": [ "scenes_ boundary_01", "瓜哥现代区", @@ -1061,8 +975,6 @@ "group": 1, "des": 2, "icon": "", - "task_name": "新剧情10143", - "task_display": "新剧情文本10143", "npc": [ "scenes_ boundary_01", "瓜哥现代区", @@ -1085,8 +997,6 @@ "group": 1, "des": 2, "icon": "", - "task_name": "新剧情10144", - "task_display": "新剧情文本10144", "npc": [ "scenes_ boundary_01", "瓜哥现代区", @@ -1109,8 +1019,6 @@ "group": 1, "des": 2, "icon": "", - "task_name": "新剧情10145", - "task_display": "新剧情文本10145", "npc": [ "scenes_ boundary_01", "瓜哥现代区", @@ -1133,8 +1041,6 @@ "group": 1, "des": 2, "icon": "", - "task_name": "新剧情10146", - "task_display": "新剧情文本10146", "npc": [ "scenes_ boundary_01", "杰克", @@ -1157,8 +1063,6 @@ "group": 1, "des": 2, "icon": "", - "task_name": "新剧情10147", - "task_display": "新剧情文本10147", "npc": [ "scenes_ boundary_01", "杰克", @@ -1181,8 +1085,6 @@ "group": 1, "des": 2, "icon": "", - "task_name": "新剧情10148", - "task_display": "新剧情文本10148", "npc": [ "scenes_ boundary_01", "杰克", @@ -1205,8 +1107,6 @@ "group": 1, "des": 2, "icon": "", - "task_name": "新剧情10149", - "task_display": "新剧情文本10149", "npc": [ "scenes_ boundary_01", "杰克", @@ -1229,8 +1129,6 @@ "group": 1, "des": 2, "icon": "", - "task_name": "新剧情10150", - "task_display": "新剧情文本10150", "npc": [ "scenes_ boundary_01", "杰克", @@ -1253,8 +1151,6 @@ "group": 1, "des": 2, "icon": "", - "task_name": "新剧情10151", - "task_display": "新剧情文本10151", "npc": [ "scenes_ boundary_01", "杰克", @@ -1277,8 +1173,6 @@ "group": 1, "des": 2, "icon": "", - "task_name": "新剧情10152", - "task_display": "新剧情文本10152", "npc": [ "scenes_ boundary_01", "杰克", @@ -1301,8 +1195,6 @@ "group": 1, "des": 2, "icon": "", - "task_name": "新剧情10153", - "task_display": "新剧情文本10153", "npc": [ "scenes_martialarts_01", "武馆杰克 ", @@ -1325,8 +1217,6 @@ "group": 1, "des": 2, "icon": "", - "task_name": "新剧情10154", - "task_display": "新剧情文本10154", "npc": [ "scenes_martialarts_01", "武馆杰克 ", @@ -1349,8 +1239,6 @@ "group": 1, "des": 2, "icon": "", - "task_name": "新剧情10155", - "task_display": "新剧情文本10155", "npc": [ "scenes_martialarts_01", "武馆杰克 ", @@ -1373,8 +1261,6 @@ "group": 1, "des": 2, "icon": "", - "task_name": "新剧情10156", - "task_display": "新剧情文本10156", "npc": [ "scenes_martialarts_01", "武馆杰克 ", @@ -1397,8 +1283,6 @@ "group": 1, "des": 2, "icon": "", - "task_name": "新剧情10157", - "task_display": "新剧情文本10157", "npc": [ "scenes_martialarts_01", "武馆杰克 ", @@ -1421,8 +1305,6 @@ "group": 1, "des": 2, "icon": "", - "task_name": "新剧情10158", - "task_display": "新剧情文本10158", "npc": [ "scenes_martialarts_01", "武馆杰克 ", @@ -1445,8 +1327,6 @@ "group": 1, "des": 2, "icon": "", - "task_name": "新剧情10159", - "task_display": "新剧情文本10159", "npc": [ "scenes_martialarts_01", "武馆杰克 ", @@ -1469,8 +1349,6 @@ "group": 1, "des": 2, "icon": "", - "task_name": "新剧情10160", - "task_display": "新剧情文本10160", "npc": [ "scenes_martialarts_01", "武馆杰克 ", @@ -1493,8 +1371,6 @@ "group": 1, "des": 2, "icon": "", - "task_name": "新剧情10161", - "task_display": "新剧情文本10161", "npc": [ "scenes_martialarts_01", "武馆杰克 ", @@ -1517,8 +1393,6 @@ "group": 1, "des": 2, "icon": "", - "task_name": "新剧情10162", - "task_display": "新剧情文本10162", "npc": [ "scenes_martialarts_01", "武馆杰克 ", @@ -1541,8 +1415,6 @@ "group": 1, "des": 2, "icon": "", - "task_name": "新剧情10163", - "task_display": "新剧情文本10163", "npc": [ "scenes_martialarts_01", "武馆杰克 ", @@ -1565,8 +1437,6 @@ "group": 1, "des": 2, "icon": "", - "task_name": "新剧情10164", - "task_display": "新剧情文本10164", "npc": [ "scenes_martialarts_01", "武馆杰克 ", @@ -1589,8 +1459,6 @@ "group": 1, "des": 2, "icon": "", - "task_name": "新剧情10165", - "task_display": "新剧情文本10165", "npc": [ "scenes_martialarts_01", "武馆杰克 ", @@ -1613,8 +1481,6 @@ "group": 10001, "des": 3, "icon": "", - "task_name": "新剧情10100", - "task_display": "新剧情文本10100", "npc": [ "scenes_ boundary_01", "阿宝组件名", @@ -1648,8 +1514,6 @@ "group": 10001, "des": 3, "icon": "", - "task_name": "新剧情10101", - "task_display": "新剧情文本10101", "npc": [ "scenes_ boundary_01", "邦尼兔组件名", @@ -1678,8 +1542,6 @@ "group": 10001, "des": 3, "icon": "", - "task_name": "新剧情10102", - "task_display": "新剧情文本10102", "npc": [ "dreamwork_restaurant_01", "波比组件名", @@ -1708,8 +1570,6 @@ "group": 10001, "des": 3, "icon": "", - "task_name": "新剧情10103", - "task_display": "新剧情文本10103", "npc": [ "dreamwork_restaurant_01", "阿宝组件名", @@ -1738,8 +1598,6 @@ "group": 10001, "des": 3, "icon": "", - "task_name": "新剧情10104", - "task_display": "新剧情文本10104", "npc": [ "dreamwork_restaurant_01", "波比组件名", @@ -1773,8 +1631,6 @@ "group": 10001, "des": 3, "icon": "", - "task_name": "新剧情10105", - "task_display": "新剧情文本10105", "npc": [ "scenes_ boundary_01", "阿宝组件名", @@ -1803,8 +1659,6 @@ "group": 10001, "des": 3, "icon": "", - "task_name": "新剧情10106", - "task_display": "新剧情文本10106", "npc": [ "scenes_ boundary_01", "阿宝组件名", @@ -1833,8 +1687,6 @@ "group": 10001, "des": 3, "icon": "", - "task_name": "新剧情10107", - "task_display": "新剧情文本10107", "npc": [ "scenes_ boundary_01", "阿宝组件名", @@ -1863,8 +1715,6 @@ "group": 10001, "des": 3, "icon": "", - "task_name": "新剧情10108", - "task_display": "新剧情文本10108", "npc": [ "scenes_ boundary_01", "阿宝组件名", @@ -1893,8 +1743,6 @@ "group": 10001, "des": 3, "icon": "", - "task_name": "新剧情10109", - "task_display": "新剧情文本10109", "npc": [ "scenes_ boundary_01", "戈伯组件名", @@ -1923,8 +1771,6 @@ "group": 10002, "des": 3, "icon": "", - "task_name": "新剧情10100", - "task_display": "新剧情文本10100", "npc": [ "scenes_ boundary_01", "阿宝组件名", @@ -1958,8 +1804,6 @@ "group": 10002, "des": 3, "icon": "", - "task_name": "新剧情10101", - "task_display": "新剧情文本10101", "npc": [ "scenes_ boundary_01", "邦尼兔组件名", @@ -1988,8 +1832,6 @@ "group": 10002, "des": 3, "icon": "", - "task_name": "新剧情10102", - "task_display": "新剧情文本10102", "npc": [ "dreamwork_restaurant_01", "波比组件名", @@ -2018,8 +1860,6 @@ "group": 10002, "des": 3, "icon": "", - "task_name": "新剧情10103", - "task_display": "新剧情文本10103", "npc": [ "dreamwork_restaurant_01", "阿宝组件名", @@ -2048,8 +1888,6 @@ "group": 10002, "des": 3, "icon": "", - "task_name": "新剧情10104", - "task_display": "新剧情文本10104", "npc": [ "dreamwork_restaurant_01", "波比组件名", @@ -2083,8 +1921,6 @@ "group": 10002, "des": 3, "icon": "", - "task_name": "新剧情10105", - "task_display": "新剧情文本10105", "npc": [ "scenes_ boundary_01", "阿宝组件名", @@ -2113,8 +1949,6 @@ "group": 10002, "des": 3, "icon": "", - "task_name": "新剧情10106", - "task_display": "新剧情文本10106", "npc": [ "scenes_ boundary_01", "阿宝组件名", @@ -2143,8 +1977,6 @@ "group": 10002, "des": 3, "icon": "", - "task_name": "新剧情10107", - "task_display": "新剧情文本10107", "npc": [ "scenes_ boundary_01", "阿宝组件名", @@ -2173,8 +2005,6 @@ "group": 10002, "des": 3, "icon": "", - "task_name": "新剧情10108", - "task_display": "新剧情文本10108", "npc": [ "scenes_ boundary_01", "阿宝组件名", @@ -2203,8 +2033,6 @@ "group": 10002, "des": 3, "icon": "", - "task_name": "新剧情10109", - "task_display": "新剧情文本10109", "npc": [ "scenes_ boundary_01", "戈伯组件名", @@ -2233,8 +2061,6 @@ "group": 1, "des": 2, "icon": "", - "task_name": "新剧情20100", - "task_display": "新剧情文本20100", "npc": [ "scenes_ boundary_01", "阿宝组件名", @@ -2263,8 +2089,6 @@ "group": 1, "des": 2, "icon": "", - "task_name": "新剧情20101", - "task_display": "新剧情文本20101", "npc": [ "scenes_ boundary_01", "邦尼兔组件名", @@ -2293,8 +2117,6 @@ "group": 1, "des": 2, "icon": "", - "task_name": "新剧情20102", - "task_display": "新剧情文本20102", "npc": [ "scenes_ boundary_01", "阿宝右屏组件名", @@ -2323,8 +2145,6 @@ "group": 1, "des": 2, "icon": "", - "task_name": "新剧情20103", - "task_display": "新剧情文本20103", "npc": [ "scenes_ boundary_01", "阿宝右屏组件名", @@ -2353,8 +2173,6 @@ "group": 1, "des": 2, "icon": "", - "task_name": "新剧情20104", - "task_display": "新剧情文本20104", "npc": [ "scenes_ boundary_01", "阿宝右屏组件名", @@ -2383,8 +2201,6 @@ "group": 1, "des": 2, "icon": "", - "task_name": "新剧情20105", - "task_display": "新剧情文本20105", "npc": [ "scenes_ boundary_01", "阿宝右屏组件名", @@ -2413,8 +2229,6 @@ "group": 1, "des": 2, "icon": "", - "task_name": "新剧情20106", - "task_display": "新剧情文本20106", "npc": [ "scenes_ boundary_01", "邦尼兔组件名", @@ -2443,8 +2257,6 @@ "group": 1, "des": 2, "icon": "", - "task_name": "新剧情20107", - "task_display": "新剧情文本20107", "npc": [ "scenes_ boundary_01", "阿宝维京区", @@ -2473,8 +2285,6 @@ "group": 1, "des": 2, "icon": "", - "task_name": "新剧情20108", - "task_display": "新剧情文本20108", "npc": [ "scenes_ boundary_01", "阿宝维京区", @@ -2503,8 +2313,6 @@ "group": 1, "des": 2, "icon": "", - "task_name": "新剧情20109", - "task_display": "新剧情文本20109", "npc": [ "scenes_ boundary_01", "邦尼兔组件名", @@ -2533,8 +2341,6 @@ "group": 1, "des": 2, "icon": "", - "task_name": "新剧情20110", - "task_display": "新剧情文本20110", "npc": [ "scenes_ boundary_01", "阿宝组件名", @@ -2563,8 +2369,6 @@ "group": 1, "des": 2, "icon": "", - "task_name": "新剧情20111", - "task_display": "新剧情文本20111", "npc": [ "scenes_ boundary_01", "阿宝右屏组件名", @@ -2593,8 +2397,6 @@ "group": 1, "des": 2, "icon": "", - "task_name": "新剧情20112", - "task_display": "新剧情文本20112", "npc": [ "scenes_ boundary_01", "阿宝右屏组件名", diff --git a/modules/worldtask/api_battlefinish.go b/modules/worldtask/api_battlefinish.go index 4438d359b..1d6f3702d 100644 --- a/modules/worldtask/api_battlefinish.go +++ b/modules/worldtask/api_battlefinish.go @@ -4,6 +4,7 @@ import ( "go_dreamfactory/comm" "go_dreamfactory/lego/sys/log" "go_dreamfactory/pb" + cfg "go_dreamfactory/sys/configure/structs" "google.golang.org/protobuf/proto" ) @@ -74,6 +75,13 @@ func (this *apiComp) Battlefinish(session comm.IUserSession, req *pb.WorldtaskBa if code, isWin = ibattle.CheckBattleReport(session, req.Report); code == pb.ErrorCode_Success { //触发任务 this.module.ModuleRtask.SendToRtask(session, comm.Rtype70, 1, req.BattleConfId) + if isWin { + if battleConf, ok := this.module.worldBattleConf.GetDataMap()[req.BattleConfId]; ok { + if code := this.module.DispenseRes(session, []*cfg.Gameatn{battleConf.Playexp}, true); code != pb.ErrorCode_Success { + this.module.Error("世界任务战斗玩家经验结算", log.Fields{"uid": uid, "playerExp": battleConf.Playexp}) + } + } + } } this.module.Debug("校验战报", log.Fields{"uid": session.GetUserId(), "taskId": req.TaskId, "战斗结果": isWin}) } diff --git a/modules/worldtask/module.go b/modules/worldtask/module.go index 29c3ad5d4..1bde326e8 100644 --- a/modules/worldtask/module.go +++ b/modules/worldtask/module.go @@ -15,11 +15,12 @@ var _ comm.IWorldtask = (*Worldtask)(nil) type Worldtask struct { modules.ModuleBase - api *apiComp - service base.IRPCXService - configure *configureComp - modelWorldtask *ModelWorldtask - worldtaskConf *cfg.GameWorldTask + api *apiComp + service base.IRPCXService + configure *configureComp + modelWorldtask *ModelWorldtask + worldtaskConf *cfg.GameWorldTask + worldBattleConf *cfg.GameWorldBattle } func NewModule() core.IModule { @@ -47,6 +48,9 @@ func (this *Worldtask) Start() (err error) { if this.worldtaskConf, err = this.configure.getWorldtaskCfg(); err != nil { return err } + if this.worldBattleConf, err = this.configure.getWorldtaskBattleCfg(); err != nil { + return err + } return } diff --git a/sys/configure/structs/Game.WorldBattleData.go b/sys/configure/structs/Game.WorldBattleData.go index a3cc32ce8..3477fa389 100644 --- a/sys/configure/structs/Game.WorldBattleData.go +++ b/sys/configure/structs/Game.WorldBattleData.go @@ -18,7 +18,7 @@ type GameWorldBattleData struct { LockSlots []int32 AssistTeam int32 EventList []int32 - Playexp int32 + Playexp *Gameatn } const TypeId_GameWorldBattleData = 1096332216 @@ -87,7 +87,7 @@ func (_v *GameWorldBattleData)Deserialize(_buf map[string]interface{}) (err erro } } - { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["playexp"].(float64); !_ok_ { err = errors.New("playexp error"); return }; _v.Playexp = int32(_tempNum_) } + { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["playexp"].(map[string]interface{}); !_ok_ { err = errors.New("playexp error"); return }; if _v.Playexp, err = DeserializeGameatn(_x_); err != nil { return } } return } diff --git a/sys/configure/structs/Game.WorldTaskData.go b/sys/configure/structs/Game.WorldTaskData.go index e92b469cb..5a75bbb7b 100644 --- a/sys/configure/structs/Game.WorldTaskData.go +++ b/sys/configure/structs/Game.WorldTaskData.go @@ -18,8 +18,6 @@ type GameWorldTaskData struct { Group int32 Des int32 Icon string - TaskName string - TaskDisplay string Npc []string GetafterEvent []int32 Completetask int32 @@ -42,8 +40,6 @@ func (_v *GameWorldTaskData)Deserialize(_buf map[string]interface{}) (err error) { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["group"].(float64); !_ok_ { err = errors.New("group error"); return }; _v.Group = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["des"].(float64); !_ok_ { err = errors.New("des error"); return }; _v.Des = int32(_tempNum_) } { var _ok_ bool; if _v.Icon, _ok_ = _buf["icon"].(string); !_ok_ { err = errors.New("icon error"); return } } - { var _ok_ bool; if _v.TaskName, _ok_ = _buf["task_name"].(string); !_ok_ { err = errors.New("task_name error"); return } } - { var _ok_ bool; if _v.TaskDisplay, _ok_ = _buf["task_display"].(string); !_ok_ { err = errors.New("task_display error"); return } } { var _arr_ []interface{} var _ok_ bool