diff --git a/bin/json/game_breakingbad.json b/bin/json/game_breakingbad.json
index 739418e58..5ce1472f3 100644
--- a/bin/json/game_breakingbad.json
+++ b/bin/json/game_breakingbad.json
@@ -1,6 +1,6 @@
[
{
- "delicacies": "99999",
+ "delicacies": "10002",
"recipe": [],
"Type": 1,
"flame": 1,
@@ -14,15 +14,15 @@
"delicacies": "10011",
"recipe": [
{
- "a": "1001",
+ "a": "10013",
"n": 5
},
{
- "a": "1003",
+ "a": "30001",
"n": 20
},
{
- "a": "1004",
+ "a": "30002",
"n": 10
}
],
@@ -38,7 +38,7 @@
"delicacies": "10012",
"recipe": [
{
- "a": "1001",
+ "a": "10013",
"n": 20
}
],
@@ -49,5 +49,25 @@
"t": "diamond",
"n": 5
}
+ },
+ {
+ "delicacies": "10014",
+ "recipe": [
+ {
+ "a": "10013",
+ "n": 20
+ },
+ {
+ "a": "30002",
+ "n": 10
+ }
+ ],
+ "Type": 2,
+ "flame": 3,
+ "unlockreward": {
+ "a": "attr",
+ "t": "diamond",
+ "n": 5
+ }
}
]
\ No newline at end of file
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_task.json b/bin/json/game_dispatch_task.json
index 912bf9fe5..75194077f 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": 71,
+ "tasktime": 94,
"tasktxt": {
"key": "Entrustment details of Po",
"text": "这是属于阿宝的专属委托"
},
- "taskneed": 1,
+ "taskneed": 2,
"taskreq": [
{
"key": 1,
- "param": 30
+ "param": 23
}
],
"reqtxt": [
@@ -56,16 +56,16 @@
},
"icon": "wg_cj1_img01",
"taskcd": 200,
- "tasktime": 180,
+ "tasktime": 161,
"tasktxt": {
"key": "Entrustment details of Bobi",
"text": "这是属于波比的专属委托"
},
- "taskneed": 2,
+ "taskneed": 4,
"taskreq": [
{
"key": 1,
- "param": 5
+ "param": 26
}
],
"reqtxt": [
@@ -104,16 +104,16 @@
},
"icon": "wg_cj1_img01",
"taskcd": 200,
- "tasktime": 128,
+ "tasktime": 92,
"tasktxt": {
"key": "Entrustment details of Tiger",
"text": "这是属于悍娇虎的专属委托"
},
- "taskneed": 2,
+ "taskneed": 4,
"taskreq": [
{
"key": 1,
- "param": 17
+ "param": 8
}
],
"reqtxt": [
@@ -152,16 +152,16 @@
},
"icon": "wg_cj1_img01",
"taskcd": 200,
- "tasktime": 135,
+ "tasktime": 63,
"tasktxt": {
"key": "Entrustment details of Shifu",
"text": "这是属于师父的专属委托"
},
- "taskneed": 4,
+ "taskneed": 2,
"taskreq": [
{
"key": 1,
- "param": 17
+ "param": 7
}
],
"reqtxt": [
@@ -200,16 +200,16 @@
},
"icon": "wg_cj1_img01",
"taskcd": 200,
- "tasktime": 157,
+ "tasktime": 69,
"tasktxt": {
"key": "Entrustment details of Po",
"text": "这是属于阿宝的专属委托"
},
- "taskneed": 1,
+ "taskneed": 3,
"taskreq": [
{
"key": 1,
- "param": 5
+ "param": 8
}
],
"reqtxt": [
@@ -248,16 +248,16 @@
},
"icon": "wg_cj1_img01",
"taskcd": 200,
- "tasktime": 160,
+ "tasktime": 94,
"tasktxt": {
"key": "Entrustment details of Bobi",
"text": "这是属于波比的专属委托"
},
- "taskneed": 4,
+ "taskneed": 2,
"taskreq": [
{
"key": 1,
- "param": 11
+ "param": 24
}
],
"reqtxt": [
@@ -296,16 +296,16 @@
},
"icon": "wg_cj1_img01",
"taskcd": 200,
- "tasktime": 128,
+ "tasktime": 129,
"tasktxt": {
"key": "Entrustment details of Tiger",
"text": "这是属于悍娇虎的专属委托"
},
- "taskneed": 2,
+ "taskneed": 3,
"taskreq": [
{
"key": 1,
- "param": 19
+ "param": 6
}
],
"reqtxt": [
@@ -344,16 +344,16 @@
},
"icon": "wg_cj1_img01",
"taskcd": 200,
- "tasktime": 92,
+ "tasktime": 154,
"tasktxt": {
"key": "Entrustment details of Shifu",
"text": "这是属于师父的专属委托"
},
- "taskneed": 4,
+ "taskneed": 2,
"taskreq": [
{
"key": 1,
- "param": 10
+ "param": 4
}
],
"reqtxt": [
@@ -392,16 +392,16 @@
},
"icon": "wg_cj1_img01",
"taskcd": 200,
- "tasktime": 67,
+ "tasktime": 63,
"tasktxt": {
"key": "Entrustment details of Po",
"text": "这是属于阿宝的专属委托"
},
- "taskneed": 4,
+ "taskneed": 1,
"taskreq": [
{
"key": 1,
- "param": 25
+ "param": 17
}
],
"reqtxt": [
@@ -440,7 +440,7 @@
},
"icon": "wg_cj1_img01",
"taskcd": 200,
- "tasktime": 61,
+ "tasktime": 176,
"tasktxt": {
"key": "Entrustment details of Bobi",
"text": "这是属于波比的专属委托"
@@ -449,7 +449,7 @@
"taskreq": [
{
"key": 1,
- "param": 5
+ "param": 18
}
],
"reqtxt": [
@@ -488,12 +488,12 @@
},
"icon": "wg_cj1_img01",
"taskcd": 200,
- "tasktime": 88,
+ "tasktime": 179,
"tasktxt": {
"key": "Entrustment details of Tiger",
"text": "这是属于悍娇虎的专属委托"
},
- "taskneed": 4,
+ "taskneed": 1,
"taskreq": [
{
"key": 1,
@@ -536,16 +536,16 @@
},
"icon": "wg_cj1_img01",
"taskcd": 200,
- "tasktime": 68,
+ "tasktime": 86,
"tasktxt": {
"key": "Entrustment details of Shifu",
"text": "这是属于师父的专属委托"
},
- "taskneed": 1,
+ "taskneed": 3,
"taskreq": [
{
"key": 1,
- "param": 5
+ "param": 19
}
],
"reqtxt": [
@@ -584,16 +584,16 @@
},
"icon": "wg_cj1_img01",
"taskcd": 200,
- "tasktime": 102,
+ "tasktime": 127,
"tasktxt": {
"key": "Entrustment details of Po",
"text": "这是属于阿宝的专属委托"
},
- "taskneed": 3,
+ "taskneed": 2,
"taskreq": [
{
"key": 1,
- "param": 25
+ "param": 2
}
],
"reqtxt": [
@@ -632,16 +632,16 @@
},
"icon": "wg_cj1_img01",
"taskcd": 200,
- "tasktime": 101,
+ "tasktime": 70,
"tasktxt": {
"key": "Entrustment details of Bobi",
"text": "这是属于波比的专属委托"
},
- "taskneed": 2,
+ "taskneed": 4,
"taskreq": [
{
"key": 1,
- "param": 22
+ "param": 27
}
],
"reqtxt": [
@@ -680,16 +680,16 @@
},
"icon": "wg_cj1_img01",
"taskcd": 200,
- "tasktime": 86,
+ "tasktime": 158,
"tasktxt": {
"key": "Entrustment details of Tiger",
"text": "这是属于悍娇虎的专属委托"
},
- "taskneed": 1,
+ "taskneed": 4,
"taskreq": [
{
"key": 1,
- "param": 20
+ "param": 9
}
],
"reqtxt": [
@@ -728,16 +728,16 @@
},
"icon": "wg_cj1_img01",
"taskcd": 200,
- "tasktime": 65,
+ "tasktime": 127,
"tasktxt": {
"key": "Entrustment details of Shifu",
"text": "这是属于师父的专属委托"
},
- "taskneed": 3,
+ "taskneed": 4,
"taskreq": [
{
"key": 1,
- "param": 21
+ "param": 18
}
],
"reqtxt": [
@@ -776,16 +776,16 @@
},
"icon": "wg_cj1_img01",
"taskcd": 200,
- "tasktime": 70,
+ "tasktime": 85,
"tasktxt": {
"key": "Entrustment details of Po",
"text": "这是属于阿宝的专属委托"
},
- "taskneed": 4,
+ "taskneed": 1,
"taskreq": [
{
"key": 1,
- "param": 24
+ "param": 11
}
],
"reqtxt": [
@@ -824,16 +824,16 @@
},
"icon": "wg_cj1_img01",
"taskcd": 200,
- "tasktime": 180,
+ "tasktime": 157,
"tasktxt": {
"key": "Entrustment details of Bobi",
"text": "这是属于波比的专属委托"
},
- "taskneed": 4,
+ "taskneed": 2,
"taskreq": [
{
"key": 1,
- "param": 7
+ "param": 8
}
],
"reqtxt": [
@@ -872,16 +872,16 @@
},
"icon": "wg_cj1_img01",
"taskcd": 200,
- "tasktime": 110,
+ "tasktime": 113,
"tasktxt": {
"key": "Entrustment details of Tiger",
"text": "这是属于悍娇虎的专属委托"
},
- "taskneed": 4,
+ "taskneed": 2,
"taskreq": [
{
"key": 1,
- "param": 13
+ "param": 14
}
],
"reqtxt": [
@@ -920,16 +920,16 @@
},
"icon": "wg_cj1_img01",
"taskcd": 200,
- "tasktime": 67,
+ "tasktime": 163,
"tasktxt": {
"key": "Entrustment details of Shifu",
"text": "这是属于师父的专属委托"
},
- "taskneed": 3,
+ "taskneed": 4,
"taskreq": [
{
"key": 1,
- "param": 27
+ "param": 6
}
],
"reqtxt": [
@@ -968,16 +968,16 @@
},
"icon": "wg_cj1_img01",
"taskcd": 200,
- "tasktime": 147,
+ "tasktime": 95,
"tasktxt": {
"key": "Entrustment details of Po",
"text": "这是属于阿宝的专属委托"
},
- "taskneed": 3,
+ "taskneed": 2,
"taskreq": [
{
"key": 1,
- "param": 23
+ "param": 12
}
],
"reqtxt": [
@@ -1016,7 +1016,7 @@
},
"icon": "wg_cj1_img01",
"taskcd": 200,
- "tasktime": 133,
+ "tasktime": 134,
"tasktxt": {
"key": "Entrustment details of Bobi",
"text": "这是属于波比的专属委托"
@@ -1025,7 +1025,7 @@
"taskreq": [
{
"key": 1,
- "param": 9
+ "param": 5
}
],
"reqtxt": [
@@ -1064,16 +1064,16 @@
},
"icon": "wg_cj1_img01",
"taskcd": 200,
- "tasktime": 148,
+ "tasktime": 123,
"tasktxt": {
"key": "Entrustment details of Tiger",
"text": "这是属于悍娇虎的专属委托"
},
- "taskneed": 2,
+ "taskneed": 1,
"taskreq": [
{
"key": 1,
- "param": 6
+ "param": 7
}
],
"reqtxt": [
@@ -1112,16 +1112,16 @@
},
"icon": "wg_cj1_img01",
"taskcd": 200,
- "tasktime": 164,
+ "tasktime": 83,
"tasktxt": {
"key": "Entrustment details of Shifu",
"text": "这是属于师父的专属委托"
},
- "taskneed": 2,
+ "taskneed": 4,
"taskreq": [
{
"key": 1,
- "param": 14
+ "param": 3
}
],
"reqtxt": [
@@ -1160,16 +1160,16 @@
},
"icon": "wg_cj1_img01",
"taskcd": 200,
- "tasktime": 143,
+ "tasktime": 180,
"tasktxt": {
"key": "Entrustment details of Po",
"text": "这是属于阿宝的专属委托"
},
- "taskneed": 2,
+ "taskneed": 1,
"taskreq": [
{
"key": 1,
- "param": 4
+ "param": 14
}
],
"reqtxt": [
@@ -1208,7 +1208,7 @@
},
"icon": "wg_cj1_img01",
"taskcd": 200,
- "tasktime": 119,
+ "tasktime": 83,
"tasktxt": {
"key": "Entrustment details of Bobi",
"text": "这是属于波比的专属委托"
@@ -1217,7 +1217,7 @@
"taskreq": [
{
"key": 1,
- "param": 23
+ "param": 28
}
],
"reqtxt": [
@@ -1256,16 +1256,16 @@
},
"icon": "wg_cj1_img01",
"taskcd": 200,
- "tasktime": 161,
+ "tasktime": 70,
"tasktxt": {
"key": "Entrustment details of Tiger",
"text": "这是属于悍娇虎的专属委托"
},
- "taskneed": 3,
+ "taskneed": 1,
"taskreq": [
{
"key": 1,
- "param": 25
+ "param": 18
}
],
"reqtxt": [
@@ -1304,16 +1304,16 @@
},
"icon": "wg_cj1_img01",
"taskcd": 200,
- "tasktime": 150,
+ "tasktime": 91,
"tasktxt": {
"key": "Entrustment details of Shifu",
"text": "这是属于师父的专属委托"
},
- "taskneed": 1,
+ "taskneed": 2,
"taskreq": [
{
"key": 1,
- "param": 29
+ "param": 7
}
],
"reqtxt": [
@@ -1352,16 +1352,16 @@
},
"icon": "wg_cj1_img01",
"taskcd": 200,
- "tasktime": 151,
+ "tasktime": 180,
"tasktxt": {
"key": "Entrustment details of Po",
"text": "这是属于阿宝的专属委托"
},
- "taskneed": 2,
+ "taskneed": 1,
"taskreq": [
{
"key": 1,
- "param": 4
+ "param": 3
}
],
"reqtxt": [
@@ -1400,16 +1400,16 @@
},
"icon": "wg_cj1_img01",
"taskcd": 200,
- "tasktime": 157,
+ "tasktime": 124,
"tasktxt": {
"key": "Entrustment details of Bobi",
"text": "这是属于波比的专属委托"
},
- "taskneed": 3,
+ "taskneed": 1,
"taskreq": [
{
"key": 1,
- "param": 9
+ "param": 11
}
],
"reqtxt": [
@@ -1448,7 +1448,7 @@
},
"icon": "wg_cj1_img01",
"taskcd": 200,
- "tasktime": 139,
+ "tasktime": 135,
"tasktxt": {
"key": "Entrustment details of Tiger",
"text": "这是属于悍娇虎的专属委托"
@@ -1457,7 +1457,7 @@
"taskreq": [
{
"key": 1,
- "param": 29
+ "param": 7
}
],
"reqtxt": [
@@ -1496,16 +1496,16 @@
},
"icon": "wg_cj1_img01",
"taskcd": 200,
- "tasktime": 102,
+ "tasktime": 104,
"tasktxt": {
"key": "Entrustment details of Shifu",
"text": "这是属于师父的专属委托"
},
- "taskneed": 2,
+ "taskneed": 4,
"taskreq": [
{
"key": 1,
- "param": 22
+ "param": 28
}
],
"reqtxt": [
@@ -1544,16 +1544,16 @@
},
"icon": "wg_cj1_img01",
"taskcd": 200,
- "tasktime": 129,
+ "tasktime": 149,
"tasktxt": {
"key": "Entrustment details of Po",
"text": "这是属于阿宝的专属委托"
},
- "taskneed": 3,
+ "taskneed": 1,
"taskreq": [
{
"key": 1,
- "param": 21
+ "param": 24
}
],
"reqtxt": [
@@ -1592,16 +1592,16 @@
},
"icon": "wg_cj1_img01",
"taskcd": 200,
- "tasktime": 82,
+ "tasktime": 66,
"tasktxt": {
"key": "Entrustment details of Bobi",
"text": "这是属于波比的专属委托"
},
- "taskneed": 3,
+ "taskneed": 4,
"taskreq": [
{
"key": 1,
- "param": 19
+ "param": 3
}
],
"reqtxt": [
@@ -1640,16 +1640,16 @@
},
"icon": "wg_cj1_img01",
"taskcd": 200,
- "tasktime": 166,
+ "tasktime": 86,
"tasktxt": {
"key": "Entrustment details of Tiger",
"text": "这是属于悍娇虎的专属委托"
},
- "taskneed": 3,
+ "taskneed": 1,
"taskreq": [
{
"key": 1,
- "param": 14
+ "param": 16
}
],
"reqtxt": [
@@ -1688,7 +1688,7 @@
},
"icon": "wg_cj1_img01",
"taskcd": 200,
- "tasktime": 156,
+ "tasktime": 67,
"tasktxt": {
"key": "Entrustment details of Shifu",
"text": "这是属于师父的专属委托"
@@ -1697,7 +1697,7 @@
"taskreq": [
{
"key": 1,
- "param": 17
+ "param": 13
}
],
"reqtxt": [
@@ -1736,7 +1736,7 @@
},
"icon": "wg_cj1_img01",
"taskcd": 200,
- "tasktime": 117,
+ "tasktime": 94,
"tasktxt": {
"key": "Entrustment details of Po",
"text": "这是属于阿宝的专属委托"
@@ -1745,7 +1745,7 @@
"taskreq": [
{
"key": 1,
- "param": 9
+ "param": 14
}
],
"reqtxt": [
@@ -1784,16 +1784,16 @@
},
"icon": "wg_cj1_img01",
"taskcd": 200,
- "tasktime": 177,
+ "tasktime": 65,
"tasktxt": {
"key": "Entrustment details of Bobi",
"text": "这是属于波比的专属委托"
},
- "taskneed": 1,
+ "taskneed": 2,
"taskreq": [
{
"key": 1,
- "param": 6
+ "param": 15
}
],
"reqtxt": [
@@ -1832,16 +1832,16 @@
},
"icon": "wg_cj1_img01",
"taskcd": 200,
- "tasktime": 149,
+ "tasktime": 81,
"tasktxt": {
"key": "Entrustment details of Tiger",
"text": "这是属于悍娇虎的专属委托"
},
- "taskneed": 4,
+ "taskneed": 3,
"taskreq": [
{
"key": 1,
- "param": 18
+ "param": 1
}
],
"reqtxt": [
@@ -1880,16 +1880,16 @@
},
"icon": "wg_cj1_img01",
"taskcd": 200,
- "tasktime": 146,
+ "tasktime": 144,
"tasktxt": {
"key": "Entrustment details of Shifu",
"text": "这是属于师父的专属委托"
},
- "taskneed": 1,
+ "taskneed": 2,
"taskreq": [
{
"key": 1,
- "param": 19
+ "param": 7
}
],
"reqtxt": [
@@ -1928,16 +1928,16 @@
},
"icon": "wg_cj1_img01",
"taskcd": 200,
- "tasktime": 168,
+ "tasktime": 158,
"tasktxt": {
"key": "Entrustment details of Po",
"text": "这是属于阿宝的专属委托"
},
- "taskneed": 1,
+ "taskneed": 3,
"taskreq": [
{
"key": 1,
- "param": 14
+ "param": 21
}
],
"reqtxt": [
@@ -1976,16 +1976,16 @@
},
"icon": "wg_cj1_img01",
"taskcd": 200,
- "tasktime": 87,
+ "tasktime": 89,
"tasktxt": {
"key": "Entrustment details of Bobi",
"text": "这是属于波比的专属委托"
},
- "taskneed": 1,
+ "taskneed": 2,
"taskreq": [
{
"key": 1,
- "param": 3
+ "param": 8
}
],
"reqtxt": [
@@ -2024,7 +2024,7 @@
},
"icon": "wg_cj1_img01",
"taskcd": 200,
- "tasktime": 109,
+ "tasktime": 91,
"tasktxt": {
"key": "Entrustment details of Tiger",
"text": "这是属于悍娇虎的专属委托"
@@ -2033,7 +2033,7 @@
"taskreq": [
{
"key": 1,
- "param": 13
+ "param": 9
}
],
"reqtxt": [
@@ -2072,16 +2072,16 @@
},
"icon": "wg_cj1_img01",
"taskcd": 200,
- "tasktime": 170,
+ "tasktime": 60,
"tasktxt": {
"key": "Entrustment details of Shifu",
"text": "这是属于师父的专属委托"
},
- "taskneed": 4,
+ "taskneed": 3,
"taskreq": [
{
"key": 1,
- "param": 8
+ "param": 19
}
],
"reqtxt": [
@@ -2120,16 +2120,16 @@
},
"icon": "wg_cj1_img01",
"taskcd": 200,
- "tasktime": 128,
+ "tasktime": 88,
"tasktxt": {
"key": "Entrustment details of Po",
"text": "这是属于阿宝的专属委托"
},
- "taskneed": 3,
+ "taskneed": 1,
"taskreq": [
{
"key": 1,
- "param": 18
+ "param": 15
}
],
"reqtxt": [
@@ -2177,7 +2177,7 @@
"taskreq": [
{
"key": 1,
- "param": 17
+ "param": 18
}
],
"reqtxt": [
@@ -2216,16 +2216,16 @@
},
"icon": "wg_cj1_img01",
"taskcd": 200,
- "tasktime": 92,
+ "tasktime": 149,
"tasktxt": {
"key": "Entrustment details of Tiger",
"text": "这是属于悍娇虎的专属委托"
},
- "taskneed": 2,
+ "taskneed": 4,
"taskreq": [
{
"key": 1,
- "param": 24
+ "param": 23
}
],
"reqtxt": [
@@ -2264,16 +2264,16 @@
},
"icon": "wg_cj1_img01",
"taskcd": 200,
- "tasktime": 108,
+ "tasktime": 173,
"tasktxt": {
"key": "Entrustment details of Shifu",
"text": "这是属于师父的专属委托"
},
- "taskneed": 4,
+ "taskneed": 2,
"taskreq": [
{
"key": 1,
- "param": 26
+ "param": 6
}
],
"reqtxt": [
@@ -2312,16 +2312,16 @@
},
"icon": "wg_cj1_img01",
"taskcd": 200,
- "tasktime": 143,
+ "tasktime": 120,
"tasktxt": {
"key": "Entrustment details of Po",
"text": "这是属于阿宝的专属委托"
},
- "taskneed": 2,
+ "taskneed": 1,
"taskreq": [
{
"key": 1,
- "param": 30
+ "param": 18
}
],
"reqtxt": [
@@ -2360,12 +2360,12 @@
},
"icon": "wg_cj1_img01",
"taskcd": 200,
- "tasktime": 66,
+ "tasktime": 119,
"tasktxt": {
"key": "Entrustment details of Bobi",
"text": "这是属于波比的专属委托"
},
- "taskneed": 1,
+ "taskneed": 2,
"taskreq": [
{
"key": 1,
@@ -2408,16 +2408,16 @@
},
"icon": "wg_cj1_img01",
"taskcd": 200,
- "tasktime": 157,
+ "tasktime": 175,
"tasktxt": {
"key": "Entrustment details of Tiger",
"text": "这是属于悍娇虎的专属委托"
},
- "taskneed": 2,
+ "taskneed": 4,
"taskreq": [
{
"key": 1,
- "param": 21
+ "param": 6
}
],
"reqtxt": [
@@ -2456,7 +2456,7 @@
},
"icon": "wg_cj1_img01",
"taskcd": 200,
- "tasktime": 66,
+ "tasktime": 60,
"tasktxt": {
"key": "Entrustment details of Shifu",
"text": "这是属于师父的专属委托"
@@ -2465,7 +2465,7 @@
"taskreq": [
{
"key": 1,
- "param": 18
+ "param": 8
}
],
"reqtxt": [
@@ -2504,16 +2504,16 @@
},
"icon": "wg_cj1_img01",
"taskcd": 200,
- "tasktime": 68,
+ "tasktime": 118,
"tasktxt": {
"key": "Entrustment details of Po",
"text": "这是属于阿宝的专属委托"
},
- "taskneed": 3,
+ "taskneed": 2,
"taskreq": [
{
"key": 1,
- "param": 7
+ "param": 11
}
],
"reqtxt": [
@@ -2552,7 +2552,7 @@
},
"icon": "wg_cj1_img01",
"taskcd": 200,
- "tasktime": 165,
+ "tasktime": 123,
"tasktxt": {
"key": "Entrustment details of Bobi",
"text": "这是属于波比的专属委托"
@@ -2561,7 +2561,7 @@
"taskreq": [
{
"key": 1,
- "param": 29
+ "param": 24
}
],
"reqtxt": [
@@ -2600,7 +2600,7 @@
},
"icon": "wg_cj1_img01",
"taskcd": 200,
- "tasktime": 97,
+ "tasktime": 60,
"tasktxt": {
"key": "Entrustment details of Tiger",
"text": "这是属于悍娇虎的专属委托"
@@ -2609,7 +2609,7 @@
"taskreq": [
{
"key": 1,
- "param": 1
+ "param": 9
}
],
"reqtxt": [
@@ -2648,16 +2648,16 @@
},
"icon": "wg_cj1_img01",
"taskcd": 200,
- "tasktime": 99,
+ "tasktime": 170,
"tasktxt": {
"key": "Entrustment details of Shifu",
"text": "这是属于师父的专属委托"
},
- "taskneed": 2,
+ "taskneed": 1,
"taskreq": [
{
"key": 1,
- "param": 4
+ "param": 11
}
],
"reqtxt": [
@@ -2696,7 +2696,7 @@
},
"icon": "wg_cj1_img01",
"taskcd": 200,
- "tasktime": 77,
+ "tasktime": 136,
"tasktxt": {
"key": "Entrustment details of Po",
"text": "这是属于阿宝的专属委托"
@@ -2705,7 +2705,7 @@
"taskreq": [
{
"key": 1,
- "param": 12
+ "param": 16
}
],
"reqtxt": [
@@ -2744,16 +2744,16 @@
},
"icon": "wg_cj1_img01",
"taskcd": 200,
- "tasktime": 157,
+ "tasktime": 153,
"tasktxt": {
"key": "Entrustment details of Bobi",
"text": "这是属于波比的专属委托"
},
- "taskneed": 3,
+ "taskneed": 2,
"taskreq": [
{
"key": 1,
- "param": 6
+ "param": 18
}
],
"reqtxt": [
@@ -2792,7 +2792,7 @@
},
"icon": "wg_cj1_img01",
"taskcd": 200,
- "tasktime": 137,
+ "tasktime": 95,
"tasktxt": {
"key": "Entrustment details of Tiger",
"text": "这是属于悍娇虎的专属委托"
@@ -2801,7 +2801,7 @@
"taskreq": [
{
"key": 1,
- "param": 13
+ "param": 10
}
],
"reqtxt": [
@@ -2840,16 +2840,16 @@
},
"icon": "wg_cj1_img01",
"taskcd": 200,
- "tasktime": 77,
+ "tasktime": 99,
"tasktxt": {
"key": "Entrustment details of Shifu",
"text": "这是属于师父的专属委托"
},
- "taskneed": 2,
+ "taskneed": 3,
"taskreq": [
{
"key": 1,
- "param": 10
+ "param": 26
}
],
"reqtxt": [
@@ -2888,7 +2888,7 @@
},
"icon": "wg_cj1_img01",
"taskcd": 200,
- "tasktime": 155,
+ "tasktime": 140,
"tasktxt": {
"key": "Entrustment details of Po",
"text": "这是属于阿宝的专属委托"
@@ -2897,7 +2897,7 @@
"taskreq": [
{
"key": 1,
- "param": 21
+ "param": 26
}
],
"reqtxt": [
@@ -2936,16 +2936,16 @@
},
"icon": "wg_cj1_img01",
"taskcd": 200,
- "tasktime": 154,
+ "tasktime": 138,
"tasktxt": {
"key": "Entrustment details of Bobi",
"text": "这是属于波比的专属委托"
},
- "taskneed": 4,
+ "taskneed": 2,
"taskreq": [
{
"key": 1,
- "param": 23
+ "param": 30
}
],
"reqtxt": [
@@ -2984,16 +2984,16 @@
},
"icon": "wg_cj1_img01",
"taskcd": 200,
- "tasktime": 70,
+ "tasktime": 92,
"tasktxt": {
"key": "Entrustment details of Tiger",
"text": "这是属于悍娇虎的专属委托"
},
- "taskneed": 4,
+ "taskneed": 1,
"taskreq": [
{
"key": 1,
- "param": 4
+ "param": 26
}
],
"reqtxt": [
@@ -3032,7 +3032,7 @@
},
"icon": "wg_cj1_img01",
"taskcd": 200,
- "tasktime": 61,
+ "tasktime": 180,
"tasktxt": {
"key": "Entrustment details of Shifu",
"text": "这是属于师父的专属委托"
@@ -3041,7 +3041,7 @@
"taskreq": [
{
"key": 1,
- "param": 14
+ "param": 12
}
],
"reqtxt": [
@@ -3080,7 +3080,7 @@
},
"icon": "wg_cj1_img01",
"taskcd": 200,
- "tasktime": 90,
+ "tasktime": 160,
"tasktxt": {
"key": "Entrustment details of Po",
"text": "这是属于阿宝的专属委托"
@@ -3089,7 +3089,7 @@
"taskreq": [
{
"key": 1,
- "param": 4
+ "param": 16
}
],
"reqtxt": [
@@ -3128,16 +3128,16 @@
},
"icon": "wg_cj1_img01",
"taskcd": 200,
- "tasktime": 117,
+ "tasktime": 135,
"tasktxt": {
"key": "Entrustment details of Bobi",
"text": "这是属于波比的专属委托"
},
- "taskneed": 1,
+ "taskneed": 4,
"taskreq": [
{
"key": 1,
- "param": 12
+ "param": 4
}
],
"reqtxt": [
@@ -3176,16 +3176,16 @@
},
"icon": "wg_cj1_img01",
"taskcd": 200,
- "tasktime": 150,
+ "tasktime": 65,
"tasktxt": {
"key": "Entrustment details of Tiger",
"text": "这是属于悍娇虎的专属委托"
},
- "taskneed": 1,
+ "taskneed": 4,
"taskreq": [
{
"key": 1,
- "param": 30
+ "param": 1
}
],
"reqtxt": [
@@ -3224,16 +3224,16 @@
},
"icon": "wg_cj1_img01",
"taskcd": 200,
- "tasktime": 177,
+ "tasktime": 100,
"tasktxt": {
"key": "Entrustment details of Shifu",
"text": "这是属于师父的专属委托"
},
- "taskneed": 3,
+ "taskneed": 4,
"taskreq": [
{
"key": 1,
- "param": 1
+ "param": 3
}
],
"reqtxt": [
@@ -3272,16 +3272,16 @@
},
"icon": "wg_cj1_img01",
"taskcd": 200,
- "tasktime": 62,
+ "tasktime": 120,
"tasktxt": {
"key": "Entrustment details of Po",
"text": "这是属于阿宝的专属委托"
},
- "taskneed": 2,
+ "taskneed": 1,
"taskreq": [
{
"key": 1,
- "param": 11
+ "param": 14
}
],
"reqtxt": [
@@ -3320,16 +3320,16 @@
},
"icon": "wg_cj1_img01",
"taskcd": 200,
- "tasktime": 98,
+ "tasktime": 62,
"tasktxt": {
"key": "Entrustment details of Bobi",
"text": "这是属于波比的专属委托"
},
- "taskneed": 4,
+ "taskneed": 1,
"taskreq": [
{
"key": 1,
- "param": 9
+ "param": 25
}
],
"reqtxt": [
@@ -3368,16 +3368,16 @@
},
"icon": "wg_cj1_img01",
"taskcd": 200,
- "tasktime": 138,
+ "tasktime": 150,
"tasktxt": {
"key": "Entrustment details of Tiger",
"text": "这是属于悍娇虎的专属委托"
},
- "taskneed": 3,
+ "taskneed": 1,
"taskreq": [
{
"key": 1,
- "param": 22
+ "param": 16
}
],
"reqtxt": [
@@ -3416,16 +3416,16 @@
},
"icon": "wg_cj1_img01",
"taskcd": 200,
- "tasktime": 97,
+ "tasktime": 172,
"tasktxt": {
"key": "Entrustment details of Shifu",
"text": "这是属于师父的专属委托"
},
- "taskneed": 3,
+ "taskneed": 4,
"taskreq": [
{
"key": 1,
- "param": 20
+ "param": 4
}
],
"reqtxt": [
@@ -3464,7 +3464,7 @@
},
"icon": "wg_cj1_img01",
"taskcd": 200,
- "tasktime": 135,
+ "tasktime": 113,
"tasktxt": {
"key": "Entrustment details of Po",
"text": "这是属于阿宝的专属委托"
@@ -3473,7 +3473,7 @@
"taskreq": [
{
"key": 1,
- "param": 24
+ "param": 7
}
],
"reqtxt": [
@@ -3512,16 +3512,16 @@
},
"icon": "wg_cj1_img01",
"taskcd": 200,
- "tasktime": 88,
+ "tasktime": 166,
"tasktxt": {
"key": "Entrustment details of Bobi",
"text": "这是属于波比的专属委托"
},
- "taskneed": 2,
+ "taskneed": 3,
"taskreq": [
{
"key": 1,
- "param": 10
+ "param": 17
}
],
"reqtxt": [
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 7e7b4163d..565b5a78f 100644
--- a/bin/json/game_rdtaskcondi.json
+++ b/bin/json/game_rdtaskcondi.json
@@ -157,15 +157,15 @@
},
{
"id": 114,
- "type_sp": 1,
- "tasktxt": "招募一次守护者",
+ "type_sp": 0,
+ "tasktxt": "",
"type": 14,
"valid": 0,
- "data1": 1,
+ "data1": 10,
"data2": 0,
"data3": 0,
"data4": 0,
- "data5": 101
+ "data5": 0
},
{
"id": 115,
@@ -721,7 +721,7 @@
},
{
"id": 161,
- "type_sp": 1,
+ "type_sp": 0,
"tasktxt": "",
"type": 61,
"valid": 0,
@@ -729,7 +729,7 @@
"data2": 0,
"data3": 0,
"data4": 0,
- "data5": 102
+ "data5": 0
},
{
"id": 162,
@@ -877,15 +877,15 @@
},
{
"id": 174,
- "type_sp": 1,
- "tasktxt": "尝试挑战邦尼兔",
+ "type_sp": 0,
+ "tasktxt": "",
"type": 70,
"valid": 0,
"data1": 1,
"data2": 101,
"data3": 0,
"data4": 0,
- "data5": 10050
+ "data5": 0
},
{
"id": 175,
@@ -1211,18 +1211,6 @@
"data4": 0,
"data5": 0
},
- {
- "id": 203,
- "type_sp": 1,
- "tasktxt": "调查这些木桩",
- "type": 149,
- "valid": 1,
- "data1": 1,
- "data2": 0,
- "data3": 0,
- "data4": 0,
- "data5": 0
- },
{
"id": 301,
"type_sp": 1,
diff --git a/bin/json/game_rdtasknpc.json b/bin/json/game_rdtasknpc.json
new file mode 100644
index 000000000..3a03897f6
--- /dev/null
+++ b/bin/json/game_rdtasknpc.json
@@ -0,0 +1,389 @@
+[
+ {
+ "id": 1,
+ "datas": [
+ "bossfight_pt_02",
+ "0新手引导-杰克-中轴城常驻待机",
+ "901"
+ ],
+ "event": [
+ 2,
+ 401
+ ],
+ "goto": 0
+ },
+ {
+ "id": 2,
+ "datas": [
+ "bossfight_pt_02",
+ "0新手引导-杰克-中轴城常驻待机",
+ "901"
+ ],
+ "event": [
+ 2,
+ 402
+ ],
+ "goto": 0
+ },
+ {
+ "id": 3,
+ "datas": [
+ "bossfight_pt_02",
+ "1.新手引导-花朵-中轴城",
+ "901"
+ ],
+ "event": [
+ 2,
+ 403
+ ],
+ "goto": 1
+ },
+ {
+ "id": 4,
+ "datas": [
+ "bossfight_pt_02",
+ "1.新手引导-花朵-中轴城",
+ "901"
+ ],
+ "event": [
+ 2,
+ 404
+ ],
+ "goto": 0
+ },
+ {
+ "id": 5,
+ "datas": [
+ "bossfight_pt_02",
+ "0新手引导-杰克-中轴城常驻待机",
+ "901"
+ ],
+ "event": [
+ 2,
+ 406
+ ],
+ "goto": 0
+ },
+ {
+ "id": 6,
+ "datas": [
+ "bossfight_pt_02",
+ "3新手引导-波比-正常待机-中轴城",
+ "901"
+ ],
+ "event": [
+ 2,
+ 407
+ ],
+ "goto": 0
+ },
+ {
+ "id": 7,
+ "datas": [
+ "bossfight_pt_02",
+ "2新手引导-邦尼兔-正常待机-中轴城",
+ "901"
+ ],
+ "event": [
+ 2,
+ 408
+ ],
+ "goto": 0
+ },
+ {
+ "id": 8,
+ "datas": [
+ "bossfight_pt_02",
+ "新手引导-波比-右屏圣树1",
+ "901"
+ ],
+ "event": [
+ 2,
+ 410
+ ],
+ "goto": 1
+ },
+ {
+ "id": 9,
+ "datas": [
+ "bossfight_pt_02",
+ "新手引导-波比-右屏圣树2",
+ "901"
+ ],
+ "event": [
+ 2,
+ 411
+ ],
+ "goto": 0
+ },
+ {
+ "id": 10,
+ "datas": [
+ "bossfight_pt_02",
+ "新手引导-豺狼人-右屏圣树",
+ "901"
+ ],
+ "event": [
+ 2,
+ 412
+ ],
+ "goto": 0
+ },
+ {
+ "id": 11,
+ "datas": [
+ "bossfight_pt_02",
+ "新手引导-豺狼人-右屏圣树",
+ "901"
+ ],
+ "event": [
+ 2,
+ 413
+ ],
+ "goto": 0
+ },
+ {
+ "id": 12,
+ "datas": [
+ "bossfight_pt_02",
+ "新手引导-波比-犀牛守卫",
+ "901"
+ ],
+ "event": [
+ 4,
+ 166
+ ],
+ "goto": 0
+ },
+ {
+ "id": 13,
+ "datas": [
+ "bossfight_pt_02",
+ "新手引导-波比-犀牛守卫",
+ "901"
+ ],
+ "event": [
+ 2,
+ 416
+ ],
+ "goto": 0
+ },
+ {
+ "id": 14,
+ "datas": [
+ "bossfight_pt_02",
+ "新手引导-波比-右屏圣树3",
+ "901"
+ ],
+ "event": [
+ 9,
+ 1
+ ],
+ "goto": 0
+ },
+ {
+ "id": 15,
+ "datas": [
+ "bossfight_pt_02",
+ "新手引导-波比-右屏圣树3",
+ "901"
+ ],
+ "event": [
+ 2,
+ 420
+ ],
+ "goto": 0
+ },
+ {
+ "id": 16,
+ "datas": [
+ "bossfight_pt_02",
+ "0新手引导-杰克-中轴城常驻待机",
+ "901"
+ ],
+ "event": [
+ 2,
+ 422
+ ],
+ "goto": 0
+ },
+ {
+ "id": 17,
+ "datas": [
+ "bossfight_pt_02",
+ "0新手引导-杰克-中轴城常驻待机",
+ "901"
+ ],
+ "event": [
+ 2,
+ 423
+ ],
+ "goto": 0
+ },
+ {
+ "id": 18,
+ "datas": [
+ "bossfight_pt_02",
+ "0新手引导-杰克-中轴城常驻待机",
+ "901"
+ ],
+ "event": [
+ 2,
+ 425
+ ],
+ "goto": 0
+ },
+ {
+ "id": 19,
+ "datas": [
+ "bossfight_pt_02",
+ "0新手引导-杰克-中轴城常驻待机",
+ "901"
+ ],
+ "event": [
+ 2,
+ 426
+ ],
+ "goto": 0
+ },
+ {
+ "id": 20,
+ "datas": [
+ "scenes_smithy_01",
+ "暴夫纳特铁匠铺",
+ "901"
+ ],
+ "event": [
+ 2,
+ 427
+ ],
+ "goto": 0
+ },
+ {
+ "id": 21,
+ "datas": [
+ "scenes_smithy_02",
+ "打造",
+ "901"
+ ],
+ "event": [
+ 2,
+ 428
+ ],
+ "goto": 0
+ },
+ {
+ "id": 22,
+ "datas": [
+ "bossfight_pt_02",
+ "0新手引导-杰克-中轴城常驻待机",
+ "901"
+ ],
+ "event": [
+ 2,
+ 429
+ ],
+ "goto": 0
+ },
+ {
+ "id": 23,
+ "datas": [
+ "bossfight_pt_02",
+ "0新手引导-杰克-中轴城常驻待机",
+ "901"
+ ],
+ "event": [
+ 2,
+ 430
+ ],
+ "goto": 0
+ },
+ {
+ "id": 24,
+ "datas": [
+ "bossfight_pt_02",
+ "0新手引导-杰克-中轴城常驻待机",
+ "901"
+ ],
+ "event": [
+ 2,
+ 431
+ ],
+ "goto": 0
+ },
+ {
+ "id": 25,
+ "datas": [
+ "bossfight_pt_02",
+ "0新手引导-杰克-中轴城常驻待机",
+ "901"
+ ],
+ "event": [
+ 2,
+ 432
+ ],
+ "goto": 0
+ },
+ {
+ "id": 26,
+ "datas": [
+ "bossfight_pt_02",
+ "功能入口-商人",
+ "901"
+ ],
+ "event": [
+ 10,
+ 122
+ ],
+ "goto": 0
+ },
+ {
+ "id": 27,
+ "datas": [
+ "scenes_smithy_02",
+ "打造",
+ "139"
+ ],
+ "event": [
+ 2,
+ 500
+ ],
+ "goto": 0
+ },
+ {
+ "id": 28,
+ "datas": [
+ "scenes_smithy_02",
+ "打造",
+ "139"
+ ],
+ "event": [
+ 2,
+ 404
+ ],
+ "goto": 0
+ },
+ {
+ "id": 29,
+ "datas": [
+ "bossfight_pt_02",
+ "功能入口-主线关卡",
+ "901"
+ ],
+ "event": [
+ 2,
+ 500
+ ],
+ "goto": 0
+ },
+ {
+ "id": 30,
+ "datas": [
+ "bossfight_pt_02",
+ "传送点-铁匠铺",
+ "901"
+ ],
+ "event": [],
+ "goto": 0
+ }
+]
\ No newline at end of file
diff --git a/bin/json/game_skillafteratk.json b/bin/json/game_skillafteratk.json
index 95599fa38..2267162a5 100644
--- a/bin/json/game_skillafteratk.json
+++ b/bin/json/game_skillafteratk.json
@@ -12687,7 +12687,7 @@
"Type": 3,
"Argu": [
390001007,
- 500,
+ 1000,
1,
2
],
@@ -12703,7 +12703,7 @@
{
"Id": 235005311,
"EmitPR": 1000,
- "From": 3,
+ "From": 1,
"Where": [],
"Order": "",
"Limit": 10,
@@ -12727,7 +12727,7 @@
{
"Id": 235005312,
"EmitPR": 1000,
- "From": 3,
+ "From": 1,
"Where": [],
"Order": "",
"Limit": 10,
@@ -12784,7 +12784,7 @@
"Type": 3,
"Argu": [
390001007,
- 500,
+ 1000,
1,
2
],
@@ -12808,7 +12808,7 @@
"Type": 3,
"Argu": [
390001325,
- 2500,
+ 1000,
1,
-1
],
@@ -23098,7 +23098,9 @@
4,
350
],
- "FollowSK": [],
+ "FollowSK": [
+ 234001112
+ ],
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false,
@@ -23118,7 +23120,7 @@
"Type": 3,
"Argu": [
390001101,
- 400,
+ 500,
1,
2
],
@@ -23162,10 +23164,13 @@
"Order": "",
"Limit": 1,
"ExecuteCnt": 1,
- "Type": 21,
+ "Type": 17,
"Argu": [
- 2,
1,
+ 4,
+ 1000,
+ 2,
+ 3,
100
],
"FollowSK": [],
@@ -26542,10 +26547,12 @@
"Type": 2,
"Argu": [
424006211,
- 1,
+ -1,
1
],
- "FollowSK": [],
+ "FollowSK": [
+ 224006212
+ ],
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false,
diff --git a/bin/json/game_skillpassive.json b/bin/json/game_skillpassive.json
index dc3129736..7d5d87a61 100644
--- a/bin/json/game_skillpassive.json
+++ b/bin/json/game_skillpassive.json
@@ -1880,7 +1880,7 @@
"Id": 434001211,
"When": 12,
"FromCheck": "Target=3",
- "TargetCheck": "",
+ "TargetCheck": "Target=2",
"MainSkillCheck": "",
"AfterSkillCheck": "",
"BuffCheck": "",
diff --git a/bin/json/game_worldall.json b/bin/json/game_worldall.json
new file mode 100644
index 000000000..53b0b2614
--- /dev/null
+++ b/bin/json/game_worldall.json
@@ -0,0 +1,22 @@
+[
+ {
+ "组id": 2,
+ "name": {
+ "key": "mainline_name_10001",
+ "text": "章节1全部任务"
+ },
+ "task_type": 2,
+ "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 0c462845c..8c4c030e3 100644
--- a/bin/json/game_worldtask.json
+++ b/bin/json/game_worldtask.json
@@ -3,85 +3,121 @@
"key": 20010,
"lock": 1,
"ontxe": 0,
+ "id_after": 20011,
+ "group": 2,
+ "des": 2,
+ "icon": "",
+ "task_Tname": {
+ "key": "task_name_01",
+ "text": "这是哪里"
+ },
+ "task_name": {
+ "key": "task_name_01",
+ "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_01",
+ "text": "这是哪里"
+ },
+ "task_name": {
+ "key": "task_name_02",
+ "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": "story_80",
- "text": "1"
+ "key": "task_name_01",
+ "text": "这是哪里"
},
"task_name": {
- "key": "story_80",
- "text": "1"
+ "key": "task_name_03",
+ "text": "触摸花朵"
},
"task_display": {
"key": "story_80",
- "text": "1"
+ "text": "新手引导"
},
- "npc": "10010",
+ "npc": 3,
"completetask": [
0
],
- "deliver_npc": 0,
+ "deliver_npc": 1,
"auto_accept": 1,
"reword": [],
- "module": []
+ "module": [
+ "practice"
+ ]
},
{
"key": 20020,
"lock": 1,
- "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": [
- 0
- ],
- "deliver_npc": 0,
- "auto_accept": 1,
- "reword": [],
- "module": []
- },
- {
- "key": 20030,
- "lock": 1,
- "ontxe": 20020,
+ "ontxe": 20012,
"id_after": 20040,
"group": 2,
"des": 2,
"icon": "",
"task_Tname": {
- "key": "story_80",
- "text": "1"
+ "key": "task_name_01",
+ "text": "这是哪里"
},
"task_name": {
- "key": "story_80",
- "text": "1"
+ "key": "task_name_04",
+ "text": "触摸花朵"
},
"task_display": {
"key": "story_80",
- "text": "1"
+ "text": "新手引导"
},
- "npc": "10030",
+ "npc": 4,
"completetask": [
0
],
- "deliver_npc": 0,
+ "deliver_npc": 1,
"auto_accept": 1,
"reword": [],
"module": []
@@ -89,28 +125,28 @@
{
"key": 20040,
"lock": 1,
- "ontxe": 20030,
+ "ontxe": 20020,
"id_after": 20050,
"group": 2,
"des": 2,
"icon": "",
"task_Tname": {
- "key": "story_80",
- "text": "1"
+ "key": "task_name_01",
+ "text": "这是哪里"
},
"task_name": {
- "key": "story_80",
- "text": "1"
+ "key": "task_name_05",
+ "text": "和杰克谈谈"
},
"task_display": {
"key": "story_80",
- "text": "1"
+ "text": "新手引导"
},
- "npc": "10040",
+ "npc": 5,
"completetask": [
- 174
+ 0
],
- "deliver_npc": 0,
+ "deliver_npc": 1,
"auto_accept": 1,
"reword": [],
"module": []
@@ -124,22 +160,22 @@
"des": 2,
"icon": "",
"task_Tname": {
- "key": "story_80",
- "text": "1"
+ "key": "task_name_01",
+ "text": "这是哪里"
},
"task_name": {
- "key": "story_80",
- "text": "1"
+ "key": "task_name_06",
+ "text": "这个小家伙是？"
},
"task_display": {
"key": "story_80",
- "text": "1"
+ "text": "新手引导"
},
- "npc": "10060",
+ "npc": 6,
"completetask": [
0
],
- "deliver_npc": 0,
+ "deliver_npc": 1,
"auto_accept": 1,
"reword": [],
"module": []
@@ -153,23 +189,23 @@
"des": 2,
"icon": "",
"task_Tname": {
- "key": "story_80",
- "text": "1"
+ "key": "task_name_01",
+ "text": "这是哪里"
},
"task_name": {
- "key": "story_80",
- "text": "1"
+ "key": "task_name_07",
+ "text": "和邦尼兔谈谈"
},
"task_display": {
"key": "story_80",
- "text": "1"
+ "text": "新手引导"
},
- "npc": "10070",
+ "npc": 7,
"completetask": [
- 203
+ 0
],
- "deliver_npc": 10080,
- "auto_accept": 0,
+ "deliver_npc": 1,
+ "auto_accept": 1,
"reword": [],
"module": []
},
@@ -182,23 +218,23 @@
"des": 2,
"icon": "",
"task_Tname": {
- "key": "story_80",
- "text": "1"
+ "key": "task_name_01",
+ "text": "这是哪里"
},
"task_name": {
- "key": "story_80",
- "text": "1"
+ "key": "task_name_08",
+ "text": "和波比谈谈"
},
"task_display": {
"key": "story_80",
- "text": "1"
+ "text": "新手引导"
},
- "npc": "10090",
+ "npc": 8,
"completetask": [
- 114
+ 0
],
- "deliver_npc": 10100,
- "auto_accept": 0,
+ "deliver_npc": 1,
+ "auto_accept": 1,
"reword": [],
"module": []
},
@@ -206,27 +242,538 @@
"key": 20080,
"lock": 1,
"ontxe": 20070,
+ "id_after": 20090,
+ "group": 2,
+ "des": 2,
+ "icon": "",
+ "task_Tname": {
+ "key": "task_name_01",
+ "text": "这是哪里"
+ },
+ "task_name": {
+ "key": "task_name_09",
+ "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_01",
+ "text": "这是哪里"
+ },
+ "task_name": {
+ "key": "task_name_10",
+ "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_01",
+ "text": "这是哪里"
+ },
+ "task_name": {
+ "key": "task_name_11",
+ "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_01",
+ "text": "这是哪里"
+ },
+ "task_name": {
+ "key": "task_name_12",
+ "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_01",
+ "text": "这是哪里"
+ },
+ "task_name": {
+ "key": "task_name_13",
+ "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_01",
+ "text": "这是哪里"
+ },
+ "task_name": {
+ "key": "task_name_14",
+ "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_01",
+ "text": "这是哪里"
+ },
+ "task_name": {
+ "key": "task_name_15",
+ "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": "story_80",
- "text": "1"
+ "key": "task_name_01",
+ "text": "这是哪里"
},
"task_name": {
- "key": "story_80",
- "text": "1"
+ "key": "task_name_16",
+ "text": "敬请期待后续剧情"
},
"task_display": {
"key": "story_80",
- "text": "1"
+ "text": "新手引导"
},
- "npc": "10110",
+ "npc": 16,
"completetask": [
- 161
+ 0
],
- "deliver_npc": 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": "task_name_01",
+ "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": "task_name_01",
+ "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": "task_name_01",
+ "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": "task_name_01",
+ "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": "task_name_01",
+ "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": "task_name_01",
+ "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": "task_name_01",
+ "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": "task_name_01",
+ "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": "task_name_01",
+ "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": "初来乍到"
+ },
+ "task_name": {
+ "key": "story_80",
+ "text": "初来乍到"
+ },
+ "task_display": {
+ "key": "story_80",
+ "text": "新手引导"
+ },
+ "npc": 29,
+ "completetask": [
+ 20003
+ ],
+ "deliver_npc": 1,
"auto_accept": 0,
"reword": [],
"module": []
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/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/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/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..2fd182eec 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
}
@@ -157,14 +155,14 @@ func (this *SeasonPagoda) TimerSeasonOver() {
}
}
- 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)
+ // }
}
// 赛季塔开始
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/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.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..53825f196
--- /dev/null
+++ b/sys/configure/structs/Game.WorldAllData.go
@@ -0,0 +1,54 @@
+//------------------------------------------------------------------------------
+//
+// 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
+ TaskType int32
+ 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; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["task_type"].(float64); !_ok_ { err = errors.New("task_type error"); return }; _v.TaskType = int32(_tempNum_) }
+ {
+ 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/Game.WorldTaskData.go b/sys/configure/structs/Game.WorldTaskData.go
index 3942991de..7c1c9ba28 100644
--- a/sys/configure/structs/Game.WorldTaskData.go
+++ b/sys/configure/structs/Game.WorldTaskData.go
@@ -21,7 +21,7 @@ type GameWorldTaskData struct {
TaskTname string
TaskName string
TaskDisplay string
- Npc string
+ Npc int32
Completetask []int32
DeliverNpc int32
AutoAccept int32
@@ -46,7 +46,7 @@ func (_v *GameWorldTaskData)Deserialize(_buf map[string]interface{}) (err error)
{var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["task_Tname"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.TaskTname error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.TaskTname, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
{var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["task_name"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.TaskName error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.TaskName, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
{var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["task_display"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.TaskDisplay error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.TaskDisplay, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
- { var _ok_ bool; if _v.Npc, _ok_ = _buf["npc"].(string); !_ok_ { err = errors.New("npc error"); return } }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["npc"].(float64); !_ok_ { err = errors.New("npc error"); return }; _v.Npc = int32(_tempNum_) }
{
var _arr_ []interface{}
var _ok_ bool
diff --git a/sys/configure/structs/Tables.go b/sys/configure/structs/Tables.go
index 368662754..30b5622f7 100644
--- a/sys/configure/structs/Tables.go
+++ b/sys/configure/structs/Tables.go
@@ -57,11 +57,9 @@ 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 +89,6 @@ type Tables struct {
LibraryBubble *GameLibraryBubble
LibraryPlayBack *GameLibraryPlayBack
Robot *GameRobot
- Ip *GameIp
NameLibrary *GameNameLibrary
HeroConvertdata *GameHeroConvertdata
LinestoryTimeLine *GameLinestoryTimeLine
@@ -127,6 +124,7 @@ type Tables struct {
PrivilegeCard *GamePrivilegeCard
Privilege *GamePrivilege
WorldTask *GameWorldTask
+ WorldAll *GameWorldAll
Teaching *GameTeaching
HeroStrategy *GameHeroStrategy
FightGlobalEvent *GameFightGlobalEvent
@@ -462,12 +460,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
}
@@ -486,12 +478,6 @@ func NewTables(loader JsonLoader) (*Tables, error) {
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 +652,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 +862,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
}