liwei_3d/go_dreamfactory
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

上传活动指南代码

Browse Source
This commit is contained in:
liwei 2023-08-03 11:27:44 +08:00
parent cf58b1901a
commit 4c3a0f2a88
25 changed files with 363 additions and 2645 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

150
bin/json/game_annulartask_library.json
View File

@ -1,11 +1,11 @@
[
{
"id": 2,
"id": 1,
"assembleid": 60000010,
"lvstart": 1,
"lvend": 999,
"itemid": 1130,
"itemwt": 10000,
"itemid": 1010,
"itemwt": 1000,
"min": 0
},
{
@ -13,26 +13,26 @@
"assembleid": 60000010,
"lvstart": 1,
"lvend": 999,
"itemid": 1180,
"itemwt": 30000,
"itemid": 1030,
"itemwt": 1000,
"min": 0
},
{
"id": 6,
"id": 5,
"assembleid": 60000010,
"lvstart": 1,
"lvend": 999,
"itemid": 1290,
"itemwt": 30000,
"itemid": 1050,
"itemwt": 1000,
"min": 0
},
{
"id": 7,
"id": 8,
"assembleid": 60000020,
"lvstart": 1,
"lvend": 999,
"itemid": 1020,
"itemwt": 10000,
"itemid": 1080,
"itemwt": 1000,
"min": 0
},
{
@ -40,8 +40,26 @@
"assembleid": 60000020,
"lvstart": 1,
"lvend": 999,
"itemid": 1190,
"itemwt": 30000,
"itemid": 1090,
"itemwt": 1000,
"min": 0
},
{
"id": 10,
"assembleid": 60000020,
"lvstart": 1,
"lvend": 999,
"itemid": 1100,
"itemwt": 1000,
"min": 0
},
{
"id": 11,
"assembleid": 60000020,
"lvstart": 1,
"lvend": 999,
"itemid": 1110,
"itemwt": 1000,
"min": 0
},
{
@ -49,8 +67,26 @@
"assembleid": 60000020,
"lvstart": 1,
"lvend": 999,
"itemid": 1300,
"itemwt": 30000,
"itemid": 1120,
"itemwt": 1000,
"min": 0
},
{
"id": 13,
"assembleid": 60000030,
"lvstart": 1,
"lvend": 999,
"itemid": 1130,
"itemwt": 1000,
"min": 0
},
{
"id": 14,
"assembleid": 60000030,
"lvstart": 1,
"lvend": 999,
"itemid": 1140,
"itemwt": 1000,
"min": 0
},
{
@ -58,8 +94,8 @@
"assembleid": 60000030,
"lvstart": 1,
"lvend": 999,
"itemid": 1200,
"itemwt": 30000,
"itemid": 1150,
"itemwt": 1000,
"min": 0
},
{
@ -67,17 +103,44 @@
"assembleid": 60000030,
"lvstart": 1,
"lvend": 999,
"itemid": 1260,
"itemwt": 10000,
"itemid": 1160,
"itemwt": 1000,
"min": 0
},
{
"id": 17,
"assembleid": 60000030,
"lvstart": 1,
"lvend": 999,
"itemid": 1170,
"itemwt": 1000,
"min": 0
},
{
"id": 18,
"assembleid": 60000030,
"assembleid": 60000040,
"lvstart": 1,
"lvend": 999,
"itemid": 1310,
"itemwt": 30000,
"itemid": 1180,
"itemwt": 1000,
"min": 0
},
{
"id": 19,
"assembleid": 60000040,
"lvstart": 1,
"lvend": 999,
"itemid": 1190,
"itemwt": 1000,
"min": 0
},
{
"id": 20,
"assembleid": 60000040,
"lvstart": 1,
"lvend": 999,
"itemid": 1200,
"itemwt": 1000,
"min": 0
},
{
@ -86,7 +149,16 @@
"lvstart": 1,
"lvend": 999,
"itemid": 1210,
"itemwt": 30000,
"itemwt": 1000,
"min": 0
},
{
"id": 22,
"assembleid": 60000040,
"lvstart": 1,
"lvend": 999,
"itemid": 1220,
"itemwt": 1000,
"min": 0
},
{
@ -94,35 +166,35 @@
"assembleid": 60000040,
"lvstart": 1,
"lvend": 999,
"itemid": 1110,
"itemwt": 10000,
"itemid": 1230,
"itemwt": 1000,
"min": 0
},
{
"id": 24,
"assembleid": 60000040,
"lvstart": 1,
"lvend": 999,
"itemid": 1320,
"itemwt": 30000,
"min": 0
},
{
"id": 27,
"assembleid": 60000050,
"lvstart": 1,
"lvend": 999,
"itemid": 1220,
"itemwt": 30000,
"itemid": 1240,
"itemwt": 1000,
"min": 0
},
{
"id": 30,
"id": 25,
"assembleid": 60000050,
"lvstart": 1,
"lvend": 999,
"itemid": 1330,
"itemwt": 30000,
"itemid": 1250,
"itemwt": 1000,
"min": 0
},
{
"id": 26,
"assembleid": 60000050,
"lvstart": 1,
"lvend": 999,
"itemid": 1260,
"itemwt": 1000,
"min": 0
}
]

36
bin/json/game_annulartaskall.json
View File

@ -12,13 +12,8 @@
"reward": [
{
"a": "attr",
"t": "diamond",
"n": 50
},
{
"a": "attr",
"t": "ps",
"n": 50
"t": "gold",
"n": 8200
}
]
},
@ -35,13 +30,8 @@
"reward": [
{
"a": "attr",
"t": "diamond",
"n": 50
},
{
"a": "attr",
"t": "ps",
"n": 50
"t": "gold",
"n": 8300
}
]
},
@ -58,13 +48,8 @@
"reward": [
{
"a": "attr",
"t": "diamond",
"n": 50
},
{
"a": "attr",
"t": "ps",
"n": 50
"t": "gold",
"n": 8400
}
]
},
@ -81,13 +66,8 @@
"reward": [
{
"a": "attr",
"t": "diamond",
"n": 50
},
{
"a": "attr",
"t": "ps",
"n": 50
"t": "gold",
"n": 8500
}
]
}

416
bin/json/game_buriedcondi.json
View File

@ -25128,7 +25128,7 @@
"head": {
"a": "attr",
"t": "gold",
"n": 1
"n": 2
},
"NPC": 60081,
"value": 1,
@ -25152,7 +25152,7 @@
"head": {
"a": "attr",
"t": "gold",
"n": 1
"n": 3
},
"NPC": 60081,
"value": 1,
@ -25176,7 +25176,7 @@
"head": {
"a": "attr",
"t": "gold",
"n": 1
"n": 4
},
"NPC": 60081,
"value": 1,
@ -25200,7 +25200,7 @@
"head": {
"a": "attr",
"t": "gold",
"n": 1
"n": 5
},
"NPC": 60081,
"value": 1,
@ -25224,7 +25224,7 @@
"head": {
"a": "attr",
"t": "gold",
"n": 1
"n": 6
},
"NPC": 0,
"value": 2,
@ -25246,7 +25246,7 @@
"head": {
"a": "attr",
"t": "gold",
"n": 1
"n": 2
},
"NPC": 0,
"value": 2,
@ -25268,7 +25268,7 @@
"head": {
"a": "attr",
"t": "gold",
"n": 1
"n": 3
},
"NPC": 0,
"value": 2,
@ -25290,7 +25290,7 @@
"head": {
"a": "attr",
"t": "gold",
"n": 1
"n": 4
},
"NPC": 0,
"value": 2,
@ -25312,7 +25312,7 @@
"head": {
"a": "attr",
"t": "gold",
"n": 1
"n": 5
},
"NPC": 0,
"value": 2,
@ -25334,7 +25334,7 @@
"head": {
"a": "attr",
"t": "gold",
"n": 1
"n": 6
},
"NPC": 60181,
"value": 1,
@ -25358,7 +25358,7 @@
"head": {
"a": "attr",
"t": "gold",
"n": 1
"n": 7
},
"NPC": 60191,
"value": 1,
@ -25382,7 +25382,7 @@
"head": {
"a": "attr",
"t": "gold",
"n": 1
"n": 8
},
"NPC": 60201,
"value": 1,
@ -25406,7 +25406,7 @@
"head": {
"a": "attr",
"t": "gold",
"n": 1
"n": 9
},
"NPC": 60211,
"value": 1,
@ -25430,7 +25430,7 @@
"head": {
"a": "attr",
"t": "gold",
"n": 1
"n": 10
},
"NPC": 60221,
"value": 1,
@ -25454,7 +25454,7 @@
"head": {
"a": "attr",
"t": "gold",
"n": 1
"n": 11
},
"NPC": 60231,
"value": 1,
@ -25478,7 +25478,7 @@
"head": {
"a": "attr",
"t": "gold",
"n": 1
"n": 12
},
"NPC": 60241,
"value": 1,
@ -25500,7 +25500,7 @@
"head": {
"a": "attr",
"t": "gold",
"n": 1
"n": 13
},
"NPC": 60251,
"value": 1,
@ -25522,391 +25522,11 @@
"head": {
"a": "attr",
"t": "gold",
"n": 1
"n": 14
},
"NPC": 60261,
"value": 1,
"filter": [],
"filter2": []
},
{
"id": 50000037,
"rtype": 2,
"ctype": 3,
"notify": [],
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_905",
"text": "检查所有可疑点4"
},
"type": 206,
"valid": 0,
"head": {
"a": "attr",
"t": "gold",
"n": 1
},
"NPC": 60271,
"value": 1,
"filter": [],
"filter2": []
},
{
"id": 50000039,
"rtype": 2,
"ctype": 3,
"notify": [],
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_906",
"text": "检查所有可疑点5"
},
"type": 206,
"valid": 0,
"head": {
"a": "attr",
"t": "gold",
"n": 1
},
"NPC": 60281,
"value": 1,
"filter": [],
"filter2": []
},
{
"id": 50000040,
"rtype": 2,
"ctype": 3,
"notify": [],
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_907",
"text": "找对象聊天1"
},
"type": 187,
"valid": 0,
"head": {
"a": "attr",
"t": "gold",
"n": 1
},
"NPC": 60291,
"value": 1,
"filter": [
12870
],
"filter2": []
},
{
"id": 50000041,
"rtype": 2,
"ctype": 3,
"notify": [],
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_908",
"text": "找对象聊天2"
},
"type": 187,
"valid": 0,
"head": {
"a": "attr",
"t": "gold",
"n": 1
},
"NPC": 60301,
"value": 1,
"filter": [
12870
],
"filter2": []
},
{
"id": 50000042,
"rtype": 2,
"ctype": 3,
"notify": [],
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_909",
"text": "找对象聊天3"
},
"type": 187,
"valid": 0,
"head": {
"a": "attr",
"t": "gold",
"n": 1
},
"NPC": 60311,
"value": 1,
"filter": [
12870
],
"filter2": []
},
{
"id": 50000043,
"rtype": 2,
"ctype": 3,
"notify": [],
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_910",
"text": "找对象聊天4"
},
"type": 187,
"valid": 0,
"head": {
"a": "attr",
"t": "gold",
"n": 1
},
"NPC": 60321,
"value": 1,
"filter": [
12870
],
"filter2": []
},
{
"id": 50000044,
"rtype": 2,
"ctype": 3,
"notify": [],
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_911",
"text": "找对象聊天5"
},
"type": 187,
"valid": 0,
"head": {
"a": "attr",
"t": "gold",
"n": 1
},
"NPC": 60331,
"value": 1,
"filter": [
12870
],
"filter2": []
},
{
"id": 50000045,
"rtype": 2,
"ctype": 3,
"notify": [],
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_912",
"text": "找对象聊天6"
},
"type": 20001,
"valid": 0,
"head": {
"a": "attr",
"t": "gold",
"n": 1
},
"NPC": 60341,
"value": 1,
"filter": [
12870
],
"filter2": []
},
{
"id": 50000046,
"rtype": 2,
"ctype": 3,
"notify": [],
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_913",
"text": "找对象聊天7"
},
"type": 20001,
"valid": 0,
"head": {
"a": "attr",
"t": "gold",
"n": 1
},
"NPC": 60351,
"value": 1,
"filter": [
12870
],
"filter2": []
},
{
"id": 50000047,
"rtype": 2,
"ctype": 3,
"notify": [],
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_914",
"text": "找对象聊天8"
},
"type": 20001,
"valid": 0,
"head": {
"a": "attr",
"t": "gold",
"n": 1
},
"NPC": 60361,
"value": 1,
"filter": [
12870
],
"filter2": []
},
{
"id": 50000048,
"rtype": 2,
"ctype": 3,
"notify": [],
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_915",
"text": "找对象聊天9"
},
"type": 20001,
"valid": 0,
"head": {
"a": "attr",
"t": "gold",
"n": 1
},
"NPC": 60371,
"value": 1,
"filter": [
12870
],
"filter2": []
},
{
"id": 50000049,
"rtype": 2,
"ctype": 3,
"notify": [],
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_916",
"text": "找对象聊天10"
},
"type": 20001,
"valid": 0,
"head": {
"a": "attr",
"t": "gold",
"n": 1
},
"NPC": 60381,
"value": 1,
"filter": [
12870
],
"filter2": []
},
{
"id": 50000050,
"rtype": 2,
"ctype": 3,
"notify": [],
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_917",
"text": "找对象聊天11"
},
"type": 20001,
"valid": 0,
"head": {
"a": "attr",
"t": "gold",
"n": 1
},
"NPC": 60391,
"value": 1,
"filter": [
12870
],
"filter2": []
},
{
"id": 50000051,
"rtype": 2,
"ctype": 3,
"notify": [],
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_918",
"text": "找对象聊天12"
},
"type": 20001,
"valid": 0,
"head": {
"a": "attr",
"t": "gold",
"n": 1
},
"NPC": 60401,
"value": 1,
"filter": [
12870
],
"filter2": []
},
{
"id": 50000052,
"rtype": 2,
"ctype": 3,
"notify": [],
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_919",
"text": "找对象聊天13"
},
"type": 20001,
"valid": 0,
"head": {
"a": "attr",
"t": "gold",
"n": 1
},
"NPC": 60411,
"value": 1,
"filter": [
12870
],
"filter2": []
},
{
"id": 50000053,
"rtype": 2,
"ctype": 3,
"notify": [],
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_920",
"text": "找对象聊天14"
},
"type": 20001,
"valid": 0,
"head": {
"a": "attr",
"t": "gold",
"n": 1
},
"NPC": 60421,
"value": 1,
"filter": [
12870
],
"filter2": []
}
]

120
bin/json/game_equipattrlibrarys.json
View File

@ -78,7 +78,7 @@
"key": 6,
"libraryid": 1101,
"attrkey": "atkpro",
"attrvar": 39,
"attrvar": 42,
"attrvar_correct": 1000,
"probability": 200,
"Addition": [
@ -93,7 +93,7 @@
"key": 7,
"libraryid": 1101,
"attrkey": "defpro",
"attrvar": 39,
"attrvar": 42,
"attrvar_correct": 1000,
"probability": 200,
"Addition": [
@ -108,7 +108,7 @@
"key": 8,
"libraryid": 1101,
"attrkey": "hppro",
"attrvar": 39,
"attrvar": 42,
"attrvar_correct": 1000,
"probability": 200,
"Addition": [
@ -183,7 +183,7 @@
"key": 13,
"libraryid": 1301,
"attrkey": "atkpro",
"attrvar": 39,
"attrvar": 42,
"attrvar_correct": 1000,
"probability": 250,
"Addition": [
@ -198,7 +198,7 @@
"key": 14,
"libraryid": 1301,
"attrkey": "defpro",
"attrvar": 39,
"attrvar": 42,
"attrvar_correct": 1000,
"probability": 125,
"Addition": [
@ -213,7 +213,7 @@
"key": 15,
"libraryid": 1301,
"attrkey": "hppro",
"attrvar": 39,
"attrvar": 42,
"attrvar_correct": 1000,
"probability": 125,
"Addition": [
@ -243,7 +243,7 @@
"key": 17,
"libraryid": 1301,
"attrkey": "cridam",
"attrvar": 39,
"attrvar": 42,
"attrvar_correct": 1000,
"probability": 60,
"Addition": [
@ -318,7 +318,7 @@
"key": 22,
"libraryid": 1501,
"attrkey": "atkpro",
"attrvar": 39,
"attrvar": 42,
"attrvar_correct": 1000,
"probability": 125,
"Addition": [
@ -333,7 +333,7 @@
"key": 23,
"libraryid": 1501,
"attrkey": "defpro",
"attrvar": 39,
"attrvar": 42,
"attrvar_correct": 1000,
"probability": 125,
"Addition": [
@ -348,7 +348,7 @@
"key": 24,
"libraryid": 1501,
"attrkey": "hppro",
"attrvar": 39,
"attrvar": 42,
"attrvar_correct": 1000,
"probability": 250,
"Addition": [
@ -363,7 +363,7 @@
"key": 25,
"libraryid": 1501,
"attrkey": "effhit",
"attrvar": 39,
"attrvar": 42,
"attrvar_correct": 1000,
"probability": 100,
"Addition": [
@ -378,7 +378,7 @@
"key": 26,
"libraryid": 1501,
"attrkey": "effre",
"attrvar": 39,
"attrvar": 42,
"attrvar_correct": 1000,
"probability": 100,
"Addition": [
@ -468,7 +468,7 @@
"key": 32,
"libraryid": 1102,
"attrkey": "atkpro",
"attrvar": 46,
"attrvar": 51,
"attrvar_correct": 1000,
"probability": 100,
"Addition": [
@ -483,7 +483,7 @@
"key": 33,
"libraryid": 1102,
"attrkey": "defpro",
"attrvar": 46,
"attrvar": 51,
"attrvar_correct": 1000,
"probability": 200,
"Addition": [
@ -498,7 +498,7 @@
"key": 34,
"libraryid": 1102,
"attrkey": "hppro",
"attrvar": 46,
"attrvar": 51,
"attrvar_correct": 1000,
"probability": 200,
"Addition": [
@ -573,7 +573,7 @@
"key": 39,
"libraryid": 1302,
"attrkey": "atkpro",
"attrvar": 46,
"attrvar": 51,
"attrvar_correct": 1000,
"probability": 100,
"Addition": [
@ -588,7 +588,7 @@
"key": 40,
"libraryid": 1302,
"attrkey": "defpro",
"attrvar": 46,
"attrvar": 51,
"attrvar_correct": 1000,
"probability": 250,
"Addition": [
@ -603,7 +603,7 @@
"key": 41,
"libraryid": 1302,
"attrkey": "hppro",
"attrvar": 46,
"attrvar": 51,
"attrvar_correct": 1000,
"probability": 125,
"Addition": [
@ -633,7 +633,7 @@
"key": 43,
"libraryid": 1302,
"attrkey": "cridam",
"attrvar": 46,
"attrvar": 51,
"attrvar_correct": 1000,
"probability": 90,
"Addition": [
@ -708,7 +708,7 @@
"key": 48,
"libraryid": 1502,
"attrkey": "atkpro",
"attrvar": 46,
"attrvar": 51,
"attrvar_correct": 1000,
"probability": 100,
"Addition": [
@ -723,7 +723,7 @@
"key": 49,
"libraryid": 1502,
"attrkey": "defpro",
"attrvar": 46,
"attrvar": 51,
"attrvar_correct": 1000,
"probability": 125,
"Addition": [
@ -738,7 +738,7 @@
"key": 50,
"libraryid": 1502,
"attrkey": "hppro",
"attrvar": 46,
"attrvar": 51,
"attrvar_correct": 1000,
"probability": 125,
"Addition": [
@ -753,7 +753,7 @@
"key": 51,
"libraryid": 1502,
"attrkey": "effhit",
"attrvar": 46,
"attrvar": 51,
"attrvar_correct": 1000,
"probability": 250,
"Addition": [
@ -768,7 +768,7 @@
"key": 52,
"libraryid": 1502,
"attrkey": "effre",
"attrvar": 46,
"attrvar": 51,
"attrvar_correct": 1000,
"probability": 100,
"Addition": [
@ -858,7 +858,7 @@
"key": 58,
"libraryid": 1103,
"attrkey": "atkpro",
"attrvar": 54,
"attrvar": 59,
"attrvar_correct": 1000,
"probability": 100,
"Addition": [
@ -873,7 +873,7 @@
"key": 59,
"libraryid": 1103,
"attrkey": "defpro",
"attrvar": 54,
"attrvar": 59,
"attrvar_correct": 1000,
"probability": 100,
"Addition": [
@ -888,7 +888,7 @@
"key": 60,
"libraryid": 1103,
"attrkey": "hppro",
"attrvar": 54,
"attrvar": 59,
"attrvar_correct": 1000,
"probability": 200,
"Addition": [
@ -963,7 +963,7 @@
"key": 65,
"libraryid": 1303,
"attrkey": "atkpro",
"attrvar": 54,
"attrvar": 59,
"attrvar_correct": 1000,
"probability": 100,
"Addition": [
@ -978,7 +978,7 @@
"key": 66,
"libraryid": 1303,
"attrkey": "defpro",
"attrvar": 54,
"attrvar": 59,
"attrvar_correct": 1000,
"probability": 100,
"Addition": [
@ -993,7 +993,7 @@
"key": 67,
"libraryid": 1303,
"attrkey": "hppro",
"attrvar": 54,
"attrvar": 59,
"attrvar_correct": 1000,
"probability": 250,
"Addition": [
@ -1023,7 +1023,7 @@
"key": 69,
"libraryid": 1303,
"attrkey": "cridam",
"attrvar": 54,
"attrvar": 59,
"attrvar_correct": 1000,
"probability": 125,
"Addition": [
@ -1098,7 +1098,7 @@
"key": 74,
"libraryid": 1503,
"attrkey": "atkpro",
"attrvar": 54,
"attrvar": 59,
"attrvar_correct": 1000,
"probability": 100,
"Addition": [
@ -1113,7 +1113,7 @@
"key": 75,
"libraryid": 1503,
"attrkey": "defpro",
"attrvar": 54,
"attrvar": 59,
"attrvar_correct": 1000,
"probability": 100,
"Addition": [
@ -1128,7 +1128,7 @@
"key": 76,
"libraryid": 1503,
"attrkey": "hppro",
"attrvar": 54,
"attrvar": 59,
"attrvar_correct": 1000,
"probability": 125,
"Addition": [
@ -1143,7 +1143,7 @@
"key": 77,
"libraryid": 1503,
"attrkey": "effhit",
"attrvar": 54,
"attrvar": 59,
"attrvar_correct": 1000,
"probability": 125,
"Addition": [
@ -1158,7 +1158,7 @@
"key": 78,
"libraryid": 1503,
"attrkey": "effre",
"attrvar": 54,
"attrvar": 59,
"attrvar_correct": 1000,
"probability": 250,
"Addition": [
@ -1248,7 +1248,7 @@
"key": 84,
"libraryid": 1104,
"attrkey": "atkpro",
"attrvar": 62,
"attrvar": 68,
"attrvar_correct": 1000,
"probability": 100,
"Addition": [
@ -1263,7 +1263,7 @@
"key": 85,
"libraryid": 1104,
"attrkey": "defpro",
"attrvar": 62,
"attrvar": 68,
"attrvar_correct": 1000,
"probability": 100,
"Addition": [
@ -1278,7 +1278,7 @@
"key": 86,
"libraryid": 1104,
"attrkey": "hppro",
"attrvar": 62,
"attrvar": 68,
"attrvar_correct": 1000,
"probability": 100,
"Addition": [
@ -1353,7 +1353,7 @@
"key": 91,
"libraryid": 1304,
"attrkey": "atkpro",
"attrvar": 62,
"attrvar": 68,
"attrvar_correct": 1000,
"probability": 100,
"Addition": [
@ -1368,7 +1368,7 @@
"key": 92,
"libraryid": 1304,
"attrkey": "defpro",
"attrvar": 62,
"attrvar": 68,
"attrvar_correct": 1000,
"probability": 100,
"Addition": [
@ -1383,7 +1383,7 @@
"key": 93,
"libraryid": 1304,
"attrkey": "hppro",
"attrvar": 62,
"attrvar": 68,
"attrvar_correct": 1000,
"probability": 100,
"Addition": [
@ -1413,7 +1413,7 @@
"key": 95,
"libraryid": 1304,
"attrkey": "cridam",
"attrvar": 62,
"attrvar": 68,
"attrvar_correct": 1000,
"probability": 125,
"Addition": [
@ -1488,7 +1488,7 @@
"key": 100,
"libraryid": 1504,
"attrkey": "atkpro",
"attrvar": 62,
"attrvar": 68,
"attrvar_correct": 1000,
"probability": 100,
"Addition": [
@ -1503,7 +1503,7 @@
"key": 101,
"libraryid": 1504,
"attrkey": "defpro",
"attrvar": 62,
"attrvar": 68,
"attrvar_correct": 1000,
"probability": 100,
"Addition": [
@ -1518,7 +1518,7 @@
"key": 102,
"libraryid": 1504,
"attrkey": "hppro",
"attrvar": 62,
"attrvar": 68,
"attrvar_correct": 1000,
"probability": 100,
"Addition": [
@ -1533,7 +1533,7 @@
"key": 103,
"libraryid": 1504,
"attrkey": "effhit",
"attrvar": 62,
"attrvar": 68,
"attrvar_correct": 1000,
"probability": 125,
"Addition": [
@ -1548,7 +1548,7 @@
"key": 104,
"libraryid": 1504,
"attrkey": "effre",
"attrvar": 62,
"attrvar": 68,
"attrvar_correct": 1000,
"probability": 125,
"Addition": [
@ -2028,7 +2028,7 @@
"key": 136,
"libraryid": 1106,
"attrkey": "atkpro",
"attrvar": 78,
"attrvar": 85,
"attrvar_correct": 1000,
"probability": 1,
"Addition": [
@ -2043,7 +2043,7 @@
"key": 137,
"libraryid": 1106,
"attrkey": "defpro",
"attrvar": 78,
"attrvar": 85,
"attrvar_correct": 1000,
"probability": 100,
"Addition": [
@ -2058,7 +2058,7 @@
"key": 138,
"libraryid": 1106,
"attrkey": "hppro",
"attrvar": 78,
"attrvar": 85,
"attrvar_correct": 1000,
"probability": 100,
"Addition": [
@ -2133,7 +2133,7 @@
"key": 143,
"libraryid": 1306,
"attrkey": "atkpro",
"attrvar": 78,
"attrvar": 85,
"attrvar_correct": 1000,
"probability": 200,
"Addition": [
@ -2148,7 +2148,7 @@
"key": 144,
"libraryid": 1306,
"attrkey": "defpro",
"attrvar": 78,
"attrvar": 85,
"attrvar_correct": 1000,
"probability": 1,
"Addition": [
@ -2163,7 +2163,7 @@
"key": 145,
"libraryid": 1306,
"attrkey": "hppro",
"attrvar": 78,
"attrvar": 85,
"attrvar_correct": 1000,
"probability": 100,
"Addition": [
@ -2193,7 +2193,7 @@
"key": 147,
"libraryid": 1306,
"attrkey": "cridam",
"attrvar": 78,
"attrvar": 85,
"attrvar_correct": 1000,
"probability": 100,
"Addition": [
@ -2268,7 +2268,7 @@
"key": 152,
"libraryid": 1506,
"attrkey": "atkpro",
"attrvar": 78,
"attrvar": 85,
"attrvar_correct": 1000,
"probability": 60,
"Addition": [
@ -2283,7 +2283,7 @@
"key": 153,
"libraryid": 1506,
"attrkey": "defpro",
"attrvar": 78,
"attrvar": 85,
"attrvar_correct": 1000,
"probability": 3,
"Addition": [
@ -2298,7 +2298,7 @@
"key": 154,
"libraryid": 1506,
"attrkey": "hppro",
"attrvar": 78,
"attrvar": 85,
"attrvar_correct": 1000,
"probability": 100,
"Addition": [
@ -2313,7 +2313,7 @@
"key": 155,
"libraryid": 1506,
"attrkey": "effhit",
"attrvar": 78,
"attrvar": 85,
"attrvar_correct": 1000,
"probability": 100,
"Addition": [
@ -2328,7 +2328,7 @@
"key": 156,
"libraryid": 1506,
"attrkey": "effre",
"attrvar": 78,
"attrvar": 85,
"attrvar_correct": 1000,
"probability": 100,
"Addition": [

4
bin/json/game_gamesummarytab.json
View File

@ -17,7 +17,7 @@
"layer": 1,
"name": {
"key": "gamesummary_fathernode_name_2",
"text": "冒险之旅"
"text": "冒险关卡"
},
"mapPos": {
"x": -2363,
@ -95,7 +95,7 @@
"layer": 0,
"name": {
"key": "gamesummary_fathernode_name_11",
"text": "石阵秘境"
"text": "迷宫玩法"
},
"mapPos": {
"x": -1037,

78
bin/json/game_guidance.json
View File

@ -3,130 +3,78 @@
"id": 1,
"exp": "日常任务",
"jumpid": 109,
"index": 20,
"intr": {
"key": "guidance_1",
"text": "今日剩余任务：{0}/{1}"
}
"index": 20
},
{
"id": 2,
"exp": "每日一练",
"jumpid": 10002,
"index": 21,
"intr": {
"key": "guidance_2",
"text": "今日完成进度：{0}/{1}"
}
"index": 21
},
{
"id": 3,
"exp": "云朵先生签到",
"jumpid": 719,
"index": 22,
"intr": {
"key": "guidance_3",
"text": "今日完成进度：{0}/{1}"
}
"index": 22
},
{
"id": 4,
"exp": "巨怪商队跑商",
"jumpid": 11001,
"index": 23,
"intr": {
"key": "guidance_4",
"text": "今日剩余车票：{0}"
}
"index": 23
},
{
"id": 5,
"exp": "公会签到",
"jumpid": 804,
"index": 24,
"intr": {
"key": "guidance_5",
"text": "今日剩余签到：{0}"
}
"index": 24
},
{
"id": 6,
"exp": "公会副本",
"jumpid": 11005,
"index": 25,
"intr": {
"key": "guidance_6",
"text": "今日剩余挑战次数：{0}"
}
"index": 25
},
{
"id": 7,
"exp": "公会任务",
"jumpid": 161,
"index": 26,
"intr": {
"key": "guidance_7",
"text": "今日剩余任务：{0}"
}
"index": 26
},
{
"id": 8,
"exp": "竞技挑战",
"jumpid": 156,
"index": 27,
"intr": {
"key": "guidance_8",
"text": "今日剩余挑战券：{0}"
}
"index": 27
},
{
"id": 9,
"exp": "熊猫武馆训练",
"jumpid": 10002,
"index": 28,
"intr": {
"key": "guidance_9",
"text": "今日剩余训练次数：{0}"
}
"index": 28
},
{
"id": 10,
"exp": "种族塔",
"jumpid": 10018,
"index": 29,
"intr": {
"key": "guidance_10",
"text": "今日剩余可挑战关卡：{0}"
}
"index": 29
},
{
"id": 11,
"exp": "维京远征",
"jumpid": 11012,
"index": 30,
"intr": {
"key": "guidance_11",
"text": "今日剩余体力：{0}/{1}"
}
"index": 30
},
{
"id": 12,
"exp": "狩猎",
"jumpid": 168,
"index": 31,
"intr": {
"key": "guidance_12",
"text": "今日剩余体力：{0}/{1}"
}
"index": 31
},
{
"id": 13,
"exp": "经验副本",
"jumpid": 10013,
"index": 32,
"intr": {
"key": "guidance_13",
"text": "今日剩余体力：{0}/{1}"
}
"index": 32
}
]

72
bin/json/game_lottery.json
View File

@ -1047,7 +1047,7 @@
},
"itemdes": "阵营觉醒材料",
"itemwt": 1000,
"min": 8000,
"min": 16000,
"max": 16000,
"VIPmin": 0,
"VIPmax": 15,
@ -1095,7 +1095,7 @@
},
"itemdes": "阵营觉醒材料",
"itemwt": 1000,
"min": 9900,
"min": 19800,
"max": 19800,
"VIPmin": 0,
"VIPmax": 15,
@ -1167,7 +1167,7 @@
},
"itemdes": "阵营觉醒材料",
"itemwt": 1000,
"min": 12000,
"min": 24000,
"max": 24000,
"VIPmin": 0,
"VIPmax": 15,
@ -1239,7 +1239,7 @@
},
"itemdes": "阵营觉醒材料",
"itemwt": 1000,
"min": 14300,
"min": 28600,
"max": 28600,
"VIPmin": 0,
"VIPmax": 15,
@ -1311,7 +1311,7 @@
},
"itemdes": "阵营觉醒材料",
"itemwt": 1000,
"min": 16800,
"min": 33600,
"max": 33600,
"VIPmin": 0,
"VIPmax": 15,
@ -1383,7 +1383,7 @@
},
"itemdes": "阵营觉醒材料",
"itemwt": 1000,
"min": 19500,
"min": 39000,
"max": 39000,
"VIPmin": 0,
"VIPmax": 15,
@ -1479,7 +1479,7 @@
},
"itemdes": "阵营觉醒材料",
"itemwt": 1000,
"min": 22400,
"min": 44800,
"max": 44800,
"VIPmin": 0,
"VIPmax": 15,
@ -1575,7 +1575,7 @@
},
"itemdes": "阵营觉醒材料",
"itemwt": 1000,
"min": 25500,
"min": 51000,
"max": 51000,
"VIPmin": 0,
"VIPmax": 15,
@ -1671,7 +1671,7 @@
},
"itemdes": "阵营觉醒材料",
"itemwt": 1000,
"min": 28800,
"min": 57600,
"max": 57600,
"VIPmin": 0,
"VIPmax": 15,
@ -1767,7 +1767,7 @@
},
"itemdes": "阵营觉醒材料",
"itemwt": 1000,
"min": 32300,
"min": 64600,
"max": 64600,
"VIPmin": 0,
"VIPmax": 15,
@ -1863,7 +1863,7 @@
},
"itemdes": "阵营觉醒材料",
"itemwt": 1000,
"min": 36000,
"min": 72000,
"max": 72000,
"VIPmin": 0,
"VIPmax": 15,
@ -1959,7 +1959,7 @@
},
"itemdes": "阵营觉醒材料",
"itemwt": 1000,
"min": 40000,
"min": 80000,
"max": 80000,
"VIPmin": 0,
"VIPmax": 15,
@ -6447,8 +6447,8 @@
},
"itemdes": "金币",
"itemwt": 1000,
"min": 4000,
"max": 4000,
"min": 8000,
"max": 8000,
"VIPmin": 0,
"VIPmax": 15,
"playerlvmin": 0,
@ -6519,8 +6519,8 @@
},
"itemdes": "金币",
"itemwt": 1000,
"min": 4950,
"max": 4950,
"min": 9900,
"max": 9900,
"VIPmin": 0,
"VIPmax": 15,
"playerlvmin": 0,
@ -6591,8 +6591,8 @@
},
"itemdes": "金币",
"itemwt": 1000,
"min": 6000,
"max": 6000,
"min": 12000,
"max": 12000,
"VIPmin": 0,
"VIPmax": 15,
"playerlvmin": 0,
@ -6663,8 +6663,8 @@
},
"itemdes": "金币",
"itemwt": 1000,
"min": 7150,
"max": 7150,
"min": 14300,
"max": 14300,
"VIPmin": 0,
"VIPmax": 15,
"playerlvmin": 0,
@ -6735,8 +6735,8 @@
},
"itemdes": "金币",
"itemwt": 1000,
"min": 8400,
"max": 8400,
"min": 16800,
"max": 16800,
"VIPmin": 0,
"VIPmax": 15,
"playerlvmin": 0,
@ -6807,8 +6807,8 @@
},
"itemdes": "金币",
"itemwt": 1000,
"min": 9750,
"max": 9750,
"min": 19500,
"max": 19500,
"VIPmin": 0,
"VIPmax": 15,
"playerlvmin": 0,
@ -6879,8 +6879,8 @@
},
"itemdes": "金币",
"itemwt": 1000,
"min": 11200,
"max": 11200,
"min": 22400,
"max": 22400,
"VIPmin": 0,
"VIPmax": 15,
"playerlvmin": 0,
@ -6951,8 +6951,8 @@
},
"itemdes": "金币",
"itemwt": 1000,
"min": 12750,
"max": 12750,
"min": 25500,
"max": 25500,
"VIPmin": 0,
"VIPmax": 15,
"playerlvmin": 0,
@ -7047,8 +7047,8 @@
},
"itemdes": "金币",
"itemwt": 1000,
"min": 14400,
"max": 14400,
"min": 28800,
"max": 28800,
"VIPmin": 0,
"VIPmax": 15,
"playerlvmin": 0,
@ -7143,8 +7143,8 @@
},
"itemdes": "金币",
"itemwt": 1000,
"min": 16150,
"max": 16150,
"min": 32300,
"max": 32300,
"VIPmin": 0,
"VIPmax": 15,
"playerlvmin": 0,
@ -7239,8 +7239,8 @@
},
"itemdes": "金币",
"itemwt": 1000,
"min": 18000,
"max": 18000,
"min": 36000,
"max": 36000,
"VIPmin": 0,
"VIPmax": 15,
"playerlvmin": 0,
@ -7335,8 +7335,8 @@
},
"itemdes": "金币",
"itemwt": 1000,
"min": 20000,
"max": 20000,
"min": 1,
"max": 1,
"VIPmin": 0,
"VIPmax": 15,
"playerlvmin": 0,

6
bin/json/game_namelibrary.json
View File

@ -807,7 +807,7 @@
"id": 68,
"surname": {
"key": "name_name_surname_68",
"text": "随意的"
"text": "随性的"
},
"name": {
"key": "name_name_name_68",
@ -1371,7 +1371,7 @@
"id": 115,
"surname": {
"key": "name_name_surname_115",
"text": "率真的"
"text": "率性的"
},
"name": {
"key": "name_name_name_115",
@ -1507,7 +1507,7 @@
},
"name": {
"key": "name_name_name_126",
"text": "维级"
"text": "维基"
},
"sex": 1
}

2
bin/json/game_navigation.json
View File

@ -135,7 +135,7 @@
"sceneicon": "ty_qp_zhb",
"functionname": {
"key": "navigation_Sheet1_functionname_8",
"text": "冒险之旅"
"text": "冒险关卡"
},
"npcName": [
"功能入口_主线"

695
bin/json/game_rdtasknpc.json
View File

@ -6610,8 +6610,8 @@
"901"
],
"event": [
10,
140
2,
12960
],
"goto": 0
},
@ -6655,8 +6655,8 @@
"901"
],
"event": [
10,
140
2,
12960
],
"goto": 0
},
@ -6700,8 +6700,8 @@
"901"
],
"event": [
10,
140
2,
12960
],
"goto": 0
},
@ -6745,8 +6745,8 @@
"901"
],
"event": [
10,
140
2,
12960
],
"goto": 0
},
@ -6790,8 +6790,8 @@
"901"
],
"event": [
10,
140
2,
12960
],
"goto": 0
},
@ -7529,680 +7529,5 @@
13010
],
"goto": 0
},
{
"id": 60290,
"heroid": 25001,
"Levelid": 0,
"datas": [
"GameMain",
"功能入口-商人",
"901"
],
"event": [
2,
12930
],
"goto": 0
},
{
"id": 60291,
"heroid": 25001,
"Levelid": 0,
"datas": [
"GameMain",
"功能入口-公告",
"901"
],
"event": [
2,
12870
],
"goto": 0
},
{
"id": 60298,
"heroid": 25001,
"Levelid": 0,
"datas": [
"GameMain",
"功能入口-邮件",
"901"
],
"event": [
2,
12950
],
"goto": 0
},
{
"id": 60300,
"heroid": 25001,
"Levelid": 0,
"datas": [
"GameMain",
"功能入口-维京远征",
"901"
],
"event": [
2,
12930
],
"goto": 0
},
{
"id": 60301,
"heroid": 25001,
"Levelid": 0,
"datas": [
"GameMain",
"功能入口-招募",
"901"
],
"event": [
2,
12870
],
"goto": 0
},
{
"id": 60308,
"heroid": 25001,
"Levelid": 0,
"datas": [
"GameMain",
"功能入口-狩猎",
"901"
],
"event": [
2,
12950
],
"goto": 0
},
{
"id": 60310,
"heroid": 25001,
"Levelid": 0,
"datas": [
"GameMain",
"功能入口-藏书馆",
"901"
],
"event": [
2,
12930
],
"goto": 0
},
{
"id": 60311,
"heroid": 25001,
"Levelid": 0,
"datas": [
"GameMain",
"功能入口-魔药",
"901"
],
"event": [
2,
12870
],
"goto": 0
},
{
"id": 60318,
"heroid": 25001,
"Levelid": 0,
"datas": [
"GameMain",
"功能入口-剧情副本(旧时光)",
"901"
],
"event": [
2,
12950
],
"goto": 0
},
{
"id": 60320,
"heroid": 25001,
"Levelid": 0,
"datas": [
"GameMain",
"功能入口-竞技场",
"901"
],
"event": [
2,
12930
],
"goto": 0
},
{
"id": 60321,
"heroid": 25001,
"Levelid": 0,
"datas": [
"GameMain",
"功能入口-招募",
"901"
],
"event": [
2,
12870
],
"goto": 0
},
{
"id": 60328,
"heroid": 25001,
"Levelid": 0,
"datas": [
"GameMain",
"功能入口-烹饪",
"901"
],
"event": [
2,
12950
],
"goto": 0
},
{
"id": 60330,
"heroid": 25001,
"Levelid": 0,
"datas": [
"GameMain",
"功能入口-浇水拼图",
"901"
],
"event": [
2,
12930
],
"goto": 0
},
{
"id": 60331,
"heroid": 25001,
"Levelid": 0,
"datas": [
"WuGuanScene",
"阿宝",
"137"
],
"event": [
2,
12870
],
"goto": 0
},
{
"id": 60338,
"heroid": 25001,
"Levelid": 0,
"datas": [
"WuGuanScene",
"总教习",
"137"
],
"event": [
2,
12950
],
"goto": 0
},
{
"id": 60340,
"heroid": 25001,
"Levelid": 0,
"datas": [
"GameMain",
"功能入口-商人",
"901"
],
"event": [
2,
12930
],
"goto": 0
},
{
"id": 60341,
"heroid": 25001,
"Levelid": 0,
"datas": [
"GameMain",
"功能入口-公告",
"901"
],
"event": [
2,
12870
],
"goto": 0
},
{
"id": 60348,
"heroid": 25001,
"Levelid": 0,
"datas": [
"GameMain",
"功能入口-邮件",
"901"
],
"event": [
2,
12950
],
"goto": 0
},
{
"id": 60350,
"heroid": 25001,
"Levelid": 0,
"datas": [
"GameMain",
"功能入口-维京远征",
"901"
],
"event": [
2,
12930
],
"goto": 0
},
{
"id": 60351,
"heroid": 25001,
"Levelid": 0,
"datas": [
"GameMain",
"功能入口-招募",
"901"
],
"event": [
2,
12870
],
"goto": 0
},
{
"id": 60358,
"heroid": 25001,
"Levelid": 0,
"datas": [
"GameMain",
"功能入口-狩猎",
"901"
],
"event": [
2,
12950
],
"goto": 0
},
{
"id": 60360,
"heroid": 25001,
"Levelid": 0,
"datas": [
"GameMain",
"功能入口-藏书馆",
"901"
],
"event": [
2,
12930
],
"goto": 0
},
{
"id": 60361,
"heroid": 25001,
"Levelid": 0,
"datas": [
"GameMain",
"功能入口-魔药",
"901"
],
"event": [
2,
12870
],
"goto": 0
},
{
"id": 60368,
"heroid": 25001,
"Levelid": 0,
"datas": [
"GameMain",
"功能入口-剧情副本(旧时光)",
"901"
],
"event": [
2,
12950
],
"goto": 0
},
{
"id": 60370,
"heroid": 25001,
"Levelid": 0,
"datas": [
"GameMain",
"功能入口-竞技场",
"901"
],
"event": [
2,
12930
],
"goto": 0
},
{
"id": 60371,
"heroid": 25001,
"Levelid": 0,
"datas": [
"GameMain",
"功能入口-招募",
"901"
],
"event": [
2,
12870
],
"goto": 0
},
{
"id": 60378,
"heroid": 25001,
"Levelid": 0,
"datas": [
"GameMain",
"功能入口-烹饪",
"901"
],
"event": [
2,
12950
],
"goto": 0
},
{
"id": 60380,
"heroid": 25001,
"Levelid": 0,
"datas": [
"GameMain",
"功能入口-浇水拼图",
"901"
],
"event": [
2,
12930
],
"goto": 0
},
{
"id": 60381,
"heroid": 25001,
"Levelid": 0,
"datas": [
"WuGuanScene",
"阿宝",
"137"
],
"event": [
2,
12870
],
"goto": 0
},
{
"id": 60388,
"heroid": 25001,
"Levelid": 0,
"datas": [
"WuGuanScene",
"总教习",
"137"
],
"event": [
2,
12950
],
"goto": 0
},
{
"id": 60390,
"heroid": 25001,
"Levelid": 0,
"datas": [
"GameMain",
"功能入口-商人",
"901"
],
"event": [
2,
12930
],
"goto": 0
},
{
"id": 60391,
"heroid": 25001,
"Levelid": 0,
"datas": [
"GameMain",
"功能入口-公告",
"901"
],
"event": [
2,
12870
],
"goto": 0
},
{
"id": 60398,
"heroid": 25001,
"Levelid": 0,
"datas": [
"GameMain",
"功能入口-邮件",
"901"
],
"event": [
2,
12950
],
"goto": 0
},
{
"id": 60400,
"heroid": 25001,
"Levelid": 0,
"datas": [
"GameMain",
"功能入口-维京远征",
"901"
],
"event": [
2,
12930
],
"goto": 0
},
{
"id": 60401,
"heroid": 25001,
"Levelid": 0,
"datas": [
"GameMain",
"功能入口-招募",
"901"
],
"event": [
2,
12870
],
"goto": 0
},
{
"id": 60408,
"heroid": 25001,
"Levelid": 0,
"datas": [
"GameMain",
"功能入口-狩猎",
"901"
],
"event": [
2,
12950
],
"goto": 0
},
{
"id": 60410,
"heroid": 25001,
"Levelid": 0,
"datas": [
"GameMain",
"功能入口-藏书馆",
"901"
],
"event": [
2,
12930
],
"goto": 0
},
{
"id": 60411,
"heroid": 25001,
"Levelid": 0,
"datas": [
"GameMain",
"功能入口-魔药",
"901"
],
"event": [
2,
12870
],
"goto": 0
},
{
"id": 60418,
"heroid": 25001,
"Levelid": 0,
"datas": [
"GameMain",
"功能入口-剧情副本(旧时光)",
"901"
],
"event": [
2,
12950
],
"goto": 0
},
{
"id": 60420,
"heroid": 25001,
"Levelid": 0,
"datas": [
"GameMain",
"功能入口-竞技场",
"901"
],
"event": [
2,
12930
],
"goto": 0
},
{
"id": 60421,
"heroid": 25001,
"Levelid": 0,
"datas": [
"GameMain",
"功能入口-招募",
"901"
],
"event": [
2,
12870
],
"goto": 0
},
{
"id": 60428,
"heroid": 25001,
"Levelid": 0,
"datas": [
"GameMain",
"功能入口-烹饪",
"901"
],
"event": [
2,
12950
],
"goto": 0
},
{
"id": 60430,
"heroid": 25001,
"Levelid": 0,
"datas": [
"GameMain",
"功能入口-浇水拼图",
"901"
],
"event": [
2,
12930
],
"goto": 0
},
{
"id": 60431,
"heroid": 25001,
"Levelid": 0,
"datas": [
"WuGuanScene",
"阿宝",
"137"
],
"event": [
2,
12870
],
"goto": 0
},
{
"id": 60438,
"heroid": 25001,
"Levelid": 0,
"datas": [
"WuGuanScene",
"总教习",
"137"
],
"event": [
2,
12950
],
"goto": 0
}
]

9
bin/json/game_reddot.json
View File

@ -691,14 +691,5 @@
"group": "",
"path": "",
"header": "红点出现：当聊天系统中公会，私聊，跨服，系统存在玩家未接受消息时，触发聊天红点。"
},
{
"id": 29101,
"msg_type": 2,
"show_type": 1,
"count_type": 1,
"group": "",
"path": "",
"header": ""
}
]

4
bin/json/game_ruledesc.json
View File

@ -135,11 +135,11 @@
"id": 10013,
"title": {
"key": "ruledesc_ruledesc_title_13",
"text": "冒险之旅说明"
"text": "冒险关卡说明"
},
"content": {
"key": "ruledesc_ruledesc_content_13",
"text": "这里可以挑战冒险之旅并赢取巨量奖励。"
"text": "这里可以挑战冒险关卡并赢取巨量奖励。"
}
},
{

204
bin/json/game_skillpassive.json
View File

File diff suppressed because it is too large Load Diff

91
bin/json/game_worldall.json
View File

@ -444,96 +444,5 @@
"text": ""
},
"reword": []
},
{
"id": 1270,
"name": {
"key": "worldtask_world_all_name_37",
"text": "日常测试27"
},
"task_icon": "",
"task_txt": {
"key": "",
"text": ""
},
"reword": []
},
{
"id": 1280,
"name": {
"key": "worldtask_world_all_name_38",
"text": "日常测试28"
},
"task_icon": "",
"task_txt": {
"key": "",
"text": ""
},
"reword": []
},
{
"id": 1290,
"name": {
"key": "worldtask_world_all_name_39",
"text": "日常测试29"
},
"task_icon": "",
"task_txt": {
"key": "",
"text": ""
},
"reword": []
},
{
"id": 1300,
"name": {
"key": "worldtask_world_all_name_40",
"text": "日常测试30"
},
"task_icon": "",
"task_txt": {
"key": "",
"text": ""
},
"reword": []
},
{
"id": 1310,
"name": {
"key": "worldtask_world_all_name_41",
"text": "日常测试31"
},
"task_icon": "",
"task_txt": {
"key": "",
"text": ""
},
"reword": []
},
{
"id": 1320,
"name": {
"key": "worldtask_world_all_name_42",
"text": "日常测试32"
},
"task_icon": "",
"task_txt": {
"key": "",
"text": ""
},
"reword": []
},
{
"id": 1330,
"name": {
"key": "worldtask_world_all_name_43",
"text": "日常测试33"
},
"task_icon": "",
"task_txt": {
"key": "",
"text": ""
},
"reword": []
}
]

84
bin/json/game_worldbattle.json
View File

@ -376,89 +376,5 @@
"n": 0
},
"carexe": 500
},
{
"id": 501,
"FormatList": [
700011
],
"BattleReadyID": 126,
"EventList": [],
"playexp": {
"a": "attr",
"t": "exp",
"n": 0
},
"carexe": 500
},
{
"id": 502,
"FormatList": [
700011
],
"BattleReadyID": 126,
"EventList": [],
"playexp": {
"a": "attr",
"t": "exp",
"n": 0
},
"carexe": 500
},
{
"id": 503,
"FormatList": [
700011
],
"BattleReadyID": 126,
"EventList": [],
"playexp": {
"a": "attr",
"t": "exp",
"n": 0
},
"carexe": 500
},
{
"id": 504,
"FormatList": [
700011
],
"BattleReadyID": 126,
"EventList": [],
"playexp": {
"a": "attr",
"t": "exp",
"n": 0
},
"carexe": 500
},
{
"id": 505,
"FormatList": [
700011
],
"BattleReadyID": 126,
"EventList": [],
"playexp": {
"a": "attr",
"t": "exp",
"n": 0
},
"carexe": 500
},
{
"id": 506,
"FormatList": [
700011
],
"BattleReadyID": 126,
"EventList": [],
"playexp": {
"a": "attr",
"t": "exp",
"n": 0
},
"carexe": 500
}
]

38
bin/json/game_worldrd.json
View File

@ -89,7 +89,7 @@
"key": "eventname_6",
"text": "无事发生"
},
"eventweight": 40000,
"eventweight": 1000,
"eventtype": 0,
"battleready": 0,
"battleid": 0,
@ -102,7 +102,7 @@
"key": "eventname_7",
"text": "打怪"
},
"eventweight": 30000,
"eventweight": 1000,
"eventtype": 1,
"battleready": 126,
"battleid": 101011,
@ -111,11 +111,37 @@
{
"id": 8,
"group": 1002,
"eventname": {
"key": "eventname_8",
"text": "打怪"
},
"eventweight": 1000,
"eventtype": 1,
"battleready": 126,
"battleid": 101011,
"getitem": []
},
{
"id": 9,
"group": 1002,
"eventname": {
"key": "eventname_9",
"text": "打怪"
},
"eventweight": 1000,
"eventtype": 1,
"battleready": 126,
"battleid": 101011,
"getitem": []
},
{
"id": 10,
"group": 1002,
"eventname": {
"key": "eventname_10",
"text": "获取金币"
},
"eventweight": 10000,
"eventweight": 1000,
"eventtype": 2,
"battleready": 0,
"battleid": 0,
@ -128,13 +154,13 @@
]
},
{
"id": 9,
"id": 11,
"group": 1002,
"eventname": {
"key": "eventname_11",
"text": "获取金币"
},
"eventweight": 10000,
"eventweight": 1000,
"eventtype": 2,
"battleready": 0,
"battleid": 0,
@ -142,7 +168,7 @@
{
"a": "attr",
"t": "gold",
"n": 44004
"n": 20000
}
]
}

884
bin/json/game_worldtask.json
View File

@ -7252,889 +7252,5 @@
}
],
"module": []
},
{
"key": 100270,
"opencond": "",
"lock": 1,
"lockend": 999,
"ontxe": 0,
"id_after": 0,
"group": 1270,
"exgroup": 110,
"des": 1,
"icon": "25001",
"task_name": {
"key": "worldtask_world_task_task_name_163",
"text": "检查所有可疑点4"
},
"task_details": {
"key": "worldtask_world_task_task_details_163",
"text": "检查所有可疑点4"
},
"npctxt": {
"key": "worldtask_world_task_npctxt_163",
"text": "检查所有可疑点4"
},
"get_item": [],
"trigger": 0,
"npc": 60270,
"completetask": [
50000037
],
"deliver_npc": 60278,
"taskend_removeitem": [],
"auto_accept": 0,
"lock_add": 0,
"reword": [
{
"a": "attr",
"t": "gold",
"n": 5000
},
{
"a": "attr",
"t": "ps",
"n": 10
},
{
"a": "attr",
"t": "diamond",
"n": 10
}
],
"module": []
},
{
"key": 100280,
"opencond": "",
"lock": 1,
"lockend": 999,
"ontxe": 0,
"id_after": 0,
"group": 1280,
"exgroup": 110,
"des": 1,
"icon": "25001",
"task_name": {
"key": "worldtask_world_task_task_name_164",
"text": "检查所有可疑点5"
},
"task_details": {
"key": "worldtask_world_task_task_details_164",
"text": "检查所有可疑点5"
},
"npctxt": {
"key": "worldtask_world_task_npctxt_164",
"text": "检查所有可疑点5"
},
"get_item": [],
"trigger": 0,
"npc": 60280,
"completetask": [
50000038
],
"deliver_npc": 60288,
"taskend_removeitem": [],
"auto_accept": 0,
"lock_add": 0,
"reword": [
{
"a": "attr",
"t": "gold",
"n": 5000
},
{
"a": "attr",
"t": "ps",
"n": 10
},
{
"a": "attr",
"t": "diamond",
"n": 10
}
],
"module": []
},
{
"key": 100290,
"opencond": "",
"lock": 1,
"lockend": 999,
"ontxe": 0,
"id_after": 100300,
"group": 1290,
"exgroup": 110,
"des": 1,
"icon": "25001",
"task_name": {
"key": "worldtask_world_task_task_name_165",
"text": "1号连环第1个"
},
"task_details": {
"key": "worldtask_world_task_task_details_165",
"text": "1号连环第1个"
},
"npctxt": {
"key": "worldtask_world_task_npctxt_165",
"text": "1号连环第1个"
},
"get_item": [],
"trigger": 0,
"npc": 60290,
"completetask": [
50000039
],
"deliver_npc": 60298,
"taskend_removeitem": [],
"auto_accept": 0,
"lock_add": 0,
"reword": [
{
"a": "attr",
"t": "gold",
"n": 5000
},
{
"a": "attr",
"t": "ps",
"n": 10
},
{
"a": "attr",
"t": "diamond",
"n": 10
}
],
"module": []
},
{
"key": 100300,
"opencond": "",
"lock": 1,
"lockend": 999,
"ontxe": 100290,
"id_after": 100310,
"group": 1290,
"exgroup": 110,
"des": 1,
"icon": "25001",
"task_name": {
"key": "worldtask_world_task_task_name_166",
"text": "1号连环第2个"
},
"task_details": {
"key": "worldtask_world_task_task_details_166",
"text": "1号连环第2个"
},
"npctxt": {
"key": "worldtask_world_task_npctxt_166",
"text": "1号连环第2个"
},
"get_item": [],
"trigger": 0,
"npc": 60300,
"completetask": [
50000040
],
"deliver_npc": 60308,
"taskend_removeitem": [],
"auto_accept": 0,
"lock_add": 0,
"reword": [
{
"a": "attr",
"t": "gold",
"n": 5000
},
{
"a": "attr",
"t": "ps",
"n": 10
},
{
"a": "attr",
"t": "diamond",
"n": 10
}
],
"module": []
},
{
"key": 100310,
"opencond": "",
"lock": 1,
"lockend": 999,
"ontxe": 100300,
"id_after": 0,
"group": 1290,
"exgroup": 110,
"des": 1,
"icon": "25001",
"task_name": {
"key": "worldtask_world_task_task_name_167",
"text": "1号连环第3个"
},
"task_details": {
"key": "worldtask_world_task_task_details_167",
"text": "1号连环第3个"
},
"npctxt": {
"key": "worldtask_world_task_npctxt_167",
"text": "1号连环第3个"
},
"get_item": [],
"trigger": 0,
"npc": 60310,
"completetask": [
50000041
],
"deliver_npc": 60318,
"taskend_removeitem": [],
"auto_accept": 0,
"lock_add": 0,
"reword": [
{
"a": "attr",
"t": "gold",
"n": 5000
},
{
"a": "attr",
"t": "ps",
"n": 10
},
{
"a": "attr",
"t": "diamond",
"n": 10
}
],
"module": []
},
{
"key": 100320,
"opencond": "",
"lock": 1,
"lockend": 999,
"ontxe": 0,
"id_after": 100330,
"group": 1300,
"exgroup": 110,
"des": 1,
"icon": "25001",
"task_name": {
"key": "worldtask_world_task_task_name_168",
"text": "2号连环第1个"
},
"task_details": {
"key": "worldtask_world_task_task_details_168",
"text": "2号连环第1个"
},
"npctxt": {
"key": "worldtask_world_task_npctxt_168",
"text": "2号连环第1个"
},
"get_item": [],
"trigger": 0,
"npc": 60320,
"completetask": [
50000042
],
"deliver_npc": 60328,
"taskend_removeitem": [],
"auto_accept": 0,
"lock_add": 0,
"reword": [
{
"a": "attr",
"t": "gold",
"n": 5000
},
{
"a": "attr",
"t": "ps",
"n": 10
},
{
"a": "attr",
"t": "diamond",
"n": 10
}
],
"module": []
},
{
"key": 100330,
"opencond": "",
"lock": 1,
"lockend": 999,
"ontxe": 100320,
"id_after": 100340,
"group": 1300,
"exgroup": 110,
"des": 1,
"icon": "25001",
"task_name": {
"key": "worldtask_world_task_task_name_169",
"text": "2号连环第2个"
},
"task_details": {
"key": "worldtask_world_task_task_details_169",
"text": "2号连环第2个"
},
"npctxt": {
"key": "worldtask_world_task_npctxt_169",
"text": "2号连环第2个"
},
"get_item": [],
"trigger": 0,
"npc": 60330,
"completetask": [
50000043
],
"deliver_npc": 60338,
"taskend_removeitem": [],
"auto_accept": 0,
"lock_add": 0,
"reword": [
{
"a": "attr",
"t": "gold",
"n": 5000
},
{
"a": "attr",
"t": "ps",
"n": 10
},
{
"a": "attr",
"t": "diamond",
"n": 10
}
],
"module": []
},
{
"key": 100340,
"opencond": "",
"lock": 1,
"lockend": 999,
"ontxe": 100330,
"id_after": 0,
"group": 1300,
"exgroup": 110,
"des": 1,
"icon": "25001",
"task_name": {
"key": "worldtask_world_task_task_name_170",
"text": "2号连环第3个"
},
"task_details": {
"key": "worldtask_world_task_task_details_170",
"text": "2号连环第3个"
},
"npctxt": {
"key": "worldtask_world_task_npctxt_170",
"text": "2号连环第3个"
},
"get_item": [],
"trigger": 0,
"npc": 60340,
"completetask": [
50000044
],
"deliver_npc": 60348,
"taskend_removeitem": [],
"auto_accept": 0,
"lock_add": 0,
"reword": [
{
"a": "attr",
"t": "gold",
"n": 5000
},
{
"a": "attr",
"t": "ps",
"n": 10
},
{
"a": "attr",
"t": "diamond",
"n": 10
}
],
"module": []
},
{
"key": 100350,
"opencond": "",
"lock": 1,
"lockend": 999,
"ontxe": 0,
"id_after": 100360,
"group": 1310,
"exgroup": 110,
"des": 1,
"icon": "25001",
"task_name": {
"key": "worldtask_world_task_task_name_171",
"text": "3号连环第1个"
},
"task_details": {
"key": "worldtask_world_task_task_details_171",
"text": "3号连环第1个"
},
"npctxt": {
"key": "worldtask_world_task_npctxt_171",
"text": "3号连环第1个"
},
"get_item": [],
"trigger": 0,
"npc": 60350,
"completetask": [
50000045
],
"deliver_npc": 60358,
"taskend_removeitem": [],
"auto_accept": 0,
"lock_add": 0,
"reword": [
{
"a": "attr",
"t": "gold",
"n": 5000
},
{
"a": "attr",
"t": "ps",
"n": 10
},
{
"a": "attr",
"t": "diamond",
"n": 10
}
],
"module": []
},
{
"key": 100360,
"opencond": "",
"lock": 1,
"lockend": 999,
"ontxe": 100350,
"id_after": 100370,
"group": 1310,
"exgroup": 110,
"des": 1,
"icon": "25001",
"task_name": {
"key": "worldtask_world_task_task_name_172",
"text": "3号连环第2个"
},
"task_details": {
"key": "worldtask_world_task_task_details_172",
"text": "3号连环第2个"
},
"npctxt": {
"key": "worldtask_world_task_npctxt_172",
"text": "3号连环第2个"
},
"get_item": [],
"trigger": 0,
"npc": 60360,
"completetask": [
50000046
],
"deliver_npc": 60368,
"taskend_removeitem": [],
"auto_accept": 0,
"lock_add": 0,
"reword": [
{
"a": "attr",
"t": "gold",
"n": 5000
},
{
"a": "attr",
"t": "ps",
"n": 10
},
{
"a": "attr",
"t": "diamond",
"n": 10
}
],
"module": []
},
{
"key": 100370,
"opencond": "",
"lock": 1,
"lockend": 999,
"ontxe": 100360,
"id_after": 0,
"group": 1310,
"exgroup": 110,
"des": 1,
"icon": "25001",
"task_name": {
"key": "worldtask_world_task_task_name_173",
"text": "3号连环第3个"
},
"task_details": {
"key": "worldtask_world_task_task_details_173",
"text": "3号连环第3个"
},
"npctxt": {
"key": "worldtask_world_task_npctxt_173",
"text": "3号连环第3个"
},
"get_item": [],
"trigger": 0,
"npc": 60370,
"completetask": [
50000047
],
"deliver_npc": 60378,
"taskend_removeitem": [],
"auto_accept": 0,
"lock_add": 0,
"reword": [
{
"a": "attr",
"t": "gold",
"n": 5000
},
{
"a": "attr",
"t": "ps",
"n": 10
},
{
"a": "attr",
"t": "diamond",
"n": 10
}
],
"module": []
},
{
"key": 100380,
"opencond": "",
"lock": 1,
"lockend": 999,
"ontxe": 0,
"id_after": 100390,
"group": 1320,
"exgroup": 110,
"des": 1,
"icon": "25001",
"task_name": {
"key": "worldtask_world_task_task_name_174",
"text": "4号连环第1个"
},
"task_details": {
"key": "worldtask_world_task_task_details_174",
"text": "4号连环第1个"
},
"npctxt": {
"key": "worldtask_world_task_npctxt_174",
"text": "4号连环第1个"
},
"get_item": [],
"trigger": 0,
"npc": 60380,
"completetask": [
50000048
],
"deliver_npc": 60388,
"taskend_removeitem": [],
"auto_accept": 0,
"lock_add": 0,
"reword": [
{
"a": "attr",
"t": "gold",
"n": 5000
},
{
"a": "attr",
"t": "ps",
"n": 10
},
{
"a": "attr",
"t": "diamond",
"n": 10
}
],
"module": []
},
{
"key": 100390,
"opencond": "",
"lock": 1,
"lockend": 999,
"ontxe": 100380,
"id_after": 100400,
"group": 1320,
"exgroup": 110,
"des": 1,
"icon": "25001",
"task_name": {
"key": "worldtask_world_task_task_name_175",
"text": "4号连环第2个"
},
"task_details": {
"key": "worldtask_world_task_task_details_175",
"text": "4号连环第2个"
},
"npctxt": {
"key": "worldtask_world_task_npctxt_175",
"text": "4号连环第2个"
},
"get_item": [],
"trigger": 0,
"npc": 60390,
"completetask": [
50000049
],
"deliver_npc": 60398,
"taskend_removeitem": [],
"auto_accept": 0,
"lock_add": 0,
"reword": [
{
"a": "attr",
"t": "gold",
"n": 5000
},
{
"a": "attr",
"t": "ps",
"n": 10
},
{
"a": "attr",
"t": "diamond",
"n": 10
}
],
"module": []
},
{
"key": 100400,
"opencond": "",
"lock": 1,
"lockend": 999,
"ontxe": 100390,
"id_after": 0,
"group": 1320,
"exgroup": 110,
"des": 1,
"icon": "25001",
"task_name": {
"key": "worldtask_world_task_task_name_176",
"text": "4号连环第3个"
},
"task_details": {
"key": "worldtask_world_task_task_details_176",
"text": "4号连环第3个"
},
"npctxt": {
"key": "worldtask_world_task_npctxt_176",
"text": "4号连环第3个"
},
"get_item": [],
"trigger": 0,
"npc": 60400,
"completetask": [
50000050
],
"deliver_npc": 60408,
"taskend_removeitem": [],
"auto_accept": 0,
"lock_add": 0,
"reword": [
{
"a": "attr",
"t": "gold",
"n": 5000
},
{
"a": "attr",
"t": "ps",
"n": 10
},
{
"a": "attr",
"t": "diamond",
"n": 10
}
],
"module": []
},
{
"key": 100410,
"opencond": "",
"lock": 1,
"lockend": 999,
"ontxe": 0,
"id_after": 100420,
"group": 1330,
"exgroup": 110,
"des": 1,
"icon": "25001",
"task_name": {
"key": "worldtask_world_task_task_name_177",
"text": "5号连环第1个"
},
"task_details": {
"key": "worldtask_world_task_task_details_177",
"text": "5号连环第1个"
},
"npctxt": {
"key": "worldtask_world_task_npctxt_177",
"text": "5号连环第1个"
},
"get_item": [],
"trigger": 0,
"npc": 60410,
"completetask": [
50000051
],
"deliver_npc": 60418,
"taskend_removeitem": [],
"auto_accept": 0,
"lock_add": 0,
"reword": [
{
"a": "attr",
"t": "gold",
"n": 5000
},
{
"a": "attr",
"t": "ps",
"n": 10
},
{
"a": "attr",
"t": "diamond",
"n": 10
}
],
"module": []
},
{
"key": 100420,
"opencond": "",
"lock": 1,
"lockend": 999,
"ontxe": 100410,
"id_after": 100430,
"group": 1330,
"exgroup": 110,
"des": 1,
"icon": "25001",
"task_name": {
"key": "worldtask_world_task_task_name_178",
"text": "5号连环第2个"
},
"task_details": {
"key": "worldtask_world_task_task_details_178",
"text": "5号连环第2个"
},
"npctxt": {
"key": "worldtask_world_task_npctxt_178",
"text": "5号连环第2个"
},
"get_item": [],
"trigger": 0,
"npc": 60420,
"completetask": [
50000052
],
"deliver_npc": 60428,
"taskend_removeitem": [],
"auto_accept": 0,
"lock_add": 0,
"reword": [
{
"a": "attr",
"t": "gold",
"n": 5000
},
{
"a": "attr",
"t": "ps",
"n": 10
},
{
"a": "attr",
"t": "diamond",
"n": 10
}
],
"module": []
},
{
"key": 100430,
"opencond": "",
"lock": 1,
"lockend": 999,
"ontxe": 100420,
"id_after": 0,
"group": 1330,
"exgroup": 110,
"des": 1,
"icon": "25001",
"task_name": {
"key": "worldtask_world_task_task_name_179",
"text": "5号连环第3个"
},
"task_details": {
"key": "worldtask_world_task_task_details_179",
"text": "5号连环第3个"
},
"npctxt": {
"key": "worldtask_world_task_npctxt_179",
"text": "5号连环第3个"
},
"get_item": [],
"trigger": 0,
"npc": 60430,
"completetask": [
50000053
],
"deliver_npc": 60438,
"taskend_removeitem": [],
"auto_accept": 0,
"lock_add": 0,
"reword": [
{
"a": "attr",
"t": "gold",
"n": 5000
},
{
"a": "attr",
"t": "ps",
"n": 10
},
{
"a": "attr",
"t": "diamond",
"n": 10
}
],
"module": []
}
]

2
comm/imodule.go
View File

@ -552,7 +552,7 @@ type (
//校验条件是否达成 返回未完成列表
CheckCondition(uid string, condiIds ...int32) (condis []*pb.ConIProgress, err error)
//激活条件
ActiveCondition(uid string, condiIds ...int32) (err error)
ActiveCondition(uid string, condiIds ...int32) (errdata *pb.ErrorData)
//完成任务并校验接口
FinishConditionAndCheck(uid string, finishcondiIds []int32, condiIds ...int32) (condis []*pb.ConIProgress, err error)
//重置埋点 按类型

23
modules/buried/module.go
View File

@ -87,7 +87,7 @@ func (this *Buried) Rpc_ModuleBuriedTrigger(ctx context.Context, req *pb.Rpc_Mod
}
// 激活数据采集点
func (this *Buried) ActiveCondition(uid string, condiIds ...int32) (err error) {
func (this *Buried) ActiveCondition(uid string, condiIds ...int32) (errdata *pb.ErrorData) {
var (
conf *cfg.GameBuriedCondiData
bdatas *pb.DBBuried
@ -95,8 +95,14 @@ func (this *Buried) ActiveCondition(uid string, condiIds ...int32) (err error) {
bdata *pb.DBBuriedItem
ok bool
chanage bool
err error
)
if model, err = this.modelBuried.getburiedModel(uid); err != nil {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,
Title: pb.ErrorCode_DBError.String(),
Message: err.Error(),
}
return
}
this.Debug("激活埋点!", log.Field{Key: "condiIds", Value: condiIds})
@ -104,6 +110,11 @@ func (this *Buried) ActiveCondition(uid string, condiIds ...int32) (err error) {
err = lock.Lock()
if err != nil {
this.Error("埋点分布式锁失效 err!", log.Field{Key: "uid", Value: uid}, log.Field{Key: "err", Value: err.Error()})
errdata = &pb.ErrorData{
Code: pb.ErrorCode_CacheReadError,
Title: pb.ErrorCode_CacheReadError.String(),
Message: err.Error(),
}
return
}
defer lock.Unlock()
@ -112,6 +123,11 @@ func (this *Buried) ActiveCondition(uid string, condiIds ...int32) (err error) {
continue
}
if conf, err = this.configure.getburiedcondidata(v); err != nil {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ConfigNoFound,
Title: pb.ErrorCode_ConfigNoFound.String(),
Message: err.Error(),
}
return
}
if conf.Rtype != rtype2 { //非接取任务 不处理
@ -119,6 +135,11 @@ func (this *Buried) ActiveCondition(uid string, condiIds ...int32) (err error) {
}
if bdatas == nil { //放在后面 可以减少网络io
if bdatas, err = model.getUserBurieds(uid); err != nil {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,
Title: pb.ErrorCode_DBError.String(),
Message: err.Error(),
}
return
}
}

10
modules/caravan/comp_configure.go
View File

@ -21,7 +21,7 @@ const (
game_caravan_rank = "game_caravanrank.json"
)
///配置管理基础组件
// /配置管理基础组件
type configureComp struct {
modules.MCompConfigure
module *Caravan
@ -30,7 +30,7 @@ type configureComp struct {
overflow int32
}
//组件初始化接口
// 组件初始化接口
func (this *configureComp) Init(service core.IService, module core.IModule, comp core.IModuleComp, options core.IModuleOptions) (err error) {
err = this.MCompConfigure.Init(service, module, comp, options)
this.module = module.(*Caravan)
@ -54,7 +54,7 @@ func (this *configureComp) Init(service core.IService, module core.IModule, comp
this.lock.Unlock()
})
configure.RegisterConfigure(game_caravan_reward, cfg.NewGameCaravanReward, func() {
if v, err := this.GetConfigure(game_caravan_event); err != nil {
if v, err := this.GetConfigure(game_caravan_reward); err != nil {
this.module.Errorf("err:%v", err)
return
} else {
@ -69,7 +69,7 @@ func (this *configureComp) Init(service core.IService, module core.IModule, comp
return
}
//加载多个配置文件
// 加载多个配置文件
func (this *configureComp) LoadMultiConfigure(confs map[string]interface{}) (err error) {
for k, v := range confs {
err = configure.RegisterConfigure(k, v, nil)
@ -81,7 +81,7 @@ func (this *configureComp) LoadMultiConfigure(confs map[string]interface{}) (err
return
}
//读取配置数据
// 读取配置数据
func (this *configureComp) GetConfigure(name string) (v interface{}, err error) {
return configure.GetConfigure(name)
}

17
modules/practice/module.go
View File

@ -458,11 +458,18 @@ func (this *Practice) Reddot(session comm.IUserSession, rid ...comm.ReddotType)
}
break
case comm.Reddot26201:
reddot[comm.Reddot26201] = &pb.ReddotItem{
Rid: int32(comm.Reddot26201),
Activated: true,
Progress: usenum,
Total: totalusenum,
if totalusenum > 0 {
reddot[comm.Reddot26201] = &pb.ReddotItem{
Rid: int32(comm.Reddot26201),
Activated: true,
Progress: usenum,
Total: totalusenum,
}
} else {
reddot[comm.Reddot26201] = &pb.ReddotItem{
Rid: int32(comm.Reddot26201),
Activated: false,
}
}
break
}

1
modules/reddot/core.go Normal file
View File

@ -0,0 +1 @@
package reddot

7
modules/wtask/api_accept.go
View File

@ -70,12 +70,7 @@ func (this *apiComp) Accept(session comm.IUserSession, req *pb.WTaskAcceptReq) (
wtask.Accepts = append(wtask.Accepts, req.Tid)
update["activations"] = wtask.Activations
update["accepts"] = wtask.Accepts
if err = this.module.ModuleBuried.ActiveCondition(session.GetUserId(), conf.Completetask...); err != nil {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ExternalModule,
Title: pb.ErrorCode_ExternalModule.ToString(),
Message: fmt.Sprintf("ModuleBuried.ActiveCondition uid:%s condiIds:%v", session.GetUserId(), conf.Completetask),
}
if errdata = this.module.ModuleBuried.ActiveCondition(session.GetUserId(), conf.Completetask...); err != nil {
return
}

48
modules/wtask/api_finish.go
View File

@ -17,8 +17,8 @@ func (this *apiComp) FinishCheck(session comm.IUserSession, req *pb.WTaskFinishR
// /获取系统公告
func (this *apiComp) Finish(session comm.IUserSession, req *pb.WTaskFinishReq) (errdata *pb.ErrorData) {
var (
conf *cfg.GameWorldTaskData
afterconf *cfg.GameWorldTaskData
conf *cfg.GameWorldTaskData
// afterconf *cfg.GameWorldTaskData
wtask *pb.DBWTask
condis []*pb.ConIProgress
award []*pb.UserAssets
@ -132,28 +132,28 @@ func (this *apiComp) Finish(session comm.IUserSession, req *pb.WTaskFinishReq) (
wtask.Completes = append(wtask.Completes, req.Tid)
}
if conf.Des == 1 && conf.IdAfter != 0 { //日常任务 自动接取下一个
if afterconf, err = this.module.configure.gettaskconfconfigure(conf.IdAfter); err != nil {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ConfigNoFound,
Title: pb.ErrorCode_ConfigNoFound.ToString(),
Message: err.Error(),
}
return
}
// if err = this.module.ModuleBuried.ActiveCondition(session.GetUserId(), afterconf.Completetask...); err != nil {
// errdata = &pb.ErrorData{
// Code: pb.ErrorCode_ExternalModule,
// Title: pb.ErrorCode_ExternalModule.ToString(),
// Message: fmt.Sprintf("ModuleBuried.ActiveCondition uid:%s condiIds:%v", session.GetUserId(), conf.Completetask),
// }
// return
// }
wtask.Activations = append(wtask.Activations, afterconf.Key)
// if _, errdata = this.module.pushtaskprogress(session, wtask, true); errdata != nil {
// return
// }
}
// if conf.Des == 1 && conf.IdAfter != 0 { //日常任务 自动接取下一个
// if afterconf, err = this.module.configure.gettaskconfconfigure(conf.IdAfter); err != nil {
// errdata = &pb.ErrorData{
// Code: pb.ErrorCode_ConfigNoFound,
// Title: pb.ErrorCode_ConfigNoFound.ToString(),
// Message: err.Error(),
// }
// return
// }
// if err = this.module.ModuleBuried.ActiveCondition(session.GetUserId(), afterconf.Completetask...); err != nil {
// errdata = &pb.ErrorData{
// Code: pb.ErrorCode_ExternalModule,
// Title: pb.ErrorCode_ExternalModule.ToString(),
// Message: fmt.Sprintf("ModuleBuried.ActiveCondition uid:%s condiIds:%v", session.GetUserId(), conf.Completetask),
// }
// return
// }
// wtask.Activations = append(wtask.Activations, afterconf.Key)
// if _, errdata = this.module.pushtaskprogress(session, wtask, true); errdata != nil {
// return
// }
// }
this.module.checkgroupState(session, wtask, conf.Group)
session.SendMsg(string(this.module.GetType()), "finish", &pb.WTaskFinishResp{Tid: req.Tid, Award: award, Completes: wtask.Completes, Groups: wtask.Groups})

7
modules/wtask/module.go
View File

@ -768,12 +768,7 @@ func (this *WTask) inquireActivations(session comm.IUserSession, wtask *pb.DBWTa
}
if changeAccept {
if err = this.ModuleBuried.ActiveCondition(session.GetUserId(), condiIds...); err != nil {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ExternalModule,
Title: pb.ErrorCode_ExternalModule.ToString(),
Message: fmt.Sprintf("ModuleBuried.ActiveCondition uid:%s condiIds:%v", session.GetUserId(), condiIds),
}
if errdata = this.ModuleBuried.ActiveCondition(session.GetUserId(), condiIds...); err != nil {
return
}
progress, errdata = this.pushtaskprogress(session, wtask, ispush)