Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev
This commit is contained in:
commit
cf41baf481
File diff suppressed because it is too large
Load Diff
@ -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
@ -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
|
||||
}
|
||||
|
||||
@ -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,
|
||||
|
||||
@ -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",
|
||||
|
||||
@ -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
|
||||
}
|
||||
]
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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": [],
|
||||
|
||||
@ -1528,7 +1528,7 @@
|
||||
},
|
||||
{
|
||||
"Id": 455005213,
|
||||
"When": 15,
|
||||
"When": 21,
|
||||
"FromCheck": "Target=3",
|
||||
"TargetCheck": "Target=2",
|
||||
"MainSkillCheck": "",
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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 {
|
||||
|
||||
@ -154,9 +154,7 @@ func (this *modelHoroscope) reddot(session comm.IUserSession) bool {
|
||||
}
|
||||
|
||||
for _, v := range horoscope.GetDataList() {
|
||||
|
||||
if lv, ok := info.Nodes[v.NodeId]; !ok && v.Lv > lv {
|
||||
|
||||
if code = this.module.CheckRes(session, v.CostItem); code == pb.ErrorCode_Success {
|
||||
return true
|
||||
}
|
||||
|
||||
@ -318,21 +318,21 @@ func (this *ModuleBase) CheckRes(session comm.IUserSession, res []*cfg.Gameatn)
|
||||
case comm.ItemType:
|
||||
items[v.T] = v.N
|
||||
default:
|
||||
this.Errorf("not found res type") // 找不到资源类型
|
||||
this.Error("not found res type", log.Field{Key: "Type", Value: v.A}) // 找不到资源类型
|
||||
}
|
||||
}
|
||||
// 校验数量
|
||||
for k, v := range attrs {
|
||||
if this.ModuleUser.QueryAttributeValue(session.GetUserId(), k) < int64(v) {
|
||||
code = pb.ErrorCode_ResNoEnough
|
||||
this.Warn("资源不足", log.Field{Key: "uid", Value: session.GetUserId()}, log.Field{Key: "T", Value: k}, log.Field{Key: "N", Value: v})
|
||||
// this.Warn("资源不足", log.Field{Key: "uid", Value: session.GetUserId()}, log.Field{Key: "T", Value: k}, log.Field{Key: "N", Value: v})
|
||||
return
|
||||
}
|
||||
}
|
||||
for k, v := range items { //校验消费资源是否充足
|
||||
if int32(this.ModuleItems.QueryItemAmount(session.GetUserId(), k)) < v {
|
||||
code = pb.ErrorCode_ResNoEnough
|
||||
this.Warn("道具不足", log.Field{Key: "uid", Value: session.GetUserId()}, log.Field{Key: "T", Value: k}, log.Field{Key: "N", Value: v})
|
||||
// this.Warn("道具不足", log.Field{Key: "uid", Value: session.GetUserId()}, log.Field{Key: "T", Value: k}, log.Field{Key: "N", Value: v})
|
||||
return
|
||||
}
|
||||
}
|
||||
|
||||
@ -46,7 +46,8 @@ const (
|
||||
)
|
||||
|
||||
const (
|
||||
SociatyNoFound = "未找到该玩家的公会"
|
||||
SociatyNoFound = "The user's guild was not found"
|
||||
SociatyNoRight = "no operation permission"
|
||||
)
|
||||
|
||||
type apiComp struct {
|
||||
|
||||
@ -32,6 +32,7 @@ func (this *apiComp) Accuse(session comm.IUserSession, req *pb.SociatyAccuseReq)
|
||||
pb.SociatyJob_ADMIN,
|
||||
pb.SociatyJob_MEMBER) {
|
||||
code = pb.ErrorCode_SociatyNoRight
|
||||
data.Message = SociatyNoRight
|
||||
return
|
||||
}
|
||||
|
||||
@ -43,9 +44,11 @@ func (this *apiComp) Accuse(session comm.IUserSession, req *pb.SociatyAccuseReq)
|
||||
} else {
|
||||
code = pb.ErrorCode_DBError
|
||||
}
|
||||
data.Datastring = sociaty.Id
|
||||
this.module.Error("弹劾",
|
||||
log.Field{Key: "uid", Value: uid},
|
||||
log.Field{Key: "sociatyId", Value: sociaty.Id},
|
||||
log.Field{Key: "err", Value: err.Error()},
|
||||
)
|
||||
return
|
||||
}
|
||||
|
||||
@ -2,7 +2,6 @@ package sociaty
|
||||
|
||||
import (
|
||||
"go_dreamfactory/comm"
|
||||
"go_dreamfactory/lego/sys/log"
|
||||
"go_dreamfactory/pb"
|
||||
)
|
||||
|
||||
@ -17,7 +16,8 @@ func (this *apiComp) Activitylist(session comm.IUserSession, req *pb.SociatyActi
|
||||
sociaty := this.module.modelSociaty.getUserSociaty(uid)
|
||||
if sociaty == nil {
|
||||
code = pb.ErrorCode_SociatyNoFound
|
||||
this.module.Error("当前玩家所在的公会未找到", log.Field{Key: "uid", Value: uid})
|
||||
data.Datastring = uid
|
||||
data.Message = SociatyNoFound
|
||||
return
|
||||
}
|
||||
|
||||
|
||||
@ -1,6 +1,7 @@
|
||||
package sociaty
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"go_dreamfactory/comm"
|
||||
"go_dreamfactory/lego/sys/log"
|
||||
"go_dreamfactory/pb"
|
||||
@ -48,13 +49,8 @@ func (this *apiComp) Activityreceive(session comm.IUserSession, req *pb.SociatyA
|
||||
//是否满足领取条件
|
||||
if sociaty.Activity < conf.Activity {
|
||||
code = pb.ErrorCode_SociatyActivityNoEnough
|
||||
this.module.Debug("活跃度不足",
|
||||
log.Field{Key: "uid", Value: uid},
|
||||
log.Field{Key: "sociatyId", Value: sociaty.Id},
|
||||
log.Field{Key: "confId", Value: req.Id},
|
||||
log.Field{Key: "实际活跃度", Value: sociaty.Activity},
|
||||
log.Field{Key: "期望活跃度", Value: conf.Activity},
|
||||
)
|
||||
data.Datastring = uid
|
||||
data.Message = fmt.Sprintf("活跃度不足 实际:%d 期望:%d", sociaty.Activity, conf.Activity)
|
||||
return
|
||||
}
|
||||
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
package worldtask
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"go_dreamfactory/comm"
|
||||
"go_dreamfactory/lego/sys/log"
|
||||
"go_dreamfactory/pb"
|
||||
"go_dreamfactory/utils"
|
||||
)
|
||||
@ -24,14 +24,16 @@ func (a *apiComp) Accept(session comm.IUserSession, req *pb.WorldtaskAcceptReq)
|
||||
user := a.module.ModuleUser.GetUser(uid)
|
||||
if user == nil {
|
||||
code = pb.ErrorCode_UserSessionNobeing
|
||||
data.Title = code.String()
|
||||
return
|
||||
}
|
||||
|
||||
rsp := &pb.WorldtaskAcceptResp{}
|
||||
myWorldtask, err := a.module.modelWorldtask.getWorldtask(uid)
|
||||
if err != nil {
|
||||
a.module.Error("获取玩家世界任务失败", log.Field{Key: "uid", Value: uid}, log.Field{Key: "err", Value: err.Error()})
|
||||
code = pb.ErrorCode_DBError
|
||||
data.Title = code.String()
|
||||
data.Datastring = uid
|
||||
return
|
||||
}
|
||||
|
||||
@ -39,25 +41,23 @@ func (a *apiComp) Accept(session comm.IUserSession, req *pb.WorldtaskAcceptReq)
|
||||
curTaskConf, err := a.module.configure.getWorldtaskById(req.TaskId)
|
||||
if err != nil || curTaskConf == nil {
|
||||
code = pb.ErrorCode_ConfigNoFound
|
||||
log.Error("世界任务配置未找到",
|
||||
log.Field{Key: "uid", Value: uid},
|
||||
log.Field{Key: "taskId", Value: req.TaskId},
|
||||
)
|
||||
data.Title = code.String()
|
||||
data.Message = err.Error()
|
||||
return
|
||||
}
|
||||
|
||||
// 判断玩家等级要求
|
||||
if user.Lv < curTaskConf.Lock {
|
||||
rsp.Code = pb.ErrorCode_WorldtaskLvNotEnough
|
||||
a.sendMsg(session, WorldtaskSubtypeAccept, rsp)
|
||||
code = pb.ErrorCode_WorldtaskLvNotEnough
|
||||
data.Title = code.String()
|
||||
data.Message = fmt.Sprintf("实际等级:%d 期望等级:%d", user.Lv, curTaskConf.Lock)
|
||||
return
|
||||
}
|
||||
|
||||
// 前置任务ID 只有世界任务才校验前置
|
||||
if !a.module.modelWorldtask.IsPreFinished(req.GroupId, myWorldtask, curTaskConf) {
|
||||
a.module.Debug("前置任务未完成", log.Field{Key: "uid", Value: uid}, log.Field{Key: "preTaskId", Value: curTaskConf.Ontxe}, log.Field{Key: "taskId", Value: curTaskConf.Key})
|
||||
rsp.Code = pb.ErrorCode_WorldtaskLastUnFinished
|
||||
a.sendMsg(session, WorldtaskSubtypeAccept, rsp)
|
||||
code = pb.ErrorCode_WorldtaskLastUnFinished
|
||||
data.Message = fmt.Sprintf("%v前置任务%v未完成", curTaskConf.Key, curTaskConf.Ontxe)
|
||||
return
|
||||
}
|
||||
|
||||
@ -67,7 +67,7 @@ func (a *apiComp) Accept(session comm.IUserSession, req *pb.WorldtaskAcceptReq)
|
||||
myWorldtask.CurrentTask[curTaskConf.Group] = &pb.Worldtask{
|
||||
TaskId: req.TaskId,
|
||||
TaskType: curTaskConf.Des,
|
||||
NpcStatus: 1,
|
||||
NpcStatus: 1, //接取
|
||||
}
|
||||
|
||||
update := map[string]interface{}{
|
||||
|
||||
@ -84,11 +84,11 @@ func (this *apiComp) Battlefinish(session comm.IUserSession, req *pb.WorldtaskBa
|
||||
if userTask.CurrentTask == nil {
|
||||
userTask.CurrentTask = make(map[int32]*pb.Worldtask)
|
||||
}
|
||||
|
||||
|
||||
if _, ok := utils.Findx(userTask.CurrentTask[req.GroupId].CondiIds, req.CondiId); !ok {
|
||||
userTask.CurrentTask[req.GroupId].CondiIds = append(userTask.CurrentTask[req.GroupId].CondiIds, req.CondiId)
|
||||
}
|
||||
|
||||
|
||||
update := map[string]interface{}{
|
||||
"currentTask": userTask.CurrentTask,
|
||||
}
|
||||
@ -96,19 +96,13 @@ func (this *apiComp) Battlefinish(session comm.IUserSession, req *pb.WorldtaskBa
|
||||
code = pb.ErrorCode_DBError
|
||||
return
|
||||
}
|
||||
|
||||
//推送
|
||||
// session.SendMsg(string(this.module.GetType()), "completecondis", &pb.WorldtaskCompletecondisPush{
|
||||
// GroupId: req.GroupId,
|
||||
// TaskId: req.TaskId,
|
||||
// CondiIds: userTask.CurrentTask[req.GroupId].CondiIds,
|
||||
// })
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
} else {
|
||||
rsp.Code = code
|
||||
data.Title = code.String()
|
||||
this.sendMsg(session, WorldtaskBattleFinish, rsp)
|
||||
return
|
||||
}
|
||||
|
||||
@ -1,6 +1,7 @@
|
||||
package worldtask
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"go_dreamfactory/comm"
|
||||
"go_dreamfactory/lego/sys/log"
|
||||
"go_dreamfactory/pb"
|
||||
@ -22,16 +23,14 @@ func (this *apiComp) Battlestart(session comm.IUserSession, req *pb.WorldtaskBat
|
||||
if code = this.BattlestartCheck(session, req); code != pb.ErrorCode_Success {
|
||||
return
|
||||
}
|
||||
uid := session.GetUserId()
|
||||
|
||||
resp := &pb.WorldtaskBattleStartResp{}
|
||||
|
||||
battleConf, err := this.module.configure.getWorldtaskBattleById(req.BattleConfId)
|
||||
if err != nil || battleConf == nil {
|
||||
code = pb.ErrorCode_ConfigNoFound
|
||||
log.Error("战斗配置未找到",
|
||||
log.Field{Key: "uid", Value: uid},
|
||||
log.Field{Key: "battleConfId", Value: req.BattleConfId},
|
||||
)
|
||||
data.Title = code.String()
|
||||
data.Message = fmt.Sprintf("战斗配置未找到 %v", req.BattleConfId)
|
||||
return
|
||||
}
|
||||
|
||||
@ -52,8 +51,7 @@ func (this *apiComp) Battlestart(session comm.IUserSession, req *pb.WorldtaskBat
|
||||
})
|
||||
|
||||
if code != pb.ErrorCode_Success {
|
||||
resp.Code = code
|
||||
this.sendMsg(session, WorldtaskBattleStart, resp)
|
||||
data.Title = code.String()
|
||||
return
|
||||
}
|
||||
|
||||
@ -72,8 +70,8 @@ func (this *apiComp) Battlestart(session comm.IUserSession, req *pb.WorldtaskBat
|
||||
},
|
||||
}
|
||||
} else {
|
||||
resp.Code = pb.ErrorCode_WorldtaskBattleCreate
|
||||
this.sendMsg(session, WorldtaskBattleStart, resp)
|
||||
code = pb.ErrorCode_WorldtaskBattleCreate
|
||||
data.Title = code.String()
|
||||
return
|
||||
}
|
||||
|
||||
|
||||
@ -2,7 +2,6 @@ package worldtask
|
||||
|
||||
import (
|
||||
"go_dreamfactory/comm"
|
||||
"go_dreamfactory/lego/sys/log"
|
||||
"go_dreamfactory/pb"
|
||||
)
|
||||
|
||||
@ -22,19 +21,19 @@ func (this *apiComp) Chapterreward(session comm.IUserSession, req *pb.WorldtaskC
|
||||
rsp := &pb.WorldtaskChapterrewardResp{}
|
||||
myWorldtask, err := this.module.modelWorldtask.getWorldtask(uid)
|
||||
if err != nil {
|
||||
this.module.Error("获取玩家世界任务失败", log.Field{Key: "uid", Value: uid}, log.Field{Key: "err", Value: err.Error()})
|
||||
code = pb.ErrorCode_DBError
|
||||
data.Title = code.String()
|
||||
return
|
||||
}
|
||||
|
||||
if stats, ok := myWorldtask.Chapters[req.GroupId]; !ok {
|
||||
rsp.Code = pb.ErrorCode_WorldtaskChapterUnFinished
|
||||
this.sendMsg(session, WorldtaskChapterReward, rsp)
|
||||
code = pb.ErrorCode_WorldtaskChapterUnFinished
|
||||
data.Title = code.String()
|
||||
return
|
||||
} else {
|
||||
if stats == 2 {
|
||||
rsp.Code = pb.ErrorCode_WorldtaskChapterReceived
|
||||
this.sendMsg(session, WorldtaskChapterReward, rsp)
|
||||
code = pb.ErrorCode_WorldtaskChapterReceived
|
||||
data.Title = code.String()
|
||||
return
|
||||
}
|
||||
}
|
||||
@ -42,12 +41,15 @@ func (this *apiComp) Chapterreward(session comm.IUserSession, req *pb.WorldtaskC
|
||||
gwa, err := this.module.configure.getWorldAllCfg()
|
||||
if err != nil || gwa == nil {
|
||||
code = pb.ErrorCode_ConfigNoFound
|
||||
data.Title = code.String()
|
||||
data.Message = err.Error()
|
||||
return
|
||||
}
|
||||
|
||||
rewardCnf := gwa.GetDataMap()[req.GroupId]
|
||||
if rewardCnf == nil {
|
||||
code = pb.ErrorCode_ConfigNoFound
|
||||
data.Title = code.String()
|
||||
return
|
||||
}
|
||||
|
||||
|
||||
@ -28,42 +28,22 @@ func (this *apiComp) CompleteCondi(session comm.IUserSession, req *pb.WorldtaskC
|
||||
}
|
||||
if (len(curTaskConf.Completetask) == 1 && curTaskConf.Completetask[0] == 0) ||
|
||||
len(curTaskConf.Completetask) == 0 {
|
||||
rsp.Code = pb.ErrorCode_WorldtaskNoProcess
|
||||
this.sendMsg(session, WorldtaskComplete, rsp)
|
||||
code = pb.ErrorCode_WorldtaskNoProcess
|
||||
data.Title = code.ToString()
|
||||
data.Message = "无完成条件"
|
||||
return
|
||||
}
|
||||
|
||||
myWorldtask, err := this.module.modelWorldtask.getWorldtask(uid)
|
||||
if err != nil {
|
||||
code = pb.ErrorCode_DBError
|
||||
data.Title = code.ToString()
|
||||
return
|
||||
}
|
||||
|
||||
myWorldtask.Uid = uid
|
||||
wt := myWorldtask.CurrentTask[req.GroupId]
|
||||
// if m, err := this.module.service.GetModule(comm.ModuleRtask); err == nil {
|
||||
// iwt, ok := m.(comm.IRtask)
|
||||
// if ok {
|
||||
// if code = iwt.CheckCondi(uid, req.CondiId); code != pb.ErrorCode_Success {
|
||||
// rsp.Code = code
|
||||
// rsp.CondiId = req.CondiId
|
||||
// rsp.TaskId = req.TaskId
|
||||
// this.module.Debug("任务完成条件不满足",
|
||||
// log.Field{Key: "uid", Value: uid},
|
||||
// log.Field{Key: "taskId", Value: req.TaskId},
|
||||
// log.Field{Key: "condiId", Value: req.CondiId},
|
||||
// )
|
||||
// this.sendMsg(session, WorldtaskComplete, rsp)
|
||||
// return
|
||||
// }
|
||||
// if wt == nil {
|
||||
// wt = &pb.Worldtask{}
|
||||
// }
|
||||
// if _, b := utils.Findx(wt.CondiIds, req.CondiId); !b {
|
||||
// wt.CondiIds = append(wt.CondiIds, req.CondiId)
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
|
||||
condIds, err := this.module.ModuleBuried.CheckCondition(uid, req.CondiId)
|
||||
if err == nil && len(condIds) > 0 {
|
||||
wt.CondiIds = append(wt.CondiIds, condIds...)
|
||||
|
||||
@ -1,6 +1,7 @@
|
||||
package worldtask
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"go_dreamfactory/comm"
|
||||
"go_dreamfactory/lego/core"
|
||||
"go_dreamfactory/lego/sys/log"
|
||||
@ -38,25 +39,28 @@ func (this *apiComp) Finish(session comm.IUserSession, req *pb.WorldtaskFinishRe
|
||||
curTaskConf, err := this.module.configure.getWorldtaskById(req.TaskId)
|
||||
if err != nil || curTaskConf == nil {
|
||||
code = pb.ErrorCode_ConfigNoFound
|
||||
data.Title = code.ToString()
|
||||
data.Message = err.Error()
|
||||
return
|
||||
}
|
||||
|
||||
if curTaskConf.Group != req.GroupId {
|
||||
rsp.Code = pb.ErrorCode_WorldtaskGroupIdNosame
|
||||
this.sendMsg(session, WorldtaskSubtypeFinish, rsp)
|
||||
code = pb.ErrorCode_WorldtaskGroupIdNosame
|
||||
data.Title = code.ToString()
|
||||
return
|
||||
}
|
||||
|
||||
if curTaskConf.DeliverNpc == 0 {
|
||||
rsp.Code = pb.ErrorCode_WorldtaskNoProcess
|
||||
this.sendMsg(session, WorldtaskSubtypeFinish, rsp)
|
||||
code = pb.ErrorCode_WorldtaskNoProcess
|
||||
data.Title = code.ToString()
|
||||
return
|
||||
}
|
||||
|
||||
// 判断玩家等级要求
|
||||
if user.Lv < curTaskConf.Lock {
|
||||
rsp.Code = pb.ErrorCode_WorldtaskLvNotEnough
|
||||
this.sendMsg(session, WorldtaskSubtypeFinish, rsp)
|
||||
code = pb.ErrorCode_WorldtaskLvNotEnough
|
||||
data.Title = code.ToString()
|
||||
data.Message = fmt.Sprintf("实际等级:%d 期望等级:%d", user.Lv, curTaskConf.Lock)
|
||||
return
|
||||
}
|
||||
|
||||
@ -73,7 +77,7 @@ func (this *apiComp) Finish(session comm.IUserSession, req *pb.WorldtaskFinishRe
|
||||
// 前置任务ID 只有世界任务才校验前置
|
||||
if !this.module.modelWorldtask.IsPreFinished(req.GroupId, userTask, curTaskConf) {
|
||||
this.module.Debug("前置任务未完成", log.Field{Key: "uid", Value: uid}, log.Field{Key: "preTaskId", Value: curTaskConf.Ontxe}, log.Field{Key: "taskId", Value: curTaskConf.Key})
|
||||
rsp.Code = pb.ErrorCode_WorldtaskLastUnFinished
|
||||
code = pb.ErrorCode_WorldtaskLastUnFinished
|
||||
this.sendMsg(session, WorldtaskSubtypeFinish, rsp)
|
||||
return
|
||||
}
|
||||
@ -91,7 +95,6 @@ func (this *apiComp) Finish(session comm.IUserSession, req *pb.WorldtaskFinishRe
|
||||
}
|
||||
|
||||
var (
|
||||
condiId int32
|
||||
condiFlag bool
|
||||
)
|
||||
|
||||
@ -99,12 +102,12 @@ func (this *apiComp) Finish(session comm.IUserSession, req *pb.WorldtaskFinishRe
|
||||
for _, condId := range curTaskConf.Completetask {
|
||||
if v, ok := userTask.CurrentTask[req.GroupId]; ok {
|
||||
if _, ok := utils.Findx(v.CondiIds, condId); !ok {
|
||||
//
|
||||
conIds, err := this.module.ModuleBuried.CheckCondition(uid, condId)
|
||||
if err == nil && len(conIds) > 0 {
|
||||
condiFlag = true
|
||||
} else {
|
||||
condiFlag = false
|
||||
condiId = condId
|
||||
}
|
||||
} else {
|
||||
condiFlag = true
|
||||
@ -113,10 +116,8 @@ func (this *apiComp) Finish(session comm.IUserSession, req *pb.WorldtaskFinishRe
|
||||
}
|
||||
|
||||
if !condiFlag {
|
||||
rsp.Code = pb.ErrorCode_RtaskCondiNoReach
|
||||
rsp.CondiId = condiId
|
||||
rsp.TaskId = req.TaskId
|
||||
this.sendMsg(session, WorldtaskSubtypeFinish, rsp)
|
||||
code = pb.ErrorCode_RtaskCondiNoReach
|
||||
data.Title = code.ToString()
|
||||
return
|
||||
}
|
||||
|
||||
@ -156,7 +157,7 @@ func (this *apiComp) Finish(session comm.IUserSession, req *pb.WorldtaskFinishRe
|
||||
}
|
||||
|
||||
this.module.modelWorldtask.taskFinishPush(session, req.GroupId, userTask, curTaskConf)
|
||||
|
||||
this.sendMsg(session, WorldtaskSubtypeFinish, rsp)
|
||||
return
|
||||
}
|
||||
|
||||
@ -203,25 +204,7 @@ func (this *apiComp) updateCheckCond(uid string, userTask *pb.DBWorldtask, nextT
|
||||
TaskType: nextTaskConf.Des,
|
||||
}
|
||||
}
|
||||
// if m, err := this.module.service.GetModule(comm.ModuleRtask); err == nil {
|
||||
// iwt, ok := m.(comm.IRtask)
|
||||
// if ok {
|
||||
// if mc := iwt.CheckCondi(uid, condiId); mc != pb.ErrorCode_Success {
|
||||
// this.module.Debug("任务完成条件不满足",
|
||||
// log.Field{Key: "uid", Value: uid},
|
||||
// log.Field{Key: "taskId", Value: nextTaskId},
|
||||
// log.Field{Key: "condiId", Value: condiId},
|
||||
// )
|
||||
// } else {
|
||||
// if ok {
|
||||
// nwt.CondiIds = append(nwt.CondiIds, condiId)
|
||||
// } else {
|
||||
// condiIds := []int32{condiId}
|
||||
// nwt.CondiIds = condiIds
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
|
||||
condIds, err := this.module.ModuleBuried.CheckCondition(uid, condiId)
|
||||
if err == nil && len(condIds) > 0 {
|
||||
nwt.CondiIds = condIds
|
||||
|
||||
@ -2,6 +2,7 @@ package worldtask
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"go_dreamfactory/comm"
|
||||
"go_dreamfactory/lego/core"
|
||||
"go_dreamfactory/modules"
|
||||
cfg "go_dreamfactory/sys/configure/structs"
|
||||
@ -67,7 +68,7 @@ func (this *configureComp) getWorldtaskById(taskId int32) (*cfg.GameWorldTaskDat
|
||||
if data, ok := gwt.GetDataMap()[taskId]; ok {
|
||||
return data, nil
|
||||
}
|
||||
return nil, fmt.Errorf("GameWorldTask config id:%v not found", taskId)
|
||||
return nil, comm.NewNotFoundConfErr(moduleName_cn, gameWorldTask, taskId)
|
||||
}
|
||||
|
||||
func (this *configureComp) getWorldtaskBattleCfg() (data *cfg.GameWorldBattle, err error) {
|
||||
|
||||
@ -14,6 +14,7 @@ import (
|
||||
|
||||
var _ comm.IWorldtask = (*Worldtask)(nil)
|
||||
|
||||
var moduleName_cn = "世界任务"
|
||||
type Worldtask struct {
|
||||
modules.ModuleBase
|
||||
api *apiComp
|
||||
|
||||
@ -20,7 +20,9 @@ const (
|
||||
_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
|
||||
)
|
||||
|
||||
// go:generate stringer -type ErrorCode -linecomment
|
||||
// 在pb目录下执行 go generate (先安装工具stringer go install golang.org/x/tools/cmd/stringer) 会生成errorcode_strings.go
|
||||
// ps: 手动注释或删除 errorcode.pb.go中的String()重定义方法
|
||||
//go:generate stringer -type ErrorCode -linecomment
|
||||
type ErrorCode int32
|
||||
|
||||
const (
|
||||
|
||||
@ -677,7 +677,7 @@ var _ErrorCode_map = map[ErrorCode]string{
|
||||
4605: _ErrorCode_name[6153:6171],
|
||||
}
|
||||
|
||||
func (i ErrorCode) tString() string {
|
||||
func (i ErrorCode) ToString() string {
|
||||
if str, ok := _ErrorCode_map[i]; ok {
|
||||
return str
|
||||
}
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
package pb
|
||||
|
||||
func GetErrorCodeMsg(code ErrorCode) string {
|
||||
return code.tString()
|
||||
return code.ToString()
|
||||
}
|
||||
|
||||
@ -167,8 +167,7 @@ type WorldtaskAcceptResp struct {
|
||||
sizeCache protoimpl.SizeCache
|
||||
unknownFields protoimpl.UnknownFields
|
||||
|
||||
Code ErrorCode `protobuf:"varint,1,opt,name=code,proto3,enum=ErrorCode" json:"code"`
|
||||
CondiIds []int32 `protobuf:"varint,2,rep,packed,name=condiIds,proto3" json:"condiIds"` //完成条件
|
||||
CondiIds []int32 `protobuf:"varint,1,rep,packed,name=condiIds,proto3" json:"condiIds"` //完成条件
|
||||
}
|
||||
|
||||
func (x *WorldtaskAcceptResp) Reset() {
|
||||
@ -203,13 +202,6 @@ func (*WorldtaskAcceptResp) Descriptor() ([]byte, []int) {
|
||||
return file_worldtask_worldtask_msg_proto_rawDescGZIP(), []int{3}
|
||||
}
|
||||
|
||||
func (x *WorldtaskAcceptResp) GetCode() ErrorCode {
|
||||
if x != nil {
|
||||
return x.Code
|
||||
}
|
||||
return ErrorCode_Success
|
||||
}
|
||||
|
||||
func (x *WorldtaskAcceptResp) GetCondiIds() []int32 {
|
||||
if x != nil {
|
||||
return x.CondiIds
|
||||
@ -350,9 +342,8 @@ type WorldtaskCompleteCondiResp struct {
|
||||
sizeCache protoimpl.SizeCache
|
||||
unknownFields protoimpl.UnknownFields
|
||||
|
||||
Code ErrorCode `protobuf:"varint,1,opt,name=code,proto3,enum=ErrorCode" json:"code"`
|
||||
TaskId int32 `protobuf:"varint,2,opt,name=taskId,proto3" json:"taskId"`
|
||||
CondiId int32 `protobuf:"varint,3,opt,name=condiId,proto3" json:"condiId"`
|
||||
TaskId int32 `protobuf:"varint,1,opt,name=taskId,proto3" json:"taskId"`
|
||||
CondiId int32 `protobuf:"varint,2,opt,name=condiId,proto3" json:"condiId"`
|
||||
}
|
||||
|
||||
func (x *WorldtaskCompleteCondiResp) Reset() {
|
||||
@ -387,13 +378,6 @@ func (*WorldtaskCompleteCondiResp) Descriptor() ([]byte, []int) {
|
||||
return file_worldtask_worldtask_msg_proto_rawDescGZIP(), []int{6}
|
||||
}
|
||||
|
||||
func (x *WorldtaskCompleteCondiResp) GetCode() ErrorCode {
|
||||
if x != nil {
|
||||
return x.Code
|
||||
}
|
||||
return ErrorCode_Success
|
||||
}
|
||||
|
||||
func (x *WorldtaskCompleteCondiResp) GetTaskId() int32 {
|
||||
if x != nil {
|
||||
return x.TaskId
|
||||
@ -469,9 +453,7 @@ type WorldtaskFinishResp struct {
|
||||
sizeCache protoimpl.SizeCache
|
||||
unknownFields protoimpl.UnknownFields
|
||||
|
||||
Code ErrorCode `protobuf:"varint,1,opt,name=code,proto3,enum=ErrorCode" json:"code"`
|
||||
TaskId int32 `protobuf:"varint,2,opt,name=taskId,proto3" json:"taskId"`
|
||||
CondiId int32 `protobuf:"varint,3,opt,name=condiId,proto3" json:"condiId"`
|
||||
TaskId int32 `protobuf:"varint,1,opt,name=taskId,proto3" json:"taskId"`
|
||||
}
|
||||
|
||||
func (x *WorldtaskFinishResp) Reset() {
|
||||
@ -506,13 +488,6 @@ func (*WorldtaskFinishResp) Descriptor() ([]byte, []int) {
|
||||
return file_worldtask_worldtask_msg_proto_rawDescGZIP(), []int{8}
|
||||
}
|
||||
|
||||
func (x *WorldtaskFinishResp) GetCode() ErrorCode {
|
||||
if x != nil {
|
||||
return x.Code
|
||||
}
|
||||
return ErrorCode_Success
|
||||
}
|
||||
|
||||
func (x *WorldtaskFinishResp) GetTaskId() int32 {
|
||||
if x != nil {
|
||||
return x.TaskId
|
||||
@ -520,13 +495,6 @@ func (x *WorldtaskFinishResp) GetTaskId() int32 {
|
||||
return 0
|
||||
}
|
||||
|
||||
func (x *WorldtaskFinishResp) GetCondiId() int32 {
|
||||
if x != nil {
|
||||
return x.CondiId
|
||||
}
|
||||
return 0
|
||||
}
|
||||
|
||||
//任务完成条件达成的推送
|
||||
type WorldtaskNexttaskPush struct {
|
||||
state protoimpl.MessageState
|
||||
@ -645,7 +613,6 @@ type WorldtaskBattleStartResp struct {
|
||||
unknownFields protoimpl.UnknownFields
|
||||
|
||||
Info *BattleInfo `protobuf:"bytes,1,opt,name=info,proto3" json:"info"` //战斗信息
|
||||
Code ErrorCode `protobuf:"varint,2,opt,name=code,proto3,enum=ErrorCode" json:"code"`
|
||||
}
|
||||
|
||||
func (x *WorldtaskBattleStartResp) Reset() {
|
||||
@ -687,13 +654,6 @@ func (x *WorldtaskBattleStartResp) GetInfo() *BattleInfo {
|
||||
return nil
|
||||
}
|
||||
|
||||
func (x *WorldtaskBattleStartResp) GetCode() ErrorCode {
|
||||
if x != nil {
|
||||
return x.Code
|
||||
}
|
||||
return ErrorCode_Success
|
||||
}
|
||||
|
||||
// 战斗完成
|
||||
type WorldtaskBattleFinishReq struct {
|
||||
state protoimpl.MessageState
|
||||
@ -779,8 +739,7 @@ type WorldtaskBattleFinishResp struct {
|
||||
sizeCache protoimpl.SizeCache
|
||||
unknownFields protoimpl.UnknownFields
|
||||
|
||||
TaskId int32 `protobuf:"varint,1,opt,name=taskId,proto3" json:"taskId"` //任务ID
|
||||
Code ErrorCode `protobuf:"varint,2,opt,name=code,proto3,enum=ErrorCode" json:"code"`
|
||||
TaskId int32 `protobuf:"varint,1,opt,name=taskId,proto3" json:"taskId"` //任务ID
|
||||
}
|
||||
|
||||
func (x *WorldtaskBattleFinishResp) Reset() {
|
||||
@ -822,13 +781,6 @@ func (x *WorldtaskBattleFinishResp) GetTaskId() int32 {
|
||||
return 0
|
||||
}
|
||||
|
||||
func (x *WorldtaskBattleFinishResp) GetCode() ErrorCode {
|
||||
if x != nil {
|
||||
return x.Code
|
||||
}
|
||||
return ErrorCode_Success
|
||||
}
|
||||
|
||||
// 当前完成的任务列表推送
|
||||
type WorldtaskFinishIdsPush struct {
|
||||
state protoimpl.MessageState
|
||||
@ -930,7 +882,7 @@ type WorldtaskChapterrewardResp struct {
|
||||
sizeCache protoimpl.SizeCache
|
||||
unknownFields protoimpl.UnknownFields
|
||||
|
||||
Code ErrorCode `protobuf:"varint,1,opt,name=code,proto3,enum=ErrorCode" json:"code"`
|
||||
GroupId int32 `protobuf:"varint,1,opt,name=groupId,proto3" json:"groupId"`
|
||||
}
|
||||
|
||||
func (x *WorldtaskChapterrewardResp) Reset() {
|
||||
@ -965,11 +917,11 @@ func (*WorldtaskChapterrewardResp) Descriptor() ([]byte, []int) {
|
||||
return file_worldtask_worldtask_msg_proto_rawDescGZIP(), []int{16}
|
||||
}
|
||||
|
||||
func (x *WorldtaskChapterrewardResp) GetCode() ErrorCode {
|
||||
func (x *WorldtaskChapterrewardResp) GetGroupId() int32 {
|
||||
if x != nil {
|
||||
return x.Code
|
||||
return x.GroupId
|
||||
}
|
||||
return ErrorCode_Success
|
||||
return 0
|
||||
}
|
||||
|
||||
var File_worldtask_worldtask_msg_proto protoreflect.FileDescriptor
|
||||
@ -990,11 +942,9 @@ var file_worldtask_worldtask_msg_proto_rawDesc = []byte{
|
||||
0x63, 0x63, 0x65, 0x70, 0x74, 0x52, 0x65, 0x71, 0x12, 0x18, 0x0a, 0x07, 0x67, 0x72, 0x6f, 0x75,
|
||||
0x70, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x67, 0x72, 0x6f, 0x75, 0x70,
|
||||
0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01,
|
||||
0x28, 0x05, 0x52, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x22, 0x51, 0x0a, 0x13, 0x57, 0x6f,
|
||||
0x28, 0x05, 0x52, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x22, 0x31, 0x0a, 0x13, 0x57, 0x6f,
|
||||
0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x41, 0x63, 0x63, 0x65, 0x70, 0x74, 0x52, 0x65, 0x73,
|
||||
0x70, 0x12, 0x1e, 0x0a, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32,
|
||||
0x0a, 0x2e, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x52, 0x04, 0x63, 0x6f, 0x64,
|
||||
0x65, 0x12, 0x1a, 0x0a, 0x08, 0x63, 0x6f, 0x6e, 0x64, 0x69, 0x49, 0x64, 0x73, 0x18, 0x02, 0x20,
|
||||
0x70, 0x12, 0x1a, 0x0a, 0x08, 0x63, 0x6f, 0x6e, 0x64, 0x69, 0x49, 0x64, 0x73, 0x18, 0x01, 0x20,
|
||||
0x03, 0x28, 0x05, 0x52, 0x08, 0x63, 0x6f, 0x6e, 0x64, 0x69, 0x49, 0x64, 0x73, 0x22, 0x6b, 0x0a,
|
||||
0x1b, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65,
|
||||
0x74, 0x65, 0x63, 0x6f, 0x6e, 0x64, 0x69, 0x73, 0x50, 0x75, 0x73, 0x68, 0x12, 0x18, 0x0a, 0x07,
|
||||
@ -1009,78 +959,68 @@ var file_worldtask_worldtask_msg_proto_rawDesc = []byte{
|
||||
0x64, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28,
|
||||
0x05, 0x52, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x63, 0x6f, 0x6e,
|
||||
0x64, 0x69, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x63, 0x6f, 0x6e, 0x64,
|
||||
0x69, 0x49, 0x64, 0x22, 0x6e, 0x0a, 0x1a, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b,
|
||||
0x69, 0x49, 0x64, 0x22, 0x4e, 0x0a, 0x1a, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b,
|
||||
0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x43, 0x6f, 0x6e, 0x64, 0x69, 0x52, 0x65, 0x73,
|
||||
0x70, 0x12, 0x1e, 0x0a, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32,
|
||||
0x0a, 0x2e, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x52, 0x04, 0x63, 0x6f, 0x64,
|
||||
0x65, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28,
|
||||
0x70, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28,
|
||||
0x05, 0x52, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x63, 0x6f, 0x6e,
|
||||
0x64, 0x69, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x63, 0x6f, 0x6e, 0x64,
|
||||
0x64, 0x69, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x63, 0x6f, 0x6e, 0x64,
|
||||
0x69, 0x49, 0x64, 0x22, 0x46, 0x0a, 0x12, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b,
|
||||
0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x52, 0x65, 0x71, 0x12, 0x18, 0x0a, 0x07, 0x67, 0x72, 0x6f,
|
||||
0x75, 0x70, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x67, 0x72, 0x6f, 0x75,
|
||||
0x70, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x18, 0x02, 0x20,
|
||||
0x01, 0x28, 0x05, 0x52, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x22, 0x67, 0x0a, 0x13, 0x57,
|
||||
0x01, 0x28, 0x05, 0x52, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x22, 0x2d, 0x0a, 0x13, 0x57,
|
||||
0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x52, 0x65,
|
||||
0x73, 0x70, 0x12, 0x1e, 0x0a, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e,
|
||||
0x32, 0x0a, 0x2e, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x52, 0x04, 0x63, 0x6f,
|
||||
0x64, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01,
|
||||
0x28, 0x05, 0x52, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x63, 0x6f,
|
||||
0x6e, 0x64, 0x69, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x63, 0x6f, 0x6e,
|
||||
0x64, 0x69, 0x49, 0x64, 0x22, 0xcc, 0x01, 0x0a, 0x15, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61,
|
||||
0x73, 0x6b, 0x4e, 0x65, 0x78, 0x74, 0x74, 0x61, 0x73, 0x6b, 0x50, 0x75, 0x73, 0x68, 0x12, 0x40,
|
||||
0x0a, 0x08, 0x6e, 0x65, 0x78, 0x74, 0x54, 0x61, 0x73, 0x6b, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b,
|
||||
0x32, 0x24, 0x2e, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x4e, 0x65, 0x78, 0x74,
|
||||
0x74, 0x61, 0x73, 0x6b, 0x50, 0x75, 0x73, 0x68, 0x2e, 0x4e, 0x65, 0x78, 0x74, 0x54, 0x61, 0x73,
|
||||
0x6b, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x08, 0x6e, 0x65, 0x78, 0x74, 0x54, 0x61, 0x73, 0x6b,
|
||||
0x12, 0x28, 0x0a, 0x0f, 0x66, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x65, 0x64, 0x54, 0x61, 0x73, 0x6b,
|
||||
0x49, 0x64, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x05, 0x52, 0x0f, 0x66, 0x69, 0x6e, 0x69, 0x73,
|
||||
0x68, 0x65, 0x64, 0x54, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x73, 0x1a, 0x47, 0x0a, 0x0d, 0x4e, 0x65,
|
||||
0x78, 0x74, 0x54, 0x61, 0x73, 0x6b, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b,
|
||||
0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x20, 0x0a,
|
||||
0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x57,
|
||||
0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a,
|
||||
0x02, 0x38, 0x01, 0x22, 0x67, 0x0a, 0x17, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b,
|
||||
0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x53, 0x74, 0x61, 0x72, 0x74, 0x52, 0x65, 0x71, 0x12, 0x22,
|
||||
0x0a, 0x0c, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x49, 0x64, 0x18, 0x01,
|
||||
0x20, 0x01, 0x28, 0x05, 0x52, 0x0c, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6f, 0x6e, 0x66,
|
||||
0x49, 0x64, 0x12, 0x28, 0x0a, 0x06, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x18, 0x02, 0x20, 0x01,
|
||||
0x28, 0x0b, 0x32, 0x10, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x6f, 0x72, 0x6d, 0x61,
|
||||
0x74, 0x69, 0x6f, 0x6e, 0x52, 0x06, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x22, 0x5b, 0x0a, 0x18,
|
||||
0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x53,
|
||||
0x74, 0x61, 0x72, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1f, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f,
|
||||
0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x49,
|
||||
0x6e, 0x66, 0x6f, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x12, 0x1e, 0x0a, 0x04, 0x63, 0x6f, 0x64,
|
||||
0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x0a, 0x2e, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x43,
|
||||
0x6f, 0x64, 0x65, 0x52, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x22, 0xb1, 0x01, 0x0a, 0x18, 0x57, 0x6f,
|
||||
0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x69, 0x6e,
|
||||
0x69, 0x73, 0x68, 0x52, 0x65, 0x71, 0x12, 0x18, 0x0a, 0x07, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x49,
|
||||
0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x49, 0x64,
|
||||
0x12, 0x16, 0x0a, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05,
|
||||
0x52, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x63, 0x6f, 0x6e, 0x64,
|
||||
0x69, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x63, 0x6f, 0x6e, 0x64, 0x69,
|
||||
0x49, 0x64, 0x12, 0x22, 0x0a, 0x0c, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6f, 0x6e, 0x66,
|
||||
0x49, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0c, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65,
|
||||
0x43, 0x6f, 0x6e, 0x66, 0x49, 0x64, 0x12, 0x25, 0x0a, 0x06, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74,
|
||||
0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52,
|
||||
0x65, 0x70, 0x6f, 0x72, 0x74, 0x52, 0x06, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x22, 0x53, 0x0a,
|
||||
0x19, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65,
|
||||
0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x52, 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x61,
|
||||
0x73, 0x6b, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x74, 0x61, 0x73, 0x6b,
|
||||
0x49, 0x64, 0x12, 0x1e, 0x0a, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0e,
|
||||
0x32, 0x0a, 0x2e, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x52, 0x04, 0x63, 0x6f,
|
||||
0x64, 0x65, 0x22, 0x40, 0x0a, 0x16, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x46,
|
||||
0x69, 0x6e, 0x69, 0x73, 0x68, 0x49, 0x64, 0x73, 0x50, 0x75, 0x73, 0x68, 0x12, 0x26, 0x0a, 0x08,
|
||||
0x74, 0x61, 0x73, 0x6b, 0x4c, 0x69, 0x73, 0x74, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0a,
|
||||
0x2e, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x52, 0x08, 0x74, 0x61, 0x73, 0x6b,
|
||||
0x4c, 0x69, 0x73, 0x74, 0x22, 0x35, 0x0a, 0x19, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73,
|
||||
0x6b, 0x43, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65,
|
||||
0x71, 0x12, 0x18, 0x0a, 0x07, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01,
|
||||
0x28, 0x05, 0x52, 0x07, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x49, 0x64, 0x22, 0x3c, 0x0a, 0x1a, 0x57,
|
||||
0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x43, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x72,
|
||||
0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1e, 0x0a, 0x04, 0x63, 0x6f, 0x64,
|
||||
0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x0a, 0x2e, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x43,
|
||||
0x6f, 0x64, 0x65, 0x52, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70,
|
||||
0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01,
|
||||
0x28, 0x05, 0x52, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x22, 0xcc, 0x01, 0x0a, 0x15, 0x57,
|
||||
0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x4e, 0x65, 0x78, 0x74, 0x74, 0x61, 0x73, 0x6b,
|
||||
0x50, 0x75, 0x73, 0x68, 0x12, 0x40, 0x0a, 0x08, 0x6e, 0x65, 0x78, 0x74, 0x54, 0x61, 0x73, 0x6b,
|
||||
0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x24, 0x2e, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61,
|
||||
0x73, 0x6b, 0x4e, 0x65, 0x78, 0x74, 0x74, 0x61, 0x73, 0x6b, 0x50, 0x75, 0x73, 0x68, 0x2e, 0x4e,
|
||||
0x65, 0x78, 0x74, 0x54, 0x61, 0x73, 0x6b, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x08, 0x6e, 0x65,
|
||||
0x78, 0x74, 0x54, 0x61, 0x73, 0x6b, 0x12, 0x28, 0x0a, 0x0f, 0x66, 0x69, 0x6e, 0x69, 0x73, 0x68,
|
||||
0x65, 0x64, 0x54, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x05, 0x52,
|
||||
0x0f, 0x66, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x65, 0x64, 0x54, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x73,
|
||||
0x1a, 0x47, 0x0a, 0x0d, 0x4e, 0x65, 0x78, 0x74, 0x54, 0x61, 0x73, 0x6b, 0x45, 0x6e, 0x74, 0x72,
|
||||
0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03,
|
||||
0x6b, 0x65, 0x79, 0x12, 0x20, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01,
|
||||
0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x52, 0x05,
|
||||
0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x67, 0x0a, 0x17, 0x57, 0x6f, 0x72,
|
||||
0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x53, 0x74, 0x61, 0x72,
|
||||
0x74, 0x52, 0x65, 0x71, 0x12, 0x22, 0x0a, 0x0c, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6f,
|
||||
0x6e, 0x66, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0c, 0x62, 0x61, 0x74, 0x74,
|
||||
0x6c, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x49, 0x64, 0x12, 0x28, 0x0a, 0x06, 0x62, 0x61, 0x74, 0x74,
|
||||
0x6c, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c,
|
||||
0x65, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x06, 0x62, 0x61, 0x74, 0x74,
|
||||
0x6c, 0x65, 0x22, 0x3b, 0x0a, 0x18, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x42,
|
||||
0x61, 0x74, 0x74, 0x6c, 0x65, 0x53, 0x74, 0x61, 0x72, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1f,
|
||||
0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x42,
|
||||
0x61, 0x74, 0x74, 0x6c, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22,
|
||||
0xb1, 0x01, 0x0a, 0x18, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x42, 0x61, 0x74,
|
||||
0x74, 0x6c, 0x65, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x52, 0x65, 0x71, 0x12, 0x18, 0x0a, 0x07,
|
||||
0x67, 0x72, 0x6f, 0x75, 0x70, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x67,
|
||||
0x72, 0x6f, 0x75, 0x70, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64,
|
||||
0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x12, 0x18,
|
||||
0x0a, 0x07, 0x63, 0x6f, 0x6e, 0x64, 0x69, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52,
|
||||
0x07, 0x63, 0x6f, 0x6e, 0x64, 0x69, 0x49, 0x64, 0x12, 0x22, 0x0a, 0x0c, 0x62, 0x61, 0x74, 0x74,
|
||||
0x6c, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x49, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0c,
|
||||
0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x49, 0x64, 0x12, 0x25, 0x0a, 0x06,
|
||||
0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x42,
|
||||
0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x52, 0x06, 0x72, 0x65, 0x70,
|
||||
0x6f, 0x72, 0x74, 0x22, 0x33, 0x0a, 0x19, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b,
|
||||
0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x52, 0x65, 0x73, 0x70,
|
||||
0x12, 0x16, 0x0a, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05,
|
||||
0x52, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x22, 0x40, 0x0a, 0x16, 0x57, 0x6f, 0x72, 0x6c,
|
||||
0x64, 0x74, 0x61, 0x73, 0x6b, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x49, 0x64, 0x73, 0x50, 0x75,
|
||||
0x73, 0x68, 0x12, 0x26, 0x0a, 0x08, 0x74, 0x61, 0x73, 0x6b, 0x4c, 0x69, 0x73, 0x74, 0x18, 0x01,
|
||||
0x20, 0x03, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b,
|
||||
0x52, 0x08, 0x74, 0x61, 0x73, 0x6b, 0x4c, 0x69, 0x73, 0x74, 0x22, 0x35, 0x0a, 0x19, 0x57, 0x6f,
|
||||
0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x43, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x72, 0x65,
|
||||
0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x71, 0x12, 0x18, 0x0a, 0x07, 0x67, 0x72, 0x6f, 0x75, 0x70,
|
||||
0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x49,
|
||||
0x64, 0x22, 0x36, 0x0a, 0x1a, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x43, 0x68,
|
||||
0x61, 0x70, 0x74, 0x65, 0x72, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12,
|
||||
0x18, 0x0a, 0x07, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05,
|
||||
0x52, 0x07, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x49, 0x64, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70,
|
||||
0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
|
||||
}
|
||||
|
||||
@ -1117,31 +1057,24 @@ var file_worldtask_worldtask_msg_proto_goTypes = []interface{}{
|
||||
(*WorldtaskChapterrewardResp)(nil), // 16: WorldtaskChapterrewardResp
|
||||
nil, // 17: WorldtaskNexttaskPush.NextTaskEntry
|
||||
(*DBWorldtask)(nil), // 18: DBWorldtask
|
||||
(ErrorCode)(0), // 19: ErrorCode
|
||||
(*BattleFormation)(nil), // 20: BattleFormation
|
||||
(*BattleInfo)(nil), // 21: BattleInfo
|
||||
(*BattleReport)(nil), // 22: BattleReport
|
||||
(*Worldtask)(nil), // 23: Worldtask
|
||||
(*BattleFormation)(nil), // 19: BattleFormation
|
||||
(*BattleInfo)(nil), // 20: BattleInfo
|
||||
(*BattleReport)(nil), // 21: BattleReport
|
||||
(*Worldtask)(nil), // 22: Worldtask
|
||||
}
|
||||
var file_worldtask_worldtask_msg_proto_depIdxs = []int32{
|
||||
18, // 0: WorldtaskMineResp.task:type_name -> DBWorldtask
|
||||
19, // 1: WorldtaskAcceptResp.code:type_name -> ErrorCode
|
||||
19, // 2: WorldtaskCompleteCondiResp.code:type_name -> ErrorCode
|
||||
19, // 3: WorldtaskFinishResp.code:type_name -> ErrorCode
|
||||
17, // 4: WorldtaskNexttaskPush.nextTask:type_name -> WorldtaskNexttaskPush.NextTaskEntry
|
||||
20, // 5: WorldtaskBattleStartReq.battle:type_name -> BattleFormation
|
||||
21, // 6: WorldtaskBattleStartResp.info:type_name -> BattleInfo
|
||||
19, // 7: WorldtaskBattleStartResp.code:type_name -> ErrorCode
|
||||
22, // 8: WorldtaskBattleFinishReq.report:type_name -> BattleReport
|
||||
19, // 9: WorldtaskBattleFinishResp.code:type_name -> ErrorCode
|
||||
23, // 10: WorldtaskFinishIdsPush.taskList:type_name -> Worldtask
|
||||
19, // 11: WorldtaskChapterrewardResp.code:type_name -> ErrorCode
|
||||
23, // 12: WorldtaskNexttaskPush.NextTaskEntry.value:type_name -> Worldtask
|
||||
13, // [13:13] is the sub-list for method output_type
|
||||
13, // [13:13] is the sub-list for method input_type
|
||||
13, // [13:13] is the sub-list for extension type_name
|
||||
13, // [13:13] is the sub-list for extension extendee
|
||||
0, // [0:13] is the sub-list for field type_name
|
||||
17, // 1: WorldtaskNexttaskPush.nextTask:type_name -> WorldtaskNexttaskPush.NextTaskEntry
|
||||
19, // 2: WorldtaskBattleStartReq.battle:type_name -> BattleFormation
|
||||
20, // 3: WorldtaskBattleStartResp.info:type_name -> BattleInfo
|
||||
21, // 4: WorldtaskBattleFinishReq.report:type_name -> BattleReport
|
||||
22, // 5: WorldtaskFinishIdsPush.taskList:type_name -> Worldtask
|
||||
22, // 6: WorldtaskNexttaskPush.NextTaskEntry.value:type_name -> Worldtask
|
||||
7, // [7:7] is the sub-list for method output_type
|
||||
7, // [7:7] is the sub-list for method input_type
|
||||
7, // [7:7] is the sub-list for extension type_name
|
||||
7, // [7:7] is the sub-list for extension extendee
|
||||
0, // [0:7] is the sub-list for field type_name
|
||||
}
|
||||
|
||||
func init() { file_worldtask_worldtask_msg_proto_init() }
|
||||
|
||||
Loading…
Reference in New Issue
Block a user