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

上传任务配置修复

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1472
bin/json/game_buriedcondi.json
View File

File diff suppressed because it is too large Load Diff

25
bin/json/game_buriedtype.json
View File

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

22682
bin/json/game_heroawaken.json
View File

File diff suppressed because it is too large Load Diff

6
bin/json/game_heroexp.json
View File

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

20
bin/json/game_herolevelgrow.json
View File

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

96
bin/json/game_mainchapter.json
View File

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

14
bin/json/game_paypackage.json
View File

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

184
bin/json/game_skillafteratk.json
View File

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

16
bin/json/game_skillbuff.json
View File

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

2
bin/json/game_skillpassive.json
View File

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

3
modules/buried/configure.go
View File

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

6
modules/buried/modelburied.go
View File

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

8
modules/buried/module.go
View File

@ -226,6 +226,14 @@ func (this *Buried) trigger(uid string, burieds ...*pb.BuriedParam) {
) )
this.Debug("触发埋点!", log.Field{Key: "burieds", Value: burieds}) 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 { for _, buried := range burieds {
conds := this.configure.getCondiDatas(buried.TaskType) conds := this.configure.getCondiDatas(buried.TaskType)
if bconf, err = this.configure.getburiedtypedata(buried.TaskType); err != nil { if bconf, err = this.configure.getburiedtypedata(buried.TaskType); err != nil {