上传世界任务相关代码

This commit is contained in:
liwei 2023-07-05 15:51:13 +08:00
parent 85db31e26e
commit 490aa9ac7c
8 changed files with 488 additions and 172 deletions

View File

@ -35,7 +35,7 @@
"eventweight": 40000,
"eventtype": 1,
"mustdo": 2,
"citystory": 50020011,
"citystory": 50020010,
"citynormal": 50020030,
"cityabnormal": 50020020,
"worldtask": 510,
@ -65,7 +65,7 @@
"eventweight": 20000,
"eventtype": 1,
"mustdo": 1,
"citystory": 50020012,
"citystory": 50020010,
"citynormal": 50020030,
"cityabnormal": 50020020,
"worldtask": 520,

View File

@ -6371,8 +6371,7 @@
],
"biography_name": [
140011,
140012,
140013
140012
],
"biography_reward1": [
{
@ -6477,8 +6476,7 @@
],
"biography_name": [
140011,
140012,
140013
140012
],
"biography_reward1": [
{
@ -6583,8 +6581,7 @@
],
"biography_name": [
140011,
140012,
140013
140012
],
"biography_reward1": [
{
@ -6689,8 +6686,7 @@
],
"biography_name": [
140011,
140012,
140013
140012
],
"biography_reward1": [
{
@ -6795,8 +6791,7 @@
],
"biography_name": [
140011,
140012,
140013
140012
],
"biography_reward1": [
{
@ -6901,8 +6896,7 @@
],
"biography_name": [
140011,
140012,
140013
140012
],
"biography_reward1": [
{
@ -7007,8 +7001,7 @@
],
"biography_name": [
140011,
140012,
140013
140012
],
"biography_reward1": [
{
@ -7113,8 +7106,7 @@
],
"biography_name": [
140011,
140012,
140013
140012
],
"biography_reward1": [
{
@ -7219,8 +7211,7 @@
],
"biography_name": [
140011,
140012,
140013
140012
],
"biography_reward1": [
{
@ -7325,8 +7316,7 @@
],
"biography_name": [
140011,
140012,
140013
140012
],
"biography_reward1": [
{
@ -36797,8 +36787,7 @@
],
"biography_name": [
130041,
130042,
130043
130042
],
"biography_reward1": [
{
@ -36903,8 +36892,7 @@
],
"biography_name": [
130041,
130042,
130043
130042
],
"biography_reward1": [
{
@ -37009,8 +36997,7 @@
],
"biography_name": [
130041,
130042,
130043
130042
],
"biography_reward1": [
{
@ -37115,8 +37102,7 @@
],
"biography_name": [
130041,
130042,
130043
130042
],
"biography_reward1": [
{
@ -37221,8 +37207,7 @@
],
"biography_name": [
130041,
130042,
130043
130042
],
"biography_reward1": [
{
@ -37327,8 +37312,7 @@
],
"biography_name": [
130041,
130042,
130043
130042
],
"biography_reward1": [
{
@ -37433,8 +37417,7 @@
],
"biography_name": [
130041,
130042,
130043
130042
],
"biography_reward1": [
{
@ -37539,8 +37522,7 @@
],
"biography_name": [
130041,
130042,
130043
130042
],
"biography_reward1": [
{
@ -37645,8 +37627,7 @@
],
"biography_name": [
130041,
130042,
130043
130042
],
"biography_reward1": [
{
@ -37751,8 +37732,7 @@
],
"biography_name": [
130041,
130042,
130043
130042
],
"biography_reward1": [
{

View File

@ -7406,9 +7406,11 @@
"synthetize_get": [],
"decompose_deplete": [],
"decompose_get": [],
"access": [],
"use_skip": 0,
"upper_limit": 0,
"access": [
702
],
"use_skip": 166,
"upper_limit": 999,
"img": "item_14020010",
"intr": {
"key": "item_item_intr_211",
@ -7437,9 +7439,11 @@
"synthetize_get": [],
"decompose_deplete": [],
"decompose_get": [],
"access": [],
"use_skip": 0,
"upper_limit": 0,
"access": [
702
],
"use_skip": 166,
"upper_limit": 999,
"img": "item_14020011",
"intr": {
"key": "item_item_intr_212",
@ -7468,9 +7472,11 @@
"synthetize_get": [],
"decompose_deplete": [],
"decompose_get": [],
"access": [],
"use_skip": 0,
"upper_limit": 0,
"access": [
702
],
"use_skip": 166,
"upper_limit": 999,
"img": "item_14020012",
"intr": {
"key": "item_item_intr_213",
@ -7499,9 +7505,11 @@
"synthetize_get": [],
"decompose_deplete": [],
"decompose_get": [],
"access": [],
"use_skip": 0,
"upper_limit": 0,
"access": [
702
],
"use_skip": 166,
"upper_limit": 999,
"img": "item_14020013",
"intr": {
"key": "item_item_intr_214",
@ -7530,9 +7538,11 @@
"synthetize_get": [],
"decompose_deplete": [],
"decompose_get": [],
"access": [],
"use_skip": 0,
"upper_limit": 0,
"access": [
702
],
"use_skip": 166,
"upper_limit": 999,
"img": "item_14020014",
"intr": {
"key": "item_item_intr_215",
@ -7561,9 +7571,11 @@
"synthetize_get": [],
"decompose_deplete": [],
"decompose_get": [],
"access": [],
"use_skip": 0,
"upper_limit": 0,
"access": [
702
],
"use_skip": 166,
"upper_limit": 999,
"img": "item_14020015",
"intr": {
"key": "item_item_intr_216",
@ -7592,9 +7604,11 @@
"synthetize_get": [],
"decompose_deplete": [],
"decompose_get": [],
"access": [],
"use_skip": 0,
"upper_limit": 0,
"access": [
702
],
"use_skip": 166,
"upper_limit": 999,
"img": "item_14020016",
"intr": {
"key": "item_item_intr_217",
@ -7623,9 +7637,11 @@
"synthetize_get": [],
"decompose_deplete": [],
"decompose_get": [],
"access": [],
"use_skip": 0,
"upper_limit": 0,
"access": [
702
],
"use_skip": 166,
"upper_limit": 999,
"img": "item_14020017",
"intr": {
"key": "item_item_intr_218",
@ -7654,9 +7670,11 @@
"synthetize_get": [],
"decompose_deplete": [],
"decompose_get": [],
"access": [],
"use_skip": 0,
"upper_limit": 0,
"access": [
702
],
"use_skip": 166,
"upper_limit": 999,
"img": "item_14020018",
"intr": {
"key": "item_item_intr_219",
@ -7685,9 +7703,11 @@
"synthetize_get": [],
"decompose_deplete": [],
"decompose_get": [],
"access": [],
"use_skip": 0,
"upper_limit": 0,
"access": [
702
],
"use_skip": 166,
"upper_limit": 999,
"img": "item_14020019",
"intr": {
"key": "item_item_intr_220",
@ -7716,9 +7736,11 @@
"synthetize_get": [],
"decompose_deplete": [],
"decompose_get": [],
"access": [],
"use_skip": 0,
"upper_limit": 0,
"access": [
702
],
"use_skip": 166,
"upper_limit": 999,
"img": "item_14020020",
"intr": {
"key": "item_item_intr_221",
@ -7747,9 +7769,11 @@
"synthetize_get": [],
"decompose_deplete": [],
"decompose_get": [],
"access": [],
"use_skip": 0,
"upper_limit": 0,
"access": [
702
],
"use_skip": 166,
"upper_limit": 999,
"img": "item_14020021",
"intr": {
"key": "item_item_intr_222",
@ -7778,9 +7802,11 @@
"synthetize_get": [],
"decompose_deplete": [],
"decompose_get": [],
"access": [],
"use_skip": 0,
"upper_limit": 0,
"access": [
702
],
"use_skip": 166,
"upper_limit": 999,
"img": "item_14020022",
"intr": {
"key": "item_item_intr_223",
@ -7809,9 +7835,11 @@
"synthetize_get": [],
"decompose_deplete": [],
"decompose_get": [],
"access": [],
"use_skip": 0,
"upper_limit": 0,
"access": [
702
],
"use_skip": 166,
"upper_limit": 999,
"img": "item_14020023",
"intr": {
"key": "item_item_intr_224",
@ -7840,9 +7868,11 @@
"synthetize_get": [],
"decompose_deplete": [],
"decompose_get": [],
"access": [],
"use_skip": 0,
"upper_limit": 0,
"access": [
702
],
"use_skip": 166,
"upper_limit": 999,
"img": "item_14020024",
"intr": {
"key": "item_item_intr_225",
@ -7871,9 +7901,11 @@
"synthetize_get": [],
"decompose_deplete": [],
"decompose_get": [],
"access": [],
"use_skip": 0,
"upper_limit": 0,
"access": [
702
],
"use_skip": 166,
"upper_limit": 999,
"img": "item_14020025",
"intr": {
"key": "item_item_intr_226",
@ -7902,9 +7934,11 @@
"synthetize_get": [],
"decompose_deplete": [],
"decompose_get": [],
"access": [],
"use_skip": 0,
"upper_limit": 0,
"access": [
702
],
"use_skip": 166,
"upper_limit": 999,
"img": "item_14020026",
"intr": {
"key": "item_item_intr_227",
@ -7933,9 +7967,11 @@
"synthetize_get": [],
"decompose_deplete": [],
"decompose_get": [],
"access": [],
"use_skip": 0,
"upper_limit": 0,
"access": [
702
],
"use_skip": 166,
"upper_limit": 999,
"img": "item_14020027",
"intr": {
"key": "item_item_intr_228",
@ -7964,9 +8000,11 @@
"synthetize_get": [],
"decompose_deplete": [],
"decompose_get": [],
"access": [],
"use_skip": 0,
"upper_limit": 0,
"access": [
702
],
"use_skip": 166,
"upper_limit": 999,
"img": "item_14020028",
"intr": {
"key": "item_item_intr_229",
@ -7995,9 +8033,11 @@
"synthetize_get": [],
"decompose_deplete": [],
"decompose_get": [],
"access": [],
"use_skip": 0,
"upper_limit": 0,
"access": [
702
],
"use_skip": 166,
"upper_limit": 999,
"img": "item_14020029",
"intr": {
"key": "item_item_intr_230",
@ -8026,9 +8066,11 @@
"synthetize_get": [],
"decompose_deplete": [],
"decompose_get": [],
"access": [],
"use_skip": 0,
"upper_limit": 0,
"access": [
702
],
"use_skip": 166,
"upper_limit": 999,
"img": "item_14020030",
"intr": {
"key": "item_item_intr_231",
@ -8057,9 +8099,11 @@
"synthetize_get": [],
"decompose_deplete": [],
"decompose_get": [],
"access": [],
"use_skip": 0,
"upper_limit": 0,
"access": [
702
],
"use_skip": 166,
"upper_limit": 999,
"img": "item_14020031",
"intr": {
"key": "item_item_intr_232",
@ -8088,9 +8132,11 @@
"synthetize_get": [],
"decompose_deplete": [],
"decompose_get": [],
"access": [],
"use_skip": 0,
"upper_limit": 0,
"access": [
702
],
"use_skip": 166,
"upper_limit": 999,
"img": "item_14020032",
"intr": {
"key": "item_item_intr_233",
@ -8119,9 +8165,11 @@
"synthetize_get": [],
"decompose_deplete": [],
"decompose_get": [],
"access": [],
"use_skip": 0,
"upper_limit": 0,
"access": [
702
],
"use_skip": 166,
"upper_limit": 999,
"img": "item_14020033",
"intr": {
"key": "item_item_intr_234",
@ -8150,9 +8198,11 @@
"synthetize_get": [],
"decompose_deplete": [],
"decompose_get": [],
"access": [],
"use_skip": 0,
"upper_limit": 0,
"access": [
702
],
"use_skip": 166,
"upper_limit": 999,
"img": "item_14020034",
"intr": {
"key": "item_item_intr_235",
@ -8181,9 +8231,11 @@
"synthetize_get": [],
"decompose_deplete": [],
"decompose_get": [],
"access": [],
"use_skip": 0,
"upper_limit": 0,
"access": [
702
],
"use_skip": 166,
"upper_limit": 999,
"img": "item_14020035",
"intr": {
"key": "item_item_intr_236",
@ -8212,9 +8264,11 @@
"synthetize_get": [],
"decompose_deplete": [],
"decompose_get": [],
"access": [],
"use_skip": 0,
"upper_limit": 0,
"access": [
702
],
"use_skip": 166,
"upper_limit": 999,
"img": "item_14020036",
"intr": {
"key": "item_item_intr_237",
@ -8243,9 +8297,11 @@
"synthetize_get": [],
"decompose_deplete": [],
"decompose_get": [],
"access": [],
"use_skip": 0,
"upper_limit": 0,
"access": [
702
],
"use_skip": 166,
"upper_limit": 999,
"img": "item_14020037",
"intr": {
"key": "item_item_intr_238",
@ -8274,9 +8330,11 @@
"synthetize_get": [],
"decompose_deplete": [],
"decompose_get": [],
"access": [],
"use_skip": 0,
"upper_limit": 0,
"access": [
702
],
"use_skip": 166,
"upper_limit": 999,
"img": "item_14020038",
"intr": {
"key": "item_item_intr_239",
@ -8305,9 +8363,11 @@
"synthetize_get": [],
"decompose_deplete": [],
"decompose_get": [],
"access": [],
"use_skip": 0,
"upper_limit": 0,
"access": [
702
],
"use_skip": 166,
"upper_limit": 999,
"img": "item_14020039",
"intr": {
"key": "item_item_intr_240",
@ -8336,9 +8396,11 @@
"synthetize_get": [],
"decompose_deplete": [],
"decompose_get": [],
"access": [],
"use_skip": 0,
"upper_limit": 0,
"access": [
702
],
"use_skip": 166,
"upper_limit": 999,
"img": "item_14020040",
"intr": {
"key": "item_item_intr_241",
@ -8367,9 +8429,11 @@
"synthetize_get": [],
"decompose_deplete": [],
"decompose_get": [],
"access": [],
"use_skip": 0,
"upper_limit": 0,
"access": [
702
],
"use_skip": 166,
"upper_limit": 999,
"img": "item_14020041",
"intr": {
"key": "item_item_intr_242",
@ -8398,9 +8462,11 @@
"synthetize_get": [],
"decompose_deplete": [],
"decompose_get": [],
"access": [],
"use_skip": 0,
"upper_limit": 0,
"access": [
702
],
"use_skip": 166,
"upper_limit": 999,
"img": "item_14020042",
"intr": {
"key": "item_item_intr_243",
@ -8429,9 +8495,11 @@
"synthetize_get": [],
"decompose_deplete": [],
"decompose_get": [],
"access": [],
"use_skip": 0,
"upper_limit": 0,
"access": [
702
],
"use_skip": 166,
"upper_limit": 999,
"img": "item_14020043",
"intr": {
"key": "item_item_intr_244",
@ -8460,9 +8528,11 @@
"synthetize_get": [],
"decompose_deplete": [],
"decompose_get": [],
"access": [],
"use_skip": 0,
"upper_limit": 0,
"access": [
702
],
"use_skip": 166,
"upper_limit": 999,
"img": "item_14020044",
"intr": {
"key": "item_item_intr_245",
@ -8491,9 +8561,11 @@
"synthetize_get": [],
"decompose_deplete": [],
"decompose_get": [],
"access": [],
"use_skip": 0,
"upper_limit": 0,
"access": [
702
],
"use_skip": 166,
"upper_limit": 999,
"img": "item_14020045",
"intr": {
"key": "item_item_intr_246",
@ -8522,9 +8594,11 @@
"synthetize_get": [],
"decompose_deplete": [],
"decompose_get": [],
"access": [],
"use_skip": 0,
"upper_limit": 0,
"access": [
702
],
"use_skip": 166,
"upper_limit": 999,
"img": "item_14020046",
"intr": {
"key": "item_item_intr_247",
@ -8553,9 +8627,11 @@
"synthetize_get": [],
"decompose_deplete": [],
"decompose_get": [],
"access": [],
"use_skip": 0,
"upper_limit": 0,
"access": [
702
],
"use_skip": 166,
"upper_limit": 999,
"img": "item_14020047",
"intr": {
"key": "item_item_intr_248",
@ -8584,9 +8660,11 @@
"synthetize_get": [],
"decompose_deplete": [],
"decompose_get": [],
"access": [],
"use_skip": 0,
"upper_limit": 0,
"access": [
702
],
"use_skip": 166,
"upper_limit": 999,
"img": "item_14020048",
"intr": {
"key": "item_item_intr_249",
@ -8615,9 +8693,11 @@
"synthetize_get": [],
"decompose_deplete": [],
"decompose_get": [],
"access": [],
"use_skip": 0,
"upper_limit": 0,
"access": [
702
],
"use_skip": 166,
"upper_limit": 999,
"img": "item_14020049",
"intr": {
"key": "item_item_intr_250",
@ -12655,7 +12735,7 @@
"access": [],
"use_skip": 0,
"upper_limit": -1,
"img": "icon_mcs",
"img": "item_10000035",
"intr": {
"key": "item_item_intr_355",
"text": "用于商城购买消耗的礼卷"

View File

@ -1,6 +1,7 @@
[
{
"key": 20010,
"opencond": "",
"lock": 1,
"lockend": 0,
"ontxe": 0,
@ -38,6 +39,7 @@
},
{
"key": 20011,
"opencond": "",
"lock": 1,
"lockend": 0,
"ontxe": 20010,
@ -75,6 +77,7 @@
},
{
"key": 20012,
"opencond": "",
"lock": 1,
"lockend": 0,
"ontxe": 20011,
@ -117,6 +120,7 @@
},
{
"key": 20020,
"opencond": "",
"lock": 1,
"lockend": 0,
"ontxe": 20012,
@ -154,6 +158,7 @@
},
{
"key": 20030,
"opencond": "",
"lock": 1,
"lockend": 0,
"ontxe": 20020,
@ -191,6 +196,7 @@
},
{
"key": 20040,
"opencond": "",
"lock": 1,
"lockend": 0,
"ontxe": 20030,
@ -233,6 +239,7 @@
},
{
"key": 20050,
"opencond": "",
"lock": 1,
"lockend": 0,
"ontxe": 20040,
@ -275,6 +282,7 @@
},
{
"key": 20060,
"opencond": "",
"lock": 1,
"lockend": 0,
"ontxe": 20050,
@ -312,6 +320,7 @@
},
{
"key": 20070,
"opencond": "",
"lock": 1,
"lockend": 0,
"ontxe": 20060,
@ -349,6 +358,7 @@
},
{
"key": 20080,
"opencond": "",
"lock": 1,
"lockend": 0,
"ontxe": 20070,
@ -388,6 +398,7 @@
},
{
"key": 20090,
"opencond": "",
"lock": 1,
"lockend": 0,
"ontxe": 20080,
@ -430,6 +441,7 @@
},
{
"key": 20100,
"opencond": "",
"lock": 1,
"lockend": 0,
"ontxe": 20090,
@ -492,6 +504,7 @@
},
{
"key": 20110,
"opencond": "",
"lock": 1,
"lockend": 0,
"ontxe": 20100,
@ -529,6 +542,7 @@
},
{
"key": 20120,
"opencond": "",
"lock": 1,
"lockend": 0,
"ontxe": 20110,
@ -566,6 +580,7 @@
},
{
"key": 20130,
"opencond": "",
"lock": 1,
"lockend": 0,
"ontxe": 20120,
@ -603,6 +618,7 @@
},
{
"key": 20140,
"opencond": "",
"lock": 1,
"lockend": 0,
"ontxe": 20130,
@ -665,6 +681,7 @@
},
{
"key": 20150,
"opencond": "",
"lock": 1,
"lockend": 0,
"ontxe": 20140,
@ -702,6 +719,7 @@
},
{
"key": 20160,
"opencond": "",
"lock": 1,
"lockend": 0,
"ontxe": 20150,
@ -739,6 +757,7 @@
},
{
"key": 20170,
"opencond": "",
"lock": 1,
"lockend": 0,
"ontxe": 20160,
@ -781,6 +800,7 @@
},
{
"key": 20180,
"opencond": "",
"lock": 1,
"lockend": 0,
"ontxe": 20170,
@ -823,6 +843,7 @@
},
{
"key": 20190,
"opencond": "",
"lock": 1,
"lockend": 0,
"ontxe": 20180,
@ -860,6 +881,7 @@
},
{
"key": 20200,
"opencond": "",
"lock": 1,
"lockend": 0,
"ontxe": 20190,
@ -897,6 +919,7 @@
},
{
"key": 20210,
"opencond": "",
"lock": 1,
"lockend": 0,
"ontxe": 20200,
@ -934,6 +957,7 @@
},
{
"key": 20220,
"opencond": "",
"lock": 1,
"lockend": 0,
"ontxe": 20210,
@ -971,6 +995,7 @@
},
{
"key": 20230,
"opencond": "",
"lock": 1,
"lockend": 0,
"ontxe": 20220,
@ -1013,6 +1038,7 @@
},
{
"key": 20240,
"opencond": "",
"lock": 1,
"lockend": 0,
"ontxe": 20230,
@ -1050,6 +1076,7 @@
},
{
"key": 20250,
"opencond": "",
"lock": 1,
"lockend": 0,
"ontxe": 20240,
@ -1112,6 +1139,7 @@
},
{
"key": 20260,
"opencond": "",
"lock": 1,
"lockend": 0,
"ontxe": 20250,
@ -1149,6 +1177,7 @@
},
{
"key": 20270,
"opencond": "",
"lock": 1,
"lockend": 0,
"ontxe": 20260,
@ -1186,6 +1215,7 @@
},
{
"key": 20280,
"opencond": "",
"lock": 1,
"lockend": 0,
"ontxe": 20270,
@ -1228,6 +1258,7 @@
},
{
"key": 20290,
"opencond": "",
"lock": 1,
"lockend": 0,
"ontxe": 20280,
@ -1267,6 +1298,7 @@
},
{
"key": 20300,
"opencond": "",
"lock": 1,
"lockend": 0,
"ontxe": 20290,
@ -1309,6 +1341,7 @@
},
{
"key": 20310,
"opencond": "",
"lock": 1,
"lockend": 0,
"ontxe": 20300,
@ -1346,6 +1379,7 @@
},
{
"key": 20320,
"opencond": "",
"lock": 1,
"lockend": 0,
"ontxe": 20310,
@ -1383,6 +1417,7 @@
},
{
"key": 20330,
"opencond": "",
"lock": 1,
"lockend": 0,
"ontxe": 20320,
@ -1420,6 +1455,7 @@
},
{
"key": 20340,
"opencond": "",
"lock": 1,
"lockend": 0,
"ontxe": 20330,
@ -1467,6 +1503,7 @@
},
{
"key": 20350,
"opencond": "",
"lock": 1,
"lockend": 0,
"ontxe": 20340,
@ -1505,6 +1542,7 @@
},
{
"key": 20360,
"opencond": "",
"lock": 1,
"lockend": 0,
"ontxe": 20350,
@ -1547,6 +1585,7 @@
},
{
"key": 20370,
"opencond": "",
"lock": 1,
"lockend": 0,
"ontxe": 20360,
@ -1589,6 +1628,7 @@
},
{
"key": 20380,
"opencond": "",
"lock": 1,
"lockend": 0,
"ontxe": 20370,
@ -1626,6 +1666,7 @@
},
{
"key": 20390,
"opencond": "",
"lock": 1,
"lockend": 0,
"ontxe": 20380,
@ -1663,6 +1704,7 @@
},
{
"key": 20400,
"opencond": "",
"lock": 1,
"lockend": 0,
"ontxe": 20390,
@ -1700,6 +1742,7 @@
},
{
"key": 20410,
"opencond": "",
"lock": 1,
"lockend": 0,
"ontxe": 20400,
@ -1737,6 +1780,7 @@
},
{
"key": 20420,
"opencond": "",
"lock": 1,
"lockend": 0,
"ontxe": 20410,
@ -1774,6 +1818,7 @@
},
{
"key": 20430,
"opencond": "",
"lock": 1,
"lockend": 0,
"ontxe": 20420,
@ -1816,6 +1861,7 @@
},
{
"key": 20440,
"opencond": "",
"lock": 5,
"lockend": 0,
"ontxe": 20430,
@ -1853,6 +1899,7 @@
},
{
"key": 20450,
"opencond": "",
"lock": 5,
"lockend": 0,
"ontxe": 20440,
@ -1890,6 +1937,7 @@
},
{
"key": 20460,
"opencond": "",
"lock": 5,
"lockend": 0,
"ontxe": 20450,
@ -1927,6 +1975,7 @@
},
{
"key": 20470,
"opencond": "",
"lock": 5,
"lockend": 0,
"ontxe": 20460,
@ -1964,6 +2013,7 @@
},
{
"key": 20480,
"opencond": "",
"lock": 5,
"lockend": 0,
"ontxe": 20470,
@ -2001,6 +2051,7 @@
},
{
"key": 20490,
"opencond": "",
"lock": 5,
"lockend": 0,
"ontxe": 20480,
@ -2038,6 +2089,7 @@
},
{
"key": 20500,
"opencond": "",
"lock": 5,
"lockend": 0,
"ontxe": 20490,
@ -2080,6 +2132,7 @@
},
{
"key": 20510,
"opencond": "",
"lock": 5,
"lockend": 0,
"ontxe": 20500,
@ -2117,6 +2170,7 @@
},
{
"key": 20520,
"opencond": "",
"lock": 5,
"lockend": 0,
"ontxe": 20510,
@ -2154,6 +2208,7 @@
},
{
"key": 20530,
"opencond": "",
"lock": 5,
"lockend": 0,
"ontxe": 20520,
@ -2196,6 +2251,7 @@
},
{
"key": 20540,
"opencond": "",
"lock": 5,
"lockend": 0,
"ontxe": 20530,
@ -2233,6 +2289,7 @@
},
{
"key": 20550,
"opencond": "",
"lock": 5,
"lockend": 0,
"ontxe": 20540,
@ -2270,6 +2327,7 @@
},
{
"key": 20560,
"opencond": "",
"lock": 5,
"lockend": 0,
"ontxe": 20550,
@ -2307,6 +2365,7 @@
},
{
"key": 20570,
"opencond": "",
"lock": 5,
"lockend": 0,
"ontxe": 20560,
@ -2344,6 +2403,7 @@
},
{
"key": 20580,
"opencond": "",
"lock": 5,
"lockend": 0,
"ontxe": 20570,
@ -2381,6 +2441,7 @@
},
{
"key": 20590,
"opencond": "",
"lock": 5,
"lockend": 0,
"ontxe": 20580,
@ -2418,6 +2479,7 @@
},
{
"key": 20600,
"opencond": "",
"lock": 5,
"lockend": 0,
"ontxe": 20590,
@ -2455,6 +2517,7 @@
},
{
"key": 20610,
"opencond": "",
"lock": 5,
"lockend": 0,
"ontxe": 20600,
@ -2492,6 +2555,7 @@
},
{
"key": 20620,
"opencond": "",
"lock": 5,
"lockend": 0,
"ontxe": 20610,
@ -2529,6 +2593,7 @@
},
{
"key": 20630,
"opencond": "",
"lock": 5,
"lockend": 0,
"ontxe": 20620,
@ -2571,6 +2636,7 @@
},
{
"key": 20640,
"opencond": "",
"lock": 5,
"lockend": 0,
"ontxe": 20630,
@ -2608,6 +2674,7 @@
},
{
"key": 20650,
"opencond": "",
"lock": 5,
"lockend": 0,
"ontxe": 20640,
@ -2645,6 +2712,7 @@
},
{
"key": 20660,
"opencond": "",
"lock": 5,
"lockend": 0,
"ontxe": 20650,
@ -2682,6 +2750,7 @@
},
{
"key": 20670,
"opencond": "",
"lock": 5,
"lockend": 0,
"ontxe": 20660,
@ -2724,6 +2793,7 @@
},
{
"key": 20680,
"opencond": "",
"lock": 5,
"lockend": 0,
"ontxe": 20670,
@ -2766,6 +2836,7 @@
},
{
"key": 20690,
"opencond": "",
"lock": 5,
"lockend": 0,
"ontxe": 20680,
@ -2803,6 +2874,7 @@
},
{
"key": 20700,
"opencond": "",
"lock": 5,
"lockend": 0,
"ontxe": 20690,
@ -2840,6 +2912,7 @@
},
{
"key": 20710,
"opencond": "",
"lock": 5,
"lockend": 0,
"ontxe": 20700,
@ -2877,6 +2950,7 @@
},
{
"key": 20720,
"opencond": "",
"lock": 5,
"lockend": 0,
"ontxe": 20710,
@ -2914,6 +2988,7 @@
},
{
"key": 20730,
"opencond": "",
"lock": 5,
"lockend": 0,
"ontxe": 20720,
@ -2951,6 +3026,7 @@
},
{
"key": 20740,
"opencond": "",
"lock": 5,
"lockend": 0,
"ontxe": 20730,
@ -2988,6 +3064,7 @@
},
{
"key": 20750,
"opencond": "",
"lock": 5,
"lockend": 0,
"ontxe": 20740,
@ -3025,6 +3102,7 @@
},
{
"key": 20760,
"opencond": "",
"lock": 5,
"lockend": 0,
"ontxe": 20750,
@ -3062,6 +3140,7 @@
},
{
"key": 20770,
"opencond": "",
"lock": 5,
"lockend": 0,
"ontxe": 20760,
@ -3104,6 +3183,7 @@
},
{
"key": 20780,
"opencond": "",
"lock": 5,
"lockend": 0,
"ontxe": 20770,
@ -3141,6 +3221,7 @@
},
{
"key": 20790,
"opencond": "",
"lock": 5,
"lockend": 0,
"ontxe": 20780,
@ -3178,6 +3259,7 @@
},
{
"key": 20800,
"opencond": "",
"lock": 5,
"lockend": 0,
"ontxe": 20790,
@ -3215,6 +3297,7 @@
},
{
"key": 20810,
"opencond": "",
"lock": 5,
"lockend": 0,
"ontxe": 20800,
@ -3252,6 +3335,7 @@
},
{
"key": 20820,
"opencond": "",
"lock": 5,
"lockend": 0,
"ontxe": 20810,
@ -3294,6 +3378,7 @@
},
{
"key": 20830,
"opencond": "",
"lock": 5,
"lockend": 0,
"ontxe": 20820,
@ -3331,6 +3416,7 @@
},
{
"key": 20840,
"opencond": "",
"lock": 5,
"lockend": 0,
"ontxe": 20830,
@ -3373,6 +3459,7 @@
},
{
"key": 20850,
"opencond": "",
"lock": 5,
"lockend": 0,
"ontxe": 20840,
@ -3415,6 +3502,7 @@
},
{
"key": 20860,
"opencond": "",
"lock": 5,
"lockend": 0,
"ontxe": 20850,
@ -3452,6 +3540,7 @@
},
{
"key": 20870,
"opencond": "",
"lock": 5,
"lockend": 0,
"ontxe": 20860,
@ -3489,6 +3578,7 @@
},
{
"key": 20880,
"opencond": "",
"lock": 5,
"lockend": 0,
"ontxe": 20870,
@ -3531,6 +3621,7 @@
},
{
"key": 20890,
"opencond": "",
"lock": 5,
"lockend": 0,
"ontxe": 20880,
@ -3568,6 +3659,7 @@
},
{
"key": 20900,
"opencond": "",
"lock": 5,
"lockend": 0,
"ontxe": 20890,
@ -3605,6 +3697,7 @@
},
{
"key": 20910,
"opencond": "",
"lock": 5,
"lockend": 0,
"ontxe": 20900,
@ -3642,6 +3735,7 @@
},
{
"key": 20920,
"opencond": "",
"lock": 5,
"lockend": 0,
"ontxe": 20910,
@ -3679,6 +3773,7 @@
},
{
"key": 20930,
"opencond": "",
"lock": 5,
"lockend": 0,
"ontxe": 20920,
@ -3716,6 +3811,7 @@
},
{
"key": 20940,
"opencond": "",
"lock": 5,
"lockend": 0,
"ontxe": 20930,
@ -3753,6 +3849,7 @@
},
{
"key": 20950,
"opencond": "",
"lock": 5,
"lockend": 0,
"ontxe": 20940,
@ -3795,6 +3892,7 @@
},
{
"key": 20960,
"opencond": "",
"lock": 5,
"lockend": 0,
"ontxe": 20950,
@ -3832,6 +3930,7 @@
},
{
"key": 20970,
"opencond": "",
"lock": 5,
"lockend": 0,
"ontxe": 20960,
@ -3869,6 +3968,7 @@
},
{
"key": 20980,
"opencond": "",
"lock": 5,
"lockend": 0,
"ontxe": 20970,
@ -3906,6 +4006,7 @@
},
{
"key": 20990,
"opencond": "",
"lock": 5,
"lockend": 0,
"ontxe": 20980,
@ -3943,6 +4044,7 @@
},
{
"key": 21000,
"opencond": "",
"lock": 5,
"lockend": 0,
"ontxe": 20990,
@ -3980,6 +4082,7 @@
},
{
"key": 21010,
"opencond": "",
"lock": 5,
"lockend": 0,
"ontxe": 21000,
@ -4017,6 +4120,7 @@
},
{
"key": 21020,
"opencond": "",
"lock": 5,
"lockend": 0,
"ontxe": 21010,
@ -4054,6 +4158,7 @@
},
{
"key": 21030,
"opencond": "",
"lock": 5,
"lockend": 0,
"ontxe": 21020,
@ -4091,6 +4196,7 @@
},
{
"key": 21040,
"opencond": "",
"lock": 5,
"lockend": 0,
"ontxe": 21030,
@ -4128,6 +4234,7 @@
},
{
"key": 21050,
"opencond": "",
"lock": 5,
"lockend": 0,
"ontxe": 21040,
@ -4165,6 +4272,7 @@
},
{
"key": 21060,
"opencond": "",
"lock": 5,
"lockend": 0,
"ontxe": 21050,
@ -4202,6 +4310,7 @@
},
{
"key": 21070,
"opencond": "",
"lock": 5,
"lockend": 0,
"ontxe": 21060,
@ -4239,6 +4348,7 @@
},
{
"key": 21080,
"opencond": "",
"lock": 5,
"lockend": 0,
"ontxe": 21070,
@ -4276,6 +4386,7 @@
},
{
"key": 21090,
"opencond": "",
"lock": 5,
"lockend": 0,
"ontxe": 21080,
@ -4313,6 +4424,7 @@
},
{
"key": 21100,
"opencond": "",
"lock": 5,
"lockend": 0,
"ontxe": 21090,
@ -4350,6 +4462,7 @@
},
{
"key": 21110,
"opencond": "",
"lock": 5,
"lockend": 0,
"ontxe": 21100,
@ -4387,6 +4500,7 @@
},
{
"key": 21120,
"opencond": "",
"lock": 5,
"lockend": 0,
"ontxe": 21110,
@ -4424,6 +4538,7 @@
},
{
"key": 21130,
"opencond": "",
"lock": 5,
"lockend": 0,
"ontxe": 21120,
@ -4461,6 +4576,7 @@
},
{
"key": 21140,
"opencond": "",
"lock": 5,
"lockend": 0,
"ontxe": 21130,
@ -4498,6 +4614,7 @@
},
{
"key": 21150,
"opencond": "",
"lock": 5,
"lockend": 0,
"ontxe": 21140,
@ -4535,6 +4652,7 @@
},
{
"key": 21160,
"opencond": "",
"lock": 5,
"lockend": 0,
"ontxe": 21150,
@ -4572,6 +4690,7 @@
},
{
"key": 21170,
"opencond": "",
"lock": 5,
"lockend": 0,
"ontxe": 21160,
@ -4609,6 +4728,7 @@
},
{
"key": 21180,
"opencond": "",
"lock": 5,
"lockend": 0,
"ontxe": 21170,
@ -4646,6 +4766,7 @@
},
{
"key": 21190,
"opencond": "",
"lock": 5,
"lockend": 0,
"ontxe": 21180,
@ -4683,6 +4804,7 @@
},
{
"key": 500010,
"opencond": "",
"lock": 1,
"lockend": 0,
"ontxe": 0,
@ -4722,6 +4844,7 @@
},
{
"key": 500020,
"opencond": "",
"lock": 1,
"lockend": 0,
"ontxe": 500010,
@ -4761,6 +4884,7 @@
},
{
"key": 500030,
"opencond": "",
"lock": 1,
"lockend": 0,
"ontxe": 500020,
@ -4800,6 +4924,7 @@
},
{
"key": 500040,
"opencond": "",
"lock": 1,
"lockend": 0,
"ontxe": 0,
@ -4839,6 +4964,7 @@
},
{
"key": 500050,
"opencond": "",
"lock": 1,
"lockend": 0,
"ontxe": 0,

View File

@ -77,3 +77,9 @@ func (this *configureComp) updateconfigure() {
this.condlTask = worldtaskConf
this.lock.Unlock()
}
func (this *configureComp) getcondlTask() map[int32][]*cfg.GameWorldTaskData {
this.lock.RLock()
defer this.lock.RUnlock()
return this.condlTask
}

View File

@ -3,7 +3,9 @@ package wtask
import (
"go_dreamfactory/comm"
"go_dreamfactory/lego/core"
"go_dreamfactory/lego/sys/log"
"go_dreamfactory/modules"
"go_dreamfactory/pb"
cfg "go_dreamfactory/sys/configure/structs"
)
@ -37,20 +39,132 @@ func (this *WTask) OnInstallComp() {
}
// 埋点通知
func (this *WTask) BuriedsNotify(uid string, condis []*pb.ConIProgress) {
var (
session comm.IUserSession
condisMap map[int32]*pb.ConIProgress = make(map[int32]*pb.ConIProgress)
utask *pb.DBWTask
accepttaskMap map[int32]struct{} = make(map[int32]struct{})
condlTask map[int32][]*cfg.GameWorldTaskData
temptasks []*cfg.GameWorldTaskData
changetasks map[int32]*cfg.GameWorldTaskData = make(map[int32]*cfg.GameWorldTaskData)
checkcondlsMap map[int32]struct{} = make(map[int32]struct{})
checkcondls []int32 = make([]int32, 0)
detailstasks []*pb.DBWTaskItem = make([]*pb.DBWTaskItem, 0)
finishtasks []int32 = make([]int32, 0)
award []*pb.UserAssets = make([]*pb.UserAssets, 0)
ok bool
needcheck bool //是否需要校验
err error
)
if utask, err = this.modelwtask.getUserWTasks(uid); err != nil {
this.Error("读取玩家世界任务数据 失败", log.Field{Key: "err", Value: err.Error()})
return
}
condlTask = this.configure.getcondlTask()
for _, v := range condis {
condisMap[v.Conid] = v
}
for _, v := range utask.Accepttask {
accepttaskMap[v] = struct{}{}
}
for _, v := range condis {
if temptasks, ok = condlTask[v.Conid]; ok {
for _, task := range temptasks {
if _, ok = accepttaskMap[task.Key]; ok { //任务列表进度有变化
if _, ok = changetasks[task.Key]; ok {
changetasks[task.Key] = task
for _, cid := range task.Completetask {
if _, ok = checkcondlsMap[cid]; !ok {
checkcondlsMap[cid] = struct{}{}
checkcondls = append(checkcondls, cid)
}
}
}
}
}
}
}
if len(changetasks) == 0 { //没有任务变化
return
}
for k, _ := range checkcondlsMap {
if _, ok = condisMap[k]; !ok {
needcheck = true
}
}
if needcheck { //校验有变化的任务 的完成条件
if condis, err = this.ModuleBuried.CheckCondition(uid, checkcondls...); err != nil {
this.Error("校验玩家子任务进度数据 失败", log.Field{Key: "err", Value: err.Error()})
return
}
for _, v := range condis {
condisMap[v.Conid] = v
}
}
//推送进度变化消息
for k, v := range changetasks {
task := &pb.DBWTaskItem{
Tid: k,
Conlds: make([]*pb.ConIProgress, len(v.Completetask)),
}
ok = true
for i, v := range v.Completetask {
task.Conlds[i] = condisMap[v]
if task.Conlds[i].State != pb.BuriedItemFinishState_buried_unfinish {
ok = false
}
}
detailstasks = append(detailstasks, task)
if ok && v.DeliverNpc == 0 { //自动完成
finishtasks = append(finishtasks, k)
this.DispenseRes(session, v.Reword, true) //发送奖励
for _, v := range v.Reword {
award = append(award, &pb.UserAssets{
A: v.A,
T: v.T,
N: v.N,
})
}
}
}
session, _ = this.GetUserSession(uid)
defer func() {
session.Push()
this.PutUserSession(session)
}()
//发送进度变化消息
session.SendMsg(string(this.GetType()), "accepttaskchange", &pb.WTaskAccepttaskChangePush{Accepttask: detailstasks})
if len(finishtasks) > 0 {
//发送任务完成推送
session.SendMsg(string(this.GetType()), "autofinsh", &pb.WTaskAutoFinshPush{Completes: finishtasks, Award: award})
utask.Completes = append(utask.Completes, finishtasks...)
this.inquireActivations(session, utask, 1, []string{})
}
}
// 查询可接取任务列表
func (this *WTask) inquireActivations(lv int32, complete []int32, opencmd []string) (err error, activations []int32) {
func (this *WTask) inquireActivations(session comm.IUserSession, wtask *pb.DBWTask, lv int32, opencmd []string) (err error) {
var (
conf *cfg.GameWorldTask
completeMap map[int32]struct{} = make(map[int32]struct{})
opencmdMap map[string]struct{} = make(map[string]struct{})
ok bool
change bool
)
activations = make([]int32, 0)
if conf, err = this.configure.getWorldtaskCfg(); err != nil {
return
}
for _, v := range complete {
for _, v := range wtask.Completes {
completeMap[v] = struct{}{}
}
for _, v := range opencmd {
@ -63,13 +177,21 @@ func (this *WTask) inquireActivations(lv int32, complete []int32, opencmd []stri
if lv < v.Lock || lv > v.Lockend { //等级不符合
continue
}
if _, ok = opencmdMap[v.Opencond]; v.Opencond != "" && !ok { //功能开启
continue
}
if _, ok = completeMap[v.Ontxe]; v.Ontxe != 0 && !ok { //前置任务判断
continue
}
if v.Des == 5 { //商队任务不主动触发
continue
}
activations = append(activations, v.Key)
wtask.Activations = append(wtask.Activations, v.Key)
change = true
}
if change {
session.SendMsg(string(this.GetType()), "autofinsh", &pb.WTaskActivationsPush{Activations: wtask.Activations})
}
return
}

View File

@ -624,8 +624,8 @@ type WTaskAutoFinshPush struct {
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
Completes int32 `protobuf:"varint,1,opt,name=completes,proto3" json:"completes"` //可接取任务列表
Award []*UserAssets `protobuf:"bytes,2,rep,name=award,proto3" json:"award"` //奖励
Completes []int32 `protobuf:"varint,1,rep,packed,name=completes,proto3" json:"completes"` //可接取任务列表
Award []*UserAssets `protobuf:"bytes,2,rep,name=award,proto3" json:"award"` //奖励
}
func (x *WTaskAutoFinshPush) Reset() {
@ -660,11 +660,11 @@ func (*WTaskAutoFinshPush) Descriptor() ([]byte, []int) {
return file_wtask_wtask_msg_proto_rawDescGZIP(), []int{12}
}
func (x *WTaskAutoFinshPush) GetCompletes() int32 {
func (x *WTaskAutoFinshPush) GetCompletes() []int32 {
if x != nil {
return x.Completes
}
return 0
return nil
}
func (x *WTaskAutoFinshPush) GetAward() []*UserAssets {
@ -731,7 +731,7 @@ var file_wtask_wtask_msg_proto_rawDesc = []byte{
0x57, 0x54, 0x61, 0x73, 0x6b, 0x49, 0x74, 0x65, 0x6d, 0x52, 0x0a, 0x61, 0x63, 0x63, 0x65, 0x70,
0x74, 0x74, 0x61, 0x73, 0x6b, 0x22, 0x55, 0x0a, 0x12, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x41, 0x75,
0x74, 0x6f, 0x46, 0x69, 0x6e, 0x73, 0x68, 0x50, 0x75, 0x73, 0x68, 0x12, 0x1c, 0x0a, 0x09, 0x63,
0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09,
0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x05, 0x52, 0x09,
0x63, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x73, 0x12, 0x21, 0x0a, 0x05, 0x61, 0x77, 0x61,
0x72, 0x64, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41,
0x73, 0x73, 0x65, 0x74, 0x73, 0x52, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x42, 0x06, 0x5a, 0x04,

View File

@ -12,6 +12,7 @@ import "errors"
type GameWorldTaskData struct {
Key int32
Opencond string
Lock int32
Lockend int32
Ontxe int32
@ -39,6 +40,7 @@ func (*GameWorldTaskData) GetTypeId() int32 {
func (_v *GameWorldTaskData)Deserialize(_buf map[string]interface{}) (err error) {
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["key"].(float64); !_ok_ { err = errors.New("key error"); return }; _v.Key = int32(_tempNum_) }
{ var _ok_ bool; if _v.Opencond, _ok_ = _buf["opencond"].(string); !_ok_ { err = errors.New("opencond error"); return } }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["lock"].(float64); !_ok_ { err = errors.New("lock error"); return }; _v.Lock = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["lockend"].(float64); !_ok_ { err = errors.New("lockend error"); return }; _v.Lockend = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["ontxe"].(float64); !_ok_ { err = errors.New("ontxe error"); return }; _v.Ontxe = int32(_tempNum_) }