上传任务配置修复

This commit is contained in:
liwei1dao 2023-05-30 14:48:11 +08:00
parent 5915c6363d
commit 53969b4fe8
13 changed files with 3098 additions and 21418 deletions

File diff suppressed because it is too large Load Diff

View File

@ -123,7 +123,9 @@
{
"id": 22,
"insert": 1,
"filter": []
"filter": [
"eq"
]
},
{
"id": 23,
@ -208,7 +210,7 @@
},
{
"id": 35,
"insert": 3,
"insert": 1,
"filter": [
"eq"
]
@ -242,7 +244,7 @@
},
{
"id": 40,
"insert": 3,
"insert": 1,
"filter": [
"gte"
]
@ -382,7 +384,9 @@
{
"id": 61,
"insert": 1,
"filter": []
"filter": [
"eq"
]
},
{
"id": 62,
@ -403,7 +407,8 @@
"id": 65,
"insert": 2,
"filter": [
"eq"
"eq",
"gte"
]
},
{
@ -462,6 +467,7 @@
"id": 75,
"insert": 2,
"filter": [
"eq",
"eq"
]
},
@ -485,7 +491,8 @@
"insert": 1,
"filter": [
"eq",
"lte"
"lte",
"eq"
]
},
{
@ -507,7 +514,7 @@
"id": 81,
"insert": 1,
"filter": [
"eq"
"gte"
]
},
{
@ -634,7 +641,9 @@
{
"id": 103,
"insert": 2,
"filter": []
"filter": [
"eq"
]
},
{
"id": 104,

File diff suppressed because it is too large Load Diff

View File

@ -1,16 +1,16 @@
[
{
"itemid": "600002",
"itemid": "10000008",
"exp": 1000,
"needgold": 10000
},
{
"itemid": "600003",
"itemid": "10000009",
"exp": 2000,
"needgold": 20000
},
{
"itemid": "600004",
"itemid": "10000010",
"exp": 30000,
"needgold": 30000
}

View File

@ -2160,7 +2160,7 @@
"hp": 0,
"atk": 0,
"def": 0,
"speed": 183,
"speed": 70,
"cri": 50,
"cridam": 1500,
"effhit": 0,
@ -2182,7 +2182,7 @@
"hp": 0,
"atk": 0,
"def": 0,
"speed": 183,
"speed": 112,
"cri": 50,
"cridam": 1500,
"effhit": 0,
@ -2204,7 +2204,7 @@
"hp": 0,
"atk": 0,
"def": 0,
"speed": 183,
"speed": 70,
"cri": 50,
"cridam": 1500,
"effhit": 0,
@ -2226,7 +2226,7 @@
"hp": 0,
"atk": 0,
"def": 0,
"speed": 174,
"speed": 100,
"cri": 50,
"cridam": 1500,
"effhit": 0,
@ -2248,7 +2248,7 @@
"hp": 0,
"atk": 0,
"def": 0,
"speed": 193,
"speed": 70,
"cri": 50,
"cridam": 1500,
"effhit": 0,
@ -2270,7 +2270,7 @@
"hp": 0,
"atk": 0,
"def": 0,
"speed": 165,
"speed": 90,
"cri": 50,
"cridam": 1500,
"effhit": 0,
@ -2283,7 +2283,7 @@
"betreadd": 0,
"suckblood": 0,
"hpgrow": 2250,
"atkgrow": 4200,
"atkgrow": 1500,
"defgrow": 1500,
"speedgrow": 0
},
@ -2292,7 +2292,7 @@
"hp": 0,
"atk": 0,
"def": 0,
"speed": 183,
"speed": 95,
"cri": 50,
"cridam": 1500,
"effhit": 0,
@ -2305,7 +2305,7 @@
"betreadd": 0,
"suckblood": 0,
"hpgrow": 1250,
"atkgrow": 4200,
"atkgrow": 2000,
"defgrow": 1250,
"speedgrow": 0
},
@ -2314,7 +2314,7 @@
"hp": 0,
"atk": 0,
"def": 0,
"speed": 183,
"speed": 95,
"cri": 50,
"cridam": 1500,
"effhit": 0,

View File

@ -3,14 +3,14 @@
"id": 11001,
"name": {
"key": "mainchapter_main_chapter_name_1",
"text": "Chapter 1"
"text": "第1章"
},
"chapter_type": 1,
"map": "scenes_worldmap_01 ",
"camera": "",
"title": {
"key": "mainchapter_main_chapter_title_1",
"text": "第1章功夫熊猫"
"text": "功夫熊猫"
},
"desc": {
"key": "mainchapter_main_chapter_desc_1",
@ -22,14 +22,14 @@
"id": 11002,
"name": {
"key": "mainchapter_main_chapter_name_2",
"text": "Chapter 2"
"text": "第2章"
},
"chapter_type": 1,
"map": "scenes_worldmap_01 ",
"camera": "",
"title": {
"key": "mainchapter_main_chapter_title_2",
"text": "第2章疯狂原始人"
"text": "疯狂原始人"
},
"desc": {
"key": "mainchapter_main_chapter_desc_2",
@ -41,14 +41,14 @@
"id": 11003,
"name": {
"key": "mainchapter_main_chapter_name_3",
"text": "Chapter 3"
"text": "第3章"
},
"chapter_type": 1,
"map": "scenes_worldmap_01 ",
"camera": "",
"title": {
"key": "mainchapter_main_chapter_title_3",
"text": "第3章怪物史莱克"
"text": "怪物史莱克"
},
"desc": {
"key": "mainchapter_main_chapter_desc_3",
@ -60,14 +60,14 @@
"id": 11004,
"name": {
"key": "mainchapter_main_chapter_name_4",
"text": "Chapter 4"
"text": "第4章"
},
"chapter_type": 1,
"map": "scenes_worldmap_01 ",
"camera": "",
"title": {
"key": "mainchapter_main_chapter_title_4",
"text": "第4章乌龟大师"
"text": "乌龟大师"
},
"desc": {
"key": "mainchapter_main_chapter_desc_4",
@ -79,14 +79,14 @@
"id": 11005,
"name": {
"key": "mainchapter_main_chapter_name_5",
"text": "Chapter 5"
"text": "第5章"
},
"chapter_type": 1,
"map": "scenes_worldmap_01 ",
"camera": "",
"title": {
"key": "mainchapter_main_chapter_title_5",
"text": "第5章激烈战斗"
"text": "激烈战斗"
},
"desc": {
"key": "mainchapter_main_chapter_desc_5",
@ -98,14 +98,14 @@
"id": 11006,
"name": {
"key": "mainchapter_main_chapter_name_6",
"text": "Chapter 6"
"text": "第6章"
},
"chapter_type": 1,
"map": "scenes_worldmap_01 ",
"camera": "",
"title": {
"key": "mainchapter_main_chapter_title_6",
"text": "第6章下山"
"text": "下山"
},
"desc": {
"key": "mainchapter_main_chapter_desc_6",
@ -117,14 +117,14 @@
"id": 11007,
"name": {
"key": "mainchapter_main_chapter_name_7",
"text": "Chapter 7"
"text": "第7章"
},
"chapter_type": 1,
"map": "scenes_worldmap_01 ",
"camera": "",
"title": {
"key": "mainchapter_main_chapter_title_7",
"text": "第7章事件余波"
"text": "事件余波"
},
"desc": {
"key": "mainchapter_main_chapter_desc_7",
@ -136,14 +136,14 @@
"id": 11008,
"name": {
"key": "mainchapter_main_chapter_name_8",
"text": "Chapter 8"
"text": "第8章"
},
"chapter_type": 1,
"map": "scenes_worldmap_01 ",
"camera": "",
"title": {
"key": "mainchapter_main_chapter_title_8",
"text": "第8章乌龟大师"
"text": "乌龟大师"
},
"desc": {
"key": "mainchapter_main_chapter_desc_8",
@ -155,14 +155,14 @@
"id": 11009,
"name": {
"key": "mainchapter_main_chapter_name_9",
"text": "Chapter 9"
"text": "第9章"
},
"chapter_type": 1,
"map": "scenes_worldmap_01 ",
"camera": "",
"title": {
"key": "mainchapter_main_chapter_title_9",
"text": "第9章太狼来袭"
"text": "太狼来袭"
},
"desc": {
"key": "mainchapter_main_chapter_desc_9",
@ -174,14 +174,14 @@
"id": 11010,
"name": {
"key": "mainchapter_main_chapter_name_10",
"text": "Chapter 10"
"text": "第10章"
},
"chapter_type": 1,
"map": "scenes_worldmap_01 ",
"camera": "",
"title": {
"key": "mainchapter_main_chapter_title_10",
"text": "第10章乌龟大师"
"text": "乌龟大师"
},
"desc": {
"key": "mainchapter_main_chapter_desc_10",
@ -193,14 +193,14 @@
"id": 11011,
"name": {
"key": "mainchapter_main_chapter_name_11",
"text": "Chapter 11"
"text": "第11章"
},
"chapter_type": 1,
"map": "scenes_worldmap_01 ",
"camera": "",
"title": {
"key": "mainchapter_main_chapter_title_11",
"text": "第11章太狼来袭"
"text": "太狼来袭"
},
"desc": {
"key": "mainchapter_main_chapter_desc_11",
@ -212,14 +212,14 @@
"id": 11012,
"name": {
"key": "mainchapter_main_chapter_name_12",
"text": "Chapter 12"
"text": "第12章"
},
"chapter_type": 1,
"map": "scenes_worldmap_01 ",
"camera": "",
"title": {
"key": "mainchapter_main_chapter_title_12",
"text": "第12章乌龟大师"
"text": "乌龟大师"
},
"desc": {
"key": "mainchapter_main_chapter_desc_12",
@ -231,14 +231,14 @@
"id": 12001,
"name": {
"key": "mainchapter_main_chapter_name_13",
"text": "Chapter 1"
"text": "第1章"
},
"chapter_type": 2,
"map": "scenes_worldmap_01",
"camera": "",
"title": {
"key": "mainchapter_main_chapter_title_13",
"text": "第1章功夫世界"
"text": "功夫世界"
},
"desc": {
"key": "mainchapter_main_chapter_desc_13",
@ -250,14 +250,14 @@
"id": 12002,
"name": {
"key": "mainchapter_main_chapter_name_14",
"text": "Chapter 2"
"text": "第2章"
},
"chapter_type": 2,
"map": "scenes_worldmap_01",
"camera": "",
"title": {
"key": "mainchapter_main_chapter_title_14",
"text": "第2章练功房"
"text": "练功房"
},
"desc": {
"key": "mainchapter_main_chapter_desc_14",
@ -269,14 +269,14 @@
"id": 12003,
"name": {
"key": "mainchapter_main_chapter_name_15",
"text": "Chapter 3"
"text": "第3章"
},
"chapter_type": 2,
"map": "scenes_worldmap_01",
"camera": "",
"title": {
"key": "mainchapter_main_chapter_title_15",
"text": "第3章太狼来袭"
"text": "太狼来袭"
},
"desc": {
"key": "mainchapter_main_chapter_desc_15",
@ -288,14 +288,14 @@
"id": 12004,
"name": {
"key": "mainchapter_main_chapter_name_16",
"text": "Chapter 4"
"text": "第4章"
},
"chapter_type": 2,
"map": "scenes_worldmap_01",
"camera": "",
"title": {
"key": "mainchapter_main_chapter_title_16",
"text": "第4章乌龟大师"
"text": "乌龟大师"
},
"desc": {
"key": "mainchapter_main_chapter_desc_16",
@ -307,14 +307,14 @@
"id": 12005,
"name": {
"key": "mainchapter_main_chapter_name_17",
"text": "Chapter 5"
"text": "第5章"
},
"chapter_type": 2,
"map": "scenes_worldmap_01",
"camera": "",
"title": {
"key": "mainchapter_main_chapter_title_17",
"text": "第5章激烈战斗"
"text": "激烈战斗"
},
"desc": {
"key": "mainchapter_main_chapter_desc_17",
@ -326,14 +326,14 @@
"id": 12006,
"name": {
"key": "mainchapter_main_chapter_name_18",
"text": "Chapter 6"
"text": "第6章"
},
"chapter_type": 2,
"map": "scenes_worldmap_01",
"camera": "",
"title": {
"key": "mainchapter_main_chapter_title_18",
"text": "第6章下山"
"text": "下山"
},
"desc": {
"key": "mainchapter_main_chapter_desc_18",
@ -345,14 +345,14 @@
"id": 12007,
"name": {
"key": "mainchapter_main_chapter_name_19",
"text": "Chapter 7"
"text": "第7章"
},
"chapter_type": 2,
"map": "scenes_worldmap_01",
"camera": "",
"title": {
"key": "mainchapter_main_chapter_title_19",
"text": "第7章事件余波"
"text": "事件余波"
},
"desc": {
"key": "mainchapter_main_chapter_desc_19",
@ -364,14 +364,14 @@
"id": 12008,
"name": {
"key": "mainchapter_main_chapter_name_20",
"text": "Chapter 8"
"text": "第8章"
},
"chapter_type": 2,
"map": "scenes_worldmap_01",
"camera": "",
"title": {
"key": "mainchapter_main_chapter_title_20",
"text": "第8章乌龟大师"
"text": "乌龟大师"
},
"desc": {
"key": "mainchapter_main_chapter_desc_20",
@ -383,14 +383,14 @@
"id": 12009,
"name": {
"key": "mainchapter_main_chapter_name_21",
"text": "Chapter 9"
"text": "第9章"
},
"chapter_type": 2,
"map": "scenes_worldmap_01",
"camera": "",
"title": {
"key": "mainchapter_main_chapter_title_21",
"text": "第9章太狼来袭"
"text": "太狼来袭"
},
"desc": {
"key": "mainchapter_main_chapter_desc_21",
@ -402,14 +402,14 @@
"id": 12010,
"name": {
"key": "mainchapter_main_chapter_name_22",
"text": "Chapter 10"
"text": "第10章"
},
"chapter_type": 2,
"map": "scenes_worldmap_01",
"camera": "",
"title": {
"key": "mainchapter_main_chapter_title_22",
"text": "第10章乌龟大师"
"text": "乌龟大师"
},
"desc": {
"key": "mainchapter_main_chapter_desc_22",
@ -421,14 +421,14 @@
"id": 12011,
"name": {
"key": "mainchapter_main_chapter_name_23",
"text": "Chapter 11"
"text": "第11章"
},
"chapter_type": 2,
"map": "scenes_worldmap_01",
"camera": "",
"title": {
"key": "mainchapter_main_chapter_title_23",
"text": "第11章太狼来袭"
"text": "太狼来袭"
},
"desc": {
"key": "mainchapter_main_chapter_desc_23",
@ -440,14 +440,14 @@
"id": 12012,
"name": {
"key": "mainchapter_main_chapter_name_24",
"text": "Chapter 12"
"text": "第12章"
},
"chapter_type": 2,
"map": "scenes_worldmap_01",
"camera": "",
"title": {
"key": "mainchapter_main_chapter_title_24",
"text": "第12章乌龟大师"
"text": "乌龟大师"
},
"desc": {
"key": "mainchapter_main_chapter_desc_24",

View File

@ -22,22 +22,22 @@
"item": [
{
"a": "item",
"t": "50001",
"t": "10000008",
"n": 5
},
{
"a": "item",
"t": "50002",
"t": "10000009",
"n": 5
},
{
"a": "item",
"t": "50003",
"t": "10000010",
"n": 5
},
{
"a": "item",
"t": "50004",
"t": "10000011",
"n": 5
}
]
@ -59,17 +59,17 @@
"item": [
{
"a": "item",
"t": "50005",
"t": "10000008",
"n": 5
},
{
"a": "item",
"t": "50006",
"t": "10000009",
"n": 5
},
{
"a": "item",
"t": "50003",
"t": "10000010",
"n": 5
}
]

View File

@ -3312,7 +3312,7 @@
800,
1,
5,
1000
1500
],
"FollowSK": [],
"SucFollowSK": [
@ -3364,7 +3364,7 @@
800,
1,
5,
1100
1600
],
"FollowSK": [],
"SucFollowSK": [
@ -3416,7 +3416,7 @@
800,
1,
5,
1200
1700
],
"FollowSK": [],
"SucFollowSK": [
@ -3468,7 +3468,7 @@
800,
1,
5,
1300
1800
],
"FollowSK": [],
"SucFollowSK": [
@ -3520,7 +3520,7 @@
800,
1,
5,
1300
1900
],
"FollowSK": [],
"SucFollowSK": [
@ -3686,7 +3686,7 @@
"Argu": [
1,
5,
900
2700
],
"FollowSK": [],
"SucFollowSK": [],
@ -3826,7 +3826,7 @@
"Argu": [
1,
5,
1400
2750
],
"FollowSK": [],
"SucFollowSK": [],
@ -3966,7 +3966,7 @@
"Argu": [
1,
5,
1600
2800
],
"FollowSK": [],
"SucFollowSK": [],
@ -4106,7 +4106,7 @@
"Argu": [
1,
5,
1400
2850
],
"FollowSK": [],
"SucFollowSK": [],
@ -4246,7 +4246,7 @@
"Argu": [
1,
5,
1400
2900
],
"FollowSK": [],
"SucFollowSK": [],
@ -4320,7 +4320,7 @@
800,
1,
5,
1100
3100
],
"FollowSK": [],
"SucFollowSK": [],
@ -4346,7 +4346,7 @@
800,
1,
5,
1200
3200
],
"FollowSK": [],
"SucFollowSK": [],
@ -4372,7 +4372,7 @@
800,
1,
5,
1300
3300
],
"FollowSK": [],
"SucFollowSK": [],
@ -4398,7 +4398,7 @@
800,
1,
5,
1400
3400
],
"FollowSK": [],
"SucFollowSK": [],
@ -5226,7 +5226,7 @@
"Argu": [
1,
4,
1600
3600
],
"FollowSK": [],
"SucFollowSK": [
@ -5248,12 +5248,12 @@
"Where": [],
"Order": "Type=Rand",
"Limit": 2,
"ExecuteCnt": 1,
"ExecuteCnt": 2,
"Type": 1,
"Argu": [
1,
4,
900
1800
],
"FollowSK": [],
"SucFollowSK": [
@ -5304,13 +5304,13 @@
"Order": "",
"Limit": 2,
"ExecuteCnt": 1,
"Type": 17,
"Type": 23,
"Argu": [
1,
4,
500,
2,
1,
2,
50
],
"FollowSK": [],
@ -5360,7 +5360,7 @@
"Argu": [
1,
4,
1650
3700
],
"FollowSK": [],
"SucFollowSK": [],
@ -5378,12 +5378,12 @@
"Where": [],
"Order": "Type=Rand",
"Limit": 2,
"ExecuteCnt": 1,
"ExecuteCnt": 2,
"Type": 1,
"Argu": [
1,
4,
600
1900
],
"FollowSK": [],
"SucFollowSK": [],
@ -5406,7 +5406,7 @@
"Argu": [
1,
4,
1700
3800
],
"FollowSK": [],
"SucFollowSK": [],
@ -5424,12 +5424,12 @@
"Where": [],
"Order": "Type=Rand",
"Limit": 2,
"ExecuteCnt": 1,
"ExecuteCnt": 2,
"Type": 1,
"Argu": [
1,
4,
700
2000
],
"FollowSK": [],
"SucFollowSK": [],
@ -5452,7 +5452,7 @@
"Argu": [
1,
4,
1750
3900
],
"FollowSK": [],
"SucFollowSK": [],
@ -5470,12 +5470,12 @@
"Where": [],
"Order": "Type=Rand",
"Limit": 2,
"ExecuteCnt": 1,
"ExecuteCnt": 2,
"Type": 1,
"Argu": [
1,
4,
700
2100
],
"FollowSK": [],
"SucFollowSK": [],
@ -5498,7 +5498,7 @@
"Argu": [
1,
4,
1800
4000
],
"FollowSK": [],
"SucFollowSK": [],
@ -5516,12 +5516,12 @@
"Where": [],
"Order": "Type=Rand",
"Limit": 2,
"ExecuteCnt": 1,
"ExecuteCnt": 2,
"Type": 1,
"Argu": [
1,
4,
800
2200
],
"FollowSK": [],
"SucFollowSK": [],
@ -5544,7 +5544,7 @@
"Argu": [
1,
4,
1850
4100
],
"FollowSK": [],
"SucFollowSK": [],
@ -5562,12 +5562,12 @@
"Where": [],
"Order": "Type=Rand",
"Limit": 2,
"ExecuteCnt": 1,
"ExecuteCnt": 2,
"Type": 1,
"Argu": [
1,
4,
800
2300
],
"FollowSK": [],
"SucFollowSK": [],
@ -5590,7 +5590,7 @@
"Argu": [
1,
4,
1900
5100
],
"FollowSK": [],
"SucFollowSK": [],
@ -5637,7 +5637,7 @@
"Argu": [
1,
4,
2500
5200
],
"FollowSK": [],
"SucFollowSK": [],
@ -5660,7 +5660,7 @@
"Argu": [
1,
4,
2600
5300
],
"FollowSK": [],
"SucFollowSK": [],
@ -5683,7 +5683,7 @@
"Argu": [
1,
4,
2700
5400
],
"FollowSK": [],
"SucFollowSK": [],
@ -5778,7 +5778,7 @@
"Argu": [
1,
4,
1400
2500
],
"FollowSK": [],
"SucFollowSK": [],
@ -5801,7 +5801,7 @@
"Argu": [
1,
4,
1450
2600
],
"FollowSK": [],
"SucFollowSK": [],
@ -5824,7 +5824,7 @@
"Argu": [
1,
4,
1500
2700
],
"FollowSK": [],
"SucFollowSK": [],
@ -10636,7 +10636,7 @@
"Argu": [
1,
4,
500
1500
],
"FollowSK": [],
"SucFollowSK": [
@ -10706,7 +10706,7 @@
"Argu": [
1,
4,
550
1650
],
"FollowSK": [],
"SucFollowSK": [
@ -10752,7 +10752,7 @@
"Argu": [
1,
4,
550
1800
],
"FollowSK": [],
"SucFollowSK": [
@ -10798,7 +10798,7 @@
"Argu": [
1,
4,
600
1950
],
"FollowSK": [],
"SucFollowSK": [
@ -10844,7 +10844,7 @@
"Argu": [
1,
4,
700
2100
],
"FollowSK": [],
"SucFollowSK": [
@ -10937,7 +10937,7 @@
"Argu": [
1,
4,
750
2250
],
"FollowSK": [],
"SucFollowSK": [
@ -10986,7 +10986,7 @@
"Argu": [
1,
4,
800
2350
],
"FollowSK": [],
"SucFollowSK": [
@ -11035,7 +11035,7 @@
"Argu": [
1,
4,
800
2450
],
"FollowSK": [],
"SucFollowSK": [
@ -11084,7 +11084,7 @@
"Argu": [
1,
4,
900
2550
],
"FollowSK": [],
"SucFollowSK": [
@ -11133,7 +11133,7 @@
"Argu": [
1,
4,
500
2650
],
"FollowSK": [
214003351,
@ -11182,7 +11182,7 @@
"Argu": [
1,
4,
550
2750
],
"FollowSK": [
214003351,
@ -11231,7 +11231,7 @@
"Argu": [
1,
4,
550
2850
],
"FollowSK": [
214003351,
@ -11280,7 +11280,7 @@
"Argu": [
1,
4,
600
2950
],
"FollowSK": [
214003351,
@ -11330,7 +11330,7 @@
1,
4,
6,
33
100
],
"FollowSK": [],
"SucFollowSK": [],
@ -14323,7 +14323,7 @@
"Argu": [
1,
4,
1000
3000
],
"FollowSK": [],
"SucFollowSK": [],
@ -14394,10 +14394,10 @@
"Argu": [
1,
4,
1500,
3000,
1,
4,
1500
3000
],
"FollowSK": [],
"SucFollowSK": [
@ -14422,7 +14422,7 @@
"Argu": [
1,
4,
1000
3000
],
"FollowSK": [],
"SucFollowSK": [
@ -14468,7 +14468,7 @@
"Argu": [
1,
4,
450
1350
],
"FollowSK": [],
"SucFollowSK": [
@ -14542,7 +14542,7 @@
"Argu": [
1,
4,
450
1350
],
"FollowSK": [],
"SucFollowSK": [
@ -14618,7 +14618,7 @@
"Argu": [
1,
4,
1200
3600
],
"FollowSK": [],
"SucFollowSK": [],
@ -16275,7 +16275,7 @@
"Argu": [
1,
4,
1200
3600
],
"FollowSK": [],
"SucFollowSK": [],
@ -16348,7 +16348,7 @@
"Argu": [
1,
4,
1200
3600
],
"FollowSK": [],
"SucFollowSK": [],
@ -16421,7 +16421,7 @@
"Argu": [
1,
4,
2100
6300
],
"FollowSK": [],
"SucFollowSK": [],
@ -16470,7 +16470,7 @@
"Argu": [
1,
4,
2600
8000
],
"FollowSK": [],
"SucFollowSK": [
@ -16542,7 +16542,7 @@
"Argu": [
1,
4,
1100
3300
],
"FollowSK": [],
"SucFollowSK": [
@ -16616,7 +16616,7 @@
"Argu": [
1,
4,
400
1200
],
"FollowSK": [],
"SucFollowSK": [
@ -16665,7 +16665,7 @@
"Argu": [
1,
4,
1800
5400
],
"FollowSK": [],
"SucFollowSK": [
@ -16935,7 +16935,7 @@
"Argu": [
1,
4,
1200
3600
],
"FollowSK": [],
"SucFollowSK": [
@ -16984,7 +16984,7 @@
"Argu": [
1,
4,
1000
2000
],
"FollowSK": [],
"SucFollowSK": [
@ -17009,7 +17009,7 @@
"Argu": [
1,
4,
1000
2000
],
"FollowSK": [],
"SucFollowSK": [
@ -18245,7 +18245,7 @@
"Argu": [
1,
4,
700
2100
],
"FollowSK": [
214005112
@ -18293,7 +18293,7 @@
"Argu": [
1,
4,
1500
2250
],
"FollowSK": [],
"SucFollowSK": [
@ -19182,7 +19182,7 @@
"Argu": [
1,
4,
1300
3900
],
"FollowSK": [
215002112,
@ -19376,7 +19376,7 @@
"Argu": [
1,
4,
1200
4000
],
"FollowSK": [],
"SucFollowSK": [],
@ -19729,7 +19729,7 @@
"Argu": [
1,
4,
1100
3300
],
"FollowSK": [],
"SucFollowSK": [],
@ -19798,7 +19798,7 @@
"Argu": [
1,
4,
550
1650
],
"FollowSK": [
224009212
@ -19915,7 +19915,7 @@
"Argu": [
1,
4,
450
1350
],
"FollowSK": [],
"SucFollowSK": [],
@ -20009,7 +20009,7 @@
"Argu": [
1,
4,
1300
3900
],
"FollowSK": [],
"SucFollowSK": [],
@ -20076,7 +20076,7 @@
"Argu": [
1,
4,
700
2100
],
"FollowSK": [
224001212,
@ -20144,7 +20144,7 @@
"Argu": [
1,
4,
250
750
],
"FollowSK": [],
"SucFollowSK": [],
@ -20167,7 +20167,7 @@
"Argu": [
1,
4,
400
1200
],
"FollowSK": [
224001314
@ -21252,7 +21252,7 @@
"Argu": [
1,
4,
3000
6000
],
"FollowSK": [
255005112
@ -21336,7 +21336,7 @@
{
"Id": 255005213,
"EmitPR": 1000,
"From": 3,
"From": 0,
"Where": [],
"Order": "",
"Limit": 1,
@ -21344,12 +21344,10 @@
"Type": 2,
"Argu": [
455005213,
1,
0
],
"FollowSK": [
255005214
-1,
-1
],
"FollowSK": [],
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false,
@ -21371,7 +21369,7 @@
390001446,
1000,
1,
1
-1
],
"FollowSK": [],
"SucFollowSK": [],
@ -21394,7 +21392,7 @@
"Argu": [
1,
4,
8000
12000
],
"FollowSK": [
255005312
@ -21421,7 +21419,7 @@
"Argu": [
1,
4,
12000
20000
],
"FollowSK": [
255005313

View File

@ -323,7 +323,7 @@
},
"BuffType": 30,
"EffectArgu": [
14,
-1,
100
],
"BufParNum": 1,
@ -2790,7 +2790,7 @@
},
"BuffType": 30,
"EffectArgu": [
14,
-1,
500
],
"BufParNum": 1,
@ -2882,7 +2882,7 @@
},
"BuffType": 30,
"EffectArgu": [
14,
-1,
1000
],
"BufParNum": 1,
@ -2913,7 +2913,7 @@
},
"BuffType": 30,
"EffectArgu": [
14,
-1,
200
],
"BufParNum": 1,
@ -3233,7 +3233,7 @@
},
"BuffType": 30,
"EffectArgu": [
14,
-1,
100
],
"BufParNum": 1,
@ -3911,12 +3911,12 @@
},
"Desc": {
"key": "skill_skill_buff_Desc_131",
"text": "造成伤害提升2%"
"text": "造成伤害提升50%"
},
"BuffType": 30,
"EffectArgu": [
14,
20
-1,
500
],
"BufParNum": 1,
"RelyCheckArgu": [],

View File

@ -1528,7 +1528,7 @@
},
{
"Id": 455005213,
"When": 15,
"When": 21,
"FromCheck": "Target=3",
"TargetCheck": "Target=2",
"MainSkillCheck": "",

View File

@ -66,9 +66,12 @@ func (this *configureComp) checkconfig() (err error) {
}
}
} else {
this.module.Error("未配置埋点类型!",
log.Field{Key: "vtype", Value: int32(k)},
)
for _, cond := range conids {
this.module.Error("未配置埋点类型!",
log.Field{Key: "vtype", Value: int32(k)},
log.Field{Key: "cond", Value: cond.Id},
)
}
}
}
return

View File

@ -1,9 +1,11 @@
package buried
import (
"fmt"
"go_dreamfactory/comm"
"go_dreamfactory/lego/core"
"go_dreamfactory/lego/sys/mgo"
"go_dreamfactory/lego/sys/redis"
"go_dreamfactory/modules"
"go_dreamfactory/pb"
@ -51,6 +53,10 @@ func (this *modelBuried) updateUserBurieds(uid string, bdatas []*pb.DBBuried) (e
return
}
func (this *modelBuried) userlock(uid string) (result *redis.RedisMutex, err error) {
return this.DBModel.Redis.NewRedisMutex(fmt.Sprintf("ulockburied:%s", uid))
}
//更新埋点数据到db中
// func (this *modelBuried) getburiedModel(uid string) (model *buriedModel, err error) {
// var m *db.DBModel

View File

@ -226,6 +226,14 @@ func (this *Buried) trigger(uid string, burieds ...*pb.BuriedParam) {
)
this.Debug("触发埋点!", log.Field{Key: "burieds", Value: burieds})
lock, _ := this.modelBuried.userlock(uid)
err = lock.Lock()
if err != nil {
this.Error("埋点分布式锁失效 err!", log.Field{Key: "uid", Value: uid}, log.Field{Key: "err", Value: err.Error()})
return
}
defer lock.Unlock()
for _, buried := range burieds {
conds := this.configure.getCondiDatas(buried.TaskType)
if bconf, err = this.configure.getburiedtypedata(buried.TaskType); err != nil {