diff --git a/bin/json/game_breakingbad.json b/bin/json/game_breakingbad.json
index 739418e58..f1c01a744 100644
--- a/bin/json/game_breakingbad.json
+++ b/bin/json/game_breakingbad.json
@@ -1,32 +1,68 @@
[
{
- "delicacies": "99999",
+ "delicacies": "132000",
"recipe": [],
"Type": 1,
"flame": 1,
"unlockreward": {
"a": "attr",
"t": "diamond",
- "n": 1
+ "n": 5
}
},
{
- "delicacies": "10011",
+ "delicacies": "132001",
"recipe": [
{
- "a": "1001",
- "n": 5
+ "a": "131005",
+ "n": 10
},
{
- "a": "1003",
- "n": 20
- },
- {
- "a": "1004",
+ "a": "132005",
"n": 10
}
],
"Type": 2,
+ "flame": 10,
+ "unlockreward": {
+ "a": "attr",
+ "t": "diamond",
+ "n": 5
+ }
+ },
+ {
+ "delicacies": "132002",
+ "recipe": [
+ {
+ "a": "131001",
+ "n": 10
+ },
+ {
+ "a": "132005",
+ "n": 5
+ }
+ ],
+ "Type": 3,
+ "flame": 10,
+ "unlockreward": {
+ "a": "attr",
+ "t": "diamond",
+ "n": 10
+ }
+ },
+ {
+ "delicacies": "132003",
+ "recipe": [
+ {
+ "a": "131003",
+ "n": 10
+ },
+ {
+ "a": "132005",
+ "n": 5
+ }
+ ],
+ "Type": 3,
"flame": 5,
"unlockreward": {
"a": "attr",
@@ -35,15 +71,103 @@
}
},
{
- "delicacies": "10012",
+ "delicacies": "132004",
"recipe": [
{
- "a": "1001",
+ "a": "131003",
+ "n": 20
+ }
+ ],
+ "Type": 3,
+ "flame": 5,
+ "unlockreward": {
+ "a": "attr",
+ "t": "diamond",
+ "n": 5
+ }
+ },
+ {
+ "delicacies": "132005",
+ "recipe": [
+ {
+ "a": "131004",
"n": 20
}
],
"Type": 2,
- "flame": 3,
+ "flame": 5,
+ "unlockreward": {
+ "a": "attr",
+ "t": "diamond",
+ "n": 5
+ }
+ },
+ {
+ "delicacies": "132006",
+ "recipe": [
+ {
+ "a": "131005",
+ "n": 10
+ },
+ {
+ "a": "131004",
+ "n": 10
+ }
+ ],
+ "Type": 3,
+ "flame": 5,
+ "unlockreward": {
+ "a": "attr",
+ "t": "diamond",
+ "n": 5
+ }
+ },
+ {
+ "delicacies": "132007",
+ "recipe": [
+ {
+ "a": "131005",
+ "n": 20
+ }
+ ],
+ "Type": 2,
+ "flame": 5,
+ "unlockreward": {
+ "a": "attr",
+ "t": "diamond",
+ "n": 5
+ }
+ },
+ {
+ "delicacies": "132008",
+ "recipe": [
+ {
+ "a": "131002",
+ "n": 10
+ },
+ {
+ "a": "131005",
+ "n": 10
+ }
+ ],
+ "Type": 2,
+ "flame": 5,
+ "unlockreward": {
+ "a": "attr",
+ "t": "diamond",
+ "n": 5
+ }
+ },
+ {
+ "delicacies": "132009",
+ "recipe": [
+ {
+ "a": "131001",
+ "n": 20
+ }
+ ],
+ "Type": 2,
+ "flame": 5,
"unlockreward": {
"a": "attr",
"t": "diamond",
diff --git a/bin/json/game_bubblegroup.json b/bin/json/game_bubblegroup.json
new file mode 100644
index 000000000..d84f9230b
--- /dev/null
+++ b/bin/json/game_bubblegroup.json
@@ -0,0 +1,254 @@
+[
+ {
+ "KeyId": 1,
+ "GroupID": 24002,
+ "Type": 1,
+ "TaskIDMin": 0,
+ "TaskIDMax": 0,
+ "weight": 10,
+ "Text_Bubble": {
+ "key": "bubblegroup_1",
+ "text": "我喜欢你的牙齿！"
+ }
+ },
+ {
+ "KeyId": 2,
+ "GroupID": 24002,
+ "Type": 1,
+ "TaskIDMin": 0,
+ "TaskIDMax": 0,
+ "weight": 10,
+ "Text_Bubble": {
+ "key": "bubblegroup_2",
+ "text": "我这里的东西应有尽有，慢慢挑~"
+ }
+ },
+ {
+ "KeyId": 3,
+ "GroupID": 24002,
+ "Type": 1,
+ "TaskIDMin": 0,
+ "TaskIDMax": 0,
+ "weight": 10,
+ "Text_Bubble": {
+ "key": "bubblegroup_3",
+ "text": "有什么需要帮忙的吗？"
+ }
+ },
+ {
+ "KeyId": 4,
+ "GroupID": 24008,
+ "Type": 1,
+ "TaskIDMin": 0,
+ "TaskIDMax": 0,
+ "weight": 10,
+ "Text_Bubble": {
+ "key": "bubblegroup_4",
+ "text": "啊？找我有什么事？"
+ }
+ },
+ {
+ "KeyId": 5,
+ "GroupID": 24008,
+ "Type": 1,
+ "TaskIDMin": 0,
+ "TaskIDMax": 0,
+ "weight": 10,
+ "Text_Bubble": {
+ "key": "bubblegroup_5",
+ "text": "你这家伙居然敢不理我？"
+ }
+ },
+ {
+ "KeyId": 6,
+ "GroupID": 24008,
+ "Type": 1,
+ "TaskIDMin": 0,
+ "TaskIDMax": 0,
+ "weight": 10,
+ "Text_Bubble": {
+ "key": "bubblegroup_6",
+ "text": "再不说话，小心我凑你！"
+ }
+ },
+ {
+ "KeyId": 7,
+ "GroupID": 44006,
+ "Type": 1,
+ "TaskIDMin": 0,
+ "TaskIDMax": 0,
+ "weight": 10,
+ "Text_Bubble": {
+ "key": "bubblegroup_7",
+ "text": "听说你想成为功夫大师？"
+ }
+ },
+ {
+ "KeyId": 8,
+ "GroupID": 44006,
+ "Type": 1,
+ "TaskIDMin": 0,
+ "TaskIDMax": 0,
+ "weight": 10,
+ "Text_Bubble": {
+ "key": "bubblegroup_8",
+ "text": "今天的晨功又没看见你。"
+ }
+ },
+ {
+ "KeyId": 9,
+ "GroupID": 44006,
+ "Type": 1,
+ "TaskIDMin": 0,
+ "TaskIDMax": 0,
+ "weight": 10,
+ "Text_Bubble": {
+ "key": "bubblegroup_9",
+ "text": "若有差遣，但凭吩咐。"
+ }
+ },
+ {
+ "KeyId": 10,
+ "GroupID": 34002,
+ "Type": 1,
+ "TaskIDMin": 0,
+ "TaskIDMax": 0,
+ "weight": 10,
+ "Text_Bubble": {
+ "key": "bubblegroup_10",
+ "text": "就这样，什么也不用说……"
+ }
+ },
+ {
+ "KeyId": 11,
+ "GroupID": 34002,
+ "Type": 1,
+ "TaskIDMin": 0,
+ "TaskIDMax": 0,
+ "weight": 10,
+ "Text_Bubble": {
+ "key": "bubblegroup_11",
+ "text": "听说你升职了，恭喜你~"
+ }
+ },
+ {
+ "KeyId": 12,
+ "GroupID": 34002,
+ "Type": 1,
+ "TaskIDMin": 0,
+ "TaskIDMax": 0,
+ "weight": 10,
+ "Text_Bubble": {
+ "key": "bubblegroup_12",
+ "text": "我们都如愿以偿了，真好。"
+ }
+ },
+ {
+ "KeyId": 13,
+ "GroupID": 13003,
+ "Type": 1,
+ "TaskIDMin": 0,
+ "TaskIDMax": 0,
+ "weight": 10,
+ "Text_Bubble": {
+ "key": "bubblegroup_13",
+ "text": "啊，呃……哦~"
+ }
+ },
+ {
+ "KeyId": 14,
+ "GroupID": 13003,
+ "Type": 1,
+ "TaskIDMin": 0,
+ "TaskIDMax": 0,
+ "weight": 10,
+ "Text_Bubble": {
+ "key": "bubblegroup_14",
+ "text": "我，我也不知道……"
+ }
+ },
+ {
+ "KeyId": 15,
+ "GroupID": 13003,
+ "Type": 1,
+ "TaskIDMin": 0,
+ "TaskIDMax": 0,
+ "weight": 10,
+ "Text_Bubble": {
+ "key": "bubblegroup_15",
+ "text": "我能理解你，朋友。"
+ }
+ },
+ {
+ "KeyId": 16,
+ "GroupID": 34006,
+ "Type": 1,
+ "TaskIDMin": 0,
+ "TaskIDMax": 0,
+ "weight": 10,
+ "Text_Bubble": {
+ "key": "bubblegroup_16",
+ "text": "你醒了吗？还是还在梦中？"
+ }
+ },
+ {
+ "KeyId": 17,
+ "GroupID": 34006,
+ "Type": 1,
+ "TaskIDMin": 0,
+ "TaskIDMax": 0,
+ "weight": 10,
+ "Text_Bubble": {
+ "key": "bubblegroup_17",
+ "text": "我会指引你的一切行动。"
+ }
+ },
+ {
+ "KeyId": 18,
+ "GroupID": 34006,
+ "Type": 1,
+ "TaskIDMin": 0,
+ "TaskIDMax": 0,
+ "weight": 10,
+ "Text_Bubble": {
+ "key": "bubblegroup_18",
+ "text": "天快亮了，黎明就在前方。"
+ }
+ },
+ {
+ "KeyId": 19,
+ "GroupID": 14005,
+ "Type": 1,
+ "TaskIDMin": 0,
+ "TaskIDMax": 0,
+ "weight": 10,
+ "Text_Bubble": {
+ "key": "bubblegroup_19",
+ "text": "你想去哪儿，我可以载你一程。"
+ }
+ },
+ {
+ "KeyId": 20,
+ "GroupID": 14005,
+ "Type": 1,
+ "TaskIDMin": 0,
+ "TaskIDMax": 0,
+ "weight": 10,
+ "Text_Bubble": {
+ "key": "bubblegroup_20",
+ "text": "不需要闹出太大动静。"
+ }
+ },
+ {
+ "KeyId": 21,
+ "GroupID": 14005,
+ "Type": 1,
+ "TaskIDMin": 0,
+ "TaskIDMax": 0,
+ "weight": 10,
+ "Text_Bubble": {
+ "key": "bubblegroup_21",
+ "text": "别冲动，先屏住呼吸~"
+ }
+ }
+]
\ No newline at end of file
diff --git a/bin/json/game_dispatch_lv.json b/bin/json/game_dispatch_lv.json
index d59dbea84..c9f845fba 100644
--- a/bin/json/game_dispatch_lv.json
+++ b/bin/json/game_dispatch_lv.json
@@ -2,8 +2,8 @@
{
"lv": 1,
"probability": [
- 100,
- 0,
+ 80,
+ 20,
0,
0
],
@@ -12,9 +12,9 @@
{
"lv": 2,
"probability": [
- 80,
+ 70,
20,
- 0,
+ 10,
0
],
"Upgrade": 1
@@ -22,30 +22,30 @@
{
"lv": 3,
"probability": [
- 70,
- 20,
- 10,
- 0
+ 50,
+ 30,
+ 15,
+ 5
],
"Upgrade": 2
},
{
"lv": 4,
"probability": [
- 50,
- 30,
- 15,
- 5
+ 45,
+ 25,
+ 20,
+ 10
],
"Upgrade": 3
},
{
"lv": 5,
"probability": [
- 45,
- 25,
- 20,
- 10
+ 40,
+ 30,
+ 15,
+ 15
],
"Upgrade": 4
}
diff --git a/bin/json/game_dispatch_task.json b/bin/json/game_dispatch_task.json
index ed030d9dc..3c58acf05 100644
--- a/bin/json/game_dispatch_task.json
+++ b/bin/json/game_dispatch_task.json
@@ -8,16 +8,16 @@
},
"icon": "wg_cj1_img01",
"taskcd": 200,
- "tasktime": 160,
+ "tasktime": 94,
"tasktxt": {
"key": "Entrustment details of Po",
"text": "这是属于阿宝的专属委托"
},
- "taskneed": 2,
+ "taskneed": 1,
"taskreq": [
{
"key": 1,
- "param": 25
+ "param": 16
}
],
"reqtxt": [
@@ -56,16 +56,16 @@
},
"icon": "wg_cj1_img01",
"taskcd": 200,
- "tasktime": 176,
+ "tasktime": 86,
"tasktxt": {
"key": "Entrustment details of Bobi",
"text": "这是属于波比的专属委托"
},
- "taskneed": 1,
+ "taskneed": 2,
"taskreq": [
{
"key": 1,
- "param": 9
+ "param": 26
}
],
"reqtxt": [
@@ -104,16 +104,16 @@
},
"icon": "wg_cj1_img01",
"taskcd": 200,
- "tasktime": 65,
+ "tasktime": 150,
"tasktxt": {
"key": "Entrustment details of Tiger",
"text": "这是属于悍娇虎的专属委托"
},
- "taskneed": 3,
+ "taskneed": 1,
"taskreq": [
{
"key": 1,
- "param": 4
+ "param": 30
}
],
"reqtxt": [
@@ -152,16 +152,16 @@
},
"icon": "wg_cj1_img01",
"taskcd": 200,
- "tasktime": 148,
+ "tasktime": 164,
"tasktxt": {
"key": "Entrustment details of Shifu",
"text": "这是属于师父的专属委托"
},
- "taskneed": 1,
+ "taskneed": 3,
"taskreq": [
{
"key": 1,
- "param": 28
+ "param": 1
}
],
"reqtxt": [
@@ -205,11 +205,11 @@
"key": "Entrustment details of Po",
"text": "这是属于阿宝的专属委托"
},
- "taskneed": 1,
+ "taskneed": 3,
"taskreq": [
{
"key": 1,
- "param": 12
+ "param": 18
}
],
"reqtxt": [
@@ -248,16 +248,16 @@
},
"icon": "wg_cj1_img01",
"taskcd": 200,
- "tasktime": 171,
+ "tasktime": 170,
"tasktxt": {
"key": "Entrustment details of Bobi",
"text": "这是属于波比的专属委托"
},
- "taskneed": 3,
+ "taskneed": 2,
"taskreq": [
{
"key": 1,
- "param": 4
+ "param": 18
}
],
"reqtxt": [
@@ -296,16 +296,16 @@
},
"icon": "wg_cj1_img01",
"taskcd": 200,
- "tasktime": 144,
+ "tasktime": 132,
"tasktxt": {
"key": "Entrustment details of Tiger",
"text": "这是属于悍娇虎的专属委托"
},
- "taskneed": 2,
+ "taskneed": 1,
"taskreq": [
{
"key": 1,
- "param": 14
+ "param": 27
}
],
"reqtxt": [
@@ -344,16 +344,16 @@
},
"icon": "wg_cj1_img01",
"taskcd": 200,
- "tasktime": 96,
+ "tasktime": 179,
"tasktxt": {
"key": "Entrustment details of Shifu",
"text": "这是属于师父的专属委托"
},
- "taskneed": 3,
+ "taskneed": 1,
"taskreq": [
{
"key": 1,
- "param": 6
+ "param": 16
}
],
"reqtxt": [
@@ -392,7 +392,7 @@
},
"icon": "wg_cj1_img01",
"taskcd": 200,
- "tasktime": 72,
+ "tasktime": 165,
"tasktxt": {
"key": "Entrustment details of Po",
"text": "这是属于阿宝的专属委托"
@@ -401,7 +401,7 @@
"taskreq": [
{
"key": 1,
- "param": 10
+ "param": 5
}
],
"reqtxt": [
@@ -440,16 +440,16 @@
},
"icon": "wg_cj1_img01",
"taskcd": 200,
- "tasktime": 146,
+ "tasktime": 164,
"tasktxt": {
"key": "Entrustment details of Bobi",
"text": "这是属于波比的专属委托"
},
- "taskneed": 3,
+ "taskneed": 2,
"taskreq": [
{
"key": 1,
- "param": 10
+ "param": 20
}
],
"reqtxt": [
@@ -488,12 +488,12 @@
},
"icon": "wg_cj1_img01",
"taskcd": 200,
- "tasktime": 154,
+ "tasktime": 66,
"tasktxt": {
"key": "Entrustment details of Tiger",
"text": "这是属于悍娇虎的专属委托"
},
- "taskneed": 2,
+ "taskneed": 1,
"taskreq": [
{
"key": 1,
@@ -536,7 +536,7 @@
},
"icon": "wg_cj1_img01",
"taskcd": 200,
- "tasktime": 103,
+ "tasktime": 75,
"tasktxt": {
"key": "Entrustment details of Shifu",
"text": "这是属于师父的专属委托"
@@ -545,7 +545,7 @@
"taskreq": [
{
"key": 1,
- "param": 14
+ "param": 7
}
],
"reqtxt": [
@@ -584,16 +584,16 @@
},
"icon": "wg_cj1_img01",
"taskcd": 200,
- "tasktime": 84,
+ "tasktime": 98,
"tasktxt": {
"key": "Entrustment details of Po",
"text": "这是属于阿宝的专属委托"
},
- "taskneed": 1,
+ "taskneed": 4,
"taskreq": [
{
"key": 1,
- "param": 1
+ "param": 27
}
],
"reqtxt": [
@@ -641,7 +641,7 @@
"taskreq": [
{
"key": 1,
- "param": 1
+ "param": 11
}
],
"reqtxt": [
@@ -680,16 +680,16 @@
},
"icon": "wg_cj1_img01",
"taskcd": 200,
- "tasktime": 160,
+ "tasktime": 80,
"tasktxt": {
"key": "Entrustment details of Tiger",
"text": "这是属于悍娇虎的专属委托"
},
- "taskneed": 2,
+ "taskneed": 4,
"taskreq": [
{
"key": 1,
- "param": 11
+ "param": 19
}
],
"reqtxt": [
@@ -728,16 +728,16 @@
},
"icon": "wg_cj1_img01",
"taskcd": 200,
- "tasktime": 75,
+ "tasktime": 74,
"tasktxt": {
"key": "Entrustment details of Shifu",
"text": "这是属于师父的专属委托"
},
- "taskneed": 2,
+ "taskneed": 4,
"taskreq": [
{
"key": 1,
- "param": 6
+ "param": 11
}
],
"reqtxt": [
@@ -776,7 +776,7 @@
},
"icon": "wg_cj1_img01",
"taskcd": 200,
- "tasktime": 107,
+ "tasktime": 163,
"tasktxt": {
"key": "Entrustment details of Po",
"text": "这是属于阿宝的专属委托"
@@ -785,7 +785,7 @@
"taskreq": [
{
"key": 1,
- "param": 30
+ "param": 2
}
],
"reqtxt": [
@@ -824,16 +824,16 @@
},
"icon": "wg_cj1_img01",
"taskcd": 200,
- "tasktime": 87,
+ "tasktime": 124,
"tasktxt": {
"key": "Entrustment details of Bobi",
"text": "这是属于波比的专属委托"
},
- "taskneed": 3,
+ "taskneed": 4,
"taskreq": [
{
"key": 1,
- "param": 10
+ "param": 18
}
],
"reqtxt": [
@@ -872,16 +872,16 @@
},
"icon": "wg_cj1_img01",
"taskcd": 200,
- "tasktime": 106,
+ "tasktime": 165,
"tasktxt": {
"key": "Entrustment details of Tiger",
"text": "这是属于悍娇虎的专属委托"
},
- "taskneed": 4,
+ "taskneed": 3,
"taskreq": [
{
"key": 1,
- "param": 12
+ "param": 29
}
],
"reqtxt": [
@@ -920,16 +920,16 @@
},
"icon": "wg_cj1_img01",
"taskcd": 200,
- "tasktime": 166,
+ "tasktime": 122,
"tasktxt": {
"key": "Entrustment details of Shifu",
"text": "这是属于师父的专属委托"
},
- "taskneed": 2,
+ "taskneed": 4,
"taskreq": [
{
"key": 1,
- "param": 8
+ "param": 24
}
],
"reqtxt": [
@@ -968,7 +968,7 @@
},
"icon": "wg_cj1_img01",
"taskcd": 200,
- "tasktime": 145,
+ "tasktime": 108,
"tasktxt": {
"key": "Entrustment details of Po",
"text": "这是属于阿宝的专属委托"
@@ -977,7 +977,7 @@
"taskreq": [
{
"key": 1,
- "param": 13
+ "param": 1
}
],
"reqtxt": [
@@ -1016,16 +1016,16 @@
},
"icon": "wg_cj1_img01",
"taskcd": 200,
- "tasktime": 142,
+ "tasktime": 82,
"tasktxt": {
"key": "Entrustment details of Bobi",
"text": "这是属于波比的专属委托"
},
- "taskneed": 2,
+ "taskneed": 4,
"taskreq": [
{
"key": 1,
- "param": 6
+ "param": 2
}
],
"reqtxt": [
@@ -1064,7 +1064,7 @@
},
"icon": "wg_cj1_img01",
"taskcd": 200,
- "tasktime": 67,
+ "tasktime": 61,
"tasktxt": {
"key": "Entrustment details of Tiger",
"text": "这是属于悍娇虎的专属委托"
@@ -1112,16 +1112,16 @@
},
"icon": "wg_cj1_img01",
"taskcd": 200,
- "tasktime": 179,
+ "tasktime": 142,
"tasktxt": {
"key": "Entrustment details of Shifu",
"text": "这是属于师父的专属委托"
},
- "taskneed": 3,
+ "taskneed": 1,
"taskreq": [
{
"key": 1,
- "param": 14
+ "param": 30
}
],
"reqtxt": [
@@ -1160,7 +1160,7 @@
},
"icon": "wg_cj1_img01",
"taskcd": 200,
- "tasktime": 64,
+ "tasktime": 171,
"tasktxt": {
"key": "Entrustment details of Po",
"text": "这是属于阿宝的专属委托"
@@ -1169,7 +1169,7 @@
"taskreq": [
{
"key": 1,
- "param": 10
+ "param": 27
}
],
"reqtxt": [
@@ -1208,16 +1208,16 @@
},
"icon": "wg_cj1_img01",
"taskcd": 200,
- "tasktime": 71,
+ "tasktime": 76,
"tasktxt": {
"key": "Entrustment details of Bobi",
"text": "这是属于波比的专属委托"
},
- "taskneed": 1,
+ "taskneed": 2,
"taskreq": [
{
"key": 1,
- "param": 8
+ "param": 30
}
],
"reqtxt": [
@@ -1256,7 +1256,7 @@
},
"icon": "wg_cj1_img01",
"taskcd": 200,
- "tasktime": 60,
+ "tasktime": 177,
"tasktxt": {
"key": "Entrustment details of Tiger",
"text": "这是属于悍娇虎的专属委托"
@@ -1265,7 +1265,7 @@
"taskreq": [
{
"key": 1,
- "param": 3
+ "param": 17
}
],
"reqtxt": [
@@ -1304,16 +1304,16 @@
},
"icon": "wg_cj1_img01",
"taskcd": 200,
- "tasktime": 137,
+ "tasktime": 60,
"tasktxt": {
"key": "Entrustment details of Shifu",
"text": "这是属于师父的专属委托"
},
- "taskneed": 3,
+ "taskneed": 1,
"taskreq": [
{
"key": 1,
- "param": 6
+ "param": 22
}
],
"reqtxt": [
@@ -1352,16 +1352,16 @@
},
"icon": "wg_cj1_img01",
"taskcd": 200,
- "tasktime": 122,
+ "tasktime": 95,
"tasktxt": {
"key": "Entrustment details of Po",
"text": "这是属于阿宝的专属委托"
},
- "taskneed": 1,
+ "taskneed": 3,
"taskreq": [
{
"key": 1,
- "param": 6
+ "param": 9
}
],
"reqtxt": [
@@ -1400,7 +1400,7 @@
},
"icon": "wg_cj1_img01",
"taskcd": 200,
- "tasktime": 130,
+ "tasktime": 121,
"tasktxt": {
"key": "Entrustment details of Bobi",
"text": "这是属于波比的专属委托"
@@ -1409,7 +1409,7 @@
"taskreq": [
{
"key": 1,
- "param": 19
+ "param": 21
}
],
"reqtxt": [
@@ -1448,7 +1448,7 @@
},
"icon": "wg_cj1_img01",
"taskcd": 200,
- "tasktime": 88,
+ "tasktime": 69,
"tasktxt": {
"key": "Entrustment details of Tiger",
"text": "这是属于悍娇虎的专属委托"
@@ -1457,7 +1457,7 @@
"taskreq": [
{
"key": 1,
- "param": 25
+ "param": 15
}
],
"reqtxt": [
@@ -1496,7 +1496,7 @@
},
"icon": "wg_cj1_img01",
"taskcd": 200,
- "tasktime": 151,
+ "tasktime": 85,
"tasktxt": {
"key": "Entrustment details of Shifu",
"text": "这是属于师父的专属委托"
@@ -1505,7 +1505,7 @@
"taskreq": [
{
"key": 1,
- "param": 21
+ "param": 6
}
],
"reqtxt": [
@@ -1544,16 +1544,16 @@
},
"icon": "wg_cj1_img01",
"taskcd": 200,
- "tasktime": 122,
+ "tasktime": 92,
"tasktxt": {
"key": "Entrustment details of Po",
"text": "这是属于阿宝的专属委托"
},
- "taskneed": 4,
+ "taskneed": 1,
"taskreq": [
{
"key": 1,
- "param": 2
+ "param": 11
}
],
"reqtxt": [
@@ -1592,16 +1592,16 @@
},
"icon": "wg_cj1_img01",
"taskcd": 200,
- "tasktime": 117,
+ "tasktime": 156,
"tasktxt": {
"key": "Entrustment details of Bobi",
"text": "这是属于波比的专属委托"
},
- "taskneed": 3,
+ "taskneed": 2,
"taskreq": [
{
"key": 1,
- "param": 12
+ "param": 20
}
],
"reqtxt": [
@@ -1640,16 +1640,16 @@
},
"icon": "wg_cj1_img01",
"taskcd": 200,
- "tasktime": 128,
+ "tasktime": 65,
"tasktxt": {
"key": "Entrustment details of Tiger",
"text": "这是属于悍娇虎的专属委托"
},
- "taskneed": 4,
+ "taskneed": 2,
"taskreq": [
{
"key": 1,
- "param": 4
+ "param": 16
}
],
"reqtxt": [
@@ -1688,16 +1688,16 @@
},
"icon": "wg_cj1_img01",
"taskcd": 200,
- "tasktime": 146,
+ "tasktime": 174,
"tasktxt": {
"key": "Entrustment details of Shifu",
"text": "这是属于师父的专属委托"
},
- "taskneed": 3,
+ "taskneed": 4,
"taskreq": [
{
"key": 1,
- "param": 14
+ "param": 3
}
],
"reqtxt": [
@@ -1736,16 +1736,16 @@
},
"icon": "wg_cj1_img01",
"taskcd": 200,
- "tasktime": 118,
+ "tasktime": 106,
"tasktxt": {
"key": "Entrustment details of Po",
"text": "这是属于阿宝的专属委托"
},
- "taskneed": 2,
+ "taskneed": 1,
"taskreq": [
{
"key": 1,
- "param": 22
+ "param": 21
}
],
"reqtxt": [
@@ -1784,12 +1784,12 @@
},
"icon": "wg_cj1_img01",
"taskcd": 200,
- "tasktime": 164,
+ "tasktime": 160,
"tasktxt": {
"key": "Entrustment details of Bobi",
"text": "这是属于波比的专属委托"
},
- "taskneed": 1,
+ "taskneed": 3,
"taskreq": [
{
"key": 1,
@@ -1832,16 +1832,16 @@
},
"icon": "wg_cj1_img01",
"taskcd": 200,
- "tasktime": 67,
+ "tasktime": 66,
"tasktxt": {
"key": "Entrustment details of Tiger",
"text": "这是属于悍娇虎的专属委托"
},
- "taskneed": 3,
+ "taskneed": 1,
"taskreq": [
{
"key": 1,
- "param": 26
+ "param": 7
}
],
"reqtxt": [
@@ -1880,7 +1880,7 @@
},
"icon": "wg_cj1_img01",
"taskcd": 200,
- "tasktime": 60,
+ "tasktime": 101,
"tasktxt": {
"key": "Entrustment details of Shifu",
"text": "这是属于师父的专属委托"
@@ -1889,7 +1889,7 @@
"taskreq": [
{
"key": 1,
- "param": 10
+ "param": 21
}
],
"reqtxt": [
@@ -1928,16 +1928,16 @@
},
"icon": "wg_cj1_img01",
"taskcd": 200,
- "tasktime": 159,
+ "tasktime": 92,
"tasktxt": {
"key": "Entrustment details of Po",
"text": "这是属于阿宝的专属委托"
},
- "taskneed": 2,
+ "taskneed": 4,
"taskreq": [
{
"key": 1,
- "param": 3
+ "param": 8
}
],
"reqtxt": [
@@ -1976,16 +1976,16 @@
},
"icon": "wg_cj1_img01",
"taskcd": 200,
- "tasktime": 61,
+ "tasktime": 177,
"tasktxt": {
"key": "Entrustment details of Bobi",
"text": "这是属于波比的专属委托"
},
- "taskneed": 3,
+ "taskneed": 1,
"taskreq": [
{
"key": 1,
- "param": 11
+ "param": 3
}
],
"reqtxt": [
@@ -2024,16 +2024,16 @@
},
"icon": "wg_cj1_img01",
"taskcd": 200,
- "tasktime": 69,
+ "tasktime": 72,
"tasktxt": {
"key": "Entrustment details of Tiger",
"text": "这是属于悍娇虎的专属委托"
},
- "taskneed": 3,
+ "taskneed": 2,
"taskreq": [
{
"key": 1,
- "param": 24
+ "param": 8
}
],
"reqtxt": [
@@ -2072,7 +2072,7 @@
},
"icon": "wg_cj1_img01",
"taskcd": 200,
- "tasktime": 61,
+ "tasktime": 107,
"tasktxt": {
"key": "Entrustment details of Shifu",
"text": "这是属于师父的专属委托"
@@ -2081,7 +2081,7 @@
"taskreq": [
{
"key": 1,
- "param": 19
+ "param": 2
}
],
"reqtxt": [
@@ -2120,16 +2120,16 @@
},
"icon": "wg_cj1_img01",
"taskcd": 200,
- "tasktime": 168,
+ "tasktime": 151,
"tasktxt": {
"key": "Entrustment details of Po",
"text": "这是属于阿宝的专属委托"
},
- "taskneed": 3,
+ "taskneed": 4,
"taskreq": [
{
"key": 1,
- "param": 10
+ "param": 25
}
],
"reqtxt": [
@@ -2168,16 +2168,16 @@
},
"icon": "wg_cj1_img01",
"taskcd": 200,
- "tasktime": 158,
+ "tasktime": 109,
"tasktxt": {
"key": "Entrustment details of Bobi",
"text": "这是属于波比的专属委托"
},
- "taskneed": 4,
+ "taskneed": 3,
"taskreq": [
{
"key": 1,
- "param": 27
+ "param": 25
}
],
"reqtxt": [
@@ -2216,7 +2216,7 @@
},
"icon": "wg_cj1_img01",
"taskcd": 200,
- "tasktime": 84,
+ "tasktime": 143,
"tasktxt": {
"key": "Entrustment details of Tiger",
"text": "这是属于悍娇虎的专属委托"
@@ -2225,7 +2225,7 @@
"taskreq": [
{
"key": 1,
- "param": 6
+ "param": 18
}
],
"reqtxt": [
@@ -2264,7 +2264,7 @@
},
"icon": "wg_cj1_img01",
"taskcd": 200,
- "tasktime": 100,
+ "tasktime": 115,
"tasktxt": {
"key": "Entrustment details of Shifu",
"text": "这是属于师父的专属委托"
@@ -2273,7 +2273,7 @@
"taskreq": [
{
"key": 1,
- "param": 27
+ "param": 8
}
],
"reqtxt": [
@@ -2312,16 +2312,16 @@
},
"icon": "wg_cj1_img01",
"taskcd": 200,
- "tasktime": 78,
+ "tasktime": 131,
"tasktxt": {
"key": "Entrustment details of Po",
"text": "这是属于阿宝的专属委托"
},
- "taskneed": 3,
+ "taskneed": 4,
"taskreq": [
{
"key": 1,
- "param": 15
+ "param": 11
}
],
"reqtxt": [
@@ -2360,16 +2360,16 @@
},
"icon": "wg_cj1_img01",
"taskcd": 200,
- "tasktime": 103,
+ "tasktime": 112,
"tasktxt": {
"key": "Entrustment details of Bobi",
"text": "这是属于波比的专属委托"
},
- "taskneed": 3,
+ "taskneed": 4,
"taskreq": [
{
"key": 1,
- "param": 8
+ "param": 6
}
],
"reqtxt": [
@@ -2408,7 +2408,7 @@
},
"icon": "wg_cj1_img01",
"taskcd": 200,
- "tasktime": 144,
+ "tasktime": 180,
"tasktxt": {
"key": "Entrustment details of Tiger",
"text": "这是属于悍娇虎的专属委托"
@@ -2417,7 +2417,7 @@
"taskreq": [
{
"key": 1,
- "param": 11
+ "param": 28
}
],
"reqtxt": [
@@ -2456,16 +2456,16 @@
},
"icon": "wg_cj1_img01",
"taskcd": 200,
- "tasktime": 151,
+ "tasktime": 160,
"tasktxt": {
"key": "Entrustment details of Shifu",
"text": "这是属于师父的专属委托"
},
- "taskneed": 4,
+ "taskneed": 3,
"taskreq": [
{
"key": 1,
- "param": 16
+ "param": 5
}
],
"reqtxt": [
@@ -2504,12 +2504,12 @@
},
"icon": "wg_cj1_img01",
"taskcd": 200,
- "tasktime": 154,
+ "tasktime": 70,
"tasktxt": {
"key": "Entrustment details of Po",
"text": "这是属于阿宝的专属委托"
},
- "taskneed": 3,
+ "taskneed": 1,
"taskreq": [
{
"key": 1,
@@ -2552,12 +2552,12 @@
},
"icon": "wg_cj1_img01",
"taskcd": 200,
- "tasktime": 94,
+ "tasktime": 159,
"tasktxt": {
"key": "Entrustment details of Bobi",
"text": "这是属于波比的专属委托"
},
- "taskneed": 3,
+ "taskneed": 2,
"taskreq": [
{
"key": 1,
@@ -2600,16 +2600,16 @@
},
"icon": "wg_cj1_img01",
"taskcd": 200,
- "tasktime": 82,
+ "tasktime": 159,
"tasktxt": {
"key": "Entrustment details of Tiger",
"text": "这是属于悍娇虎的专属委托"
},
- "taskneed": 1,
+ "taskneed": 2,
"taskreq": [
{
"key": 1,
- "param": 4
+ "param": 22
}
],
"reqtxt": [
@@ -2648,16 +2648,16 @@
},
"icon": "wg_cj1_img01",
"taskcd": 200,
- "tasktime": 60,
+ "tasktime": 114,
"tasktxt": {
"key": "Entrustment details of Shifu",
"text": "这是属于师父的专属委托"
},
- "taskneed": 1,
+ "taskneed": 3,
"taskreq": [
{
"key": 1,
- "param": 6
+ "param": 30
}
],
"reqtxt": [
@@ -2696,16 +2696,16 @@
},
"icon": "wg_cj1_img01",
"taskcd": 200,
- "tasktime": 156,
+ "tasktime": 169,
"tasktxt": {
"key": "Entrustment details of Po",
"text": "这是属于阿宝的专属委托"
},
- "taskneed": 1,
+ "taskneed": 4,
"taskreq": [
{
"key": 1,
- "param": 28
+ "param": 21
}
],
"reqtxt": [
@@ -2744,12 +2744,12 @@
},
"icon": "wg_cj1_img01",
"taskcd": 200,
- "tasktime": 116,
+ "tasktime": 105,
"tasktxt": {
"key": "Entrustment details of Bobi",
"text": "这是属于波比的专属委托"
},
- "taskneed": 4,
+ "taskneed": 1,
"taskreq": [
{
"key": 1,
@@ -2792,16 +2792,16 @@
},
"icon": "wg_cj1_img01",
"taskcd": 200,
- "tasktime": 102,
+ "tasktime": 137,
"tasktxt": {
"key": "Entrustment details of Tiger",
"text": "这是属于悍娇虎的专属委托"
},
- "taskneed": 1,
+ "taskneed": 4,
"taskreq": [
{
"key": 1,
- "param": 2
+ "param": 24
}
],
"reqtxt": [
@@ -2840,16 +2840,16 @@
},
"icon": "wg_cj1_img01",
"taskcd": 200,
- "tasktime": 134,
+ "tasktime": 141,
"tasktxt": {
"key": "Entrustment details of Shifu",
"text": "这是属于师父的专属委托"
},
- "taskneed": 2,
+ "taskneed": 1,
"taskreq": [
{
"key": 1,
- "param": 8
+ "param": 3
}
],
"reqtxt": [
@@ -2888,16 +2888,16 @@
},
"icon": "wg_cj1_img01",
"taskcd": 200,
- "tasktime": 103,
+ "tasktime": 62,
"tasktxt": {
"key": "Entrustment details of Po",
"text": "这是属于阿宝的专属委托"
},
- "taskneed": 3,
+ "taskneed": 4,
"taskreq": [
{
"key": 1,
- "param": 18
+ "param": 27
}
],
"reqtxt": [
@@ -2936,16 +2936,16 @@
},
"icon": "wg_cj1_img01",
"taskcd": 200,
- "tasktime": 154,
+ "tasktime": 60,
"tasktxt": {
"key": "Entrustment details of Bobi",
"text": "这是属于波比的专属委托"
},
- "taskneed": 1,
+ "taskneed": 4,
"taskreq": [
{
"key": 1,
- "param": 30
+ "param": 27
}
],
"reqtxt": [
@@ -2984,16 +2984,16 @@
},
"icon": "wg_cj1_img01",
"taskcd": 200,
- "tasktime": 179,
+ "tasktime": 126,
"tasktxt": {
"key": "Entrustment details of Tiger",
"text": "这是属于悍娇虎的专属委托"
},
- "taskneed": 2,
+ "taskneed": 4,
"taskreq": [
{
"key": 1,
- "param": 21
+ "param": 11
}
],
"reqtxt": [
@@ -3032,16 +3032,16 @@
},
"icon": "wg_cj1_img01",
"taskcd": 200,
- "tasktime": 170,
+ "tasktime": 90,
"tasktxt": {
"key": "Entrustment details of Shifu",
"text": "这是属于师父的专属委托"
},
- "taskneed": 1,
+ "taskneed": 2,
"taskreq": [
{
"key": 1,
- "param": 5
+ "param": 18
}
],
"reqtxt": [
@@ -3080,12 +3080,12 @@
},
"icon": "wg_cj1_img01",
"taskcd": 200,
- "tasktime": 118,
+ "tasktime": 139,
"tasktxt": {
"key": "Entrustment details of Po",
"text": "这是属于阿宝的专属委托"
},
- "taskneed": 1,
+ "taskneed": 2,
"taskreq": [
{
"key": 1,
@@ -3128,7 +3128,7 @@
},
"icon": "wg_cj1_img01",
"taskcd": 200,
- "tasktime": 91,
+ "tasktime": 74,
"tasktxt": {
"key": "Entrustment details of Bobi",
"text": "这是属于波比的专属委托"
@@ -3137,7 +3137,7 @@
"taskreq": [
{
"key": 1,
- "param": 21
+ "param": 2
}
],
"reqtxt": [
@@ -3176,16 +3176,16 @@
},
"icon": "wg_cj1_img01",
"taskcd": 200,
- "tasktime": 117,
+ "tasktime": 111,
"tasktxt": {
"key": "Entrustment details of Tiger",
"text": "这是属于悍娇虎的专属委托"
},
- "taskneed": 1,
+ "taskneed": 2,
"taskreq": [
{
"key": 1,
- "param": 1
+ "param": 19
}
],
"reqtxt": [
@@ -3224,16 +3224,16 @@
},
"icon": "wg_cj1_img01",
"taskcd": 200,
- "tasktime": 141,
+ "tasktime": 161,
"tasktxt": {
"key": "Entrustment details of Shifu",
"text": "这是属于师父的专属委托"
},
- "taskneed": 4,
+ "taskneed": 2,
"taskreq": [
{
"key": 1,
- "param": 14
+ "param": 21
}
],
"reqtxt": [
@@ -3272,16 +3272,16 @@
},
"icon": "wg_cj1_img01",
"taskcd": 200,
- "tasktime": 99,
+ "tasktime": 70,
"tasktxt": {
"key": "Entrustment details of Po",
"text": "这是属于阿宝的专属委托"
},
- "taskneed": 4,
+ "taskneed": 1,
"taskreq": [
{
"key": 1,
- "param": 16
+ "param": 20
}
],
"reqtxt": [
@@ -3320,16 +3320,16 @@
},
"icon": "wg_cj1_img01",
"taskcd": 200,
- "tasktime": 171,
+ "tasktime": 61,
"tasktxt": {
"key": "Entrustment details of Bobi",
"text": "这是属于波比的专属委托"
},
- "taskneed": 1,
+ "taskneed": 4,
"taskreq": [
{
"key": 1,
- "param": 4
+ "param": 16
}
],
"reqtxt": [
@@ -3368,16 +3368,16 @@
},
"icon": "wg_cj1_img01",
"taskcd": 200,
- "tasktime": 107,
+ "tasktime": 96,
"tasktxt": {
"key": "Entrustment details of Tiger",
"text": "这是属于悍娇虎的专属委托"
},
- "taskneed": 1,
+ "taskneed": 2,
"taskreq": [
{
"key": 1,
- "param": 2
+ "param": 9
}
],
"reqtxt": [
@@ -3416,16 +3416,16 @@
},
"icon": "wg_cj1_img01",
"taskcd": 200,
- "tasktime": 65,
+ "tasktime": 170,
"tasktxt": {
"key": "Entrustment details of Shifu",
"text": "这是属于师父的专属委托"
},
- "taskneed": 1,
+ "taskneed": 4,
"taskreq": [
{
"key": 1,
- "param": 25
+ "param": 22
}
],
"reqtxt": [
@@ -3464,16 +3464,16 @@
},
"icon": "wg_cj1_img01",
"taskcd": 200,
- "tasktime": 84,
+ "tasktime": 98,
"tasktxt": {
"key": "Entrustment details of Po",
"text": "这是属于阿宝的专属委托"
},
- "taskneed": 4,
+ "taskneed": 2,
"taskreq": [
{
"key": 1,
- "param": 9
+ "param": 20
}
],
"reqtxt": [
@@ -3512,7 +3512,7 @@
},
"icon": "wg_cj1_img01",
"taskcd": 200,
- "tasktime": 80,
+ "tasktime": 75,
"tasktxt": {
"key": "Entrustment details of Bobi",
"text": "这是属于波比的专属委托"
@@ -3521,7 +3521,7 @@
"taskreq": [
{
"key": 1,
- "param": 2
+ "param": 12
}
],
"reqtxt": [
diff --git a/bin/json/game_item.json b/bin/json/game_item.json
index b0c355ae2..7155f3d72 100644
--- a/bin/json/game_item.json
+++ b/bin/json/game_item.json
@@ -10258,5 +10258,665 @@
"key": "skilluptoolstxt_615005",
"text": "亚力克斯守护之心不足"
}
+ },
+ {
+ "id": "132000",
+ "name": {
+ "key": "item_name_130200",
+ "text": "垃圾菜"
+ },
+ "usetype": 13,
+ "color": 1,
+ "bagtype": 1,
+ "index": 99,
+ "special_type": 0,
+ "time": 0,
+ "effects": "",
+ "box_id": 0,
+ "synthetize_num": 0,
+ "access": [
+ 107
+ ],
+ "use_skip": 166,
+ "upper_limit": 999,
+ "uselv": 0,
+ "isani": 0,
+ "star": 0,
+ "race": 0,
+ "img": "wp_icon_10019",
+ "ico": "wp_icon_10019",
+ "intr": {
+ "key": "item_intr_132000",
+ "text": "就是垃圾"
+ },
+ "sale": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 1000
+ }
+ ],
+ "synthetize_deplete": [],
+ "decompose_deplete": [],
+ "tipstxt": {
+ "key": "item_tipstxt_132000",
+ "text": "土豆不足"
+ }
+ },
+ {
+ "id": "132001",
+ "name": {
+ "key": "item_name_130201",
+ "text": "肉包子"
+ },
+ "usetype": 13,
+ "color": 3,
+ "bagtype": 1,
+ "index": 99,
+ "special_type": 0,
+ "time": 0,
+ "effects": "",
+ "box_id": 0,
+ "synthetize_num": 0,
+ "access": [
+ 107
+ ],
+ "use_skip": 166,
+ "upper_limit": 999,
+ "uselv": 0,
+ "isani": 0,
+ "star": 0,
+ "race": 0,
+ "img": "wp_icon_10020",
+ "ico": "wp_icon_10020",
+ "intr": {
+ "key": "item_intr_132001",
+ "text": "需要面粉和肉"
+ },
+ "sale": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 1000
+ }
+ ],
+ "synthetize_deplete": [],
+ "decompose_deplete": [],
+ "tipstxt": {
+ "key": "item_tipstxt_132001",
+ "text": "粗盐不足"
+ }
+ },
+ {
+ "id": "132002",
+ "name": {
+ "key": "item_name_130202",
+ "text": "土豆炖肉"
+ },
+ "usetype": 13,
+ "color": 4,
+ "bagtype": 1,
+ "index": 1,
+ "special_type": 0,
+ "time": 0,
+ "effects": "",
+ "box_id": 0,
+ "synthetize_num": 0,
+ "access": [
+ 107
+ ],
+ "use_skip": 166,
+ "upper_limit": 999,
+ "uselv": 0,
+ "isani": 0,
+ "star": 0,
+ "race": 0,
+ "img": "wp_icon_10021",
+ "ico": "wp_icon_10021",
+ "intr": {
+ "key": "item_intr_132002",
+ "text": "需要土豆和肉"
+ },
+ "sale": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 1000
+ }
+ ],
+ "synthetize_deplete": [],
+ "decompose_deplete": [],
+ "tipstxt": {
+ "key": "item_tipstxt_132002",
+ "text": "青椒不足"
+ }
+ },
+ {
+ "id": "132003",
+ "name": {
+ "key": "item_name_130203",
+ "text": "青椒炒肉"
+ },
+ "usetype": 13,
+ "color": 4,
+ "bagtype": 1,
+ "index": 2,
+ "special_type": 0,
+ "time": 0,
+ "effects": "",
+ "box_id": 0,
+ "synthetize_num": 0,
+ "access": [
+ 107
+ ],
+ "use_skip": 166,
+ "upper_limit": 999,
+ "uselv": 0,
+ "isani": 0,
+ "star": 0,
+ "race": 0,
+ "img": "wp_icon_10031",
+ "ico": "wp_icon_10031",
+ "intr": {
+ "key": "item_intr_132003",
+ "text": "需要青椒和肉"
+ },
+ "sale": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 1000
+ }
+ ],
+ "synthetize_deplete": [],
+ "decompose_deplete": [],
+ "tipstxt": {
+ "key": "item_tipstxt_132003",
+ "text": "面粉不足"
+ }
+ },
+ {
+ "id": "132004",
+ "name": {
+ "key": "item_name_130204",
+ "text": "虎皮青椒"
+ },
+ "usetype": 13,
+ "color": 3,
+ "bagtype": 1,
+ "index": 3,
+ "special_type": 0,
+ "time": 0,
+ "effects": "",
+ "box_id": 0,
+ "synthetize_num": 0,
+ "access": [
+ 107
+ ],
+ "use_skip": 166,
+ "upper_limit": 999,
+ "uselv": 0,
+ "isani": 0,
+ "star": 0,
+ "race": 0,
+ "img": "wp_icon_10032",
+ "ico": "wp_icon_10032",
+ "intr": {
+ "key": "item_intr_132004",
+ "text": "需要青椒和盐"
+ },
+ "sale": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 1000
+ }
+ ],
+ "synthetize_deplete": [],
+ "decompose_deplete": [],
+ "tipstxt": {
+ "key": "item_tipstxt_132004",
+ "text": "肉不足"
+ }
+ },
+ {
+ "id": "132005",
+ "name": {
+ "key": "item_name_130205",
+ "text": "面条"
+ },
+ "usetype": 13,
+ "color": 3,
+ "bagtype": 1,
+ "index": 4,
+ "special_type": 0,
+ "time": 0,
+ "effects": "",
+ "box_id": 0,
+ "synthetize_num": 0,
+ "access": [
+ 107
+ ],
+ "use_skip": 166,
+ "upper_limit": 999,
+ "uselv": 0,
+ "isani": 0,
+ "star": 0,
+ "race": 0,
+ "img": "wp_icon_10033",
+ "ico": "wp_icon_10033",
+ "intr": {
+ "key": "item_intr_132005",
+ "text": "需要面粉"
+ },
+ "sale": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 1000
+ }
+ ],
+ "synthetize_deplete": [],
+ "decompose_deplete": [],
+ "tipstxt": {
+ "key": "item_tipstxt_132005",
+ "text": "肉包子不足"
+ }
+ },
+ {
+ "id": "132006",
+ "name": {
+ "key": "item_name_130206",
+ "text": "锅包肉"
+ },
+ "usetype": 13,
+ "color": 3,
+ "bagtype": 1,
+ "index": 5,
+ "special_type": 0,
+ "time": 0,
+ "effects": "",
+ "box_id": 0,
+ "synthetize_num": 0,
+ "access": [
+ 107
+ ],
+ "use_skip": 166,
+ "upper_limit": 999,
+ "uselv": 0,
+ "isani": 0,
+ "star": 0,
+ "race": 0,
+ "img": "wp_icon_10034",
+ "ico": "wp_icon_10034",
+ "intr": {
+ "key": "item_intr_132006",
+ "text": "需要面粉和肉"
+ },
+ "sale": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 1000
+ }
+ ],
+ "synthetize_deplete": [],
+ "decompose_deplete": [],
+ "tipstxt": {
+ "key": "item_tipstxt_132006",
+ "text": "土豆炖肉不足"
+ }
+ },
+ {
+ "id": "132007",
+ "name": {
+ "key": "item_name_130207",
+ "text": "烤肉"
+ },
+ "usetype": 13,
+ "color": 3,
+ "bagtype": 1,
+ "index": 6,
+ "special_type": 0,
+ "time": 0,
+ "effects": "effect_ui_wuping_1",
+ "box_id": 0,
+ "synthetize_num": 0,
+ "access": [
+ 107
+ ],
+ "use_skip": 166,
+ "upper_limit": 999,
+ "uselv": 0,
+ "isani": 0,
+ "star": 0,
+ "race": 0,
+ "img": "wp_icon_10031",
+ "ico": "wp_icon_10031",
+ "intr": {
+ "key": "item_intr_132007",
+ "text": "需要肉"
+ },
+ "sale": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 1000
+ }
+ ],
+ "synthetize_deplete": [],
+ "decompose_deplete": [],
+ "tipstxt": {
+ "key": "item_tipstxt_132007",
+ "text": "青椒炒肉不足"
+ }
+ },
+ {
+ "id": "132008",
+ "name": {
+ "key": "item_name_130208",
+ "text": "岩盐烤肉"
+ },
+ "usetype": 13,
+ "color": 3,
+ "bagtype": 1,
+ "index": 7,
+ "special_type": 0,
+ "time": 0,
+ "effects": "effect_ui_wuping_1",
+ "box_id": 0,
+ "synthetize_num": 0,
+ "access": [
+ 107
+ ],
+ "use_skip": 166,
+ "upper_limit": 999,
+ "uselv": 0,
+ "isani": 0,
+ "star": 0,
+ "race": 0,
+ "img": "wp_icon_10032",
+ "ico": "wp_icon_10032",
+ "intr": {
+ "key": "item_intr_132008",
+ "text": "需要粗盐和肉"
+ },
+ "sale": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 1000
+ }
+ ],
+ "synthetize_deplete": [],
+ "decompose_deplete": [],
+ "tipstxt": {
+ "key": "item_tipstxt_132008",
+ "text": "虎皮青椒不足"
+ }
+ },
+ {
+ "id": "132009",
+ "name": {
+ "key": "item_name_130209",
+ "text": "烤土豆"
+ },
+ "usetype": 13,
+ "color": 3,
+ "bagtype": 1,
+ "index": 8,
+ "special_type": 0,
+ "time": 0,
+ "effects": "",
+ "box_id": 0,
+ "synthetize_num": 0,
+ "access": [
+ 107
+ ],
+ "use_skip": 166,
+ "upper_limit": 999,
+ "uselv": 0,
+ "isani": 0,
+ "star": 0,
+ "race": 0,
+ "img": "wp_icon_10033",
+ "ico": "wp_icon_10033",
+ "intr": {
+ "key": "item_intr_132009",
+ "text": "需要土豆"
+ },
+ "sale": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 1000
+ }
+ ],
+ "synthetize_deplete": [],
+ "decompose_deplete": [],
+ "tipstxt": {
+ "key": "item_tipstxt_132009",
+ "text": "面条不足"
+ }
+ },
+ {
+ "id": "131001",
+ "name": {
+ "key": "item_name_130101",
+ "text": "土豆"
+ },
+ "usetype": 13,
+ "color": 2,
+ "bagtype": 1,
+ "index": 9,
+ "special_type": 0,
+ "time": 0,
+ "effects": "",
+ "box_id": 0,
+ "synthetize_num": 0,
+ "access": [
+ 107
+ ],
+ "use_skip": 166,
+ "upper_limit": 999,
+ "uselv": 0,
+ "isani": 0,
+ "star": 0,
+ "race": 0,
+ "img": "wp_icon_10034",
+ "ico": "wp_icon_10034",
+ "intr": {
+ "key": "item_intr_131001",
+ "text": "就是土豆"
+ },
+ "sale": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 1000
+ }
+ ],
+ "synthetize_deplete": [],
+ "decompose_deplete": [],
+ "tipstxt": {
+ "key": "item_tipstxt_131001",
+ "text": "锅包肉不足"
+ }
+ },
+ {
+ "id": "131002",
+ "name": {
+ "key": "item_name_130102",
+ "text": "粗盐"
+ },
+ "usetype": 13,
+ "color": 2,
+ "bagtype": 1,
+ "index": 10,
+ "special_type": 0,
+ "time": 0,
+ "effects": "",
+ "box_id": 0,
+ "synthetize_num": 0,
+ "access": [
+ 107
+ ],
+ "use_skip": 166,
+ "upper_limit": 999,
+ "uselv": 0,
+ "isani": 0,
+ "star": 0,
+ "race": 0,
+ "img": "wp_icon_10031",
+ "ico": "wp_icon_10031",
+ "intr": {
+ "key": "item_intr_131002",
+ "text": "就是粗盐"
+ },
+ "sale": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 1000
+ }
+ ],
+ "synthetize_deplete": [],
+ "decompose_deplete": [],
+ "tipstxt": {
+ "key": "item_tipstxt_131002",
+ "text": "烤肉不足"
+ }
+ },
+ {
+ "id": "131003",
+ "name": {
+ "key": "item_name_130103",
+ "text": "青椒"
+ },
+ "usetype": 13,
+ "color": 2,
+ "bagtype": 1,
+ "index": 11,
+ "special_type": 0,
+ "time": 0,
+ "effects": "",
+ "box_id": 0,
+ "synthetize_num": 0,
+ "access": [
+ 107
+ ],
+ "use_skip": 166,
+ "upper_limit": 999,
+ "uselv": 0,
+ "isani": 0,
+ "star": 0,
+ "race": 0,
+ "img": "wp_icon_10032",
+ "ico": "wp_icon_10032",
+ "intr": {
+ "key": "item_intr_131003",
+ "text": "就是青椒"
+ },
+ "sale": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 1000
+ }
+ ],
+ "synthetize_deplete": [],
+ "decompose_deplete": [],
+ "tipstxt": {
+ "key": "item_tipstxt_131003",
+ "text": "岩盐烤肉不足"
+ }
+ },
+ {
+ "id": "131004",
+ "name": {
+ "key": "item_name_130104",
+ "text": "面粉"
+ },
+ "usetype": 13,
+ "color": 2,
+ "bagtype": 1,
+ "index": 12,
+ "special_type": 0,
+ "time": 0,
+ "effects": "",
+ "box_id": 0,
+ "synthetize_num": 0,
+ "access": [
+ 107
+ ],
+ "use_skip": 166,
+ "upper_limit": 999,
+ "uselv": 0,
+ "isani": 0,
+ "star": 0,
+ "race": 0,
+ "img": "wp_icon_10033",
+ "ico": "wp_icon_10033",
+ "intr": {
+ "key": "item_intr_131004",
+ "text": "就是面粉"
+ },
+ "sale": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 1000
+ }
+ ],
+ "synthetize_deplete": [],
+ "decompose_deplete": [],
+ "tipstxt": {
+ "key": "item_tipstxt_131004",
+ "text": "烤土豆不足"
+ }
+ },
+ {
+ "id": "131005",
+ "name": {
+ "key": "item_name_130105",
+ "text": "肉"
+ },
+ "usetype": 13,
+ "color": 2,
+ "bagtype": 1,
+ "index": 13,
+ "special_type": 0,
+ "time": 0,
+ "effects": "",
+ "box_id": 0,
+ "synthetize_num": 0,
+ "access": [
+ 107
+ ],
+ "use_skip": 166,
+ "upper_limit": 999,
+ "uselv": 0,
+ "isani": 0,
+ "star": 0,
+ "race": 0,
+ "img": "wp_icon_10034",
+ "ico": "wp_icon_10034",
+ "intr": {
+ "key": "item_intr_131005",
+ "text": "就是肉"
+ },
+ "sale": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 1000
+ }
+ ],
+ "synthetize_deplete": [],
+ "decompose_deplete": [],
+ "tipstxt": {
+ "key": "item_tipstxt_131005",
+ "text": "垃圾菜不足"
+ }
}
]
\ No newline at end of file
diff --git a/bin/json/game_newsmithy.json b/bin/json/game_newsmithy.json
index a40d0f2e4..403727701 100644
--- a/bin/json/game_newsmithy.json
+++ b/bin/json/game_newsmithy.json
@@ -42,7 +42,8 @@
100,
0,
0
- ]
+ ],
+ "light_velocity": 3000
},
{
"id": 2,
@@ -88,7 +89,8 @@
70,
30,
0
- ]
+ ],
+ "light_velocity": 2900
},
{
"id": 3,
@@ -135,7 +137,8 @@
50,
30,
20
- ]
+ ],
+ "light_velocity": 2800
},
{
"id": 4,
@@ -181,7 +184,8 @@
70,
30,
0
- ]
+ ],
+ "light_velocity": 2700
},
{
"id": 5,
@@ -228,7 +232,8 @@
50,
30,
20
- ]
+ ],
+ "light_velocity": 2600
},
{
"id": 6,
@@ -274,7 +279,8 @@
70,
30,
0
- ]
+ ],
+ "light_velocity": 2500
},
{
"id": 7,
@@ -321,7 +327,8 @@
50,
30,
20
- ]
+ ],
+ "light_velocity": 2400
},
{
"id": 8,
@@ -367,7 +374,8 @@
70,
30,
0
- ]
+ ],
+ "light_velocity": 2300
},
{
"id": 9,
@@ -414,7 +422,8 @@
50,
30,
20
- ]
+ ],
+ "light_velocity": 2200
},
{
"id": 10,
@@ -465,7 +474,8 @@
70,
30,
0
- ]
+ ],
+ "light_velocity": 2100
},
{
"id": 11,
@@ -515,7 +525,8 @@
100,
0,
0
- ]
+ ],
+ "light_velocity": 2000
},
{
"id": 12,
@@ -565,7 +576,8 @@
100,
0,
0
- ]
+ ],
+ "light_velocity": 1900
},
{
"id": 13,
@@ -615,7 +627,8 @@
100,
0,
0
- ]
+ ],
+ "light_velocity": 1800
},
{
"id": 14,
@@ -665,7 +678,8 @@
100,
0,
0
- ]
+ ],
+ "light_velocity": 1700
},
{
"id": 15,
@@ -715,7 +729,8 @@
100,
0,
0
- ]
+ ],
+ "light_velocity": 1600
},
{
"id": 16,
@@ -765,7 +780,8 @@
100,
0,
0
- ]
+ ],
+ "light_velocity": 1500
},
{
"id": 17,
@@ -815,7 +831,8 @@
100,
0,
0
- ]
+ ],
+ "light_velocity": 1400
},
{
"id": 18,
@@ -865,7 +882,8 @@
100,
0,
0
- ]
+ ],
+ "light_velocity": 1300
},
{
"id": 19,
@@ -915,7 +933,8 @@
100,
0,
0
- ]
+ ],
+ "light_velocity": 1200
},
{
"id": 20,
@@ -970,7 +989,8 @@
100,
0,
0
- ]
+ ],
+ "light_velocity": 1100
},
{
"id": 21,
@@ -1025,7 +1045,8 @@
100,
0,
0
- ]
+ ],
+ "light_velocity": 1000
},
{
"id": 22,
@@ -1080,7 +1101,8 @@
100,
0,
0
- ]
+ ],
+ "light_velocity": 900
},
{
"id": 23,
@@ -1135,7 +1157,8 @@
100,
0,
0
- ]
+ ],
+ "light_velocity": 800
},
{
"id": 24,
@@ -1190,7 +1213,8 @@
100,
0,
0
- ]
+ ],
+ "light_velocity": 700
},
{
"id": 25,
@@ -1245,7 +1269,8 @@
100,
0,
0
- ]
+ ],
+ "light_velocity": 600
},
{
"id": 26,
@@ -1290,7 +1315,8 @@
100,
0,
0
- ]
+ ],
+ "light_velocity": 3000
},
{
"id": 27,
@@ -1336,7 +1362,8 @@
70,
30,
0
- ]
+ ],
+ "light_velocity": 2900
},
{
"id": 28,
@@ -1383,7 +1410,8 @@
50,
30,
20
- ]
+ ],
+ "light_velocity": 2800
},
{
"id": 29,
@@ -1429,7 +1457,8 @@
70,
30,
0
- ]
+ ],
+ "light_velocity": 2700
},
{
"id": 30,
@@ -1476,7 +1505,8 @@
50,
30,
20
- ]
+ ],
+ "light_velocity": 2600
},
{
"id": 31,
@@ -1522,7 +1552,8 @@
70,
30,
0
- ]
+ ],
+ "light_velocity": 2500
},
{
"id": 32,
@@ -1569,7 +1600,8 @@
50,
30,
20
- ]
+ ],
+ "light_velocity": 2400
},
{
"id": 33,
@@ -1615,7 +1647,8 @@
70,
30,
0
- ]
+ ],
+ "light_velocity": 2300
},
{
"id": 34,
@@ -1662,7 +1695,8 @@
50,
30,
20
- ]
+ ],
+ "light_velocity": 2200
},
{
"id": 35,
@@ -1713,7 +1747,8 @@
70,
30,
0
- ]
+ ],
+ "light_velocity": 2100
},
{
"id": 36,
@@ -1763,7 +1798,8 @@
100,
0,
0
- ]
+ ],
+ "light_velocity": 2000
},
{
"id": 37,
@@ -1813,7 +1849,8 @@
100,
0,
0
- ]
+ ],
+ "light_velocity": 1900
},
{
"id": 38,
@@ -1863,7 +1900,8 @@
100,
0,
0
- ]
+ ],
+ "light_velocity": 1800
},
{
"id": 39,
@@ -1913,7 +1951,8 @@
100,
0,
0
- ]
+ ],
+ "light_velocity": 1700
},
{
"id": 40,
@@ -1963,7 +2002,8 @@
100,
0,
0
- ]
+ ],
+ "light_velocity": 1600
},
{
"id": 41,
@@ -2013,7 +2053,8 @@
100,
0,
0
- ]
+ ],
+ "light_velocity": 1500
},
{
"id": 42,
@@ -2063,7 +2104,8 @@
100,
0,
0
- ]
+ ],
+ "light_velocity": 1400
},
{
"id": 43,
@@ -2113,7 +2155,8 @@
100,
0,
0
- ]
+ ],
+ "light_velocity": 1300
},
{
"id": 44,
@@ -2163,7 +2206,8 @@
100,
0,
0
- ]
+ ],
+ "light_velocity": 1200
},
{
"id": 45,
@@ -2218,7 +2262,8 @@
100,
0,
0
- ]
+ ],
+ "light_velocity": 1100
},
{
"id": 46,
@@ -2273,7 +2318,8 @@
100,
0,
0
- ]
+ ],
+ "light_velocity": 1000
},
{
"id": 47,
@@ -2328,7 +2374,8 @@
100,
0,
0
- ]
+ ],
+ "light_velocity": 900
},
{
"id": 48,
@@ -2383,7 +2430,8 @@
100,
0,
0
- ]
+ ],
+ "light_velocity": 800
},
{
"id": 49,
@@ -2438,7 +2486,8 @@
100,
0,
0
- ]
+ ],
+ "light_velocity": 700
},
{
"id": 50,
@@ -2493,7 +2542,8 @@
100,
0,
0
- ]
+ ],
+ "light_velocity": 600
},
{
"id": 51,
@@ -2538,7 +2588,8 @@
100,
0,
0
- ]
+ ],
+ "light_velocity": 3000
},
{
"id": 52,
@@ -2584,7 +2635,8 @@
70,
30,
0
- ]
+ ],
+ "light_velocity": 2900
},
{
"id": 53,
@@ -2631,7 +2683,8 @@
50,
30,
20
- ]
+ ],
+ "light_velocity": 2800
},
{
"id": 54,
@@ -2677,7 +2730,8 @@
70,
30,
0
- ]
+ ],
+ "light_velocity": 2700
},
{
"id": 55,
@@ -2724,7 +2778,8 @@
50,
30,
20
- ]
+ ],
+ "light_velocity": 2600
},
{
"id": 56,
@@ -2770,7 +2825,8 @@
70,
30,
0
- ]
+ ],
+ "light_velocity": 2500
},
{
"id": 57,
@@ -2817,7 +2873,8 @@
50,
30,
20
- ]
+ ],
+ "light_velocity": 2400
},
{
"id": 58,
@@ -2863,7 +2920,8 @@
70,
30,
0
- ]
+ ],
+ "light_velocity": 2300
},
{
"id": 59,
@@ -2910,7 +2968,8 @@
50,
30,
20
- ]
+ ],
+ "light_velocity": 2200
},
{
"id": 60,
@@ -2961,7 +3020,8 @@
70,
30,
0
- ]
+ ],
+ "light_velocity": 2100
},
{
"id": 61,
@@ -3011,7 +3071,8 @@
100,
0,
0
- ]
+ ],
+ "light_velocity": 2000
},
{
"id": 62,
@@ -3061,7 +3122,8 @@
100,
0,
0
- ]
+ ],
+ "light_velocity": 1900
},
{
"id": 63,
@@ -3111,7 +3173,8 @@
100,
0,
0
- ]
+ ],
+ "light_velocity": 1800
},
{
"id": 64,
@@ -3161,7 +3224,8 @@
100,
0,
0
- ]
+ ],
+ "light_velocity": 1700
},
{
"id": 65,
@@ -3211,7 +3275,8 @@
100,
0,
0
- ]
+ ],
+ "light_velocity": 1600
},
{
"id": 66,
@@ -3261,7 +3326,8 @@
100,
0,
0
- ]
+ ],
+ "light_velocity": 1500
},
{
"id": 67,
@@ -3311,7 +3377,8 @@
100,
0,
0
- ]
+ ],
+ "light_velocity": 1400
},
{
"id": 68,
@@ -3361,7 +3428,8 @@
100,
0,
0
- ]
+ ],
+ "light_velocity": 1300
},
{
"id": 69,
@@ -3411,7 +3479,8 @@
100,
0,
0
- ]
+ ],
+ "light_velocity": 1200
},
{
"id": 70,
@@ -3466,7 +3535,8 @@
100,
0,
0
- ]
+ ],
+ "light_velocity": 1100
},
{
"id": 71,
@@ -3521,7 +3591,8 @@
100,
0,
0
- ]
+ ],
+ "light_velocity": 1000
},
{
"id": 72,
@@ -3576,7 +3647,8 @@
100,
0,
0
- ]
+ ],
+ "light_velocity": 900
},
{
"id": 73,
@@ -3631,7 +3703,8 @@
100,
0,
0
- ]
+ ],
+ "light_velocity": 800
},
{
"id": 74,
@@ -3686,7 +3759,8 @@
100,
0,
0
- ]
+ ],
+ "light_velocity": 700
},
{
"id": 75,
@@ -3741,6 +3815,7 @@
100,
0,
0
- ]
+ ],
+ "light_velocity": 600
}
]
\ No newline at end of file
diff --git a/bin/json/game_rdtaskcondi.json b/bin/json/game_rdtaskcondi.json
index 565b5a78f..7cfebbaaa 100644
--- a/bin/json/game_rdtaskcondi.json
+++ b/bin/json/game_rdtaskcondi.json
@@ -157,15 +157,15 @@
},
{
"id": 114,
- "type_sp": 0,
- "tasktxt": "",
+ "type_sp": 1,
+ "tasktxt": "招募一次守护者",
"type": 14,
"valid": 0,
- "data1": 10,
+ "data1": 1,
"data2": 0,
"data3": 0,
"data4": 0,
- "data5": 0
+ "data5": 101
},
{
"id": 115,
@@ -721,15 +721,15 @@
},
{
"id": 161,
- "type_sp": 0,
- "tasktxt": "",
+ "type_sp": 1,
+ "tasktxt": "通关主线章节1-6",
"type": 61,
"valid": 0,
- "data1": 109,
+ "data1": 1100106,
"data2": 0,
"data3": 0,
"data4": 0,
- "data5": 0
+ "data5": 102
},
{
"id": 162,
@@ -877,15 +877,15 @@
},
{
"id": 174,
- "type_sp": 0,
- "tasktxt": "",
+ "type_sp": 1,
+ "tasktxt": "尝试挑战邦尼兔",
"type": 70,
"valid": 0,
"data1": 1,
"data2": 101,
"data3": 0,
"data4": 0,
- "data5": 0
+ "data5": 10031
},
{
"id": 175,
@@ -1211,6 +1211,18 @@
"data4": 0,
"data5": 0
},
+ {
+ "id": 203,
+ "type_sp": 1,
+ "tasktxt": "调查这些木桩",
+ "type": 149,
+ "valid": 1,
+ "data1": 1,
+ "data2": 0,
+ "data3": 0,
+ "data4": 0,
+ "data5": 104
+ },
{
"id": 301,
"type_sp": 1,
@@ -4226,37 +4238,25 @@
{
"id": 20001,
"type_sp": 1,
- "tasktxt": "与杰克进行交谈",
+ "tasktxt": "和骇客蛛进行对话",
"type": 20001,
"valid": 1,
"data1": 1,
"data2": 500,
"data3": 0,
"data4": 0,
- "data5": 1
+ "data5": 10011
},
{
"id": 20002,
"type_sp": 1,
- "tasktxt": "前往商人购买任意道具",
- "type": 64,
- "valid": 0,
- "data1": 1,
- "data2": 0,
- "data3": 0,
- "data4": 0,
- "data5": 26
- },
- {
- "id": 20003,
- "type_sp": 1,
- "tasktxt": "和暴夫纳特交谈",
+ "tasktxt": "和邦尼兔进行对话",
"type": 20001,
"valid": 1,
"data1": 1,
- "data2": 500,
+ "data2": 3001,
"data3": 0,
"data4": 0,
- "data5": 21
+ "data5": 10021
}
]
\ No newline at end of file
diff --git a/bin/json/game_rdtasknpc.json b/bin/json/game_rdtasknpc.json
new file mode 100644
index 000000000..e6984602e
--- /dev/null
+++ b/bin/json/game_rdtasknpc.json
@@ -0,0 +1,236 @@
+[
+ {
+ "id": 101,
+ "datas": [
+ "GameMain",
+ "功能入口-招募",
+ "901"
+ ],
+ "event": [
+ 10,
+ 107
+ ],
+ "goto": 0
+ },
+ {
+ "id": 102,
+ "datas": [
+ "GameMain",
+ "功能入口-主线",
+ "901"
+ ],
+ "event": [
+ 10,
+ 166
+ ],
+ "goto": 0
+ },
+ {
+ "id": 103,
+ "datas": [
+ "WuGuanScene",
+ "乌龟大师",
+ "137"
+ ],
+ "event": [
+ 2,
+ 500
+ ],
+ "goto": 0
+ },
+ {
+ "id": 104,
+ "datas": [
+ "WuGuanScene",
+ "木桩1",
+ "137"
+ ],
+ "event": [
+ 2,
+ 500
+ ],
+ "goto": 0
+ },
+ {
+ "id": 10010,
+ "datas": [
+ "GameMain",
+ "20010_熊猫_1",
+ "901"
+ ],
+ "event": [
+ 2,
+ 500
+ ],
+ "goto": 0
+ },
+ {
+ "id": 10011,
+ "datas": [
+ "GameMain",
+ "20010_骇客蛛_1",
+ "901"
+ ],
+ "event": [
+ 2,
+ 500
+ ],
+ "goto": 0
+ },
+ {
+ "id": 10012,
+ "datas": [
+ "GameMain",
+ "20010_箱子_1",
+ "901"
+ ],
+ "event": [
+ 2,
+ 500
+ ],
+ "goto": 0
+ },
+ {
+ "id": 10020,
+ "datas": [
+ "GameMain",
+ "20020_熊猫_2",
+ "901"
+ ],
+ "event": [
+ 2,
+ 500
+ ],
+ "goto": 0
+ },
+ {
+ "id": 10021,
+ "datas": [
+ "GameMain",
+ "20020_邦尼兔_1",
+ "901"
+ ],
+ "event": [
+ 2,
+ 500
+ ],
+ "goto": 0
+ },
+ {
+ "id": 10022,
+ "datas": [
+ "GameMain",
+ "20020_熊猫_2",
+ "901"
+ ],
+ "event": [
+ 2,
+ 500
+ ],
+ "goto": 0
+ },
+ {
+ "id": 10030,
+ "datas": [
+ "GameMain",
+ "20020_熊猫_2",
+ "901"
+ ],
+ "event": [
+ 2,
+ 500
+ ],
+ "goto": 0
+ },
+ {
+ "id": 10031,
+ "datas": [
+ "GameMain",
+ "20020_邦尼兔_1",
+ "901"
+ ],
+ "event": [
+ 2,
+ 412
+ ],
+ "goto": 0
+ },
+ {
+ "id": 10032,
+ "datas": [
+ "GameMain",
+ "20020_邦尼兔_1",
+ "901"
+ ],
+ "event": [
+ 2,
+ 500
+ ],
+ "goto": 0
+ },
+ {
+ "id": 10040,
+ "datas": [
+ "GameMain",
+ "20020_邦尼兔_1",
+ "901"
+ ],
+ "event": [
+ 2,
+ 500
+ ],
+ "goto": 0
+ },
+ {
+ "id": 10041,
+ "datas": [
+ "GameMain",
+ "20020_熊猫_2",
+ "901"
+ ],
+ "event": [
+ 2,
+ 500
+ ],
+ "goto": 0
+ },
+ {
+ "id": 10050,
+ "datas": [
+ "WuGuanScene",
+ "20050_邦尼兔_1",
+ "137"
+ ],
+ "event": [
+ 2,
+ 500
+ ],
+ "goto": 0
+ },
+ {
+ "id": 10060,
+ "datas": [
+ "GameMain",
+ "20020_熊猫_2",
+ "901"
+ ],
+ "event": [
+ 2,
+ 500
+ ],
+ "goto": 0
+ },
+ {
+ "id": 10061,
+ "datas": [
+ "GameMain",
+ "20010_熊猫_1",
+ "901"
+ ],
+ "event": [
+ 2,
+ 500
+ ],
+ "goto": 0
+ }
+]
\ No newline at end of file
diff --git a/bin/json/game_seasonloop.json b/bin/json/game_seasonloop.json
deleted file mode 100644
index 4665f4482..000000000
--- a/bin/json/game_seasonloop.json
+++ /dev/null
@@ -1,21 +0,0 @@
-[
- {
- "key": 2,
- "disposable_loop": [
- 201,
- 203,
- 202,
- 204,
- 203,
- 202,
- 201,
- 204
- ],
- "fixed_loop": [
- 201,
- 202,
- 203,
- 204
- ]
- }
-]
\ No newline at end of file
diff --git a/bin/json/game_skillafteratk.json b/bin/json/game_skillafteratk.json
index 0306ca3c1..e9ced57f8 100644
--- a/bin/json/game_skillafteratk.json
+++ b/bin/json/game_skillafteratk.json
@@ -10640,9 +10640,10 @@
"Order": "",
"Limit": 1,
"ExecuteCnt": 1,
- "Type": 21,
+ "Type": 25,
"Argu": [
1,
+ 4,
6,
33
],
@@ -10889,10 +10890,10 @@
{
"Id": 214003213,
"EmitPR": 1000,
- "From": 4,
+ "From": 2,
"Where": [],
"Order": "",
- "Limit": 1,
+ "Limit": 10,
"ExecuteCnt": 2,
"Type": 1,
"Argu": [
@@ -10914,10 +10915,10 @@
{
"Id": 214003214,
"EmitPR": 1000,
- "From": 4,
+ "From": 2,
"Where": [],
"Order": "",
- "Limit": 1,
+ "Limit": 10,
"ExecuteCnt": 1,
"Type": 3,
"Argu": [
@@ -10938,10 +10939,10 @@
{
"Id": 214003223,
"EmitPR": 1000,
- "From": 4,
+ "From": 2,
"Where": [],
"Order": "",
- "Limit": 1,
+ "Limit": 10,
"ExecuteCnt": 2,
"Type": 1,
"Argu": [
@@ -10963,10 +10964,10 @@
{
"Id": 214003224,
"EmitPR": 1000,
- "From": 4,
+ "From": 2,
"Where": [],
"Order": "",
- "Limit": 1,
+ "Limit": 10,
"ExecuteCnt": 1,
"Type": 3,
"Argu": [
@@ -10987,10 +10988,10 @@
{
"Id": 214003233,
"EmitPR": 1000,
- "From": 4,
+ "From": 2,
"Where": [],
"Order": "",
- "Limit": 1,
+ "Limit": 10,
"ExecuteCnt": 2,
"Type": 1,
"Argu": [
@@ -11012,10 +11013,10 @@
{
"Id": 214003234,
"EmitPR": 1000,
- "From": 4,
+ "From": 2,
"Where": [],
"Order": "",
- "Limit": 1,
+ "Limit": 10,
"ExecuteCnt": 1,
"Type": 3,
"Argu": [
@@ -11036,10 +11037,10 @@
{
"Id": 214003243,
"EmitPR": 1000,
- "From": 4,
+ "From": 2,
"Where": [],
"Order": "",
- "Limit": 1,
+ "Limit": 10,
"ExecuteCnt": 2,
"Type": 1,
"Argu": [
@@ -11061,10 +11062,10 @@
{
"Id": 214003244,
"EmitPR": 1000,
- "From": 4,
+ "From": 2,
"Where": [],
"Order": "",
- "Limit": 1,
+ "Limit": 10,
"ExecuteCnt": 1,
"Type": 3,
"Argu": [
@@ -11085,10 +11086,10 @@
{
"Id": 214003311,
"EmitPR": 1000,
- "From": 4,
+ "From": 2,
"Where": [],
"Order": "",
- "Limit": 1,
+ "Limit": 10,
"ExecuteCnt": 3,
"Type": 1,
"Argu": [
@@ -11096,7 +11097,10 @@
4,
500
],
- "FollowSK": [],
+ "FollowSK": [
+ 214003351,
+ 214003352
+ ],
"SucFollowSK": [
214003312
],
@@ -11110,10 +11114,10 @@
{
"Id": 214003312,
"EmitPR": 400,
- "From": 4,
+ "From": 2,
"Where": [],
"Order": "",
- "Limit": 1,
+ "Limit": 10,
"ExecuteCnt": 1,
"Type": 12,
"Argu": [
@@ -11131,10 +11135,10 @@
{
"Id": 214003321,
"EmitPR": 1000,
- "From": 4,
+ "From": 2,
"Where": [],
"Order": "",
- "Limit": 1,
+ "Limit": 10,
"ExecuteCnt": 3,
"Type": 1,
"Argu": [
@@ -11142,7 +11146,10 @@
4,
550
],
- "FollowSK": [],
+ "FollowSK": [
+ 214003351,
+ 214003352
+ ],
"SucFollowSK": [
214003322
],
@@ -11156,10 +11163,10 @@
{
"Id": 214003322,
"EmitPR": 400,
- "From": 4,
+ "From": 2,
"Where": [],
"Order": "",
- "Limit": 1,
+ "Limit": 10,
"ExecuteCnt": 1,
"Type": 12,
"Argu": [
@@ -11177,10 +11184,10 @@
{
"Id": 214003331,
"EmitPR": 1000,
- "From": 4,
+ "From": 2,
"Where": [],
"Order": "",
- "Limit": 1,
+ "Limit": 10,
"ExecuteCnt": 3,
"Type": 1,
"Argu": [
@@ -11188,7 +11195,10 @@
4,
550
],
- "FollowSK": [],
+ "FollowSK": [
+ 214003351,
+ 214003352
+ ],
"SucFollowSK": [
214003332
],
@@ -11202,10 +11212,10 @@
{
"Id": 214003332,
"EmitPR": 500,
- "From": 4,
+ "From": 2,
"Where": [],
"Order": "",
- "Limit": 1,
+ "Limit": 10,
"ExecuteCnt": 1,
"Type": 12,
"Argu": [
@@ -11223,10 +11233,10 @@
{
"Id": 214003341,
"EmitPR": 1000,
- "From": 4,
+ "From": 2,
"Where": [],
"Order": "",
- "Limit": 1,
+ "Limit": 10,
"ExecuteCnt": 3,
"Type": 1,
"Argu": [
@@ -11234,7 +11244,10 @@
4,
600
],
- "FollowSK": [],
+ "FollowSK": [
+ 214003351,
+ 214003352
+ ],
"SucFollowSK": [
214003342
],
@@ -11248,10 +11261,10 @@
{
"Id": 214003342,
"EmitPR": 500,
- "From": 4,
+ "From": 2,
"Where": [],
"Order": "",
- "Limit": 1,
+ "Limit": 10,
"ExecuteCnt": 1,
"Type": 12,
"Argu": [
@@ -11266,6 +11279,54 @@
"RevisiCondition": "",
"RevisiParams": []
},
+ {
+ "Id": 214003351,
+ "EmitPR": 1000,
+ "From": 2,
+ "Where": [],
+ "Order": "",
+ "Limit": 10,
+ "ExecuteCnt": 1,
+ "Type": 25,
+ "Argu": [
+ 1,
+ 4,
+ 6,
+ 33
+ ],
+ "FollowSK": [],
+ "SucFollowSK": [],
+ "FailFollowSK": [],
+ "MustHit": false,
+ "DpsRevisiType": 0,
+ "DpsCondition": "",
+ "RevisiCondition": "",
+ "RevisiParams": []
+ },
+ {
+ "Id": 214003352,
+ "EmitPR": 1000,
+ "From": 2,
+ "Where": [],
+ "Order": "",
+ "Limit": 10,
+ "ExecuteCnt": 1,
+ "Type": 3,
+ "Argu": [
+ 390001105,
+ 1000,
+ 1,
+ 1
+ ],
+ "FollowSK": [],
+ "SucFollowSK": [],
+ "FailFollowSK": [],
+ "MustHit": false,
+ "DpsRevisiType": 0,
+ "DpsCondition": "",
+ "RevisiCondition": "",
+ "RevisiParams": []
+ },
{
"Id": 245003011,
"EmitPR": 1000,
@@ -11674,17 +11735,15 @@
{
"Id": 235003112,
"EmitPR": 1000,
- "From": 9,
+ "From": 4,
"Where": [],
"Order": "",
"Limit": 1,
"ExecuteCnt": 1,
- "Type": 8,
+ "Type": 31,
"Argu": [
0,
- 0,
- 1,
- 1000
+ 2
],
"FollowSK": [],
"SucFollowSK": [],
@@ -11698,7 +11757,7 @@
{
"Id": 235003113,
"EmitPR": 1000,
- "From": 9,
+ "From": 4,
"Where": [],
"Order": "",
"Limit": 1,
@@ -11735,7 +11794,9 @@
1,
-1
],
- "FollowSK": [],
+ "FollowSK": [
+ 235003215
+ ],
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false,
@@ -11759,7 +11820,9 @@
1,
-1
],
- "FollowSK": [],
+ "FollowSK": [
+ 235003215
+ ],
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false,
@@ -11779,8 +11842,8 @@
"Type": 2,
"Argu": [
435003211,
- 1,
- -1
+ -1,
+ 0
],
"FollowSK": [],
"SucFollowSK": [],
@@ -11802,8 +11865,8 @@
"Type": 2,
"Argu": [
435003212,
- 1,
- -1
+ -1,
+ 0
],
"FollowSK": [],
"SucFollowSK": [],
@@ -11820,7 +11883,7 @@
"From": 3,
"Where": [],
"Order": "",
- "Limit": 1,
+ "Limit": 50,
"ExecuteCnt": 1,
"Type": 3,
"Argu": [
@@ -11852,7 +11915,9 @@
1,
-1
],
- "FollowSK": [],
+ "FollowSK": [
+ 235003217
+ ],
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false,
@@ -11869,14 +11934,13 @@
"Order": "",
"Limit": 1,
"ExecuteCnt": 1,
- "Type": 3,
+ "Type": 30,
"Argu": [
- 390001126,
- 1000,
- 1,
- -1
+ 10
+ ],
+ "FollowSK": [
+ 235003218
],
- "FollowSK": [],
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false,
@@ -11908,6 +11972,53 @@
"RevisiCondition": "",
"RevisiParams": []
},
+ {
+ "Id": 235003220,
+ "EmitPR": 1000,
+ "From": 1,
+ "Where": [],
+ "Order": "",
+ "Limit": 1,
+ "ExecuteCnt": 1,
+ "Type": 2,
+ "Argu": [
+ 413004111,
+ 1,
+ -1
+ ],
+ "FollowSK": [],
+ "SucFollowSK": [],
+ "FailFollowSK": [],
+ "MustHit": false,
+ "DpsRevisiType": 0,
+ "DpsCondition": "",
+ "RevisiCondition": "",
+ "RevisiParams": []
+ },
+ {
+ "Id": 235003221,
+ "EmitPR": 1000,
+ "From": 3,
+ "Where": [],
+ "Order": "",
+ "Limit": 50,
+ "ExecuteCnt": 10,
+ "Type": 3,
+ "Argu": [
+ 390001212,
+ 1000,
+ 1,
+ -1
+ ],
+ "FollowSK": [],
+ "SucFollowSK": [],
+ "FailFollowSK": [],
+ "MustHit": false,
+ "DpsRevisiType": 0,
+ "DpsCondition": "",
+ "RevisiCondition": "",
+ "RevisiParams": []
+ },
{
"Id": 235003311,
"EmitPR": 1000,
@@ -11916,12 +12027,10 @@
"Order": "",
"Limit": 10,
"ExecuteCnt": 1,
- "Type": 8,
+ "Type": 31,
"Argu": [
0,
- 0,
- 1,
- 1000
+ 1
],
"FollowSK": [],
"SucFollowSK": [],
@@ -11960,7 +12069,7 @@
{
"Id": 235003313,
"EmitPR": 1000,
- "From": 9,
+ "From": 3,
"Where": [],
"Order": "",
"Limit": 1,
@@ -12618,6 +12727,32 @@
45
],
"FollowSK": [],
+ "SucFollowSK": [
+ 235005112
+ ],
+ "FailFollowSK": [],
+ "MustHit": false,
+ "DpsRevisiType": 0,
+ "DpsCondition": "",
+ "RevisiCondition": "",
+ "RevisiParams": []
+ },
+ {
+ "Id": 235005112,
+ "EmitPR": 1000,
+ "From": 2,
+ "Where": [],
+ "Order": "",
+ "Limit": 10,
+ "ExecuteCnt": 1,
+ "Type": 25,
+ "Argu": [
+ 1,
+ 6,
+ 4,
+ 45
+ ],
+ "FollowSK": [],
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false,
@@ -12658,7 +12793,7 @@
"Where": [],
"Order": "",
"Limit": 10,
- "ExecuteCnt": 2,
+ "ExecuteCnt": 1,
"Type": 1,
"Argu": [
1,
@@ -12687,7 +12822,7 @@
"Type": 3,
"Argu": [
390001007,
- 500,
+ 1000,
1,
2
],
@@ -12703,7 +12838,7 @@
{
"Id": 235005311,
"EmitPR": 1000,
- "From": 3,
+ "From": 1,
"Where": [],
"Order": "",
"Limit": 10,
@@ -12727,7 +12862,7 @@
{
"Id": 235005312,
"EmitPR": 1000,
- "From": 3,
+ "From": 1,
"Where": [],
"Order": "",
"Limit": 10,
@@ -12784,7 +12919,7 @@
"Type": 3,
"Argu": [
390001007,
- 500,
+ 1000,
1,
2
],
@@ -12808,7 +12943,7 @@
"Type": 3,
"Argu": [
390001325,
- 2500,
+ 1000,
1,
-1
],
@@ -23098,7 +23233,9 @@
4,
350
],
- "FollowSK": [],
+ "FollowSK": [
+ 234001112
+ ],
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false,
@@ -23118,7 +23255,7 @@
"Type": 3,
"Argu": [
390001101,
- 400,
+ 500,
1,
2
],
@@ -23162,10 +23299,13 @@
"Order": "",
"Limit": 1,
"ExecuteCnt": 1,
- "Type": 21,
+ "Type": 17,
"Argu": [
- 2,
1,
+ 4,
+ 1000,
+ 2,
+ 3,
100
],
"FollowSK": [],
@@ -23473,7 +23613,7 @@
{
"Id": 224007213,
"EmitPR": 1000,
- "From": 2,
+ "From": 4,
"Where": [],
"Order": "",
"Limit": 1,
@@ -23481,7 +23621,7 @@
"Type": 2,
"Argu": [
424007213,
- 1,
+ -1,
1
],
"FollowSK": [],
@@ -23496,7 +23636,7 @@
{
"Id": 224007214,
"EmitPR": 1000,
- "From": 2,
+ "From": 4,
"Where": [],
"Order": "",
"Limit": 1,
@@ -26167,7 +26307,7 @@
"Where": [],
"Order": "",
"Limit": 1,
- "ExecuteCnt": 4,
+ "ExecuteCnt": 3,
"Type": 3,
"Argu": [
390001431,
@@ -26517,10 +26657,10 @@
"ExecuteCnt": 1,
"Type": 8,
"Argu": [
+ 0,
0,
1,
- 700,
- 1000
+ 700
],
"FollowSK": [],
"SucFollowSK": [],
@@ -26542,10 +26682,12 @@
"Type": 2,
"Argu": [
424006211,
- 1,
+ -1,
1
],
- "FollowSK": [],
+ "FollowSK": [
+ 224006212
+ ],
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false,
@@ -26559,7 +26701,7 @@
"EmitPR": 1000,
"From": 1,
"Where": [],
- "Order": "PropertyUp=3",
+ "Order": "PropertyDown=3",
"Limit": 1,
"ExecuteCnt": 1,
"Type": 5,
@@ -26582,16 +26724,16 @@
{
"Id": 224006213,
"EmitPR": 1000,
- "From": 9,
+ "From": 1,
"Where": [],
"Order": "",
"Limit": 1,
"ExecuteCnt": 1,
"Type": 8,
"Argu": [
+ 0,
1,
1,
- 1000,
1000
],
"FollowSK": [
@@ -26608,9 +26750,9 @@
{
"Id": 224006214,
"EmitPR": 1000,
- "From": 9,
+ "From": 1,
"Where": [
- "EnemyHpproless=500"
+ "Hpproless=500"
],
"Order": "",
"Limit": 1,
@@ -26641,9 +26783,9 @@
"ExecuteCnt": 1,
"Type": 8,
"Argu": [
+ 0,
1,
-1,
- 1000,
1000
],
"FollowSK": [
@@ -26668,7 +26810,7 @@
"Type": 5,
"Argu": [
2,
- 1,
+ 2,
300
],
"FollowSK": [],
diff --git a/bin/json/game_skillatk.json b/bin/json/game_skillatk.json
index 9a089e55e..25270ceac 100644
--- a/bin/json/game_skillatk.json
+++ b/bin/json/game_skillatk.json
@@ -1180,7 +1180,7 @@
"act": "Skill_2",
"Type": 1,
"CD": 4,
- "Target": 1,
+ "Target": 0,
"ChildSkill": {
"Id": [
224003211,
@@ -1209,7 +1209,7 @@
"act": "Skill_2",
"Type": 1,
"CD": 3,
- "Target": 1,
+ "Target": 0,
"ChildSkill": {
"Id": [
224003211,
@@ -1233,7 +1233,7 @@
"text": "梦·创世"
},
"ico": "jn_icon_015",
- "CorrectPos": 0,
+ "CorrectPos": 140,
"IsMelee": 0,
"act": "Skill_3",
"Type": 1,
@@ -12936,7 +12936,7 @@
"act": "Skill_3",
"Type": 1,
"CD": 5,
- "Target": 1,
+ "Target": 0,
"ChildSkill": {
"Id": [
224007311,
@@ -14270,7 +14270,7 @@
"act": "Skill_3",
"Type": 1,
"CD": 5,
- "Target": 1,
+ "Target": 0,
"ChildSkill": {
"Id": [
224006311
diff --git a/bin/json/game_skillbuff.json b/bin/json/game_skillbuff.json
index d29887b43..ffa1580f9 100644
--- a/bin/json/game_skillbuff.json
+++ b/bin/json/game_skillbuff.json
@@ -943,7 +943,7 @@
"key": "skill_buffdes_390001126",
"text": "无法附加减益状态"
},
- "BuffType": 0,
+ "BuffType": 20,
"EffectArgu": [],
"BufParNum": 1,
"RelyCheckArgu": [],
@@ -1222,8 +1222,7 @@
},
"BuffType": 23,
"EffectArgu": [
- 35,
- 250
+ 350
],
"BufParNum": 1,
"RelyCheckArgu": [],
@@ -1321,9 +1320,10 @@
"key": "skill_buffdes_390001212",
"text": "检测效果，最多叠加50层"
},
- "BuffType": 1,
+ "BuffType": 45,
"EffectArgu": [
- 10
+ 50,
+ 30
],
"BufParNum": 1,
"RelyCheckArgu": [],
@@ -1345,10 +1345,12 @@
},
"Desc": {
"key": "skill_buffdes_390001213",
- "text": ""
+ "text": "一方收到攻击，另一方收到此次伤害的80%的真实伤害"
},
- "BuffType": 0,
- "EffectArgu": [],
+ "BuffType": 94,
+ "EffectArgu": [
+ 800
+ ],
"BufParNum": 1,
"RelyCheckArgu": [],
"CoexistCheckArgu": [],
@@ -2933,21 +2935,23 @@
},
"Desc": {
"key": "skill_buffdes_390001431",
- "text": "下一次攻击暴击率提升100%，暴击伤害提升40%。"
+ "text": "下一次攻击暴击率提升100%"
},
- "BuffType": 0,
- "EffectArgu": [],
- "BufParNum": 0,
+ "BuffType": 4,
+ "EffectArgu": [
+ 1000
+ ],
+ "BufParNum": 1,
"RelyCheckArgu": [],
"CoexistCheckArgu": [],
"Effect": 0,
"AddEffect": false,
- "RemoveType": false,
- "OverlayTimes": 0,
- "SameID": false,
- "buffIcon": "",
+ "RemoveType": true,
+ "OverlayTimes": 99,
+ "SameID": true,
+ "buffIcon": "ty_zd_buff_z006",
"buffeffect": "",
- "buffpos": ""
+ "buffpos": "infopos"
},
{
"Id": 390001432,
diff --git a/bin/json/game_skillpassive.json b/bin/json/game_skillpassive.json
index e71ebec83..c63646f0b 100644
--- a/bin/json/game_skillpassive.json
+++ b/bin/json/game_skillpassive.json
@@ -531,8 +531,8 @@
},
{
"Id": 414007211,
- "When": 16,
- "FromCheck": "",
+ "When": 14,
+ "FromCheck": "Target=2",
"TargetCheck": "Target=3",
"MainSkillCheck": "",
"AfterSkillCheck": "",
@@ -580,39 +580,39 @@
},
{
"Id": 435003211,
- "When": 19,
+ "When": 5,
"FromCheck": "",
- "TargetCheck": "Target=3",
+ "TargetCheck": "Target=3,HasBuff=0",
"MainSkillCheck": "",
"AfterSkillCheck": "",
- "BuffCheck": "Effect=0,Succ=1",
+ "BuffCheck": "",
"AddCon": [],
"PasPr": 1000,
"Type": "CallSkillPas",
"MaxEmitTimes": 99,
"Callback": [
- 235003215
+ 235003211
]
},
{
"Id": 435003212,
- "When": 19,
+ "When": 5,
"FromCheck": "",
- "TargetCheck": "Target=3",
+ "TargetCheck": "Target=3,HasBuff=1",
"MainSkillCheck": "",
"AfterSkillCheck": "",
- "BuffCheck": "Effect=0,Succ=0",
+ "BuffCheck": "",
"AddCon": [],
"PasPr": 1000,
"Type": "CallSkillPas",
"MaxEmitTimes": 99,
"Callback": [
- 235003215
+ 235003212
]
},
{
"Id": 435003213,
- "When": 16,
+ "When": 14,
"FromCheck": "",
"TargetCheck": "Target=3",
"MainSkillCheck": "",
@@ -922,7 +922,7 @@
"Id": 413004111,
"When": 16,
"FromCheck": "Target=3,Hpproless=500",
- "TargetCheck": "",
+ "TargetCheck": "424006211",
"MainSkillCheck": "",
"AfterSkillCheck": "",
"BuffCheck": "",
@@ -1880,7 +1880,7 @@
"Id": 434001211,
"When": 12,
"FromCheck": "Target=3",
- "TargetCheck": "",
+ "TargetCheck": "Target=2",
"MainSkillCheck": "",
"AfterSkillCheck": "",
"BuffCheck": "",
@@ -1894,9 +1894,9 @@
},
{
"Id": 424007213,
- "When": 3,
+ "When": 16,
"FromCheck": "Target=3",
- "TargetCheck": "",
+ "TargetCheck": "Hasbuff=SPDUP",
"MainSkillCheck": "",
"AfterSkillCheck": "",
"BuffCheck": "",
@@ -2158,7 +2158,7 @@
"Id": 424006211,
"When": 21,
"FromCheck": "Target=3",
- "TargetCheck": "3",
+ "TargetCheck": "Target=1",
"MainSkillCheck": "",
"AfterSkillCheck": "",
"BuffCheck": "",
diff --git a/bin/json/game_worldall.json b/bin/json/game_worldall.json
new file mode 100644
index 000000000..def0f9f07
--- /dev/null
+++ b/bin/json/game_worldall.json
@@ -0,0 +1,26 @@
+[
+ {
+ "组id": 2,
+ "name": {
+ "key": "mainline_name_10001",
+ "text": "章节1全部任务"
+ },
+ "task_icon": "",
+ "task_txt": {
+ "key": "story_80",
+ "text": "这是描述"
+ },
+ "reword": [
+ {
+ "a": "item",
+ "t": "30001",
+ "n": 30
+ },
+ {
+ "a": "hero",
+ "t": "34006",
+ "n": 1
+ }
+ ]
+ }
+]
\ No newline at end of file
diff --git a/bin/json/game_worldtask.json b/bin/json/game_worldtask.json
index dfbefe606..bea23ac9f 100644
--- a/bin/json/game_worldtask.json
+++ b/bin/json/game_worldtask.json
@@ -3,152 +3,140 @@
"key": 20010,
"lock": 1,
"ontxe": 0,
- "id_after": 20011,
- "group": 2,
- "des": 2,
- "icon": "",
- "task_Tname": {
- "key": "task_name_01",
- "text": "这是哪里"
- },
- "task_name": {
- "key": "story_80",
- "text": "这是哪里"
- },
- "task_display": {
- "key": "story_80",
- "text": "新手引导"
- },
- "npc": 1,
- "completetask": [
- 20001,
- 20002
- ],
- "deliver_npc": 1,
- "auto_accept": 1,
- "reword": [],
- "module": [
- "practice"
- ]
- },
- {
- "key": 20011,
- "lock": 1,
- "ontxe": 20010,
- "id_after": 20012,
- "group": 2,
- "des": 2,
- "icon": "",
- "task_Tname": {
- "key": "task_name_02",
- "text": "和这个少年谈谈"
- },
- "task_name": {
- "key": "story_80",
- "text": "和这个少年谈谈"
- },
- "task_display": {
- "key": "story_80",
- "text": "新手引导"
- },
- "npc": 2,
- "completetask": [
- 0
- ],
- "deliver_npc": 1,
- "auto_accept": 0,
- "reword": [],
- "module": [
- "practice"
- ]
- },
- {
- "key": 20012,
- "lock": 1,
- "ontxe": 20011,
"id_after": 20020,
"group": 2,
"des": 2,
"icon": "",
"task_Tname": {
- "key": "task_name_03",
- "text": "触摸花朵"
+ "key": "story_80",
+ "text": "1"
},
"task_name": {
"key": "story_80",
- "text": "触摸花朵"
+ "text": "1"
},
"task_display": {
"key": "story_80",
- "text": "新手引导"
+ "text": "1"
},
- "npc": 3,
+ "npc": 10010,
"completetask": [
- 0
+ 20001
],
- "deliver_npc": 1,
+ "deliver_npc": 10012,
"auto_accept": 1,
- "reword": [],
- "module": [
- "practice"
- ]
+ "reword": [
+ {
+ "a": "item",
+ "t": "110001",
+ "n": 100
+ }
+ ],
+ "module": []
},
{
"key": 20020,
"lock": 1,
- "ontxe": 20012,
+ "ontxe": 20010,
+ "id_after": 20030,
+ "group": 2,
+ "des": 2,
+ "icon": "",
+ "task_Tname": {
+ "key": "story_80",
+ "text": "1"
+ },
+ "task_name": {
+ "key": "story_80",
+ "text": "1"
+ },
+ "task_display": {
+ "key": "story_80",
+ "text": "1"
+ },
+ "npc": 10020,
+ "completetask": [
+ 20002
+ ],
+ "deliver_npc": 10022,
+ "auto_accept": 0,
+ "reword": [
+ {
+ "a": "item",
+ "t": "110001",
+ "n": 101
+ }
+ ],
+ "module": []
+ },
+ {
+ "key": 20030,
+ "lock": 1,
+ "ontxe": 20020,
"id_after": 20040,
"group": 2,
"des": 2,
"icon": "",
"task_Tname": {
- "key": "task_name_04",
- "text": "触摸花朵"
+ "key": "story_80",
+ "text": "1"
},
"task_name": {
"key": "story_80",
- "text": "触摸花朵"
+ "text": "1"
},
"task_display": {
"key": "story_80",
- "text": "新手引导"
+ "text": "1"
},
- "npc": 4,
+ "npc": 10030,
"completetask": [
- 0
+ 174
+ ],
+ "deliver_npc": 10032,
+ "auto_accept": 0,
+ "reword": [
+ {
+ "a": "item",
+ "t": "110001",
+ "n": 102
+ }
],
- "deliver_npc": 1,
- "auto_accept": 1,
- "reword": [],
"module": []
},
{
"key": 20040,
"lock": 1,
- "ontxe": 20020,
+ "ontxe": 20030,
"id_after": 20050,
"group": 2,
"des": 2,
"icon": "",
"task_Tname": {
- "key": "task_name_05",
- "text": "和杰克谈谈"
+ "key": "story_80",
+ "text": "1"
},
"task_name": {
"key": "story_80",
- "text": "和杰克谈谈"
+ "text": "1"
},
"task_display": {
"key": "story_80",
- "text": "新手引导"
+ "text": "1"
},
- "npc": 5,
+ "npc": 10040,
"completetask": [
- 0
+ 114
+ ],
+ "deliver_npc": 10041,
+ "auto_accept": 0,
+ "reword": [
+ {
+ "a": "item",
+ "t": "110001",
+ "n": 103
+ }
],
- "deliver_npc": 1,
- "auto_accept": 1,
- "reword": [],
"module": []
},
{
@@ -160,622 +148,65 @@
"des": 2,
"icon": "",
"task_Tname": {
- "key": "task_name_06",
- "text": "这个小家伙是？"
+ "key": "story_80",
+ "text": "1"
},
"task_name": {
"key": "story_80",
- "text": "这个小家伙是？"
+ "text": "1"
},
"task_display": {
"key": "story_80",
- "text": "新手引导"
+ "text": "1"
},
- "npc": 6,
+ "npc": 103,
"completetask": [
- 0
+ 203
+ ],
+ "deliver_npc": 10050,
+ "auto_accept": 0,
+ "reword": [
+ {
+ "a": "item",
+ "t": "110001",
+ "n": 104
+ }
],
- "deliver_npc": 1,
- "auto_accept": 1,
- "reword": [],
"module": []
},
{
"key": 20060,
"lock": 1,
"ontxe": 20050,
- "id_after": 20070,
- "group": 2,
- "des": 2,
- "icon": "",
- "task_Tname": {
- "key": "task_name_07",
- "text": "和邦尼兔谈谈"
- },
- "task_name": {
- "key": "story_80",
- "text": "和邦尼兔谈谈"
- },
- "task_display": {
- "key": "story_80",
- "text": "新手引导"
- },
- "npc": 7,
- "completetask": [
- 0
- ],
- "deliver_npc": 1,
- "auto_accept": 1,
- "reword": [],
- "module": []
- },
- {
- "key": 20070,
- "lock": 1,
- "ontxe": 20060,
- "id_after": 20080,
- "group": 2,
- "des": 2,
- "icon": "",
- "task_Tname": {
- "key": "task_name_08",
- "text": "和波比谈谈"
- },
- "task_name": {
- "key": "story_80",
- "text": "和波比谈谈"
- },
- "task_display": {
- "key": "story_80",
- "text": "新手引导"
- },
- "npc": 8,
- "completetask": [
- 0
- ],
- "deliver_npc": 1,
- "auto_accept": 1,
- "reword": [],
- "module": []
- },
- {
- "key": 20080,
- "lock": 1,
- "ontxe": 20070,
- "id_after": 20090,
- "group": 2,
- "des": 2,
- "icon": "",
- "task_Tname": {
- "key": "task_name_09",
- "text": "和波比谈谈"
- },
- "task_name": {
- "key": "story_80",
- "text": "和波比谈谈"
- },
- "task_display": {
- "key": "story_80",
- "text": "新手引导"
- },
- "npc": 9,
- "completetask": [
- 0
- ],
- "deliver_npc": 1,
- "auto_accept": 1,
- "reword": [],
- "module": []
- },
- {
- "key": 20090,
- "lock": 1,
- "ontxe": 20080,
- "id_after": 20100,
- "group": 2,
- "des": 2,
- "icon": "",
- "task_Tname": {
- "key": "task_name_10",
- "text": "和豺狼人谈谈"
- },
- "task_name": {
- "key": "story_80",
- "text": "和豺狼人谈谈"
- },
- "task_display": {
- "key": "story_80",
- "text": "新手引导"
- },
- "npc": 10,
- "completetask": [
- 174
- ],
- "deliver_npc": 1,
- "auto_accept": 1,
- "reword": [
- {
- "a": "hero",
- "t": "34006",
- "n": 1
- }
- ],
- "module": []
- },
- {
- "key": 20100,
- "lock": 1,
- "ontxe": 20090,
- "id_after": 20110,
- "group": 2,
- "des": 2,
- "icon": "",
- "task_Tname": {
- "key": "task_name_11",
- "text": "和豺狼人谈谈"
- },
- "task_name": {
- "key": "story_80",
- "text": "和豺狼人谈谈"
- },
- "task_display": {
- "key": "story_80",
- "text": "新手引导"
- },
- "npc": 11,
- "completetask": [
- 0
- ],
- "deliver_npc": 1,
- "auto_accept": 1,
- "reword": [],
- "module": []
- },
- {
- "key": 20110,
- "lock": 1,
- "ontxe": 20100,
- "id_after": 20120,
- "group": 2,
- "des": 2,
- "icon": "",
- "task_Tname": {
- "key": "task_name_12",
- "text": "走入黑洞"
- },
- "task_name": {
- "key": "story_80",
- "text": "走入黑洞"
- },
- "task_display": {
- "key": "story_80",
- "text": "新手引导"
- },
- "npc": 12,
- "completetask": [
- 198
- ],
- "deliver_npc": 1,
- "auto_accept": 1,
- "reword": [
- {
- "a": "item",
- "t": "30001",
- "n": 30
- }
- ],
- "module": []
- },
- {
- "key": 20120,
- "lock": 1,
- "ontxe": 20110,
- "id_after": 20130,
- "group": 2,
- "des": 2,
- "icon": "",
- "task_Tname": {
- "key": "task_name_13",
- "text": "和犀牛守卫谈谈"
- },
- "task_name": {
- "key": "story_80",
- "text": "和犀牛守卫谈谈"
- },
- "task_display": {
- "key": "story_80",
- "text": "新手引导"
- },
- "npc": 13,
- "completetask": [
- 0
- ],
- "deliver_npc": 1,
- "auto_accept": 1,
- "reword": [],
- "module": []
- },
- {
- "key": 20130,
- "lock": 1,
- "ontxe": 20120,
- "id_after": 20140,
- "group": 2,
- "des": 2,
- "icon": "",
- "task_Tname": {
- "key": "task_name_14",
- "text": "和波比谈谈"
- },
- "task_name": {
- "key": "story_80",
- "text": "和波比谈谈"
- },
- "task_display": {
- "key": "story_80",
- "text": "新手引导"
- },
- "npc": 14,
- "completetask": [
- 0
- ],
- "deliver_npc": 1,
- "auto_accept": 1,
- "reword": [],
- "module": []
- },
- {
- "key": 20140,
- "lock": 1,
- "ontxe": 20130,
- "id_after": 20150,
- "group": 2,
- "des": 2,
- "icon": "",
- "task_Tname": {
- "key": "task_name_15",
- "text": "和波比谈谈"
- },
- "task_name": {
- "key": "story_80",
- "text": "和波比谈谈"
- },
- "task_display": {
- "key": "story_80",
- "text": "新手引导"
- },
- "npc": 15,
- "completetask": [
- 0
- ],
- "deliver_npc": 1,
- "auto_accept": 1,
- "reword": [],
- "module": []
- },
- {
- "key": 20150,
- "lock": 1,
- "ontxe": 20140,
- "id_after": 0,
- "group": 2,
- "des": 2,
- "icon": "",
- "task_Tname": {
- "key": "task_name_16",
- "text": "敬请期待后续剧情"
- },
- "task_name": {
- "key": "story_80",
- "text": "和杰克谈谈"
- },
- "task_display": {
- "key": "story_80",
- "text": "新手引导"
- },
- "npc": 16,
- "completetask": [
- 0
- ],
- "deliver_npc": 1,
- "auto_accept": 1,
- "reword": [],
- "module": []
- },
- {
- "key": 20160,
- "lock": 1,
- "ontxe": 20151,
- "id_after": 20170,
- "group": 2,
- "des": 2,
- "icon": "",
- "task_Tname": {
- "key": "story_80",
- "text": "初来乍到"
- },
- "task_name": {
- "key": "story_80",
- "text": "新手引导"
- },
- "task_display": {
- "key": "story_80",
- "text": "新手引导"
- },
- "npc": 17,
- "completetask": [
- 0
- ],
- "deliver_npc": 1,
- "auto_accept": 1,
- "reword": [],
- "module": []
- },
- {
- "key": 20170,
- "lock": 1,
- "ontxe": 20160,
- "id_after": 20180,
- "group": 2,
- "des": 2,
- "icon": "",
- "task_Tname": {
- "key": "story_80",
- "text": "初来乍到"
- },
- "task_name": {
- "key": "story_80",
- "text": "新手引导"
- },
- "task_display": {
- "key": "story_80",
- "text": "新手引导"
- },
- "npc": 18,
- "completetask": [
- 0
- ],
- "deliver_npc": 1,
- "auto_accept": 1,
- "reword": [],
- "module": []
- },
- {
- "key": 20180,
- "lock": 1,
- "ontxe": 20170,
- "id_after": 20190,
- "group": 2,
- "des": 2,
- "icon": "",
- "task_Tname": {
- "key": "story_80",
- "text": "初来乍到"
- },
- "task_name": {
- "key": "story_80",
- "text": "新手引导"
- },
- "task_display": {
- "key": "story_80",
- "text": "新手引导"
- },
- "npc": 19,
- "completetask": [
- 0
- ],
- "deliver_npc": 1,
- "auto_accept": 1,
- "reword": [
- {
- "a": "item",
- "t": "120001",
- "n": 3
- }
- ],
- "module": []
- },
- {
- "key": 20190,
- "lock": 1,
- "ontxe": 20180,
- "id_after": 20200,
- "group": 2,
- "des": 2,
- "icon": "",
- "task_Tname": {
- "key": "story_80",
- "text": "初来乍到"
- },
- "task_name": {
- "key": "story_80",
- "text": "新手引导"
- },
- "task_display": {
- "key": "story_80",
- "text": "新手引导"
- },
- "npc": 20,
- "completetask": [
- 0
- ],
- "deliver_npc": 1,
- "auto_accept": 1,
- "reword": [],
- "module": []
- },
- {
- "key": 20200,
- "lock": 1,
- "ontxe": 20190,
- "id_after": 20210,
- "group": 2,
- "des": 2,
- "icon": "",
- "task_Tname": {
- "key": "story_80",
- "text": "初来乍到"
- },
- "task_name": {
- "key": "story_80",
- "text": "新手引导"
- },
- "task_display": {
- "key": "story_80",
- "text": "新手引导"
- },
- "npc": 21,
- "completetask": [
- 0
- ],
- "deliver_npc": 1,
- "auto_accept": 1,
- "reword": [],
- "module": []
- },
- {
- "key": 20210,
- "lock": 1,
- "ontxe": 20200,
- "id_after": 20220,
- "group": 2,
- "des": 2,
- "icon": "",
- "task_Tname": {
- "key": "story_80",
- "text": "初来乍到"
- },
- "task_name": {
- "key": "story_80",
- "text": "新手引导"
- },
- "task_display": {
- "key": "story_80",
- "text": "新手引导"
- },
- "npc": 22,
- "completetask": [
- 301
- ],
- "deliver_npc": 1,
- "auto_accept": 1,
- "reword": [],
- "module": []
- },
- {
- "key": 20220,
- "lock": 1,
- "ontxe": 20210,
- "id_after": 20230,
- "group": 2,
- "des": 2,
- "icon": "",
- "task_Tname": {
- "key": "story_80",
- "text": "初来乍到"
- },
- "task_name": {
- "key": "story_80",
- "text": "新手引导"
- },
- "task_display": {
- "key": "story_80",
- "text": "新手引导"
- },
- "npc": 23,
- "completetask": [
- 302
- ],
- "deliver_npc": 1,
- "auto_accept": 1,
- "reword": [],
- "module": []
- },
- {
- "key": 20230,
- "lock": 1,
- "ontxe": 20220,
- "id_after": 20240,
- "group": 2,
- "des": 2,
- "icon": "",
- "task_Tname": {
- "key": "story_80",
- "text": "初来乍到"
- },
- "task_name": {
- "key": "story_80",
- "text": "新手引导"
- },
- "task_display": {
- "key": "story_80",
- "text": "新手引导"
- },
- "npc": 24,
- "completetask": [
- 303
- ],
- "deliver_npc": 1,
- "auto_accept": 1,
- "reword": [],
- "module": []
- },
- {
- "key": 20240,
- "lock": 1,
- "ontxe": 20230,
- "id_after": 0,
- "group": 2,
- "des": 2,
- "icon": "",
- "task_Tname": {
- "key": "story_80",
- "text": "初来乍到"
- },
- "task_name": {
- "key": "story_80",
- "text": "新手引导"
- },
- "task_display": {
- "key": "story_80",
- "text": "新手引导"
- },
- "npc": 25,
- "completetask": [
- 114
- ],
- "deliver_npc": 1,
- "auto_accept": 1,
- "reword": [],
- "module": []
- },
- {
- "key": 30001,
- "lock": 1,
- "ontxe": 20010,
"id_after": 0,
"group": 3,
"des": 3,
"icon": "",
"task_Tname": {
"key": "story_80",
- "text": "初来乍到"
+ "text": "1"
},
"task_name": {
"key": "story_80",
- "text": "新手引导"
+ "text": "1"
},
"task_display": {
"key": "story_80",
- "text": "新手引导"
+ "text": "1"
},
- "npc": 29,
+ "npc": 10060,
"completetask": [
- 20003
+ 161
],
- "deliver_npc": 1,
+ "deliver_npc": 10061,
"auto_accept": 0,
- "reword": [],
+ "reword": [
+ {
+ "a": "item",
+ "t": "110001",
+ "n": 105
+ }
+ ],
"module": []
}
]
\ No newline at end of file
diff --git a/cmd/v2/ui/views/worldtask_mine.go b/cmd/v2/ui/views/worldtask_mine.go
index c15462620..2605444a3 100644
--- a/cmd/v2/ui/views/worldtask_mine.go
+++ b/cmd/v2/ui/views/worldtask_mine.go
@@ -79,8 +79,43 @@ func (this *WorldtaskMineView) CreateView(t *model.TestCase) fyne.CanvasObject {
dconf.Show()
})
- // 完成任务
- this.juqingBtn = widget.NewButton("完成任务", func() {
+ // 完成任务条件
+ completeBtn := widget.NewButton("任务条件", func() {
+ groupId := widget.NewEntry()
+ groupId.PlaceHolder = "分组ID"
+ taskIdEntry := widget.NewEntry()
+ taskIdEntry.PlaceHolder = "任务ID"
+ condiId := widget.NewEntry()
+ condiId.PlaceHolder = "条件"
+ form := widget.NewForm(
+ widget.NewFormItem("组ID", groupId),
+ widget.NewFormItem("任务ID", taskIdEntry),
+ widget.NewFormItem("完成条件", condiId),
+ )
+
+ dconf := dialog.NewCustom("完成条件", "关闭", form, this.w)
+
+ form.OnSubmit = func() {
+ if err := service.GetPttService().SendToClient(
+ t.MainType,
+ "completecondi",
+ &pb.WorldtaskCompleteCondiReq{
+ GroupId: cast.ToInt32(groupId.Text),
+ TaskId: cast.ToInt32(taskIdEntry.Text),
+ CondiId: cast.ToInt32(condiId.Text),
+ }); err != nil {
+ logrus.Error(err)
+ }
+ dconf.Hide()
+ this.mineReq()
+ }
+ form.SubmitText = "确定"
+ dconf.Resize(fyne.NewSize(400, 200))
+ dconf.Show()
+ })
+
+ // 交付任务
+ this.juqingBtn = widget.NewButton("交付任务", func() {
groupId := widget.NewEntry()
groupId.PlaceHolder = "分组ID"
taskIdEntry := widget.NewEntry()
@@ -141,7 +176,7 @@ func (this *WorldtaskMineView) CreateView(t *model.TestCase) fyne.CanvasObject {
dconf.Resize(fyne.NewSize(400, 200))
dconf.Show()
})
- barBtn := container.NewHBox(refreshBtn, acceptBtn, this.juqingBtn, battleBtn)
+ barBtn := container.NewHBox(refreshBtn, acceptBtn, completeBtn, this.juqingBtn, battleBtn)
c := container.NewBorder(barBtn, nil, nil, nil, this.itemList.ItemList)
this.mineData()
@@ -173,8 +208,8 @@ func (this *WorldtaskMineView) mineData() {
for _, v := range rsp.Task.TaskList {
item := common.Item{
- Id: cast.ToString(v.TaskId),
- Text: fmt.Sprintf("%d - 类型:%v", v.TaskId, v.TaskType),
+ Id: cast.ToString(v),
+ Text: fmt.Sprintf("%d ", v),
}
this.itemList.AddItem(item)
}
diff --git a/comm/const.go b/comm/const.go
index 5811313ea..4bf1f66c6 100644
--- a/comm/const.go
+++ b/comm/const.go
@@ -282,7 +282,7 @@ const ( //Rpc
Rpc_ModuleFetter core.Rpc_Key = "Rpc_ModuleFetter"
// 赛季塔计算邮件奖励
- Rpc_ModuleSeasonPagodaReward core.Rpc_Key = "Rpc_ModuleSeasonPagodaReward"
+ //Rpc_ModuleSeasonPagodaReward core.Rpc_Key = "Rpc_ModuleSeasonPagodaReward"
// 公会信息
Rpc_ModuleSociaty core.Rpc_Key = "Rpc_ModuleSociaty"
diff --git a/comm/imodule.go b/comm/imodule.go
index 886a46248..f3ca79269 100644
--- a/comm/imodule.go
+++ b/comm/imodule.go
@@ -370,7 +370,7 @@ type (
IWorldtask interface {
// 任务条件达成通知
// Deprecated
- TaskcondNotify(session IUserSession, condId int32) error
+ // TaskcondNotify(session IUserSession, condId int32) error
TaskCondFinishNotify(session IUserSession, condId int32) error
// bingo所有任务
BingoAllTask(session IUserSession) error
diff --git a/modules/dispatch/api_do.go b/modules/dispatch/api_do.go
index e1f7ec8eb..f37736421 100644
--- a/modules/dispatch/api_do.go
+++ b/modules/dispatch/api_do.go
@@ -3,6 +3,7 @@ package dispatch
import (
"errors"
"go_dreamfactory/comm"
+ "go_dreamfactory/lego/sys/log"
"go_dreamfactory/pb"
cfg "go_dreamfactory/sys/configure/structs"
@@ -43,6 +44,7 @@ func (a *apiComp) Do(session comm.IUserSession, req *pb.DispatchDoReq) (code pb.
}
if len(req.HeroIds) < int(dConf.Taskneed) {
+ a.module.Error("英雄派遣:", log.Field{Key: "HeroIds len", Value: len(req.HeroIds)}, log.Field{Key: "Taskneed", Value: dConf.Taskneed})
code = pb.ErrorCode_DispatchHeroNoEnough
return
}
diff --git a/modules/dispatch/model_dispatch.go b/modules/dispatch/model_dispatch.go
index a7688fffa..25c061eb7 100644
--- a/modules/dispatch/model_dispatch.go
+++ b/modules/dispatch/model_dispatch.go
@@ -138,30 +138,6 @@ func (this *modelDispatch) taskRandom(uid string, dispatch *pb.DBDispatch) (task
dispatch.Nb.Lv = 1
}
- // conf, err := this.module.configure.getDispatchLvConf(dispatch.Nb.Lv)
- // if err != nil || conf == nil {
- // return nil, err
- // }
-
- // var items []*comm.WeightItem
- // for i, v := range conf.Probability {
- // items = append(items, &comm.WeightItem{Id: (i + 1), Weight: int(v)})
- // }
-
- // wr := comm.NewWeightedRandom(items)
- // //任务类型
- // var taskType int
- // if c := wr.Pick(); c != nil {
- // taskType = c.Id.(int)
- // }
-
- // confList := this.module.configure.getDispatchListConf()
- // var tIds []int32
- // for _, v := range confList {
- // if int(v.Type) == taskType {
- // tIds = append(tIds, v.Id)
- // }
- // }
tIds := this.getTasksWeight(uid, dispatch)
if len(tIds) == 0 {
return
@@ -199,7 +175,7 @@ func (this *modelDispatch) taskRandom(uid string, dispatch *pb.DBDispatch) (task
}
}
//追加随机
- tasks = this.addRandomTask(uid, dispatch, randCount)
+ tasks = append(tasks, this.addRandomTask(uid, dispatch, randCount)...)
}
return
@@ -258,7 +234,7 @@ func (this *modelDispatch) replaceTask(uid string, taskId int32, dispatch *pb.DB
}
}
- tasks = this.addRandomTask(uid, dispatch, randCount)
+ tasks = append(tasks, this.addRandomTask(uid, dispatch, randCount)...)
return
}
@@ -280,7 +256,7 @@ func (this *modelDispatch) replaceFinishedTask(uid string, dispatch *pb.DBDispat
}
}
- tasks = this.addRandomTask(uid, dispatch, randCount)
+ tasks = append(tasks, this.addRandomTask(uid, dispatch, randCount)...)
return
}
@@ -446,10 +422,9 @@ func (this *modelDispatch) updateNotice(uid string, dispatch *pb.DBDispatch) err
count := len(dispatch.Nb.Tasks)
if count < 6 {
randCount = 6 - count
+ dispatch.Nb.Tasks = append(dispatch.Nb.Tasks, this.addRandomTask(uid, dispatch, randCount)...)
}
- dispatch.Nb.Tasks = this.addRandomTask(uid, dispatch, randCount)
-
//判断是否有下一等级
nextConf, err := this.module.configure.getDispatchLvConf(dispatch.Nb.Lv + 1)
if nextConf != nil {
diff --git a/modules/gourmet/api.go b/modules/gourmet/api.go
index 2e07071d9..3bbf49cbd 100644
--- a/modules/gourmet/api.go
+++ b/modules/gourmet/api.go
@@ -24,6 +24,7 @@ type apiComp struct {
func (this *apiComp) Init(service core.IService, module core.IModule, comp core.IModuleComp, options core.IModuleOptions) (err error) {
err = this.MCompGate.Init(service, module, comp, options)
this.module = module.(*Gourmet)
+
this.service = service
return
}
diff --git a/modules/gourmet/api_activateatlas.go b/modules/gourmet/api_activateatlas.go
new file mode 100644
index 000000000..19c46605d
--- /dev/null
+++ b/modules/gourmet/api_activateatlas.go
@@ -0,0 +1,54 @@
+package gourmet
+
+import (
+ "go_dreamfactory/comm"
+ "go_dreamfactory/pb"
+ cfg "go_dreamfactory/sys/configure/structs"
+
+ "google.golang.org/protobuf/proto"
+)
+
+//参数校验
+func (this *apiComp) ActivateAtlasCheck(session comm.IUserSession, req *pb.GourmetActivateAtlasReq) (code pb.ErrorCode) {
+ if req.Cid == "" {
+ code = pb.ErrorCode_ReqParameterError
+ return
+ }
+ return
+}
+
+func (this *apiComp) ActivateAtlas(session comm.IUserSession, req *pb.GourmetActivateAtlasReq) (code pb.ErrorCode, data proto.Message) {
+
+ code = this.ActivateAtlasCheck(session, req)
+ if code != pb.ErrorCode_Success {
+ return // 参数校验失败直接返回
+ }
+ conf := this.configure.GetGrormetCookBookConf(req.Cid)
+ if conf == nil { // 配置校验
+ code = pb.ErrorCode_ConfigNoFound
+ return
+ }
+ _gourmet, err := this.module.modelAtlas.getGourmetAtlasList(session.GetUserId())
+ if err != nil {
+ code = pb.ErrorCode_DBError
+ return
+ }
+ if v, ok := _gourmet.Atlas[req.Cid]; ok && v == -1 {
+ code = pb.ErrorCode_ReqParameterError
+ return
+ }
+ _gourmet.Atlas[req.Cid] = 1
+ if err := this.module.modelAtlas.Change(session.GetUserId(), map[string]interface{}{
+ "atlas": _gourmet.Atlas[req.Cid],
+ }); err != nil {
+ this.module.Errorf("change modelAtlas failed: %v", err)
+ }
+
+ // 发送首次获得奖励
+ this.module.DispenseRes(session, []*cfg.Gameatn{conf.Unlockreward}, true)
+ session.SendMsg(string(this.module.GetType()), "activateatlas", &pb.GourmetActivateAtlasResp{
+ Atlas: _gourmet.Atlas,
+ })
+
+ return
+}
diff --git a/modules/gourmet/api_createfood.go b/modules/gourmet/api_createfood.go
index f03be4a29..680513323 100644
--- a/modules/gourmet/api_createfood.go
+++ b/modules/gourmet/api_createfood.go
@@ -70,7 +70,7 @@ func (this *apiComp) CreateFood(session comm.IUserSession, req *pb.GourmetCreate
rst, _ := this.module.modelAtlas.getGourmetAtlasList(session.GetUserId()) // 校验是否首次获得
if _, ok := rst.Atlas[curFood]; !ok {
bFirst = true
- rst.Atlas[curFood] = 1
+ rst.Atlas[curFood] = -1
if err := this.module.modelAtlas.Change(session.GetUserId(), map[string]interface{}{
"atlas": rst.Atlas,
}); err != nil {
diff --git a/modules/gourmet/api_getatlas.go b/modules/gourmet/api_getatlas.go
new file mode 100644
index 000000000..65b6fa7e2
--- /dev/null
+++ b/modules/gourmet/api_getatlas.go
@@ -0,0 +1,34 @@
+package gourmet
+
+import (
+ "go_dreamfactory/comm"
+ "go_dreamfactory/pb"
+
+ "google.golang.org/protobuf/proto"
+)
+
+//参数校验
+func (this *apiComp) AtlasCheck(session comm.IUserSession, req *pb.GourmetAtlasReq) (code pb.ErrorCode) {
+
+ return
+}
+
+///获取美食城基本信息
+func (this *apiComp) Atlas(session comm.IUserSession, req *pb.GourmetAtlasReq) (code pb.ErrorCode, data proto.Message) {
+
+ code = this.AtlasCheck(session, req)
+ if code != pb.ErrorCode_Success {
+ return // 参数校验失败直接返回
+ }
+ _gourmet, err := this.module.modelAtlas.getGourmetAtlasList(session.GetUserId())
+ if err != nil {
+ code = pb.ErrorCode_DBError
+ return
+ }
+
+ session.SendMsg(string(this.module.GetType()), "atlas", &pb.GourmetAtlasResp{
+ Atlas: _gourmet.Atlas,
+ })
+
+ return
+}
diff --git a/modules/library/model_fetterstory.go b/modules/library/model_fetterstory.go
index fc197bde4..1c9f9ac11 100644
--- a/modules/library/model_fetterstory.go
+++ b/modules/library/model_fetterstory.go
@@ -91,7 +91,7 @@ func (this *modelFetterstory) getMaintasks(uid string, fetterId int32) (list []*
for _, taskId := range mainTasks.Tasks {
// 遍历已完成的世界任务
for _, task := range wt.TaskList {
- if taskId == task.TaskId {
+ if taskId == task {
list = append(list, &pb.FetterTask{
TaskId: taskId,
Status: 1,
diff --git a/modules/linestory/model_linestory.go b/modules/linestory/model_linestory.go
index e414d4d21..8b7dab236 100644
--- a/modules/linestory/model_linestory.go
+++ b/modules/linestory/model_linestory.go
@@ -88,7 +88,7 @@ func (this *ModelLinestory) getMaintasks(uid string, groupId int32) (list []*pb.
for _, conf := range mainTasks {
// 遍历已完成的世界任务
for _, task := range wt.TaskList {
- if conf.Id == task.TaskId {
+ if conf.Id == task {
list = append(list, &pb.TaskMain{
TaskId: conf.Id,
Status: 1,
diff --git a/modules/pagoda/comp_configure.go b/modules/pagoda/comp_configure.go
index 0d0aa9d9e..1b02ec8b4 100644
--- a/modules/pagoda/comp_configure.go
+++ b/modules/pagoda/comp_configure.go
@@ -1,7 +1,6 @@
package pagoda
import (
- "fmt"
"go_dreamfactory/lego/core"
"go_dreamfactory/lego/sys/log"
"go_dreamfactory/modules"
@@ -32,17 +31,15 @@ func (this *configureComp) Init(service core.IService, module core.IModule, comp
this.module = module.(*Pagoda)
err = this.LoadMultiConfigure(map[string]interface{}{
//game_pagoda: cfg.NewGame_pagoda,
- game_pagodaseasonreward: cfg.NewGamePagodaSeasonReward,
- game_pagodataskreward: cfg.NewGamePagodaTaskReward,
- game_pagoda: cfg.NewGamePagoda,
+ //game_pagodaseasonreward: cfg.NewGamePagodaSeasonReward,
+ game_pagodataskreward: cfg.NewGamePagodaTaskReward,
+ game_pagoda: cfg.NewGamePagoda,
})
//configure.RegisterConfigure(game_pagoda, cfg.NewGamePagoda, this.LoadPagodaData)
this._checkType = make(map[int32][]*cfg.GamePassCheckData, 0)
configure.RegisterConfigure(game_passcheck, cfg.NewGamePassCheck, this.LoadPassCheck)
- _data := this.GetPagodaSeasonReward()
- fmt.Printf("%v", _data)
return
}
@@ -130,17 +127,6 @@ func (this *configureComp) GetPassCheckByID(id int32) *cfg.GamePassCheckData {
return nil
}
-// 获取
-func (this *configureComp) GetPagodaSeasonReward() []*cfg.GamePagodaSeasonRewardData {
- if v, err := this.GetConfigure(game_pagodaseasonreward); err == nil {
- if configure, ok := v.(*cfg.GamePagodaSeasonReward); ok {
- return configure.GetDataList()
- }
- }
-
- return nil
-}
-
func (this *configureComp) LoadPassCheck() {
var err error
if v, err := this.GetConfigure(game_passcheck); err == nil {
diff --git a/modules/pagoda/model_rank.go b/modules/pagoda/model_rank.go
index 55a66a5d3..a046eb702 100644
--- a/modules/pagoda/model_rank.go
+++ b/modules/pagoda/model_rank.go
@@ -4,15 +4,11 @@ import (
"context"
"go_dreamfactory/comm"
"go_dreamfactory/lego/core"
- "strconv"
- "time"
//"go_dreamfactory/lego/sys/redis"
"go_dreamfactory/lego/sys/redis/pipe"
"go_dreamfactory/modules"
"go_dreamfactory/pb"
- "go_dreamfactory/sys/configure"
- "go_dreamfactory/sys/db"
"github.com/go-redis/redis/v8"
"go.mongodb.org/mongo-driver/bson/primitive"
@@ -111,54 +107,3 @@ func (this *ModelRank) SetNormalPagodaRankList(tableName string, score int32, ui
}
}
-
-func (this *ModelRank) seasonSettlement() {
- rankReward := this.modulePagoda.configure.GetPagodaSeasonReward()
- if rankReward == nil {
- return
- }
- if !db.IsCross() {
- if conn, err := db.Cross(); err == nil {
- var (
- pipe *pipe.RedisPipe = conn.Redis.RedisPipe(context.TODO())
- Items []*pb.UserAssets
- )
-
- rd := pipe.ZRevRange("pagodaSeasonRank", 0, comm.MaxRankList)
- _dataList := rd.Val()
- model1 := db.NewDBModel(comm.TableSeasonPagoda, time.Hour, conn)
- for index, v := range _dataList {
- result := &pb.DBPagodaRecord{}
- //result := &pb.DBVikingRank{}
- if err := model1.Get(v, result); err == nil {
-
- if userinfo := this.modulePagoda.ModuleUser.GetUser(result.Uid); userinfo != nil {
- Items = make([]*pb.UserAssets, 0) //TO 排名配置
- for _, v := range rankReward {
- if len(v.Ranking) != 2 {
- continue
- }
- if index >= int(v.Ranking[0]) && index <= int(v.Ranking[1]) {
- for _, v1 := range v.Reward {
- Items = append(Items, &pb.UserAssets{
- A: v1.A,
- T: v1.T,
- N: v1.N,
- })
- }
- this.modulePagoda.mail.SendNewMail(&pb.DBMailData{
- CreateTime: uint64(configure.Now().Unix()),
- Items: Items,
- Cid: "SeasonPagodaReward",
- Param: []string{strconv.Itoa(index + 1)}, // 名次
- }, result.Uid)
- break
- }
- }
- }
- }
- }
- }
- }
-
-}
diff --git a/modules/pagoda/module.go b/modules/pagoda/module.go
index 3bac1c0b9..6b1d5e0ca 100644
--- a/modules/pagoda/module.go
+++ b/modules/pagoda/module.go
@@ -83,7 +83,7 @@ func (this *Pagoda) Start() (err error) {
}
this.mail = module.(comm.Imail)
- this.service.RegisterFunctionName(string(comm.Rpc_ModuleSeasonPagodaReward), this.Rpc_ModuleSeasonPagodaReward)
+ //this.service.RegisterFunctionName(string(comm.Rpc_ModuleSeasonPagodaReward), this.Rpc_ModuleSeasonPagodaReward)
return
}
@@ -199,7 +199,7 @@ func (this *Pagoda) CheckPoint6(uid string) bool {
func (this *Pagoda) Rpc_ModuleSeasonPagodaReward(ctx context.Context, args *pb.EmptyReq, reply *pb.EmptyResp) {
this.Debug("Rpc_ModuleSeasonPagodaReward", log.Field{Key: "args", Value: args.String()})
- this.modulerank.seasonSettlement()
+ // this.modulerank.seasonSettlement()
}
func (this *Pagoda) CheckPoint7(uid string) bool {
diff --git a/modules/rtask/model_rtask.go b/modules/rtask/model_rtask.go
index e7740cc2b..544ab37f7 100644
--- a/modules/rtask/model_rtask.go
+++ b/modules/rtask/model_rtask.go
@@ -80,7 +80,7 @@ func (this *ModelRtask) checkCondi(uid string, condiId int32) (err error, ok boo
}
conf, err := this.moduleRtask.configure.getRtaskTypeById(condiId)
- if err != nil {
+ if err != nil || conf == nil {
errors.Errorf("conf not found condiID: %v", condiId)
return
}
diff --git a/modules/rtask/module.go b/modules/rtask/module.go
index d28fc2b2d..eefedf1db 100644
--- a/modules/rtask/module.go
+++ b/modules/rtask/module.go
@@ -550,81 +550,6 @@ func (this *ModuleRtask) SendToRtask(session comm.IUserSession, rtaskType comm.T
}
}
- //任务完成则推送
- if code = this.CheckCondi(uid, conf.Id); code == pb.ErrorCode_Success {
- module, err := this.service.GetModule(comm.ModuleWorldtask)
- if err == nil {
- // go func() {
- // defer func() {
- // if r := recover(); r != nil {
- // log.Errorf("[worldtask ] err:%v ", r)
- // }
- // }()
- // 世界任务
- if worldtask, ok := module.(comm.IWorldtask); ok {
- if err := worldtask.TaskcondNotify(session, conf.Id); err != nil {
- var customErr = new(comm.CustomError)
- if errors.As(err, &customErr) {
- notifyErr := &pb.NotifyErrorNotifyPush{
- ReqMainType: string(comm.ModuleWorldtask),
- ReqSubType: "finish",
- Message: "",
- }
-
- if customErr.Code == pb.ErrorCode_WorldtaskLvNotEnough {
- notifyErr.Code = pb.ErrorCode_WorldtaskLvNotEnough
- session.SendMsg(string(comm.ModuleWorldtask), "finish", notifyErr)
- } else if customErr.Code == pb.ErrorCode_UserSessionNobeing {
- notifyErr.Code = pb.ErrorCode_UserSessionNobeing
- session.SendMsg(string(comm.ModuleWorldtask), "finish", notifyErr)
- } else {
- log.Error("任务条件达成通知",
- log.Field{Key: "uid", Value: uid},
- log.Field{Key: "condId", Value: conf.Id},
- log.Field{Key: "err", Value: err.Error()},
- )
- }
- }
- }
- }
- // }()
- }
- userModule, err := this.service.GetModule(comm.ModuleUser)
- if err == nil {
- // go func() {
- // defer func() { //程序异常 收集异常信息传递给前端显示
- // if r := recover(); r != nil {
- // log.Errorf("[sociatytask ] err:%v ", r)
- // }
- // }()
- // 公会
- if user, ok := userModule.(comm.IUser); ok {
- ex, err := user.GetUserExpand(session.GetUserId())
- if err == nil && ex.SociatyId != "" {
- sociatyModule, err := this.service.GetModule(comm.ModuleSociaty)
- if err != nil {
- return
- }
- if sociaty, ok := sociatyModule.(comm.ISociaty); ok {
- if err2 := sociaty.TaskcondNotify(uid, ex.SociatyId, conf.Id); err2 != nil {
- log.Error("公会任务条件达成通知",
- log.Field{Key: "uid", Value: uid},
- log.Field{Key: "sociatyId", Value: ex.SociatyId},
- log.Field{Key: "condId", Value: conf.Id},
- log.Field{Key: "err", Value: err2.Error()},
- )
- }
- if module, err := this.service.GetModule(comm.ModuleRtask); err == nil {
- if iRtask, ok := module.(comm.IRtask); ok {
- iRtask.SendToRtask(session, comm.Rtype156, 1)
- }
- }
- }
- }
- }
- // }()
- }
- }
}
return
@@ -652,8 +577,8 @@ func (this *ModuleRtask) TriggerTask(uid string, taskParams ...*comm.TaskParam)
// 任务条件校验
func (this *ModuleRtask) CheckCondi(uid string, condiId int32) (code pb.ErrorCode) {
+ // this.Debug("检查任务条件", log.Field{Key: "uid", Value: uid}, log.Field{Key: "condiId", Value: condiId})
if _, ok := this.modelRtask.checkCondi(uid, condiId); !ok {
- // this.Debug("任务条件未达到", log.Field{Key: "uid", Value: uid}, log.Field{Key: "condiId", Value: condiId})
code = pb.ErrorCode_RtaskCondiNoReach
}
return
diff --git a/modules/smithy/api_forgeequip.go b/modules/smithy/api_forgeequip.go
index d7ebb0abd..ef648338c 100644
--- a/modules/smithy/api_forgeequip.go
+++ b/modules/smithy/api_forgeequip.go
@@ -132,7 +132,7 @@ func (this *apiComp) ForgeEquip(session comm.IUserSession, req *pb.SmithyForgeEq
return
}
// 玩小游戏增加双倍产出校验
- if req.SuiteId != 0 { // 定制才有
+ if req.SuiteId == 0 { // 定制才有
var (
hitLen int32
)
@@ -153,7 +153,24 @@ func (this *apiComp) ForgeEquip(session comm.IUserSession, req *pb.SmithyForgeEq
code = pb.ErrorCode_ReqParameterError
this.module.Errorf("铁匠铺小游戏打造次数超过上限,当前打造次数:%d, 配置总次数：%d", hitLen, maxHitCount)
}
-
+ // 校验是否刷新最大记录
+ for k, v := range req.Hit {
+ if stove.Hit[k] != v {
+ var curProbability int32
+ for k, v := range stove.Hit {
+ confMake := this.module.configure.GetSmithyMake(k)
+ if confMake == nil {
+ break
+ }
+ curProbability += v * confMake.Probability
+ }
+ if curProbability < addProbability {
+ stove.Hit = req.Hit
+ update["hit"] = stove.Hit
+ }
+ break
+ }
+ }
}
// 装备资源分发
if customLv > 0 {
diff --git a/modules/smithy/model_stove.go b/modules/smithy/model_stove.go
index e567153ef..78e02abeb 100644
--- a/modules/smithy/model_stove.go
+++ b/modules/smithy/model_stove.go
@@ -44,6 +44,7 @@ func (this *modelStove) getSmithyStoveList(uid string) (result *pb.DBStove, err
result.Data = make(map[int32]*pb.Mastery, 0)
result.Skill = make(map[int32]int32, 0)
result.Forge = make(map[int32]int32, 0)
+ result.Hit = make(map[int32]int32, 0)
result.Lv = 1
result.RecoveTime = 0
@@ -94,10 +95,11 @@ func (this *modelStove) CheckForgetwoEquip(reelId int32, lv int32, addProbabilit
}
}
value += addProbability
-
- n, _ := rand.Int(rand.Reader, big.NewInt(1000)) // 千分比
- if value > int32(n.Int64()) {
- return true
+ if value > 0 {
+ n, _ := rand.Int(rand.Reader, big.NewInt(1000)) // 千分比
+ if value > int32(n.Int64()) {
+ return true
+ }
}
return false
diff --git a/modules/sys/model_sys.go b/modules/sys/model_sys.go
index 49e4ba6b1..34a64f6e4 100644
--- a/modules/sys/model_sys.go
+++ b/modules/sys/model_sys.go
@@ -74,23 +74,24 @@ func (this *ModelSys) validCond(uid string, condData *cfg.GameOpencondData) stri
}
case 3: //世界任务ID
- module, err := this.service.GetModule(comm.ModuleWorldtask)
- if err != nil {
- this.moduleSys.Debugln(err)
- flag = false
- return ""
- }
- if i, ok := module.(comm.IWorldtask); ok {
- d := i.GetMyWorldtask(uid)
- for _, v := range d.LastTaskIds {
- if v.TaskId >= conf.Param {
- flag = true
- continue
- }
- }
- } else {
- flag = false
- }
+ // module, err := this.service.GetModule(comm.ModuleWorldtask)
+ // if err != nil {
+ // this.moduleSys.Debugln(err)
+ // flag = false
+ // return ""
+ // }
+ // if i, ok := module.(comm.IWorldtask); ok {
+ // d := i.GetMyWorldtask(uid)
+ // for _, v := range d.LastTaskIds {
+ // if v.TaskId >= conf.Param {
+ // flag = true
+ // continue
+ // }
+ // }
+ // } else {
+ // flag = false
+ // }
+ flag = true
}
}
diff --git a/modules/timer/module.go b/modules/timer/module.go
index fb21a9c42..be54b2341 100644
--- a/modules/timer/module.go
+++ b/modules/timer/module.go
@@ -24,9 +24,9 @@ type Timer struct {
options *Options
service base.IRPCXService //rpc服务对象 通过这个对象可以发布服务和调用其他服务的接口
chat *ChatComp //俩天系统定时任务
- season *SeasonPagoda
- forum *ForumComp
- arena *ArenaComp
+ //season *SeasonPagoda
+ forum *ForumComp
+ arena *ArenaComp
}
//模块名
@@ -56,7 +56,7 @@ func (this *Timer) Start() (err error) {
func (this *Timer) OnInstallComp() {
this.ModuleBase.OnInstallComp()
this.chat = this.RegisterComp(new(ChatComp)).(*ChatComp)
- this.season = this.RegisterComp(new(SeasonPagoda)).(*SeasonPagoda)
+ //this.season = this.RegisterComp(new(SeasonPagoda)).(*SeasonPagoda)
this.arena = this.RegisterComp(new(ArenaComp)).(*ArenaComp)
}
diff --git a/modules/timer/season.go b/modules/timer/season.go
index 8d38a1664..086565276 100644
--- a/modules/timer/season.go
+++ b/modules/timer/season.go
@@ -11,12 +11,10 @@ import (
"go_dreamfactory/sys/db"
"math"
"strconv"
- "time"
"go_dreamfactory/lego/base"
"go_dreamfactory/lego/core"
"go_dreamfactory/lego/core/cbase"
- "go_dreamfactory/lego/sys/cron"
"go_dreamfactory/lego/sys/log"
"go_dreamfactory/lego/sys/redis/pipe"
@@ -59,39 +57,39 @@ func (this *SeasonPagoda) Start() (err error) {
err = this.MCompModel.Start()
err = this.MCompConfigure.Start()
- configure.RegisterConfigure(game_seasonloop, cfg.NewGameSeasonLoop, nil)
- configure.RegisterConfigure(game_seasonreward, cfg.NewGamePagodaSeasonReward, nil)
- cron.AddFunc("0 0 23 L * ?", this.TimerSeasonOver) //每月最后一天23点执行一次
- cron.AddFunc("0 0 5 /* * ?", this.TimerSeasonStar) //每月第一天5点执行一次
- if db.IsCross() {
- return
- }
- //time.Sleep(time.Second * 1)
- //this.DbTest()
- conn, err := db.Cross()
- if err == nil {
- //this.DbTest()
- model := db.NewDBModel(comm.TableSeasonData, 0, conn)
+ // configure.RegisterConfigure(game_seasonloop, cfg.NewGameSeasonLoop, nil)
+ // configure.RegisterConfigure(game_seasonreward, cfg.NewGamePagodaSeasonReward, nil)
+ // cron.AddFunc("0 0 23 L * ?", this.TimerSeasonOver) //每月最后一天23点执行一次
+ // cron.AddFunc("0 0 5 /* * ?", this.TimerSeasonStar) //每月第一天5点执行一次
+ // if db.IsCross() {
+ // return
+ // }
+ // //time.Sleep(time.Second * 1)
+ // //this.DbTest()
+ // conn, err := db.Cross()
+ // if err == nil {
+ // //this.DbTest()
+ // model := db.NewDBModel(comm.TableSeasonData, 0, conn)
- _len, err1 := model.DB.CountDocuments(comm.TableSeasonData, bson.M{})
- if err1 == nil && _len == 0 {
- fmt.Printf("%v,%v", _len, err1)
- server := &pb.DBServerData{
- Id: primitive.NewObjectID().Hex(),
- ServerState: 1,
- DisposableLoop: 1,
- FixedLoop: 0,
- SeasonType: 201,
- OpenTime: time.Now().Unix(),
- }
- conf := this.GetSeasonLoop(comm.SeasonType)
- if len(conf.DisposableLoop) > 0 {
- server.SeasonType = conf.DisposableLoop[0]
- }
+ // _len, err1 := model.DB.CountDocuments(comm.TableSeasonData, bson.M{})
+ // if err1 == nil && _len == 0 {
+ // fmt.Printf("%v,%v", _len, err1)
+ // server := &pb.DBServerData{
+ // Id: primitive.NewObjectID().Hex(),
+ // ServerState: 1,
+ // DisposableLoop: 1,
+ // FixedLoop: 0,
+ // SeasonType: 201,
+ // OpenTime: time.Now().Unix(),
+ // }
+ // conf := this.GetSeasonLoop(comm.SeasonType)
+ // if len(conf.DisposableLoop) > 0 {
+ // server.SeasonType = conf.DisposableLoop[0]
+ // }
- model.DB.InsertOne(comm.TableSeasonData, server)
- }
- }
+ // model.DB.InsertOne(comm.TableSeasonData, server)
+ // }
+ // }
return
}
@@ -110,62 +108,49 @@ func (this *SeasonPagoda) GetSeasonReward() []int32 {
return sz
}
}
-func (this *SeasonPagoda) GetSeasonLoop(id int32) *cfg.GameSeasonLoopData {
-
- if v, err := this.GetConfigure(game_seasonloop); err != nil {
- log.Errorf("get global conf err:%v", err)
- return nil
- } else {
- if configure, ok := v.(*cfg.GameSeasonLoop); ok {
- return configure.Get(id)
- }
- log.Errorf("%T no is *cfg.Game_global", v)
- return nil
- }
-}
// // 赛季塔结束
-func (this *SeasonPagoda) TimerSeasonOver() {
- this.module.Debugf("TimerSeasonOver:%d", configure.Now().Unix())
- if db.IsCross() {
- if conn, err := db.Cross(); err == nil {
- if rst := conn.Mgo.FindOne(comm.TableSeasonData, bson.M{}); rst != nil {
- serverData := &pb.DBServerData{}
- rst.Decode(serverData)
- conf := this.GetSeasonLoop(comm.SeasonType) // 获取赛季塔重置配置
- if serverData.FixedLoop == 0 {
- if len(conf.DisposableLoop) >= int(serverData.DisposableLoop) && len(conf.FixedLoop) > 0 { // 开始执行循环逻辑
- serverData.FixedLoop = 1
- serverData.DisposableLoop = 0
- serverData.SeasonType = conf.FixedLoop[int(serverData.FixedLoop)-1]
- } else {
- serverData.DisposableLoop++
- serverData.SeasonType = conf.DisposableLoop[int(serverData.DisposableLoop)-1]
- }
+// func (this *SeasonPagoda) TimerSeasonOver() {
+// this.module.Debugf("TimerSeasonOver:%d", configure.Now().Unix())
+// if db.IsCross() {
+// if conn, err := db.Cross(); err == nil {
+// if rst := conn.Mgo.FindOne(comm.TableSeasonData, bson.M{}); rst != nil {
+// serverData := &pb.DBServerData{}
+// rst.Decode(serverData)
+// conf := this.GetSeasonLoop(comm.SeasonType) // 获取赛季塔重置配置
+// if serverData.FixedLoop == 0 {
+// if len(conf.DisposableLoop) >= int(serverData.DisposableLoop) && len(conf.FixedLoop) > 0 { // 开始执行循环逻辑
+// serverData.FixedLoop = 1
+// serverData.DisposableLoop = 0
+// serverData.SeasonType = conf.FixedLoop[int(serverData.FixedLoop)-1]
+// } else {
+// serverData.DisposableLoop++
+// serverData.SeasonType = conf.DisposableLoop[int(serverData.DisposableLoop)-1]
+// }
- } else { // 循环
- if len(conf.FixedLoop) >= int(serverData.FixedLoop) {
- serverData.FixedLoop = 1
- } else {
- serverData.FixedLoop++
- }
- serverData.SeasonType = conf.FixedLoop[int(serverData.FixedLoop)-1]
- }
- this.DB.UpdateOne(comm.TableSeasonData, bson.M{}, serverData)
- fmt.Printf("%v", serverData)
- }
- }
- }
+// } else { // 循环
+// if len(conf.FixedLoop) >= int(serverData.FixedLoop) {
+// serverData.FixedLoop = 1
+// } else {
+// serverData.FixedLoop++
+// }
+// serverData.SeasonType = conf.FixedLoop[int(serverData.FixedLoop)-1]
+// }
+// this.DB.UpdateOne(comm.TableSeasonData, bson.M{}, serverData)
+// fmt.Printf("%v", serverData)
+// }
+// }
+// }
- if _, err := this.service.RpcGo(context.Background(),
- comm.Service_Worker,
- string(comm.Rpc_ModuleSeasonPagodaReward),
- pb.EmptyReq{},
- nil,
- ); err != nil {
- this.module.Errorln(err)
- }
-}
+// if _, err := this.service.RpcGo(context.Background(),
+// comm.Service_Worker,
+// string(comm.Rpc_ModuleSeasonPagodaReward),
+// pb.EmptyReq{},
+// nil,
+// ); err != nil {
+// this.module.Errorln(err)
+// }
+//}
// 赛季塔开始
func (this *SeasonPagoda) TimerSeasonStar() {
diff --git a/modules/worldtask/api_accept.go b/modules/worldtask/api_accept.go
index f13c2ad31..efa980c1c 100644
--- a/modules/worldtask/api_accept.go
+++ b/modules/worldtask/api_accept.go
@@ -34,17 +34,18 @@ func (a *apiComp) Accept(session comm.IUserSession, req *pb.WorldtaskAcceptReq)
return
}
- if myWorldtask.CurrentTaskIds == nil {
- myWorldtask.CurrentTaskIds = make(map[int32]*pb.Worldtask)
+ if myWorldtask.CurrentTask == nil {
+ myWorldtask.CurrentTask = make(map[int32]*pb.Worldtask)
}
- myWorldtask.CurrentTaskIds[curTaskConf.Group] = &pb.Worldtask{
+ myWorldtask.CurrentTask[curTaskConf.Group] = &pb.Worldtask{
TaskId: req.TaskId,
TaskType: 2,
}
+ myWorldtask.CurrentTask[curTaskConf.Group].NpcStatus=1
+
update := map[string]interface{}{
- "currentTaskIds": myWorldtask.CurrentTaskIds,
- "npcStatus": 1,
+ "currentTask": myWorldtask.CurrentTask,
}
if err := a.module.modelWorldtask.Change(uid, update); err != nil {
code = pb.ErrorCode_DBError
diff --git a/modules/worldtask/api_battlefinish.go b/modules/worldtask/api_battlefinish.go
index b83cf8cb7..724c3e403 100644
--- a/modules/worldtask/api_battlefinish.go
+++ b/modules/worldtask/api_battlefinish.go
@@ -62,8 +62,13 @@ func (this *apiComp) Battlefinish(session comm.IUserSession, req *pb.WorldtaskBa
}
if taskConf.IdAfter != 0 {
+ nextTaskIds := this.module.modelWorldtask.findNextTasks(req.TaskId)
+ nextMap := make(map[int32]*pb.Worldtask)
+ nextMap[req.GroupId] = &pb.Worldtask{
+ CondiIds: nextTaskIds,
+ }
if err := session.SendMsg(string(this.module.GetType()), "nexttask", &pb.WorldtaskNexttaskPush{
- NextTaskId: taskConf.IdAfter,
+ NextTask: nextMap,
}); err != nil {
log.Error("任务条件达成推送",
log.Field{Key: "uid", Value: uid},
diff --git a/modules/worldtask/api_completetask.go b/modules/worldtask/api_completetask.go
index 72fb0b084..f01534892 100644
--- a/modules/worldtask/api_completetask.go
+++ b/modules/worldtask/api_completetask.go
@@ -4,13 +4,14 @@ import (
"go_dreamfactory/comm"
"go_dreamfactory/lego/sys/log"
"go_dreamfactory/pb"
+ "go_dreamfactory/utils"
"google.golang.org/protobuf/proto"
)
// 任务完成条件
func (this *apiComp) CompleteCondiCheck(session comm.IUserSession, req *pb.WorldtaskCompleteCondiReq) (code pb.ErrorCode) {
- if req.GroupId != 2 || req.TaskId <= 0 || req.CondiId <= 0 {
+ if req.GroupId <= 0 || req.TaskId <= 0 || req.CondiId <= 0 {
code = *pb.ErrorCode_ReqParameterError.Enum()
}
return
@@ -28,18 +29,26 @@ func (this *apiComp) CompleteCondi(session comm.IUserSession, req *pb.WorldtaskC
return
}
+ 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 {
return
}
- myWorldtask.CondiIds = append(myWorldtask.CondiIds, req.CondiId)
+ if wt == nil {
+ wt = &pb.Worldtask{}
+ }
+ if _, b := utils.Findx(wt.CondiIds, req.CondiId); !b {
+ wt.CondiIds = append(wt.CondiIds, req.CondiId)
+ }
}
}
+ myWorldtask.CurrentTask[req.GroupId] = wt
+
update := map[string]interface{}{
- "condiIds": myWorldtask.CondiIds,
+ "currentTask": myWorldtask.CurrentTask,
}
if err := this.module.modelWorldtask.Change(uid, update); err != nil {
code = pb.ErrorCode_DBError
diff --git a/modules/worldtask/api_finish.go b/modules/worldtask/api_finish.go
index caa25c6d3..91b830a01 100644
--- a/modules/worldtask/api_finish.go
+++ b/modules/worldtask/api_finish.go
@@ -68,17 +68,74 @@ func (this *apiComp) Finish(session comm.IUserSession, req *pb.WorldtaskFinishRe
// 前置任务ID 只有世界任务才校验前置
if curTaskConf.Des == 2 {
- if !this.module.modelWorldtask.IsPreFinished(userTask, curTaskConf) {
+ 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})
code = pb.ErrorCode_WorldtaskLastUnFinished
return
}
}
- var (
- hero []string
- )
- hero = make([]string, 0)
- var nextTaskId int32
+
+ updateCheckCond := func(nextTaskId int32) *pb.DBWorldtask {
+ //检查下个任务的完成条件
+ nextTaskConf, err := this.module.configure.getWorldtaskById(nextTaskId)
+ if err != nil || curTaskConf == nil {
+ code = pb.ErrorCode_ConfigNoFound
+ return nil
+ }
+ if nextTaskConf == nil {
+ return nil
+ }
+
+ if userTask.CurrentTask == nil {
+ userTask.CurrentTask = make(map[int32]*pb.Worldtask)
+ }
+
+ if len(nextTaskConf.Completetask) == 1 && nextTaskConf.Completetask[0] == 0 {
+ wt := &pb.Worldtask{
+ TaskId: nextTaskId,
+ TaskType: nextTaskConf.Des,
+ CondiIds: []int32{},
+ }
+ userTask.CurrentTask[nextTaskConf.Group] = wt
+ } else {
+ for _, condiId := range nextTaskConf.Completetask {
+ if condiId == 0 {
+ continue
+ }
+ if m, err := this.module.service.GetModule(comm.ModuleRtask); err == nil {
+ iwt, ok := m.(comm.IRtask)
+ if ok {
+ if code = iwt.CheckCondi(uid, condiId); code != pb.ErrorCode_Success {
+ return nil
+ }
+ _, ok := userTask.CurrentTask[nextTaskConf.Group]
+ if ok {
+ userTask.CurrentTask[nextTaskConf.Group].CondiIds = append(userTask.CurrentTask[req.GroupId].CondiIds, condiId)
+ } else {
+ condiIds := []int32{condiId}
+ userTask.CurrentTask[nextTaskConf.Group] = &pb.Worldtask{
+ TaskId: nextTaskId,
+ TaskType: nextTaskConf.Des,
+ CondiIds: condiIds,
+ }
+ }
+
+ }
+ }
+ }
+ }
+
+ update := map[string]interface{}{
+ "currentTask": userTask.CurrentTask,
+ }
+
+ if err := this.module.modelWorldtask.Change(uid, update); err != nil {
+ code = pb.ErrorCode_DBError
+ return nil
+ }
+
+ return userTask
+ }
finishRsp := func() {
if err := session.SendMsg(string(this.module.GetType()), WorldtaskSubtypeFinish, rsp); err != nil {
@@ -86,69 +143,41 @@ func (this *apiComp) Finish(session comm.IUserSession, req *pb.WorldtaskFinishRe
return
}
if curTaskConf.IdAfter != 0 {
- nextTaskId = curTaskConf.IdAfter
- //检查下个任务的完成条件
- nextTaskConf, err := this.module.configure.getWorldtaskById(nextTaskId)
- if err != nil || curTaskConf == nil {
- code = pb.ErrorCode_ConfigNoFound
- return
- }
+ nextTaskIds := this.module.modelWorldtask.findNextTasks(curTaskConf.Key)
+ this.module.Debug("nextTaskIds", log.Field{Key: "nextTaskIds", Value: nextTaskIds})
- if len(nextTaskConf.Completetask) == 1 && nextTaskConf.Completetask[0] == 0 {
- userTask.CondiIds = []int32{}
- } else {
- for _, condiId := range nextTaskConf.Completetask {
- if condiId == 0 {
- continue
- }
- if m, err := this.module.service.GetModule(comm.ModuleRtask); err == nil {
- iwt, ok := m.(comm.IRtask)
- if ok {
- if code = iwt.CheckCondi(uid, condiId); code != pb.ErrorCode_Success {
- return
- }
- userTask.CondiIds = append(userTask.CondiIds, condiId)
+ nextTask := make(map[int32]*pb.Worldtask)
+ for _, next := range nextTaskIds {
+ userTask = updateCheckCond(next)
+ if userTask != nil {
+ for k, v := range userTask.CurrentTask {
+ nextTask[k] = &pb.Worldtask{
+ TaskId: v.TaskId,
}
}
}
}
- //设置当前进行的任务
- userTask.CurrentTaskIds[curTaskConf.Group] = &pb.Worldtask{
- TaskId: nextTaskId,
- TaskType: 2,
- }
-
- update := map[string]interface{}{
- "condiIds": userTask.CondiIds,
- "currentTaskIds": userTask.CurrentTaskIds,
- }
-
- if err := this.module.modelWorldtask.Change(uid, update); err != nil {
- code = pb.ErrorCode_DBError
- return
- }
// 任务完成推送
if err := session.SendMsg(string(this.module.GetType()), WorldtaskNexttaskPush, &pb.WorldtaskNexttaskPush{
- NextTaskId: nextTaskId,
- CondIds: userTask.CondiIds,
+ NextTask: nextTask,
}); err != nil {
code = pb.ErrorCode_SystemError
return
}
-
+ } else {
+ // if _, ok := utils.Findx(userTask.Chapters, req.GroupId); !ok {
+ // userTask.Chapters = append(userTask.Chapters, req.GroupId)
+ // update := map[string]interface{}{
+ // "chapters": userTask.Chapters,
+ // }
+ // this.module.modelWorldtask.Change(uid, update)
+ // }
}
-
}
finishCall := func() {
- for _, v := range curTaskConf.Reword {
- if v.A == comm.HeroType {
- hero = append(hero, v.T)
- }
- }
-
// 完成任务
if err := this.module.modelWorldtask.finishTask(req.GroupId, req.TaskId, userTask); err != nil {
code = pb.ErrorCode_WorldtaskFinish
@@ -189,8 +218,8 @@ func (this *apiComp) Finish(session comm.IUserSession, req *pb.WorldtaskFinishRe
}
//判断任务是否已完成
- for _, t := range userTask.TaskList {
- if t.TaskId == req.TaskId {
+ for _, v := range userTask.TaskList {
+ if v == req.TaskId {
this.module.Debug("任务已完成,返回下一个",
log.Field{Key: "uid", Value: uid},
log.Field{Key: "taskId", Value: req.TaskId},
diff --git a/modules/worldtask/api_mine.go b/modules/worldtask/api_mine.go
index 9159ff1ff..49dca91c1 100644
--- a/modules/worldtask/api_mine.go
+++ b/modules/worldtask/api_mine.go
@@ -21,21 +21,7 @@ func (this *apiComp) Mine(session comm.IUserSession, req *pb.WorldtaskMineReq) (
code = pb.ErrorCode_DBError
return
}
- var list []*pb.Worldtask
- for _, v := range myWorldtask.TaskList {
- if v.TaskType == 2 { //世界任务
- list = append(list, v)
- }
- }
- var wtMp = make(map[int32]*pb.Worldtask)
- for k, v := range myWorldtask.LastTaskIds {
- if v.TaskType == 2 {
- wtMp[k] = v
- }
- }
- myWorldtask.LastTaskIds = wtMp
- myWorldtask.TaskList = list
rsp := &pb.WorldtaskMineResp{
Task: myWorldtask,
}
diff --git a/modules/worldtask/model_worldtask.go b/modules/worldtask/model_worldtask.go
index c86d39591..2046ed674 100644
--- a/modules/worldtask/model_worldtask.go
+++ b/modules/worldtask/model_worldtask.go
@@ -40,7 +40,7 @@ func (this *ModelWorldtask) getWorldtask(uid string) (*pb.DBWorldtask, error) {
// 判断前置任务是否完成
// true 已完成 false未完成
-func (this *ModelWorldtask) IsPreFinished(userTask *pb.DBWorldtask, curTaskConf *cfg.GameWorldTaskData) bool {
+func (this *ModelWorldtask) IsPreFinished(groupId int32, userTask *pb.DBWorldtask, curTaskConf *cfg.GameWorldTaskData) bool {
var (
lastTaskId int32
preTaskFinished bool
@@ -51,8 +51,8 @@ func (this *ModelWorldtask) IsPreFinished(userTask *pb.DBWorldtask, curTaskConf
lastTaskId = curTaskConf.Ontxe
}
- for _, t := range userTask.TaskList {
- if lastTaskId == t.TaskId {
+ for _, v := range userTask.TaskList {
+ if lastTaskId == v {
preTaskFinished = true
}
}
@@ -76,9 +76,6 @@ func (this *ModelWorldtask) finishTask(groupId, taskId int32, task *pb.DBWorldta
return errors.New("worldtask is nil")
}
update := map[string]interface{}{}
- if task.LastTaskIds == nil {
- task.LastTaskIds = make(map[int32]*pb.Worldtask)
- }
taskConf := this.moduleWorldtask.worldtaskConf.GetDataMap()[taskId]
if taskConf == nil {
@@ -90,15 +87,21 @@ func (this *ModelWorldtask) finishTask(groupId, taskId int32, task *pb.DBWorldta
TaskId: taskId,
TaskType: taskConf.Des,
}
- task.TaskList = append(task.TaskList, wt)
- task.LastTaskIds[groupId] = wt
+
+ task.TaskList = append(task.TaskList, taskId)
+
+ if task.CurrentTask == nil {
+ task.CurrentTask = make(map[int32]*pb.Worldtask)
+ }
+
+ wt.NpcStatus = 0
+ wt.DeliverNpc = 0
+ wt.CondiIds = []int32{}
+ task.CurrentTask[groupId] = wt
update["taskList"] = task.TaskList
- update["lastTaskIds"] = task.LastTaskIds
- update["deliverNpc"] = 1
- update["condiIds"] = []int32{}
- update["npcStatus"] = 0
- update["deliverNpc"] = 0
+ update["currentTask"] = task.CurrentTask
+
if err := this.Change(task.Uid, update); err != nil {
return err
}
@@ -130,3 +133,18 @@ func (this *ModelWorldtask) finishTask(groupId, taskId int32, task *pb.DBWorldta
}
return nil
}
+
+// 查找后续任务
+func (this *ModelWorldtask) findNextTasks(parentTaskId int32) (taskIds []int32) {
+ gwt, err := this.moduleWorldtask.configure.getWorldtaskCfg()
+ if err != nil || gwt == nil {
+ return
+ }
+
+ for _, v := range gwt.GetDataList() {
+ if v.Ontxe == parentTaskId {
+ taskIds = append(taskIds, v.Key)
+ }
+ }
+ return
+}
diff --git a/modules/worldtask/module.go b/modules/worldtask/module.go
index 4a7868051..ab50e3bb9 100644
--- a/modules/worldtask/module.go
+++ b/modules/worldtask/module.go
@@ -1,7 +1,6 @@
package worldtask
import (
- "fmt"
"go_dreamfactory/comm"
"go_dreamfactory/lego/base"
"go_dreamfactory/lego/core"
@@ -64,12 +63,15 @@ func (this *Worldtask) TaskCondFinishNotify(session comm.IUserSession, condId in
return err
}
+ var groupId int32
// 检索condId是否是世界任务的完成条件
finishedTaskIds := make(map[int32]int32) //达成的任务条件
for _, c := range this.worldtaskConf.GetDataList() {
for _, v := range c.Completetask {
if v == condId {
finishedTaskIds[c.Group] = c.Key
+ groupId = c.Group
+ break
}
}
}
@@ -78,20 +80,31 @@ func (this *Worldtask) TaskCondFinishNotify(session comm.IUserSession, condId in
return nil
}
- userTask.CondiIds = append(userTask.CondiIds, condId)
+ if userTask.CurrentTask == nil {
+ userTask.CurrentTask = make(map[int32]*pb.Worldtask)
+ }
+
+ wt, ok := userTask.CurrentTask[groupId]
+ if !ok {
+ wt = &pb.Worldtask{}
+ }
+
+ wt.CondiIds = append(wt.CondiIds, condId)
+
+ userTask.CurrentTask[groupId] = wt
update := map[string]interface{}{
- "condiIds": userTask.CondiIds,
+ "currentTask": userTask.CurrentTask,
}
this.modelWorldtask.Change(uid, update)
- for k, v := range userTask.CurrentTaskIds {
+ for k, v := range userTask.CurrentTask {
session.SendMsg(string(this.GetType()), "completecondis", &pb.WorldtaskCompletecondisPush{
GroupId: k,
TaskId: v.TaskId,
- CondiIds: userTask.CondiIds,
+ CondiIds: wt.CondiIds,
})
- this.Debug("推送完成条件",log.Field{Key: "condiIds",Value: v.TaskId})
+ this.Debug("推送完成条件", log.Field{Key: "condiIds", Value: v.TaskId})
}
return nil
@@ -99,104 +112,104 @@ func (this *Worldtask) TaskCondFinishNotify(session comm.IUserSession, condId in
// 任务条件达成通知
// Deprecated
-func (this *Worldtask) TaskcondNotify(session comm.IUserSession, condId int32) error {
- uid := session.GetUserId()
+// func (this *Worldtask) TaskcondNotify(session comm.IUserSession, condId int32) error {
+// uid := session.GetUserId()
- finishedTaskIds := make(map[int32]int32) //达成的任务条件
- for _, c := range this.worldtaskConf.GetDataList() {
- for _, v := range c.Completetask {
- if v == condId {
- finishedTaskIds[c.Group] = c.Key
- }
- }
- }
+// finishedTaskIds := make(map[int32]int32) //达成的任务条件
+// for _, c := range this.worldtaskConf.GetDataList() {
+// for _, v := range c.Completetask {
+// if v == condId {
+// finishedTaskIds[c.Group] = c.Key
+// }
+// }
+// }
- if len(finishedTaskIds) == 0 {
- //this.Debug("没有匹配到任务世界任务", log.Field{Key: "uid", Value: session.GetUserId()}, log.Field{Key: "condId", Value: condId})
- return nil
- }
- this.Debug("世界任务完成通知-查找到世界任务", log.Field{Key: "uid", Value: uid}, log.Field{Key: "condId", Value: condId}, log.Field{Key: "params", Value: finishedTaskIds})
- //下一个任务ID
- var nextTaskId int32
- // 获取用户信息
- user := this.ModuleUser.GetUser(uid)
- if user == nil {
- return comm.NewCustomError(pb.ErrorCode_UserSessionNobeing)
- }
+// if len(finishedTaskIds) == 0 {
+// //this.Debug("没有匹配到任务世界任务", log.Field{Key: "uid", Value: session.GetUserId()}, log.Field{Key: "condId", Value: condId})
+// return nil
+// }
+// this.Debug("世界任务完成通知-查找到世界任务", log.Field{Key: "uid", Value: uid}, log.Field{Key: "condId", Value: condId}, log.Field{Key: "params", Value: finishedTaskIds})
+// //下一个任务ID
+// var nextTaskId int32
+// // 获取用户信息
+// user := this.ModuleUser.GetUser(uid)
+// if user == nil {
+// return comm.NewCustomError(pb.ErrorCode_UserSessionNobeing)
+// }
- // 玩家世界任务
- userTask, err := this.modelWorldtask.getWorldtask(uid)
- if err != nil {
- this.Error("获取玩家世界任务", log.Field{Key: "uid", Value: uid}, log.Field{Key: "condId", Value: condId})
- return err
- }
+// // 玩家世界任务
+// userTask, err := this.modelWorldtask.getWorldtask(uid)
+// if err != nil {
+// this.Error("获取玩家世界任务", log.Field{Key: "uid", Value: uid}, log.Field{Key: "condId", Value: condId})
+// return err
+// }
- if userTask.Uid != "" {
- //查找任务ID根据condId 可能会找出不同的任务
- for groupId, taskId := range finishedTaskIds {
- logFields := []log.Field{{Key: "uid", Value: uid}, {Key: "group", Value: groupId}, {Key: "taskId", Value: taskId}, {Key: "condId", Value: condId}}
- // 判断任务是否已完成
- if this.modelWorldtask.isFinished(taskId, userTask.TaskList) {
- this.Debug("世界任务已完成", logFields...)
- continue
- }
- taskConf, err := this.configure.getWorldtaskById(taskId)
- if err != nil {
- this.Error("world_task config not found", logFields...)
- return err
- }
- logFields = append(logFields, log.Field{Key: "id_after", Value: taskConf.IdAfter}, log.Field{Key: "des", Value: taskConf.Des})
- if taskConf != nil {
- if taskConf.Des == 2 { //只有世界任务才校验前置
- if !this.modelWorldtask.IsPreFinished(userTask, taskConf) {
- this.Debug("世界任务前置任务未完成", logFields...)
- continue
- }
- }
- nextTaskId = taskConf.IdAfter
+// if userTask.Uid != "" {
+// //查找任务ID根据condId 可能会找出不同的任务
+// for groupId, taskId := range finishedTaskIds {
+// logFields := []log.Field{{Key: "uid", Value: uid}, {Key: "group", Value: groupId}, {Key: "taskId", Value: taskId}, {Key: "condId", Value: condId}}
+// // 判断任务是否已完成
+// if this.modelWorldtask.isFinished(taskId, userTask.TaskList) {
+// this.Debug("世界任务已完成", logFields...)
+// continue
+// }
+// taskConf, err := this.configure.getWorldtaskById(taskId)
+// if err != nil {
+// this.Error("world_task config not found", logFields...)
+// return err
+// }
+// logFields = append(logFields, log.Field{Key: "id_after", Value: taskConf.IdAfter}, log.Field{Key: "des", Value: taskConf.Des})
+// if taskConf != nil {
+// if taskConf.Des == 2 { //只有世界任务才校验前置
+// if !this.modelWorldtask.IsPreFinished(userTask, taskConf) {
+// this.Debug("世界任务前置任务未完成", logFields...)
+// continue
+// }
+// }
+// nextTaskId = taskConf.IdAfter
- // 判断玩家等级要求
- if taskConf.Des == 2 {
- if user.Lv < taskConf.Lock {
- logFields = append(logFields, log.Field{Key: "当前lv", Value: user.Lv}, log.Field{Key: "期望等级", Value: taskConf.Lock})
- this.Debug("等级不满足", logFields...)
- return comm.NewCustomError(pb.ErrorCode_WorldtaskLvNotEnough)
- }
- }
+// // 判断玩家等级要求
+// if taskConf.Des == 2 {
+// if user.Lv < taskConf.Lock {
+// logFields = append(logFields, log.Field{Key: "当前lv", Value: user.Lv}, log.Field{Key: "期望等级", Value: taskConf.Lock})
+// this.Debug("等级不满足", logFields...)
+// return comm.NewCustomError(pb.ErrorCode_WorldtaskLvNotEnough)
+// }
+// }
- //完成任务
- if err := this.modelWorldtask.finishTask(groupId, taskId, userTask); err != nil {
- logFields = append(logFields, log.Field{Key: "err", Value: err.Error()})
- this.Error("世界任务完成", logFields...)
- return err
- }
- this.Debug("任务条件达成完成", logFields...)
- //发奖
- if code := this.DispenseRes(session, taskConf.Reword, true); code != pb.ErrorCode_Success {
- logFields = append(logFields, log.Field{Key: "reward", Value: taskConf.Reword}, log.Field{Key: "code", Value: code})
- this.Error("资源发放", logFields...)
- }
+// //完成任务
+// if err := this.modelWorldtask.finishTask(groupId, taskId, userTask); err != nil {
+// logFields = append(logFields, log.Field{Key: "err", Value: err.Error()})
+// this.Error("世界任务完成", logFields...)
+// return err
+// }
+// this.Debug("任务条件达成完成", logFields...)
+// //发奖
+// if code := this.DispenseRes(session, taskConf.Reword, true); code != pb.ErrorCode_Success {
+// logFields = append(logFields, log.Field{Key: "reward", Value: taskConf.Reword}, log.Field{Key: "code", Value: code})
+// this.Error("资源发放", logFields...)
+// }
- if nextTaskId != 0 && taskConf.Des == 2 {
- if err := session.SendMsg(string(this.GetType()), "nexttask", &pb.WorldtaskNexttaskPush{
- NextTaskId: nextTaskId,
- }); err != nil {
- logFields = append(logFields, log.Field{Key: "err", Value: err.Error()})
- log.Error("任务条件达成推送", logFields...)
- } else {
- this.Debug("推送任务", log.Field{Key: "NextTaskId", Value: nextTaskId})
- }
- } else {
- this.Debug("已经是最后一个任务了", logFields...)
- }
+// if nextTaskId != 0 && taskConf.Des == 2 {
+// if err := session.SendMsg(string(this.GetType()), "nexttask", &pb.WorldtaskNexttaskPush{
+// // NextTaskId: nextTaskId,
+// }); err != nil {
+// logFields = append(logFields, log.Field{Key: "err", Value: err.Error()})
+// log.Error("任务条件达成推送", logFields...)
+// } else {
+// this.Debug("推送任务", log.Field{Key: "NextTaskId", Value: nextTaskId})
+// }
+// } else {
+// this.Debug("已经是最后一个任务了", logFields...)
+// }
- }
- }
+// }
+// }
- }
+// }
- return nil
-}
+// return nil
+// }
// 获取我的世界任务
func (this *Worldtask) GetMyWorldtask(uid string) *pb.DBWorldtask {
@@ -209,90 +222,80 @@ func (this *Worldtask) GetMyWorldtask(uid string) *pb.DBWorldtask {
}
func (this *Worldtask) BingoAllTask(session comm.IUserSession) error {
- uid := session.GetUserId()
- mytask := &pb.DBWorldtask{Uid: uid}
- mytask.LastTaskIds = make(map[int32]*pb.Worldtask)
+ // uid := session.GetUserId()
+ // mytask := &pb.DBWorldtask{Uid: uid}
- tasklist := this.worldtaskConf.GetDataList()
+ // tasklist := this.worldtaskConf.GetDataList()
- for _, conf := range tasklist {
- //世界任务配置
- if conf.Des == 2 {
- wt := &pb.Worldtask{
- TaskId: conf.Key,
- TaskType: conf.Des,
- }
- mytask.LastTaskIds[conf.Group] = wt
- mytask.TaskList = append(mytask.TaskList, wt)
- }
- }
+ // for _, conf := range tasklist {
+ // //世界任务配置
+ // wt := &pb.Worldtask{
+ // TaskId: conf.Key,
+ // TaskType: conf.Des,
+ // }
+ // mytask.TaskList = append(mytask.TaskList, wt)
+ // }
- if err := this.modelWorldtask.Add(uid, mytask); err != nil {
- return err
- }
+ // if err := this.modelWorldtask.Add(uid, mytask); err != nil {
+ // return err
+ // }
- rsp := &pb.WorldtaskFinishIdsPush{
- TaskList: mytask.TaskList,
- }
+ // rsp := &pb.WorldtaskFinishIdsPush{
+ // TaskList: mytask.TaskList,
+ // }
- return session.SendMsg(string(this.GetType()), "finishids", rsp)
+ return nil //session.SendMsg(string(this.GetType()), "finishids", rsp)
}
// bingo世界任务跳跃 支持回退
func (this *Worldtask) BingoJumpTask(session comm.IUserSession, groupId, taskId int32) error {
- uid := session.GetUserId()
- mytask, err := this.modelWorldtask.getWorldtask(uid)
- if err != nil {
- return err
- }
- mytask.Uid = uid
- // 更新数据
- update := map[string]interface{}{}
+ // uid := session.GetUserId()
+ // mytask, err := this.modelWorldtask.getWorldtask(uid)
+ // if err != nil {
+ // return err
+ // }
+ // mytask.Uid = uid
+ // // 更新数据
+ // update := map[string]interface{}{}
- taskConf := this.worldtaskConf.GetDataMap()[taskId]
- if taskConf == nil {
- return fmt.Errorf("taskId: %v config is nil", taskId)
- }
+ // taskConf := this.worldtaskConf.GetDataMap()[taskId]
+ // if taskConf == nil {
+ // return fmt.Errorf("taskId: %v config is nil", taskId)
+ // }
- if mytask.LastTaskIds == nil {
- mytask.LastTaskIds = make(map[int32]*pb.Worldtask)
- }
- //重置taskList
- mytask.TaskList = []*pb.Worldtask{}
+ // //重置taskList
+ // mytask.TaskList = []*pb.Worldtask{}
- //遍历
- if taskConf.Ontxe != 0 && taskConf.IdAfter != 0 {
- for _, v := range this.worldtaskConf.GetDataList() {
- if v.Group == groupId && v.Key <= taskId {
- wt := &pb.Worldtask{
- TaskId: v.Key,
- TaskType: v.Des,
- }
- mytask.LastTaskIds[groupId] = wt
- mytask.TaskList = append(mytask.TaskList, wt)
- }
+ // //遍历
+ // if taskConf.Ontxe != 0 && taskConf.IdAfter != 0 {
+ // for _, v := range this.worldtaskConf.GetDataList() {
+ // if v.Group == groupId && v.Key <= taskId {
+ // wt := &pb.Worldtask{
+ // TaskId: v.Key,
+ // TaskType: v.Des,
+ // }
+ // mytask.TaskList = append(mytask.TaskList, wt)
+ // }
- }
- } else {
- wt := &pb.Worldtask{
- TaskId: taskId,
- TaskType: taskConf.Des,
- }
- mytask.LastTaskIds[groupId] = wt
- mytask.TaskList = append(mytask.TaskList, wt)
- }
- update = map[string]interface{}{
- "lastTaskIds": mytask.LastTaskIds,
- "taskList": mytask.TaskList,
- }
+ // }
+ // } else {
+ // wt := &pb.Worldtask{
+ // TaskId: taskId,
+ // TaskType: taskConf.Des,
+ // }
+ // mytask.TaskList = append(mytask.TaskList, wt)
+ // }
+ // update = map[string]interface{}{
+ // "taskList": mytask.TaskList,
+ // }
- if err := this.modelWorldtask.Change(uid, update); err != nil {
- return err
- }
+ // if err := this.modelWorldtask.Change(uid, update); err != nil {
+ // return err
+ // }
- rsp := &pb.WorldtaskFinishIdsPush{
- TaskList: mytask.TaskList,
- }
+ // rsp := &pb.WorldtaskFinishIdsPush{
+ // TaskList: mytask.TaskList,
+ // }
- return session.SendMsg(string(this.GetType()), "finishids", rsp)
+ return nil //session.SendMsg(string(this.GetType()), "finishids", rsp)
}
diff --git a/pb/gourmet_msg.pb.go b/pb/gourmet_msg.pb.go
index d3b8b0eeb..70b0693b6 100644
--- a/pb/gourmet_msg.pb.go
+++ b/pb/gourmet_msg.pb.go
@@ -130,6 +130,100 @@ func (x *GourmetCreateFoodResp) GetFirstGet() bool {
return false
}
+type GourmetActivateAtlasReq struct {
+ state protoimpl.MessageState
+ sizeCache protoimpl.SizeCache
+ unknownFields protoimpl.UnknownFields
+
+ Cid string `protobuf:"bytes,1,opt,name=cid,proto3" json:"cid"` // 图鉴ID
+}
+
+func (x *GourmetActivateAtlasReq) Reset() {
+ *x = GourmetActivateAtlasReq{}
+ if protoimpl.UnsafeEnabled {
+ mi := &file_gourmet_gourmet_msg_proto_msgTypes[2]
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ ms.StoreMessageInfo(mi)
+ }
+}
+
+func (x *GourmetActivateAtlasReq) String() string {
+ return protoimpl.X.MessageStringOf(x)
+}
+
+func (*GourmetActivateAtlasReq) ProtoMessage() {}
+
+func (x *GourmetActivateAtlasReq) ProtoReflect() protoreflect.Message {
+ mi := &file_gourmet_gourmet_msg_proto_msgTypes[2]
+ if protoimpl.UnsafeEnabled && x != nil {
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ if ms.LoadMessageInfo() == nil {
+ ms.StoreMessageInfo(mi)
+ }
+ return ms
+ }
+ return mi.MessageOf(x)
+}
+
+// Deprecated: Use GourmetActivateAtlasReq.ProtoReflect.Descriptor instead.
+func (*GourmetActivateAtlasReq) Descriptor() ([]byte, []int) {
+ return file_gourmet_gourmet_msg_proto_rawDescGZIP(), []int{2}
+}
+
+func (x *GourmetActivateAtlasReq) GetCid() string {
+ if x != nil {
+ return x.Cid
+ }
+ return ""
+}
+
+type GourmetActivateAtlasResp struct {
+ state protoimpl.MessageState
+ sizeCache protoimpl.SizeCache
+ unknownFields protoimpl.UnknownFields
+
+ Atlas map[string]int32 `protobuf:"bytes,1,rep,name=atlas,proto3" json:"atlas" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"`
+}
+
+func (x *GourmetActivateAtlasResp) Reset() {
+ *x = GourmetActivateAtlasResp{}
+ if protoimpl.UnsafeEnabled {
+ mi := &file_gourmet_gourmet_msg_proto_msgTypes[3]
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ ms.StoreMessageInfo(mi)
+ }
+}
+
+func (x *GourmetActivateAtlasResp) String() string {
+ return protoimpl.X.MessageStringOf(x)
+}
+
+func (*GourmetActivateAtlasResp) ProtoMessage() {}
+
+func (x *GourmetActivateAtlasResp) ProtoReflect() protoreflect.Message {
+ mi := &file_gourmet_gourmet_msg_proto_msgTypes[3]
+ if protoimpl.UnsafeEnabled && x != nil {
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ if ms.LoadMessageInfo() == nil {
+ ms.StoreMessageInfo(mi)
+ }
+ return ms
+ }
+ return mi.MessageOf(x)
+}
+
+// Deprecated: Use GourmetActivateAtlasResp.ProtoReflect.Descriptor instead.
+func (*GourmetActivateAtlasResp) Descriptor() ([]byte, []int) {
+ return file_gourmet_gourmet_msg_proto_rawDescGZIP(), []int{3}
+}
+
+func (x *GourmetActivateAtlasResp) GetAtlas() map[string]int32 {
+ if x != nil {
+ return x.Atlas
+ }
+ return nil
+}
+
// 图鉴
type GourmetAtlasReq struct {
state protoimpl.MessageState
@@ -140,7 +234,7 @@ type GourmetAtlasReq struct {
func (x *GourmetAtlasReq) Reset() {
*x = GourmetAtlasReq{}
if protoimpl.UnsafeEnabled {
- mi := &file_gourmet_gourmet_msg_proto_msgTypes[2]
+ mi := &file_gourmet_gourmet_msg_proto_msgTypes[4]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@@ -153,7 +247,7 @@ func (x *GourmetAtlasReq) String() string {
func (*GourmetAtlasReq) ProtoMessage() {}
func (x *GourmetAtlasReq) ProtoReflect() protoreflect.Message {
- mi := &file_gourmet_gourmet_msg_proto_msgTypes[2]
+ mi := &file_gourmet_gourmet_msg_proto_msgTypes[4]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@@ -166,7 +260,7 @@ func (x *GourmetAtlasReq) ProtoReflect() protoreflect.Message {
// Deprecated: Use GourmetAtlasReq.ProtoReflect.Descriptor instead.
func (*GourmetAtlasReq) Descriptor() ([]byte, []int) {
- return file_gourmet_gourmet_msg_proto_rawDescGZIP(), []int{2}
+ return file_gourmet_gourmet_msg_proto_rawDescGZIP(), []int{4}
}
type GourmetAtlasResp struct {
@@ -174,13 +268,13 @@ type GourmetAtlasResp struct {
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
- Atlas *DBGourmetAtlas `protobuf:"bytes,1,opt,name=atlas,proto3" json:"atlas"`
+ Atlas map[string]int32 `protobuf:"bytes,1,rep,name=atlas,proto3" json:"atlas" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"`
}
func (x *GourmetAtlasResp) Reset() {
*x = GourmetAtlasResp{}
if protoimpl.UnsafeEnabled {
- mi := &file_gourmet_gourmet_msg_proto_msgTypes[3]
+ mi := &file_gourmet_gourmet_msg_proto_msgTypes[5]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@@ -193,7 +287,7 @@ func (x *GourmetAtlasResp) String() string {
func (*GourmetAtlasResp) ProtoMessage() {}
func (x *GourmetAtlasResp) ProtoReflect() protoreflect.Message {
- mi := &file_gourmet_gourmet_msg_proto_msgTypes[3]
+ mi := &file_gourmet_gourmet_msg_proto_msgTypes[5]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@@ -206,10 +300,10 @@ func (x *GourmetAtlasResp) ProtoReflect() protoreflect.Message {
// Deprecated: Use GourmetAtlasResp.ProtoReflect.Descriptor instead.
func (*GourmetAtlasResp) Descriptor() ([]byte, []int) {
- return file_gourmet_gourmet_msg_proto_rawDescGZIP(), []int{3}
+ return file_gourmet_gourmet_msg_proto_rawDescGZIP(), []int{5}
}
-func (x *GourmetAtlasResp) GetAtlas() *DBGourmetAtlas {
+func (x *GourmetAtlasResp) GetAtlas() map[string]int32 {
if x != nil {
return x.Atlas
}
@@ -225,7 +319,7 @@ type GourmetGetListReq struct {
func (x *GourmetGetListReq) Reset() {
*x = GourmetGetListReq{}
if protoimpl.UnsafeEnabled {
- mi := &file_gourmet_gourmet_msg_proto_msgTypes[4]
+ mi := &file_gourmet_gourmet_msg_proto_msgTypes[6]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@@ -238,7 +332,7 @@ func (x *GourmetGetListReq) String() string {
func (*GourmetGetListReq) ProtoMessage() {}
func (x *GourmetGetListReq) ProtoReflect() protoreflect.Message {
- mi := &file_gourmet_gourmet_msg_proto_msgTypes[4]
+ mi := &file_gourmet_gourmet_msg_proto_msgTypes[6]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@@ -251,7 +345,7 @@ func (x *GourmetGetListReq) ProtoReflect() protoreflect.Message {
// Deprecated: Use GourmetGetListReq.ProtoReflect.Descriptor instead.
func (*GourmetGetListReq) Descriptor() ([]byte, []int) {
- return file_gourmet_gourmet_msg_proto_rawDescGZIP(), []int{4}
+ return file_gourmet_gourmet_msg_proto_rawDescGZIP(), []int{6}
}
// 返回进度信息
@@ -266,7 +360,7 @@ type GourmetGetListResp struct {
func (x *GourmetGetListResp) Reset() {
*x = GourmetGetListResp{}
if protoimpl.UnsafeEnabled {
- mi := &file_gourmet_gourmet_msg_proto_msgTypes[5]
+ mi := &file_gourmet_gourmet_msg_proto_msgTypes[7]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@@ -279,7 +373,7 @@ func (x *GourmetGetListResp) String() string {
func (*GourmetGetListResp) ProtoMessage() {}
func (x *GourmetGetListResp) ProtoReflect() protoreflect.Message {
- mi := &file_gourmet_gourmet_msg_proto_msgTypes[5]
+ mi := &file_gourmet_gourmet_msg_proto_msgTypes[7]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@@ -292,7 +386,7 @@ func (x *GourmetGetListResp) ProtoReflect() protoreflect.Message {
// Deprecated: Use GourmetGetListResp.ProtoReflect.Descriptor instead.
func (*GourmetGetListResp) Descriptor() ([]byte, []int) {
- return file_gourmet_gourmet_msg_proto_rawDescGZIP(), []int{5}
+ return file_gourmet_gourmet_msg_proto_rawDescGZIP(), []int{7}
}
func (x *GourmetGetListResp) GetData() *DBGourmet {
@@ -314,7 +408,7 @@ type GourmetCreateOrderReq struct {
func (x *GourmetCreateOrderReq) Reset() {
*x = GourmetCreateOrderReq{}
if protoimpl.UnsafeEnabled {
- mi := &file_gourmet_gourmet_msg_proto_msgTypes[6]
+ mi := &file_gourmet_gourmet_msg_proto_msgTypes[8]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@@ -327,7 +421,7 @@ func (x *GourmetCreateOrderReq) String() string {
func (*GourmetCreateOrderReq) ProtoMessage() {}
func (x *GourmetCreateOrderReq) ProtoReflect() protoreflect.Message {
- mi := &file_gourmet_gourmet_msg_proto_msgTypes[6]
+ mi := &file_gourmet_gourmet_msg_proto_msgTypes[8]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@@ -340,7 +434,7 @@ func (x *GourmetCreateOrderReq) ProtoReflect() protoreflect.Message {
// Deprecated: Use GourmetCreateOrderReq.ProtoReflect.Descriptor instead.
func (*GourmetCreateOrderReq) Descriptor() ([]byte, []int) {
- return file_gourmet_gourmet_msg_proto_rawDescGZIP(), []int{6}
+ return file_gourmet_gourmet_msg_proto_rawDescGZIP(), []int{8}
}
func (x *GourmetCreateOrderReq) GetOrder() []*OrderCook {
@@ -361,7 +455,7 @@ type GourmetCreateOrderResp struct {
func (x *GourmetCreateOrderResp) Reset() {
*x = GourmetCreateOrderResp{}
if protoimpl.UnsafeEnabled {
- mi := &file_gourmet_gourmet_msg_proto_msgTypes[7]
+ mi := &file_gourmet_gourmet_msg_proto_msgTypes[9]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@@ -374,7 +468,7 @@ func (x *GourmetCreateOrderResp) String() string {
func (*GourmetCreateOrderResp) ProtoMessage() {}
func (x *GourmetCreateOrderResp) ProtoReflect() protoreflect.Message {
- mi := &file_gourmet_gourmet_msg_proto_msgTypes[7]
+ mi := &file_gourmet_gourmet_msg_proto_msgTypes[9]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@@ -387,7 +481,7 @@ func (x *GourmetCreateOrderResp) ProtoReflect() protoreflect.Message {
// Deprecated: Use GourmetCreateOrderResp.ProtoReflect.Descriptor instead.
func (*GourmetCreateOrderResp) Descriptor() ([]byte, []int) {
- return file_gourmet_gourmet_msg_proto_rawDescGZIP(), []int{7}
+ return file_gourmet_gourmet_msg_proto_rawDescGZIP(), []int{9}
}
func (x *GourmetCreateOrderResp) GetData() *DBGourmet {
@@ -407,7 +501,7 @@ type GourmetGetRewardReq struct {
func (x *GourmetGetRewardReq) Reset() {
*x = GourmetGetRewardReq{}
if protoimpl.UnsafeEnabled {
- mi := &file_gourmet_gourmet_msg_proto_msgTypes[8]
+ mi := &file_gourmet_gourmet_msg_proto_msgTypes[10]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@@ -420,7 +514,7 @@ func (x *GourmetGetRewardReq) String() string {
func (*GourmetGetRewardReq) ProtoMessage() {}
func (x *GourmetGetRewardReq) ProtoReflect() protoreflect.Message {
- mi := &file_gourmet_gourmet_msg_proto_msgTypes[8]
+ mi := &file_gourmet_gourmet_msg_proto_msgTypes[10]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@@ -433,7 +527,7 @@ func (x *GourmetGetRewardReq) ProtoReflect() protoreflect.Message {
// Deprecated: Use GourmetGetRewardReq.ProtoReflect.Descriptor instead.
func (*GourmetGetRewardReq) Descriptor() ([]byte, []int) {
- return file_gourmet_gourmet_msg_proto_rawDescGZIP(), []int{8}
+ return file_gourmet_gourmet_msg_proto_rawDescGZIP(), []int{10}
}
type GourmetGetRewardResp struct {
@@ -447,7 +541,7 @@ type GourmetGetRewardResp struct {
func (x *GourmetGetRewardResp) Reset() {
*x = GourmetGetRewardResp{}
if protoimpl.UnsafeEnabled {
- mi := &file_gourmet_gourmet_msg_proto_msgTypes[9]
+ mi := &file_gourmet_gourmet_msg_proto_msgTypes[11]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@@ -460,7 +554,7 @@ func (x *GourmetGetRewardResp) String() string {
func (*GourmetGetRewardResp) ProtoMessage() {}
func (x *GourmetGetRewardResp) ProtoReflect() protoreflect.Message {
- mi := &file_gourmet_gourmet_msg_proto_msgTypes[9]
+ mi := &file_gourmet_gourmet_msg_proto_msgTypes[11]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@@ -473,7 +567,7 @@ func (x *GourmetGetRewardResp) ProtoReflect() protoreflect.Message {
// Deprecated: Use GourmetGetRewardResp.ProtoReflect.Descriptor instead.
func (*GourmetGetRewardResp) Descriptor() ([]byte, []int) {
- return file_gourmet_gourmet_msg_proto_rawDescGZIP(), []int{9}
+ return file_gourmet_gourmet_msg_proto_rawDescGZIP(), []int{11}
}
func (x *GourmetGetRewardResp) GetData() *DBGourmet {
@@ -495,7 +589,7 @@ type GourmetSkillLvReq struct {
func (x *GourmetSkillLvReq) Reset() {
*x = GourmetSkillLvReq{}
if protoimpl.UnsafeEnabled {
- mi := &file_gourmet_gourmet_msg_proto_msgTypes[10]
+ mi := &file_gourmet_gourmet_msg_proto_msgTypes[12]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@@ -508,7 +602,7 @@ func (x *GourmetSkillLvReq) String() string {
func (*GourmetSkillLvReq) ProtoMessage() {}
func (x *GourmetSkillLvReq) ProtoReflect() protoreflect.Message {
- mi := &file_gourmet_gourmet_msg_proto_msgTypes[10]
+ mi := &file_gourmet_gourmet_msg_proto_msgTypes[12]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@@ -521,7 +615,7 @@ func (x *GourmetSkillLvReq) ProtoReflect() protoreflect.Message {
// Deprecated: Use GourmetSkillLvReq.ProtoReflect.Descriptor instead.
func (*GourmetSkillLvReq) Descriptor() ([]byte, []int) {
- return file_gourmet_gourmet_msg_proto_rawDescGZIP(), []int{10}
+ return file_gourmet_gourmet_msg_proto_rawDescGZIP(), []int{12}
}
func (x *GourmetSkillLvReq) GetSkillType() int32 {
@@ -542,7 +636,7 @@ type GourmetSkillLvResp struct {
func (x *GourmetSkillLvResp) Reset() {
*x = GourmetSkillLvResp{}
if protoimpl.UnsafeEnabled {
- mi := &file_gourmet_gourmet_msg_proto_msgTypes[11]
+ mi := &file_gourmet_gourmet_msg_proto_msgTypes[13]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@@ -555,7 +649,7 @@ func (x *GourmetSkillLvResp) String() string {
func (*GourmetSkillLvResp) ProtoMessage() {}
func (x *GourmetSkillLvResp) ProtoReflect() protoreflect.Message {
- mi := &file_gourmet_gourmet_msg_proto_msgTypes[11]
+ mi := &file_gourmet_gourmet_msg_proto_msgTypes[13]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@@ -568,7 +662,7 @@ func (x *GourmetSkillLvResp) ProtoReflect() protoreflect.Message {
// Deprecated: Use GourmetSkillLvResp.ProtoReflect.Descriptor instead.
func (*GourmetSkillLvResp) Descriptor() ([]byte, []int) {
- return file_gourmet_gourmet_msg_proto_rawDescGZIP(), []int{11}
+ return file_gourmet_gourmet_msg_proto_rawDescGZIP(), []int{13}
}
func (x *GourmetSkillLvResp) GetData() *DBGourmet {
@@ -589,7 +683,7 @@ type GourmetGetRandUserReq struct {
func (x *GourmetGetRandUserReq) Reset() {
*x = GourmetGetRandUserReq{}
if protoimpl.UnsafeEnabled {
- mi := &file_gourmet_gourmet_msg_proto_msgTypes[12]
+ mi := &file_gourmet_gourmet_msg_proto_msgTypes[14]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@@ -602,7 +696,7 @@ func (x *GourmetGetRandUserReq) String() string {
func (*GourmetGetRandUserReq) ProtoMessage() {}
func (x *GourmetGetRandUserReq) ProtoReflect() protoreflect.Message {
- mi := &file_gourmet_gourmet_msg_proto_msgTypes[12]
+ mi := &file_gourmet_gourmet_msg_proto_msgTypes[14]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@@ -615,7 +709,7 @@ func (x *GourmetGetRandUserReq) ProtoReflect() protoreflect.Message {
// Deprecated: Use GourmetGetRandUserReq.ProtoReflect.Descriptor instead.
func (*GourmetGetRandUserReq) Descriptor() ([]byte, []int) {
- return file_gourmet_gourmet_msg_proto_rawDescGZIP(), []int{12}
+ return file_gourmet_gourmet_msg_proto_rawDescGZIP(), []int{14}
}
func (x *GourmetGetRandUserReq) GetPeople() int32 {
@@ -636,7 +730,7 @@ type GourmetGetRandUserResp struct {
func (x *GourmetGetRandUserResp) Reset() {
*x = GourmetGetRandUserResp{}
if protoimpl.UnsafeEnabled {
- mi := &file_gourmet_gourmet_msg_proto_msgTypes[13]
+ mi := &file_gourmet_gourmet_msg_proto_msgTypes[15]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@@ -649,7 +743,7 @@ func (x *GourmetGetRandUserResp) String() string {
func (*GourmetGetRandUserResp) ProtoMessage() {}
func (x *GourmetGetRandUserResp) ProtoReflect() protoreflect.Message {
- mi := &file_gourmet_gourmet_msg_proto_msgTypes[13]
+ mi := &file_gourmet_gourmet_msg_proto_msgTypes[15]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@@ -662,7 +756,7 @@ func (x *GourmetGetRandUserResp) ProtoReflect() protoreflect.Message {
// Deprecated: Use GourmetGetRandUserResp.ProtoReflect.Descriptor instead.
func (*GourmetGetRandUserResp) Descriptor() ([]byte, []int) {
- return file_gourmet_gourmet_msg_proto_rawDescGZIP(), []int{13}
+ return file_gourmet_gourmet_msg_proto_rawDescGZIP(), []int{15}
}
func (x *GourmetGetRandUserResp) GetUser() []*DBUser {
@@ -694,43 +788,59 @@ var file_gourmet_gourmet_msg_proto_rawDesc = []byte{
0x61, 0x74, 0x65, 0x46, 0x6f, 0x6f, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x63,
0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x63, 0x69, 0x64, 0x12, 0x1a, 0x0a,
0x08, 0x66, 0x69, 0x72, 0x73, 0x74, 0x47, 0x65, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52,
- 0x08, 0x66, 0x69, 0x72, 0x73, 0x74, 0x47, 0x65, 0x74, 0x22, 0x11, 0x0a, 0x0f, 0x47, 0x6f, 0x75,
- 0x72, 0x6d, 0x65, 0x74, 0x41, 0x74, 0x6c, 0x61, 0x73, 0x52, 0x65, 0x71, 0x22, 0x39, 0x0a, 0x10,
- 0x47, 0x6f, 0x75, 0x72, 0x6d, 0x65, 0x74, 0x41, 0x74, 0x6c, 0x61, 0x73, 0x52, 0x65, 0x73, 0x70,
- 0x12, 0x25, 0x0a, 0x05, 0x61, 0x74, 0x6c, 0x61, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32,
- 0x0f, 0x2e, 0x44, 0x42, 0x47, 0x6f, 0x75, 0x72, 0x6d, 0x65, 0x74, 0x41, 0x74, 0x6c, 0x61, 0x73,
- 0x52, 0x05, 0x61, 0x74, 0x6c, 0x61, 0x73, 0x22, 0x13, 0x0a, 0x11, 0x47, 0x6f, 0x75, 0x72, 0x6d,
- 0x65, 0x74, 0x47, 0x65, 0x74, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x22, 0x34, 0x0a, 0x12,
- 0x47, 0x6f, 0x75, 0x72, 0x6d, 0x65, 0x74, 0x47, 0x65, 0x74, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65,
- 0x73, 0x70, 0x12, 0x1e, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b,
- 0x32, 0x0a, 0x2e, 0x44, 0x42, 0x47, 0x6f, 0x75, 0x72, 0x6d, 0x65, 0x74, 0x52, 0x04, 0x64, 0x61,
- 0x74, 0x61, 0x22, 0x39, 0x0a, 0x15, 0x47, 0x6f, 0x75, 0x72, 0x6d, 0x65, 0x74, 0x43, 0x72, 0x65,
- 0x61, 0x74, 0x65, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x52, 0x65, 0x71, 0x12, 0x20, 0x0a, 0x05, 0x6f,
- 0x72, 0x64, 0x65, 0x72, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x4f, 0x72, 0x64,
- 0x65, 0x72, 0x43, 0x6f, 0x6f, 0x6b, 0x52, 0x05, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x22, 0x38, 0x0a,
- 0x16, 0x47, 0x6f, 0x75, 0x72, 0x6d, 0x65, 0x74, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x4f, 0x72,
- 0x64, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1e, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18,
- 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x44, 0x42, 0x47, 0x6f, 0x75, 0x72, 0x6d, 0x65,
- 0x74, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x15, 0x0a, 0x13, 0x47, 0x6f, 0x75, 0x72, 0x6d,
- 0x65, 0x74, 0x47, 0x65, 0x74, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x71, 0x22, 0x36,
- 0x0a, 0x14, 0x47, 0x6f, 0x75, 0x72, 0x6d, 0x65, 0x74, 0x47, 0x65, 0x74, 0x52, 0x65, 0x77, 0x61,
- 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1e, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01,
- 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x44, 0x42, 0x47, 0x6f, 0x75, 0x72, 0x6d, 0x65, 0x74,
- 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x31, 0x0a, 0x11, 0x47, 0x6f, 0x75, 0x72, 0x6d, 0x65,
- 0x74, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x4c, 0x76, 0x52, 0x65, 0x71, 0x12, 0x1c, 0x0a, 0x09, 0x73,
- 0x6b, 0x69, 0x6c, 0x6c, 0x54, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09,
- 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x54, 0x79, 0x70, 0x65, 0x22, 0x34, 0x0a, 0x12, 0x47, 0x6f, 0x75,
- 0x72, 0x6d, 0x65, 0x74, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x4c, 0x76, 0x52, 0x65, 0x73, 0x70, 0x12,
+ 0x08, 0x66, 0x69, 0x72, 0x73, 0x74, 0x47, 0x65, 0x74, 0x22, 0x2b, 0x0a, 0x17, 0x47, 0x6f, 0x75,
+ 0x72, 0x6d, 0x65, 0x74, 0x41, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x65, 0x41, 0x74, 0x6c, 0x61,
+ 0x73, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x63, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28,
+ 0x09, 0x52, 0x03, 0x63, 0x69, 0x64, 0x22, 0x90, 0x01, 0x0a, 0x18, 0x47, 0x6f, 0x75, 0x72, 0x6d,
+ 0x65, 0x74, 0x41, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x65, 0x41, 0x74, 0x6c, 0x61, 0x73, 0x52,
+ 0x65, 0x73, 0x70, 0x12, 0x3a, 0x0a, 0x05, 0x61, 0x74, 0x6c, 0x61, 0x73, 0x18, 0x01, 0x20, 0x03,
+ 0x28, 0x0b, 0x32, 0x24, 0x2e, 0x47, 0x6f, 0x75, 0x72, 0x6d, 0x65, 0x74, 0x41, 0x63, 0x74, 0x69,
+ 0x76, 0x61, 0x74, 0x65, 0x41, 0x74, 0x6c, 0x61, 0x73, 0x52, 0x65, 0x73, 0x70, 0x2e, 0x41, 0x74,
+ 0x6c, 0x61, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x05, 0x61, 0x74, 0x6c, 0x61, 0x73, 0x1a,
+ 0x38, 0x0a, 0x0a, 0x41, 0x74, 0x6c, 0x61, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a,
+ 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12,
+ 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05,
+ 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x11, 0x0a, 0x0f, 0x47, 0x6f, 0x75,
+ 0x72, 0x6d, 0x65, 0x74, 0x41, 0x74, 0x6c, 0x61, 0x73, 0x52, 0x65, 0x71, 0x22, 0x80, 0x01, 0x0a,
+ 0x10, 0x47, 0x6f, 0x75, 0x72, 0x6d, 0x65, 0x74, 0x41, 0x74, 0x6c, 0x61, 0x73, 0x52, 0x65, 0x73,
+ 0x70, 0x12, 0x32, 0x0a, 0x05, 0x61, 0x74, 0x6c, 0x61, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b,
+ 0x32, 0x1c, 0x2e, 0x47, 0x6f, 0x75, 0x72, 0x6d, 0x65, 0x74, 0x41, 0x74, 0x6c, 0x61, 0x73, 0x52,
+ 0x65, 0x73, 0x70, 0x2e, 0x41, 0x74, 0x6c, 0x61, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x05,
+ 0x61, 0x74, 0x6c, 0x61, 0x73, 0x1a, 0x38, 0x0a, 0x0a, 0x41, 0x74, 0x6c, 0x61, 0x73, 0x45, 0x6e,
+ 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
+ 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02,
+ 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22,
+ 0x13, 0x0a, 0x11, 0x47, 0x6f, 0x75, 0x72, 0x6d, 0x65, 0x74, 0x47, 0x65, 0x74, 0x4c, 0x69, 0x73,
+ 0x74, 0x52, 0x65, 0x71, 0x22, 0x34, 0x0a, 0x12, 0x47, 0x6f, 0x75, 0x72, 0x6d, 0x65, 0x74, 0x47,
+ 0x65, 0x74, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1e, 0x0a, 0x04, 0x64, 0x61,
+ 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x44, 0x42, 0x47, 0x6f, 0x75,
+ 0x72, 0x6d, 0x65, 0x74, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x39, 0x0a, 0x15, 0x47, 0x6f,
+ 0x75, 0x72, 0x6d, 0x65, 0x74, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x4f, 0x72, 0x64, 0x65, 0x72,
+ 0x52, 0x65, 0x71, 0x12, 0x20, 0x0a, 0x05, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x18, 0x01, 0x20, 0x03,
+ 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x43, 0x6f, 0x6f, 0x6b, 0x52, 0x05,
+ 0x6f, 0x72, 0x64, 0x65, 0x72, 0x22, 0x38, 0x0a, 0x16, 0x47, 0x6f, 0x75, 0x72, 0x6d, 0x65, 0x74,
+ 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x12,
0x1e, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e,
0x44, 0x42, 0x47, 0x6f, 0x75, 0x72, 0x6d, 0x65, 0x74, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22,
- 0x2f, 0x0a, 0x15, 0x47, 0x6f, 0x75, 0x72, 0x6d, 0x65, 0x74, 0x47, 0x65, 0x74, 0x52, 0x61, 0x6e,
- 0x64, 0x55, 0x73, 0x65, 0x72, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x65, 0x6f, 0x70,
- 0x6c, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x70, 0x65, 0x6f, 0x70, 0x6c, 0x65,
- 0x22, 0x35, 0x0a, 0x16, 0x47, 0x6f, 0x75, 0x72, 0x6d, 0x65, 0x74, 0x47, 0x65, 0x74, 0x52, 0x61,
- 0x6e, 0x64, 0x55, 0x73, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1b, 0x0a, 0x04, 0x75, 0x73,
- 0x65, 0x72, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44, 0x42, 0x55, 0x73, 0x65,
- 0x72, 0x52, 0x04, 0x75, 0x73, 0x65, 0x72, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62,
- 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+ 0x15, 0x0a, 0x13, 0x47, 0x6f, 0x75, 0x72, 0x6d, 0x65, 0x74, 0x47, 0x65, 0x74, 0x52, 0x65, 0x77,
+ 0x61, 0x72, 0x64, 0x52, 0x65, 0x71, 0x22, 0x36, 0x0a, 0x14, 0x47, 0x6f, 0x75, 0x72, 0x6d, 0x65,
+ 0x74, 0x47, 0x65, 0x74, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1e,
+ 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x44,
+ 0x42, 0x47, 0x6f, 0x75, 0x72, 0x6d, 0x65, 0x74, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x31,
+ 0x0a, 0x11, 0x47, 0x6f, 0x75, 0x72, 0x6d, 0x65, 0x74, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x4c, 0x76,
+ 0x52, 0x65, 0x71, 0x12, 0x1c, 0x0a, 0x09, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x54, 0x79, 0x70, 0x65,
+ 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x54, 0x79, 0x70,
+ 0x65, 0x22, 0x34, 0x0a, 0x12, 0x47, 0x6f, 0x75, 0x72, 0x6d, 0x65, 0x74, 0x53, 0x6b, 0x69, 0x6c,
+ 0x6c, 0x4c, 0x76, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1e, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18,
+ 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x44, 0x42, 0x47, 0x6f, 0x75, 0x72, 0x6d, 0x65,
+ 0x74, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x2f, 0x0a, 0x15, 0x47, 0x6f, 0x75, 0x72, 0x6d,
+ 0x65, 0x74, 0x47, 0x65, 0x74, 0x52, 0x61, 0x6e, 0x64, 0x55, 0x73, 0x65, 0x72, 0x52, 0x65, 0x71,
+ 0x12, 0x16, 0x0a, 0x06, 0x70, 0x65, 0x6f, 0x70, 0x6c, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05,
+ 0x52, 0x06, 0x70, 0x65, 0x6f, 0x70, 0x6c, 0x65, 0x22, 0x35, 0x0a, 0x16, 0x47, 0x6f, 0x75, 0x72,
+ 0x6d, 0x65, 0x74, 0x47, 0x65, 0x74, 0x52, 0x61, 0x6e, 0x64, 0x55, 0x73, 0x65, 0x72, 0x52, 0x65,
+ 0x73, 0x70, 0x12, 0x1b, 0x0a, 0x04, 0x75, 0x73, 0x65, 0x72, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b,
+ 0x32, 0x07, 0x2e, 0x44, 0x42, 0x55, 0x73, 0x65, 0x72, 0x52, 0x04, 0x75, 0x73, 0x65, 0x72, 0x42,
+ 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
}
var (
@@ -745,42 +855,46 @@ func file_gourmet_gourmet_msg_proto_rawDescGZIP() []byte {
return file_gourmet_gourmet_msg_proto_rawDescData
}
-var file_gourmet_gourmet_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 15)
+var file_gourmet_gourmet_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 19)
var file_gourmet_gourmet_msg_proto_goTypes = []interface{}{
- (*GourmetCreateFoodReq)(nil), // 0: GourmetCreateFoodReq
- (*GourmetCreateFoodResp)(nil), // 1: GourmetCreateFoodResp
- (*GourmetAtlasReq)(nil), // 2: GourmetAtlasReq
- (*GourmetAtlasResp)(nil), // 3: GourmetAtlasResp
- (*GourmetGetListReq)(nil), // 4: GourmetGetListReq
- (*GourmetGetListResp)(nil), // 5: GourmetGetListResp
- (*GourmetCreateOrderReq)(nil), // 6: GourmetCreateOrderReq
- (*GourmetCreateOrderResp)(nil), // 7: GourmetCreateOrderResp
- (*GourmetGetRewardReq)(nil), // 8: GourmetGetRewardReq
- (*GourmetGetRewardResp)(nil), // 9: GourmetGetRewardResp
- (*GourmetSkillLvReq)(nil), // 10: GourmetSkillLvReq
- (*GourmetSkillLvResp)(nil), // 11: GourmetSkillLvResp
- (*GourmetGetRandUserReq)(nil), // 12: GourmetGetRandUserReq
- (*GourmetGetRandUserResp)(nil), // 13: GourmetGetRandUserResp
- nil, // 14: GourmetCreateFoodReq.MaterialEntry
- (*DBGourmetAtlas)(nil), // 15: DBGourmetAtlas
- (*DBGourmet)(nil), // 16: DBGourmet
- (*OrderCook)(nil), // 17: OrderCook
- (*DBUser)(nil), // 18: DBUser
+ (*GourmetCreateFoodReq)(nil), // 0: GourmetCreateFoodReq
+ (*GourmetCreateFoodResp)(nil), // 1: GourmetCreateFoodResp
+ (*GourmetActivateAtlasReq)(nil), // 2: GourmetActivateAtlasReq
+ (*GourmetActivateAtlasResp)(nil), // 3: GourmetActivateAtlasResp
+ (*GourmetAtlasReq)(nil), // 4: GourmetAtlasReq
+ (*GourmetAtlasResp)(nil), // 5: GourmetAtlasResp
+ (*GourmetGetListReq)(nil), // 6: GourmetGetListReq
+ (*GourmetGetListResp)(nil), // 7: GourmetGetListResp
+ (*GourmetCreateOrderReq)(nil), // 8: GourmetCreateOrderReq
+ (*GourmetCreateOrderResp)(nil), // 9: GourmetCreateOrderResp
+ (*GourmetGetRewardReq)(nil), // 10: GourmetGetRewardReq
+ (*GourmetGetRewardResp)(nil), // 11: GourmetGetRewardResp
+ (*GourmetSkillLvReq)(nil), // 12: GourmetSkillLvReq
+ (*GourmetSkillLvResp)(nil), // 13: GourmetSkillLvResp
+ (*GourmetGetRandUserReq)(nil), // 14: GourmetGetRandUserReq
+ (*GourmetGetRandUserResp)(nil), // 15: GourmetGetRandUserResp
+ nil, // 16: GourmetCreateFoodReq.MaterialEntry
+ nil, // 17: GourmetActivateAtlasResp.AtlasEntry
+ nil, // 18: GourmetAtlasResp.AtlasEntry
+ (*DBGourmet)(nil), // 19: DBGourmet
+ (*OrderCook)(nil), // 20: OrderCook
+ (*DBUser)(nil), // 21: DBUser
}
var file_gourmet_gourmet_msg_proto_depIdxs = []int32{
- 14, // 0: GourmetCreateFoodReq.material:type_name -> GourmetCreateFoodReq.MaterialEntry
- 15, // 1: GourmetAtlasResp.atlas:type_name -> DBGourmetAtlas
- 16, // 2: GourmetGetListResp.data:type_name -> DBGourmet
- 17, // 3: GourmetCreateOrderReq.order:type_name -> OrderCook
- 16, // 4: GourmetCreateOrderResp.data:type_name -> DBGourmet
- 16, // 5: GourmetGetRewardResp.data:type_name -> DBGourmet
- 16, // 6: GourmetSkillLvResp.data:type_name -> DBGourmet
- 18, // 7: GourmetGetRandUserResp.user:type_name -> DBUser
- 8, // [8:8] is the sub-list for method output_type
- 8, // [8:8] is the sub-list for method input_type
- 8, // [8:8] is the sub-list for extension type_name
- 8, // [8:8] is the sub-list for extension extendee
- 0, // [0:8] is the sub-list for field type_name
+ 16, // 0: GourmetCreateFoodReq.material:type_name -> GourmetCreateFoodReq.MaterialEntry
+ 17, // 1: GourmetActivateAtlasResp.atlas:type_name -> GourmetActivateAtlasResp.AtlasEntry
+ 18, // 2: GourmetAtlasResp.atlas:type_name -> GourmetAtlasResp.AtlasEntry
+ 19, // 3: GourmetGetListResp.data:type_name -> DBGourmet
+ 20, // 4: GourmetCreateOrderReq.order:type_name -> OrderCook
+ 19, // 5: GourmetCreateOrderResp.data:type_name -> DBGourmet
+ 19, // 6: GourmetGetRewardResp.data:type_name -> DBGourmet
+ 19, // 7: GourmetSkillLvResp.data:type_name -> DBGourmet
+ 21, // 8: GourmetGetRandUserResp.user:type_name -> DBUser
+ 9, // [9:9] is the sub-list for method output_type
+ 9, // [9:9] is the sub-list for method input_type
+ 9, // [9:9] is the sub-list for extension type_name
+ 9, // [9:9] is the sub-list for extension extendee
+ 0, // [0:9] is the sub-list for field type_name
}
func init() { file_gourmet_gourmet_msg_proto_init() }
@@ -816,7 +930,7 @@ func file_gourmet_gourmet_msg_proto_init() {
}
}
file_gourmet_gourmet_msg_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
- switch v := v.(*GourmetAtlasReq); i {
+ switch v := v.(*GourmetActivateAtlasReq); i {
case 0:
return &v.state
case 1:
@@ -828,7 +942,7 @@ func file_gourmet_gourmet_msg_proto_init() {
}
}
file_gourmet_gourmet_msg_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
- switch v := v.(*GourmetAtlasResp); i {
+ switch v := v.(*GourmetActivateAtlasResp); i {
case 0:
return &v.state
case 1:
@@ -840,7 +954,7 @@ func file_gourmet_gourmet_msg_proto_init() {
}
}
file_gourmet_gourmet_msg_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
- switch v := v.(*GourmetGetListReq); i {
+ switch v := v.(*GourmetAtlasReq); i {
case 0:
return &v.state
case 1:
@@ -852,7 +966,7 @@ func file_gourmet_gourmet_msg_proto_init() {
}
}
file_gourmet_gourmet_msg_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
- switch v := v.(*GourmetGetListResp); i {
+ switch v := v.(*GourmetAtlasResp); i {
case 0:
return &v.state
case 1:
@@ -864,7 +978,7 @@ func file_gourmet_gourmet_msg_proto_init() {
}
}
file_gourmet_gourmet_msg_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} {
- switch v := v.(*GourmetCreateOrderReq); i {
+ switch v := v.(*GourmetGetListReq); i {
case 0:
return &v.state
case 1:
@@ -876,7 +990,7 @@ func file_gourmet_gourmet_msg_proto_init() {
}
}
file_gourmet_gourmet_msg_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} {
- switch v := v.(*GourmetCreateOrderResp); i {
+ switch v := v.(*GourmetGetListResp); i {
case 0:
return &v.state
case 1:
@@ -888,7 +1002,7 @@ func file_gourmet_gourmet_msg_proto_init() {
}
}
file_gourmet_gourmet_msg_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} {
- switch v := v.(*GourmetGetRewardReq); i {
+ switch v := v.(*GourmetCreateOrderReq); i {
case 0:
return &v.state
case 1:
@@ -900,7 +1014,7 @@ func file_gourmet_gourmet_msg_proto_init() {
}
}
file_gourmet_gourmet_msg_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} {
- switch v := v.(*GourmetGetRewardResp); i {
+ switch v := v.(*GourmetCreateOrderResp); i {
case 0:
return &v.state
case 1:
@@ -912,7 +1026,7 @@ func file_gourmet_gourmet_msg_proto_init() {
}
}
file_gourmet_gourmet_msg_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} {
- switch v := v.(*GourmetSkillLvReq); i {
+ switch v := v.(*GourmetGetRewardReq); i {
case 0:
return &v.state
case 1:
@@ -924,7 +1038,7 @@ func file_gourmet_gourmet_msg_proto_init() {
}
}
file_gourmet_gourmet_msg_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} {
- switch v := v.(*GourmetSkillLvResp); i {
+ switch v := v.(*GourmetGetRewardResp); i {
case 0:
return &v.state
case 1:
@@ -936,7 +1050,7 @@ func file_gourmet_gourmet_msg_proto_init() {
}
}
file_gourmet_gourmet_msg_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} {
- switch v := v.(*GourmetGetRandUserReq); i {
+ switch v := v.(*GourmetSkillLvReq); i {
case 0:
return &v.state
case 1:
@@ -948,6 +1062,30 @@ func file_gourmet_gourmet_msg_proto_init() {
}
}
file_gourmet_gourmet_msg_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} {
+ switch v := v.(*GourmetSkillLvResp); i {
+ case 0:
+ return &v.state
+ case 1:
+ return &v.sizeCache
+ case 2:
+ return &v.unknownFields
+ default:
+ return nil
+ }
+ }
+ file_gourmet_gourmet_msg_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} {
+ switch v := v.(*GourmetGetRandUserReq); i {
+ case 0:
+ return &v.state
+ case 1:
+ return &v.sizeCache
+ case 2:
+ return &v.unknownFields
+ default:
+ return nil
+ }
+ }
+ file_gourmet_gourmet_msg_proto_msgTypes[15].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*GourmetGetRandUserResp); i {
case 0:
return &v.state
@@ -966,7 +1104,7 @@ func file_gourmet_gourmet_msg_proto_init() {
GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
RawDescriptor: file_gourmet_gourmet_msg_proto_rawDesc,
NumEnums: 0,
- NumMessages: 15,
+ NumMessages: 19,
NumExtensions: 0,
NumServices: 0,
},
diff --git a/pb/worldtask_db.pb.go b/pb/worldtask_db.pb.go
index 725b92508..febba6241 100644
--- a/pb/worldtask_db.pb.go
+++ b/pb/worldtask_db.pb.go
@@ -25,13 +25,9 @@ type DBWorldtask struct {
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
- Uid string `protobuf:"bytes,1,opt,name=uid,proto3" json:"uid" bson:"uid"` //玩家ID
- LastTaskIds map[int32]*Worldtask `protobuf:"bytes,2,rep,name=lastTaskIds,proto3" json:"lastTaskIds" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3" bson:"lastTaskIds"` //上一次完成的任务 key:groupId val:任务ID
- TaskList []*Worldtask `protobuf:"bytes,3,rep,name=taskList,proto3" json:"taskList" bson:"taskList"` // 任务列表
- CurrentTaskIds map[int32]*Worldtask `protobuf:"bytes,4,rep,name=currentTaskIds,proto3" json:"currentTaskIds" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3" bson:"currentTaskIds"` //正在进行的任务
- NpcStatus int32 `protobuf:"varint,5,opt,name=npcStatus,proto3" json:"npcStatus" bson:"npcStatus"` //NPC任务完成状态0未完成 1完成
- CondiIds []int32 `protobuf:"varint,6,rep,packed,name=condiIds,proto3" json:"condiIds" bson:"condiIds"` //任务完成条件
- DeliverNpc int32 `protobuf:"varint,7,opt,name=deliverNpc,proto3" json:"deliverNpc" bson:"deliverNpc"` //交付NPC完成状态0未完成 1完成
+ Uid string `protobuf:"bytes,1,opt,name=uid,proto3" json:"uid" bson:"uid"` //玩家ID
+ TaskList []int32 `protobuf:"varint,3,rep,packed,name=taskList,proto3" json:"taskList" bson:"taskList"` // 任务列表
+ CurrentTask map[int32]*Worldtask `protobuf:"bytes,4,rep,name=currentTask,proto3" json:"currentTask" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3" bson:"currentTask"` //正在进行的任务
}
func (x *DBWorldtask) Reset() {
@@ -73,55 +69,30 @@ func (x *DBWorldtask) GetUid() string {
return ""
}
-func (x *DBWorldtask) GetLastTaskIds() map[int32]*Worldtask {
- if x != nil {
- return x.LastTaskIds
- }
- return nil
-}
-
-func (x *DBWorldtask) GetTaskList() []*Worldtask {
+func (x *DBWorldtask) GetTaskList() []int32 {
if x != nil {
return x.TaskList
}
return nil
}
-func (x *DBWorldtask) GetCurrentTaskIds() map[int32]*Worldtask {
+func (x *DBWorldtask) GetCurrentTask() map[int32]*Worldtask {
if x != nil {
- return x.CurrentTaskIds
+ return x.CurrentTask
}
return nil
}
-func (x *DBWorldtask) GetNpcStatus() int32 {
- if x != nil {
- return x.NpcStatus
- }
- return 0
-}
-
-func (x *DBWorldtask) GetCondiIds() []int32 {
- if x != nil {
- return x.CondiIds
- }
- return nil
-}
-
-func (x *DBWorldtask) GetDeliverNpc() int32 {
- if x != nil {
- return x.DeliverNpc
- }
- return 0
-}
-
type Worldtask struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
- TaskId int32 `protobuf:"varint,1,opt,name=taskId,proto3" json:"taskId" bson:"taskIds"` //任务ID
- TaskType int32 `protobuf:"varint,3,opt,name=taskType,proto3" json:"taskType" bson:"taskType"` //任务类型 1 日/周常 2随机任务 3支线剧情
+ TaskId int32 `protobuf:"varint,1,opt,name=taskId,proto3" json:"taskId" bson:"taskIds"` //任务ID
+ TaskType int32 `protobuf:"varint,3,opt,name=taskType,proto3" json:"taskType" bson:"taskType"` //任务类型 1 日/周常 2随机任务 3支线剧情
+ NpcStatus int32 `protobuf:"varint,5,opt,name=npcStatus,proto3" json:"npcStatus" bson:"npcStatus"` //NPC任务完成状态0未完成 1完成
+ CondiIds []int32 `protobuf:"varint,6,rep,packed,name=condiIds,proto3" json:"condiIds" bson:"condiIds"` //任务完成条件
+ DeliverNpc int32 `protobuf:"varint,7,opt,name=deliverNpc,proto3" json:"deliverNpc" bson:"deliverNpc"` //交付NPC完成状态0未完成 1完成
}
func (x *Worldtask) Reset() {
@@ -170,45 +141,56 @@ func (x *Worldtask) GetTaskType() int32 {
return 0
}
+func (x *Worldtask) GetNpcStatus() int32 {
+ if x != nil {
+ return x.NpcStatus
+ }
+ return 0
+}
+
+func (x *Worldtask) GetCondiIds() []int32 {
+ if x != nil {
+ return x.CondiIds
+ }
+ return nil
+}
+
+func (x *Worldtask) GetDeliverNpc() int32 {
+ if x != nil {
+ return x.DeliverNpc
+ }
+ return 0
+}
+
var File_worldtask_worldtask_db_proto protoreflect.FileDescriptor
var file_worldtask_worldtask_db_proto_rawDesc = []byte{
0x0a, 0x1c, 0x77, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x2f, 0x77, 0x6f, 0x72, 0x6c,
- 0x64, 0x74, 0x61, 0x73, 0x6b, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xc7,
- 0x03, 0x0a, 0x0b, 0x44, 0x42, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x12, 0x10,
+ 0x64, 0x74, 0x61, 0x73, 0x6b, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xc8,
+ 0x01, 0x0a, 0x0b, 0x44, 0x42, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x12, 0x10,
0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64,
- 0x12, 0x3f, 0x0a, 0x0b, 0x6c, 0x61, 0x73, 0x74, 0x54, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x73, 0x18,
- 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x44, 0x42, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74,
- 0x61, 0x73, 0x6b, 0x2e, 0x4c, 0x61, 0x73, 0x74, 0x54, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x73, 0x45,
- 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0b, 0x6c, 0x61, 0x73, 0x74, 0x54, 0x61, 0x73, 0x6b, 0x49, 0x64,
- 0x73, 0x12, 0x26, 0x0a, 0x08, 0x74, 0x61, 0x73, 0x6b, 0x4c, 0x69, 0x73, 0x74, 0x18, 0x03, 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, 0x12, 0x48, 0x0a, 0x0e, 0x63, 0x75, 0x72,
- 0x72, 0x65, 0x6e, 0x74, 0x54, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28,
- 0x0b, 0x32, 0x20, 0x2e, 0x44, 0x42, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x2e,
- 0x43, 0x75, 0x72, 0x72, 0x65, 0x6e, 0x74, 0x54, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x73, 0x45, 0x6e,
- 0x74, 0x72, 0x79, 0x52, 0x0e, 0x63, 0x75, 0x72, 0x72, 0x65, 0x6e, 0x74, 0x54, 0x61, 0x73, 0x6b,
- 0x49, 0x64, 0x73, 0x12, 0x1c, 0x0a, 0x09, 0x6e, 0x70, 0x63, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73,
- 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x6e, 0x70, 0x63, 0x53, 0x74, 0x61, 0x74, 0x75,
- 0x73, 0x12, 0x1a, 0x0a, 0x08, 0x63, 0x6f, 0x6e, 0x64, 0x69, 0x49, 0x64, 0x73, 0x18, 0x06, 0x20,
- 0x03, 0x28, 0x05, 0x52, 0x08, 0x63, 0x6f, 0x6e, 0x64, 0x69, 0x49, 0x64, 0x73, 0x12, 0x1e, 0x0a,
- 0x0a, 0x64, 0x65, 0x6c, 0x69, 0x76, 0x65, 0x72, 0x4e, 0x70, 0x63, 0x18, 0x07, 0x20, 0x01, 0x28,
- 0x05, 0x52, 0x0a, 0x64, 0x65, 0x6c, 0x69, 0x76, 0x65, 0x72, 0x4e, 0x70, 0x63, 0x1a, 0x4a, 0x0a,
- 0x10, 0x4c, 0x61, 0x73, 0x74, 0x54, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x73, 0x45, 0x6e, 0x74, 0x72,
+ 0x12, 0x1a, 0x0a, 0x08, 0x74, 0x61, 0x73, 0x6b, 0x4c, 0x69, 0x73, 0x74, 0x18, 0x03, 0x20, 0x03,
+ 0x28, 0x05, 0x52, 0x08, 0x74, 0x61, 0x73, 0x6b, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x3f, 0x0a, 0x0b,
+ 0x63, 0x75, 0x72, 0x72, 0x65, 0x6e, 0x74, 0x54, 0x61, 0x73, 0x6b, 0x18, 0x04, 0x20, 0x03, 0x28,
+ 0x0b, 0x32, 0x1d, 0x2e, 0x44, 0x42, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x2e,
+ 0x43, 0x75, 0x72, 0x72, 0x65, 0x6e, 0x74, 0x54, 0x61, 0x73, 0x6b, 0x45, 0x6e, 0x74, 0x72, 0x79,
+ 0x52, 0x0b, 0x63, 0x75, 0x72, 0x72, 0x65, 0x6e, 0x74, 0x54, 0x61, 0x73, 0x6b, 0x1a, 0x4a, 0x0a,
+ 0x10, 0x43, 0x75, 0x72, 0x72, 0x65, 0x6e, 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, 0x1a, 0x4d, 0x0a, 0x13, 0x43, 0x75, 0x72,
- 0x72, 0x65, 0x6e, 0x74, 0x54, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x73, 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, 0x3f, 0x0a, 0x09, 0x57, 0x6f, 0x72, 0x6c,
- 0x64, 0x74, 0x61, 0x73, 0x6b, 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, 0x1a, 0x0a,
- 0x08, 0x74, 0x61, 0x73, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52,
- 0x08, 0x74, 0x61, 0x73, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70,
- 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+ 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x99, 0x01, 0x0a, 0x09, 0x57, 0x6f,
+ 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 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,
+ 0x1a, 0x0a, 0x08, 0x74, 0x61, 0x73, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28,
+ 0x05, 0x52, 0x08, 0x74, 0x61, 0x73, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x6e,
+ 0x70, 0x63, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09,
+ 0x6e, 0x70, 0x63, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x1a, 0x0a, 0x08, 0x63, 0x6f, 0x6e,
+ 0x64, 0x69, 0x49, 0x64, 0x73, 0x18, 0x06, 0x20, 0x03, 0x28, 0x05, 0x52, 0x08, 0x63, 0x6f, 0x6e,
+ 0x64, 0x69, 0x49, 0x64, 0x73, 0x12, 0x1e, 0x0a, 0x0a, 0x64, 0x65, 0x6c, 0x69, 0x76, 0x65, 0x72,
+ 0x4e, 0x70, 0x63, 0x18, 0x07, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x64, 0x65, 0x6c, 0x69, 0x76,
+ 0x65, 0x72, 0x4e, 0x70, 0x63, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70,
+ 0x72, 0x6f, 0x74, 0x6f, 0x33,
}
var (
@@ -223,24 +205,20 @@ func file_worldtask_worldtask_db_proto_rawDescGZIP() []byte {
return file_worldtask_worldtask_db_proto_rawDescData
}
-var file_worldtask_worldtask_db_proto_msgTypes = make([]protoimpl.MessageInfo, 4)
+var file_worldtask_worldtask_db_proto_msgTypes = make([]protoimpl.MessageInfo, 3)
var file_worldtask_worldtask_db_proto_goTypes = []interface{}{
(*DBWorldtask)(nil), // 0: DBWorldtask
(*Worldtask)(nil), // 1: Worldtask
- nil, // 2: DBWorldtask.LastTaskIdsEntry
- nil, // 3: DBWorldtask.CurrentTaskIdsEntry
+ nil, // 2: DBWorldtask.CurrentTaskEntry
}
var file_worldtask_worldtask_db_proto_depIdxs = []int32{
- 2, // 0: DBWorldtask.lastTaskIds:type_name -> DBWorldtask.LastTaskIdsEntry
- 1, // 1: DBWorldtask.taskList:type_name -> Worldtask
- 3, // 2: DBWorldtask.currentTaskIds:type_name -> DBWorldtask.CurrentTaskIdsEntry
- 1, // 3: DBWorldtask.LastTaskIdsEntry.value:type_name -> Worldtask
- 1, // 4: DBWorldtask.CurrentTaskIdsEntry.value:type_name -> Worldtask
- 5, // [5:5] is the sub-list for method output_type
- 5, // [5:5] is the sub-list for method input_type
- 5, // [5:5] is the sub-list for extension type_name
- 5, // [5:5] is the sub-list for extension extendee
- 0, // [0:5] is the sub-list for field type_name
+ 2, // 0: DBWorldtask.currentTask:type_name -> DBWorldtask.CurrentTaskEntry
+ 1, // 1: DBWorldtask.CurrentTaskEntry.value:type_name -> Worldtask
+ 2, // [2:2] is the sub-list for method output_type
+ 2, // [2:2] is the sub-list for method input_type
+ 2, // [2:2] is the sub-list for extension type_name
+ 2, // [2:2] is the sub-list for extension extendee
+ 0, // [0:2] is the sub-list for field type_name
}
func init() { file_worldtask_worldtask_db_proto_init() }
@@ -280,7 +258,7 @@ func file_worldtask_worldtask_db_proto_init() {
GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
RawDescriptor: file_worldtask_worldtask_db_proto_rawDesc,
NumEnums: 0,
- NumMessages: 4,
+ NumMessages: 3,
NumExtensions: 0,
NumServices: 0,
},
diff --git a/pb/worldtask_msg.pb.go b/pb/worldtask_msg.pb.go
index 886063bf7..7e1e8de85 100644
--- a/pb/worldtask_msg.pb.go
+++ b/pb/worldtask_msg.pb.go
@@ -525,8 +525,7 @@ type WorldtaskNexttaskPush struct {
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
- NextTaskId int32 `protobuf:"varint,1,opt,name=nextTaskId,proto3" json:"nextTaskId"` //下一个任务ID
- CondIds []int32 `protobuf:"varint,2,rep,packed,name=condIds,proto3" json:"condIds"` // 条件ID
+ NextTask map[int32]*Worldtask `protobuf:"bytes,1,rep,name=nextTask,proto3" json:"nextTask" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
}
func (x *WorldtaskNexttaskPush) Reset() {
@@ -561,16 +560,9 @@ func (*WorldtaskNexttaskPush) Descriptor() ([]byte, []int) {
return file_worldtask_worldtask_msg_proto_rawDescGZIP(), []int{9}
}
-func (x *WorldtaskNexttaskPush) GetNextTaskId() int32 {
+func (x *WorldtaskNexttaskPush) GetNextTask() map[int32]*Worldtask {
if x != nil {
- return x.NextTaskId
- }
- return 0
-}
-
-func (x *WorldtaskNexttaskPush) GetCondIds() []int32 {
- if x != nil {
- return x.CondIds
+ return x.NextTask
}
return nil
}
@@ -684,9 +676,10 @@ type WorldtaskBattleFinishReq struct {
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
- TaskId int32 `protobuf:"varint,1,opt,name=taskId,proto3" json:"taskId"` //任务ID
- BattleConfId int32 `protobuf:"varint,2,opt,name=battleConfId,proto3" json:"battleConfId"` //战斗配表ID
- Report *BattleReport `protobuf:"bytes,3,opt,name=report,proto3" json:"report"` //战报
+ GroupId int32 `protobuf:"varint,1,opt,name=groupId,proto3" json:"groupId"`
+ TaskId int32 `protobuf:"varint,2,opt,name=taskId,proto3" json:"taskId"` //任务ID
+ BattleConfId int32 `protobuf:"varint,3,opt,name=battleConfId,proto3" json:"battleConfId"` //战斗配表ID
+ Report *BattleReport `protobuf:"bytes,4,opt,name=report,proto3" json:"report"` //战报
}
func (x *WorldtaskBattleFinishReq) Reset() {
@@ -721,6 +714,13 @@ func (*WorldtaskBattleFinishReq) Descriptor() ([]byte, []int) {
return file_worldtask_worldtask_msg_proto_rawDescGZIP(), []int{12}
}
+func (x *WorldtaskBattleFinishReq) GetGroupId() int32 {
+ if x != nil {
+ return x.GroupId
+ }
+ return 0
+}
+
func (x *WorldtaskBattleFinishReq) GetTaskId() int32 {
if x != nil {
return x.TaskId
@@ -837,6 +837,101 @@ func (x *WorldtaskFinishIdsPush) GetTaskList() []*Worldtask {
return nil
}
+// 章节奖励领取
+type WorldtaskChapterawardReq struct {
+ state protoimpl.MessageState
+ sizeCache protoimpl.SizeCache
+ unknownFields protoimpl.UnknownFields
+
+ GroupId int32 `protobuf:"varint,1,opt,name=groupId,proto3" json:"groupId"`
+}
+
+func (x *WorldtaskChapterawardReq) Reset() {
+ *x = WorldtaskChapterawardReq{}
+ if protoimpl.UnsafeEnabled {
+ mi := &file_worldtask_worldtask_msg_proto_msgTypes[15]
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ ms.StoreMessageInfo(mi)
+ }
+}
+
+func (x *WorldtaskChapterawardReq) String() string {
+ return protoimpl.X.MessageStringOf(x)
+}
+
+func (*WorldtaskChapterawardReq) ProtoMessage() {}
+
+func (x *WorldtaskChapterawardReq) ProtoReflect() protoreflect.Message {
+ mi := &file_worldtask_worldtask_msg_proto_msgTypes[15]
+ if protoimpl.UnsafeEnabled && x != nil {
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ if ms.LoadMessageInfo() == nil {
+ ms.StoreMessageInfo(mi)
+ }
+ return ms
+ }
+ return mi.MessageOf(x)
+}
+
+// Deprecated: Use WorldtaskChapterawardReq.ProtoReflect.Descriptor instead.
+func (*WorldtaskChapterawardReq) Descriptor() ([]byte, []int) {
+ return file_worldtask_worldtask_msg_proto_rawDescGZIP(), []int{15}
+}
+
+func (x *WorldtaskChapterawardReq) GetGroupId() int32 {
+ if x != nil {
+ return x.GroupId
+ }
+ return 0
+}
+
+type WorldtaskChapterawardResp struct {
+ state protoimpl.MessageState
+ sizeCache protoimpl.SizeCache
+ unknownFields protoimpl.UnknownFields
+
+ GroupId int32 `protobuf:"varint,1,opt,name=groupId,proto3" json:"groupId"`
+}
+
+func (x *WorldtaskChapterawardResp) Reset() {
+ *x = WorldtaskChapterawardResp{}
+ if protoimpl.UnsafeEnabled {
+ mi := &file_worldtask_worldtask_msg_proto_msgTypes[16]
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ ms.StoreMessageInfo(mi)
+ }
+}
+
+func (x *WorldtaskChapterawardResp) String() string {
+ return protoimpl.X.MessageStringOf(x)
+}
+
+func (*WorldtaskChapterawardResp) ProtoMessage() {}
+
+func (x *WorldtaskChapterawardResp) ProtoReflect() protoreflect.Message {
+ mi := &file_worldtask_worldtask_msg_proto_msgTypes[16]
+ if protoimpl.UnsafeEnabled && x != nil {
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ if ms.LoadMessageInfo() == nil {
+ ms.StoreMessageInfo(mi)
+ }
+ return ms
+ }
+ return mi.MessageOf(x)
+}
+
+// Deprecated: Use WorldtaskChapterawardResp.ProtoReflect.Descriptor instead.
+func (*WorldtaskChapterawardResp) Descriptor() ([]byte, []int) {
+ return file_worldtask_worldtask_msg_proto_rawDescGZIP(), []int{16}
+}
+
+func (x *WorldtaskChapterawardResp) GetGroupId() int32 {
+ if x != nil {
+ return x.GroupId
+ }
+ return 0
+}
+
var File_worldtask_worldtask_msg_proto protoreflect.FileDescriptor
var file_worldtask_worldtask_msg_proto_rawDesc = []byte{
@@ -888,39 +983,52 @@ var file_worldtask_worldtask_msg_proto_rawDesc = []byte{
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, 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, 0x15, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b,
- 0x4e, 0x65, 0x78, 0x74, 0x74, 0x61, 0x73, 0x6b, 0x50, 0x75, 0x73, 0x68, 0x12, 0x1e, 0x0a, 0x0a,
- 0x6e, 0x65, 0x78, 0x74, 0x54, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05,
- 0x52, 0x0a, 0x6e, 0x65, 0x78, 0x74, 0x54, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x12, 0x18, 0x0a, 0x07,
- 0x63, 0x6f, 0x6e, 0x64, 0x49, 0x64, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x05, 0x52, 0x07, 0x63,
- 0x6f, 0x6e, 0x64, 0x49, 0x64, 0x73, 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, 0x7d, 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, 0x16, 0x0a, 0x06, 0x74, 0x61, 0x73, 0x6b,
- 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64,
- 0x12, 0x22, 0x0a, 0x0c, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x49, 0x64,
- 0x18, 0x02, 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, 0x03,
- 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, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74,
- 0x6f, 0x33,
+ 0x6b, 0x49, 0x64, 0x22, 0xa2, 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, 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, 0x97,
+ 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, 0x22, 0x0a,
+ 0x0c, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x49, 0x64, 0x18, 0x03, 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, 0x04, 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,
+ 0x34, 0x0a, 0x18, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x43, 0x68, 0x61, 0x70,
+ 0x74, 0x65, 0x72, 0x61, 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, 0x35, 0x0a, 0x19, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61,
+ 0x73, 0x6b, 0x43, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x61, 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,
}
var (
@@ -935,7 +1043,7 @@ func file_worldtask_worldtask_msg_proto_rawDescGZIP() []byte {
return file_worldtask_worldtask_msg_proto_rawDescData
}
-var file_worldtask_worldtask_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 15)
+var file_worldtask_worldtask_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 18)
var file_worldtask_worldtask_msg_proto_goTypes = []interface{}{
(*WorldtaskMineReq)(nil), // 0: WorldtaskMineReq
(*WorldtaskMineResp)(nil), // 1: WorldtaskMineResp
@@ -952,23 +1060,28 @@ var file_worldtask_worldtask_msg_proto_goTypes = []interface{}{
(*WorldtaskBattleFinishReq)(nil), // 12: WorldtaskBattleFinishReq
(*WorldtaskBattleFinishResp)(nil), // 13: WorldtaskBattleFinishResp
(*WorldtaskFinishIdsPush)(nil), // 14: WorldtaskFinishIdsPush
- (*DBWorldtask)(nil), // 15: DBWorldtask
- (*BattleFormation)(nil), // 16: BattleFormation
- (*BattleInfo)(nil), // 17: BattleInfo
- (*BattleReport)(nil), // 18: BattleReport
- (*Worldtask)(nil), // 19: Worldtask
+ (*WorldtaskChapterawardReq)(nil), // 15: WorldtaskChapterawardReq
+ (*WorldtaskChapterawardResp)(nil), // 16: WorldtaskChapterawardResp
+ nil, // 17: WorldtaskNexttaskPush.NextTaskEntry
+ (*DBWorldtask)(nil), // 18: DBWorldtask
+ (*BattleFormation)(nil), // 19: BattleFormation
+ (*BattleInfo)(nil), // 20: BattleInfo
+ (*BattleReport)(nil), // 21: BattleReport
+ (*Worldtask)(nil), // 22: Worldtask
}
var file_worldtask_worldtask_msg_proto_depIdxs = []int32{
- 15, // 0: WorldtaskMineResp.task:type_name -> DBWorldtask
- 16, // 1: WorldtaskBattleStartReq.battle:type_name -> BattleFormation
- 17, // 2: WorldtaskBattleStartResp.info:type_name -> BattleInfo
- 18, // 3: WorldtaskBattleFinishReq.report:type_name -> BattleReport
- 19, // 4: WorldtaskFinishIdsPush.taskList:type_name -> Worldtask
- 5, // [5:5] is the sub-list for method output_type
- 5, // [5:5] is the sub-list for method input_type
- 5, // [5:5] is the sub-list for extension type_name
- 5, // [5:5] is the sub-list for extension extendee
- 0, // [0:5] is the sub-list for field type_name
+ 18, // 0: WorldtaskMineResp.task:type_name -> DBWorldtask
+ 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() }
@@ -1159,6 +1272,30 @@ func file_worldtask_worldtask_msg_proto_init() {
return nil
}
}
+ file_worldtask_worldtask_msg_proto_msgTypes[15].Exporter = func(v interface{}, i int) interface{} {
+ switch v := v.(*WorldtaskChapterawardReq); i {
+ case 0:
+ return &v.state
+ case 1:
+ return &v.sizeCache
+ case 2:
+ return &v.unknownFields
+ default:
+ return nil
+ }
+ }
+ file_worldtask_worldtask_msg_proto_msgTypes[16].Exporter = func(v interface{}, i int) interface{} {
+ switch v := v.(*WorldtaskChapterawardResp); i {
+ case 0:
+ return &v.state
+ case 1:
+ return &v.sizeCache
+ case 2:
+ return &v.unknownFields
+ default:
+ return nil
+ }
+ }
}
type x struct{}
out := protoimpl.TypeBuilder{
@@ -1166,7 +1303,7 @@ func file_worldtask_worldtask_msg_proto_init() {
GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
RawDescriptor: file_worldtask_worldtask_msg_proto_rawDesc,
NumEnums: 0,
- NumMessages: 15,
+ NumMessages: 18,
NumExtensions: 0,
NumServices: 0,
},
diff --git a/sys/configure/structs/Game.NewSmithyData.go b/sys/configure/structs/Game.NewSmithyData.go
index 6171ac2fd..c00bec2cc 100644
--- a/sys/configure/structs/Game.NewSmithyData.go
+++ b/sys/configure/structs/Game.NewSmithyData.go
@@ -24,6 +24,7 @@ type GameNewSmithyData struct {
CustomizedCos2 *Gameatn
CustomizedLv []int32
CustomizedLvDistribution []int32
+ LightVelocity int32
}
const TypeId_GameNewSmithyData = -1249020316
@@ -85,6 +86,7 @@ func (_v *GameNewSmithyData)Deserialize(_buf map[string]interface{}) (err error)
}
}
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["light_velocity"].(float64); !_ok_ { err = errors.New("light_velocity error"); return }; _v.LightVelocity = int32(_tempNum_) }
return
}
diff --git a/sys/configure/structs/Game.SeasonLoop.go b/sys/configure/structs/Game.SeasonLoop.go
deleted file mode 100644
index 88a4b39d0..000000000
--- a/sys/configure/structs/Game.SeasonLoop.go
+++ /dev/null
@@ -1,42 +0,0 @@
-//------------------------------------------------------------------------------
-//
-// This code was generated by a tool.
-// Changes to this file may cause incorrect behavior and will be lost if
-// the code is regenerated.
-//
-//------------------------------------------------------------------------------
-
-package cfg
-
-type GameSeasonLoop struct {
- _dataMap map[int32]*GameSeasonLoopData
- _dataList []*GameSeasonLoopData
-}
-
-func NewGameSeasonLoop(_buf []map[string]interface{}) (*GameSeasonLoop, error) {
- _dataList := make([]*GameSeasonLoopData, 0, len(_buf))
- dataMap := make(map[int32]*GameSeasonLoopData)
- for _, _ele_ := range _buf {
- if _v, err2 := DeserializeGameSeasonLoopData(_ele_); err2 != nil {
- return nil, err2
- } else {
- _dataList = append(_dataList, _v)
- dataMap[_v.Key] = _v
- }
- }
- return &GameSeasonLoop{_dataList:_dataList, _dataMap:dataMap}, nil
-}
-
-func (table *GameSeasonLoop) GetDataMap() map[int32]*GameSeasonLoopData {
- return table._dataMap
-}
-
-func (table *GameSeasonLoop) GetDataList() []*GameSeasonLoopData {
- return table._dataList
-}
-
-func (table *GameSeasonLoop) Get(key int32) *GameSeasonLoopData {
- return table._dataMap[key]
-}
-
-
diff --git a/sys/configure/structs/Game.SeasonLoopData.go b/sys/configure/structs/Game.SeasonLoopData.go
deleted file mode 100644
index 79ec69c1d..000000000
--- a/sys/configure/structs/Game.SeasonLoopData.go
+++ /dev/null
@@ -1,65 +0,0 @@
-//------------------------------------------------------------------------------
-//
-// This code was generated by a tool.
-// Changes to this file may cause incorrect behavior and will be lost if
-// the code is regenerated.
-//
-//------------------------------------------------------------------------------
-
-package cfg
-
-import "errors"
-
-type GameSeasonLoopData struct {
- Key int32
- DisposableLoop []int32
- FixedLoop []int32
-}
-
-const TypeId_GameSeasonLoopData = 1327247853
-
-func (*GameSeasonLoopData) GetTypeId() int32 {
- return 1327247853
-}
-
-func (_v *GameSeasonLoopData)Deserialize(_buf map[string]interface{}) (err error) {
- { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["key"].(float64); !_ok_ { err = errors.New("key error"); return }; _v.Key = int32(_tempNum_) }
- {
- var _arr_ []interface{}
- var _ok_ bool
- if _arr_, _ok_ = _buf["disposable_loop"].([]interface{}); !_ok_ { err = errors.New("disposable_loop error"); return }
-
- _v.DisposableLoop = make([]int32, 0, len(_arr_))
-
- for _, _e_ := range _arr_ {
- var _list_v_ int32
- { var _ok_ bool; var _x_ float64; if _x_, _ok_ = _e_.(float64); !_ok_ { err = errors.New("_list_v_ error"); return }; _list_v_ = int32(_x_) }
- _v.DisposableLoop = append(_v.DisposableLoop, _list_v_)
- }
- }
-
- {
- var _arr_ []interface{}
- var _ok_ bool
- if _arr_, _ok_ = _buf["fixed_loop"].([]interface{}); !_ok_ { err = errors.New("fixed_loop error"); return }
-
- _v.FixedLoop = make([]int32, 0, len(_arr_))
-
- for _, _e_ := range _arr_ {
- var _list_v_ int32
- { var _ok_ bool; var _x_ float64; if _x_, _ok_ = _e_.(float64); !_ok_ { err = errors.New("_list_v_ error"); return }; _list_v_ = int32(_x_) }
- _v.FixedLoop = append(_v.FixedLoop, _list_v_)
- }
- }
-
- return
-}
-
-func DeserializeGameSeasonLoopData(_buf map[string]interface{}) (*GameSeasonLoopData, error) {
- v := &GameSeasonLoopData{}
- if err := v.Deserialize(_buf); err == nil {
- return v, nil
- } else {
- return nil, err
- }
-}
diff --git a/sys/configure/structs/Game.WorldAll.go b/sys/configure/structs/Game.WorldAll.go
new file mode 100644
index 000000000..d3b5dc0bc
--- /dev/null
+++ b/sys/configure/structs/Game.WorldAll.go
@@ -0,0 +1,42 @@
+//------------------------------------------------------------------------------
+//
+// This code was generated by a tool.
+// Changes to this file may cause incorrect behavior and will be lost if
+// the code is regenerated.
+//
+//------------------------------------------------------------------------------
+
+package cfg
+
+type GameWorldAll struct {
+ _dataMap map[int32]*GameWorldAllData
+ _dataList []*GameWorldAllData
+}
+
+func NewGameWorldAll(_buf []map[string]interface{}) (*GameWorldAll, error) {
+ _dataList := make([]*GameWorldAllData, 0, len(_buf))
+ dataMap := make(map[int32]*GameWorldAllData)
+ for _, _ele_ := range _buf {
+ if _v, err2 := DeserializeGameWorldAllData(_ele_); err2 != nil {
+ return nil, err2
+ } else {
+ _dataList = append(_dataList, _v)
+ dataMap[_v.组id] = _v
+ }
+ }
+ return &GameWorldAll{_dataList:_dataList, _dataMap:dataMap}, nil
+}
+
+func (table *GameWorldAll) GetDataMap() map[int32]*GameWorldAllData {
+ return table._dataMap
+}
+
+func (table *GameWorldAll) GetDataList() []*GameWorldAllData {
+ return table._dataList
+}
+
+func (table *GameWorldAll) Get(key int32) *GameWorldAllData {
+ return table._dataMap[key]
+}
+
+
diff --git a/sys/configure/structs/Game.WorldAllData.go b/sys/configure/structs/Game.WorldAllData.go
new file mode 100644
index 000000000..34a58773e
--- /dev/null
+++ b/sys/configure/structs/Game.WorldAllData.go
@@ -0,0 +1,56 @@
+//------------------------------------------------------------------------------
+//
+// This code was generated by a tool.
+// Changes to this file may cause incorrect behavior and will be lost if
+// the code is regenerated.
+//
+//------------------------------------------------------------------------------
+
+package cfg
+
+import "errors"
+
+type GameWorldAllData struct {
+ 组id int32
+ Name string
+ TaskIcon string
+ TaskTxt string
+ Reword []*Gameatn
+}
+
+const TypeId_GameWorldAllData = 1421722997
+
+func (*GameWorldAllData) GetTypeId() int32 {
+ return 1421722997
+}
+
+func (_v *GameWorldAllData)Deserialize(_buf map[string]interface{}) (err error) {
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["组id"].(float64); !_ok_ { err = errors.New("组id error"); return }; _v.组id = int32(_tempNum_) }
+ {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["name"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Name error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Name, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
+ { var _ok_ bool; if _v.TaskIcon, _ok_ = _buf["task_icon"].(string); !_ok_ { err = errors.New("task_icon error"); return } }
+ {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["task_txt"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.TaskTxt error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.TaskTxt, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
+ {
+ var _arr_ []interface{}
+ var _ok_ bool
+ if _arr_, _ok_ = _buf["reword"].([]interface{}); !_ok_ { err = errors.New("reword error"); return }
+
+ _v.Reword = make([]*Gameatn, 0, len(_arr_))
+
+ for _, _e_ := range _arr_ {
+ var _list_v_ *Gameatn
+ { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ { err = errors.New("_list_v_ error"); return }; if _list_v_, err = DeserializeGameatn(_x_); err != nil { return } }
+ _v.Reword = append(_v.Reword, _list_v_)
+ }
+ }
+
+ return
+}
+
+func DeserializeGameWorldAllData(_buf map[string]interface{}) (*GameWorldAllData, error) {
+ v := &GameWorldAllData{}
+ if err := v.Deserialize(_buf); err == nil {
+ return v, nil
+ } else {
+ return nil, err
+ }
+}
diff --git a/sys/configure/structs/Tables.go b/sys/configure/structs/Tables.go
index 368662754..174adc0a0 100644
--- a/sys/configure/structs/Tables.go
+++ b/sys/configure/structs/Tables.go
@@ -57,11 +57,8 @@ type Tables struct {
Facemod *GameFacemod
Msgdistrib *GameMsgdistrib
Opencond *GameOpencond
- Stroy *GameStroy
Pagoda *GamePagoda
PagodaTaskReward *GamePagodaTaskReward
- SeasonLoop *GameSeasonLoop
- PagodaSeasonReward *GamePagodaSeasonReward
RdtaskCondi *GameRdtaskCondi
RdtaskNpc *GameRdtaskNpc
Gourmet *GameGourmet
@@ -91,7 +88,6 @@ type Tables struct {
LibraryBubble *GameLibraryBubble
LibraryPlayBack *GameLibraryPlayBack
Robot *GameRobot
- Ip *GameIp
NameLibrary *GameNameLibrary
HeroConvertdata *GameHeroConvertdata
LinestoryTimeLine *GameLinestoryTimeLine
@@ -127,6 +123,7 @@ type Tables struct {
PrivilegeCard *GamePrivilegeCard
Privilege *GamePrivilege
WorldTask *GameWorldTask
+ WorldAll *GameWorldAll
Teaching *GameTeaching
HeroStrategy *GameHeroStrategy
FightGlobalEvent *GameFightGlobalEvent
@@ -462,12 +459,6 @@ func NewTables(loader JsonLoader) (*Tables, error) {
if tables.Opencond, err = NewGameOpencond(buf) ; err != nil {
return nil, err
}
- if buf, err = loader("game_stroy") ; err != nil {
- return nil, err
- }
- if tables.Stroy, err = NewGameStroy(buf) ; err != nil {
- return nil, err
- }
if buf, err = loader("game_pagoda") ; err != nil {
return nil, err
}
@@ -480,18 +471,6 @@ func NewTables(loader JsonLoader) (*Tables, error) {
if tables.PagodaTaskReward, err = NewGamePagodaTaskReward(buf) ; err != nil {
return nil, err
}
- if buf, err = loader("game_seasonloop") ; err != nil {
- return nil, err
- }
- if tables.SeasonLoop, err = NewGameSeasonLoop(buf) ; err != nil {
- return nil, err
- }
- if buf, err = loader("game_pagodaseasonreward") ; err != nil {
- return nil, err
- }
- if tables.PagodaSeasonReward, err = NewGamePagodaSeasonReward(buf) ; err != nil {
- return nil, err
- }
if buf, err = loader("game_rdtaskcondi") ; err != nil {
return nil, err
}
@@ -666,12 +645,6 @@ func NewTables(loader JsonLoader) (*Tables, error) {
if tables.Robot, err = NewGameRobot(buf) ; err != nil {
return nil, err
}
- if buf, err = loader("game_ip") ; err != nil {
- return nil, err
- }
- if tables.Ip, err = NewGameIp(buf) ; err != nil {
- return nil, err
- }
if buf, err = loader("game_namelibrary") ; err != nil {
return nil, err
}
@@ -882,6 +855,12 @@ func NewTables(loader JsonLoader) (*Tables, error) {
if tables.WorldTask, err = NewGameWorldTask(buf) ; err != nil {
return nil, err
}
+ if buf, err = loader("game_worldall") ; err != nil {
+ return nil, err
+ }
+ if tables.WorldAll, err = NewGameWorldAll(buf) ; err != nil {
+ return nil, err
+ }
if buf, err = loader("game_teaching") ; err != nil {
return nil, err
}