Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev
This commit is contained in:
liwei1dao
commit
2d3666e0ac
@ -500,7 +500,7 @@
|
||||
"weight": 10,
|
||||
"Text_Bubble": {
|
||||
"key": "bubblegroup_bubblegroup_Text_Bubble_42",
|
||||
"text": "商店收购需求商品语录"
|
||||
"text": "啊哈，这个城市需要这个"
|
||||
}
|
||||
},
|
||||
{
|
||||
@ -512,7 +512,7 @@
|
||||
"weight": 10,
|
||||
"Text_Bubble": {
|
||||
"key": "bubblegroup_bubblegroup_Text_Bubble_43",
|
||||
"text": "商店收购普通商品语录"
|
||||
"text": "嗯，货色不错。"
|
||||
}
|
||||
},
|
||||
{
|
||||
@ -524,7 +524,7 @@
|
||||
"weight": 10,
|
||||
"Text_Bubble": {
|
||||
"key": "bubblegroup_bubblegroup_Text_Bubble_44",
|
||||
"text": "商店收购饱和商品语录"
|
||||
"text": "不是很明智的交易。"
|
||||
}
|
||||
},
|
||||
{
|
||||
@ -536,7 +536,7 @@
|
||||
"weight": 10,
|
||||
"Text_Bubble": {
|
||||
"key": "bubblegroup_bubblegroup_Text_Bubble_45",
|
||||
"text": "玩家购买成功语录"
|
||||
"text": "眼光不错，小伙子。"
|
||||
}
|
||||
},
|
||||
{
|
||||
|
||||
@ -1225,5 +1225,65 @@
|
||||
"id": 214,
|
||||
"insert": 2,
|
||||
"filter": []
|
||||
},
|
||||
{
|
||||
"id": 215,
|
||||
"insert": 1,
|
||||
"filter": []
|
||||
},
|
||||
{
|
||||
"id": 216,
|
||||
"insert": 1,
|
||||
"filter": []
|
||||
},
|
||||
{
|
||||
"id": 217,
|
||||
"insert": 1,
|
||||
"filter": []
|
||||
},
|
||||
{
|
||||
"id": 218,
|
||||
"insert": 1,
|
||||
"filter": []
|
||||
},
|
||||
{
|
||||
"id": 219,
|
||||
"insert": 1,
|
||||
"filter": []
|
||||
},
|
||||
{
|
||||
"id": 220,
|
||||
"insert": 1,
|
||||
"filter": []
|
||||
},
|
||||
{
|
||||
"id": 221,
|
||||
"insert": 1,
|
||||
"filter": []
|
||||
},
|
||||
{
|
||||
"id": 222,
|
||||
"insert": 1,
|
||||
"filter": []
|
||||
},
|
||||
{
|
||||
"id": 223,
|
||||
"insert": 1,
|
||||
"filter": []
|
||||
},
|
||||
{
|
||||
"id": 224,
|
||||
"insert": 1,
|
||||
"filter": []
|
||||
},
|
||||
{
|
||||
"id": 225,
|
||||
"insert": 1,
|
||||
"filter": []
|
||||
},
|
||||
{
|
||||
"id": 226,
|
||||
"insert": 1,
|
||||
"filter": []
|
||||
}
|
||||
]
|
||||
@ -134,9 +134,29 @@
|
||||
"specialnum": 600,
|
||||
"exspecial_num": 1,
|
||||
"exspecial": [
|
||||
"21000003",
|
||||
"21000004",
|
||||
"21000005",
|
||||
"21000006",
|
||||
"21000007",
|
||||
"21000008",
|
||||
"21000015"
|
||||
"21000010",
|
||||
"21000011",
|
||||
"21000012",
|
||||
"21000013",
|
||||
"21000014",
|
||||
"21000016",
|
||||
"21000017",
|
||||
"21000020",
|
||||
"21000021",
|
||||
"21000022",
|
||||
"21000023",
|
||||
"21000026",
|
||||
"21000027",
|
||||
"21000028",
|
||||
"21000030",
|
||||
"21000031",
|
||||
"21000032"
|
||||
],
|
||||
"exspecial_weight": [
|
||||
3000,
|
||||
@ -222,9 +242,27 @@
|
||||
"specialnum": 600,
|
||||
"exspecial_num": 1,
|
||||
"exspecial": [
|
||||
"21000005",
|
||||
"21000002",
|
||||
"21000003",
|
||||
"21000004",
|
||||
"21000006",
|
||||
"21000007",
|
||||
"21000009",
|
||||
"21000010",
|
||||
"21000012",
|
||||
"21000008"
|
||||
"21000014",
|
||||
"21000019",
|
||||
"21000020",
|
||||
"21000021",
|
||||
"21000022",
|
||||
"21000023",
|
||||
"21000026",
|
||||
"21000027",
|
||||
"21000028",
|
||||
"21000029",
|
||||
"21000030",
|
||||
"21000031",
|
||||
"21000032"
|
||||
],
|
||||
"exspecial_weight": [
|
||||
3000,
|
||||
@ -310,9 +348,30 @@
|
||||
"specialnum": 600,
|
||||
"exspecial_num": 1,
|
||||
"exspecial": [
|
||||
"21000003",
|
||||
"21000004",
|
||||
"21000005",
|
||||
"21000006",
|
||||
"21000016",
|
||||
"21000013"
|
||||
"21000007",
|
||||
"21000008",
|
||||
"21000009",
|
||||
"21000010",
|
||||
"21000011",
|
||||
"21000012",
|
||||
"21000013",
|
||||
"21000015",
|
||||
"21000017",
|
||||
"21000018",
|
||||
"21000020",
|
||||
"21000021",
|
||||
"21000024",
|
||||
"21000025",
|
||||
"21000026",
|
||||
"21000027",
|
||||
"21000029",
|
||||
"21000030",
|
||||
"21000032",
|
||||
"21000033"
|
||||
],
|
||||
"exspecial_weight": [
|
||||
3000,
|
||||
@ -396,9 +455,31 @@
|
||||
"specialnum": 600,
|
||||
"exspecial_num": 1,
|
||||
"exspecial": [
|
||||
"21000002",
|
||||
"21000004",
|
||||
"21000005",
|
||||
"21000006",
|
||||
"21000007",
|
||||
"21000008",
|
||||
"21000009",
|
||||
"21000010",
|
||||
"21000011",
|
||||
"21000012",
|
||||
"21000013",
|
||||
"21000014",
|
||||
"21000015",
|
||||
"21000017",
|
||||
"21000018",
|
||||
"21000019",
|
||||
"21000020",
|
||||
"21000006"
|
||||
"21000022",
|
||||
"21000024",
|
||||
"21000025",
|
||||
"21000027",
|
||||
"21000028",
|
||||
"21000029",
|
||||
"21000031",
|
||||
"21000033"
|
||||
],
|
||||
"exspecial_weight": [
|
||||
3000,
|
||||
@ -483,9 +564,31 @@
|
||||
"specialnum": 600,
|
||||
"exspecial_num": 1,
|
||||
"exspecial": [
|
||||
"21000009",
|
||||
"21000002",
|
||||
"21000003",
|
||||
"21000004",
|
||||
"21000021"
|
||||
"21000006",
|
||||
"21000007",
|
||||
"21000008",
|
||||
"21000009",
|
||||
"21000010",
|
||||
"21000011",
|
||||
"21000012",
|
||||
"21000013",
|
||||
"21000014",
|
||||
"21000015",
|
||||
"21000016",
|
||||
"21000018",
|
||||
"21000019",
|
||||
"21000021",
|
||||
"21000023",
|
||||
"21000024",
|
||||
"21000025",
|
||||
"21000028",
|
||||
"21000029",
|
||||
"21000030",
|
||||
"21000031",
|
||||
"21000032"
|
||||
],
|
||||
"exspecial_weight": [
|
||||
3000,
|
||||
@ -569,9 +672,31 @@
|
||||
"specialnum": 600,
|
||||
"exspecial_num": 1,
|
||||
"exspecial": [
|
||||
"21000004",
|
||||
"21000002",
|
||||
"21000003",
|
||||
"21000005",
|
||||
"21000006",
|
||||
"21000007",
|
||||
"21000008",
|
||||
"21000015"
|
||||
"21000009",
|
||||
"21000010",
|
||||
"21000011",
|
||||
"21000012",
|
||||
"21000013",
|
||||
"21000014",
|
||||
"21000016",
|
||||
"21000018",
|
||||
"21000019",
|
||||
"21000021",
|
||||
"21000022",
|
||||
"21000023",
|
||||
"21000024",
|
||||
"21000026",
|
||||
"21000028",
|
||||
"21000030",
|
||||
"21000031",
|
||||
"21000032",
|
||||
"21000033"
|
||||
],
|
||||
"exspecial_weight": [
|
||||
3000,
|
||||
@ -656,9 +781,30 @@
|
||||
"specialnum": 600,
|
||||
"exspecial_num": 1,
|
||||
"exspecial": [
|
||||
"21000002",
|
||||
"21000003",
|
||||
"21000004",
|
||||
"21000005",
|
||||
"21000006",
|
||||
"21000007",
|
||||
"21000008",
|
||||
"21000009",
|
||||
"21000010",
|
||||
"21000011",
|
||||
"21000012",
|
||||
"21000008"
|
||||
"21000016",
|
||||
"21000018",
|
||||
"21000020",
|
||||
"21000021",
|
||||
"21000023",
|
||||
"21000026",
|
||||
"21000027",
|
||||
"21000028",
|
||||
"21000029",
|
||||
"21000030",
|
||||
"21000031",
|
||||
"21000032",
|
||||
"21000033"
|
||||
],
|
||||
"exspecial_weight": [
|
||||
3000,
|
||||
@ -742,9 +888,31 @@
|
||||
"specialnum": 600,
|
||||
"exspecial_num": 1,
|
||||
"exspecial": [
|
||||
"21000002",
|
||||
"21000003",
|
||||
"21000004",
|
||||
"21000005",
|
||||
"21000006",
|
||||
"21000016",
|
||||
"21000013"
|
||||
"21000007",
|
||||
"21000008",
|
||||
"21000009",
|
||||
"21000011",
|
||||
"21000012",
|
||||
"21000013",
|
||||
"21000014",
|
||||
"21000015",
|
||||
"21000017",
|
||||
"21000018",
|
||||
"21000019",
|
||||
"21000020",
|
||||
"21000021",
|
||||
"21000022",
|
||||
"21000024",
|
||||
"21000025",
|
||||
"21000026",
|
||||
"21000027",
|
||||
"21000030",
|
||||
"21000032"
|
||||
],
|
||||
"exspecial_weight": [
|
||||
3000,
|
||||
@ -828,9 +996,31 @@
|
||||
"specialnum": 600,
|
||||
"exspecial_num": 1,
|
||||
"exspecial": [
|
||||
"21000002",
|
||||
"21000003",
|
||||
"21000004",
|
||||
"21000005",
|
||||
"21000006",
|
||||
"21000007",
|
||||
"21000020",
|
||||
"21000006"
|
||||
"21000009",
|
||||
"21000010",
|
||||
"21000011",
|
||||
"21000012",
|
||||
"21000013",
|
||||
"21000014",
|
||||
"21000015",
|
||||
"21000017",
|
||||
"21000019",
|
||||
"21000021",
|
||||
"21000022",
|
||||
"21000023",
|
||||
"21000025",
|
||||
"21000026",
|
||||
"21000027",
|
||||
"21000029",
|
||||
"21000031",
|
||||
"21000032",
|
||||
"21000033"
|
||||
],
|
||||
"exspecial_weight": [
|
||||
3000,
|
||||
@ -915,9 +1105,31 @@
|
||||
"specialnum": 600,
|
||||
"exspecial_num": 1,
|
||||
"exspecial": [
|
||||
"21000009",
|
||||
"21000002",
|
||||
"21000003",
|
||||
"21000004",
|
||||
"21000021"
|
||||
"21000005",
|
||||
"21000006",
|
||||
"21000007",
|
||||
"21000008",
|
||||
"21000009",
|
||||
"21000010",
|
||||
"21000011",
|
||||
"21000013",
|
||||
"21000014",
|
||||
"21000016",
|
||||
"21000018",
|
||||
"21000019",
|
||||
"21000021",
|
||||
"21000022",
|
||||
"21000023",
|
||||
"21000026",
|
||||
"21000027",
|
||||
"21000028",
|
||||
"21000030",
|
||||
"21000031",
|
||||
"21000032",
|
||||
"21000033"
|
||||
],
|
||||
"exspecial_weight": [
|
||||
3000,
|
||||
@ -1002,9 +1214,30 @@
|
||||
"specialnum": 600,
|
||||
"exspecial_num": 1,
|
||||
"exspecial": [
|
||||
"21000002",
|
||||
"21000003",
|
||||
"21000004",
|
||||
"21000005",
|
||||
"21000007",
|
||||
"21000008",
|
||||
"21000015"
|
||||
"21000009",
|
||||
"21000010",
|
||||
"21000011",
|
||||
"21000012",
|
||||
"21000013",
|
||||
"21000015",
|
||||
"21000016",
|
||||
"21000017",
|
||||
"21000018",
|
||||
"21000020",
|
||||
"21000023",
|
||||
"21000024",
|
||||
"21000025",
|
||||
"21000027",
|
||||
"21000028",
|
||||
"21000029",
|
||||
"21000030",
|
||||
"21000033"
|
||||
],
|
||||
"exspecial_weight": [
|
||||
3000,
|
||||
@ -1089,9 +1322,30 @@
|
||||
"specialnum": 600,
|
||||
"exspecial_num": 1,
|
||||
"exspecial": [
|
||||
"21000002",
|
||||
"21000003",
|
||||
"21000004",
|
||||
"21000005",
|
||||
"21000006",
|
||||
"21000008",
|
||||
"21000009",
|
||||
"21000010",
|
||||
"21000011",
|
||||
"21000012",
|
||||
"21000008"
|
||||
"21000013",
|
||||
"21000014",
|
||||
"21000016",
|
||||
"21000017",
|
||||
"21000018",
|
||||
"21000019",
|
||||
"21000020",
|
||||
"21000022",
|
||||
"21000023",
|
||||
"21000024",
|
||||
"21000025",
|
||||
"21000026",
|
||||
"21000031",
|
||||
"21000033"
|
||||
],
|
||||
"exspecial_weight": [
|
||||
3000,
|
||||
|
||||
@ -5,7 +5,12 @@
|
||||
"hero_initial": "25001",
|
||||
"hero_replace": "25001",
|
||||
"replace_cd": 0,
|
||||
"replace_num": 0
|
||||
"replace_num": 0,
|
||||
"buy_cos": {
|
||||
"a": "item",
|
||||
"t": "10000101",
|
||||
"n": 150
|
||||
}
|
||||
},
|
||||
{
|
||||
"id": 2,
|
||||
@ -13,7 +18,12 @@
|
||||
"hero_initial": "25001",
|
||||
"hero_replace": "24002",
|
||||
"replace_cd": 0,
|
||||
"replace_num": 0
|
||||
"replace_num": 0,
|
||||
"buy_cos": {
|
||||
"a": "item",
|
||||
"t": "10000101",
|
||||
"n": 150
|
||||
}
|
||||
},
|
||||
{
|
||||
"id": 3,
|
||||
@ -21,7 +31,12 @@
|
||||
"hero_initial": "25001",
|
||||
"hero_replace": "13003",
|
||||
"replace_cd": 0,
|
||||
"replace_num": 0
|
||||
"replace_num": 0,
|
||||
"buy_cos": {
|
||||
"a": "item",
|
||||
"t": "10000101",
|
||||
"n": 150
|
||||
}
|
||||
},
|
||||
{
|
||||
"id": 4,
|
||||
@ -29,7 +44,12 @@
|
||||
"hero_initial": "15002",
|
||||
"hero_replace": "15002",
|
||||
"replace_cd": 5184000,
|
||||
"replace_num": 0
|
||||
"replace_num": 0,
|
||||
"buy_cos": {
|
||||
"a": "item",
|
||||
"t": "10000101",
|
||||
"n": 150
|
||||
}
|
||||
},
|
||||
{
|
||||
"id": 5,
|
||||
@ -37,7 +57,12 @@
|
||||
"hero_initial": "15002",
|
||||
"hero_replace": "15004",
|
||||
"replace_cd": 5184000,
|
||||
"replace_num": 0
|
||||
"replace_num": 0,
|
||||
"buy_cos": {
|
||||
"a": "item",
|
||||
"t": "10000101",
|
||||
"n": 150
|
||||
}
|
||||
},
|
||||
{
|
||||
"id": 6,
|
||||
@ -45,7 +70,12 @@
|
||||
"hero_initial": "15002",
|
||||
"hero_replace": "25001",
|
||||
"replace_cd": 5184000,
|
||||
"replace_num": 300
|
||||
"replace_num": 300,
|
||||
"buy_cos": {
|
||||
"a": "item",
|
||||
"t": "10000101",
|
||||
"n": 150
|
||||
}
|
||||
},
|
||||
{
|
||||
"id": 7,
|
||||
@ -53,7 +83,12 @@
|
||||
"hero_initial": "15002",
|
||||
"hero_replace": "25004",
|
||||
"replace_cd": 5184000,
|
||||
"replace_num": 300
|
||||
"replace_num": 300,
|
||||
"buy_cos": {
|
||||
"a": "item",
|
||||
"t": "10000101",
|
||||
"n": 150
|
||||
}
|
||||
},
|
||||
{
|
||||
"id": 8,
|
||||
@ -61,7 +96,12 @@
|
||||
"hero_initial": "15002",
|
||||
"hero_replace": "35004",
|
||||
"replace_cd": 5184000,
|
||||
"replace_num": 400
|
||||
"replace_num": 400,
|
||||
"buy_cos": {
|
||||
"a": "item",
|
||||
"t": "10000101",
|
||||
"n": 180
|
||||
}
|
||||
},
|
||||
{
|
||||
"id": 9,
|
||||
@ -69,6 +109,11 @@
|
||||
"hero_initial": "15002",
|
||||
"hero_replace": "35005",
|
||||
"replace_cd": 5184000,
|
||||
"replace_num": 600
|
||||
"replace_num": 600,
|
||||
"buy_cos": {
|
||||
"a": "item",
|
||||
"t": "10000101",
|
||||
"n": 180
|
||||
}
|
||||
}
|
||||
]
|
||||
@ -747,7 +747,7 @@
|
||||
"buzkashi_bumpdis": 5,
|
||||
"stamina_potion": 10000003,
|
||||
"fight_ps": 3,
|
||||
"player_bodychange": 20160,
|
||||
"player_bodychange": 20180,
|
||||
"mryl_reward": [
|
||||
{
|
||||
"a": "attr",
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@ -5321,7 +5321,7 @@
|
||||
"EmitPR": 1000,
|
||||
"From": 9,
|
||||
"Where": [
|
||||
"SelfHasBuff=390001426"
|
||||
"SelfHasBuff=390001119"
|
||||
],
|
||||
"Order": "",
|
||||
"Limit": 2,
|
||||
@ -25938,11 +25938,11 @@
|
||||
"Type": 15,
|
||||
"Argu": [
|
||||
1,
|
||||
1,
|
||||
-1,
|
||||
2,
|
||||
1,
|
||||
-1,
|
||||
3,
|
||||
1
|
||||
-1
|
||||
],
|
||||
"FollowSK": [],
|
||||
"SucFollowSK": [],
|
||||
@ -25966,7 +25966,7 @@
|
||||
390001001,
|
||||
1000,
|
||||
1,
|
||||
1
|
||||
2
|
||||
],
|
||||
"FollowSK": [],
|
||||
"SucFollowSK": [],
|
||||
@ -26011,11 +26011,11 @@
|
||||
"Type": 15,
|
||||
"Argu": [
|
||||
1,
|
||||
1,
|
||||
-1,
|
||||
2,
|
||||
1,
|
||||
-1,
|
||||
3,
|
||||
1
|
||||
-1
|
||||
],
|
||||
"FollowSK": [],
|
||||
"SucFollowSK": [],
|
||||
@ -26039,7 +26039,7 @@
|
||||
390001001,
|
||||
1000,
|
||||
1,
|
||||
1
|
||||
2
|
||||
],
|
||||
"FollowSK": [],
|
||||
"SucFollowSK": [],
|
||||
@ -26084,11 +26084,11 @@
|
||||
"Type": 15,
|
||||
"Argu": [
|
||||
1,
|
||||
1,
|
||||
-1,
|
||||
2,
|
||||
1,
|
||||
-1,
|
||||
3,
|
||||
1
|
||||
-1
|
||||
],
|
||||
"FollowSK": [],
|
||||
"SucFollowSK": [],
|
||||
@ -26112,7 +26112,7 @@
|
||||
390001001,
|
||||
1000,
|
||||
1,
|
||||
1
|
||||
2
|
||||
],
|
||||
"FollowSK": [],
|
||||
"SucFollowSK": [],
|
||||
@ -26157,11 +26157,11 @@
|
||||
"Type": 15,
|
||||
"Argu": [
|
||||
1,
|
||||
1,
|
||||
-1,
|
||||
2,
|
||||
1,
|
||||
-1,
|
||||
3,
|
||||
1
|
||||
-1
|
||||
],
|
||||
"FollowSK": [],
|
||||
"SucFollowSK": [],
|
||||
@ -26185,7 +26185,7 @@
|
||||
390001305,
|
||||
1000,
|
||||
1,
|
||||
1
|
||||
-1
|
||||
],
|
||||
"FollowSK": [],
|
||||
"SucFollowSK": [],
|
||||
|
||||
@ -28,5 +28,45 @@
|
||||
"Value1": 0,
|
||||
"Value2": 0,
|
||||
"Value3": 0
|
||||
},
|
||||
{
|
||||
"PrivilegeId": 4,
|
||||
"Desc": {
|
||||
"key": "stonehenge_privilege_Desc_4",
|
||||
"text": "累计选择3个所选类型的buff后，可额外触发一次随机buff三选一事件"
|
||||
},
|
||||
"Value1": 25100001,
|
||||
"Value2": 3,
|
||||
"Value3": 0
|
||||
},
|
||||
{
|
||||
"PrivilegeId": 5,
|
||||
"Desc": {
|
||||
"key": "stonehenge_privilege_Desc_5",
|
||||
"text": "累计选择6个所选类型的buff后，可额外触发一次随机buff三选一事件"
|
||||
},
|
||||
"Value1": 25100001,
|
||||
"Value2": 6,
|
||||
"Value3": 0
|
||||
},
|
||||
{
|
||||
"PrivilegeId": 6,
|
||||
"Desc": {
|
||||
"key": "stonehenge_privilege_Desc_6",
|
||||
"text": "累计选择10个所选类型的buff后，可额外触发一次随机buff三选一事件"
|
||||
},
|
||||
"Value1": 25100001,
|
||||
"Value2": 10,
|
||||
"Value3": 0
|
||||
},
|
||||
{
|
||||
"PrivilegeId": 7,
|
||||
"Desc": {
|
||||
"key": "stonehenge_privilege_Desc_7",
|
||||
"text": "随机buff三选一事件，新增重置功能"
|
||||
},
|
||||
"Value1": 0,
|
||||
"Value2": 0,
|
||||
"Value3": 0
|
||||
}
|
||||
]
|
||||
@ -6,7 +6,7 @@
|
||||
"text": "离开石阵秘境"
|
||||
},
|
||||
"SceneName": "",
|
||||
"PortalName": "portal_3",
|
||||
"PortalName": "portal_7",
|
||||
"EventrewardGroup": 0,
|
||||
"EventBattleGroup": 0,
|
||||
"EventStoryNpcGroup": 0,
|
||||
@ -60,7 +60,7 @@
|
||||
"text": "剧情"
|
||||
},
|
||||
"SceneName": "StonehengeScene3",
|
||||
"PortalName": "portal_2",
|
||||
"PortalName": "portal_4",
|
||||
"EventrewardGroup": 0,
|
||||
"EventBattleGroup": 0,
|
||||
"EventStoryNpcGroup": 12100000,
|
||||
@ -96,7 +96,7 @@
|
||||
"text": "商店"
|
||||
},
|
||||
"SceneName": "StonehengeScene4",
|
||||
"PortalName": "portal_2",
|
||||
"PortalName": "portal_5",
|
||||
"EventrewardGroup": 0,
|
||||
"EventBattleGroup": 0,
|
||||
"EventStoryNpcGroup": 0,
|
||||
@ -112,7 +112,7 @@
|
||||
"text": "首领"
|
||||
},
|
||||
"SceneName": "StonehengeScene2",
|
||||
"PortalName": "portal_1",
|
||||
"PortalName": "portal_3",
|
||||
"EventrewardGroup": 16010100,
|
||||
"EventBattleGroup": 0,
|
||||
"EventStoryNpcGroup": 12100001,
|
||||
@ -166,7 +166,7 @@
|
||||
"text": "剧情"
|
||||
},
|
||||
"SceneName": "StonehengeScene3",
|
||||
"PortalName": "portal_2",
|
||||
"PortalName": "portal_4",
|
||||
"EventrewardGroup": 0,
|
||||
"EventBattleGroup": 0,
|
||||
"EventStoryNpcGroup": 12100000,
|
||||
@ -202,7 +202,7 @@
|
||||
"text": "剧情"
|
||||
},
|
||||
"SceneName": "StonehengeScene3",
|
||||
"PortalName": "portal_2",
|
||||
"PortalName": "portal_4",
|
||||
"EventrewardGroup": 0,
|
||||
"EventBattleGroup": 0,
|
||||
"EventStoryNpcGroup": 12100000,
|
||||
@ -220,7 +220,7 @@
|
||||
"text": "精英"
|
||||
},
|
||||
"SceneName": "StonehengeScene1",
|
||||
"PortalName": "portal_1",
|
||||
"PortalName": "portal_2",
|
||||
"EventrewardGroup": 16010100,
|
||||
"EventBattleGroup": 14010100,
|
||||
"EventStoryNpcGroup": 0,
|
||||
@ -256,7 +256,7 @@
|
||||
"text": "剧情"
|
||||
},
|
||||
"SceneName": "StonehengeScene3",
|
||||
"PortalName": "portal_2",
|
||||
"PortalName": "portal_4",
|
||||
"EventrewardGroup": 0,
|
||||
"EventBattleGroup": 0,
|
||||
"EventStoryNpcGroup": 12100000,
|
||||
@ -292,7 +292,7 @@
|
||||
"text": "商店"
|
||||
},
|
||||
"SceneName": "StonehengeScene4",
|
||||
"PortalName": "portal_2",
|
||||
"PortalName": "portal_5",
|
||||
"EventrewardGroup": 0,
|
||||
"EventBattleGroup": 0,
|
||||
"EventStoryNpcGroup": 0,
|
||||
@ -308,7 +308,7 @@
|
||||
"text": "首领"
|
||||
},
|
||||
"SceneName": "StonehengeScene2",
|
||||
"PortalName": "portal_1",
|
||||
"PortalName": "portal_3",
|
||||
"EventrewardGroup": 16010100,
|
||||
"EventBattleGroup": 0,
|
||||
"EventStoryNpcGroup": 12100001,
|
||||
@ -362,7 +362,7 @@
|
||||
"text": "剧情"
|
||||
},
|
||||
"SceneName": "StonehengeScene3",
|
||||
"PortalName": "portal_2",
|
||||
"PortalName": "portal_4",
|
||||
"EventrewardGroup": 0,
|
||||
"EventBattleGroup": 0,
|
||||
"EventStoryNpcGroup": 12100000,
|
||||
@ -398,7 +398,7 @@
|
||||
"text": "剧情"
|
||||
},
|
||||
"SceneName": "StonehengeScene3",
|
||||
"PortalName": "portal_2",
|
||||
"PortalName": "portal_4",
|
||||
"EventrewardGroup": 0,
|
||||
"EventBattleGroup": 0,
|
||||
"EventStoryNpcGroup": 12100000,
|
||||
@ -416,7 +416,7 @@
|
||||
"text": "精英"
|
||||
},
|
||||
"SceneName": "StonehengeScene1",
|
||||
"PortalName": "portal_1",
|
||||
"PortalName": "portal_2",
|
||||
"EventrewardGroup": 16010100,
|
||||
"EventBattleGroup": 14010100,
|
||||
"EventStoryNpcGroup": 0,
|
||||
@ -452,7 +452,7 @@
|
||||
"text": "剧情"
|
||||
},
|
||||
"SceneName": "StonehengeScene3",
|
||||
"PortalName": "portal_2",
|
||||
"PortalName": "portal_4",
|
||||
"EventrewardGroup": 0,
|
||||
"EventBattleGroup": 0,
|
||||
"EventStoryNpcGroup": 12100000,
|
||||
@ -488,7 +488,7 @@
|
||||
"text": "商店"
|
||||
},
|
||||
"SceneName": "StonehengeScene4",
|
||||
"PortalName": "portal_2",
|
||||
"PortalName": "portal_5",
|
||||
"EventrewardGroup": 0,
|
||||
"EventBattleGroup": 0,
|
||||
"EventStoryNpcGroup": 0,
|
||||
@ -504,7 +504,7 @@
|
||||
"text": "首领"
|
||||
},
|
||||
"SceneName": "StonehengeScene2",
|
||||
"PortalName": "portal_1",
|
||||
"PortalName": "portal_3",
|
||||
"EventrewardGroup": 16010100,
|
||||
"EventBattleGroup": 0,
|
||||
"EventStoryNpcGroup": 12100001,
|
||||
@ -558,7 +558,7 @@
|
||||
"text": "剧情"
|
||||
},
|
||||
"SceneName": "StonehengeScene3",
|
||||
"PortalName": "portal_2",
|
||||
"PortalName": "portal_4",
|
||||
"EventrewardGroup": 0,
|
||||
"EventBattleGroup": 0,
|
||||
"EventStoryNpcGroup": 12100000,
|
||||
@ -594,7 +594,7 @@
|
||||
"text": "剧情"
|
||||
},
|
||||
"SceneName": "StonehengeScene3",
|
||||
"PortalName": "portal_2",
|
||||
"PortalName": "portal_4",
|
||||
"EventrewardGroup": 0,
|
||||
"EventBattleGroup": 0,
|
||||
"EventStoryNpcGroup": 12100000,
|
||||
@ -612,7 +612,7 @@
|
||||
"text": "精英"
|
||||
},
|
||||
"SceneName": "StonehengeScene1",
|
||||
"PortalName": "portal_1",
|
||||
"PortalName": "portal_2",
|
||||
"EventrewardGroup": 16010100,
|
||||
"EventBattleGroup": 14010100,
|
||||
"EventStoryNpcGroup": 0,
|
||||
@ -648,7 +648,7 @@
|
||||
"text": "剧情"
|
||||
},
|
||||
"SceneName": "StonehengeScene3",
|
||||
"PortalName": "portal_2",
|
||||
"PortalName": "portal_4",
|
||||
"EventrewardGroup": 0,
|
||||
"EventBattleGroup": 0,
|
||||
"EventStoryNpcGroup": 12100000,
|
||||
@ -684,7 +684,7 @@
|
||||
"text": "剧情"
|
||||
},
|
||||
"SceneName": "StonehengeScene3",
|
||||
"PortalName": "portal_2",
|
||||
"PortalName": "portal_4",
|
||||
"EventrewardGroup": 0,
|
||||
"EventBattleGroup": 0,
|
||||
"EventStoryNpcGroup": 12100000,
|
||||
@ -702,7 +702,7 @@
|
||||
"text": "商店"
|
||||
},
|
||||
"SceneName": "StonehengeScene4",
|
||||
"PortalName": "portal_2",
|
||||
"PortalName": "portal_5",
|
||||
"EventrewardGroup": 0,
|
||||
"EventBattleGroup": 0,
|
||||
"EventStoryNpcGroup": 0,
|
||||
@ -718,7 +718,7 @@
|
||||
"text": "精英"
|
||||
},
|
||||
"SceneName": "StonehengeScene1",
|
||||
"PortalName": "portal_1",
|
||||
"PortalName": "portal_2",
|
||||
"EventrewardGroup": 16010100,
|
||||
"EventBattleGroup": 14010100,
|
||||
"EventStoryNpcGroup": 0,
|
||||
@ -754,7 +754,7 @@
|
||||
"text": "剧情"
|
||||
},
|
||||
"SceneName": "StonehengeScene3",
|
||||
"PortalName": "portal_2",
|
||||
"PortalName": "portal_4",
|
||||
"EventrewardGroup": 0,
|
||||
"EventBattleGroup": 0,
|
||||
"EventStoryNpcGroup": 12100000,
|
||||
@ -790,7 +790,7 @@
|
||||
"text": "剧情"
|
||||
},
|
||||
"SceneName": "StonehengeScene3",
|
||||
"PortalName": "portal_2",
|
||||
"PortalName": "portal_4",
|
||||
"EventrewardGroup": 0,
|
||||
"EventBattleGroup": 0,
|
||||
"EventStoryNpcGroup": 12100000,
|
||||
@ -808,7 +808,7 @@
|
||||
"text": "商店"
|
||||
},
|
||||
"SceneName": "StonehengeScene4",
|
||||
"PortalName": "portal_2",
|
||||
"PortalName": "portal_5",
|
||||
"EventrewardGroup": 0,
|
||||
"EventBattleGroup": 0,
|
||||
"EventStoryNpcGroup": 0,
|
||||
@ -824,7 +824,7 @@
|
||||
"text": "首领"
|
||||
},
|
||||
"SceneName": "StonehengeScene2",
|
||||
"PortalName": "portal_1",
|
||||
"PortalName": "portal_3",
|
||||
"EventrewardGroup": 16010100,
|
||||
"EventBattleGroup": 0,
|
||||
"EventStoryNpcGroup": 12100001,
|
||||
@ -878,7 +878,7 @@
|
||||
"text": "剧情"
|
||||
},
|
||||
"SceneName": "StonehengeScene3",
|
||||
"PortalName": "portal_2",
|
||||
"PortalName": "portal_4",
|
||||
"EventrewardGroup": 0,
|
||||
"EventBattleGroup": 0,
|
||||
"EventStoryNpcGroup": 12100000,
|
||||
@ -914,7 +914,7 @@
|
||||
"text": "剧情"
|
||||
},
|
||||
"SceneName": "StonehengeScene3",
|
||||
"PortalName": "portal_2",
|
||||
"PortalName": "portal_4",
|
||||
"EventrewardGroup": 0,
|
||||
"EventBattleGroup": 0,
|
||||
"EventStoryNpcGroup": 12100000,
|
||||
@ -932,7 +932,7 @@
|
||||
"text": "精英"
|
||||
},
|
||||
"SceneName": "StonehengeScene1",
|
||||
"PortalName": "portal_1",
|
||||
"PortalName": "portal_2",
|
||||
"EventrewardGroup": 16010100,
|
||||
"EventBattleGroup": 14010100,
|
||||
"EventStoryNpcGroup": 0,
|
||||
@ -968,7 +968,7 @@
|
||||
"text": "剧情"
|
||||
},
|
||||
"SceneName": "StonehengeScene3",
|
||||
"PortalName": "portal_2",
|
||||
"PortalName": "portal_4",
|
||||
"EventrewardGroup": 0,
|
||||
"EventBattleGroup": 0,
|
||||
"EventStoryNpcGroup": 12100000,
|
||||
@ -1004,7 +1004,7 @@
|
||||
"text": "剧情"
|
||||
},
|
||||
"SceneName": "StonehengeScene3",
|
||||
"PortalName": "portal_2",
|
||||
"PortalName": "portal_4",
|
||||
"EventrewardGroup": 0,
|
||||
"EventBattleGroup": 0,
|
||||
"EventStoryNpcGroup": 12100000,
|
||||
@ -1022,7 +1022,7 @@
|
||||
"text": "商店"
|
||||
},
|
||||
"SceneName": "StonehengeScene4",
|
||||
"PortalName": "portal_2",
|
||||
"PortalName": "portal_5",
|
||||
"EventrewardGroup": 0,
|
||||
"EventBattleGroup": 0,
|
||||
"EventStoryNpcGroup": 0,
|
||||
@ -1038,7 +1038,7 @@
|
||||
"text": "精英"
|
||||
},
|
||||
"SceneName": "StonehengeScene1",
|
||||
"PortalName": "portal_1",
|
||||
"PortalName": "portal_2",
|
||||
"EventrewardGroup": 16010100,
|
||||
"EventBattleGroup": 14010100,
|
||||
"EventStoryNpcGroup": 0,
|
||||
@ -1074,7 +1074,7 @@
|
||||
"text": "剧情"
|
||||
},
|
||||
"SceneName": "StonehengeScene3",
|
||||
"PortalName": "portal_2",
|
||||
"PortalName": "portal_4",
|
||||
"EventrewardGroup": 0,
|
||||
"EventBattleGroup": 0,
|
||||
"EventStoryNpcGroup": 12100000,
|
||||
@ -1110,7 +1110,7 @@
|
||||
"text": "剧情"
|
||||
},
|
||||
"SceneName": "StonehengeScene3",
|
||||
"PortalName": "portal_2",
|
||||
"PortalName": "portal_4",
|
||||
"EventrewardGroup": 0,
|
||||
"EventBattleGroup": 0,
|
||||
"EventStoryNpcGroup": 12100000,
|
||||
@ -1128,7 +1128,7 @@
|
||||
"text": "商店"
|
||||
},
|
||||
"SceneName": "StonehengeScene4",
|
||||
"PortalName": "portal_2",
|
||||
"PortalName": "portal_5",
|
||||
"EventrewardGroup": 0,
|
||||
"EventBattleGroup": 0,
|
||||
"EventStoryNpcGroup": 0,
|
||||
@ -1144,7 +1144,7 @@
|
||||
"text": "首领"
|
||||
},
|
||||
"SceneName": "StonehengeScene2",
|
||||
"PortalName": "portal_1",
|
||||
"PortalName": "portal_3",
|
||||
"EventrewardGroup": 16010100,
|
||||
"EventBattleGroup": 0,
|
||||
"EventStoryNpcGroup": 12100001,
|
||||
@ -1198,7 +1198,7 @@
|
||||
"text": "剧情"
|
||||
},
|
||||
"SceneName": "StonehengeScene3",
|
||||
"PortalName": "portal_2",
|
||||
"PortalName": "portal_4",
|
||||
"EventrewardGroup": 0,
|
||||
"EventBattleGroup": 0,
|
||||
"EventStoryNpcGroup": 12100000,
|
||||
@ -1234,7 +1234,7 @@
|
||||
"text": "剧情"
|
||||
},
|
||||
"SceneName": "StonehengeScene3",
|
||||
"PortalName": "portal_2",
|
||||
"PortalName": "portal_4",
|
||||
"EventrewardGroup": 0,
|
||||
"EventBattleGroup": 0,
|
||||
"EventStoryNpcGroup": 12100000,
|
||||
@ -1252,7 +1252,7 @@
|
||||
"text": "精英"
|
||||
},
|
||||
"SceneName": "StonehengeScene1",
|
||||
"PortalName": "portal_1",
|
||||
"PortalName": "portal_2",
|
||||
"EventrewardGroup": 16010100,
|
||||
"EventBattleGroup": 14010100,
|
||||
"EventStoryNpcGroup": 0,
|
||||
@ -1288,7 +1288,7 @@
|
||||
"text": "剧情"
|
||||
},
|
||||
"SceneName": "StonehengeScene3",
|
||||
"PortalName": "portal_2",
|
||||
"PortalName": "portal_4",
|
||||
"EventrewardGroup": 0,
|
||||
"EventBattleGroup": 0,
|
||||
"EventStoryNpcGroup": 12100000,
|
||||
@ -1324,7 +1324,7 @@
|
||||
"text": "剧情"
|
||||
},
|
||||
"SceneName": "StonehengeScene3",
|
||||
"PortalName": "portal_2",
|
||||
"PortalName": "portal_4",
|
||||
"EventrewardGroup": 0,
|
||||
"EventBattleGroup": 0,
|
||||
"EventStoryNpcGroup": 12100000,
|
||||
@ -1342,7 +1342,7 @@
|
||||
"text": "商店"
|
||||
},
|
||||
"SceneName": "StonehengeScene4",
|
||||
"PortalName": "portal_2",
|
||||
"PortalName": "portal_5",
|
||||
"EventrewardGroup": 0,
|
||||
"EventBattleGroup": 0,
|
||||
"EventStoryNpcGroup": 0,
|
||||
@ -1358,7 +1358,7 @@
|
||||
"text": "精英"
|
||||
},
|
||||
"SceneName": "StonehengeScene1",
|
||||
"PortalName": "portal_1",
|
||||
"PortalName": "portal_2",
|
||||
"EventrewardGroup": 16010100,
|
||||
"EventBattleGroup": 14010100,
|
||||
"EventStoryNpcGroup": 0,
|
||||
@ -1394,7 +1394,7 @@
|
||||
"text": "剧情"
|
||||
},
|
||||
"SceneName": "StonehengeScene3",
|
||||
"PortalName": "portal_2",
|
||||
"PortalName": "portal_4",
|
||||
"EventrewardGroup": 0,
|
||||
"EventBattleGroup": 0,
|
||||
"EventStoryNpcGroup": 12100000,
|
||||
@ -1430,7 +1430,7 @@
|
||||
"text": "剧情"
|
||||
},
|
||||
"SceneName": "StonehengeScene3",
|
||||
"PortalName": "portal_2",
|
||||
"PortalName": "portal_4",
|
||||
"EventrewardGroup": 0,
|
||||
"EventBattleGroup": 0,
|
||||
"EventStoryNpcGroup": 12100000,
|
||||
@ -1448,7 +1448,7 @@
|
||||
"text": "商店"
|
||||
},
|
||||
"SceneName": "StonehengeScene4",
|
||||
"PortalName": "portal_2",
|
||||
"PortalName": "portal_5",
|
||||
"EventrewardGroup": 0,
|
||||
"EventBattleGroup": 0,
|
||||
"EventStoryNpcGroup": 0,
|
||||
@ -1464,7 +1464,7 @@
|
||||
"text": "首领"
|
||||
},
|
||||
"SceneName": "StonehengeScene2",
|
||||
"PortalName": "portal_1",
|
||||
"PortalName": "portal_3",
|
||||
"EventrewardGroup": 16010100,
|
||||
"EventBattleGroup": 0,
|
||||
"EventStoryNpcGroup": 12100001,
|
||||
@ -1518,7 +1518,7 @@
|
||||
"text": "剧情"
|
||||
},
|
||||
"SceneName": "StonehengeScene3",
|
||||
"PortalName": "portal_2",
|
||||
"PortalName": "portal_4",
|
||||
"EventrewardGroup": 0,
|
||||
"EventBattleGroup": 0,
|
||||
"EventStoryNpcGroup": 12100000,
|
||||
@ -1554,7 +1554,7 @@
|
||||
"text": "剧情"
|
||||
},
|
||||
"SceneName": "StonehengeScene3",
|
||||
"PortalName": "portal_2",
|
||||
"PortalName": "portal_4",
|
||||
"EventrewardGroup": 0,
|
||||
"EventBattleGroup": 0,
|
||||
"EventStoryNpcGroup": 12100000,
|
||||
@ -1572,7 +1572,7 @@
|
||||
"text": "精英"
|
||||
},
|
||||
"SceneName": "StonehengeScene1",
|
||||
"PortalName": "portal_1",
|
||||
"PortalName": "portal_2",
|
||||
"EventrewardGroup": 16010100,
|
||||
"EventBattleGroup": 14010100,
|
||||
"EventStoryNpcGroup": 0,
|
||||
@ -1608,7 +1608,7 @@
|
||||
"text": "剧情"
|
||||
},
|
||||
"SceneName": "StonehengeScene3",
|
||||
"PortalName": "portal_2",
|
||||
"PortalName": "portal_4",
|
||||
"EventrewardGroup": 0,
|
||||
"EventBattleGroup": 0,
|
||||
"EventStoryNpcGroup": 12100000,
|
||||
@ -1644,7 +1644,7 @@
|
||||
"text": "剧情"
|
||||
},
|
||||
"SceneName": "StonehengeScene3",
|
||||
"PortalName": "portal_2",
|
||||
"PortalName": "portal_4",
|
||||
"EventrewardGroup": 0,
|
||||
"EventBattleGroup": 0,
|
||||
"EventStoryNpcGroup": 12100000,
|
||||
@ -1662,7 +1662,7 @@
|
||||
"text": "商店"
|
||||
},
|
||||
"SceneName": "StonehengeScene4",
|
||||
"PortalName": "portal_2",
|
||||
"PortalName": "portal_5",
|
||||
"EventrewardGroup": 0,
|
||||
"EventBattleGroup": 0,
|
||||
"EventStoryNpcGroup": 0,
|
||||
@ -1678,7 +1678,7 @@
|
||||
"text": "精英"
|
||||
},
|
||||
"SceneName": "StonehengeScene1",
|
||||
"PortalName": "portal_1",
|
||||
"PortalName": "portal_2",
|
||||
"EventrewardGroup": 16010100,
|
||||
"EventBattleGroup": 14010100,
|
||||
"EventStoryNpcGroup": 0,
|
||||
@ -1714,7 +1714,7 @@
|
||||
"text": "剧情"
|
||||
},
|
||||
"SceneName": "StonehengeScene3",
|
||||
"PortalName": "portal_2",
|
||||
"PortalName": "portal_4",
|
||||
"EventrewardGroup": 0,
|
||||
"EventBattleGroup": 0,
|
||||
"EventStoryNpcGroup": 12100000,
|
||||
@ -1750,7 +1750,7 @@
|
||||
"text": "剧情"
|
||||
},
|
||||
"SceneName": "StonehengeScene3",
|
||||
"PortalName": "portal_2",
|
||||
"PortalName": "portal_4",
|
||||
"EventrewardGroup": 0,
|
||||
"EventBattleGroup": 0,
|
||||
"EventStoryNpcGroup": 12100000,
|
||||
@ -1768,7 +1768,7 @@
|
||||
"text": "商店"
|
||||
},
|
||||
"SceneName": "StonehengeScene4",
|
||||
"PortalName": "portal_2",
|
||||
"PortalName": "portal_5",
|
||||
"EventrewardGroup": 0,
|
||||
"EventBattleGroup": 0,
|
||||
"EventStoryNpcGroup": 0,
|
||||
@ -1784,7 +1784,7 @@
|
||||
"text": "首领"
|
||||
},
|
||||
"SceneName": "StonehengeScene2",
|
||||
"PortalName": "portal_1",
|
||||
"PortalName": "portal_3",
|
||||
"EventrewardGroup": 16010100,
|
||||
"EventBattleGroup": 0,
|
||||
"EventStoryNpcGroup": 12100001,
|
||||
@ -1838,7 +1838,7 @@
|
||||
"text": "剧情"
|
||||
},
|
||||
"SceneName": "StonehengeScene3",
|
||||
"PortalName": "portal_2",
|
||||
"PortalName": "portal_4",
|
||||
"EventrewardGroup": 0,
|
||||
"EventBattleGroup": 0,
|
||||
"EventStoryNpcGroup": 12100000,
|
||||
@ -1874,7 +1874,7 @@
|
||||
"text": "剧情"
|
||||
},
|
||||
"SceneName": "StonehengeScene3",
|
||||
"PortalName": "portal_2",
|
||||
"PortalName": "portal_4",
|
||||
"EventrewardGroup": 0,
|
||||
"EventBattleGroup": 0,
|
||||
"EventStoryNpcGroup": 12100000,
|
||||
@ -1892,7 +1892,7 @@
|
||||
"text": "精英"
|
||||
},
|
||||
"SceneName": "StonehengeScene1",
|
||||
"PortalName": "portal_1",
|
||||
"PortalName": "portal_2",
|
||||
"EventrewardGroup": 16010100,
|
||||
"EventBattleGroup": 14010100,
|
||||
"EventStoryNpcGroup": 0,
|
||||
@ -1928,7 +1928,7 @@
|
||||
"text": "剧情"
|
||||
},
|
||||
"SceneName": "StonehengeScene3",
|
||||
"PortalName": "portal_2",
|
||||
"PortalName": "portal_4",
|
||||
"EventrewardGroup": 0,
|
||||
"EventBattleGroup": 0,
|
||||
"EventStoryNpcGroup": 12100000,
|
||||
@ -1964,7 +1964,7 @@
|
||||
"text": "剧情"
|
||||
},
|
||||
"SceneName": "StonehengeScene3",
|
||||
"PortalName": "portal_2",
|
||||
"PortalName": "portal_4",
|
||||
"EventrewardGroup": 0,
|
||||
"EventBattleGroup": 0,
|
||||
"EventStoryNpcGroup": 12100000,
|
||||
@ -1982,7 +1982,7 @@
|
||||
"text": "商店"
|
||||
},
|
||||
"SceneName": "StonehengeScene4",
|
||||
"PortalName": "portal_2",
|
||||
"PortalName": "portal_5",
|
||||
"EventrewardGroup": 0,
|
||||
"EventBattleGroup": 0,
|
||||
"EventStoryNpcGroup": 0,
|
||||
@ -1998,7 +1998,7 @@
|
||||
"text": "精英"
|
||||
},
|
||||
"SceneName": "StonehengeScene1",
|
||||
"PortalName": "portal_1",
|
||||
"PortalName": "portal_2",
|
||||
"EventrewardGroup": 16010100,
|
||||
"EventBattleGroup": 14010100,
|
||||
"EventStoryNpcGroup": 0,
|
||||
@ -2034,7 +2034,7 @@
|
||||
"text": "剧情"
|
||||
},
|
||||
"SceneName": "StonehengeScene3",
|
||||
"PortalName": "portal_2",
|
||||
"PortalName": "portal_4",
|
||||
"EventrewardGroup": 0,
|
||||
"EventBattleGroup": 0,
|
||||
"EventStoryNpcGroup": 12100000,
|
||||
@ -2070,7 +2070,7 @@
|
||||
"text": "剧情"
|
||||
},
|
||||
"SceneName": "StonehengeScene3",
|
||||
"PortalName": "portal_2",
|
||||
"PortalName": "portal_4",
|
||||
"EventrewardGroup": 0,
|
||||
"EventBattleGroup": 0,
|
||||
"EventStoryNpcGroup": 12100000,
|
||||
@ -2088,7 +2088,7 @@
|
||||
"text": "商店"
|
||||
},
|
||||
"SceneName": "StonehengeScene4",
|
||||
"PortalName": "portal_2",
|
||||
"PortalName": "portal_5",
|
||||
"EventrewardGroup": 0,
|
||||
"EventBattleGroup": 0,
|
||||
"EventStoryNpcGroup": 0,
|
||||
@ -2104,7 +2104,7 @@
|
||||
"text": "首领"
|
||||
},
|
||||
"SceneName": "StonehengeScene2",
|
||||
"PortalName": "portal_1",
|
||||
"PortalName": "portal_3",
|
||||
"EventrewardGroup": 16010100,
|
||||
"EventBattleGroup": 0,
|
||||
"EventStoryNpcGroup": 12100001,
|
||||
|
||||
@ -137,7 +137,7 @@
|
||||
"TalentItem": {
|
||||
"a": "item",
|
||||
"t": "10000037",
|
||||
"n": 10
|
||||
"n": 15
|
||||
},
|
||||
"ReferenceLevel": 0,
|
||||
"StageValue": 0
|
||||
@ -203,7 +203,7 @@
|
||||
"TalentItem": {
|
||||
"a": "item",
|
||||
"t": "10000037",
|
||||
"n": 20
|
||||
"n": 35
|
||||
},
|
||||
"ReferenceLevel": 0,
|
||||
"StageValue": 0
|
||||
@ -269,7 +269,7 @@
|
||||
"TalentItem": {
|
||||
"a": "item",
|
||||
"t": "10000037",
|
||||
"n": 50
|
||||
"n": 85
|
||||
},
|
||||
"ReferenceLevel": 0,
|
||||
"StageValue": 0
|
||||
@ -335,7 +335,7 @@
|
||||
"TalentItem": {
|
||||
"a": "item",
|
||||
"t": "10000037",
|
||||
"n": 100
|
||||
"n": 185
|
||||
},
|
||||
"ReferenceLevel": 0,
|
||||
"StageValue": 0
|
||||
@ -478,7 +478,7 @@
|
||||
"TalentItem": {
|
||||
"a": "item",
|
||||
"t": "10000037",
|
||||
"n": 15
|
||||
"n": 20
|
||||
},
|
||||
"ReferenceLevel": 0,
|
||||
"StageValue": 0
|
||||
@ -544,7 +544,7 @@
|
||||
"TalentItem": {
|
||||
"a": "item",
|
||||
"t": "10000037",
|
||||
"n": 30
|
||||
"n": 50
|
||||
},
|
||||
"ReferenceLevel": 0,
|
||||
"StageValue": 0
|
||||
@ -610,7 +610,7 @@
|
||||
"TalentItem": {
|
||||
"a": "item",
|
||||
"t": "10000037",
|
||||
"n": 60
|
||||
"n": 110
|
||||
},
|
||||
"ReferenceLevel": 0,
|
||||
"StageValue": 0
|
||||
@ -676,7 +676,7 @@
|
||||
"TalentItem": {
|
||||
"a": "item",
|
||||
"t": "10000037",
|
||||
"n": 90
|
||||
"n": 200
|
||||
},
|
||||
"ReferenceLevel": 0,
|
||||
"StageValue": 0
|
||||
@ -742,7 +742,7 @@
|
||||
"TalentItem": {
|
||||
"a": "item",
|
||||
"t": "10000037",
|
||||
"n": 120
|
||||
"n": 320
|
||||
},
|
||||
"ReferenceLevel": 0,
|
||||
"StageValue": 0
|
||||
@ -808,7 +808,7 @@
|
||||
"TalentItem": {
|
||||
"a": "item",
|
||||
"t": "10000037",
|
||||
"n": 150
|
||||
"n": 470
|
||||
},
|
||||
"ReferenceLevel": 0,
|
||||
"StageValue": 0
|
||||
@ -874,7 +874,7 @@
|
||||
"TalentItem": {
|
||||
"a": "item",
|
||||
"t": "10000037",
|
||||
"n": 200
|
||||
"n": 670
|
||||
},
|
||||
"ReferenceLevel": 0,
|
||||
"StageValue": 0
|
||||
@ -1017,7 +1017,7 @@
|
||||
"TalentItem": {
|
||||
"a": "item",
|
||||
"t": "10000037",
|
||||
"n": 18
|
||||
"n": 24
|
||||
},
|
||||
"ReferenceLevel": 0,
|
||||
"StageValue": 0
|
||||
@ -1083,7 +1083,7 @@
|
||||
"TalentItem": {
|
||||
"a": "item",
|
||||
"t": "10000037",
|
||||
"n": 36
|
||||
"n": 60
|
||||
},
|
||||
"ReferenceLevel": 0,
|
||||
"StageValue": 0
|
||||
@ -1149,7 +1149,7 @@
|
||||
"TalentItem": {
|
||||
"a": "item",
|
||||
"t": "10000037",
|
||||
"n": 72
|
||||
"n": 132
|
||||
},
|
||||
"ReferenceLevel": 0,
|
||||
"StageValue": 0
|
||||
@ -1215,7 +1215,7 @@
|
||||
"TalentItem": {
|
||||
"a": "item",
|
||||
"t": "10000037",
|
||||
"n": 108
|
||||
"n": 240
|
||||
},
|
||||
"ReferenceLevel": 0,
|
||||
"StageValue": 0
|
||||
@ -1281,7 +1281,7 @@
|
||||
"TalentItem": {
|
||||
"a": "item",
|
||||
"t": "10000037",
|
||||
"n": 144
|
||||
"n": 384
|
||||
},
|
||||
"ReferenceLevel": 0,
|
||||
"StageValue": 0
|
||||
@ -1347,7 +1347,7 @@
|
||||
"TalentItem": {
|
||||
"a": "item",
|
||||
"t": "10000037",
|
||||
"n": 180
|
||||
"n": 564
|
||||
},
|
||||
"ReferenceLevel": 0,
|
||||
"StageValue": 0
|
||||
@ -1413,7 +1413,7 @@
|
||||
"TalentItem": {
|
||||
"a": "item",
|
||||
"t": "10000037",
|
||||
"n": 240
|
||||
"n": 804
|
||||
},
|
||||
"ReferenceLevel": 0,
|
||||
"StageValue": 0
|
||||
@ -1556,7 +1556,7 @@
|
||||
"TalentItem": {
|
||||
"a": "item",
|
||||
"t": "10000037",
|
||||
"n": 27
|
||||
"n": 45
|
||||
},
|
||||
"ReferenceLevel": 0,
|
||||
"StageValue": 0
|
||||
@ -1622,7 +1622,7 @@
|
||||
"TalentItem": {
|
||||
"a": "item",
|
||||
"t": "10000037",
|
||||
"n": 54
|
||||
"n": 99
|
||||
},
|
||||
"ReferenceLevel": 0,
|
||||
"StageValue": 0
|
||||
@ -1688,7 +1688,7 @@
|
||||
"TalentItem": {
|
||||
"a": "item",
|
||||
"t": "10000037",
|
||||
"n": 81
|
||||
"n": 180
|
||||
},
|
||||
"ReferenceLevel": 0,
|
||||
"StageValue": 0
|
||||
@ -1754,7 +1754,7 @@
|
||||
"TalentItem": {
|
||||
"a": "item",
|
||||
"t": "10000037",
|
||||
"n": 108
|
||||
"n": 288
|
||||
},
|
||||
"ReferenceLevel": 0,
|
||||
"StageValue": 0
|
||||
@ -1820,7 +1820,7 @@
|
||||
"TalentItem": {
|
||||
"a": "item",
|
||||
"t": "10000037",
|
||||
"n": 135
|
||||
"n": 423
|
||||
},
|
||||
"ReferenceLevel": 0,
|
||||
"StageValue": 0
|
||||
@ -1886,7 +1886,7 @@
|
||||
"TalentItem": {
|
||||
"a": "item",
|
||||
"t": "10000037",
|
||||
"n": 162
|
||||
"n": 585
|
||||
},
|
||||
"ReferenceLevel": 0,
|
||||
"StageValue": 0
|
||||
@ -1952,7 +1952,7 @@
|
||||
"TalentItem": {
|
||||
"a": "item",
|
||||
"t": "10000037",
|
||||
"n": 189
|
||||
"n": 774
|
||||
},
|
||||
"ReferenceLevel": 0,
|
||||
"StageValue": 0
|
||||
@ -2018,7 +2018,7 @@
|
||||
"TalentItem": {
|
||||
"a": "item",
|
||||
"t": "10000037",
|
||||
"n": 216
|
||||
"n": 990
|
||||
},
|
||||
"ReferenceLevel": 0,
|
||||
"StageValue": 0
|
||||
@ -2084,7 +2084,7 @@
|
||||
"TalentItem": {
|
||||
"a": "item",
|
||||
"t": "10000037",
|
||||
"n": 243
|
||||
"n": 1233
|
||||
},
|
||||
"ReferenceLevel": 0,
|
||||
"StageValue": 0
|
||||
@ -2150,7 +2150,7 @@
|
||||
"TalentItem": {
|
||||
"a": "item",
|
||||
"t": "10000037",
|
||||
"n": 270
|
||||
"n": 1503
|
||||
},
|
||||
"ReferenceLevel": 0,
|
||||
"StageValue": 0
|
||||
@ -2216,7 +2216,7 @@
|
||||
"TalentItem": {
|
||||
"a": "item",
|
||||
"t": "10000037",
|
||||
"n": 360
|
||||
"n": 1863
|
||||
},
|
||||
"ReferenceLevel": 0,
|
||||
"StageValue": 0
|
||||
@ -2359,7 +2359,7 @@
|
||||
"TalentItem": {
|
||||
"a": "item",
|
||||
"t": "10000037",
|
||||
"n": 36
|
||||
"n": 60
|
||||
},
|
||||
"ReferenceLevel": 0,
|
||||
"StageValue": 0
|
||||
@ -2425,7 +2425,7 @@
|
||||
"TalentItem": {
|
||||
"a": "item",
|
||||
"t": "10000037",
|
||||
"n": 72
|
||||
"n": 132
|
||||
},
|
||||
"ReferenceLevel": 0,
|
||||
"StageValue": 0
|
||||
@ -2491,7 +2491,7 @@
|
||||
"TalentItem": {
|
||||
"a": "item",
|
||||
"t": "10000037",
|
||||
"n": 108
|
||||
"n": 240
|
||||
},
|
||||
"ReferenceLevel": 0,
|
||||
"StageValue": 0
|
||||
@ -2557,7 +2557,7 @@
|
||||
"TalentItem": {
|
||||
"a": "item",
|
||||
"t": "10000037",
|
||||
"n": 144
|
||||
"n": 384
|
||||
},
|
||||
"ReferenceLevel": 0,
|
||||
"StageValue": 0
|
||||
@ -2623,7 +2623,7 @@
|
||||
"TalentItem": {
|
||||
"a": "item",
|
||||
"t": "10000037",
|
||||
"n": 180
|
||||
"n": 564
|
||||
},
|
||||
"ReferenceLevel": 0,
|
||||
"StageValue": 0
|
||||
@ -2689,7 +2689,7 @@
|
||||
"TalentItem": {
|
||||
"a": "item",
|
||||
"t": "10000037",
|
||||
"n": 216
|
||||
"n": 780
|
||||
},
|
||||
"ReferenceLevel": 0,
|
||||
"StageValue": 0
|
||||
@ -2755,7 +2755,7 @@
|
||||
"TalentItem": {
|
||||
"a": "item",
|
||||
"t": "10000037",
|
||||
"n": 252
|
||||
"n": 1032
|
||||
},
|
||||
"ReferenceLevel": 0,
|
||||
"StageValue": 0
|
||||
@ -2821,7 +2821,7 @@
|
||||
"TalentItem": {
|
||||
"a": "item",
|
||||
"t": "10000037",
|
||||
"n": 288
|
||||
"n": 1320
|
||||
},
|
||||
"ReferenceLevel": 0,
|
||||
"StageValue": 0
|
||||
@ -2887,7 +2887,7 @@
|
||||
"TalentItem": {
|
||||
"a": "item",
|
||||
"t": "10000037",
|
||||
"n": 324
|
||||
"n": 1644
|
||||
},
|
||||
"ReferenceLevel": 0,
|
||||
"StageValue": 0
|
||||
@ -2953,7 +2953,7 @@
|
||||
"TalentItem": {
|
||||
"a": "item",
|
||||
"t": "10000037",
|
||||
"n": 360
|
||||
"n": 2004
|
||||
},
|
||||
"ReferenceLevel": 0,
|
||||
"StageValue": 0
|
||||
@ -3019,7 +3019,7 @@
|
||||
"TalentItem": {
|
||||
"a": "item",
|
||||
"t": "10000037",
|
||||
"n": 480
|
||||
"n": 2484
|
||||
},
|
||||
"ReferenceLevel": 0,
|
||||
"StageValue": 0
|
||||
@ -3162,7 +3162,7 @@
|
||||
"TalentItem": {
|
||||
"a": "item",
|
||||
"t": "10000037",
|
||||
"n": 36
|
||||
"n": 60
|
||||
},
|
||||
"ReferenceLevel": 0,
|
||||
"StageValue": 0
|
||||
@ -3228,7 +3228,7 @@
|
||||
"TalentItem": {
|
||||
"a": "item",
|
||||
"t": "10000037",
|
||||
"n": 72
|
||||
"n": 132
|
||||
},
|
||||
"ReferenceLevel": 0,
|
||||
"StageValue": 0
|
||||
@ -3294,7 +3294,7 @@
|
||||
"TalentItem": {
|
||||
"a": "item",
|
||||
"t": "10000037",
|
||||
"n": 108
|
||||
"n": 240
|
||||
},
|
||||
"ReferenceLevel": 0,
|
||||
"StageValue": 0
|
||||
@ -3360,7 +3360,7 @@
|
||||
"TalentItem": {
|
||||
"a": "item",
|
||||
"t": "10000037",
|
||||
"n": 144
|
||||
"n": 384
|
||||
},
|
||||
"ReferenceLevel": 0,
|
||||
"StageValue": 0
|
||||
@ -3426,7 +3426,7 @@
|
||||
"TalentItem": {
|
||||
"a": "item",
|
||||
"t": "10000037",
|
||||
"n": 180
|
||||
"n": 564
|
||||
},
|
||||
"ReferenceLevel": 0,
|
||||
"StageValue": 0
|
||||
@ -3492,7 +3492,7 @@
|
||||
"TalentItem": {
|
||||
"a": "item",
|
||||
"t": "10000037",
|
||||
"n": 216
|
||||
"n": 780
|
||||
},
|
||||
"ReferenceLevel": 0,
|
||||
"StageValue": 0
|
||||
@ -3558,7 +3558,7 @@
|
||||
"TalentItem": {
|
||||
"a": "item",
|
||||
"t": "10000037",
|
||||
"n": 252
|
||||
"n": 1032
|
||||
},
|
||||
"ReferenceLevel": 0,
|
||||
"StageValue": 0
|
||||
@ -3624,7 +3624,7 @@
|
||||
"TalentItem": {
|
||||
"a": "item",
|
||||
"t": "10000037",
|
||||
"n": 288
|
||||
"n": 1320
|
||||
},
|
||||
"ReferenceLevel": 0,
|
||||
"StageValue": 0
|
||||
@ -3690,7 +3690,7 @@
|
||||
"TalentItem": {
|
||||
"a": "item",
|
||||
"t": "10000037",
|
||||
"n": 324
|
||||
"n": 1644
|
||||
},
|
||||
"ReferenceLevel": 0,
|
||||
"StageValue": 0
|
||||
@ -3756,7 +3756,7 @@
|
||||
"TalentItem": {
|
||||
"a": "item",
|
||||
"t": "10000037",
|
||||
"n": 360
|
||||
"n": 2004
|
||||
},
|
||||
"ReferenceLevel": 0,
|
||||
"StageValue": 0
|
||||
@ -3822,7 +3822,7 @@
|
||||
"TalentItem": {
|
||||
"a": "item",
|
||||
"t": "10000037",
|
||||
"n": 480
|
||||
"n": 2484
|
||||
},
|
||||
"ReferenceLevel": 0,
|
||||
"StageValue": 0
|
||||
@ -3965,7 +3965,7 @@
|
||||
"TalentItem": {
|
||||
"a": "item",
|
||||
"t": "10000037",
|
||||
"n": 45
|
||||
"n": 72
|
||||
},
|
||||
"ReferenceLevel": 0,
|
||||
"StageValue": 0
|
||||
@ -4031,7 +4031,7 @@
|
||||
"TalentItem": {
|
||||
"a": "item",
|
||||
"t": "10000037",
|
||||
"n": 90
|
||||
"n": 162
|
||||
},
|
||||
"ReferenceLevel": 0,
|
||||
"StageValue": 0
|
||||
@ -4097,7 +4097,7 @@
|
||||
"TalentItem": {
|
||||
"a": "item",
|
||||
"t": "10000037",
|
||||
"n": 135
|
||||
"n": 297
|
||||
},
|
||||
"ReferenceLevel": 0,
|
||||
"StageValue": 0
|
||||
@ -4163,7 +4163,7 @@
|
||||
"TalentItem": {
|
||||
"a": "item",
|
||||
"t": "10000037",
|
||||
"n": 180
|
||||
"n": 477
|
||||
},
|
||||
"ReferenceLevel": 0,
|
||||
"StageValue": 0
|
||||
@ -4229,7 +4229,7 @@
|
||||
"TalentItem": {
|
||||
"a": "item",
|
||||
"t": "10000037",
|
||||
"n": 225
|
||||
"n": 702
|
||||
},
|
||||
"ReferenceLevel": 0,
|
||||
"StageValue": 0
|
||||
@ -4295,7 +4295,7 @@
|
||||
"TalentItem": {
|
||||
"a": "item",
|
||||
"t": "10000037",
|
||||
"n": 270
|
||||
"n": 972
|
||||
},
|
||||
"ReferenceLevel": 0,
|
||||
"StageValue": 0
|
||||
@ -4361,7 +4361,7 @@
|
||||
"TalentItem": {
|
||||
"a": "item",
|
||||
"t": "10000037",
|
||||
"n": 315
|
||||
"n": 1287
|
||||
},
|
||||
"ReferenceLevel": 0,
|
||||
"StageValue": 0
|
||||
@ -4427,7 +4427,7 @@
|
||||
"TalentItem": {
|
||||
"a": "item",
|
||||
"t": "10000037",
|
||||
"n": 360
|
||||
"n": 1647
|
||||
},
|
||||
"ReferenceLevel": 0,
|
||||
"StageValue": 0
|
||||
@ -4493,7 +4493,7 @@
|
||||
"TalentItem": {
|
||||
"a": "item",
|
||||
"t": "10000037",
|
||||
"n": 405
|
||||
"n": 2052
|
||||
},
|
||||
"ReferenceLevel": 0,
|
||||
"StageValue": 0
|
||||
@ -4559,7 +4559,7 @@
|
||||
"TalentItem": {
|
||||
"a": "item",
|
||||
"t": "10000037",
|
||||
"n": 450
|
||||
"n": 2502
|
||||
},
|
||||
"ReferenceLevel": 0,
|
||||
"StageValue": 0
|
||||
@ -4625,7 +4625,7 @@
|
||||
"TalentItem": {
|
||||
"a": "item",
|
||||
"t": "10000037",
|
||||
"n": 600
|
||||
"n": 3102
|
||||
},
|
||||
"ReferenceLevel": 0,
|
||||
"StageValue": 0
|
||||
@ -4768,7 +4768,7 @@
|
||||
"TalentItem": {
|
||||
"a": "item",
|
||||
"t": "10000037",
|
||||
"n": 45
|
||||
"n": 72
|
||||
},
|
||||
"ReferenceLevel": 0,
|
||||
"StageValue": 0
|
||||
@ -4834,7 +4834,7 @@
|
||||
"TalentItem": {
|
||||
"a": "item",
|
||||
"t": "10000037",
|
||||
"n": 90
|
||||
"n": 162
|
||||
},
|
||||
"ReferenceLevel": 0,
|
||||
"StageValue": 0
|
||||
@ -4900,7 +4900,7 @@
|
||||
"TalentItem": {
|
||||
"a": "item",
|
||||
"t": "10000037",
|
||||
"n": 135
|
||||
"n": 297
|
||||
},
|
||||
"ReferenceLevel": 0,
|
||||
"StageValue": 0
|
||||
@ -4966,7 +4966,7 @@
|
||||
"TalentItem": {
|
||||
"a": "item",
|
||||
"t": "10000037",
|
||||
"n": 180
|
||||
"n": 477
|
||||
},
|
||||
"ReferenceLevel": 0,
|
||||
"StageValue": 0
|
||||
@ -5032,7 +5032,7 @@
|
||||
"TalentItem": {
|
||||
"a": "item",
|
||||
"t": "10000037",
|
||||
"n": 225
|
||||
"n": 702
|
||||
},
|
||||
"ReferenceLevel": 0,
|
||||
"StageValue": 0
|
||||
@ -5098,7 +5098,7 @@
|
||||
"TalentItem": {
|
||||
"a": "item",
|
||||
"t": "10000037",
|
||||
"n": 270
|
||||
"n": 972
|
||||
},
|
||||
"ReferenceLevel": 0,
|
||||
"StageValue": 0
|
||||
@ -5164,7 +5164,7 @@
|
||||
"TalentItem": {
|
||||
"a": "item",
|
||||
"t": "10000037",
|
||||
"n": 315
|
||||
"n": 1287
|
||||
},
|
||||
"ReferenceLevel": 0,
|
||||
"StageValue": 0
|
||||
@ -5230,7 +5230,7 @@
|
||||
"TalentItem": {
|
||||
"a": "item",
|
||||
"t": "10000037",
|
||||
"n": 360
|
||||
"n": 1647
|
||||
},
|
||||
"ReferenceLevel": 0,
|
||||
"StageValue": 0
|
||||
@ -5296,7 +5296,7 @@
|
||||
"TalentItem": {
|
||||
"a": "item",
|
||||
"t": "10000037",
|
||||
"n": 405
|
||||
"n": 2052
|
||||
},
|
||||
"ReferenceLevel": 0,
|
||||
"StageValue": 0
|
||||
@ -5362,7 +5362,7 @@
|
||||
"TalentItem": {
|
||||
"a": "item",
|
||||
"t": "10000037",
|
||||
"n": 450
|
||||
"n": 2502
|
||||
},
|
||||
"ReferenceLevel": 0,
|
||||
"StageValue": 0
|
||||
@ -5428,7 +5428,7 @@
|
||||
"TalentItem": {
|
||||
"a": "item",
|
||||
"t": "10000037",
|
||||
"n": 600
|
||||
"n": 3102
|
||||
},
|
||||
"ReferenceLevel": 0,
|
||||
"StageValue": 0
|
||||
|
||||
@ -256,8 +256,13 @@ func (this *Activity) HDCelebration(session comm.IUserSession, systemtype int32,
|
||||
}
|
||||
if data.Val == 0 {
|
||||
var pos int32
|
||||
_sub := int32((configure.Now().Unix()-activity.Stime)/(24*3600)) + 1
|
||||
var maxday int32
|
||||
_days := this.configure.GetHDCelebrationData()
|
||||
for _, v := range _days { // 开启循环
|
||||
maxday += v
|
||||
}
|
||||
_sub := int32((configure.Now().Unix() - activity.Stime) / (24 * 3600))
|
||||
_sub = _sub%maxday + 1
|
||||
for index, v := range _days {
|
||||
for i := 0; i < int(v); i++ {
|
||||
pos++
|
||||
@ -391,10 +396,14 @@ func (this *Activity) GetHdData(session comm.IUserSession, oids []string) (resul
|
||||
update["lasttime"] = list.Lasttime
|
||||
|
||||
update["gotarr"] = list.Gotarr
|
||||
|
||||
var maxday int32
|
||||
_days := this.configure.GetHDCelebrationData()
|
||||
for _, v := range _days { // 开启循环
|
||||
maxday += v
|
||||
}
|
||||
var pos int32
|
||||
_sub := int32((configure.Now().Unix()-activity.Stime)/(24*3600)) + 1
|
||||
_sub := int32((configure.Now().Unix() - activity.Stime) / (24 * 3600))
|
||||
_sub = _sub%maxday + 1
|
||||
for index, v := range _days {
|
||||
for i := 0; i < int(v); i++ {
|
||||
pos++
|
||||
|
||||
@ -244,5 +244,33 @@ func (this *apiComp) BuyOrSell(session comm.IUserSession, req *pb.CaravanBuyOrSe
|
||||
session.SendMsg(string(this.module.GetType()), "buyorsell", &pb.CaravanBuyOrSellResp{
|
||||
Data: caravan,
|
||||
})
|
||||
|
||||
// 任务统计
|
||||
var szTask []*pb.BuriedParam
|
||||
var opCount int32
|
||||
for _, v := range req.Items {
|
||||
opCount += v
|
||||
}
|
||||
if req.IsBuy {
|
||||
|
||||
szTask = append(szTask, comm.GetBuriedParam(comm.Rtype209, req.City, opCount))
|
||||
} else { // 卖
|
||||
//向指定X城市贩卖货物，贩卖货物价值需要X虚拟币以上
|
||||
var price int32
|
||||
for k, v := range req.Items {
|
||||
|
||||
price += caravan.Items[k].Price * v
|
||||
}
|
||||
szTask = append(szTask, comm.GetBuriedParam(comm.Rtype210, req.City, price))
|
||||
|
||||
// 急需货物
|
||||
if v, ok := caravan.City[req.City]; ok {
|
||||
for range v.Exspecial {
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
szTask = append(szTask, comm.GetBuriedParam(comm.Rtype212, req.City)) // 接取任务后，商队抵达指定城市
|
||||
go this.module.ModuleBuried.TriggerBuried(session.Clone(), szTask...)
|
||||
return
|
||||
}
|
||||
|
||||
@ -145,160 +145,15 @@ func GetLotterConfById(id int32) (data *cfg.GameLotteryData) {
|
||||
}
|
||||
return
|
||||
}
|
||||
func GetGroupDataByLottery(lotteryId int32) (items []*cfg.Gameatn) {
|
||||
|
||||
if _, ok := _lotteryType1[lotteryId]; !ok {
|
||||
if _, ok := _lotteryType2[lotteryId]; !ok {
|
||||
fmt.Printf("not found config lotterId:%d", lotteryId)
|
||||
return
|
||||
}
|
||||
}
|
||||
// 优先校验大组ID 的类型
|
||||
//if this.Btype[lotteryId] == 1 { // 该大组中的小组为权重掉落，必定从N个小组中随机出1个小组
|
||||
var (
|
||||
szW []int32 // 权重数组
|
||||
szID []int32 // 小组ID 数组
|
||||
groupID int32
|
||||
gourp map[int32]int32 // key 小组ID value 权重
|
||||
)
|
||||
|
||||
gourp = make(map[int32]int32, 0)
|
||||
// 随机小组id
|
||||
for _, v := range _lotteryType1[lotteryId] {
|
||||
if _data := GetLotterConfById(v); _data != nil {
|
||||
if _, ok := gourp[_data.Groupid]; !ok {
|
||||
gourp[_data.Groupid] = _data.Groupwt // 小组ID 权重赋值
|
||||
szW = append(szW, _data.Groupwt)
|
||||
szID = append(szID, _data.Groupid)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
groupID = szID[comm.GetRandW(szW)] // 获得小组ID
|
||||
//fmt.Printf("大组类型为1的,获得小组ID :%d，dropID：%d", groupID, lotteryId)
|
||||
key := int64(lotteryId)<<31 + int64(groupID)
|
||||
// 小组ID 类型判断
|
||||
if Stype[key] == 1 { // 该小组的道具为权重掉落，必定从N个道具中随机出1个道具
|
||||
for i := 0; i < int(SNum[key]); i++ {
|
||||
szW = make([]int32, 0)
|
||||
szID = make([]int32, 0)
|
||||
gourp = make(map[int32]int32, 0)
|
||||
for _, v := range _groupType1[key] {
|
||||
if _data := GetLotterConfById(v); _data != nil { // 权重赋值
|
||||
if _, ok := gourp[_data.Groupid]; !ok {
|
||||
szW = append(szW, _data.Itemwt)
|
||||
szID = append(szID, _data.Id)
|
||||
}
|
||||
}
|
||||
}
|
||||
index := comm.GetRandW(szW)
|
||||
_data := GetLotterConfById(szID[index])
|
||||
//fmt.Printf("获得最终的道具 :%d", _data.Id)
|
||||
count := comm.GetRandNum(_data.Min, _data.Max)
|
||||
// 随机获得的数量
|
||||
items = append(items, &cfg.Gameatn{
|
||||
A: _data.Itemid.A,
|
||||
T: _data.Itemid.T,
|
||||
N: _data.Itemid.N * count,
|
||||
})
|
||||
}
|
||||
|
||||
} else if Stype[key] == 2 { // 该小组中的道具为概率掉落，每个道具都会随机一次是否会掉落（单位为千分比）
|
||||
var wt int32
|
||||
for _, v := range _groupType2[key] {
|
||||
if _data := GetLotterConfById(v); _data != nil { // 权重赋值
|
||||
if _data.Itemwt != 0 {
|
||||
wt = _data.Itemwt
|
||||
}
|
||||
if wt >= comm.GetRandNum(0, 1000) { // 命中
|
||||
count := comm.GetRandNum(_data.Min, _data.Max)
|
||||
items = append(items, &cfg.Gameatn{
|
||||
A: _data.Itemid.A,
|
||||
T: _data.Itemid.T,
|
||||
N: _data.Itemid.N * count, // 小组产出数量
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
//}
|
||||
//if this.Btype[lotteryId] == 2 { // 该大组中的小组为概率掉落，每个小组都会随机一次是否会掉落（单位为千分比）
|
||||
// 每个小组id 都随机取一次
|
||||
var szGroupID []int32 // 获得的权重数组
|
||||
gourp1 := make([]*cfg.GameLotteryData, 0) // key 小组ID value 权重
|
||||
for _, v := range _lotteryType2[lotteryId] {
|
||||
if _data := GetLotterConfById(v); _data != nil {
|
||||
gourp1 = append(gourp1, _data)
|
||||
}
|
||||
}
|
||||
// 过滤 group
|
||||
var wt int32
|
||||
// 类型为2 可能会同时获得多个组id
|
||||
for _, v := range gourp1 {
|
||||
k := v.Groupid
|
||||
if v.Groupwt != 0 {
|
||||
wt = v.Groupwt
|
||||
}
|
||||
//fmt.Printf("大组类型为2的,获得小组ID :%d,dropID:%d", k, v.Id)
|
||||
if wt >= comm.GetRandNum(0, 1000) { // 命中
|
||||
szGroupID = append(szGroupID, k)
|
||||
key := int64(lotteryId)<<31 + int64(k)
|
||||
if Stype[key] == 1 { // 随机一组数据
|
||||
for i := 0; i < int(SNum[key]); i++ {
|
||||
szW := make([]int32, 0)
|
||||
szID := make([]int32, 0)
|
||||
gourp := make(map[int32]int32, 0)
|
||||
for _, v := range _groupType1[key] {
|
||||
if _data := GetLotterConfById(v); _data != nil { // 权重赋值
|
||||
if _, ok := gourp[_data.Groupid]; !ok {
|
||||
szW = append(szW, _data.Itemwt)
|
||||
szID = append(szID, _data.Id)
|
||||
}
|
||||
}
|
||||
}
|
||||
index := comm.GetRandW(szW)
|
||||
_data := GetLotterConfById(szID[index])
|
||||
//fmt.Printf("获得最终的道具 :%d", _data.Id)
|
||||
count := comm.GetRandNum(_data.Min, _data.Max)
|
||||
// 随机获得的数量
|
||||
items = append(items, &cfg.Gameatn{
|
||||
A: _data.Itemid.A,
|
||||
T: _data.Itemid.T,
|
||||
N: _data.Itemid.N * count,
|
||||
})
|
||||
}
|
||||
} else if Stype[key] == 2 {
|
||||
var wt int32
|
||||
for _, v := range _groupType2[key] {
|
||||
if _data := GetLotterConfById(v); _data != nil { // 权重赋值
|
||||
if _data.Itemwt != 0 {
|
||||
wt = _data.Itemwt
|
||||
}
|
||||
if wt >= comm.GetRandNum(1, 1000) { // 命中
|
||||
count := comm.GetRandNum(_data.Min, _data.Max)
|
||||
items = append(items, &cfg.Gameatn{
|
||||
A: _data.Itemid.A,
|
||||
T: _data.Itemid.T,
|
||||
N: _data.Itemid.N * count, // 小组产出数量
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
//}
|
||||
return
|
||||
}
|
||||
func LoadConfigure(name string, fn interface{}) (err error) {
|
||||
return configure.RegisterConfigure(name, fn, nil)
|
||||
}
|
||||
func Test_Main(t *testing.T) {
|
||||
LoadConfigure(game_lottery, cfg.NewGameLottery)
|
||||
GetGroupDataByLottery(1001)
|
||||
|
||||
sz := make(map[string]*pb.DBHero)
|
||||
fmt.Printf("%v", sz["1"])
|
||||
hero := &pb.DBHero{}
|
||||
|
||||
value, err := strconv.Atoi("944005411")
|
||||
fmt.Printf("%v,%v,%d", value, err, utils.WeekIntervalTime())
|
||||
fmt.Printf("%v,%v,%d,%v,%v", value, err, utils.WeekIntervalTime(), sz, hero)
|
||||
ids := utils.RandomNumbers(0, 10, 5)
|
||||
for _, v := range ids {
|
||||
fmt.Printf("%d", v)
|
||||
@ -344,11 +199,7 @@ func Test_Main(t *testing.T) {
|
||||
fmt.Println(getA, getA2, typeofA)
|
||||
|
||||
cron.AddFunc("0 0 5 /* * ?", TimerStar) //每月第一天5点执行一次
|
||||
sz := make([]string, 0)
|
||||
for i := 0; i < 10; i++ {
|
||||
sz = append(sz, "1")
|
||||
}
|
||||
sz[len(sz)-1] = "xxxx"
|
||||
|
||||
//创建trace文件
|
||||
f, err := os.Create("trace.out")
|
||||
if err != nil {
|
||||
|
||||
@ -3,6 +3,7 @@ package stonehenge
|
||||
import (
|
||||
"go_dreamfactory/comm"
|
||||
"go_dreamfactory/pb"
|
||||
cfg "go_dreamfactory/sys/configure/structs"
|
||||
)
|
||||
|
||||
//参数校验
|
||||
@ -18,6 +19,7 @@ func (this *apiComp) Finish(session comm.IUserSession, req *pb.StonehengeFinishR
|
||||
update map[string]interface{}
|
||||
err error
|
||||
curintegral int32
|
||||
atno []*pb.UserAtno
|
||||
)
|
||||
update = make(map[string]interface{})
|
||||
if errdata = this.FinishCheck(session, req); errdata != nil {
|
||||
@ -33,15 +35,16 @@ func (this *apiComp) Finish(session comm.IUserSession, req *pb.StonehengeFinishR
|
||||
return
|
||||
}
|
||||
|
||||
// 发放积分 和奖励
|
||||
|
||||
if conf := this.module.configure.GetStageConfByStageid(stone.StageID, stone.CurRoomIndes); conf != nil {
|
||||
stone.Integral += conf.WeeklyPoint
|
||||
stone.Integral += conf.WeeklyPoint // 发放积分 和奖励
|
||||
update["integral"] = stone.Integral
|
||||
curintegral = conf.WeeklyPoint
|
||||
// if errdata, atno = this.module.DispenseAtno(session, conf.FirstReward, true); errdata != nil {
|
||||
// return
|
||||
// }
|
||||
// 再发天赋奖励
|
||||
if errdata, atno = this.module.DispenseAtno(session, []*cfg.Gameatn{conf.TalentItem}, true); errdata != nil {
|
||||
return
|
||||
}
|
||||
}
|
||||
|
||||
stone.StageID = 0
|
||||
update["stageID"] = stone.StageID
|
||||
stone.CurRoomIndes = 0
|
||||
@ -63,6 +66,7 @@ func (this *apiComp) Finish(session comm.IUserSession, req *pb.StonehengeFinishR
|
||||
session.SendMsg(string(this.module.GetType()), "finish", &pb.StonehengeFinishResp{
|
||||
Data: stone,
|
||||
Curintegral: curintegral,
|
||||
Reward: atno,
|
||||
})
|
||||
return
|
||||
}
|
||||
|
||||
@ -56,6 +56,25 @@ func (this *apiComp) GetList(session comm.IUserSession, req *pb.StonehengeGetLis
|
||||
update["weeklyreward"] = stone.Weeklyreward
|
||||
this.module.modelStonehenge.ChangeStonehengeData(session.GetUserId(), update)
|
||||
}
|
||||
if len(stone.Webuff) == 0 || len(stone.Enemybuff) == 0 {
|
||||
if stage := this.module.modelStonehenge.GetStoneBoosData(stone.StageID); stage != nil {
|
||||
for _, v := range stage.Mainebuff { // 我方环境buff
|
||||
if buff, err := this.module.configure.GetStoneBuffDataById(v); err == nil {
|
||||
stone.Webuff = append(stone.Webuff, buff.BuffId)
|
||||
}
|
||||
}
|
||||
|
||||
for _, v := range stage.Enemybuff { // 敌方环境buff
|
||||
if buff, err := this.module.configure.GetStoneBuffDataById(v); err == nil {
|
||||
stone.Enemybuff = append(stone.Enemybuff, buff.BuffId)
|
||||
}
|
||||
}
|
||||
update := make(map[string]interface{}, 0)
|
||||
update["webuff"] = stone.Webuff
|
||||
update["enemybuff"] = stone.Enemybuff
|
||||
this.module.modelStonehenge.ChangeStonehengeData(session.GetUserId(), update)
|
||||
}
|
||||
}
|
||||
|
||||
session.SendMsg(string(this.module.GetType()), "getlist", &pb.StonehengeGetListResp{
|
||||
Data: stone,
|
||||
|
||||
@ -380,20 +380,21 @@ func (this *ModelUser) ChangeLevel(event interface{}, next func(event interface{
|
||||
func (this *ModelUser) AddUserProfit(uid string, score int64) (err error) {
|
||||
var (
|
||||
model *db.DBModel
|
||||
value map[string]interface{}
|
||||
update map[string]interface{}
|
||||
)
|
||||
if score < 0 {
|
||||
return
|
||||
}
|
||||
user := &pb.DBUser{}
|
||||
value["profit"] = score
|
||||
update = make(map[string]interface{}, 0)
|
||||
update["profit"] = score
|
||||
if db.IsCross() {
|
||||
if model, err = this.module.GetDBModelByUid(uid, this.TableName); err == nil {
|
||||
if err := this.Get(uid, user); err != nil {
|
||||
this.module.Errorf("err:%v", err)
|
||||
}
|
||||
value["profit"] = user.Profit + score
|
||||
return model.Change(uid, value)
|
||||
update["profit"] = user.Profit + score
|
||||
return model.Change(uid, update)
|
||||
} else {
|
||||
this.module.Errorln(err)
|
||||
return err
|
||||
@ -403,10 +404,10 @@ func (this *ModelUser) AddUserProfit(uid string, score int64) (err error) {
|
||||
if err := this.Get(uid, user); err != nil {
|
||||
this.module.Errorf("err:%v", err)
|
||||
}
|
||||
value["profit"] = user.Profit + score
|
||||
update["profit"] = user.Profit + score
|
||||
}
|
||||
|
||||
return this.Change(uid, value)
|
||||
return this.Change(uid, update)
|
||||
|
||||
}
|
||||
|
||||
|
||||
@ -643,6 +643,7 @@ type StonehengeFinishResp struct {
|
||||
|
||||
Data *DBStonehenge `protobuf:"bytes,1,opt,name=data,proto3" json:"data"`
|
||||
Curintegral int32 `protobuf:"varint,2,opt,name=curintegral,proto3" json:"curintegral"`
|
||||
Reward []*UserAtno `protobuf:"bytes,4,rep,name=reward,proto3" json:"reward"` // 完成事件获得的奖励
|
||||
}
|
||||
|
||||
func (x *StonehengeFinishResp) Reset() {
|
||||
@ -691,6 +692,13 @@ func (x *StonehengeFinishResp) GetCurintegral() int32 {
|
||||
return 0
|
||||
}
|
||||
|
||||
func (x *StonehengeFinishResp) GetReward() []*UserAtno {
|
||||
if x != nil {
|
||||
return x.Reward
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
// 战斗事件
|
||||
type StonehengeBattleReq struct {
|
||||
state protoimpl.MessageState
|
||||
@ -1558,110 +1566,112 @@ var file_stonehenge_stonehenge_msg_proto_rawDesc = []byte{
|
||||
0x0a, 0x04, 0x72, 0x6f, 0x6f, 0x6d, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x52,
|
||||
0x6f, 0x6f, 0x6d, 0x44, 0x61, 0x74, 0x61, 0x52, 0x04, 0x72, 0x6f, 0x6f, 0x6d, 0x22, 0x15, 0x0a,
|
||||
0x13, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x46, 0x69, 0x6e, 0x69, 0x73,
|
||||
0x68, 0x52, 0x65, 0x71, 0x22, 0x5b, 0x0a, 0x14, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e,
|
||||
0x68, 0x52, 0x65, 0x71, 0x22, 0x7e, 0x0a, 0x14, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e,
|
||||
0x67, 0x65, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x52, 0x65, 0x73, 0x70, 0x12, 0x21, 0x0a, 0x04,
|
||||
0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x44, 0x42, 0x53,
|
||||
0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x12,
|
||||
0x20, 0x0a, 0x0b, 0x63, 0x75, 0x72, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x18, 0x02,
|
||||
0x20, 0x01, 0x28, 0x05, 0x52, 0x0b, 0x63, 0x75, 0x72, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61,
|
||||
0x6c, 0x22, 0x59, 0x0a, 0x13, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x42,
|
||||
0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x65, 0x71, 0x12, 0x18, 0x0a, 0x07, 0x65, 0x76, 0x65, 0x6e,
|
||||
0x74, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x65, 0x76, 0x65, 0x6e, 0x74,
|
||||
0x69, 0x64, 0x12, 0x28, 0x0a, 0x06, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x18, 0x02, 0x20, 0x01,
|
||||
0x28, 0x0b, 0x32, 0x10, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x6f, 0x72, 0x6d, 0x61,
|
||||
0x74, 0x69, 0x6f, 0x6e, 0x52, 0x06, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x22, 0x51, 0x0a, 0x14,
|
||||
0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65,
|
||||
0x52, 0x65, 0x73, 0x70, 0x12, 0x18, 0x0a, 0x07, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x69, 0x64, 0x18,
|
||||
0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x69, 0x64, 0x12, 0x1f,
|
||||
0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x42,
|
||||
0x61, 0x74, 0x74, 0x6c, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22,
|
||||
0x52, 0x0a, 0x12, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x53, 0x74, 0x6f,
|
||||
0x72, 0x79, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x63, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01,
|
||||
0x28, 0x05, 0x52, 0x03, 0x63, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x70, 0x6f, 0x73, 0x18, 0x02,
|
||||
0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x70, 0x6f, 0x73, 0x12, 0x18, 0x0a, 0x07, 0x65, 0x76, 0x65,
|
||||
0x6e, 0x74, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x65, 0x76, 0x65, 0x6e,
|
||||
0x74, 0x69, 0x64, 0x22, 0x66, 0x0a, 0x13, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67,
|
||||
0x65, 0x53, 0x74, 0x6f, 0x72, 0x79, 0x52, 0x65, 0x73, 0x70, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x74,
|
||||
0x6f, 0x72, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x73, 0x74, 0x6f, 0x72, 0x79,
|
||||
0x12, 0x1a, 0x0a, 0x08, 0x6e, 0x65, 0x77, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01,
|
||||
0x28, 0x05, 0x52, 0x08, 0x6e, 0x65, 0x77, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x12, 0x1d, 0x0a, 0x04,
|
||||
0x72, 0x6f, 0x6f, 0x6d, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x52, 0x6f, 0x6f,
|
||||
0x6d, 0x44, 0x61, 0x74, 0x61, 0x52, 0x04, 0x72, 0x6f, 0x6f, 0x6d, 0x22, 0x2e, 0x0a, 0x12, 0x53,
|
||||
0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x53, 0x74, 0x6f, 0x72, 0x65, 0x52, 0x65,
|
||||
0x71, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x74, 0x6f, 0x72, 0x65, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01,
|
||||
0x28, 0x05, 0x52, 0x07, 0x73, 0x74, 0x6f, 0x72, 0x65, 0x49, 0x64, 0x22, 0x9c, 0x01, 0x0a, 0x13,
|
||||
0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x53, 0x74, 0x6f, 0x72, 0x65, 0x52,
|
||||
0x65, 0x73, 0x70, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x74, 0x6f, 0x72, 0x65, 0x49, 0x64, 0x18, 0x01,
|
||||
0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x73, 0x74, 0x6f, 0x72, 0x65, 0x49, 0x64, 0x12, 0x32, 0x0a,
|
||||
0x04, 0x73, 0x68, 0x6f, 0x70, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x53, 0x74,
|
||||
0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x53, 0x74, 0x6f, 0x72, 0x65, 0x52, 0x65, 0x73,
|
||||
0x70, 0x2e, 0x53, 0x68, 0x6f, 0x70, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x04, 0x73, 0x68, 0x6f,
|
||||
0x70, 0x1a, 0x37, 0x0a, 0x09, 0x53, 0x68, 0x6f, 0x70, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10,
|
||||
0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 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, 0x31, 0x0a, 0x1b, 0x53, 0x74,
|
||||
0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x41, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x65,
|
||||
0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x71, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x6f, 0x64,
|
||||
0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x6e, 0x6f, 0x64, 0x65, 0x22, 0x82, 0x03,
|
||||
0x0a, 0x1c, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x41, 0x63, 0x74, 0x69,
|
||||
0x76, 0x61, 0x74, 0x65, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x12,
|
||||
0x0a, 0x04, 0x6e, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x6e, 0x6f,
|
||||
0x64, 0x65, 0x12, 0x41, 0x0a, 0x06, 0x74, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x03,
|
||||
0x28, 0x0b, 0x32, 0x29, 0x2e, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x41,
|
||||
0x6c, 0x12, 0x21, 0x0a, 0x06, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x18, 0x04, 0x20, 0x03, 0x28,
|
||||
0x0b, 0x32, 0x09, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x74, 0x6e, 0x6f, 0x52, 0x06, 0x72, 0x65,
|
||||
0x77, 0x61, 0x72, 0x64, 0x22, 0x59, 0x0a, 0x13, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e,
|
||||
0x67, 0x65, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x65, 0x71, 0x12, 0x18, 0x0a, 0x07, 0x65,
|
||||
0x76, 0x65, 0x6e, 0x74, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x65, 0x76,
|
||||
0x65, 0x6e, 0x74, 0x69, 0x64, 0x12, 0x28, 0x0a, 0x06, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x18,
|
||||
0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x6f,
|
||||
0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x06, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x22,
|
||||
0x51, 0x0a, 0x14, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x42, 0x61, 0x74,
|
||||
0x74, 0x6c, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x18, 0x0a, 0x07, 0x65, 0x76, 0x65, 0x6e, 0x74,
|
||||
0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x69,
|
||||
0x64, 0x12, 0x1f, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32,
|
||||
0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x69, 0x6e,
|
||||
0x66, 0x6f, 0x22, 0x52, 0x0a, 0x12, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65,
|
||||
0x53, 0x74, 0x6f, 0x72, 0x79, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x63, 0x69, 0x64, 0x18,
|
||||
0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x63, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x70, 0x6f,
|
||||
0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x70, 0x6f, 0x73, 0x12, 0x18, 0x0a, 0x07,
|
||||
0x65, 0x76, 0x65, 0x6e, 0x74, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x65,
|
||||
0x76, 0x65, 0x6e, 0x74, 0x69, 0x64, 0x22, 0x66, 0x0a, 0x13, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68,
|
||||
0x65, 0x6e, 0x67, 0x65, 0x53, 0x74, 0x6f, 0x72, 0x79, 0x52, 0x65, 0x73, 0x70, 0x12, 0x14, 0x0a,
|
||||
0x05, 0x73, 0x74, 0x6f, 0x72, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x73, 0x74,
|
||||
0x6f, 0x72, 0x79, 0x12, 0x1a, 0x0a, 0x08, 0x6e, 0x65, 0x77, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x18,
|
||||
0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x6e, 0x65, 0x77, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x12,
|
||||
0x1d, 0x0a, 0x04, 0x72, 0x6f, 0x6f, 0x6d, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x09, 0x2e,
|
||||
0x52, 0x6f, 0x6f, 0x6d, 0x44, 0x61, 0x74, 0x61, 0x52, 0x04, 0x72, 0x6f, 0x6f, 0x6d, 0x22, 0x2e,
|
||||
0x0a, 0x12, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x53, 0x74, 0x6f, 0x72,
|
||||
0x65, 0x52, 0x65, 0x71, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x74, 0x6f, 0x72, 0x65, 0x49, 0x64, 0x18,
|
||||
0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x73, 0x74, 0x6f, 0x72, 0x65, 0x49, 0x64, 0x22, 0x9c,
|
||||
0x01, 0x0a, 0x13, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x53, 0x74, 0x6f,
|
||||
0x72, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x74, 0x6f, 0x72, 0x65, 0x49,
|
||||
0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x73, 0x74, 0x6f, 0x72, 0x65, 0x49, 0x64,
|
||||
0x12, 0x32, 0x0a, 0x04, 0x73, 0x68, 0x6f, 0x70, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1e,
|
||||
0x2e, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x53, 0x74, 0x6f, 0x72, 0x65,
|
||||
0x52, 0x65, 0x73, 0x70, 0x2e, 0x53, 0x68, 0x6f, 0x70, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x04,
|
||||
0x73, 0x68, 0x6f, 0x70, 0x1a, 0x37, 0x0a, 0x09, 0x53, 0x68, 0x6f, 0x70, 0x45, 0x6e, 0x74, 0x72,
|
||||
0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 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, 0x31, 0x0a,
|
||||
0x1b, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x41, 0x63, 0x74, 0x69, 0x76,
|
||||
0x61, 0x74, 0x65, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x71, 0x12, 0x12, 0x0a, 0x04,
|
||||
0x6e, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x6e, 0x6f, 0x64, 0x65,
|
||||
0x22, 0x82, 0x03, 0x0a, 0x1c, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x41,
|
||||
0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x65, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x73,
|
||||
0x70, 0x2e, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x06, 0x74,
|
||||
0x61, 0x6c, 0x65, 0x6e, 0x74, 0x12, 0x59, 0x0a, 0x0e, 0x74, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x70,
|
||||
0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x31, 0x2e,
|
||||
0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x41, 0x63, 0x74, 0x69, 0x76, 0x61,
|
||||
0x74, 0x65, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x73, 0x70, 0x2e, 0x54, 0x61, 0x6c,
|
||||
0x65, 0x6e, 0x74, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x45, 0x6e, 0x74, 0x72, 0x79,
|
||||
0x52, 0x0e, 0x74, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79,
|
||||
0x12, 0x32, 0x0a, 0x09, 0x70, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x18, 0x04, 0x20,
|
||||
0x03, 0x28, 0x0e, 0x32, 0x14, 0x2e, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65,
|
||||
0x50, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x52, 0x09, 0x70, 0x72, 0x69, 0x76, 0x69,
|
||||
0x6c, 0x65, 0x67, 0x65, 0x1a, 0x39, 0x0a, 0x0b, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x45, 0x6e,
|
||||
0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05,
|
||||
0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02,
|
||||
0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a,
|
||||
0x41, 0x0a, 0x13, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74,
|
||||
0x79, 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, 0x17, 0x0a, 0x15, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65,
|
||||
0x42, 0x6f, 0x6f, 0x6b, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x71, 0x22, 0x3f, 0x0a, 0x16, 0x53,
|
||||
0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x42, 0x6f, 0x6f, 0x6b, 0x49, 0x6e, 0x66,
|
||||
0x6f, 0x52, 0x65, 0x73, 0x70, 0x12, 0x25, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20,
|
||||
0x01, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x44, 0x42, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e,
|
||||
0x67, 0x65, 0x42, 0x6f, 0x6f, 0x6b, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22, 0x44, 0x0a, 0x16,
|
||||
0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x42, 0x6f, 0x6f, 0x6b, 0x41, 0x77,
|
||||
0x61, 0x72, 0x64, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x62, 0x74, 0x79, 0x70, 0x65, 0x18,
|
||||
0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x62, 0x74, 0x79, 0x70, 0x65, 0x12, 0x14, 0x0a, 0x05,
|
||||
0x73, 0x74, 0x61, 0x67, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x73, 0x74, 0x61,
|
||||
0x67, 0x65, 0x22, 0x68, 0x0a, 0x17, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65,
|
||||
0x42, 0x6f, 0x6f, 0x6b, 0x41, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x14, 0x0a,
|
||||
0x05, 0x62, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x62, 0x74,
|
||||
0x79, 0x70, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x74, 0x61, 0x67, 0x65, 0x18, 0x02, 0x20, 0x01,
|
||||
0x28, 0x05, 0x52, 0x05, 0x73, 0x74, 0x61, 0x67, 0x65, 0x12, 0x21, 0x0a, 0x05, 0x61, 0x77, 0x61,
|
||||
0x72, 0x64, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41,
|
||||
0x73, 0x73, 0x65, 0x74, 0x73, 0x52, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x22, 0x28, 0x0a, 0x16,
|
||||
0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x57, 0x65, 0x65, 0x6b, 0x41, 0x77,
|
||||
0x61, 0x72, 0x64, 0x52, 0x65, 0x71, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01,
|
||||
0x28, 0x05, 0x52, 0x02, 0x69, 0x64, 0x22, 0xdd, 0x01, 0x0a, 0x17, 0x53, 0x74, 0x6f, 0x6e, 0x65,
|
||||
0x68, 0x65, 0x6e, 0x67, 0x65, 0x57, 0x65, 0x65, 0x6b, 0x41, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65,
|
||||
0x73, 0x70, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02,
|
||||
0x69, 0x64, 0x12, 0x4e, 0x0a, 0x0c, 0x77, 0x65, 0x65, 0x6b, 0x6c, 0x79, 0x72, 0x65, 0x77, 0x61,
|
||||
0x72, 0x64, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x2a, 0x2e, 0x53, 0x74, 0x6f, 0x6e, 0x65,
|
||||
0x68, 0x65, 0x6e, 0x67, 0x65, 0x57, 0x65, 0x65, 0x6b, 0x41, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65,
|
||||
0x73, 0x70, 0x2e, 0x57, 0x65, 0x65, 0x6b, 0x6c, 0x79, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x45,
|
||||
0x6e, 0x74, 0x72, 0x79, 0x52, 0x0c, 0x77, 0x65, 0x65, 0x6b, 0x6c, 0x79, 0x72, 0x65, 0x77, 0x61,
|
||||
0x72, 0x64, 0x12, 0x21, 0x0a, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x18, 0x03, 0x20, 0x03, 0x28,
|
||||
0x0b, 0x32, 0x0b, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x73, 0x73, 0x65, 0x74, 0x73, 0x52, 0x05,
|
||||
0x61, 0x77, 0x61, 0x72, 0x64, 0x1a, 0x3f, 0x0a, 0x11, 0x57, 0x65, 0x65, 0x6b, 0x6c, 0x79, 0x72,
|
||||
0x65, 0x77, 0x61, 0x72, 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65,
|
||||
0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05,
|
||||
0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x76, 0x61, 0x6c,
|
||||
0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06,
|
||||
0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
|
||||
0x70, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52,
|
||||
0x04, 0x6e, 0x6f, 0x64, 0x65, 0x12, 0x41, 0x0a, 0x06, 0x74, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x18,
|
||||
0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x29, 0x2e, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e,
|
||||
0x67, 0x65, 0x41, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x65, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74,
|
||||
0x52, 0x65, 0x73, 0x70, 0x2e, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x45, 0x6e, 0x74, 0x72, 0x79,
|
||||
0x52, 0x06, 0x74, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x12, 0x59, 0x0a, 0x0e, 0x74, 0x61, 0x6c, 0x65,
|
||||
0x6e, 0x74, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b,
|
||||
0x32, 0x31, 0x2e, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x41, 0x63, 0x74,
|
||||
0x69, 0x76, 0x61, 0x74, 0x65, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x73, 0x70, 0x2e,
|
||||
0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x45, 0x6e,
|
||||
0x74, 0x72, 0x79, 0x52, 0x0e, 0x74, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x70, 0x72, 0x6f, 0x70, 0x65,
|
||||
0x72, 0x74, 0x79, 0x12, 0x32, 0x0a, 0x09, 0x70, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65,
|
||||
0x18, 0x04, 0x20, 0x03, 0x28, 0x0e, 0x32, 0x14, 0x2e, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65,
|
||||
0x6e, 0x67, 0x65, 0x50, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x52, 0x09, 0x70, 0x72,
|
||||
0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x1a, 0x39, 0x0a, 0x0b, 0x54, 0x61, 0x6c, 0x65, 0x6e,
|
||||
0x74, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20,
|
||||
0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75,
|
||||
0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02,
|
||||
0x38, 0x01, 0x1a, 0x41, 0x0a, 0x13, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x70, 0x72, 0x6f, 0x70,
|
||||
0x65, 0x72, 0x74, 0x79, 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, 0x17, 0x0a, 0x15, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65,
|
||||
0x6e, 0x67, 0x65, 0x42, 0x6f, 0x6f, 0x6b, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x71, 0x22, 0x3f,
|
||||
0x0a, 0x16, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x42, 0x6f, 0x6f, 0x6b,
|
||||
0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x73, 0x70, 0x12, 0x25, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f,
|
||||
0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x44, 0x42, 0x53, 0x74, 0x6f, 0x6e, 0x65,
|
||||
0x68, 0x65, 0x6e, 0x67, 0x65, 0x42, 0x6f, 0x6f, 0x6b, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22,
|
||||
0x44, 0x0a, 0x16, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x42, 0x6f, 0x6f,
|
||||
0x6b, 0x41, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x62, 0x74, 0x79,
|
||||
0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x62, 0x74, 0x79, 0x70, 0x65, 0x12,
|
||||
0x14, 0x0a, 0x05, 0x73, 0x74, 0x61, 0x67, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05,
|
||||
0x73, 0x74, 0x61, 0x67, 0x65, 0x22, 0x68, 0x0a, 0x17, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65,
|
||||
0x6e, 0x67, 0x65, 0x42, 0x6f, 0x6f, 0x6b, 0x41, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70,
|
||||
0x12, 0x14, 0x0a, 0x05, 0x62, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52,
|
||||
0x05, 0x62, 0x74, 0x79, 0x70, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x74, 0x61, 0x67, 0x65, 0x18,
|
||||
0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x73, 0x74, 0x61, 0x67, 0x65, 0x12, 0x21, 0x0a, 0x05,
|
||||
0x61, 0x77, 0x61, 0x72, 0x64, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x55, 0x73,
|
||||
0x65, 0x72, 0x41, 0x73, 0x73, 0x65, 0x74, 0x73, 0x52, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x22,
|
||||
0x28, 0x0a, 0x16, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x57, 0x65, 0x65,
|
||||
0x6b, 0x41, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x71, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18,
|
||||
0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x69, 0x64, 0x22, 0xdd, 0x01, 0x0a, 0x17, 0x53, 0x74,
|
||||
0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x57, 0x65, 0x65, 0x6b, 0x41, 0x77, 0x61, 0x72,
|
||||
0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28,
|
||||
0x05, 0x52, 0x02, 0x69, 0x64, 0x12, 0x4e, 0x0a, 0x0c, 0x77, 0x65, 0x65, 0x6b, 0x6c, 0x79, 0x72,
|
||||
0x65, 0x77, 0x61, 0x72, 0x64, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x2a, 0x2e, 0x53, 0x74,
|
||||
0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x57, 0x65, 0x65, 0x6b, 0x41, 0x77, 0x61, 0x72,
|
||||
0x64, 0x52, 0x65, 0x73, 0x70, 0x2e, 0x57, 0x65, 0x65, 0x6b, 0x6c, 0x79, 0x72, 0x65, 0x77, 0x61,
|
||||
0x72, 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0c, 0x77, 0x65, 0x65, 0x6b, 0x6c, 0x79, 0x72,
|
||||
0x65, 0x77, 0x61, 0x72, 0x64, 0x12, 0x21, 0x0a, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x18, 0x03,
|
||||
0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x73, 0x73, 0x65, 0x74,
|
||||
0x73, 0x52, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x1a, 0x3f, 0x0a, 0x11, 0x57, 0x65, 0x65, 0x6b,
|
||||
0x6c, 0x79, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a,
|
||||
0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12,
|
||||
0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05,
|
||||
0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70,
|
||||
0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
|
||||
}
|
||||
|
||||
var (
|
||||
@ -1736,24 +1746,25 @@ var file_stonehenge_stonehenge_msg_proto_depIdxs = []int32{
|
||||
28, // 9: StonehengeEventResp.userbuff:type_name -> StonehengeEventResp.UserbuffEntry
|
||||
35, // 10: StonehengeGetRoomInfoResp.room:type_name -> RoomData
|
||||
33, // 11: StonehengeFinishResp.data:type_name -> DBStonehenge
|
||||
38, // 12: StonehengeBattleReq.battle:type_name -> BattleFormation
|
||||
39, // 13: StonehengeBattleResp.info:type_name -> BattleInfo
|
||||
35, // 14: StonehengeStoryResp.room:type_name -> RoomData
|
||||
29, // 15: StonehengeStoreResp.shop:type_name -> StonehengeStoreResp.ShopEntry
|
||||
30, // 16: StonehengeActivateTalentResp.talent:type_name -> StonehengeActivateTalentResp.TalentEntry
|
||||
31, // 17: StonehengeActivateTalentResp.talentproperty:type_name -> StonehengeActivateTalentResp.TalentpropertyEntry
|
||||
40, // 18: StonehengeActivateTalentResp.privilege:type_name -> StonehengePrivilege
|
||||
41, // 19: StonehengeBookInfoResp.info:type_name -> DBStonehengeBook
|
||||
42, // 20: StonehengeBookAwardResp.award:type_name -> UserAssets
|
||||
32, // 21: StonehengeWeekAwardResp.weeklyreward:type_name -> StonehengeWeekAwardResp.WeeklyrewardEntry
|
||||
42, // 22: StonehengeWeekAwardResp.award:type_name -> UserAssets
|
||||
43, // 23: StonehengeEnterLevelResp.HeroEntry.value:type_name -> BattleRole
|
||||
43, // 24: StonehengeEventResp.HeroEntry.value:type_name -> BattleRole
|
||||
25, // [25:25] is the sub-list for method output_type
|
||||
25, // [25:25] is the sub-list for method input_type
|
||||
25, // [25:25] is the sub-list for extension type_name
|
||||
25, // [25:25] is the sub-list for extension extendee
|
||||
0, // [0:25] is the sub-list for field type_name
|
||||
37, // 12: StonehengeFinishResp.reward:type_name -> UserAtno
|
||||
38, // 13: StonehengeBattleReq.battle:type_name -> BattleFormation
|
||||
39, // 14: StonehengeBattleResp.info:type_name -> BattleInfo
|
||||
35, // 15: StonehengeStoryResp.room:type_name -> RoomData
|
||||
29, // 16: StonehengeStoreResp.shop:type_name -> StonehengeStoreResp.ShopEntry
|
||||
30, // 17: StonehengeActivateTalentResp.talent:type_name -> StonehengeActivateTalentResp.TalentEntry
|
||||
31, // 18: StonehengeActivateTalentResp.talentproperty:type_name -> StonehengeActivateTalentResp.TalentpropertyEntry
|
||||
40, // 19: StonehengeActivateTalentResp.privilege:type_name -> StonehengePrivilege
|
||||
41, // 20: StonehengeBookInfoResp.info:type_name -> DBStonehengeBook
|
||||
42, // 21: StonehengeBookAwardResp.award:type_name -> UserAssets
|
||||
32, // 22: StonehengeWeekAwardResp.weeklyreward:type_name -> StonehengeWeekAwardResp.WeeklyrewardEntry
|
||||
42, // 23: StonehengeWeekAwardResp.award:type_name -> UserAssets
|
||||
43, // 24: StonehengeEnterLevelResp.HeroEntry.value:type_name -> BattleRole
|
||||
43, // 25: StonehengeEventResp.HeroEntry.value:type_name -> BattleRole
|
||||
26, // [26:26] is the sub-list for method output_type
|
||||
26, // [26:26] is the sub-list for method input_type
|
||||
26, // [26:26] is the sub-list for extension type_name
|
||||
26, // [26:26] is the sub-list for extension extendee
|
||||
0, // [0:26] is the sub-list for field type_name
|
||||
}
|
||||
|
||||
func init() { file_stonehenge_stonehenge_msg_proto_init() }
|
||||
|
||||
@ -20,6 +20,7 @@ type GameMainStageData struct {
|
||||
Openlevel int32
|
||||
EditorStage int32
|
||||
Venturemodel string
|
||||
Bubbletalk string
|
||||
Venturetype int32
|
||||
Ventureavatar []string
|
||||
Herocolor int32
|
||||
@ -81,6 +82,7 @@ func (_v *GameMainStageData)Deserialize(_buf map[string]interface{}) (err error)
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["openlevel"].(float64); !_ok_ { err = errors.New("openlevel error"); return }; _v.Openlevel = int32(_tempNum_) }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["EditorStage"].(float64); !_ok_ { err = errors.New("EditorStage error"); return }; _v.EditorStage = int32(_tempNum_) }
|
||||
{ var _ok_ bool; if _v.Venturemodel, _ok_ = _buf["venturemodel"].(string); !_ok_ { err = errors.New("venturemodel error"); return } }
|
||||
{var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["bubbletalk"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Bubbletalk error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Bubbletalk, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["venturetype"].(float64); !_ok_ { err = errors.New("venturetype error"); return }; _v.Venturetype = int32(_tempNum_) }
|
||||
{
|
||||
var _arr_ []interface{}
|
||||
|
||||
@ -17,6 +17,7 @@ type GamedrawReplaceData struct {
|
||||
HeroReplace string
|
||||
ReplaceCd int32
|
||||
ReplaceNum int32
|
||||
BuyCos *Gameatn
|
||||
}
|
||||
|
||||
const TypeId_GamedrawReplaceData = 1468145342
|
||||
@ -32,6 +33,7 @@ func (_v *GamedrawReplaceData)Deserialize(_buf map[string]interface{}) (err erro
|
||||
{ var _ok_ bool; if _v.HeroReplace, _ok_ = _buf["hero_replace"].(string); !_ok_ { err = errors.New("hero_replace error"); return } }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["replace_cd"].(float64); !_ok_ { err = errors.New("replace_cd error"); return }; _v.ReplaceCd = int32(_tempNum_) }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["replace_num"].(float64); !_ok_ { err = errors.New("replace_num error"); return }; _v.ReplaceNum = int32(_tempNum_) }
|
||||
{ var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["buy_cos"].(map[string]interface{}); !_ok_ { err = errors.New("buy_cos error"); return }; if _v.BuyCos, err = DeserializeGameatn(_x_); err != nil { return } }
|
||||
return
|
||||
}
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user