diff --git a/bin/json/game_buriedcondi.json b/bin/json/game_buriedcondi.json index edabd462e..43251a352 100644 --- a/bin/json/game_buriedcondi.json +++ b/bin/json/game_buriedcondi.json @@ -24449,6 +24449,148 @@ "filter": [], "filter2": [] }, + { + "id": 14000001, + "rtype": 1, + "ctype": 1, + "notify": [], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_864", + "text": "备用埋点" + }, + "type": 130, + "valid": 0, + "head": { + "a": "attr", + "t": "gold", + "n": 1 + }, + "NPC": 0, + "value": 1000, + "filter": [], + "filter2": [] + }, + { + "id": 14000002, + "rtype": 1, + "ctype": 1, + "notify": [], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_865", + "text": "挑战悍娇虎" + }, + "type": 70, + "valid": 0, + "head": { + "a": "attr", + "t": "gold", + "n": 1 + }, + "NPC": 300028, + "value": 1, + "filter": [ + 124 + ], + "filter2": [] + }, + { + "id": 14000003, + "rtype": 1, + "ctype": 1, + "notify": [], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_866", + "text": "收集木炭" + }, + "type": 187, + "valid": 0, + "head": { + "a": "attr", + "t": "gold", + "n": 1 + }, + "NPC": 300038, + "value": 3, + "filter": [ + 13000004 + ], + "filter2": [] + }, + { + "id": 14000004, + "rtype": 1, + "ctype": 1, + "notify": [], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_867", + "text": "加入鼻涕粗战斗" + }, + "type": 70, + "valid": 1, + "head": { + "a": "attr", + "t": "gold", + "n": 2 + }, + "NPC": 300048, + "value": 1, + "filter": [ + 125 + ], + "filter2": [] + }, + { + "id": 14000005, + "rtype": 1, + "ctype": 1, + "notify": [], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_868", + "text": "阻止他们战斗" + }, + "type": 70, + "valid": 2, + "head": { + "a": "attr", + "t": "gold", + "n": 3 + }, + "NPC": 300058, + "value": 1, + "filter": [ + 126 + ], + "filter2": [] + }, + { + "id": 14000006, + "rtype": 1, + "ctype": 1, + "notify": [], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_869", + "text": "和鼻涕粗聊聊" + }, + "type": 20001, + "valid": 3, + "head": { + "a": "attr", + "t": "gold", + "n": 4 + }, + "NPC": 300618, + "value": 1, + "filter": [ + 300170 + ], + "filter2": [] + }, { "id": 15000001, "rtype": 2, diff --git a/bin/json/game_caravanreward.json b/bin/json/game_caravanreward.json index 5df853507..1336106d4 100644 --- a/bin/json/game_caravanreward.json +++ b/bin/json/game_caravanreward.json @@ -1,7 +1,7 @@ [ { "id": 1, - "key": 1000, + "key": 3000, "reward": [ { "a": "attr", @@ -12,7 +12,7 @@ }, { "id": 2, - "key": 2000, + "key": 4000, "reward": [ { "a": "attr", @@ -23,7 +23,7 @@ }, { "id": 3, - "key": 3000, + "key": 5000, "reward": [ { "a": "attr", @@ -34,7 +34,7 @@ }, { "id": 4, - "key": 4000, + "key": 6000, "reward": [ { "a": "attr", @@ -45,7 +45,7 @@ }, { "id": 5, - "key": 5000, + "key": 7000, "reward": [ { "a": "attr", diff --git a/bin/json/game_global.json b/bin/json/game_global.json index 57de98d76..595d7bdd9 100644 --- a/bin/json/game_global.json +++ b/bin/json/game_global.json @@ -43,7 +43,7 @@ "load_chat": 10, "channel_allocation_max": 2000, "channel_switching_max": 3000, - "draw_toplimit": 9999, + "draw_toplimit": 20, "draw10_star4_max": 8, "draw10_star5_max": 2, "draw_floor_star4": 20, diff --git a/bin/json/game_hero.json b/bin/json/game_hero.json index 98f8bd5a3..5522a38d0 100644 --- a/bin/json/game_hero.json +++ b/bin/json/game_hero.json @@ -21,6 +21,7 @@ "tujing": [ 107 ], + "detailwindow": "effect_chezhan", "intr": { "key": "herointr_13001", "text": "" @@ -94,6 +95,7 @@ "tujing": [ 107 ], + "detailwindow": "effect_chezhan", "intr": { "key": "", "text": "" @@ -167,6 +169,7 @@ "tujing": [ 107 ], + "detailwindow": "effect_chezhan", "intr": { "key": "", "text": "" @@ -240,6 +243,7 @@ "tujing": [ 107 ], + "detailwindow": "effect_chezhan", "intr": { "key": "", "text": "" @@ -313,6 +317,7 @@ "tujing": [ 107 ], + "detailwindow": "effect_chezhan", "intr": { "key": "", "text": "" @@ -386,6 +391,7 @@ "tujing": [ 107 ], + "detailwindow": "effect_chezhan", "intr": { "key": "", "text": "" @@ -459,6 +465,7 @@ "tujing": [ 107 ], + "detailwindow": "effect_chezhan", "intr": { "key": "", "text": "" @@ -532,6 +539,7 @@ "tujing": [ 107 ], + "detailwindow": "effect_chezhan", "intr": { "key": "", "text": "" @@ -605,6 +613,7 @@ "tujing": [ 107 ], + "detailwindow": "effect_gongfuxiongmao", "intr": { "key": "", "text": "" @@ -678,6 +687,7 @@ "tujing": [ 107 ], + "detailwindow": "effect_gongfuxiongmao", "intr": { "key": "", "text": "" @@ -751,6 +761,7 @@ "tujing": [ 107 ], + "detailwindow": "effect_gongfuxiongmao", "intr": { "key": "", "text": "" @@ -824,6 +835,7 @@ "tujing": [ 107 ], + "detailwindow": "effect_gongfuxiongmao", "intr": { "key": "", "text": "" @@ -897,6 +909,7 @@ "tujing": [ 107 ], + "detailwindow": "effect_gongfuxiongmao", "intr": { "key": "", "text": "" @@ -970,6 +983,7 @@ "tujing": [ 107 ], + "detailwindow": "effect_gongfuxiongmao", "intr": { "key": "", "text": "" @@ -1043,6 +1057,7 @@ "tujing": [ 107 ], + "detailwindow": "effect_gongfuxiongmao", "intr": { "key": "", "text": "" @@ -1116,6 +1131,7 @@ "tujing": [ 107 ], + "detailwindow": "effect_gongfuxiongmao", "intr": { "key": "", "text": "" @@ -1189,6 +1205,7 @@ "tujing": [ 107 ], + "detailwindow": "effect_huaidanlianmeng", "intr": { "key": "", "text": "" @@ -1262,6 +1279,7 @@ "tujing": [ 107 ], + "detailwindow": "effect_huaidanlianmeng", "intr": { "key": "", "text": "" @@ -1335,6 +1353,7 @@ "tujing": [ 107 ], + "detailwindow": "effect_huaidanlianmeng", "intr": { "key": "", "text": "" @@ -1408,6 +1427,7 @@ "tujing": [ 107 ], + "detailwindow": "effect_huaidanlianmeng", "intr": { "key": "", "text": "" @@ -1481,6 +1501,7 @@ "tujing": [ 107 ], + "detailwindow": "effect_huaidanlianmeng", "intr": { "key": "", "text": "" @@ -1554,6 +1575,7 @@ "tujing": [ 107 ], + "detailwindow": "effect_huaidanlianmeng", "intr": { "key": "", "text": "" @@ -1627,6 +1649,7 @@ "tujing": [ 107 ], + "detailwindow": "effect_huaidanlianmeng", "intr": { "key": "", "text": "" @@ -1700,6 +1723,7 @@ "tujing": [ 107 ], + "detailwindow": "effect_huaidanlianmeng", "intr": { "key": "", "text": "" @@ -1773,6 +1797,7 @@ "tujing": [ 107 ], + "detailwindow": "effect_shilaike", "intr": { "key": "", "text": "" @@ -1846,6 +1871,7 @@ "tujing": [ 107 ], + "detailwindow": "effect_shilaike", "intr": { "key": "", "text": "" @@ -1919,6 +1945,7 @@ "tujing": [ 107 ], + "detailwindow": "effect_shilaike", "intr": { "key": "", "text": "" @@ -1992,6 +2019,7 @@ "tujing": [ 107 ], + "detailwindow": "effect_shilaike", "intr": { "key": "", "text": "" @@ -2065,6 +2093,7 @@ "tujing": [ 107 ], + "detailwindow": "effect_shilaike", "intr": { "key": "", "text": "" @@ -2138,6 +2167,7 @@ "tujing": [ 107 ], + "detailwindow": "effect_shilaike", "intr": { "key": "", "text": "" @@ -2211,6 +2241,7 @@ "tujing": [ 107 ], + "detailwindow": "effect_shilaike", "intr": { "key": "", "text": "" @@ -2284,6 +2315,7 @@ "tujing": [ 107 ], + "detailwindow": "effect_shilaike", "intr": { "key": "", "text": "" @@ -2357,6 +2389,7 @@ "tujing": [ 107 ], + "detailwindow": "effect_xunlong", "intr": { "key": "", "text": "" @@ -2430,6 +2463,7 @@ "tujing": [ 107 ], + "detailwindow": "effect_xunlong", "intr": { "key": "", "text": "" @@ -2503,6 +2537,7 @@ "tujing": [ 107 ], + "detailwindow": "effect_xunlong", "intr": { "key": "", "text": "" @@ -2576,6 +2611,7 @@ "tujing": [ 107 ], + "detailwindow": "effect_xunlong", "intr": { "key": "", "text": "" @@ -2649,6 +2685,7 @@ "tujing": [ 107 ], + "detailwindow": "effect_xunlong", "intr": { "key": "", "text": "" @@ -2722,6 +2759,7 @@ "tujing": [ 107 ], + "detailwindow": "effect_xunlong", "intr": { "key": "", "text": "" @@ -2795,6 +2833,7 @@ "tujing": [ 107 ], + "detailwindow": "effect_xunlong", "intr": { "key": "", "text": "" @@ -2868,6 +2907,7 @@ "tujing": [ 107 ], + "detailwindow": "effect_xunlong", "intr": { "key": "", "text": "" @@ -2941,6 +2981,7 @@ "tujing": [ 107 ], + "detailwindow": "effect_gongfuxiongmao", "intr": { "key": "", "text": "" @@ -3014,6 +3055,7 @@ "tujing": [ 107 ], + "detailwindow": "effect_gongfuxiongmao", "intr": { "key": "", "text": "" @@ -3087,6 +3129,7 @@ "tujing": [ 107 ], + "detailwindow": "effect_gongfuxiongmao", "intr": { "key": "", "text": "" @@ -3160,6 +3203,7 @@ "tujing": [ 107 ], + "detailwindow": "effect_gongfuxiongmao", "intr": { "key": "", "text": "" @@ -3233,6 +3277,7 @@ "tujing": [ 107 ], + "detailwindow": "effect_gongfuxiongmao", "intr": { "key": "", "text": "" @@ -3306,6 +3351,7 @@ "tujing": [ 107 ], + "detailwindow": "effect_gongfuxiongmao", "intr": { "key": "", "text": "" @@ -3379,6 +3425,7 @@ "tujing": [ 107 ], + "detailwindow": "effect_gongfuxiongmao", "intr": { "key": "", "text": "" @@ -3452,6 +3499,7 @@ "tujing": [ 107 ], + "detailwindow": "effect_gongfuxiongmao", "intr": { "key": "", "text": "" @@ -3525,6 +3573,7 @@ "tujing": [ 107 ], + "detailwindow": "effect_huaidanlianmeng", "intr": { "key": "", "text": "" @@ -3598,6 +3647,7 @@ "tujing": [ 107 ], + "detailwindow": "effect_huaidanlianmeng", "intr": { "key": "", "text": "" @@ -3671,6 +3721,7 @@ "tujing": [ 107 ], + "detailwindow": "effect_huaidanlianmeng", "intr": { "key": "", "text": "" @@ -3744,6 +3795,7 @@ "tujing": [ 107 ], + "detailwindow": "effect_huaidanlianmeng", "intr": { "key": "", "text": "" @@ -3817,6 +3869,7 @@ "tujing": [ 107 ], + "detailwindow": "effect_huaidanlianmeng", "intr": { "key": "", "text": "" @@ -3890,6 +3943,7 @@ "tujing": [ 107 ], + "detailwindow": "effect_huaidanlianmeng", "intr": { "key": "", "text": "" @@ -3963,6 +4017,7 @@ "tujing": [ 107 ], + "detailwindow": "effect_huaidanlianmeng", "intr": { "key": "", "text": "" @@ -4036,6 +4091,7 @@ "tujing": [ 107 ], + "detailwindow": "effect_huaidanlianmeng", "intr": { "key": "", "text": "" @@ -4109,6 +4165,7 @@ "tujing": [ 107 ], + "detailwindow": "effect_xunlong", "intr": { "key": "", "text": "" @@ -4182,6 +4239,7 @@ "tujing": [ 107 ], + "detailwindow": "effect_xunlong", "intr": { "key": "", "text": "" @@ -4255,6 +4313,7 @@ "tujing": [ 107 ], + "detailwindow": "effect_xunlong", "intr": { "key": "", "text": "" @@ -4328,6 +4387,7 @@ "tujing": [ 107 ], + "detailwindow": "effect_xunlong", "intr": { "key": "", "text": "" @@ -4401,6 +4461,7 @@ "tujing": [ 107 ], + "detailwindow": "effect_xunlong", "intr": { "key": "", "text": "" @@ -4474,6 +4535,7 @@ "tujing": [ 107 ], + "detailwindow": "effect_xunlong", "intr": { "key": "", "text": "" @@ -4547,6 +4609,7 @@ "tujing": [ 107 ], + "detailwindow": "effect_xunlong", "intr": { "key": "", "text": "" @@ -4620,6 +4683,7 @@ "tujing": [ 107 ], + "detailwindow": "effect_xunlong", "intr": { "key": "", "text": "" @@ -4693,6 +4757,7 @@ "tujing": [ 107 ], + "detailwindow": "effect_chezhan", "intr": { "key": "", "text": "" @@ -4766,6 +4831,7 @@ "tujing": [ 107 ], + "detailwindow": "effect_chezhan", "intr": { "key": "", "text": "" @@ -4839,6 +4905,7 @@ "tujing": [ 107 ], + "detailwindow": "effect_chezhan", "intr": { "key": "", "text": "" @@ -4912,6 +4979,7 @@ "tujing": [ 107 ], + "detailwindow": "effect_chezhan", "intr": { "key": "", "text": "" @@ -4985,6 +5053,7 @@ "tujing": [ 107 ], + "detailwindow": "effect_chezhan", "intr": { "key": "", "text": "" @@ -5058,6 +5127,7 @@ "tujing": [ 107 ], + "detailwindow": "effect_chezhan", "intr": { "key": "", "text": "" @@ -5131,6 +5201,7 @@ "tujing": [ 107 ], + "detailwindow": "effect_chezhan", "intr": { "key": "", "text": "" @@ -5204,6 +5275,7 @@ "tujing": [ 107 ], + "detailwindow": "effect_chezhan", "intr": { "key": "", "text": "" @@ -5277,6 +5349,7 @@ "tujing": [ 107 ], + "detailwindow": "effect_gongfuxiongmao", "intr": { "key": "", "text": "" @@ -5350,6 +5423,7 @@ "tujing": [ 107 ], + "detailwindow": "effect_gongfuxiongmao", "intr": { "key": "", "text": "" @@ -5423,6 +5497,7 @@ "tujing": [ 107 ], + "detailwindow": "effect_gongfuxiongmao", "intr": { "key": "", "text": "" @@ -5496,6 +5571,7 @@ "tujing": [ 107 ], + "detailwindow": "effect_gongfuxiongmao", "intr": { "key": "", "text": "" @@ -5569,6 +5645,7 @@ "tujing": [ 107 ], + "detailwindow": "effect_gongfuxiongmao", "intr": { "key": "", "text": "" @@ -5642,6 +5719,7 @@ "tujing": [ 107 ], + "detailwindow": "effect_gongfuxiongmao", "intr": { "key": "", "text": "" @@ -5715,6 +5793,7 @@ "tujing": [ 107 ], + "detailwindow": "effect_gongfuxiongmao", "intr": { "key": "", "text": "" @@ -5788,6 +5867,7 @@ "tujing": [ 107 ], + "detailwindow": "effect_gongfuxiongmao", "intr": { "key": "", "text": "" @@ -5861,6 +5941,7 @@ "tujing": [ 107 ], + "detailwindow": "effect_huaidanlianmeng", "intr": { "key": "", "text": "" @@ -5934,6 +6015,7 @@ "tujing": [ 107 ], + "detailwindow": "effect_huaidanlianmeng", "intr": { "key": "", "text": "" @@ -6007,6 +6089,7 @@ "tujing": [ 107 ], + "detailwindow": "effect_huaidanlianmeng", "intr": { "key": "", "text": "" @@ -6080,6 +6163,7 @@ "tujing": [ 107 ], + "detailwindow": "effect_huaidanlianmeng", "intr": { "key": "", "text": "" @@ -6153,6 +6237,7 @@ "tujing": [ 107 ], + "detailwindow": "effect_huaidanlianmeng", "intr": { "key": "", "text": "" @@ -6226,6 +6311,7 @@ "tujing": [ 107 ], + "detailwindow": "effect_huaidanlianmeng", "intr": { "key": "", "text": "" @@ -6299,6 +6385,7 @@ "tujing": [ 107 ], + "detailwindow": "effect_huaidanlianmeng", "intr": { "key": "", "text": "" @@ -6372,6 +6459,7 @@ "tujing": [ 107 ], + "detailwindow": "effect_huaidanlianmeng", "intr": { "key": "", "text": "" @@ -6445,6 +6533,7 @@ "tujing": [ 107 ], + "detailwindow": "effect_xunlong", "intr": { "key": "", "text": "" @@ -6518,6 +6607,7 @@ "tujing": [ 107 ], + "detailwindow": "effect_xunlong", "intr": { "key": "", "text": "" @@ -6591,6 +6681,7 @@ "tujing": [ 107 ], + "detailwindow": "effect_xunlong", "intr": { "key": "", "text": "" @@ -6664,6 +6755,7 @@ "tujing": [ 107 ], + "detailwindow": "effect_xunlong", "intr": { "key": "", "text": "" @@ -6737,6 +6829,7 @@ "tujing": [ 107 ], + "detailwindow": "effect_xunlong", "intr": { "key": "", "text": "" @@ -6810,6 +6903,7 @@ "tujing": [ 107 ], + "detailwindow": "effect_xunlong", "intr": { "key": "", "text": "" @@ -6883,6 +6977,7 @@ "tujing": [ 107 ], + "detailwindow": "effect_xunlong", "intr": { "key": "", "text": "" @@ -6956,6 +7051,7 @@ "tujing": [ 107 ], + "detailwindow": "effect_xunlong", "intr": { "key": "", "text": "" @@ -7029,6 +7125,7 @@ "tujing": [ 107 ], + "detailwindow": "effect_chezhan", "intr": { "key": "", "text": "" @@ -7102,6 +7199,7 @@ "tujing": [ 107 ], + "detailwindow": "effect_chezhan", "intr": { "key": "", "text": "" @@ -7175,6 +7273,7 @@ "tujing": [ 107 ], + "detailwindow": "effect_chezhan", "intr": { "key": "", "text": "" @@ -7248,6 +7347,7 @@ "tujing": [ 107 ], + "detailwindow": "effect_chezhan", "intr": { "key": "", "text": "" @@ -7323,6 +7423,7 @@ "tujing": [ 107 ], + "detailwindow": "effect_chezhan", "intr": { "key": "", "text": "" @@ -7396,6 +7497,7 @@ "tujing": [ 107 ], + "detailwindow": "effect_chezhan", "intr": { "key": "", "text": "" @@ -7469,6 +7571,7 @@ "tujing": [ 107 ], + "detailwindow": "effect_chezhan", "intr": { "key": "", "text": "" @@ -7542,6 +7645,7 @@ "tujing": [ 107 ], + "detailwindow": "effect_chezhan", "intr": { "key": "", "text": "" @@ -7615,6 +7719,7 @@ "tujing": [ 107 ], + "detailwindow": "effect_gongfuxiongmao", "intr": { "key": "", "text": "" @@ -7688,6 +7793,7 @@ "tujing": [ 107 ], + "detailwindow": "effect_gongfuxiongmao", "intr": { "key": "", "text": "" @@ -7761,6 +7867,7 @@ "tujing": [ 107 ], + "detailwindow": "effect_gongfuxiongmao", "intr": { "key": "", "text": "" @@ -7834,6 +7941,7 @@ "tujing": [ 107 ], + "detailwindow": "effect_gongfuxiongmao", "intr": { "key": "", "text": "" @@ -7907,6 +8015,7 @@ "tujing": [ 107 ], + "detailwindow": "effect_gongfuxiongmao", "intr": { "key": "", "text": "" @@ -7980,6 +8089,7 @@ "tujing": [ 107 ], + "detailwindow": "effect_gongfuxiongmao", "intr": { "key": "", "text": "" @@ -8053,6 +8163,7 @@ "tujing": [ 107 ], + "detailwindow": "effect_gongfuxiongmao", "intr": { "key": "", "text": "" @@ -8126,6 +8237,7 @@ "tujing": [ 107 ], + "detailwindow": "effect_gongfuxiongmao", "intr": { "key": "", "text": "" @@ -8199,6 +8311,7 @@ "tujing": [ 107 ], + "detailwindow": "effect_huaidanlianmeng", "intr": { "key": "", "text": "" @@ -8272,6 +8385,7 @@ "tujing": [ 107 ], + "detailwindow": "effect_huaidanlianmeng", "intr": { "key": "", "text": "" @@ -8345,6 +8459,7 @@ "tujing": [ 107 ], + "detailwindow": "effect_huaidanlianmeng", "intr": { "key": "", "text": "" @@ -8418,6 +8533,7 @@ "tujing": [ 107 ], + "detailwindow": "effect_huaidanlianmeng", "intr": { "key": "", "text": "" @@ -8491,6 +8607,7 @@ "tujing": [ 107 ], + "detailwindow": "effect_huaidanlianmeng", "intr": { "key": "", "text": "" @@ -8564,6 +8681,7 @@ "tujing": [ 107 ], + "detailwindow": "effect_huaidanlianmeng", "intr": { "key": "", "text": "" @@ -8637,6 +8755,7 @@ "tujing": [ 107 ], + "detailwindow": "effect_huaidanlianmeng", "intr": { "key": "", "text": "" @@ -8710,6 +8829,7 @@ "tujing": [ 107 ], + "detailwindow": "effect_huaidanlianmeng", "intr": { "key": "", "text": "" @@ -8783,6 +8903,7 @@ "tujing": [ 107 ], + "detailwindow": "effect_xunlong", "intr": { "key": "", "text": "" @@ -8856,6 +8977,7 @@ "tujing": [ 107 ], + "detailwindow": "effect_xunlong", "intr": { "key": "", "text": "" @@ -8929,6 +9051,7 @@ "tujing": [ 107 ], + "detailwindow": "effect_xunlong", "intr": { "key": "", "text": "" @@ -9002,6 +9125,7 @@ "tujing": [ 107 ], + "detailwindow": "effect_xunlong", "intr": { "key": "", "text": "" @@ -9075,6 +9199,7 @@ "tujing": [ 107 ], + "detailwindow": "effect_xunlong", "intr": { "key": "", "text": "" @@ -9148,6 +9273,7 @@ "tujing": [ 107 ], + "detailwindow": "effect_xunlong", "intr": { "key": "", "text": "" @@ -9221,6 +9347,7 @@ "tujing": [ 107 ], + "detailwindow": "effect_xunlong", "intr": { "key": "", "text": "" @@ -9294,6 +9421,7 @@ "tujing": [ 107 ], + "detailwindow": "effect_xunlong", "intr": { "key": "", "text": "" @@ -9367,6 +9495,7 @@ "tujing": [ 107 ], + "detailwindow": "effect_chezhan", "intr": { "key": "", "text": "" @@ -9440,6 +9569,7 @@ "tujing": [ 107 ], + "detailwindow": "effect_chezhan", "intr": { "key": "", "text": "" @@ -9513,6 +9643,7 @@ "tujing": [ 107 ], + "detailwindow": "effect_chezhan", "intr": { "key": "", "text": "" @@ -9586,6 +9717,7 @@ "tujing": [ 107 ], + "detailwindow": "effect_chezhan", "intr": { "key": "", "text": "" @@ -9659,6 +9791,7 @@ "tujing": [ 107 ], + "detailwindow": "effect_chezhan", "intr": { "key": "", "text": "" @@ -9732,6 +9865,7 @@ "tujing": [ 107 ], + "detailwindow": "effect_chezhan", "intr": { "key": "", "text": "" @@ -9805,6 +9939,7 @@ "tujing": [ 107 ], + "detailwindow": "effect_chezhan", "intr": { "key": "", "text": "" @@ -9878,6 +10013,7 @@ "tujing": [ 107 ], + "detailwindow": "effect_chezhan", "intr": { "key": "", "text": "" @@ -9951,6 +10087,7 @@ "tujing": [ 107 ], + "detailwindow": "effect_gongfuxiongmao", "intr": { "key": "", "text": "" @@ -10024,6 +10161,7 @@ "tujing": [ 107 ], + "detailwindow": "effect_gongfuxiongmao", "intr": { "key": "", "text": "" @@ -10097,6 +10235,7 @@ "tujing": [ 107 ], + "detailwindow": "effect_gongfuxiongmao", "intr": { "key": "", "text": "" @@ -10170,6 +10309,7 @@ "tujing": [ 107 ], + "detailwindow": "effect_gongfuxiongmao", "intr": { "key": "", "text": "" @@ -10243,6 +10383,7 @@ "tujing": [ 107 ], + "detailwindow": "effect_gongfuxiongmao", "intr": { "key": "", "text": "" @@ -10316,6 +10457,7 @@ "tujing": [ 107 ], + "detailwindow": "effect_gongfuxiongmao", "intr": { "key": "", "text": "" @@ -10389,6 +10531,7 @@ "tujing": [ 107 ], + "detailwindow": "effect_gongfuxiongmao", "intr": { "key": "", "text": "" @@ -10462,6 +10605,7 @@ "tujing": [ 107 ], + "detailwindow": "effect_gongfuxiongmao", "intr": { "key": "", "text": "" @@ -10535,6 +10679,7 @@ "tujing": [ 107 ], + "detailwindow": "effect_huaidanlianmeng", "intr": { "key": "", "text": "" @@ -10608,6 +10753,7 @@ "tujing": [ 107 ], + "detailwindow": "effect_huaidanlianmeng", "intr": { "key": "", "text": "" @@ -10681,6 +10827,7 @@ "tujing": [ 107 ], + "detailwindow": "effect_huaidanlianmeng", "intr": { "key": "", "text": "" @@ -10754,6 +10901,7 @@ "tujing": [ 107 ], + "detailwindow": "effect_huaidanlianmeng", "intr": { "key": "", "text": "" @@ -10827,6 +10975,7 @@ "tujing": [ 107 ], + "detailwindow": "effect_huaidanlianmeng", "intr": { "key": "", "text": "" @@ -10900,6 +11049,7 @@ "tujing": [ 107 ], + "detailwindow": "effect_huaidanlianmeng", "intr": { "key": "", "text": "" @@ -10973,6 +11123,7 @@ "tujing": [ 107 ], + "detailwindow": "effect_huaidanlianmeng", "intr": { "key": "", "text": "" @@ -11046,6 +11197,7 @@ "tujing": [ 107 ], + "detailwindow": "effect_huaidanlianmeng", "intr": { "key": "", "text": "" @@ -11119,6 +11271,7 @@ "tujing": [ 107 ], + "detailwindow": "effect_xunlong", "intr": { "key": "", "text": "" @@ -11192,6 +11345,7 @@ "tujing": [ 107 ], + "detailwindow": "effect_xunlong", "intr": { "key": "", "text": "" @@ -11265,6 +11419,7 @@ "tujing": [ 107 ], + "detailwindow": "effect_xunlong", "intr": { "key": "", "text": "" @@ -11338,6 +11493,7 @@ "tujing": [ 107 ], + "detailwindow": "effect_xunlong", "intr": { "key": "", "text": "" @@ -11411,6 +11567,7 @@ "tujing": [ 107 ], + "detailwindow": "effect_xunlong", "intr": { "key": "", "text": "" @@ -11484,6 +11641,7 @@ "tujing": [ 107 ], + "detailwindow": "effect_xunlong", "intr": { "key": "", "text": "" @@ -11557,6 +11715,7 @@ "tujing": [ 107 ], + "detailwindow": "effect_xunlong", "intr": { "key": "", "text": "" @@ -11630,6 +11789,7 @@ "tujing": [ 107 ], + "detailwindow": "effect_xunlong", "intr": { "key": "", "text": "" @@ -11703,6 +11863,7 @@ "tujing": [ 107 ], + "detailwindow": "effect_chezhan", "intr": { "key": "", "text": "" @@ -11776,6 +11937,7 @@ "tujing": [ 107 ], + "detailwindow": "effect_chezhan", "intr": { "key": "", "text": "" @@ -11849,6 +12011,7 @@ "tujing": [ 107 ], + "detailwindow": "effect_chezhan", "intr": { "key": "", "text": "" @@ -11922,6 +12085,7 @@ "tujing": [ 107 ], + "detailwindow": "effect_chezhan", "intr": { "key": "", "text": "" @@ -11995,6 +12159,7 @@ "tujing": [ 107 ], + "detailwindow": "effect_chezhan", "intr": { "key": "", "text": "" @@ -12068,6 +12233,7 @@ "tujing": [ 107 ], + "detailwindow": "effect_chezhan", "intr": { "key": "", "text": "" @@ -12141,6 +12307,7 @@ "tujing": [ 107 ], + "detailwindow": "effect_chezhan", "intr": { "key": "", "text": "" @@ -12214,6 +12381,7 @@ "tujing": [ 107 ], + "detailwindow": "effect_chezhan", "intr": { "key": "", "text": "" @@ -12287,6 +12455,7 @@ "tujing": [ 107 ], + "detailwindow": "effect_gongfuxiongmao", "intr": { "key": "", "text": "" @@ -12360,6 +12529,7 @@ "tujing": [ 107 ], + "detailwindow": "effect_gongfuxiongmao", "intr": { "key": "", "text": "" @@ -12433,6 +12603,7 @@ "tujing": [ 107 ], + "detailwindow": "effect_gongfuxiongmao", "intr": { "key": "", "text": "" @@ -12506,6 +12677,7 @@ "tujing": [ 107 ], + "detailwindow": "effect_gongfuxiongmao", "intr": { "key": "", "text": "" @@ -12579,6 +12751,7 @@ "tujing": [ 107 ], + "detailwindow": "effect_gongfuxiongmao", "intr": { "key": "", "text": "" @@ -12652,6 +12825,7 @@ "tujing": [ 107 ], + "detailwindow": "effect_gongfuxiongmao", "intr": { "key": "", "text": "" @@ -12725,6 +12899,7 @@ "tujing": [ 107 ], + "detailwindow": "effect_gongfuxiongmao", "intr": { "key": "", "text": "" @@ -12798,6 +12973,7 @@ "tujing": [ 107 ], + "detailwindow": "effect_gongfuxiongmao", "intr": { "key": "", "text": "" @@ -12871,6 +13047,7 @@ "tujing": [ 107 ], + "detailwindow": "effect_huaidanlianmeng", "intr": { "key": "", "text": "" @@ -12944,6 +13121,7 @@ "tujing": [ 107 ], + "detailwindow": "effect_huaidanlianmeng", "intr": { "key": "", "text": "" @@ -13017,6 +13195,7 @@ "tujing": [ 107 ], + "detailwindow": "effect_huaidanlianmeng", "intr": { "key": "", "text": "" @@ -13090,6 +13269,7 @@ "tujing": [ 107 ], + "detailwindow": "effect_huaidanlianmeng", "intr": { "key": "", "text": "" @@ -13163,6 +13343,7 @@ "tujing": [ 107 ], + "detailwindow": "effect_huaidanlianmeng", "intr": { "key": "", "text": "" @@ -13236,6 +13417,7 @@ "tujing": [ 107 ], + "detailwindow": "effect_huaidanlianmeng", "intr": { "key": "", "text": "" @@ -13309,6 +13491,7 @@ "tujing": [ 107 ], + "detailwindow": "effect_huaidanlianmeng", "intr": { "key": "", "text": "" @@ -13382,6 +13565,7 @@ "tujing": [ 107 ], + "detailwindow": "effect_huaidanlianmeng", "intr": { "key": "", "text": "" @@ -13455,6 +13639,7 @@ "tujing": [ 107 ], + "detailwindow": "effect_xunlong", "intr": { "key": "", "text": "" @@ -13528,6 +13713,7 @@ "tujing": [ 107 ], + "detailwindow": "effect_xunlong", "intr": { "key": "", "text": "" diff --git a/bin/json/game_passon.json b/bin/json/game_passon.json index f8d6a32bb..b8680842c 100644 --- a/bin/json/game_passon.json +++ b/bin/json/game_passon.json @@ -4,6 +4,7 @@ "openlv": 20, "cd": 24, "sift": 3, + "index": 0, "text": { "key": "passon_unlock_text_1", "text": "等级达到20开启" @@ -19,6 +20,7 @@ "openlv": 20, "cd": 24, "sift": 3, + "index": 1, "text": { "key": "passon_unlock_text_2", "text": "等级达到20开启" @@ -34,6 +36,7 @@ "openlv": 20, "cd": 24, "sift": 4, + "index": 0, "text": { "key": "passon_unlock_text_3", "text": "等级达到20开启" @@ -49,6 +52,7 @@ "openlv": 24, "cd": 24, "sift": 5, + "index": 0, "text": { "key": "passon_unlock_text_4", "text": "等级达到24开启" @@ -64,6 +68,7 @@ "openlv": 25, "cd": 24, "sift": 3, + "index": 2, "text": { "key": "passon_unlock_text_5", "text": "等级达到25开启" @@ -79,6 +84,7 @@ "openlv": 26, "cd": 24, "sift": 3, + "index": 3, "text": { "key": "passon_unlock_text_6", "text": "等级达到26开启" @@ -94,6 +100,7 @@ "openlv": 27, "cd": 24, "sift": 4, + "index": 1, "text": { "key": "passon_unlock_text_7", "text": "等级达到27开启" @@ -109,6 +116,7 @@ "openlv": 28, "cd": 24, "sift": 5, + "index": 1, "text": { "key": "passon_unlock_text_8", "text": "等级达到28开启" @@ -124,6 +132,7 @@ "openlv": 29, "cd": 24, "sift": 3, + "index": 4, "text": { "key": "passon_unlock_text_9", "text": "等级达到29开启" @@ -139,6 +148,7 @@ "openlv": 30, "cd": 24, "sift": 4, + "index": 2, "text": { "key": "passon_unlock_text_10", "text": "等级达到30开启" @@ -154,6 +164,7 @@ "openlv": 31, "cd": 24, "sift": 4, + "index": 3, "text": { "key": "passon_unlock_text_11", "text": "等级达到31开启" @@ -169,6 +180,7 @@ "openlv": 32, "cd": 24, "sift": 5, + "index": 2, "text": { "key": "passon_unlock_text_12", "text": "等级达到32开启" diff --git a/bin/json/game_rdtasknpc.json b/bin/json/game_rdtasknpc.json index 769d80abd..a260fbfb2 100644 --- a/bin/json/game_rdtasknpc.json +++ b/bin/json/game_rdtasknpc.json @@ -5246,6 +5246,365 @@ ], "goto": 0 }, + { + "id": 300010, + "heroid": 25001, + "datas": [ + "WuGuanScene", + "武馆的老虎" + ], + "event": [ + 2, + 300070 + ], + "goto": 0 + }, + { + "id": 300018, + "heroid": 25001, + "datas": [ + "GameMain" + ], + "event": [ + 0 + ], + "goto": 0 + }, + { + "id": 300019, + "heroid": 25001, + "datas": [ + "GameMain" + ], + "event": [ + 0 + ], + "goto": 0 + }, + { + "id": 300020, + "heroid": 25001, + "datas": [ + "GameMain", + "烹饪处的阿宝" + ], + "event": [ + 2, + 300080 + ], + "goto": 0 + }, + { + "id": 300028, + "heroid": 25001, + "datas": [ + "WuGuanScene", + "武馆的老虎" + ], + "event": [ + 2, + 300090 + ], + "goto": 0 + }, + { + "id": 300029, + "heroid": 25001, + "datas": [ + "WuGuanScene", + "武馆的老虎" + ], + "event": [ + 2, + 300100 + ], + "goto": 0 + }, + { + "id": 300030, + "heroid": 25001, + "datas": [ + "GameMain", + "功能入口-维京远征" + ], + "event": [ + 2, + 300110 + ], + "goto": 0 + }, + { + "id": 300038, + "heroid": 25001, + "datas": [ + "GameMain", + "装木炭的箱子" + ], + "event": [], + "goto": 0 + }, + { + "id": 300039, + "heroid": 25001, + "datas": [ + "GameMain", + "功能入口-维京远征" + ], + "event": [ + 2, + 300120 + ], + "goto": 0 + }, + { + "id": 300040, + "heroid": 25001, + "datas": [ + "GameMain", + "希卡普旁的亚丝翠" + ], + "event": [ + 2, + 300130 + ], + "goto": 0 + }, + { + "id": 300048, + "heroid": 25001, + "datas": [ + "GameMain", + "亚丝翠旁的鼻涕粗" + ], + "event": [ + 1, + 125 + ], + "goto": 0 + }, + { + "id": 300049, + "heroid": 25001, + "datas": [ + "GameMain" + ], + "event": [ + 0 + ], + "goto": 0 + }, + { + "id": 300050, + "heroid": 25001, + "datas": [ + "GameMain", + "亚丝翠旁的鼻涕粗" + ], + "event": [ + 2, + 300140 + ], + "goto": 0 + }, + { + "id": 300058, + "heroid": 25001, + "datas": [ + "GameMain", + "亚丝翠旁的鼻涕粗" + ], + "event": [ + 1, + 126 + ], + "goto": 0 + }, + { + "id": 300059, + "heroid": 25001, + "datas": [ + "GameMain" + ], + "event": [ + 0 + ], + "goto": 0 + }, + { + "id": 300060, + "heroid": 25001, + "datas": [ + "GameMain", + "亚丝翠旁的鼻涕粗" + ], + "event": [ + 2, + 300150 + ], + "goto": 0 + }, + { + "id": 300068, + "heroid": 25001, + "datas": [ + "GameMain" + ], + "event": [ + 0 + ], + "goto": 0 + }, + { + "id": 300069, + "heroid": 25001, + "datas": [ + "GameMain" + ], + "event": [ + 0 + ], + "goto": 0 + }, + { + "id": 300610, + "heroid": 25001, + "datas": [ + "GameMain", + "车站旁的鼻涕粗" + ], + "event": [ + 2, + 300160 + ], + "goto": 0 + }, + { + "id": 300618, + "heroid": 25001, + "datas": [ + "GameMain" + ], + "event": [ + 0 + ], + "goto": 0 + }, + { + "id": 300619, + "heroid": 25001, + "datas": [ + "GameMain" + ], + "event": [ + 0 + ], + "goto": 0 + }, + { + "id": 300620, + "heroid": 25001, + "datas": [ + "GameMain", + "希卡普旁的亚丝翠" + ], + "event": [ + 2, + 300170 + ], + "goto": 0 + }, + { + "id": 300628, + "heroid": 25001, + "datas": [ + "GameMain" + ], + "event": [ + 0 + ], + "goto": 0 + }, + { + "id": 300629, + "heroid": 25001, + "datas": [ + "GameMain" + ], + "event": [ + 0 + ], + "goto": 0 + }, + { + "id": 300070, + "heroid": 25001, + "datas": [ + "GameMain", + "功能入口-烹饪" + ], + "event": [ + 2, + 300180 + ], + "goto": 0 + }, + { + "id": 300078, + "heroid": 25001, + "datas": [ + "GameMain" + ], + "event": [ + 0 + ], + "goto": 0 + }, + { + "id": 300079, + "heroid": 25001, + "datas": [ + "GameMain" + ], + "event": [ + 0 + ], + "goto": 0 + }, + { + "id": 300080, + "heroid": 25001, + "datas": [ + "GameMain", + "铁匠铺门口的暴芙那特" + ], + "event": [ + 2, + 300190 + ], + "goto": 0 + }, + { + "id": 300088, + "heroid": 25001, + "datas": [ + "GameMain" + ], + "event": [ + 0 + ], + "goto": 0 + }, + { + "id": 300089, + "heroid": 25001, + "datas": [ + "GameMain" + ], + "event": [ + 0 + ], + "goto": 0 + }, { "id": 50010, "heroid": 25001, diff --git a/bin/json/game_skillafteratk.json b/bin/json/game_skillafteratk.json index 0b1769da9..858eb0d12 100644 --- a/bin/json/game_skillafteratk.json +++ b/bin/json/game_skillafteratk.json @@ -33153,7 +33153,7 @@ "Where": [], "Order": "", "Limit": 1, - "ExecuteCnt": 4, + "ExecuteCnt": 8, "Type": 1, "Argu": [ 1, diff --git a/bin/json/game_skillatk.json b/bin/json/game_skillatk.json index e67c2484b..6f11d9245 100644 --- a/bin/json/game_skillatk.json +++ b/bin/json/game_skillatk.json @@ -21536,7 +21536,7 @@ "key": "skill_skill_atk_Name_155003111", "text": "海盘车" }, - "ico": "jn_35002_1", + "ico": "jn_55003_1", "CorrectPos": 0, "IsMelee": 0, "act": "Skill_1", @@ -21565,7 +21565,7 @@ "key": "skill_skill_atk_Name_155003211", "text": "海星之息" }, - "ico": "jn_35002_2", + "ico": "jn_55003_2", "CorrectPos": 0, "IsMelee": 0, "act": "Skill_2", @@ -21595,7 +21595,7 @@ "key": "skill_skill_atk_Name_155003311", "text": "光·格尔之怒" }, - "ico": "jn_35002_3", + "ico": "jn_55003_3", "CorrectPos": 0, "IsMelee": 0, "act": "Skill_3", diff --git a/bin/json/game_worldbattle.json b/bin/json/game_worldbattle.json index 9e528de64..15eb592be 100644 --- a/bin/json/game_worldbattle.json +++ b/bin/json/game_worldbattle.json @@ -310,7 +310,7 @@ { "id": 123, "FormatList": [ - 700033 + 700032 ], "BattleReadyID": 126, "EventList": [], @@ -321,6 +321,48 @@ }, "carexe": 500 }, + { + "id": 124, + "FormatList": [ + 700032 + ], + "BattleReadyID": 126, + "EventList": [], + "playexp": { + "a": "attr", + "t": "exp", + "n": 0 + }, + "carexe": 501 + }, + { + "id": 125, + "FormatList": [ + 700032 + ], + "BattleReadyID": 126, + "EventList": [], + "playexp": { + "a": "attr", + "t": "exp", + "n": 0 + }, + "carexe": 502 + }, + { + "id": 126, + "FormatList": [ + 700032 + ], + "BattleReadyID": 126, + "EventList": [], + "playexp": { + "a": "attr", + "t": "exp", + "n": 0 + }, + "carexe": 503 + }, { "id": 180, "FormatList": [ diff --git a/bin/json/game_worldtask.json b/bin/json/game_worldtask.json index c5c63b534..c8ed348c3 100644 --- a/bin/json/game_worldtask.json +++ b/bin/json/game_worldtask.json @@ -5109,5 +5109,383 @@ "module": [ "caravan" ] + }, + { + "key": 300010, + "opencond": "", + "lock": 1, + "lockend": 999, + "ontxe": 0, + "id_after": 300020, + "group": 301, + "des": 3, + "icon": "25001", + "task_name": { + "key": "worldtask_world_task_task_name_122", + "text": "阿宝悍娇虎日常一" + }, + "task_details": { + "key": "worldtask_world_task_task_details_122", + "text": "阿宝悍娇虎日常一" + }, + "npctxt": { + "key": "worldtask_world_task_npctxt_122", + "text": "阿宝悍娇虎日常一" + }, + "npc": 300010, + "completetask": [], + "deliver_npc": 0, + "taskend_removeitem": [], + "auto_accept": 0, + "lock_add": 0, + "reword": [ + { + "a": "attr", + "t": "gold", + "n": 500 + } + ], + "module": [] + }, + { + "key": 300020, + "opencond": "", + "lock": 1, + "lockend": 999, + "ontxe": 300010, + "id_after": 0, + "group": 301, + "des": 3, + "icon": "25001", + "task_name": { + "key": "worldtask_world_task_task_name_123", + "text": "阿宝悍娇虎日常二" + }, + "task_details": { + "key": "worldtask_world_task_task_details_123", + "text": "阿宝悍娇虎日常二" + }, + "npctxt": { + "key": "worldtask_world_task_npctxt_123", + "text": "阿宝悍娇虎日常二" + }, + "npc": 300020, + "completetask": [ + 14000002 + ], + "deliver_npc": 300029, + "taskend_removeitem": [], + "auto_accept": 0, + "lock_add": 0, + "reword": [ + { + "a": "attr", + "t": "gold", + "n": 500 + } + ], + "module": [] + }, + { + "key": 300030, + "opencond": "", + "lock": 1, + "lockend": 999, + "ontxe": 0, + "id_after": 300040, + "group": 302, + "des": 3, + "icon": "25001", + "task_name": { + "key": "worldtask_world_task_task_name_124", + "text": "希卡普&亚丝翠&鼻涕粗日常一" + }, + "task_details": { + "key": "worldtask_world_task_task_details_124", + "text": "希卡普&亚丝翠&鼻涕粗日常一" + }, + "npctxt": { + "key": "worldtask_world_task_npctxt_124", + "text": "希卡普&亚丝翠&鼻涕粗日常一" + }, + "npc": 300030, + "completetask": [ + 14000003 + ], + "deliver_npc": 300039, + "taskend_removeitem": [], + "auto_accept": 0, + "lock_add": 0, + "reword": [ + { + "a": "attr", + "t": "gold", + "n": 500 + } + ], + "module": [] + }, + { + "key": 300040, + "opencond": "", + "lock": 1, + "lockend": 999, + "ontxe": 300030, + "id_after": 300050, + "group": 302, + "des": 3, + "icon": "25001", + "task_name": { + "key": "worldtask_world_task_task_name_125", + "text": "希卡普&亚丝翠&鼻涕粗日常二" + }, + "task_details": { + "key": "worldtask_world_task_task_details_125", + "text": "希卡普&亚丝翠&鼻涕粗日常二" + }, + "npctxt": { + "key": "worldtask_world_task_npctxt_125", + "text": "希卡普&亚丝翠&鼻涕粗日常二" + }, + "npc": 300040, + "completetask": [ + 14000004 + ], + "deliver_npc": 0, + "taskend_removeitem": [], + "auto_accept": 0, + "lock_add": 0, + "reword": [ + { + "a": "attr", + "t": "gold", + "n": 500 + } + ], + "module": [] + }, + { + "key": 300050, + "opencond": "", + "lock": 1, + "lockend": 999, + "ontxe": 300040, + "id_after": 300060, + "group": 302, + "des": 3, + "icon": "25001", + "task_name": { + "key": "worldtask_world_task_task_name_126", + "text": "希卡普&亚丝翠&鼻涕粗日常三" + }, + "task_details": { + "key": "worldtask_world_task_task_details_126", + "text": "希卡普&亚丝翠&鼻涕粗日常三" + }, + "npctxt": { + "key": "worldtask_world_task_npctxt_126", + "text": "希卡普&亚丝翠&鼻涕粗日常三" + }, + "npc": 300050, + "completetask": [ + 14000005 + ], + "deliver_npc": 0, + "taskend_removeitem": [], + "auto_accept": 0, + "lock_add": 0, + "reword": [ + { + "a": "attr", + "t": "gold", + "n": 500 + } + ], + "module": [] + }, + { + "key": 300060, + "opencond": "", + "lock": 1, + "lockend": 999, + "ontxe": 300050, + "id_after": 300061, + "group": 302, + "des": 3, + "icon": "25001", + "task_name": { + "key": "worldtask_world_task_task_name_127", + "text": "希卡普&亚丝翠&鼻涕粗日常四" + }, + "task_details": { + "key": "worldtask_world_task_task_details_127", + "text": "希卡普&亚丝翠&鼻涕粗日常四" + }, + "npctxt": { + "key": "worldtask_world_task_npctxt_127", + "text": "希卡普&亚丝翠&鼻涕粗日常四" + }, + "npc": 300060, + "completetask": [], + "deliver_npc": 0, + "taskend_removeitem": [], + "auto_accept": 0, + "lock_add": 0, + "reword": [ + { + "a": "attr", + "t": "gold", + "n": 500 + } + ], + "module": [] + }, + { + "key": 300061, + "opencond": "", + "lock": 1, + "lockend": 999, + "ontxe": 300060, + "id_after": 300062, + "group": 302, + "des": 3, + "icon": "25001", + "task_name": { + "key": "worldtask_world_task_task_name_128", + "text": "希卡普&亚丝翠&鼻涕粗日常四_1" + }, + "task_details": { + "key": "worldtask_world_task_task_details_128", + "text": "希卡普&亚丝翠&鼻涕粗日常四_1" + }, + "npctxt": { + "key": "worldtask_world_task_npctxt_128", + "text": "希卡普&亚丝翠&鼻涕粗日常四_1" + }, + "npc": 300610, + "completetask": [], + "deliver_npc": 0, + "taskend_removeitem": [], + "auto_accept": 0, + "lock_add": 0, + "reword": [ + { + "a": "attr", + "t": "gold", + "n": 500 + } + ], + "module": [] + }, + { + "key": 300062, + "opencond": "", + "lock": 1, + "lockend": 999, + "ontxe": 300061, + "id_after": 0, + "group": 302, + "des": 3, + "icon": "25001", + "task_name": { + "key": "worldtask_world_task_task_name_129", + "text": "希卡普&亚丝翠&鼻涕粗日常四_2" + }, + "task_details": { + "key": "worldtask_world_task_task_details_129", + "text": "希卡普&亚丝翠&鼻涕粗日常四_2" + }, + "npctxt": { + "key": "worldtask_world_task_npctxt_129", + "text": "希卡普&亚丝翠&鼻涕粗日常四_2" + }, + "npc": 300620, + "completetask": [], + "deliver_npc": 0, + "taskend_removeitem": [], + "auto_accept": 0, + "lock_add": 0, + "reword": [ + { + "a": "attr", + "t": "gold", + "n": 500 + } + ], + "module": [] + }, + { + "key": 300070, + "opencond": "", + "lock": 1, + "lockend": 999, + "ontxe": 300060, + "id_after": 0, + "group": 303, + "des": 3, + "icon": "25001", + "task_name": { + "key": "worldtask_world_task_task_name_130", + "text": "平先生的焦急" + }, + "task_details": { + "key": "worldtask_world_task_task_details_130", + "text": "平先生的焦急" + }, + "npctxt": { + "key": "worldtask_world_task_npctxt_130", + "text": "平先生的焦急" + }, + "npc": 300070, + "completetask": [], + "deliver_npc": 0, + "taskend_removeitem": [], + "auto_accept": 0, + "lock_add": 0, + "reword": [ + { + "a": "attr", + "t": "gold", + "n": 500 + } + ], + "module": [] + }, + { + "key": 300080, + "opencond": "", + "lock": 1, + "lockend": 999, + "ontxe": 300070, + "id_after": 0, + "group": 304, + "des": 3, + "icon": "25001", + "task_name": { + "key": "worldtask_world_task_task_name_131", + "text": "赛龙的故事" + }, + "task_details": { + "key": "worldtask_world_task_task_details_131", + "text": "赛龙的故事" + }, + "npctxt": { + "key": "worldtask_world_task_npctxt_131", + "text": "赛龙的故事" + }, + "npc": 300080, + "completetask": [], + "deliver_npc": 0, + "taskend_removeitem": [], + "auto_accept": 0, + "lock_add": 0, + "reword": [ + { + "a": "attr", + "t": "gold", + "n": 500 + } + ], + "module": [] } ] \ No newline at end of file diff --git a/comm/imodule.go b/comm/imodule.go index 87d1fc2a3..0e21346d8 100644 --- a/comm/imodule.go +++ b/comm/imodule.go @@ -514,6 +514,7 @@ type ( ICaravan interface { ITaskComplete TestFunc(session IUserSession) + TaskGroupComplete(session IUserSession, group int32) } //埋点中心 IBuried interface { diff --git a/modules/caravan/api_getlist.go b/modules/caravan/api_getlist.go index 1cd63f41e..a4fb77b8d 100644 --- a/modules/caravan/api_getlist.go +++ b/modules/caravan/api_getlist.go @@ -34,8 +34,15 @@ func (this *apiComp) GetList(session comm.IUserSession, req *pb.CaravanGetListRe } return } - if errdata = this.module.InitCaravanTicket(session, list.Lv); errdata != nil { - return + + if conf, _ := this.module.configure.GetCaravanLv(list.Lv); conf != nil { + if errdata = this.module.InitCaravanTicket(session, conf.Tickettop); errdata != nil { + return + } + list.Merchantmoney = conf.Moneynumtop.N + update := make(map[string]interface{}) + update["merchantmoney"] = list.Merchantmoney // 更新虚拟币 + this.module.modelCaravan.modifyCaravanDataByObjId(session.GetUserId(), update) } } // 刷新城市货物信息 diff --git a/modules/caravan/api_gotocity.go b/modules/caravan/api_gotocity.go index 2e53dd0bc..f66ee0ddd 100644 --- a/modules/caravan/api_gotocity.go +++ b/modules/caravan/api_gotocity.go @@ -77,17 +77,21 @@ func (this *apiComp) GotoCity(session comm.IUserSession, req *pb.CaravanGotoCity if bNewTask { // 到该城市随机一个新的任务 if newCity, e := this.module.configure.GetCaravanCity(req.City); e == nil { if elist, err := this.module.configure.GetCaravanEventByGroup(newCity.Cityevent); err == nil { - var randW []int32 + var sz []int32 for _, v := range elist { - randW = append(randW, v.Eventweight) + if _, ok := list.Group[v.Worldtask]; !ok { + sz = append(sz, v.Worldtask) + } + } + if len(sz) > 0 { // 容错处理 + var randW []int32 + for _, v := range sz { + randW = append(randW, v) + } + list.Eventid = sz[comm.GetRandW(randW)] } - list.Eventid = elist[comm.GetRandW(randW)].Id } - // 新的任务 - // list.Tasktime = configure.Now().Unix() - // if event := this.module.configure.GetCaravanEventById(list.Eventid); event != nil { - // list.Task = event.Worldtask // 对应世界任务组 - // } + } else { errdata = &pb.ErrorData{ Code: pb.ErrorCode_ConfigNoFound, diff --git a/modules/caravan/model_caravan.go b/modules/caravan/model_caravan.go index b31038659..351d532c6 100644 --- a/modules/caravan/model_caravan.go +++ b/modules/caravan/model_caravan.go @@ -40,6 +40,7 @@ func (this *modelCaravan) getCaravanList(uid string) (result *pb.DBCaravan, err Goods: map[string]*pb.Goods{}, City: map[int32]*pb.CityInfo{}, Oldprice: map[string]int32{}, + Group: make(map[int32]bool), } if err = this.Get(uid, result); err != nil && mgo.MongodbNil == err { // 创建一条数据 diff --git a/modules/caravan/module.go b/modules/caravan/module.go index 5ed3f73f8..b74ecc891 100644 --- a/modules/caravan/module.go +++ b/modules/caravan/module.go @@ -107,7 +107,7 @@ func (this *Caravan) InitCaravanCityData(uid string, data *pb.DBCaravan) { city.Exspecial = append(city.Exspecial, v.Exspecial...) } - city.ExspecialPCT = v.ExspecialnumWeight[comm.GetRandW(v.ExspecialnumWeight)] // 获取权重 + city.ExspecialPCT = v.Exspecialnum[comm.GetRandW(v.ExspecialnumWeight)] // 获取权重 if len(v.Exspecial) > int(v.ExspecialNum) { ids := utils.RandomNumbers(0, len(v.Exspecial), int(v.ExspecialNum)) @@ -119,8 +119,8 @@ func (this *Caravan) InitCaravanCityData(uid string, data *pb.DBCaravan) { city.Nextexspecial = append(city.Nextexspecial, v.Exspecial...) } - city.ExspecialPCT = v.ExspecialnumWeight[comm.GetRandW(v.ExspecialnumWeight)] // 获取权重 - city.NextexspecialPCT = v.ExspecialnumWeight[comm.GetRandW(v.ExspecialnumWeight)] // 获取权重 + //city.ExspecialPCT = v.Exspecialnum[comm.GetRandW(v.ExspecialnumWeight)] // 获取权重 + city.NextexspecialPCT = v.Exspecialnum[int(comm.GetRandW(v.ExspecialnumWeight))] // 获取权重 data.City[v.Id] = city } data.Rtime = configure.Now().Unix() // 修改时间 @@ -146,14 +146,12 @@ func (this *Caravan) InitCaravanItemData(uid string, data *pb.DBCaravan) { } // 初始化门票和虚拟币 -func (this *Caravan) InitCaravanTicket(session comm.IUserSession, lv int32) (errdata *pb.ErrorData) { +func (this *Caravan) InitCaravanTicket(session comm.IUserSession, tick *cfg.Gameatn) (errdata *pb.ErrorData) { - if conf, _ := this.modelCaravan.module.configure.GetCaravanLv(lv); conf != nil { - var res []*cfg.Gameatn - res = append(res, conf.Tickettop) - res = append(res, conf.Moneynumtop) - errdata = this.DispenseRes(session, res, true) // 推送门票和虚拟币资源 - } + var res []*cfg.Gameatn + res = append(res, tick) + //res = append(res, conf.Moneynumtop) + errdata = this.DispenseRes(session, res, true) // 推送门票和虚拟币资源 return } @@ -262,7 +260,7 @@ func (this *Caravan) refreshCaravanCityInfo(uid string, caravan *pb.DBCaravan) { } else { v.Exspecial = append(v.Exspecial, conf.Exspecial...) } - v.NextexspecialPCT = conf.ExspecialnumWeight[comm.GetRandW(conf.ExspecialnumWeight)] // 获取权重 + v.NextexspecialPCT = conf.Exspecialnum[comm.GetRandW(conf.ExspecialnumWeight)] // 获取权重 } else { v.Exspecial = make([]string, 0) v.Exspecial = append(v.Exspecial, v.Nextexspecial...) @@ -278,7 +276,7 @@ func (this *Caravan) refreshCaravanCityInfo(uid string, caravan *pb.DBCaravan) { } else { v.Nextexspecial = append(v.Nextexspecial, conf.Exspecial...) } - v.NextexspecialPCT = conf.ExspecialnumWeight[comm.GetRandW(conf.ExspecialnumWeight)] // 获取权重 + v.NextexspecialPCT = conf.Exspecialnum[comm.GetRandW(conf.ExspecialnumWeight)] // 获取权重 } } @@ -506,3 +504,14 @@ func (this *Caravan) Rpc_ModuleCaravanSettlement(ctx context.Context, args *pb.E return } + +func (this *Caravan) TaskGroupComplete(session comm.IUserSession, group int32) { + if list, err := this.modelCaravan.getCaravanList(session.GetUserId()); err != nil { + if _, ok := list.Group[group]; !ok { + list.Group[group] = true + update := make(map[string]interface{}) + update["group"] = list.Group + this.modelCaravan.modifyCaravanDataByObjId(session.GetUserId(), update) + } + } +} diff --git a/modules/pagoda/api_getrace.go b/modules/pagoda/api_getrace.go index f5bcb1cb9..ed69bbe60 100644 --- a/modules/pagoda/api_getrace.go +++ b/modules/pagoda/api_getrace.go @@ -18,7 +18,7 @@ func (this *apiComp) GetRace(session comm.IUserSession, req *pb.PagodaGetRaceReq var ( bChange bool - sesaon int32 // 循环塔id + bSesaon bool // 循环塔id ) list, err := this.module.modelRacePagoda.getPagodaRaceList(session.GetUserId()) if err != nil { @@ -32,19 +32,17 @@ func (this *apiComp) GetRace(session comm.IUserSession, req *pb.PagodaGetRaceReq // 初始化每天挑战塔的层数 for k, v := range list.Race { - if k > 0 { - if !utils.IsToday(v.Rtime) { - list.Race[k].Rtime = configure.Now().Unix() - list.Race[k].Defeat = 0 - bChange = true - } + if !utils.IsToday(v.Rtime) { + list.Race[k].Rtime = configure.Now().Unix() + list.Race[k].Defeat = 0 + bChange = true } if k >= 10 { - sesaon = k + bSesaon = true } } - if sesaon == 0 { - list.Race[10] = &pb.RaceData{ + if !bSesaon { + list.Race[10] = &pb.RaceData{ // 第一赛季阵营id默认就是10 Race: 10, Task: []int32{}, Rtime: configure.Now().Unix(), diff --git a/modules/timer/caravanrank.go b/modules/timer/caravanrank.go index b69e5d480..4da1ca653 100644 --- a/modules/timer/caravanrank.go +++ b/modules/timer/caravanrank.go @@ -76,8 +76,8 @@ func (this *CaravanRank) Start() (err error) { if configure.Now().Unix() < opentime { // 开服时间是未来可能存在问题 return } - - cron.AddFunc("0,0,0,*,*,*", this.TimerSeason) + // 0 0 0 ? * MON // 每周一零点 + cron.AddFunc("0 0 0 ? * MON", this.TimerSeason) //this.TimerSeason() return } @@ -85,17 +85,15 @@ func (this *CaravanRank) Start() (err error) { func (this *CaravanRank) TimerSeason() { endTime := utils.WeekIntervalTime(0) this.module.Debugf("TimerSeason end: %d,cur time:%d", endTime, configure.Now().Unix()) - if configure.Now().Unix()-endTime < 5 { - this.module.Debugf("TimerSeason start: %d", configure.Now().Unix()) - if err := this.service.RpcCall( - context.Background(), - comm.Service_Worker, - string(comm.Rpc_ModuleCaravanSettlement), - pb.EmptyReq{}, - nil, - ); err != nil { - this.module.Errorln(err) - } + + if err := this.service.RpcCall( + context.Background(), + comm.Service_Worker, + string(comm.Rpc_ModuleCaravanSettlement), + pb.EmptyReq{}, + nil, + ); err != nil { + this.module.Errorln(err) } } diff --git a/modules/wtask/module.go b/modules/wtask/module.go index 729b38662..ba6ded846 100644 --- a/modules/wtask/module.go +++ b/modules/wtask/module.go @@ -449,7 +449,7 @@ func (this *WTask) checkgroupState(session comm.IUserSession, wtask *pb.DBWTask, } wtask.Groups[group] = 1 if des == 5 { //商队任务 - + this.caravan.TaskGroupComplete(session, group) } } diff --git a/pb/caravan_db.pb.go b/pb/caravan_db.pb.go index 557654073..e8ec32486 100644 --- a/pb/caravan_db.pb.go +++ b/pb/caravan_db.pb.go @@ -233,20 +233,22 @@ type DBCaravan struct { Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id" bson:"_id"` //ID Uid string `protobuf:"bytes,2,opt,name=uid,proto3" json:"uid" bson:"uid"` //用户ID //int32 useCount = 3; //@go_tags(`bson:"useCount"`) 当前背包使用的数量 - Items map[string]*BagInfo `protobuf:"bytes,4,rep,name=items,proto3" json:"items" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` // 背包数据 - Goods map[string]*Goods `protobuf:"bytes,5,rep,name=goods,proto3" json:"goods" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` // key 货物ID - City map[int32]*CityInfo `protobuf:"bytes,6,rep,name=city,proto3" json:"city" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` // 城市信息 - Lv int32 `protobuf:"varint,7,opt,name=lv,proto3" json:"lv"` // 商队等级 - Profit int64 `protobuf:"varint,8,opt,name=profit,proto3" json:"profit"` // 虚拟货利润 - Resettime int64 `protobuf:"varint,9,opt,name=resettime,proto3" json:"resettime"` // 赛季结算时间 - Curcity int32 `protobuf:"varint,10,opt,name=curcity,proto3" json:"curcity"` // 当前城市 - Taskid int32 `protobuf:"varint,11,opt,name=taskid,proto3" json:"taskid"` // 对应对应世界任务组 worldtask - Eventid int32 `protobuf:"varint,12,opt,name=eventid,proto3" json:"eventid"` // 特殊事件ID(事件配置唯一id) - Tasktime int64 `protobuf:"varint,13,opt,name=tasktime,proto3" json:"tasktime"` // 任务触发时间 - Baglimit int32 `protobuf:"varint,14,opt,name=baglimit,proto3" json:"baglimit"` // 背包上限 - Citystime int64 `protobuf:"varint,15,opt,name=citystime,proto3" json:"citystime"` // 城市刷新时间 玩家身上的货物同时刷新 - Oldprice map[string]int32 `protobuf:"bytes,16,rep,name=oldprice,proto3" json:"oldprice" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // 上一次价格 key 货物ID - Rtime int64 `protobuf:"varint,17,opt,name=rtime,proto3" json:"rtime"` // 客户端不用这个时间 + Items map[string]*BagInfo `protobuf:"bytes,4,rep,name=items,proto3" json:"items" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` // 背包数据 + Goods map[string]*Goods `protobuf:"bytes,5,rep,name=goods,proto3" json:"goods" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` // key 货物ID + City map[int32]*CityInfo `protobuf:"bytes,6,rep,name=city,proto3" json:"city" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` // 城市信息 + Lv int32 `protobuf:"varint,7,opt,name=lv,proto3" json:"lv"` // 商队等级 + Profit int64 `protobuf:"varint,8,opt,name=profit,proto3" json:"profit"` // 虚拟货利润 + Resettime int64 `protobuf:"varint,9,opt,name=resettime,proto3" json:"resettime"` // 赛季结算时间 + Curcity int32 `protobuf:"varint,10,opt,name=curcity,proto3" json:"curcity"` // 当前城市 + Taskid int32 `protobuf:"varint,11,opt,name=taskid,proto3" json:"taskid"` // 对应对应世界任务组 worldtask + Eventid int32 `protobuf:"varint,12,opt,name=eventid,proto3" json:"eventid"` // 特殊事件ID(事件配置唯一id) + Tasktime int64 `protobuf:"varint,13,opt,name=tasktime,proto3" json:"tasktime"` // 任务触发时间 + Baglimit int32 `protobuf:"varint,14,opt,name=baglimit,proto3" json:"baglimit"` // 背包上限 + Citystime int64 `protobuf:"varint,15,opt,name=citystime,proto3" json:"citystime"` // 城市刷新时间 玩家身上的货物同时刷新 + Oldprice map[string]int32 `protobuf:"bytes,16,rep,name=oldprice,proto3" json:"oldprice" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // 上一次价格 key 货物ID + Rtime int64 `protobuf:"varint,17,opt,name=rtime,proto3" json:"rtime"` // 客户端不用这个时间 + Group map[int32]bool `protobuf:"bytes,18,rep,name=group,proto3" json:"group" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` //服务器用 + Merchantmoney int32 `protobuf:"varint,19,opt,name=merchantmoney,proto3" json:"merchantmoney"` // 虚拟币（商队) } func (x *DBCaravan) Reset() { @@ -393,6 +395,20 @@ func (x *DBCaravan) GetRtime() int64 { return 0 } +func (x *DBCaravan) GetGroup() map[int32]bool { + if x != nil { + return x.Group + } + return nil +} + +func (x *DBCaravan) GetMerchantmoney() int32 { + if x != nil { + return x.Merchantmoney + } + return 0 +} + type CaravanRankInfo struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -519,7 +535,7 @@ var file_caravan_caravan_db_proto_rawDesc = []byte{ 0x22, 0x35, 0x0a, 0x07, 0x42, 0x61, 0x67, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x70, 0x72, 0x69, 0x63, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, - 0x52, 0x05, 0x70, 0x72, 0x69, 0x63, 0x65, 0x22, 0xec, 0x05, 0x0a, 0x09, 0x44, 0x42, 0x43, 0x61, + 0x52, 0x05, 0x70, 0x72, 0x69, 0x63, 0x65, 0x22, 0xf9, 0x06, 0x0a, 0x09, 0x44, 0x42, 0x43, 0x61, 0x72, 0x61, 0x76, 0x61, 0x6e, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x2b, 0x0a, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, @@ -549,37 +565,46 @@ var file_caravan_caravan_db_proto_rawDesc = []byte{ 0x10, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x44, 0x42, 0x43, 0x61, 0x72, 0x61, 0x76, 0x61, 0x6e, 0x2e, 0x4f, 0x6c, 0x64, 0x70, 0x72, 0x69, 0x63, 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x08, 0x6f, 0x6c, 0x64, 0x70, 0x72, 0x69, 0x63, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x72, 0x74, 0x69, - 0x6d, 0x65, 0x18, 0x11, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x72, 0x74, 0x69, 0x6d, 0x65, 0x1a, - 0x42, 0x0a, 0x0a, 0x49, 0x74, 0x65, 0x6d, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, + 0x6d, 0x65, 0x18, 0x11, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x72, 0x74, 0x69, 0x6d, 0x65, 0x12, + 0x2b, 0x0a, 0x05, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x18, 0x12, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x15, + 0x2e, 0x44, 0x42, 0x43, 0x61, 0x72, 0x61, 0x76, 0x61, 0x6e, 0x2e, 0x47, 0x72, 0x6f, 0x75, 0x70, + 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x05, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x12, 0x24, 0x0a, 0x0d, + 0x6d, 0x65, 0x72, 0x63, 0x68, 0x61, 0x6e, 0x74, 0x6d, 0x6f, 0x6e, 0x65, 0x79, 0x18, 0x13, 0x20, + 0x01, 0x28, 0x05, 0x52, 0x0d, 0x6d, 0x65, 0x72, 0x63, 0x68, 0x61, 0x6e, 0x74, 0x6d, 0x6f, 0x6e, + 0x65, 0x79, 0x1a, 0x42, 0x0a, 0x0a, 0x49, 0x74, 0x65, 0x6d, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, + 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, + 0x65, 0x79, 0x12, 0x1e, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, + 0x0b, 0x32, 0x08, 0x2e, 0x42, 0x61, 0x67, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x05, 0x76, 0x61, 0x6c, + 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x40, 0x0a, 0x0a, 0x47, 0x6f, 0x6f, 0x64, 0x73, 0x45, + 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, + 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x1c, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, + 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x06, 0x2e, 0x47, 0x6f, 0x6f, 0x64, 0x73, 0x52, 0x05, 0x76, + 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x42, 0x0a, 0x09, 0x43, 0x69, 0x74, 0x79, + 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, + 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x1f, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, + 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x43, 0x69, 0x74, 0x79, 0x49, 0x6e, 0x66, + 0x6f, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x3b, 0x0a, 0x0d, + 0x4f, 0x6c, 0x64, 0x70, 0x72, 0x69, 0x63, 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, - 0x1e, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x08, - 0x2e, 0x42, 0x61, 0x67, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, - 0x02, 0x38, 0x01, 0x1a, 0x40, 0x0a, 0x0a, 0x47, 0x6f, 0x6f, 0x64, 0x73, 0x45, 0x6e, 0x74, 0x72, - 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, - 0x6b, 0x65, 0x79, 0x12, 0x1c, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, - 0x28, 0x0b, 0x32, 0x06, 0x2e, 0x47, 0x6f, 0x6f, 0x64, 0x73, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, - 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x42, 0x0a, 0x09, 0x43, 0x69, 0x74, 0x79, 0x45, 0x6e, 0x74, - 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, - 0x03, 0x6b, 0x65, 0x79, 0x12, 0x1f, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, - 0x01, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x43, 0x69, 0x74, 0x79, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x05, - 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x3b, 0x0a, 0x0d, 0x4f, 0x6c, 0x64, - 0x70, 0x72, 0x69, 0x63, 0x65, 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, 0xbf, 0x01, 0x0a, 0x0f, 0x43, 0x61, 0x72, 0x61, 0x76, - 0x61, 0x6e, 0x52, 0x61, 0x6e, 0x6b, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, - 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, - 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, - 0x12, 0x16, 0x0a, 0x06, 0x75, 0x73, 0x65, 0x72, 0x6c, 0x76, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, - 0x52, 0x06, 0x75, 0x73, 0x65, 0x72, 0x6c, 0x76, 0x12, 0x16, 0x0a, 0x06, 0x61, 0x76, 0x61, 0x74, - 0x61, 0x72, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72, - 0x12, 0x12, 0x0a, 0x04, 0x72, 0x61, 0x6e, 0x6b, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, - 0x72, 0x61, 0x6e, 0x6b, 0x12, 0x24, 0x0a, 0x0d, 0x6d, 0x65, 0x72, 0x63, 0x68, 0x61, 0x6e, 0x74, - 0x6d, 0x6f, 0x6e, 0x65, 0x79, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0d, 0x6d, 0x65, 0x72, - 0x63, 0x68, 0x61, 0x6e, 0x74, 0x6d, 0x6f, 0x6e, 0x65, 0x79, 0x12, 0x1c, 0x0a, 0x09, 0x63, 0x61, - 0x72, 0x61, 0x76, 0x61, 0x6e, 0x4c, 0x76, 0x18, 0x07, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x63, - 0x61, 0x72, 0x61, 0x76, 0x61, 0x6e, 0x4c, 0x76, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, - 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 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, 0x1a, 0x38, 0x0a, 0x0a, 0x47, 0x72, 0x6f, + 0x75, 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, 0x08, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, + 0x02, 0x38, 0x01, 0x22, 0xbf, 0x01, 0x0a, 0x0f, 0x43, 0x61, 0x72, 0x61, 0x76, 0x61, 0x6e, 0x52, + 0x61, 0x6e, 0x6b, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, + 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, + 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x16, 0x0a, + 0x06, 0x75, 0x73, 0x65, 0x72, 0x6c, 0x76, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x75, + 0x73, 0x65, 0x72, 0x6c, 0x76, 0x12, 0x16, 0x0a, 0x06, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x18, + 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x12, 0x12, 0x0a, + 0x04, 0x72, 0x61, 0x6e, 0x6b, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x72, 0x61, 0x6e, + 0x6b, 0x12, 0x24, 0x0a, 0x0d, 0x6d, 0x65, 0x72, 0x63, 0x68, 0x61, 0x6e, 0x74, 0x6d, 0x6f, 0x6e, + 0x65, 0x79, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0d, 0x6d, 0x65, 0x72, 0x63, 0x68, 0x61, + 0x6e, 0x74, 0x6d, 0x6f, 0x6e, 0x65, 0x79, 0x12, 0x1c, 0x0a, 0x09, 0x63, 0x61, 0x72, 0x61, 0x76, + 0x61, 0x6e, 0x4c, 0x76, 0x18, 0x07, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x63, 0x61, 0x72, 0x61, + 0x76, 0x61, 0x6e, 0x4c, 0x76, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, + 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -594,7 +619,7 @@ func file_caravan_caravan_db_proto_rawDescGZIP() []byte { return file_caravan_caravan_db_proto_rawDescData } -var file_caravan_caravan_db_proto_msgTypes = make([]protoimpl.MessageInfo, 10) +var file_caravan_caravan_db_proto_msgTypes = make([]protoimpl.MessageInfo, 11) var file_caravan_caravan_db_proto_goTypes = []interface{}{ (*Goods)(nil), // 0: Goods (*CityInfo)(nil), // 1: CityInfo @@ -606,21 +631,23 @@ var file_caravan_caravan_db_proto_goTypes = []interface{}{ nil, // 7: DBCaravan.GoodsEntry nil, // 8: DBCaravan.CityEntry nil, // 9: DBCaravan.OldpriceEntry + nil, // 10: DBCaravan.GroupEntry } var file_caravan_caravan_db_proto_depIdxs = []int32{ - 5, // 0: CityInfo.count:type_name -> CityInfo.CountEntry - 6, // 1: DBCaravan.items:type_name -> DBCaravan.ItemsEntry - 7, // 2: DBCaravan.goods:type_name -> DBCaravan.GoodsEntry - 8, // 3: DBCaravan.city:type_name -> DBCaravan.CityEntry - 9, // 4: DBCaravan.oldprice:type_name -> DBCaravan.OldpriceEntry - 2, // 5: DBCaravan.ItemsEntry.value:type_name -> BagInfo - 0, // 6: DBCaravan.GoodsEntry.value:type_name -> Goods - 1, // 7: DBCaravan.CityEntry.value:type_name -> CityInfo - 8, // [8:8] is the sub-list for method output_type - 8, // [8:8] is the sub-list for method input_type - 8, // [8:8] is the sub-list for extension type_name - 8, // [8:8] is the sub-list for extension extendee - 0, // [0:8] is the sub-list for field type_name + 5, // 0: CityInfo.count:type_name -> CityInfo.CountEntry + 6, // 1: DBCaravan.items:type_name -> DBCaravan.ItemsEntry + 7, // 2: DBCaravan.goods:type_name -> DBCaravan.GoodsEntry + 8, // 3: DBCaravan.city:type_name -> DBCaravan.CityEntry + 9, // 4: DBCaravan.oldprice:type_name -> DBCaravan.OldpriceEntry + 10, // 5: DBCaravan.group:type_name -> DBCaravan.GroupEntry + 2, // 6: DBCaravan.ItemsEntry.value:type_name -> BagInfo + 0, // 7: DBCaravan.GoodsEntry.value:type_name -> Goods + 1, // 8: DBCaravan.CityEntry.value:type_name -> CityInfo + 9, // [9:9] is the sub-list for method output_type + 9, // [9:9] is the sub-list for method input_type + 9, // [9:9] is the sub-list for extension type_name + 9, // [9:9] is the sub-list for extension extendee + 0, // [0:9] is the sub-list for field type_name } func init() { file_caravan_caravan_db_proto_init() } @@ -696,7 +723,7 @@ func file_caravan_caravan_db_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_caravan_caravan_db_proto_rawDesc, NumEnums: 0, - NumMessages: 10, + NumMessages: 11, NumExtensions: 0, NumServices: 0, }, diff --git a/pb/user_db.pb.go b/pb/user_db.pb.go index 75c5f6ffb..a48d20459 100644 --- a/pb/user_db.pb.go +++ b/pb/user_db.pb.go @@ -143,7 +143,7 @@ type DBUser struct { Talent2 int32 `protobuf:"varint,29,opt,name=talent2,proto3" json:"talent2" bson:"talent2"` //阵营2天赋点 Talent3 int32 `protobuf:"varint,30,opt,name=talent3,proto3" json:"talent3" bson:"talent3"` //阵营3天赋点 Talent4 int32 `protobuf:"varint,31,opt,name=talent4,proto3" json:"talent4" bson:"talent4"` //阵营4天赋点 - Merchantmoney int32 `protobuf:"varint,32,opt,name=merchantmoney,proto3" json:"merchantmoney" bson:"merchantmoney"` //虚拟币（商队) + Merchantmoney int32 `protobuf:"varint,32,opt,name=merchantmoney,proto3" json:"merchantmoney" bson:"merchantmoney"` //虚拟币利润（商队) Skins []string `protobuf:"bytes,33,rep,name=skins,proto3" json:"skins" bson:"skins"` //皮肤,动作,背景 CurSkin string `protobuf:"bytes,34,opt,name=curSkin,proto3" json:"curSkin" bson:"curSkin"` //默认皮肤 CurAction string `protobuf:"bytes,35,opt,name=curAction,proto3" json:"curAction" bson:"curAction"` //默认动作 diff --git a/sys/configure/structs/Game.PassonData.go b/sys/configure/structs/Game.PassonData.go index 365362c19..2f8df3b10 100644 --- a/sys/configure/structs/Game.PassonData.go +++ b/sys/configure/structs/Game.PassonData.go @@ -15,6 +15,7 @@ type GamePassonData struct { Openlv int32 Cd int32 Sift int32 + Index int32 Text string Remake *Gameatn } @@ -30,6 +31,7 @@ func (_v *GamePassonData)Deserialize(_buf map[string]interface{}) (err error) { { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["openlv"].(float64); !_ok_ { err = errors.New("openlv error"); return }; _v.Openlv = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["cd"].(float64); !_ok_ { err = errors.New("cd error"); return }; _v.Cd = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["sift"].(float64); !_ok_ { err = errors.New("sift error"); return }; _v.Sift = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["index"].(float64); !_ok_ { err = errors.New("index error"); return }; _v.Index = int32(_tempNum_) } {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["text"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Text error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Text, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["remake"].(map[string]interface{}); !_ok_ { err = errors.New("remake error"); return }; if _v.Remake, err = DeserializeGameatn(_x_); err != nil { return } } return diff --git a/sys/configure/structs/game.heroData.go b/sys/configure/structs/game.heroData.go index 1bcf8b885..3c125cae9 100644 --- a/sys/configure/structs/game.heroData.go +++ b/sys/configure/structs/game.heroData.go @@ -28,6 +28,7 @@ type GameHeroData struct { Icon string Vocal string Tujing []int32 + Detailwindow string Intr string Events string Cite string @@ -88,6 +89,7 @@ func (_v *GameHeroData)Deserialize(_buf map[string]interface{}) (err error) { } } + { var _ok_ bool; if _v.Detailwindow, _ok_ = _buf["detailwindow"].(string); !_ok_ { err = errors.New("detailwindow error"); return } } {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["intr"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Intr error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Intr, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } { var _ok_ bool; if _v.Events, _ok_ = _buf["events"].(string); !_ok_ { err = errors.New("events error"); return } } { var _ok_ bool; if _v.Cite, _ok_ = _buf["cite"].(string); !_ok_ { err = errors.New("cite error"); return } }