diff --git a/bin/json/game_bubblegroup.json b/bin/json/game_bubblegroup.json index 9c366dde0..140c08bb0 100644 --- a/bin/json/game_bubblegroup.json +++ b/bin/json/game_bubblegroup.json @@ -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": "眼光不错，小伙子。" } }, { diff --git a/bin/json/game_buriedtype.json b/bin/json/game_buriedtype.json index 931b7d50f..ee7017f64 100644 --- a/bin/json/game_buriedtype.json +++ b/bin/json/game_buriedtype.json @@ -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": [] } ] \ No newline at end of file diff --git a/bin/json/game_caravancity.json b/bin/json/game_caravancity.json index f52521e08..063a4355b 100644 --- a/bin/json/game_caravancity.json +++ b/bin/json/game_caravancity.json @@ -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, diff --git a/bin/json/game_drawreplace.json b/bin/json/game_drawreplace.json index 9f971df54..7c0df0b1c 100644 --- a/bin/json/game_drawreplace.json +++ b/bin/json/game_drawreplace.json @@ -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 + } } ] \ No newline at end of file diff --git a/bin/json/game_global.json b/bin/json/game_global.json index 1857f07fb..be8160179 100644 --- a/bin/json/game_global.json +++ b/bin/json/game_global.json @@ -747,7 +747,7 @@ "buzkashi_bumpdis": 5, "stamina_potion": 10000003, "fight_ps": 3, - "player_bodychange": 20160, + "player_bodychange": 20180, "mryl_reward": [ { "a": "attr", diff --git a/bin/json/game_item.json b/bin/json/game_item.json index 35e82e6d9..d30b2387e 100644 --- a/bin/json/game_item.json +++ b/bin/json/game_item.json @@ -48,7 +48,7 @@ }, "usetype": 2, "color": 4, - "bagtype": 1, + "bagtype": 3, "index": 99, "special_type": 0, "time": 0, @@ -148,7 +148,7 @@ }, "usetype": 1, "color": 2, - "bagtype": 1, + "bagtype": 3, "index": 99, "special_type": 0, "time": 0, @@ -195,7 +195,7 @@ }, "usetype": 1, "color": 3, - "bagtype": 1, + "bagtype": 3, "index": 99, "special_type": 200, "time": 0, @@ -242,7 +242,7 @@ }, "usetype": 1, "color": 4, - "bagtype": 1, + "bagtype": 3, "index": 99, "special_type": 150, "time": 0, @@ -336,7 +336,7 @@ }, "usetype": 1, "color": 2, - "bagtype": 1, + "bagtype": 3, "index": 99, "special_type": 0, "time": 0, @@ -383,7 +383,7 @@ }, "usetype": 1, "color": 3, - "bagtype": 1, + "bagtype": 3, "index": 99, "special_type": 0, "time": 0, @@ -430,7 +430,7 @@ }, "usetype": 1, "color": 4, - "bagtype": 1, + "bagtype": 3, "index": 99, "special_type": 0, "time": 0, @@ -477,7 +477,7 @@ }, "usetype": 3, "color": 2, - "bagtype": 1, + "bagtype": 3, "index": 100, "special_type": 0, "time": 0, @@ -536,7 +536,7 @@ }, "usetype": 3, "color": 3, - "bagtype": 1, + "bagtype": 3, "index": 101, "special_type": 0, "time": 0, @@ -607,7 +607,7 @@ }, "usetype": 3, "color": 4, - "bagtype": 1, + "bagtype": 3, "index": 102, "special_type": 0, "time": 0, @@ -1041,9 +1041,9 @@ "text": "圣桃" }, "usetype": 1, - "color": 0, + "color": 3, "bagtype": 0, - "index": 0, + "index": 9, "special_type": 0, "time": 0, "reddottype": 0, @@ -1083,7 +1083,7 @@ }, "usetype": 3, "color": 4, - "bagtype": 0, + "bagtype": 2, "index": 2, "special_type": 0, "time": 0, @@ -1128,7 +1128,7 @@ }, "usetype": 3, "color": 2, - "bagtype": 0, + "bagtype": 2, "index": 2, "special_type": 0, "time": 0, @@ -1173,7 +1173,7 @@ }, "usetype": 3, "color": 2, - "bagtype": 0, + "bagtype": 2, "index": 2, "special_type": 0, "time": 0, @@ -1218,7 +1218,7 @@ }, "usetype": 3, "color": 2, - "bagtype": 0, + "bagtype": 2, "index": 2, "special_type": 0, "time": 0, @@ -1263,7 +1263,7 @@ }, "usetype": 3, "color": 2, - "bagtype": 0, + "bagtype": 2, "index": 2, "special_type": 0, "time": 0, @@ -1308,7 +1308,7 @@ }, "usetype": 3, "color": 2, - "bagtype": 0, + "bagtype": 2, "index": 2, "special_type": 0, "time": 0, @@ -1353,7 +1353,7 @@ }, "usetype": 3, "color": 2, - "bagtype": 0, + "bagtype": 2, "index": 2, "special_type": 0, "time": 0, @@ -1398,7 +1398,7 @@ }, "usetype": 3, "color": 2, - "bagtype": 0, + "bagtype": 2, "index": 2, "special_type": 0, "time": 0, @@ -1443,7 +1443,7 @@ }, "usetype": 3, "color": 2, - "bagtype": 0, + "bagtype": 2, "index": 2, "special_type": 0, "time": 0, @@ -1488,7 +1488,7 @@ }, "usetype": 3, "color": 2, - "bagtype": 0, + "bagtype": 2, "index": 2, "special_type": 0, "time": 0, @@ -1533,7 +1533,7 @@ }, "usetype": 3, "color": 2, - "bagtype": 0, + "bagtype": 2, "index": 2, "special_type": 0, "time": 0, @@ -1578,7 +1578,7 @@ }, "usetype": 3, "color": 2, - "bagtype": 0, + "bagtype": 2, "index": 2, "special_type": 0, "time": 0, @@ -1623,7 +1623,7 @@ }, "usetype": 3, "color": 2, - "bagtype": 0, + "bagtype": 2, "index": 2, "special_type": 0, "time": 0, @@ -1668,7 +1668,7 @@ }, "usetype": 3, "color": 2, - "bagtype": 0, + "bagtype": 2, "index": 2, "special_type": 0, "time": 0, @@ -1713,7 +1713,7 @@ }, "usetype": 3, "color": 2, - "bagtype": 0, + "bagtype": 2, "index": 2, "special_type": 0, "time": 0, @@ -1758,7 +1758,7 @@ }, "usetype": 3, "color": 2, - "bagtype": 0, + "bagtype": 2, "index": 2, "special_type": 0, "time": 0, @@ -1803,7 +1803,7 @@ }, "usetype": 3, "color": 2, - "bagtype": 0, + "bagtype": 2, "index": 2, "special_type": 0, "time": 0, @@ -1848,7 +1848,7 @@ }, "usetype": 3, "color": 2, - "bagtype": 0, + "bagtype": 2, "index": 2, "special_type": 0, "time": 0, @@ -1893,7 +1893,7 @@ }, "usetype": 3, "color": 2, - "bagtype": 0, + "bagtype": 2, "index": 2, "special_type": 0, "time": 0, @@ -1938,7 +1938,7 @@ }, "usetype": 3, "color": 2, - "bagtype": 0, + "bagtype": 2, "index": 2, "special_type": 0, "time": 0, @@ -1983,7 +1983,7 @@ }, "usetype": 3, "color": 2, - "bagtype": 0, + "bagtype": 2, "index": 2, "special_type": 0, "time": 0, @@ -2028,7 +2028,7 @@ }, "usetype": 3, "color": 2, - "bagtype": 0, + "bagtype": 2, "index": 2, "special_type": 0, "time": 0, @@ -2073,7 +2073,7 @@ }, "usetype": 3, "color": 2, - "bagtype": 0, + "bagtype": 2, "index": 2, "special_type": 0, "time": 0, @@ -2118,7 +2118,7 @@ }, "usetype": 3, "color": 2, - "bagtype": 0, + "bagtype": 2, "index": 2, "special_type": 0, "time": 0, @@ -2163,7 +2163,7 @@ }, "usetype": 3, "color": 2, - "bagtype": 0, + "bagtype": 2, "index": 2, "special_type": 0, "time": 0, @@ -2208,7 +2208,7 @@ }, "usetype": 3, "color": 2, - "bagtype": 0, + "bagtype": 2, "index": 2, "special_type": 0, "time": 0, @@ -2253,7 +2253,7 @@ }, "usetype": 3, "color": 2, - "bagtype": 0, + "bagtype": 2, "index": 2, "special_type": 0, "time": 0, @@ -2298,7 +2298,7 @@ }, "usetype": 3, "color": 2, - "bagtype": 0, + "bagtype": 2, "index": 2, "special_type": 0, "time": 0, @@ -2343,7 +2343,7 @@ }, "usetype": 3, "color": 2, - "bagtype": 0, + "bagtype": 2, "index": 2, "special_type": 0, "time": 0, @@ -2388,7 +2388,7 @@ }, "usetype": 3, "color": 2, - "bagtype": 0, + "bagtype": 2, "index": 2, "special_type": 0, "time": 0, @@ -2433,7 +2433,7 @@ }, "usetype": 3, "color": 2, - "bagtype": 0, + "bagtype": 2, "index": 2, "special_type": 0, "time": 0, @@ -2478,7 +2478,7 @@ }, "usetype": 3, "color": 2, - "bagtype": 0, + "bagtype": 2, "index": 2, "special_type": 0, "time": 0, @@ -2523,7 +2523,7 @@ }, "usetype": 3, "color": 2, - "bagtype": 0, + "bagtype": 2, "index": 2, "special_type": 0, "time": 0, @@ -2568,7 +2568,7 @@ }, "usetype": 3, "color": 2, - "bagtype": 0, + "bagtype": 2, "index": 2, "special_type": 0, "time": 0, @@ -2613,7 +2613,7 @@ }, "usetype": 3, "color": 2, - "bagtype": 0, + "bagtype": 2, "index": 2, "special_type": 0, "time": 0, @@ -2658,7 +2658,7 @@ }, "usetype": 3, "color": 2, - "bagtype": 0, + "bagtype": 2, "index": 2, "special_type": 0, "time": 0, @@ -2703,7 +2703,7 @@ }, "usetype": 3, "color": 2, - "bagtype": 0, + "bagtype": 2, "index": 2, "special_type": 0, "time": 0, @@ -2748,7 +2748,7 @@ }, "usetype": 3, "color": 2, - "bagtype": 0, + "bagtype": 2, "index": 2, "special_type": 0, "time": 0, @@ -2793,7 +2793,7 @@ }, "usetype": 3, "color": 2, - "bagtype": 0, + "bagtype": 2, "index": 2, "special_type": 0, "time": 0, @@ -2838,7 +2838,7 @@ }, "usetype": 3, "color": 2, - "bagtype": 0, + "bagtype": 2, "index": 2, "special_type": 0, "time": 0, @@ -2883,7 +2883,7 @@ }, "usetype": 3, "color": 2, - "bagtype": 0, + "bagtype": 2, "index": 2, "special_type": 0, "time": 0, @@ -2928,7 +2928,7 @@ }, "usetype": 3, "color": 2, - "bagtype": 0, + "bagtype": 2, "index": 2, "special_type": 0, "time": 0, @@ -2973,7 +2973,7 @@ }, "usetype": 3, "color": 2, - "bagtype": 0, + "bagtype": 2, "index": 2, "special_type": 0, "time": 0, @@ -3018,7 +3018,7 @@ }, "usetype": 3, "color": 2, - "bagtype": 0, + "bagtype": 2, "index": 2, "special_type": 0, "time": 0, @@ -3063,7 +3063,7 @@ }, "usetype": 3, "color": 2, - "bagtype": 0, + "bagtype": 2, "index": 2, "special_type": 0, "time": 0, @@ -3108,7 +3108,7 @@ }, "usetype": 3, "color": 2, - "bagtype": 0, + "bagtype": 2, "index": 2, "special_type": 0, "time": 0, @@ -3153,7 +3153,7 @@ }, "usetype": 3, "color": 2, - "bagtype": 0, + "bagtype": 2, "index": 2, "special_type": 0, "time": 0, @@ -3198,7 +3198,7 @@ }, "usetype": 3, "color": 2, - "bagtype": 0, + "bagtype": 2, "index": 2, "special_type": 0, "time": 0, @@ -3243,7 +3243,7 @@ }, "usetype": 3, "color": 2, - "bagtype": 0, + "bagtype": 2, "index": 2, "special_type": 0, "time": 0, @@ -3288,7 +3288,7 @@ }, "usetype": 3, "color": 2, - "bagtype": 0, + "bagtype": 2, "index": 2, "special_type": 0, "time": 0, @@ -3333,7 +3333,7 @@ }, "usetype": 3, "color": 2, - "bagtype": 0, + "bagtype": 2, "index": 2, "special_type": 0, "time": 0, @@ -3378,7 +3378,7 @@ }, "usetype": 3, "color": 2, - "bagtype": 0, + "bagtype": 2, "index": 2, "special_type": 0, "time": 0, @@ -3423,7 +3423,7 @@ }, "usetype": 3, "color": 2, - "bagtype": 0, + "bagtype": 2, "index": 2, "special_type": 0, "time": 0, @@ -3468,7 +3468,7 @@ }, "usetype": 3, "color": 2, - "bagtype": 0, + "bagtype": 2, "index": 2, "special_type": 0, "time": 0, @@ -3513,7 +3513,7 @@ }, "usetype": 3, "color": 2, - "bagtype": 0, + "bagtype": 2, "index": 2, "special_type": 0, "time": 0, @@ -3558,7 +3558,7 @@ }, "usetype": 3, "color": 2, - "bagtype": 0, + "bagtype": 2, "index": 2, "special_type": 0, "time": 0, @@ -3603,7 +3603,7 @@ }, "usetype": 3, "color": 2, - "bagtype": 0, + "bagtype": 2, "index": 2, "special_type": 0, "time": 0, @@ -3648,7 +3648,7 @@ }, "usetype": 3, "color": 2, - "bagtype": 0, + "bagtype": 2, "index": 2, "special_type": 0, "time": 0, @@ -3693,7 +3693,7 @@ }, "usetype": 3, "color": 2, - "bagtype": 0, + "bagtype": 2, "index": 2, "special_type": 0, "time": 0, @@ -3738,7 +3738,7 @@ }, "usetype": 3, "color": 2, - "bagtype": 0, + "bagtype": 2, "index": 2, "special_type": 0, "time": 0, @@ -3783,7 +3783,7 @@ }, "usetype": 3, "color": 2, - "bagtype": 0, + "bagtype": 2, "index": 2, "special_type": 0, "time": 0, @@ -3828,7 +3828,7 @@ }, "usetype": 3, "color": 2, - "bagtype": 0, + "bagtype": 2, "index": 2, "special_type": 0, "time": 0, @@ -3873,7 +3873,7 @@ }, "usetype": 3, "color": 2, - "bagtype": 0, + "bagtype": 2, "index": 2, "special_type": 0, "time": 0, @@ -3918,7 +3918,7 @@ }, "usetype": 3, "color": 2, - "bagtype": 0, + "bagtype": 2, "index": 2, "special_type": 0, "time": 0, @@ -3963,7 +3963,7 @@ }, "usetype": 3, "color": 2, - "bagtype": 0, + "bagtype": 2, "index": 2, "special_type": 0, "time": 0, @@ -4008,7 +4008,7 @@ }, "usetype": 3, "color": 2, - "bagtype": 0, + "bagtype": 2, "index": 2, "special_type": 0, "time": 0, @@ -4053,7 +4053,7 @@ }, "usetype": 3, "color": 2, - "bagtype": 0, + "bagtype": 2, "index": 2, "special_type": 0, "time": 0, @@ -4098,7 +4098,7 @@ }, "usetype": 3, "color": 2, - "bagtype": 0, + "bagtype": 2, "index": 2, "special_type": 0, "time": 0, @@ -4143,7 +4143,7 @@ }, "usetype": 3, "color": 2, - "bagtype": 0, + "bagtype": 2, "index": 2, "special_type": 0, "time": 0, @@ -4188,7 +4188,7 @@ }, "usetype": 3, "color": 2, - "bagtype": 0, + "bagtype": 2, "index": 2, "special_type": 0, "time": 0, @@ -4233,7 +4233,7 @@ }, "usetype": 3, "color": 2, - "bagtype": 0, + "bagtype": 2, "index": 2, "special_type": 0, "time": 0, @@ -4278,7 +4278,7 @@ }, "usetype": 1, "color": 2, - "bagtype": 0, + "bagtype": 3, "index": 99, "special_type": 0, "time": 0, @@ -4325,7 +4325,7 @@ }, "usetype": 1, "color": 2, - "bagtype": 0, + "bagtype": 3, "index": 99, "special_type": 0, "time": 0, @@ -4372,7 +4372,7 @@ }, "usetype": 1, "color": 2, - "bagtype": 0, + "bagtype": 3, "index": 99, "special_type": 0, "time": 0, @@ -4419,7 +4419,7 @@ }, "usetype": 1, "color": 2, - "bagtype": 0, + "bagtype": 3, "index": 99, "special_type": 0, "time": 0, @@ -4466,7 +4466,7 @@ }, "usetype": 1, "color": 2, - "bagtype": 0, + "bagtype": 3, "index": 99, "special_type": 0, "time": 0, @@ -4513,7 +4513,7 @@ }, "usetype": 1, "color": 2, - "bagtype": 0, + "bagtype": 3, "index": 99, "special_type": 0, "time": 0, @@ -4560,7 +4560,7 @@ }, "usetype": 1, "color": 2, - "bagtype": 0, + "bagtype": 3, "index": 99, "special_type": 0, "time": 0, @@ -4607,7 +4607,7 @@ }, "usetype": 1, "color": 2, - "bagtype": 0, + "bagtype": 3, "index": 99, "special_type": 0, "time": 0, @@ -4654,7 +4654,7 @@ }, "usetype": 1, "color": 2, - "bagtype": 0, + "bagtype": 3, "index": 99, "special_type": 0, "time": 0, @@ -4701,7 +4701,7 @@ }, "usetype": 1, "color": 2, - "bagtype": 0, + "bagtype": 3, "index": 99, "special_type": 0, "time": 0, @@ -4748,7 +4748,7 @@ }, "usetype": 1, "color": 2, - "bagtype": 0, + "bagtype": 3, "index": 99, "special_type": 0, "time": 0, @@ -4795,7 +4795,7 @@ }, "usetype": 1, "color": 2, - "bagtype": 0, + "bagtype": 3, "index": 99, "special_type": 0, "time": 0, @@ -4842,7 +4842,7 @@ }, "usetype": 1, "color": 2, - "bagtype": 0, + "bagtype": 3, "index": 99, "special_type": 0, "time": 0, @@ -4889,7 +4889,7 @@ }, "usetype": 1, "color": 2, - "bagtype": 0, + "bagtype": 3, "index": 99, "special_type": 0, "time": 0, @@ -4936,7 +4936,7 @@ }, "usetype": 1, "color": 2, - "bagtype": 0, + "bagtype": 3, "index": 99, "special_type": 0, "time": 0, @@ -4983,7 +4983,7 @@ }, "usetype": 1, "color": 2, - "bagtype": 0, + "bagtype": 3, "index": 99, "special_type": 0, "time": 0, @@ -5030,7 +5030,7 @@ }, "usetype": 1, "color": 2, - "bagtype": 0, + "bagtype": 3, "index": 99, "special_type": 0, "time": 0, @@ -5077,7 +5077,7 @@ }, "usetype": 1, "color": 2, - "bagtype": 0, + "bagtype": 3, "index": 99, "special_type": 0, "time": 0, @@ -5124,7 +5124,7 @@ }, "usetype": 1, "color": 2, - "bagtype": 0, + "bagtype": 3, "index": 99, "special_type": 0, "time": 0, @@ -5171,7 +5171,7 @@ }, "usetype": 1, "color": 2, - "bagtype": 0, + "bagtype": 3, "index": 99, "special_type": 0, "time": 0, @@ -5218,7 +5218,7 @@ }, "usetype": 1, "color": 2, - "bagtype": 0, + "bagtype": 3, "index": 99, "special_type": 0, "time": 0, @@ -5265,7 +5265,7 @@ }, "usetype": 1, "color": 2, - "bagtype": 0, + "bagtype": 3, "index": 99, "special_type": 0, "time": 0, @@ -5312,7 +5312,7 @@ }, "usetype": 1, "color": 2, - "bagtype": 0, + "bagtype": 3, "index": 99, "special_type": 0, "time": 0, @@ -5359,7 +5359,7 @@ }, "usetype": 1, "color": 2, - "bagtype": 0, + "bagtype": 3, "index": 99, "special_type": 0, "time": 0, @@ -5406,7 +5406,7 @@ }, "usetype": 1, "color": 2, - "bagtype": 0, + "bagtype": 3, "index": 99, "special_type": 0, "time": 0, @@ -5453,7 +5453,7 @@ }, "usetype": 1, "color": 2, - "bagtype": 0, + "bagtype": 3, "index": 99, "special_type": 0, "time": 0, @@ -5500,7 +5500,7 @@ }, "usetype": 1, "color": 2, - "bagtype": 0, + "bagtype": 3, "index": 99, "special_type": 0, "time": 0, @@ -5547,7 +5547,7 @@ }, "usetype": 1, "color": 2, - "bagtype": 0, + "bagtype": 3, "index": 99, "special_type": 0, "time": 0, @@ -5594,7 +5594,7 @@ }, "usetype": 1, "color": 2, - "bagtype": 0, + "bagtype": 3, "index": 99, "special_type": 0, "time": 0, @@ -5641,7 +5641,7 @@ }, "usetype": 1, "color": 2, - "bagtype": 0, + "bagtype": 3, "index": 99, "special_type": 0, "time": 0, @@ -5688,7 +5688,7 @@ }, "usetype": 1, "color": 2, - "bagtype": 0, + "bagtype": 3, "index": 99, "special_type": 0, "time": 0, @@ -5735,7 +5735,7 @@ }, "usetype": 1, "color": 2, - "bagtype": 0, + "bagtype": 3, "index": 99, "special_type": 0, "time": 0, @@ -5782,7 +5782,7 @@ }, "usetype": 1, "color": 2, - "bagtype": 0, + "bagtype": 3, "index": 99, "special_type": 0, "time": 0, @@ -5829,7 +5829,7 @@ }, "usetype": 1, "color": 2, - "bagtype": 0, + "bagtype": 3, "index": 99, "special_type": 0, "time": 0, @@ -5876,7 +5876,7 @@ }, "usetype": 1, "color": 2, - "bagtype": 0, + "bagtype": 3, "index": 99, "special_type": 0, "time": 0, @@ -5923,7 +5923,7 @@ }, "usetype": 1, "color": 2, - "bagtype": 0, + "bagtype": 3, "index": 99, "special_type": 0, "time": 0, @@ -5970,7 +5970,7 @@ }, "usetype": 1, "color": 2, - "bagtype": 0, + "bagtype": 3, "index": 99, "special_type": 0, "time": 0, @@ -6017,7 +6017,7 @@ }, "usetype": 1, "color": 2, - "bagtype": 0, + "bagtype": 3, "index": 99, "special_type": 0, "time": 0, @@ -6064,7 +6064,7 @@ }, "usetype": 1, "color": 2, - "bagtype": 0, + "bagtype": 3, "index": 99, "special_type": 0, "time": 0, @@ -6111,7 +6111,7 @@ }, "usetype": 1, "color": 2, - "bagtype": 0, + "bagtype": 3, "index": 99, "special_type": 0, "time": 0, @@ -6158,7 +6158,7 @@ }, "usetype": 1, "color": 2, - "bagtype": 0, + "bagtype": 3, "index": 99, "special_type": 0, "time": 0, @@ -6205,7 +6205,7 @@ }, "usetype": 1, "color": 2, - "bagtype": 0, + "bagtype": 3, "index": 99, "special_type": 0, "time": 0, @@ -6252,7 +6252,7 @@ }, "usetype": 1, "color": 2, - "bagtype": 0, + "bagtype": 3, "index": 99, "special_type": 0, "time": 0, @@ -6299,7 +6299,7 @@ }, "usetype": 1, "color": 2, - "bagtype": 0, + "bagtype": 3, "index": 99, "special_type": 0, "time": 0, @@ -6346,7 +6346,7 @@ }, "usetype": 1, "color": 2, - "bagtype": 0, + "bagtype": 3, "index": 99, "special_type": 0, "time": 0, @@ -6393,7 +6393,7 @@ }, "usetype": 1, "color": 2, - "bagtype": 0, + "bagtype": 3, "index": 99, "special_type": 0, "time": 0, @@ -6440,7 +6440,7 @@ }, "usetype": 1, "color": 2, - "bagtype": 0, + "bagtype": 3, "index": 99, "special_type": 0, "time": 0, @@ -6487,7 +6487,7 @@ }, "usetype": 1, "color": 2, - "bagtype": 0, + "bagtype": 3, "index": 99, "special_type": 0, "time": 0, @@ -6534,7 +6534,7 @@ }, "usetype": 1, "color": 2, - "bagtype": 0, + "bagtype": 3, "index": 99, "special_type": 0, "time": 0, @@ -6581,7 +6581,7 @@ }, "usetype": 1, "color": 2, - "bagtype": 0, + "bagtype": 3, "index": 99, "special_type": 0, "time": 0, @@ -6628,7 +6628,7 @@ }, "usetype": 1, "color": 2, - "bagtype": 0, + "bagtype": 3, "index": 99, "special_type": 0, "time": 0, @@ -6675,7 +6675,7 @@ }, "usetype": 1, "color": 2, - "bagtype": 0, + "bagtype": 3, "index": 99, "special_type": 0, "time": 0, @@ -6722,7 +6722,7 @@ }, "usetype": 1, "color": 2, - "bagtype": 0, + "bagtype": 3, "index": 99, "special_type": 0, "time": 0, @@ -6769,7 +6769,7 @@ }, "usetype": 1, "color": 2, - "bagtype": 0, + "bagtype": 3, "index": 99, "special_type": 0, "time": 0, @@ -6816,7 +6816,7 @@ }, "usetype": 1, "color": 2, - "bagtype": 0, + "bagtype": 3, "index": 99, "special_type": 0, "time": 0, @@ -6863,7 +6863,7 @@ }, "usetype": 1, "color": 2, - "bagtype": 0, + "bagtype": 3, "index": 99, "special_type": 0, "time": 0, @@ -6910,7 +6910,7 @@ }, "usetype": 1, "color": 2, - "bagtype": 0, + "bagtype": 3, "index": 99, "special_type": 0, "time": 0, @@ -6957,7 +6957,7 @@ }, "usetype": 1, "color": 2, - "bagtype": 0, + "bagtype": 3, "index": 99, "special_type": 0, "time": 0, @@ -7004,7 +7004,7 @@ }, "usetype": 1, "color": 2, - "bagtype": 0, + "bagtype": 3, "index": 99, "special_type": 0, "time": 0, @@ -7051,7 +7051,7 @@ }, "usetype": 1, "color": 2, - "bagtype": 0, + "bagtype": 3, "index": 99, "special_type": 0, "time": 0, @@ -7098,7 +7098,7 @@ }, "usetype": 1, "color": 2, - "bagtype": 0, + "bagtype": 3, "index": 99, "special_type": 0, "time": 0, @@ -7145,7 +7145,7 @@ }, "usetype": 1, "color": 2, - "bagtype": 0, + "bagtype": 3, "index": 99, "special_type": 0, "time": 0, @@ -7192,7 +7192,7 @@ }, "usetype": 1, "color": 2, - "bagtype": 0, + "bagtype": 3, "index": 99, "special_type": 0, "time": 0, @@ -7239,7 +7239,7 @@ }, "usetype": 1, "color": 2, - "bagtype": 0, + "bagtype": 3, "index": 99, "special_type": 0, "time": 0, @@ -7286,7 +7286,7 @@ }, "usetype": 1, "color": 2, - "bagtype": 0, + "bagtype": 3, "index": 99, "special_type": 0, "time": 0, @@ -7333,7 +7333,7 @@ }, "usetype": 1, "color": 2, - "bagtype": 0, + "bagtype": 3, "index": 99, "special_type": 0, "time": 0, @@ -7380,7 +7380,7 @@ }, "usetype": 1, "color": 2, - "bagtype": 0, + "bagtype": 3, "index": 99, "special_type": 0, "time": 0, @@ -7427,7 +7427,7 @@ }, "usetype": 1, "color": 2, - "bagtype": 0, + "bagtype": 3, "index": 99, "special_type": 0, "time": 0, @@ -7474,7 +7474,7 @@ }, "usetype": 1, "color": 2, - "bagtype": 0, + "bagtype": 3, "index": 99, "special_type": 0, "time": 0, @@ -7521,7 +7521,7 @@ }, "usetype": 1, "color": 2, - "bagtype": 0, + "bagtype": 3, "index": 99, "special_type": 0, "time": 0, @@ -7568,7 +7568,7 @@ }, "usetype": 1, "color": 2, - "bagtype": 0, + "bagtype": 3, "index": 99, "special_type": 0, "time": 0, @@ -7615,7 +7615,7 @@ }, "usetype": 2, "color": 2, - "bagtype": 1, + "bagtype": 3, "index": 120101, "special_type": 0, "time": 0, @@ -7662,7 +7662,7 @@ }, "usetype": 2, "color": 4, - "bagtype": 1, + "bagtype": 3, "index": 120102, "special_type": 0, "time": 0, @@ -7709,7 +7709,7 @@ }, "usetype": 2, "color": 4, - "bagtype": 1, + "bagtype": 3, "index": 120103, "special_type": 0, "time": 0, @@ -7756,7 +7756,7 @@ }, "usetype": 2, "color": 5, - "bagtype": 1, + "bagtype": 3, "index": 120104, "special_type": 0, "time": 0, @@ -7803,7 +7803,7 @@ }, "usetype": 2, "color": 3, - "bagtype": 1, + "bagtype": 3, "index": 1, "special_type": 0, "time": 0, @@ -7848,7 +7848,7 @@ }, "usetype": 2, "color": 5, - "bagtype": 1, + "bagtype": 3, "index": 1, "special_type": 0, "time": 0, @@ -7893,7 +7893,7 @@ }, "usetype": 2, "color": 2, - "bagtype": 1, + "bagtype": 3, "index": 120001, "special_type": 0, "time": 0, @@ -7940,7 +7940,7 @@ }, "usetype": 2, "color": 3, - "bagtype": 1, + "bagtype": 3, "index": 120002, "special_type": 0, "time": 0, @@ -7987,7 +7987,7 @@ }, "usetype": 2, "color": 4, - "bagtype": 1, + "bagtype": 3, "index": 120003, "special_type": 0, "time": 0, @@ -8034,7 +8034,7 @@ }, "usetype": 2, "color": 5, - "bagtype": 1, + "bagtype": 3, "index": 120004, "special_type": 0, "time": 0, @@ -8079,7 +8079,7 @@ }, "usetype": 2, "color": 2, - "bagtype": 1, + "bagtype": 3, "index": 120005, "special_type": 0, "time": 0, @@ -8126,7 +8126,7 @@ }, "usetype": 2, "color": 3, - "bagtype": 1, + "bagtype": 3, "index": 120006, "special_type": 0, "time": 0, @@ -8173,7 +8173,7 @@ }, "usetype": 2, "color": 4, - "bagtype": 1, + "bagtype": 3, "index": 120007, "special_type": 0, "time": 0, @@ -8220,7 +8220,7 @@ }, "usetype": 2, "color": 5, - "bagtype": 1, + "bagtype": 3, "index": 120008, "special_type": 0, "time": 0, @@ -8265,7 +8265,7 @@ }, "usetype": 2, "color": 2, - "bagtype": 1, + "bagtype": 3, "index": 120009, "special_type": 0, "time": 0, @@ -8312,7 +8312,7 @@ }, "usetype": 2, "color": 3, - "bagtype": 1, + "bagtype": 3, "index": 120010, "special_type": 0, "time": 0, @@ -8359,7 +8359,7 @@ }, "usetype": 2, "color": 4, - "bagtype": 1, + "bagtype": 3, "index": 120011, "special_type": 0, "time": 0, @@ -8406,7 +8406,7 @@ }, "usetype": 2, "color": 5, - "bagtype": 1, + "bagtype": 3, "index": 120012, "special_type": 0, "time": 0, @@ -8451,7 +8451,7 @@ }, "usetype": 2, "color": 3, - "bagtype": 1, + "bagtype": 6, "index": 1, "special_type": 0, "time": 0, @@ -8498,7 +8498,7 @@ }, "usetype": 2, "color": 4, - "bagtype": 1, + "bagtype": 6, "index": 1, "special_type": 0, "time": 0, @@ -8545,7 +8545,7 @@ }, "usetype": 2, "color": 4, - "bagtype": 1, + "bagtype": 6, "index": 1, "special_type": 0, "time": 0, @@ -8592,7 +8592,7 @@ }, "usetype": 1, "color": 2, - "bagtype": 4, + "bagtype": 5, "index": 9, "special_type": 450, "time": 0, @@ -8639,7 +8639,7 @@ }, "usetype": 1, "color": 2, - "bagtype": 4, + "bagtype": 5, "index": 10, "special_type": 400, "time": 0, @@ -8686,7 +8686,7 @@ }, "usetype": 1, "color": 2, - "bagtype": 4, + "bagtype": 5, "index": 11, "special_type": 350, "time": 0, @@ -8733,7 +8733,7 @@ }, "usetype": 1, "color": 2, - "bagtype": 4, + "bagtype": 5, "index": 12, "special_type": 300, "time": 0, @@ -8780,7 +8780,7 @@ }, "usetype": 1, "color": 2, - "bagtype": 4, + "bagtype": 5, "index": 13, "special_type": 250, "time": 0, @@ -8827,7 +8827,7 @@ }, "usetype": 1, "color": 2, - "bagtype": 0, + "bagtype": 5, "index": 0, "special_type": 0, "time": 0, @@ -8872,7 +8872,7 @@ }, "usetype": 1, "color": 2, - "bagtype": 0, + "bagtype": 5, "index": 0, "special_type": 0, "time": 0, @@ -8917,7 +8917,7 @@ }, "usetype": 1, "color": 2, - "bagtype": 0, + "bagtype": 5, "index": 0, "special_type": 0, "time": 0, @@ -8962,7 +8962,7 @@ }, "usetype": 1, "color": 2, - "bagtype": 0, + "bagtype": 5, "index": 0, "special_type": 0, "time": 0, @@ -9007,7 +9007,7 @@ }, "usetype": 1, "color": 2, - "bagtype": 0, + "bagtype": 5, "index": 0, "special_type": 0, "time": 0, @@ -9052,7 +9052,7 @@ }, "usetype": 1, "color": 2, - "bagtype": 0, + "bagtype": 5, "index": 0, "special_type": 0, "time": 0, @@ -9097,7 +9097,7 @@ }, "usetype": 1, "color": 2, - "bagtype": 0, + "bagtype": 5, "index": 0, "special_type": 0, "time": 0, @@ -9142,7 +9142,7 @@ }, "usetype": 1, "color": 2, - "bagtype": 0, + "bagtype": 5, "index": 0, "special_type": 0, "time": 0, @@ -9187,7 +9187,7 @@ }, "usetype": 1, "color": 2, - "bagtype": 0, + "bagtype": 5, "index": 0, "special_type": 0, "time": 0, @@ -9232,7 +9232,7 @@ }, "usetype": 1, "color": 2, - "bagtype": 0, + "bagtype": 5, "index": 0, "special_type": 0, "time": 0, @@ -9277,7 +9277,7 @@ }, "usetype": 1, "color": 2, - "bagtype": 0, + "bagtype": 5, "index": 0, "special_type": 0, "time": 0, @@ -9322,7 +9322,7 @@ }, "usetype": 1, "color": 1, - "bagtype": 1, + "bagtype": 4, "index": 99, "special_type": 1000, "time": 0, @@ -9369,7 +9369,7 @@ }, "usetype": 2, "color": 2, - "bagtype": 1, + "bagtype": 4, "index": 99, "special_type": 800, "time": 0, @@ -9416,7 +9416,7 @@ }, "usetype": 2, "color": 2, - "bagtype": 1, + "bagtype": 4, "index": 1, "special_type": 900, "time": 0, @@ -9463,7 +9463,7 @@ }, "usetype": 2, "color": 3, - "bagtype": 1, + "bagtype": 4, "index": 2, "special_type": 800, "time": 0, @@ -9510,7 +9510,7 @@ }, "usetype": 2, "color": 3, - "bagtype": 1, + "bagtype": 4, "index": 3, "special_type": 750, "time": 0, @@ -9557,7 +9557,7 @@ }, "usetype": 2, "color": 2, - "bagtype": 1, + "bagtype": 4, "index": 4, "special_type": 700, "time": 0, @@ -9604,7 +9604,7 @@ }, "usetype": 2, "color": 3, - "bagtype": 1, + "bagtype": 4, "index": 5, "special_type": 650, "time": 0, @@ -9651,7 +9651,7 @@ }, "usetype": 2, "color": 4, - "bagtype": 1, + "bagtype": 4, "index": 6, "special_type": 600, "time": 0, @@ -9698,7 +9698,7 @@ }, "usetype": 2, "color": 4, - "bagtype": 1, + "bagtype": 4, "index": 7, "special_type": 550, "time": 0, @@ -9745,7 +9745,7 @@ }, "usetype": 2, "color": 4, - "bagtype": 1, + "bagtype": 4, "index": 8, "special_type": 500, "time": 0, @@ -9792,7 +9792,7 @@ }, "usetype": 2, "color": 3, - "bagtype": 1, + "bagtype": 4, "index": 1, "special_type": 0, "time": 0, @@ -9839,7 +9839,7 @@ }, "usetype": 2, "color": 4, - "bagtype": 1, + "bagtype": 4, "index": 1, "special_type": 0, "time": 0, @@ -9886,7 +9886,7 @@ }, "usetype": 2, "color": 4, - "bagtype": 1, + "bagtype": 4, "index": 1, "special_type": 0, "time": 0, @@ -9933,7 +9933,7 @@ }, "usetype": 2, "color": 4, - "bagtype": 1, + "bagtype": 4, "index": 1, "special_type": 0, "time": 0, @@ -9980,7 +9980,7 @@ }, "usetype": 2, "color": 4, - "bagtype": 1, + "bagtype": 4, "index": 1, "special_type": 0, "time": 0, @@ -10027,7 +10027,7 @@ }, "usetype": 2, "color": 4, - "bagtype": 1, + "bagtype": 4, "index": 1, "special_type": 0, "time": 0, @@ -10074,7 +10074,7 @@ }, "usetype": 2, "color": 3, - "bagtype": 1, + "bagtype": 4, "index": 1, "special_type": 0, "time": 0, @@ -10121,7 +10121,7 @@ }, "usetype": 2, "color": 4, - "bagtype": 1, + "bagtype": 4, "index": 1, "special_type": 0, "time": 0, @@ -10168,7 +10168,7 @@ }, "usetype": 2, "color": 4, - "bagtype": 1, + "bagtype": 4, "index": 1, "special_type": 0, "time": 0, @@ -10215,7 +10215,7 @@ }, "usetype": 2, "color": 4, - "bagtype": 1, + "bagtype": 4, "index": 1, "special_type": 0, "time": 0, @@ -10262,7 +10262,7 @@ }, "usetype": 2, "color": 2, - "bagtype": 1, + "bagtype": 4, "index": 1, "special_type": 0, "time": 0, @@ -10309,7 +10309,7 @@ }, "usetype": 2, "color": 3, - "bagtype": 1, + "bagtype": 4, "index": 1, "special_type": 0, "time": 0, @@ -10356,7 +10356,7 @@ }, "usetype": 2, "color": 3, - "bagtype": 1, + "bagtype": 4, "index": 1, "special_type": 0, "time": 0, @@ -10403,7 +10403,7 @@ }, "usetype": 2, "color": 4, - "bagtype": 1, + "bagtype": 4, "index": 1, "special_type": 0, "time": 0, @@ -10450,7 +10450,7 @@ }, "usetype": 2, "color": 2, - "bagtype": 1, + "bagtype": 4, "index": 1, "special_type": 0, "time": 0, @@ -10497,7 +10497,7 @@ }, "usetype": 2, "color": 2, - "bagtype": 1, + "bagtype": 4, "index": 1, "special_type": 0, "time": 0, @@ -10544,7 +10544,7 @@ }, "usetype": 2, "color": 3, - "bagtype": 1, + "bagtype": 4, "index": 1, "special_type": 0, "time": 0, @@ -10591,7 +10591,7 @@ }, "usetype": 2, "color": 3, - "bagtype": 1, + "bagtype": 4, "index": 1, "special_type": 0, "time": 0, @@ -10638,7 +10638,7 @@ }, "usetype": 2, "color": 3, - "bagtype": 1, + "bagtype": 4, "index": 1, "special_type": 0, "time": 0, @@ -10685,7 +10685,7 @@ }, "usetype": 2, "color": 3, - "bagtype": 1, + "bagtype": 4, "index": 1, "special_type": 0, "time": 0, @@ -10732,7 +10732,7 @@ }, "usetype": 2, "color": 3, - "bagtype": 1, + "bagtype": 4, "index": 1, "special_type": 0, "time": 0, @@ -10779,7 +10779,7 @@ }, "usetype": 2, "color": 3, - "bagtype": 1, + "bagtype": 4, "index": 1, "special_type": 0, "time": 0, @@ -10826,7 +10826,7 @@ }, "usetype": 2, "color": 3, - "bagtype": 1, + "bagtype": 4, "index": 1, "special_type": 0, "time": 0, @@ -10873,7 +10873,7 @@ }, "usetype": 2, "color": 3, - "bagtype": 1, + "bagtype": 4, "index": 1, "special_type": 0, "time": 0, @@ -10920,7 +10920,7 @@ }, "usetype": 2, "color": 2, - "bagtype": 1, + "bagtype": 4, "index": 1, "special_type": 0, "time": 0, @@ -10967,7 +10967,7 @@ }, "usetype": 2, "color": 4, - "bagtype": 1, + "bagtype": 4, "index": 1, "special_type": 0, "time": 0, @@ -11014,7 +11014,7 @@ }, "usetype": 2, "color": 4, - "bagtype": 1, + "bagtype": 4, "index": 1, "special_type": 0, "time": 0, @@ -11061,7 +11061,7 @@ }, "usetype": 2, "color": 4, - "bagtype": 1, + "bagtype": 4, "index": 1, "special_type": 0, "time": 0, @@ -11108,7 +11108,7 @@ }, "usetype": 2, "color": 2, - "bagtype": 1, + "bagtype": 4, "index": 1, "special_type": 0, "time": 0, @@ -11155,7 +11155,7 @@ }, "usetype": 2, "color": 4, - "bagtype": 1, + "bagtype": 4, "index": 1, "special_type": 0, "time": 0, @@ -11202,7 +11202,7 @@ }, "usetype": 2, "color": 3, - "bagtype": 1, + "bagtype": 4, "index": 1, "special_type": 0, "time": 0, @@ -11249,7 +11249,7 @@ }, "usetype": 2, "color": 3, - "bagtype": 1, + "bagtype": 4, "index": 1, "special_type": 0, "time": 0, @@ -11296,7 +11296,7 @@ }, "usetype": 2, "color": 4, - "bagtype": 1, + "bagtype": 4, "index": 1, "special_type": 0, "time": 0, @@ -11343,7 +11343,7 @@ }, "usetype": 2, "color": 2, - "bagtype": 1, + "bagtype": 4, "index": 1, "special_type": 0, "time": 0, @@ -11390,7 +11390,7 @@ }, "usetype": 2, "color": 3, - "bagtype": 1, + "bagtype": 4, "index": 1, "special_type": 0, "time": 0, @@ -11437,7 +11437,7 @@ }, "usetype": 2, "color": 4, - "bagtype": 1, + "bagtype": 4, "index": 1, "special_type": 0, "time": 0, @@ -11484,7 +11484,7 @@ }, "usetype": 2, "color": 2, - "bagtype": 1, + "bagtype": 4, "index": 1, "special_type": 0, "time": 0, @@ -11531,7 +11531,7 @@ }, "usetype": 2, "color": 3, - "bagtype": 1, + "bagtype": 4, "index": 1, "special_type": 0, "time": 0, @@ -11578,7 +11578,7 @@ }, "usetype": 3, "color": 1, - "bagtype": 1, + "bagtype": 3, "index": 1, "special_type": 0, "time": 0, @@ -11637,7 +11637,7 @@ }, "usetype": 3, "color": 1, - "bagtype": 1, + "bagtype": 3, "index": 1, "special_type": 0, "time": 0, @@ -11696,7 +11696,7 @@ }, "usetype": 3, "color": 1, - "bagtype": 1, + "bagtype": 3, "index": 1, "special_type": 0, "time": 0, @@ -11755,7 +11755,7 @@ }, "usetype": 3, "color": 1, - "bagtype": 1, + "bagtype": 3, "index": 1, "special_type": 0, "time": 0, @@ -11814,7 +11814,7 @@ }, "usetype": 3, "color": 2, - "bagtype": 1, + "bagtype": 3, "index": 1, "special_type": 0, "time": 0, @@ -11885,7 +11885,7 @@ }, "usetype": 3, "color": 2, - "bagtype": 1, + "bagtype": 3, "index": 1, "special_type": 0, "time": 0, @@ -11956,7 +11956,7 @@ }, "usetype": 3, "color": 2, - "bagtype": 1, + "bagtype": 3, "index": 1, "special_type": 0, "time": 0, @@ -12027,7 +12027,7 @@ }, "usetype": 3, "color": 2, - "bagtype": 1, + "bagtype": 3, "index": 1, "special_type": 0, "time": 0, @@ -12098,7 +12098,7 @@ }, "usetype": 3, "color": 3, - "bagtype": 1, + "bagtype": 3, "index": 1, "special_type": 0, "time": 0, @@ -12157,7 +12157,7 @@ }, "usetype": 3, "color": 3, - "bagtype": 1, + "bagtype": 3, "index": 1, "special_type": 0, "time": 0, @@ -12216,7 +12216,7 @@ }, "usetype": 3, "color": 3, - "bagtype": 1, + "bagtype": 3, "index": 1, "special_type": 0, "time": 0, @@ -12275,7 +12275,7 @@ }, "usetype": 3, "color": 3, - "bagtype": 1, + "bagtype": 3, "index": 1, "special_type": 0, "time": 0, @@ -15586,7 +15586,7 @@ }, "usetype": 2, "color": 2, - "bagtype": 1, + "bagtype": 3, "index": 18, "special_type": 0, "time": 0, @@ -15633,7 +15633,7 @@ }, "usetype": 2, "color": 2, - "bagtype": 1, + "bagtype": 3, "index": 18, "special_type": 0, "time": 0, @@ -15680,7 +15680,7 @@ }, "usetype": 2, "color": 2, - "bagtype": 1, + "bagtype": 3, "index": 18, "special_type": 0, "time": 0, @@ -15727,7 +15727,7 @@ }, "usetype": 2, "color": 2, - "bagtype": 1, + "bagtype": 3, "index": 18, "special_type": 0, "time": 0, @@ -15774,7 +15774,7 @@ }, "usetype": 2, "color": 2, - "bagtype": 1, + "bagtype": 3, "index": 18, "special_type": 0, "time": 0, @@ -15821,7 +15821,7 @@ }, "usetype": 2, "color": 2, - "bagtype": 1, + "bagtype": 3, "index": 18, "special_type": 0, "time": 0, @@ -15868,7 +15868,7 @@ }, "usetype": 2, "color": 2, - "bagtype": 1, + "bagtype": 3, "index": 18, "special_type": 0, "time": 0, @@ -15915,7 +15915,7 @@ }, "usetype": 2, "color": 2, - "bagtype": 1, + "bagtype": 3, "index": 18, "special_type": 0, "time": 0, @@ -15962,7 +15962,7 @@ }, "usetype": 2, "color": 2, - "bagtype": 1, + "bagtype": 3, "index": 18, "special_type": 0, "time": 0, @@ -16009,7 +16009,7 @@ }, "usetype": 2, "color": 2, - "bagtype": 1, + "bagtype": 3, "index": 18, "special_type": 0, "time": 0, @@ -16056,7 +16056,7 @@ }, "usetype": 2, "color": 2, - "bagtype": 1, + "bagtype": 3, "index": 18, "special_type": 0, "time": 0, @@ -16103,7 +16103,7 @@ }, "usetype": 2, "color": 2, - "bagtype": 1, + "bagtype": 3, "index": 18, "special_type": 0, "time": 0, @@ -16150,7 +16150,7 @@ }, "usetype": 2, "color": 2, - "bagtype": 1, + "bagtype": 3, "index": 18, "special_type": 0, "time": 0, @@ -16197,7 +16197,7 @@ }, "usetype": 2, "color": 2, - "bagtype": 1, + "bagtype": 3, "index": 18, "special_type": 0, "time": 0, @@ -16244,7 +16244,7 @@ }, "usetype": 2, "color": 2, - "bagtype": 1, + "bagtype": 3, "index": 18, "special_type": 0, "time": 0, @@ -16291,7 +16291,7 @@ }, "usetype": 2, "color": 2, - "bagtype": 1, + "bagtype": 3, "index": 18, "special_type": 0, "time": 0, @@ -16338,7 +16338,7 @@ }, "usetype": 2, "color": 2, - "bagtype": 1, + "bagtype": 3, "index": 18, "special_type": 0, "time": 0, @@ -16385,7 +16385,7 @@ }, "usetype": 2, "color": 2, - "bagtype": 1, + "bagtype": 3, "index": 18, "special_type": 0, "time": 0, @@ -16432,7 +16432,7 @@ }, "usetype": 2, "color": 2, - "bagtype": 1, + "bagtype": 3, "index": 18, "special_type": 0, "time": 0, @@ -16526,7 +16526,7 @@ }, "usetype": 2, "color": 2, - "bagtype": 0, + "bagtype": 6, "index": 1, "special_type": 0, "time": 0, @@ -16620,7 +16620,7 @@ }, "usetype": 1, "color": 5, - "bagtype": 1, + "bagtype": 6, "index": 1, "special_type": 0, "time": 0, @@ -16710,7 +16710,7 @@ }, "usetype": 2, "color": 4, - "bagtype": 0, + "bagtype": 6, "index": 1, "special_type": 0, "time": 0, @@ -16755,7 +16755,7 @@ }, "usetype": 2, "color": 4, - "bagtype": 0, + "bagtype": 6, "index": 1, "special_type": 0, "time": 0, @@ -16800,7 +16800,7 @@ }, "usetype": 2, "color": 4, - "bagtype": 0, + "bagtype": 6, "index": 1, "special_type": 0, "time": 0, @@ -16845,7 +16845,7 @@ }, "usetype": 2, "color": 4, - "bagtype": 0, + "bagtype": 6, "index": 1, "special_type": 0, "time": 0, @@ -16890,7 +16890,7 @@ }, "usetype": 2, "color": 4, - "bagtype": 0, + "bagtype": 6, "index": 1, "special_type": 0, "time": 0, @@ -16935,7 +16935,7 @@ }, "usetype": 2, "color": 4, - "bagtype": 0, + "bagtype": 6, "index": 1, "special_type": 0, "time": 0, @@ -16980,7 +16980,7 @@ }, "usetype": 2, "color": 4, - "bagtype": 0, + "bagtype": 6, "index": 1, "special_type": 0, "time": 0, @@ -17025,7 +17025,7 @@ }, "usetype": 2, "color": 4, - "bagtype": 0, + "bagtype": 6, "index": 1, "special_type": 0, "time": 0, @@ -17070,7 +17070,7 @@ }, "usetype": 2, "color": 4, - "bagtype": 0, + "bagtype": 6, "index": 1, "special_type": 0, "time": 0, @@ -17115,7 +17115,7 @@ }, "usetype": 2, "color": 4, - "bagtype": 0, + "bagtype": 6, "index": 1, "special_type": 0, "time": 0, @@ -17160,7 +17160,7 @@ }, "usetype": 2, "color": 4, - "bagtype": 0, + "bagtype": 6, "index": 1, "special_type": 0, "time": 0, @@ -17205,7 +17205,7 @@ }, "usetype": 2, "color": 4, - "bagtype": 0, + "bagtype": 6, "index": 1, "special_type": 0, "time": 0, @@ -17250,7 +17250,7 @@ }, "usetype": 2, "color": 4, - "bagtype": 0, + "bagtype": 6, "index": 1, "special_type": 0, "time": 0, @@ -17295,7 +17295,7 @@ }, "usetype": 2, "color": 4, - "bagtype": 0, + "bagtype": 6, "index": 1, "special_type": 0, "time": 0, @@ -17340,7 +17340,7 @@ }, "usetype": 2, "color": 4, - "bagtype": 0, + "bagtype": 6, "index": 1, "special_type": 0, "time": 0, @@ -17385,7 +17385,7 @@ }, "usetype": 2, "color": 4, - "bagtype": 0, + "bagtype": 6, "index": 1, "special_type": 0, "time": 0, @@ -17430,7 +17430,7 @@ }, "usetype": 2, "color": 4, - "bagtype": 0, + "bagtype": 6, "index": 1, "special_type": 0, "time": 0, @@ -17475,7 +17475,7 @@ }, "usetype": 2, "color": 4, - "bagtype": 0, + "bagtype": 6, "index": 1, "special_type": 0, "time": 0, @@ -17520,7 +17520,7 @@ }, "usetype": 2, "color": 4, - "bagtype": 0, + "bagtype": 6, "index": 1, "special_type": 0, "time": 0, @@ -17565,7 +17565,7 @@ }, "usetype": 2, "color": 4, - "bagtype": 0, + "bagtype": 6, "index": 1, "special_type": 0, "time": 0, @@ -17610,7 +17610,7 @@ }, "usetype": 2, "color": 4, - "bagtype": 0, + "bagtype": 6, "index": 1, "special_type": 0, "time": 0, @@ -17655,7 +17655,7 @@ }, "usetype": 2, "color": 4, - "bagtype": 0, + "bagtype": 6, "index": 1, "special_type": 0, "time": 0, @@ -17700,7 +17700,7 @@ }, "usetype": 2, "color": 4, - "bagtype": 0, + "bagtype": 6, "index": 1, "special_type": 0, "time": 0, @@ -17745,7 +17745,7 @@ }, "usetype": 2, "color": 4, - "bagtype": 0, + "bagtype": 6, "index": 1, "special_type": 0, "time": 0, @@ -17790,7 +17790,7 @@ }, "usetype": 2, "color": 4, - "bagtype": 0, + "bagtype": 6, "index": 1, "special_type": 0, "time": 0, @@ -17835,7 +17835,7 @@ }, "usetype": 2, "color": 4, - "bagtype": 0, + "bagtype": 6, "index": 1, "special_type": 0, "time": 0, @@ -17880,7 +17880,7 @@ }, "usetype": 2, "color": 4, - "bagtype": 0, + "bagtype": 6, "index": 1, "special_type": 0, "time": 0, @@ -17925,7 +17925,7 @@ }, "usetype": 2, "color": 4, - "bagtype": 0, + "bagtype": 6, "index": 1, "special_type": 0, "time": 0, @@ -17970,7 +17970,7 @@ }, "usetype": 2, "color": 4, - "bagtype": 0, + "bagtype": 6, "index": 1, "special_type": 0, "time": 0, @@ -18015,7 +18015,7 @@ }, "usetype": 2, "color": 4, - "bagtype": 0, + "bagtype": 6, "index": 1, "special_type": 0, "time": 0, @@ -18060,7 +18060,7 @@ }, "usetype": 2, "color": 4, - "bagtype": 0, + "bagtype": 6, "index": 1, "special_type": 0, "time": 0, @@ -18105,7 +18105,7 @@ }, "usetype": 2, "color": 4, - "bagtype": 0, + "bagtype": 6, "index": 1, "special_type": 0, "time": 0, @@ -18150,7 +18150,7 @@ }, "usetype": 1, "color": 5, - "bagtype": 1, + "bagtype": 6, "index": 1, "special_type": 0, "time": 0, @@ -18195,7 +18195,7 @@ }, "usetype": 1, "color": 5, - "bagtype": 1, + "bagtype": 6, "index": 1, "special_type": 0, "time": 0, @@ -18240,7 +18240,7 @@ }, "usetype": 1, "color": 5, - "bagtype": 1, + "bagtype": 0, "index": 1, "special_type": 0, "time": 0, @@ -18285,7 +18285,7 @@ }, "usetype": 2, "color": 5, - "bagtype": 1, + "bagtype": 0, "index": 19, "special_type": 0, "time": 0, @@ -18330,7 +18330,7 @@ }, "usetype": 2, "color": 2, - "bagtype": 0, + "bagtype": 1, "index": 1, "special_type": 0, "time": 0, @@ -18555,7 +18555,7 @@ }, "usetype": 4, "color": 5, - "bagtype": 2, + "bagtype": 1, "index": 1, "special_type": 0, "time": 0, @@ -18647,7 +18647,7 @@ }, "usetype": 1, "color": 2, - "bagtype": 0, + "bagtype": 6, "index": 1, "special_type": 0, "time": 0, @@ -18692,7 +18692,7 @@ }, "usetype": 1, "color": 2, - "bagtype": 0, + "bagtype": 6, "index": 1, "special_type": 0, "time": 0, @@ -18737,7 +18737,7 @@ }, "usetype": 1, "color": 2, - "bagtype": 0, + "bagtype": 6, "index": 1, "special_type": 0, "time": 0, diff --git a/bin/json/game_mainstage.json b/bin/json/game_mainstage.json index 694554428..fea7010f4 100644 --- a/bin/json/game_mainstage.json +++ b/bin/json/game_mainstage.json @@ -9,6 +9,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", + "bubbletalk": { + "key": "", + "text": "" + }, "venturetype": 0, "ventureavatar": [], "herocolor": 0, @@ -65,6 +69,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", + "bubbletalk": { + "key": "", + "text": "" + }, "venturetype": 1, "ventureavatar": [ "Person/44005/44005_q.prefab", @@ -164,6 +172,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", + "bubbletalk": { + "key": "", + "text": "" + }, "venturetype": 1, "ventureavatar": [ "Person/44005/44005_q.prefab", @@ -265,6 +277,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", + "bubbletalk": { + "key": "", + "text": "" + }, "venturetype": 1, "ventureavatar": [ "Person/44005/44005_q.prefab", @@ -366,6 +382,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", + "bubbletalk": { + "key": "", + "text": "" + }, "venturetype": 1, "ventureavatar": [ "Person/44005/44005_q.prefab", @@ -472,6 +492,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", + "bubbletalk": { + "key": "", + "text": "" + }, "venturetype": 1, "ventureavatar": [ "Person/44005/44005_q.prefab", @@ -539,6 +563,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", + "bubbletalk": { + "key": "", + "text": "" + }, "venturetype": 1, "ventureavatar": [ "Person/34004/34004_q.prefab", @@ -641,6 +669,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "Person/34004/34004_q.prefab", + "bubbletalk": { + "key": "", + "text": "" + }, "venturetype": 0, "ventureavatar": [], "herocolor": 1, @@ -699,6 +731,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "Person/34004/34004_q.prefab", + "bubbletalk": { + "key": "", + "text": "" + }, "venturetype": 0, "ventureavatar": [], "herocolor": 1, @@ -763,6 +799,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "Person/34004/34004_q.prefab", + "bubbletalk": { + "key": "", + "text": "" + }, "venturetype": 0, "ventureavatar": [], "herocolor": 1, @@ -827,6 +867,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "Person/34004/34004_q.prefab", + "bubbletalk": { + "key": "", + "text": "" + }, "venturetype": 0, "ventureavatar": [], "herocolor": 1, @@ -891,6 +935,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", + "bubbletalk": { + "key": "main_stage_bubbletext_1", + "text": "嘿嘿，看我找到了什么！「猛犸象牙」！但这东西吃不了，不过拿来做一把大斧似乎不错。" + }, "venturetype": 1, "ventureavatar": [ "Person/13002/13002_q.prefab" @@ -951,6 +999,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", + "bubbletalk": { + "key": "main_stage_bubbletext_2", + "text": "「猫头熊的皮」，运气真不错 ，不过要怎么吃呢？" + }, "venturetype": 1, "ventureavatar": [ "Person/13002/13002_q.prefab" @@ -1011,6 +1063,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", + "bubbletalk": { + "key": "main_stage_bubbletext_3", + "text": "「鳄犬的尾巴」？这可是难得的美味！竟然在这里捡到了。" + }, "venturetype": 1, "ventureavatar": [ "Person/13002/13002_q.prefab" @@ -1114,6 +1170,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", + "bubbletalk": { + "key": "", + "text": "" + }, "venturetype": 0, "ventureavatar": [], "herocolor": 1, @@ -1220,6 +1280,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", + "bubbletalk": { + "key": "", + "text": "" + }, "venturetype": 0, "ventureavatar": [], "herocolor": 0, @@ -1278,6 +1342,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", + "bubbletalk": { + "key": "", + "text": "" + }, "venturetype": 0, "ventureavatar": [], "herocolor": 0, @@ -1347,6 +1415,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", + "bubbletalk": { + "key": "", + "text": "" + }, "venturetype": 0, "ventureavatar": [], "herocolor": 0, @@ -1417,6 +1489,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", + "bubbletalk": { + "key": "", + "text": "" + }, "venturetype": 0, "ventureavatar": [], "herocolor": 0, @@ -1475,6 +1551,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", + "bubbletalk": { + "key": "", + "text": "" + }, "venturetype": 0, "ventureavatar": [], "herocolor": 0, @@ -1581,6 +1661,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", + "bubbletalk": { + "key": "", + "text": "" + }, "venturetype": 0, "ventureavatar": [], "herocolor": 1, @@ -1645,6 +1729,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", + "bubbletalk": { + "key": "", + "text": "" + }, "venturetype": 0, "ventureavatar": [], "herocolor": 3, @@ -1751,6 +1839,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", + "bubbletalk": { + "key": "", + "text": "" + }, "venturetype": 0, "ventureavatar": [], "herocolor": 3, @@ -1857,6 +1949,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", + "bubbletalk": { + "key": "", + "text": "" + }, "venturetype": 0, "ventureavatar": [], "herocolor": 3, @@ -1963,6 +2059,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", + "bubbletalk": { + "key": "", + "text": "" + }, "venturetype": 0, "ventureavatar": [], "herocolor": 3, @@ -2069,6 +2169,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", + "bubbletalk": { + "key": "", + "text": "" + }, "venturetype": 0, "ventureavatar": [], "herocolor": 3, @@ -2175,6 +2279,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", + "bubbletalk": { + "key": "", + "text": "" + }, "venturetype": 0, "ventureavatar": [], "herocolor": 3, @@ -2281,6 +2389,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", + "bubbletalk": { + "key": "", + "text": "" + }, "venturetype": 0, "ventureavatar": [], "herocolor": 3, @@ -2387,6 +2499,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", + "bubbletalk": { + "key": "", + "text": "" + }, "venturetype": 0, "ventureavatar": [], "herocolor": 3, @@ -2493,6 +2609,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", + "bubbletalk": { + "key": "", + "text": "" + }, "venturetype": 0, "ventureavatar": [], "herocolor": 4, @@ -2599,6 +2719,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", + "bubbletalk": { + "key": "", + "text": "" + }, "venturetype": 0, "ventureavatar": [], "herocolor": 4, @@ -2705,6 +2829,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", + "bubbletalk": { + "key": "", + "text": "" + }, "venturetype": 0, "ventureavatar": [], "herocolor": 4, @@ -2811,6 +2939,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", + "bubbletalk": { + "key": "", + "text": "" + }, "venturetype": 0, "ventureavatar": [], "herocolor": 4, @@ -2917,6 +3049,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", + "bubbletalk": { + "key": "", + "text": "" + }, "venturetype": 0, "ventureavatar": [], "herocolor": 4, @@ -3023,6 +3159,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", + "bubbletalk": { + "key": "", + "text": "" + }, "venturetype": 0, "ventureavatar": [], "herocolor": 4, @@ -3129,6 +3269,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", + "bubbletalk": { + "key": "", + "text": "" + }, "venturetype": 0, "ventureavatar": [], "herocolor": 4, @@ -3235,6 +3379,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", + "bubbletalk": { + "key": "", + "text": "" + }, "venturetype": 0, "ventureavatar": [], "herocolor": 4, @@ -3341,6 +3489,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", + "bubbletalk": { + "key": "", + "text": "" + }, "venturetype": 0, "ventureavatar": [], "herocolor": 5, @@ -3447,6 +3599,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", + "bubbletalk": { + "key": "", + "text": "" + }, "venturetype": 0, "ventureavatar": [], "herocolor": 5, @@ -3553,6 +3709,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", + "bubbletalk": { + "key": "", + "text": "" + }, "venturetype": 0, "ventureavatar": [], "herocolor": 5, @@ -3659,6 +3819,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", + "bubbletalk": { + "key": "", + "text": "" + }, "venturetype": 0, "ventureavatar": [], "herocolor": 5, @@ -3765,6 +3929,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", + "bubbletalk": { + "key": "", + "text": "" + }, "venturetype": 0, "ventureavatar": [], "herocolor": 5, @@ -3871,6 +4039,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", + "bubbletalk": { + "key": "", + "text": "" + }, "venturetype": 0, "ventureavatar": [], "herocolor": 5, @@ -3977,6 +4149,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", + "bubbletalk": { + "key": "", + "text": "" + }, "venturetype": 0, "ventureavatar": [], "herocolor": 5, @@ -4083,6 +4259,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", + "bubbletalk": { + "key": "", + "text": "" + }, "venturetype": 0, "ventureavatar": [], "herocolor": 5, @@ -4189,6 +4369,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", + "bubbletalk": { + "key": "", + "text": "" + }, "venturetype": 0, "ventureavatar": [], "herocolor": 0, @@ -4295,6 +4479,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", + "bubbletalk": { + "key": "", + "text": "" + }, "venturetype": 0, "ventureavatar": [], "herocolor": 0, @@ -4359,6 +4547,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", + "bubbletalk": { + "key": "", + "text": "" + }, "venturetype": 0, "ventureavatar": [], "herocolor": 0, @@ -4423,6 +4615,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", + "bubbletalk": { + "key": "", + "text": "" + }, "venturetype": 0, "ventureavatar": [], "herocolor": 0, @@ -4487,6 +4683,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", + "bubbletalk": { + "key": "", + "text": "" + }, "venturetype": 0, "ventureavatar": [], "herocolor": 0, @@ -4551,6 +4751,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", + "bubbletalk": { + "key": "", + "text": "" + }, "venturetype": 0, "ventureavatar": [], "herocolor": 0, @@ -4615,6 +4819,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", + "bubbletalk": { + "key": "", + "text": "" + }, "venturetype": 0, "ventureavatar": [], "herocolor": 0, @@ -4673,6 +4881,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", + "bubbletalk": { + "key": "", + "text": "" + }, "venturetype": 0, "ventureavatar": [], "herocolor": 0, @@ -4737,6 +4949,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", + "bubbletalk": { + "key": "", + "text": "" + }, "venturetype": 0, "ventureavatar": [], "herocolor": 0, @@ -4801,6 +5017,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", + "bubbletalk": { + "key": "", + "text": "" + }, "venturetype": 0, "ventureavatar": [], "herocolor": 0, @@ -4859,6 +5079,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", + "bubbletalk": { + "key": "", + "text": "" + }, "venturetype": 0, "ventureavatar": [], "herocolor": 0, @@ -4965,6 +5189,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", + "bubbletalk": { + "key": "", + "text": "" + }, "venturetype": 0, "ventureavatar": [], "herocolor": 0, @@ -5071,6 +5299,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", + "bubbletalk": { + "key": "", + "text": "" + }, "venturetype": 0, "ventureavatar": [], "herocolor": 0, @@ -5177,6 +5409,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", + "bubbletalk": { + "key": "", + "text": "" + }, "venturetype": 0, "ventureavatar": [], "herocolor": 0, @@ -5283,6 +5519,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", + "bubbletalk": { + "key": "", + "text": "" + }, "venturetype": 0, "ventureavatar": [], "herocolor": 0, @@ -5389,6 +5629,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", + "bubbletalk": { + "key": "", + "text": "" + }, "venturetype": 0, "ventureavatar": [], "herocolor": 0, @@ -5495,6 +5739,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", + "bubbletalk": { + "key": "", + "text": "" + }, "venturetype": 0, "ventureavatar": [], "herocolor": 0, @@ -5601,6 +5849,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", + "bubbletalk": { + "key": "", + "text": "" + }, "venturetype": 0, "ventureavatar": [], "herocolor": 0, @@ -5665,6 +5917,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", + "bubbletalk": { + "key": "", + "text": "" + }, "venturetype": 0, "ventureavatar": [], "herocolor": 0, @@ -5729,6 +5985,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", + "bubbletalk": { + "key": "", + "text": "" + }, "venturetype": 0, "ventureavatar": [], "herocolor": 0, @@ -5793,6 +6053,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", + "bubbletalk": { + "key": "", + "text": "" + }, "venturetype": 0, "ventureavatar": [], "herocolor": 0, @@ -5857,6 +6121,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", + "bubbletalk": { + "key": "", + "text": "" + }, "venturetype": 0, "ventureavatar": [], "herocolor": 0, @@ -5921,6 +6189,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", + "bubbletalk": { + "key": "", + "text": "" + }, "venturetype": 0, "ventureavatar": [], "herocolor": 0, @@ -5985,6 +6257,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", + "bubbletalk": { + "key": "", + "text": "" + }, "venturetype": 0, "ventureavatar": [], "herocolor": 0, @@ -6049,6 +6325,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", + "bubbletalk": { + "key": "", + "text": "" + }, "venturetype": 0, "ventureavatar": [], "herocolor": 0, @@ -6113,6 +6393,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", + "bubbletalk": { + "key": "", + "text": "" + }, "venturetype": 0, "ventureavatar": [], "herocolor": 0, @@ -6177,6 +6461,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", + "bubbletalk": { + "key": "", + "text": "" + }, "venturetype": 0, "ventureavatar": [], "herocolor": 0, @@ -6241,6 +6529,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", + "bubbletalk": { + "key": "", + "text": "" + }, "venturetype": 0, "ventureavatar": [], "herocolor": 0, @@ -6305,6 +6597,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", + "bubbletalk": { + "key": "", + "text": "" + }, "venturetype": 0, "ventureavatar": [], "herocolor": 0, @@ -6369,6 +6665,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", + "bubbletalk": { + "key": "", + "text": "" + }, "venturetype": 0, "ventureavatar": [], "herocolor": 0, @@ -6475,6 +6775,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", + "bubbletalk": { + "key": "", + "text": "" + }, "venturetype": 0, "ventureavatar": [], "herocolor": 0, @@ -6539,6 +6843,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", + "bubbletalk": { + "key": "", + "text": "" + }, "venturetype": 0, "ventureavatar": [], "herocolor": 0, @@ -6603,6 +6911,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", + "bubbletalk": { + "key": "", + "text": "" + }, "venturetype": 0, "ventureavatar": [], "herocolor": 0, @@ -6667,6 +6979,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", + "bubbletalk": { + "key": "", + "text": "" + }, "venturetype": 0, "ventureavatar": [], "herocolor": 0, @@ -6773,6 +7089,10 @@ "openlevel": 0, "EditorStage": 0, "venturemodel": "", + "bubbletalk": { + "key": "", + "text": "" + }, "venturetype": 0, "ventureavatar": [], "herocolor": 0, @@ -6843,6 +7163,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", + "bubbletalk": { + "key": "", + "text": "" + }, "venturetype": 0, "ventureavatar": [], "herocolor": 0, @@ -6901,6 +7225,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", + "bubbletalk": { + "key": "", + "text": "" + }, "venturetype": 0, "ventureavatar": [], "herocolor": 0, @@ -7007,6 +7335,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", + "bubbletalk": { + "key": "", + "text": "" + }, "venturetype": 1, "ventureavatar": [ "Person/14002/14002_q.prefab" @@ -7115,6 +7447,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", + "bubbletalk": { + "key": "", + "text": "" + }, "venturetype": 0, "ventureavatar": [], "herocolor": 0, @@ -7221,6 +7557,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", + "bubbletalk": { + "key": "", + "text": "" + }, "venturetype": 0, "ventureavatar": [], "herocolor": 0, @@ -7327,6 +7667,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", + "bubbletalk": { + "key": "", + "text": "" + }, "venturetype": 0, "ventureavatar": [], "herocolor": 0, @@ -7433,6 +7777,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", + "bubbletalk": { + "key": "", + "text": "" + }, "venturetype": 0, "ventureavatar": [], "herocolor": 0, @@ -7539,6 +7887,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", + "bubbletalk": { + "key": "", + "text": "" + }, "venturetype": 0, "ventureavatar": [], "herocolor": 0, @@ -7645,6 +7997,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", + "bubbletalk": { + "key": "", + "text": "" + }, "venturetype": 0, "ventureavatar": [], "herocolor": 0, @@ -7751,6 +8107,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", + "bubbletalk": { + "key": "", + "text": "" + }, "venturetype": 0, "ventureavatar": [], "herocolor": 0, @@ -7857,6 +8217,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", + "bubbletalk": { + "key": "", + "text": "" + }, "venturetype": 0, "ventureavatar": [], "herocolor": 0, @@ -7963,6 +8327,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", + "bubbletalk": { + "key": "", + "text": "" + }, "venturetype": 0, "ventureavatar": [], "herocolor": 0, @@ -8069,6 +8437,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", + "bubbletalk": { + "key": "", + "text": "" + }, "venturetype": 0, "ventureavatar": [], "herocolor": 0, @@ -8175,6 +8547,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", + "bubbletalk": { + "key": "", + "text": "" + }, "venturetype": 0, "ventureavatar": [], "herocolor": 0, @@ -8281,6 +8657,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", + "bubbletalk": { + "key": "", + "text": "" + }, "venturetype": 0, "ventureavatar": [], "herocolor": 0, @@ -8387,6 +8767,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", + "bubbletalk": { + "key": "", + "text": "" + }, "venturetype": 0, "ventureavatar": [], "herocolor": 0, @@ -8493,6 +8877,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", + "bubbletalk": { + "key": "", + "text": "" + }, "venturetype": 0, "ventureavatar": [], "herocolor": 0, @@ -8599,6 +8987,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", + "bubbletalk": { + "key": "", + "text": "" + }, "venturetype": 0, "ventureavatar": [], "herocolor": 0, @@ -8705,6 +9097,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", + "bubbletalk": { + "key": "", + "text": "" + }, "venturetype": 0, "ventureavatar": [], "herocolor": 0, @@ -8811,6 +9207,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", + "bubbletalk": { + "key": "", + "text": "" + }, "venturetype": 0, "ventureavatar": [], "herocolor": 0, @@ -8915,6 +9315,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", + "bubbletalk": { + "key": "", + "text": "" + }, "venturetype": 0, "ventureavatar": [], "herocolor": 0, @@ -9019,6 +9423,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", + "bubbletalk": { + "key": "", + "text": "" + }, "venturetype": 0, "ventureavatar": [], "herocolor": 0, @@ -9123,6 +9531,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", + "bubbletalk": { + "key": "", + "text": "" + }, "venturetype": 0, "ventureavatar": [], "herocolor": 0, @@ -9227,6 +9639,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", + "bubbletalk": { + "key": "", + "text": "" + }, "venturetype": 0, "ventureavatar": [], "herocolor": 0, @@ -9331,6 +9747,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", + "bubbletalk": { + "key": "", + "text": "" + }, "venturetype": 0, "ventureavatar": [], "herocolor": 0, @@ -9435,6 +9855,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", + "bubbletalk": { + "key": "", + "text": "" + }, "venturetype": 0, "ventureavatar": [], "herocolor": 0, @@ -9539,6 +9963,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", + "bubbletalk": { + "key": "", + "text": "" + }, "venturetype": 0, "ventureavatar": [], "herocolor": 0, @@ -9643,6 +10071,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", + "bubbletalk": { + "key": "", + "text": "" + }, "venturetype": 0, "ventureavatar": [], "herocolor": 0, @@ -9747,6 +10179,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", + "bubbletalk": { + "key": "", + "text": "" + }, "venturetype": 0, "ventureavatar": [], "herocolor": 0, @@ -9851,6 +10287,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", + "bubbletalk": { + "key": "", + "text": "" + }, "venturetype": 0, "ventureavatar": [], "herocolor": 0, @@ -9955,6 +10395,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", + "bubbletalk": { + "key": "", + "text": "" + }, "venturetype": 0, "ventureavatar": [], "herocolor": 0, @@ -10059,6 +10503,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", + "bubbletalk": { + "key": "", + "text": "" + }, "venturetype": 0, "ventureavatar": [], "herocolor": 0, @@ -10163,6 +10611,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", + "bubbletalk": { + "key": "", + "text": "" + }, "venturetype": 0, "ventureavatar": [], "herocolor": 0, @@ -10267,6 +10719,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", + "bubbletalk": { + "key": "", + "text": "" + }, "venturetype": 0, "ventureavatar": [], "herocolor": 0, @@ -10371,6 +10827,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", + "bubbletalk": { + "key": "", + "text": "" + }, "venturetype": 0, "ventureavatar": [], "herocolor": 0, @@ -10475,6 +10935,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", + "bubbletalk": { + "key": "", + "text": "" + }, "venturetype": 0, "ventureavatar": [], "herocolor": 0, @@ -10579,6 +11043,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", + "bubbletalk": { + "key": "", + "text": "" + }, "venturetype": 0, "ventureavatar": [], "herocolor": 0, @@ -10683,6 +11151,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", + "bubbletalk": { + "key": "", + "text": "" + }, "venturetype": 0, "ventureavatar": [], "herocolor": 0, @@ -10787,6 +11259,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", + "bubbletalk": { + "key": "", + "text": "" + }, "venturetype": 0, "ventureavatar": [], "herocolor": 0, @@ -10891,6 +11367,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", + "bubbletalk": { + "key": "", + "text": "" + }, "venturetype": 0, "ventureavatar": [], "herocolor": 0, @@ -10995,6 +11475,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", + "bubbletalk": { + "key": "", + "text": "" + }, "venturetype": 0, "ventureavatar": [], "herocolor": 0, @@ -11099,6 +11583,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", + "bubbletalk": { + "key": "", + "text": "" + }, "venturetype": 0, "ventureavatar": [], "herocolor": 0, @@ -11203,6 +11691,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", + "bubbletalk": { + "key": "", + "text": "" + }, "venturetype": 0, "ventureavatar": [], "herocolor": 0, @@ -11307,6 +11799,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", + "bubbletalk": { + "key": "", + "text": "" + }, "venturetype": 0, "ventureavatar": [], "herocolor": 0, @@ -11411,6 +11907,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", + "bubbletalk": { + "key": "", + "text": "" + }, "venturetype": 0, "ventureavatar": [], "herocolor": 0, @@ -11515,6 +12015,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", + "bubbletalk": { + "key": "", + "text": "" + }, "venturetype": 0, "ventureavatar": [], "herocolor": 0, @@ -11619,6 +12123,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", + "bubbletalk": { + "key": "", + "text": "" + }, "venturetype": 0, "ventureavatar": [], "herocolor": 0, @@ -11723,6 +12231,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", + "bubbletalk": { + "key": "", + "text": "" + }, "venturetype": 0, "ventureavatar": [], "herocolor": 0, @@ -11827,6 +12339,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", + "bubbletalk": { + "key": "", + "text": "" + }, "venturetype": 0, "ventureavatar": [], "herocolor": 0, @@ -11931,6 +12447,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", + "bubbletalk": { + "key": "", + "text": "" + }, "venturetype": 0, "ventureavatar": [], "herocolor": 0, @@ -12035,6 +12555,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", + "bubbletalk": { + "key": "", + "text": "" + }, "venturetype": 0, "ventureavatar": [], "herocolor": 0, @@ -12139,6 +12663,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", + "bubbletalk": { + "key": "", + "text": "" + }, "venturetype": 0, "ventureavatar": [], "herocolor": 0, @@ -12243,6 +12771,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", + "bubbletalk": { + "key": "", + "text": "" + }, "venturetype": 0, "ventureavatar": [], "herocolor": 0, @@ -12347,6 +12879,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", + "bubbletalk": { + "key": "", + "text": "" + }, "venturetype": 0, "ventureavatar": [], "herocolor": 0, @@ -12451,6 +12987,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", + "bubbletalk": { + "key": "", + "text": "" + }, "venturetype": 0, "ventureavatar": [], "herocolor": 0, @@ -12555,6 +13095,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", + "bubbletalk": { + "key": "", + "text": "" + }, "venturetype": 0, "ventureavatar": [], "herocolor": 0, @@ -12659,6 +13203,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", + "bubbletalk": { + "key": "", + "text": "" + }, "venturetype": 0, "ventureavatar": [], "herocolor": 0, @@ -12763,6 +13311,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", + "bubbletalk": { + "key": "", + "text": "" + }, "venturetype": 0, "ventureavatar": [], "herocolor": 0, @@ -12867,6 +13419,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", + "bubbletalk": { + "key": "", + "text": "" + }, "venturetype": 0, "ventureavatar": [], "herocolor": 0, @@ -12971,6 +13527,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", + "bubbletalk": { + "key": "", + "text": "" + }, "venturetype": 0, "ventureavatar": [], "herocolor": 0, @@ -13075,6 +13635,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", + "bubbletalk": { + "key": "", + "text": "" + }, "venturetype": 0, "ventureavatar": [], "herocolor": 0, @@ -13179,6 +13743,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", + "bubbletalk": { + "key": "", + "text": "" + }, "venturetype": 0, "ventureavatar": [], "herocolor": 0, @@ -13283,6 +13851,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", + "bubbletalk": { + "key": "", + "text": "" + }, "venturetype": 0, "ventureavatar": [], "herocolor": 0, @@ -13387,6 +13959,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", + "bubbletalk": { + "key": "", + "text": "" + }, "venturetype": 0, "ventureavatar": [], "herocolor": 0, @@ -13491,6 +14067,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", + "bubbletalk": { + "key": "", + "text": "" + }, "venturetype": 0, "ventureavatar": [], "herocolor": 0, @@ -13595,6 +14175,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", + "bubbletalk": { + "key": "", + "text": "" + }, "venturetype": 0, "ventureavatar": [], "herocolor": 0, @@ -13699,6 +14283,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", + "bubbletalk": { + "key": "", + "text": "" + }, "venturetype": 0, "ventureavatar": [], "herocolor": 0, @@ -13803,6 +14391,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", + "bubbletalk": { + "key": "", + "text": "" + }, "venturetype": 0, "ventureavatar": [], "herocolor": 0, @@ -13907,6 +14499,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", + "bubbletalk": { + "key": "", + "text": "" + }, "venturetype": 0, "ventureavatar": [], "herocolor": 0, @@ -14011,6 +14607,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", + "bubbletalk": { + "key": "", + "text": "" + }, "venturetype": 0, "ventureavatar": [], "herocolor": 0, @@ -14115,6 +14715,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", + "bubbletalk": { + "key": "", + "text": "" + }, "venturetype": 0, "ventureavatar": [], "herocolor": 0, @@ -14219,6 +14823,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", + "bubbletalk": { + "key": "", + "text": "" + }, "venturetype": 0, "ventureavatar": [], "herocolor": 0, @@ -14323,6 +14931,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", + "bubbletalk": { + "key": "", + "text": "" + }, "venturetype": 0, "ventureavatar": [], "herocolor": 0, @@ -14427,6 +15039,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", + "bubbletalk": { + "key": "", + "text": "" + }, "venturetype": 0, "ventureavatar": [], "herocolor": 0, @@ -14531,6 +15147,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", + "bubbletalk": { + "key": "", + "text": "" + }, "venturetype": 0, "ventureavatar": [], "herocolor": 0, @@ -14635,6 +15255,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", + "bubbletalk": { + "key": "", + "text": "" + }, "venturetype": 0, "ventureavatar": [], "herocolor": 0, @@ -14739,6 +15363,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", + "bubbletalk": { + "key": "", + "text": "" + }, "venturetype": 0, "ventureavatar": [], "herocolor": 0, @@ -14843,6 +15471,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", + "bubbletalk": { + "key": "", + "text": "" + }, "venturetype": 0, "ventureavatar": [], "herocolor": 0, @@ -14947,6 +15579,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", + "bubbletalk": { + "key": "", + "text": "" + }, "venturetype": 0, "ventureavatar": [], "herocolor": 0, @@ -15051,6 +15687,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", + "bubbletalk": { + "key": "", + "text": "" + }, "venturetype": 0, "ventureavatar": [], "herocolor": 0, @@ -15155,6 +15795,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", + "bubbletalk": { + "key": "", + "text": "" + }, "venturetype": 0, "ventureavatar": [], "herocolor": 0, @@ -15259,6 +15903,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", + "bubbletalk": { + "key": "", + "text": "" + }, "venturetype": 0, "ventureavatar": [], "herocolor": 0, @@ -15363,6 +16011,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", + "bubbletalk": { + "key": "", + "text": "" + }, "venturetype": 0, "ventureavatar": [], "herocolor": 0, @@ -15467,6 +16119,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", + "bubbletalk": { + "key": "", + "text": "" + }, "venturetype": 0, "ventureavatar": [], "herocolor": 0, @@ -15571,6 +16227,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", + "bubbletalk": { + "key": "", + "text": "" + }, "venturetype": 0, "ventureavatar": [], "herocolor": 0, @@ -15675,6 +16335,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", + "bubbletalk": { + "key": "", + "text": "" + }, "venturetype": 0, "ventureavatar": [], "herocolor": 0, @@ -15779,6 +16443,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", + "bubbletalk": { + "key": "", + "text": "" + }, "venturetype": 0, "ventureavatar": [], "herocolor": 0, @@ -15883,6 +16551,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", + "bubbletalk": { + "key": "", + "text": "" + }, "venturetype": 0, "ventureavatar": [], "herocolor": 0, diff --git a/bin/json/game_skillafteratk.json b/bin/json/game_skillafteratk.json index bce0648b8..e226a9326 100644 --- a/bin/json/game_skillafteratk.json +++ b/bin/json/game_skillafteratk.json @@ -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": [], diff --git a/bin/json/game_stoneprivilege.json b/bin/json/game_stoneprivilege.json index 98eace06f..f745148ae 100644 --- a/bin/json/game_stoneprivilege.json +++ b/bin/json/game_stoneprivilege.json @@ -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 } ] \ No newline at end of file diff --git a/bin/json/game_stoneroom.json b/bin/json/game_stoneroom.json index b9f0d424c..7993d1d67 100644 --- a/bin/json/game_stoneroom.json +++ b/bin/json/game_stoneroom.json @@ -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, diff --git a/bin/json/game_stonestage.json b/bin/json/game_stonestage.json index 32f6778e7..7e123abde 100644 --- a/bin/json/game_stonestage.json +++ b/bin/json/game_stonestage.json @@ -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 diff --git a/modules/activity/module.go b/modules/activity/module.go index fedbe04d5..d0c2ace69 100644 --- a/modules/activity/module.go +++ b/modules/activity/module.go @@ -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++ diff --git a/modules/caravan/api_buyorsell.go b/modules/caravan/api_buyorsell.go index 57d73f726..62736b189 100644 --- a/modules/caravan/api_buyorsell.go +++ b/modules/caravan/api_buyorsell.go @@ -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 } diff --git a/modules/hero/hero_test.go b/modules/hero/hero_test.go index 0d42c30a9..396bf4ef0 100644 --- a/modules/hero/hero_test.go +++ b/modules/hero/hero_test.go @@ -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 { diff --git a/modules/stonehenge/api_finish.go b/modules/stonehenge/api_finish.go index 8b20f733f..6b8531176 100644 --- a/modules/stonehenge/api_finish.go +++ b/modules/stonehenge/api_finish.go @@ -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 } diff --git a/modules/stonehenge/api_getlist.go b/modules/stonehenge/api_getlist.go index 8e4d2d47d..2c87ea191 100644 --- a/modules/stonehenge/api_getlist.go +++ b/modules/stonehenge/api_getlist.go @@ -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, diff --git a/modules/user/model_user.go b/modules/user/model_user.go index b82d3226a..d6754663a 100644 --- a/modules/user/model_user.go +++ b/modules/user/model_user.go @@ -379,21 +379,22 @@ 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{} + model *db.DBModel + 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) } diff --git a/pb/stonehenge_msg.pb.go b/pb/stonehenge_msg.pb.go index 9a08fac0f..c68e4b056 100644 --- a/pb/stonehenge_msg.pb.go +++ b/pb/stonehenge_msg.pb.go @@ -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() } diff --git a/sys/configure/structs/Game.MainStageData.go b/sys/configure/structs/Game.MainStageData.go index 0ae921fcb..7ad20d02f 100644 --- a/sys/configure/structs/Game.MainStageData.go +++ b/sys/configure/structs/Game.MainStageData.go @@ -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{} diff --git a/sys/configure/structs/Game.drawReplaceData.go b/sys/configure/structs/Game.drawReplaceData.go index 05c4e0831..7c7db52ee 100644 --- a/sys/configure/structs/Game.drawReplaceData.go +++ b/sys/configure/structs/Game.drawReplaceData.go @@ -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 }