This commit is contained in:
meixiongfeng 2023-09-25 17:19:51 +08:00
commit d6f4fee1cd
25 changed files with 1511 additions and 1194 deletions

View File

@ -88,7 +88,7 @@
{
"a": "attr",
"t": "arenacoin",
"n": 12
"n": 10
}
],
"new_npc_reward": [
@ -123,7 +123,7 @@
{
"a": "attr",
"t": "arenacoin",
"n": 12
"n": 10
}
],
"new_npc_reward": [
@ -158,7 +158,7 @@
{
"a": "attr",
"t": "arenacoin",
"n": 14
"n": 10
}
],
"new_npc_reward": [
@ -193,7 +193,7 @@
{
"a": "attr",
"t": "arenacoin",
"n": 14
"n": 10
}
],
"new_npc_reward": [
@ -228,7 +228,7 @@
{
"a": "attr",
"t": "arenacoin",
"n": 16
"n": 10
}
],
"new_npc_reward": [
@ -263,7 +263,7 @@
{
"a": "attr",
"t": "arenacoin",
"n": 16
"n": 10
}
],
"new_npc_reward": [
@ -298,7 +298,7 @@
{
"a": "attr",
"t": "arenacoin",
"n": 18
"n": 10
}
],
"new_npc_reward": [
@ -333,7 +333,7 @@
{
"a": "attr",
"t": "arenacoin",
"n": 18
"n": 10
}
],
"new_npc_reward": [
@ -368,7 +368,7 @@
{
"a": "attr",
"t": "arenacoin",
"n": 20
"n": 10
}
],
"new_npc_reward": [
@ -403,7 +403,7 @@
{
"a": "attr",
"t": "arenacoin",
"n": 20
"n": 10
}
],
"new_npc_reward": [

View File

@ -17,6 +17,11 @@
"a": "attr",
"t": "diamond",
"n": 600
},
{
"a": "item",
"t": "13000001",
"n": 3
}
]
},
@ -38,6 +43,11 @@
"a": "attr",
"t": "diamond",
"n": 550
},
{
"a": "item",
"t": "13000001",
"n": 2
}
]
},
@ -59,6 +69,11 @@
"a": "attr",
"t": "diamond",
"n": 500
},
{
"a": "item",
"t": "13000001",
"n": 2
}
]
},
@ -80,6 +95,11 @@
"a": "attr",
"t": "diamond",
"n": 450
},
{
"a": "item",
"t": "13000001",
"n": 1
}
]
},

View File

@ -7,6 +7,7 @@
"battleScenes": [
"scenesfight_07"
],
"BGMusic": "",
"LoadingId": 0,
"HideAlienSpace": 0,
"RuleTips": {
@ -40,6 +41,7 @@
"battleScenes": [
"scenesfight_07"
],
"BGMusic": "",
"LoadingId": 0,
"HideAlienSpace": 0,
"RuleTips": {
@ -73,6 +75,7 @@
"battleScenes": [
"scenesfight_05_01"
],
"BGMusic": "",
"LoadingId": 0,
"HideAlienSpace": 0,
"RuleTips": {
@ -106,6 +109,7 @@
"battleScenes": [
"scenesfight_06"
],
"BGMusic": "",
"LoadingId": 0,
"HideAlienSpace": 0,
"RuleTips": {
@ -139,6 +143,7 @@
"battleScenes": [
"bossfight_spinymandrilla_02"
],
"BGMusic": "",
"LoadingId": 0,
"HideAlienSpace": 0,
"RuleTips": {
@ -172,6 +177,7 @@
"battleScenes": [
"scenesfight_07"
],
"BGMusic": "",
"LoadingId": 0,
"HideAlienSpace": 0,
"RuleTips": {
@ -205,6 +211,7 @@
"battleScenes": [
"scenesfight_07"
],
"BGMusic": "",
"LoadingId": 0,
"HideAlienSpace": 0,
"RuleTips": {
@ -238,6 +245,7 @@
"battleScenes": [
"bossfight_spinymandrilla_02"
],
"BGMusic": "",
"LoadingId": 0,
"HideAlienSpace": 0,
"RuleTips": {
@ -271,6 +279,7 @@
"battleScenes": [
"scenesfight_07"
],
"BGMusic": "",
"LoadingId": 0,
"HideAlienSpace": 0,
"RuleTips": {
@ -304,6 +313,7 @@
"battleScenes": [
"scenesfight_07"
],
"BGMusic": "",
"LoadingId": 0,
"HideAlienSpace": 0,
"RuleTips": {
@ -337,6 +347,7 @@
"battleScenes": [
"scenesfight_07"
],
"BGMusic": "",
"LoadingId": 0,
"HideAlienSpace": 0,
"RuleTips": {
@ -370,6 +381,7 @@
"battleScenes": [
"scenesfight_07"
],
"BGMusic": "",
"LoadingId": 0,
"HideAlienSpace": 0,
"RuleTips": {
@ -403,6 +415,7 @@
"battleScenes": [
"scenesfight_07"
],
"BGMusic": "",
"LoadingId": 0,
"HideAlienSpace": 0,
"RuleTips": {
@ -436,6 +449,7 @@
"battleScenes": [
"scenesfight_07"
],
"BGMusic": "",
"LoadingId": 0,
"HideAlienSpace": 0,
"RuleTips": {
@ -469,6 +483,7 @@
"battleScenes": [
"scenesfight_07"
],
"BGMusic": "",
"LoadingId": 0,
"HideAlienSpace": 0,
"RuleTips": {
@ -502,6 +517,7 @@
"battleScenes": [
"scenesfight_06"
],
"BGMusic": "",
"LoadingId": 0,
"HideAlienSpace": 0,
"RuleTips": {
@ -535,6 +551,7 @@
"battleScenes": [
"scenesfight_07"
],
"BGMusic": "",
"LoadingId": 0,
"HideAlienSpace": 0,
"RuleTips": {
@ -570,6 +587,7 @@
"scenesfight_03_02",
"scenesfight_07"
],
"BGMusic": "",
"LoadingId": 0,
"HideAlienSpace": 0,
"RuleTips": {
@ -603,6 +621,7 @@
"battleScenes": [
"scenesfight_06"
],
"BGMusic": "",
"LoadingId": 0,
"HideAlienSpace": 0,
"RuleTips": {
@ -636,6 +655,7 @@
"battleScenes": [
"scenesfight_03_02"
],
"BGMusic": "",
"LoadingId": 0,
"HideAlienSpace": 0,
"RuleTips": {
@ -669,6 +689,7 @@
"battleScenes": [
"bossfight_spinymandrilla_02"
],
"BGMusic": "",
"LoadingId": 0,
"HideAlienSpace": 0,
"RuleTips": {
@ -702,6 +723,7 @@
"battleScenes": [
"bossfight_naturetitan_01"
],
"BGMusic": "",
"LoadingId": 0,
"HideAlienSpace": 0,
"RuleTips": {
@ -735,6 +757,7 @@
"battleScenes": [
"bossfight_spinymandrilla_02"
],
"BGMusic": "",
"LoadingId": 0,
"HideAlienSpace": 0,
"RuleTips": {
@ -768,6 +791,7 @@
"battleScenes": [
"bossfight_chef_01"
],
"BGMusic": "",
"LoadingId": 0,
"HideAlienSpace": 0,
"RuleTips": {
@ -801,6 +825,7 @@
"battleScenes": [
"bossfight_spinymandrilla_03"
],
"BGMusic": "",
"LoadingId": 0,
"HideAlienSpace": 0,
"RuleTips": {
@ -834,6 +859,7 @@
"battleScenes": [
"bossfight_translate_01"
],
"BGMusic": "",
"LoadingId": 0,
"HideAlienSpace": 0,
"RuleTips": {
@ -867,6 +893,7 @@
"battleScenes": [
"scenesfight_08"
],
"BGMusic": "",
"LoadingId": 1019,
"HideAlienSpace": 0,
"RuleTips": {
@ -900,6 +927,7 @@
"battleScenes": [
"scenesfight_08"
],
"BGMusic": "",
"LoadingId": 1019,
"HideAlienSpace": 0,
"RuleTips": {
@ -933,6 +961,7 @@
"battleScenes": [
"bossfight_dragon_01"
],
"BGMusic": "",
"LoadingId": 0,
"HideAlienSpace": 0,
"RuleTips": {
@ -966,6 +995,7 @@
"battleScenes": [
"scenesfight_06"
],
"BGMusic": "",
"LoadingId": 0,
"HideAlienSpace": 0,
"RuleTips": {
@ -999,6 +1029,7 @@
"battleScenes": [
"scenesfight_06"
],
"BGMusic": "",
"LoadingId": 0,
"HideAlienSpace": 0,
"RuleTips": {
@ -1034,6 +1065,7 @@
"battleScenes": [
"scenesfight_06"
],
"BGMusic": "",
"LoadingId": 0,
"HideAlienSpace": 0,
"RuleTips": {
@ -1069,6 +1101,7 @@
"battleScenes": [
"scenesfight_06"
],
"BGMusic": "",
"LoadingId": 0,
"HideAlienSpace": 0,
"RuleTips": {
@ -1104,6 +1137,7 @@
"battleScenes": [
"bossfight_naturetitan_02"
],
"BGMusic": "",
"LoadingId": 0,
"HideAlienSpace": 0,
"RuleTips": {
@ -1137,6 +1171,7 @@
"battleScenes": [
"bossfight_naturetitan_03"
],
"BGMusic": "",
"LoadingId": 0,
"HideAlienSpace": 0,
"RuleTips": {
@ -1170,6 +1205,7 @@
"battleScenes": [
"scenesfight_07"
],
"BGMusic": "",
"LoadingId": 0,
"HideAlienSpace": 0,
"RuleTips": {
@ -1205,6 +1241,7 @@
"battleScenes": [
"scenesfight_05_01"
],
"BGMusic": "",
"LoadingId": 0,
"HideAlienSpace": 1,
"RuleTips": {
@ -1238,6 +1275,7 @@
"battleScenes": [
"scenesfight_05_01"
],
"BGMusic": "",
"LoadingId": 0,
"HideAlienSpace": 1,
"RuleTips": {
@ -1274,6 +1312,7 @@
"battleScenes": [
"scenesfight_05_01"
],
"BGMusic": "",
"LoadingId": 0,
"HideAlienSpace": 1,
"RuleTips": {
@ -1307,6 +1346,7 @@
"battleScenes": [
"scenesfight_08"
],
"BGMusic": "",
"LoadingId": 1019,
"HideAlienSpace": 0,
"RuleTips": {
@ -1342,6 +1382,7 @@
"battleScenes": [
"scenesfight_08"
],
"BGMusic": "",
"LoadingId": 1019,
"HideAlienSpace": 0,
"RuleTips": {
@ -1377,6 +1418,7 @@
"battleScenes": [
"scenesfight_06"
],
"BGMusic": "",
"LoadingId": 1019,
"HideAlienSpace": 0,
"RuleTips": {
@ -1416,6 +1458,7 @@
"battleScenes": [
"scenesfight_05_01"
],
"BGMusic": "",
"LoadingId": 0,
"HideAlienSpace": 0,
"RuleTips": {
@ -1451,6 +1494,7 @@
"battleScenes": [
"bossfight_spinymandrilla_02"
],
"BGMusic": "",
"LoadingId": 0,
"HideAlienSpace": 0,
"RuleTips": {
@ -1484,6 +1528,7 @@
"battleScenes": [
"scenesfight_05_01"
],
"BGMusic": "",
"LoadingId": 0,
"HideAlienSpace": 0,
"RuleTips": {
@ -1517,6 +1562,7 @@
"battleScenes": [
"scenesfight_08"
],
"BGMusic": "",
"LoadingId": 1019,
"HideAlienSpace": 0,
"RuleTips": {
@ -1550,6 +1596,7 @@
"battleScenes": [
"scenesfight_05_01"
],
"BGMusic": "",
"LoadingId": 0,
"HideAlienSpace": 0,
"RuleTips": {
@ -1581,10 +1628,11 @@
"id": 10103001,
"PlayType": 1,
"HeroCount": 5,
"readyScene": "scenesfight_role_interface_03",
"readyScene": "scenesfight_role_interface_07",
"battleScenes": [
"scenesfight_05_01"
"scenesfight_09"
],
"BGMusic": "",
"LoadingId": 0,
"HideAlienSpace": 0,
"RuleTips": {
@ -1614,10 +1662,11 @@
"id": 10103002,
"PlayType": 1,
"HeroCount": 5,
"readyScene": "scenesfight_role_interface_03",
"readyScene": "scenesfight_role_interface_07",
"battleScenes": [
"scenesfight_05_01"
"scenesfight_09"
],
"BGMusic": "",
"LoadingId": 0,
"HideAlienSpace": 0,
"RuleTips": {
@ -1647,10 +1696,11 @@
"id": 10103003,
"PlayType": 1,
"HeroCount": 5,
"readyScene": "scenesfight_role_interface_03",
"readyScene": "scenesfight_role_interface_07",
"battleScenes": [
"scenesfight_05_01"
"scenesfight_09"
],
"BGMusic": "",
"LoadingId": 0,
"HideAlienSpace": 0,
"RuleTips": {
@ -1686,6 +1736,7 @@
"battleScenes": [
"scenesfight_07"
],
"BGMusic": "",
"LoadingId": 0,
"HideAlienSpace": 0,
"RuleTips": {
@ -1719,6 +1770,7 @@
"battleScenes": [
"scenesfight_03_02"
],
"BGMusic": "",
"LoadingId": 0,
"HideAlienSpace": 0,
"RuleTips": {
@ -1753,6 +1805,7 @@
"bossfight_naturetitan_02",
"bossfight_naturetitan_04"
],
"BGMusic": "",
"LoadingId": 0,
"HideAlienSpace": 0,
"RuleTips": {
@ -1796,6 +1849,7 @@
"battleScenes": [
"scenesfight_08"
],
"BGMusic": "",
"LoadingId": 1019,
"HideAlienSpace": 0,
"RuleTips": {
@ -1829,6 +1883,7 @@
"battleScenes": [
"scenesfight_08"
],
"BGMusic": "",
"LoadingId": 1019,
"HideAlienSpace": 0,
"RuleTips": {
@ -1864,6 +1919,7 @@
"battleScenes": [
"scenesfight_08"
],
"BGMusic": "",
"LoadingId": 1019,
"HideAlienSpace": 0,
"RuleTips": {
@ -1897,6 +1953,7 @@
"battleScenes": [
"scenesfight_03_02"
],
"BGMusic": "",
"LoadingId": 0,
"HideAlienSpace": 0,
"RuleTips": {
@ -1930,6 +1987,7 @@
"battleScenes": [
"scenesfight_06"
],
"BGMusic": "",
"LoadingId": 0,
"HideAlienSpace": 0,
"RuleTips": {
@ -1949,10 +2007,7 @@
"ChoseHero": [],
"DisableHero": [],
"LockSlots": [],
"HeroCheck": [
"24004",
"24001"
],
"HeroCheck": [],
"RedAssistTeam": 0,
"BlueAssistTeam": 0,
"CanFriendHelp": 0,
@ -1966,6 +2021,7 @@
"battleScenes": [
"scenesfight_06"
],
"BGMusic": "",
"LoadingId": 0,
"HideAlienSpace": 0,
"RuleTips": {
@ -2001,6 +2057,7 @@
"battleScenes": [
"scenesfight_06"
],
"BGMusic": "",
"LoadingId": 0,
"HideAlienSpace": 0,
"RuleTips": {
@ -2036,6 +2093,7 @@
"battleScenes": [
"scenesfight_06"
],
"BGMusic": "",
"LoadingId": 0,
"HideAlienSpace": 0,
"RuleTips": {
@ -2071,6 +2129,7 @@
"battleScenes": [
"scenesfight_06"
],
"BGMusic": "",
"LoadingId": 0,
"HideAlienSpace": 0,
"RuleTips": {
@ -2104,6 +2163,7 @@
"battleScenes": [
"bossfight_spinymandrilla_02"
],
"BGMusic": "",
"LoadingId": 0,
"HideAlienSpace": 0,
"RuleTips": {
@ -2137,6 +2197,7 @@
"battleScenes": [
"bossfight_dragon_01"
],
"BGMusic": "",
"LoadingId": 0,
"HideAlienSpace": 0,
"RuleTips": {
@ -2170,6 +2231,7 @@
"battleScenes": [
"bossfight_chef_01"
],
"BGMusic": "",
"LoadingId": 0,
"HideAlienSpace": 0,
"RuleTips": {
@ -2203,6 +2265,7 @@
"battleScenes": [
"bossfight_translate_01"
],
"BGMusic": "",
"LoadingId": 0,
"HideAlienSpace": 0,
"RuleTips": {
@ -2236,6 +2299,7 @@
"battleScenes": [
"bossfight_naturetitan_03"
],
"BGMusic": "",
"LoadingId": 0,
"HideAlienSpace": 0,
"RuleTips": {
@ -2269,6 +2333,7 @@
"battleScenes": [
"bossfight_naturetitan_01"
],
"BGMusic": "",
"LoadingId": 0,
"HideAlienSpace": 0,
"RuleTips": {
@ -2302,6 +2367,7 @@
"battleScenes": [
"bossfight_naturetitan_02"
],
"BGMusic": "",
"LoadingId": 0,
"HideAlienSpace": 0,
"RuleTips": {
@ -2335,6 +2401,7 @@
"battleScenes": [
"scenesfight_07"
],
"BGMusic": "",
"LoadingId": 0,
"HideAlienSpace": 0,
"RuleTips": {
@ -2368,6 +2435,7 @@
"battleScenes": [
"scenesfight_07"
],
"BGMusic": "",
"LoadingId": 0,
"HideAlienSpace": 0,
"RuleTips": {
@ -2401,6 +2469,7 @@
"battleScenes": [
"scenesfight_07"
],
"BGMusic": "",
"LoadingId": 0,
"HideAlienSpace": 0,
"RuleTips": {
@ -2434,6 +2503,7 @@
"battleScenes": [
"scenesfight_07"
],
"BGMusic": "",
"LoadingId": 0,
"HideAlienSpace": 0,
"RuleTips": {
@ -2467,6 +2537,7 @@
"battleScenes": [
"scenesfight_07"
],
"BGMusic": "",
"LoadingId": 0,
"HideAlienSpace": 0,
"RuleTips": {
@ -2500,6 +2571,7 @@
"battleScenes": [
"scenesfight_07"
],
"BGMusic": "",
"LoadingId": 0,
"HideAlienSpace": 0,
"RuleTips": {
@ -2533,6 +2605,7 @@
"battleScenes": [
"scenesfight_07"
],
"BGMusic": "",
"LoadingId": 0,
"HideAlienSpace": 0,
"RuleTips": {
@ -2566,6 +2639,7 @@
"battleScenes": [
"scenesfight_07"
],
"BGMusic": "",
"LoadingId": 0,
"HideAlienSpace": 0,
"RuleTips": {
@ -2599,6 +2673,7 @@
"battleScenes": [
"scenesfight_06"
],
"BGMusic": "",
"LoadingId": 0,
"HideAlienSpace": 0,
"RuleTips": {
@ -2632,6 +2707,7 @@
"battleScenes": [
"scenesfight_07"
],
"BGMusic": "",
"LoadingId": 0,
"HideAlienSpace": 0,
"RuleTips": {
@ -2665,6 +2741,7 @@
"battleScenes": [
"scenesfight_06"
],
"BGMusic": "",
"LoadingId": 0,
"HideAlienSpace": 0,
"RuleTips": {

File diff suppressed because it is too large Load Diff

View File

@ -220,8 +220,8 @@
},
"tabId": 3,
"mapPos": {
"x": 2275,
"y": 616
"x": 2235,
"y": 626
},
"type": 4,
"params": "",
@ -263,8 +263,8 @@
},
"tabId": 3,
"mapPos": {
"x": 2412,
"y": 300
"x": 2582,
"y": 180
},
"type": 4,
"params": "",

View File

@ -166,7 +166,7 @@
"scale": 0.4,
"usetext": {
"key": "gamesummary_fathernode_usetext_10",
"text": "有人的地方就存在着纷争,·去战胜他人获得[color=#ffcc00]竞技币[/color],在[color=#ffcc00]竞技商店兑换奖励[/color]吧!"
"text": "有人的地方就存在着纷争,去战胜他人获得[color=#ffcc00]竞技币[/color],在[color=#ffcc00]竞技商店兑换奖励[/color]吧!"
}
},
{

View File

@ -672,7 +672,7 @@
"t": "merchantmoney",
"n": 1
},
"business_rankmoney": 1000,
"business_rankmoney": 220000,
"business_moneynum": 10000,
"business_minint_reward": {
"a": "attr",
@ -853,6 +853,7 @@
"dragon_interaction": 15,
"dialogueclickcd": 0.3,
"doragon_item": "24012003",
"sign_account": 28
"sign_account": 28,
"dragon_funtime": 500
}
]

View File

@ -1478,7 +1478,7 @@
"expitemnum": 7,
"herointr": {
"key": "hero_main_herointr_19",
"text": "传说中的守护者“黛塔黛恩”,拥有不俗的战斗能力"
"text": " 干草堆随着风吹过街道,生活还是一成不变,只有黛塔黛恩一如既往,在午后弹奏起她的民谣。荒野的西部,精灵一出生就要干活,一切都要靠双手获得。黛塔用她的歌声抚慰着精灵们的心,每一天都如此。<br>但,某一天,一群宛如被彩虹殴打过的精灵出现在黛塔的面前,将她的生活搅得天翻地覆。"
}
},
{
@ -1868,7 +1868,7 @@
"expitemnum": 7,
"herointr": {
"key": "hero_main_herointr_24",
"text": "传说中的守护者“邦尼兔”,拥有不俗的战斗能力"
"text": " 结实的大脚,强健的肌肉,犀利的眼神,很难想象这位猛男兔是如何画出那些精美可爱的复活蛋花纹的。邦尼冷酷的外表下有着一颗火热的心。虽然嘴上很爱挖苦人,但他却时刻关心着每位同伴的安危。<br>邦尼兔最开心的事是吃胡萝卜,最讨厌的事是与杰克共处一室。杰克漫不经心的个性一度令严苛认真的邦尼很是看不惯。"
}
},
{
@ -2180,7 +2180,7 @@
"expitemnum": 7,
"herointr": {
"key": "hero_main_herointr_28",
"text": "传说中的守护者“暴芙那特”,拥有不俗的战斗能力"
"text": " 暴躁二人组中的姐姐,粗鲁,暴躁,追求危险和刺激,无论怎么看,暴芙纳特都和淑女这个词毫不沾边。但是身为维京人,她这种特质反而被视为合格的勇士,也是件奇事。<br>暴芙纳特非常自恋,一直梦想嫁一个强壮有力的如意郎君。她的弟弟对此十分不屑。"
}
},
{

File diff suppressed because it is too large Load Diff

View File

@ -11,7 +11,7 @@
},
"introduce": {
"key": "hunting_opentime_introduce_1",
"text": "传说中的巨型猩猩是一个非常恐怖的角色,它暴戾且狡猾,与它为敌一定要非常小心。"
"text": "传说中的巨型猩猩是一个非常恐怖的角色,它暴戾且很容易饥饿,与它为敌一定要非常小心。"
},
"opentimetext": {
"key": "hunting_opentime_opentimetext_1",
@ -33,7 +33,7 @@
},
"introduce": {
"key": "hunting_opentime_introduce_2",
"text": "火龙可以从嘴里喷出猛烈的火焰,对地面造成毁灭性打击。"
"text": "这位娇美刁蛮的母龙会从嘴里喷出猛烈的火焰,对地面和你造成毁灭性打击。"
},
"opentimetext": {
"key": "hunting_opentime_opentimetext_2",
@ -55,7 +55,7 @@
},
"introduce": {
"key": "hunting_opentime_introduce_3",
"text": "大厨曾是御用厨师,但他的料理太过黑暗,如果你不想成为\"料理\"的一员,一定要离他远点。"
"text": "大厨曾是御用厨师,但她的料理太过黑暗,如果你不想成为\"料理\"的一员,一定要离她远点。"
},
"opentimetext": {
"key": "hunting_opentime_opentimetext_3",
@ -77,7 +77,7 @@
},
"introduce": {
"key": "hunting_opentime_introduce_4",
"text": "太空海星会消灭一切威胁它后代的敌人,无论你藏在在银河的哪个角落。"
"text": "格尔族人会消灭一切威胁它后代的敌人,无论你藏在在银河的哪个角落。"
},
"opentimetext": {
"key": "hunting_opentime_opentimetext_4",

View File

@ -485,7 +485,7 @@
"key": "item_item_name_11",
"text": "初级荣耀徽章"
},
"usetype": 3,
"usetype": 2,
"color": 2,
"bagtype": 3,
"index": 100,
@ -515,7 +515,7 @@
"access": [
107
],
"use_skip": 155,
"use_skip": 103,
"upper_limit": 0,
"img": "item_10000011",
"intr": {
@ -545,7 +545,7 @@
"key": "item_item_name_12",
"text": "中级荣耀徽章"
},
"usetype": 3,
"usetype": 2,
"color": 3,
"bagtype": 3,
"index": 101,
@ -587,7 +587,7 @@
"access": [
107
],
"use_skip": 155,
"use_skip": 103,
"upper_limit": 0,
"img": "item_10000012",
"intr": {
@ -617,7 +617,7 @@
"key": "item_item_name_13",
"text": "高级荣耀徽章"
},
"usetype": 3,
"usetype": 2,
"color": 4,
"bagtype": 3,
"index": 102,
@ -647,7 +647,7 @@
"access": [
107
],
"use_skip": 155,
"use_skip": 103,
"upper_limit": 0,
"img": "item_10000013",
"intr": {
@ -879,9 +879,15 @@
"effects": "",
"modelName": "",
"box_id": 0,
"synthetize_num": 0,
"synthetize_num": 10,
"synthetize_deplete": [],
"synthetize_get": [],
"synthetize_get": [
{
"a": "item",
"t": "10000021",
"n": 1
}
],
"decompose_deplete": [],
"decompose_get": [],
"access": [
@ -927,9 +933,15 @@
"effects": "",
"modelName": "",
"box_id": 0,
"synthetize_num": 0,
"synthetize_num": 10,
"synthetize_deplete": [],
"synthetize_get": [],
"synthetize_get": [
{
"a": "item",
"t": "10000022",
"n": 1
}
],
"decompose_deplete": [],
"decompose_get": [],
"access": [
@ -975,9 +987,15 @@
"effects": "",
"modelName": "",
"box_id": 0,
"synthetize_num": 0,
"synthetize_num": 10,
"synthetize_deplete": [],
"synthetize_get": [],
"synthetize_get": [
{
"a": "item",
"t": "10000023",
"n": 1
}
],
"decompose_deplete": [],
"decompose_get": [],
"access": [
@ -1023,9 +1041,15 @@
"effects": "",
"modelName": "",
"box_id": 0,
"synthetize_num": 0,
"synthetize_num": 10,
"synthetize_deplete": [],
"synthetize_get": [],
"synthetize_get": [
{
"a": "item",
"t": "10000024",
"n": 1
}
],
"decompose_deplete": [],
"decompose_get": [],
"access": [
@ -12251,7 +12275,7 @@
"key": "item_item_name_250",
"text": "热火之灵"
},
"usetype": 3,
"usetype": 2,
"color": 1,
"bagtype": 3,
"index": 1,
@ -12281,7 +12305,7 @@
"access": [
168
],
"use_skip": 902,
"use_skip": 155,
"upper_limit": 0,
"img": "item_15000101",
"intr": {
@ -12311,7 +12335,7 @@
"key": "item_item_name_251",
"text": "水滴之灵"
},
"usetype": 3,
"usetype": 2,
"color": 1,
"bagtype": 3,
"index": 1,
@ -12341,7 +12365,7 @@
"access": [
168
],
"use_skip": 902,
"use_skip": 155,
"upper_limit": 0,
"img": "item_15000102",
"intr": {
@ -12371,7 +12395,7 @@
"key": "item_item_name_252",
"text": "古木之灵"
},
"usetype": 3,
"usetype": 2,
"color": 1,
"bagtype": 3,
"index": 1,
@ -12401,7 +12425,7 @@
"access": [
168
],
"use_skip": 902,
"use_skip": 155,
"upper_limit": 0,
"img": "item_15000103",
"intr": {
@ -12431,7 +12455,7 @@
"key": "item_item_name_253",
"text": "微光之灵"
},
"usetype": 3,
"usetype": 2,
"color": 1,
"bagtype": 3,
"index": 1,
@ -12461,7 +12485,7 @@
"access": [
168
],
"use_skip": 902,
"use_skip": 155,
"upper_limit": 0,
"img": "item_15000104",
"intr": {
@ -12491,7 +12515,7 @@
"key": "item_item_name_254",
"text": "烈焰之魄"
},
"usetype": 3,
"usetype": 2,
"color": 2,
"bagtype": 3,
"index": 1,
@ -12533,7 +12557,7 @@
"access": [
168
],
"use_skip": 902,
"use_skip": 155,
"upper_limit": 0,
"img": "item_15000201",
"intr": {
@ -12563,7 +12587,7 @@
"key": "item_item_name_255",
"text": "波浪之魄"
},
"usetype": 3,
"usetype": 2,
"color": 2,
"bagtype": 3,
"index": 1,
@ -12605,7 +12629,7 @@
"access": [
168
],
"use_skip": 902,
"use_skip": 155,
"upper_limit": 0,
"img": "item_15000202",
"intr": {
@ -12635,7 +12659,7 @@
"key": "item_item_name_256",
"text": "荆棘之魄"
},
"usetype": 3,
"usetype": 2,
"color": 2,
"bagtype": 3,
"index": 1,
@ -12677,7 +12701,7 @@
"access": [
168
],
"use_skip": 902,
"use_skip": 155,
"upper_limit": 0,
"img": "item_15000203",
"intr": {
@ -12707,7 +12731,7 @@
"key": "item_item_name_257",
"text": "曙光之魄"
},
"usetype": 3,
"usetype": 2,
"color": 2,
"bagtype": 3,
"index": 1,
@ -12749,7 +12773,7 @@
"access": [
168
],
"use_skip": 902,
"use_skip": 155,
"upper_limit": 0,
"img": "item_15000204",
"intr": {
@ -12779,7 +12803,7 @@
"key": "item_item_name_258",
"text": "燃爆之魂"
},
"usetype": 3,
"usetype": 2,
"color": 3,
"bagtype": 3,
"index": 1,
@ -12809,7 +12833,7 @@
"access": [
168
],
"use_skip": 902,
"use_skip": 155,
"upper_limit": 0,
"img": "item_15000301",
"intr": {
@ -12839,7 +12863,7 @@
"key": "item_item_name_259",
"text": "浪花之魂"
},
"usetype": 3,
"usetype": 2,
"color": 3,
"bagtype": 3,
"index": 1,
@ -12869,7 +12893,7 @@
"access": [
168
],
"use_skip": 902,
"use_skip": 155,
"upper_limit": 0,
"img": "item_15000302",
"intr": {
@ -12899,7 +12923,7 @@
"key": "item_item_name_260",
"text": "回春之魂"
},
"usetype": 3,
"usetype": 2,
"color": 3,
"bagtype": 3,
"index": 1,
@ -12929,7 +12953,7 @@
"access": [
168
],
"use_skip": 902,
"use_skip": 155,
"upper_limit": 0,
"img": "item_15000303",
"intr": {
@ -12959,7 +12983,7 @@
"key": "item_item_name_261",
"text": "耀光之魂"
},
"usetype": 3,
"usetype": 2,
"color": 3,
"bagtype": 3,
"index": 1,
@ -12989,7 +13013,7 @@
"access": [
168
],
"use_skip": 902,
"use_skip": 155,
"upper_limit": 0,
"img": "item_15000304",
"intr": {
@ -15771,7 +15795,7 @@
"id": "17060009",
"name": {
"key": "item_item_name_320",
"text": "5星3系守护者自选箱碎片"
"text": "3系碎片自选箱"
},
"usetype": 4,
"color": 4,
@ -17271,7 +17295,7 @@
"access": [
10006
],
"use_skip": 107,
"use_skip": 10006,
"upper_limit": 0,
"img": "item_20000001",
"intr": {
@ -17319,7 +17343,7 @@
"access": [
10006
],
"use_skip": 107,
"use_skip": 10006,
"upper_limit": 0,
"img": "icon_mcs",
"intr": {
@ -17490,7 +17514,7 @@
"text": "角鸟蛋"
},
"usetype": 2,
"color": 4,
"color": 3,
"bagtype": 6,
"index": 1,
"special_type": 0,
@ -17536,7 +17560,7 @@
"text": "熊猫立牌"
},
"usetype": 2,
"color": 4,
"color": 2,
"bagtype": 6,
"index": 1,
"special_type": 0,
@ -17628,7 +17652,7 @@
"text": "沼泽牙膏"
},
"usetype": 2,
"color": 4,
"color": 1,
"bagtype": 6,
"index": 1,
"special_type": 0,
@ -17674,7 +17698,7 @@
"text": "碎骨龙碎片"
},
"usetype": 2,
"color": 4,
"color": 2,
"bagtype": 6,
"index": 1,
"special_type": 0,
@ -17720,7 +17744,7 @@
"text": "马鞍"
},
"usetype": 2,
"color": 4,
"color": 2,
"bagtype": 6,
"index": 1,
"special_type": 0,
@ -17766,7 +17790,7 @@
"text": "音乐琴弦"
},
"usetype": 2,
"color": 4,
"color": 2,
"bagtype": 6,
"index": 1,
"special_type": 0,
@ -17858,7 +17882,7 @@
"text": "马戏团演出服"
},
"usetype": 2,
"color": 4,
"color": 3,
"bagtype": 6,
"index": 1,
"special_type": 0,
@ -17950,7 +17974,7 @@
"text": "记忆之牙"
},
"usetype": 2,
"color": 4,
"color": 3,
"bagtype": 6,
"index": 1,
"special_type": 0,
@ -17996,7 +18020,7 @@
"text": "纪念版巨怪徽章"
},
"usetype": 2,
"color": 4,
"color": 2,
"bagtype": 6,
"index": 1,
"special_type": 0,
@ -18042,7 +18066,7 @@
"text": "远古巨石"
},
"usetype": 2,
"color": 4,
"color": 3,
"bagtype": 6,
"index": 1,
"special_type": 0,
@ -18088,7 +18112,7 @@
"text": "奶油蛋糕"
},
"usetype": 2,
"color": 4,
"color": 3,
"bagtype": 6,
"index": 1,
"special_type": 0,
@ -18134,7 +18158,7 @@
"text": "水果篮"
},
"usetype": 2,
"color": 4,
"color": 2,
"bagtype": 6,
"index": 1,
"special_type": 0,
@ -18180,7 +18204,7 @@
"text": "玻璃杯"
},
"usetype": 2,
"color": 4,
"color": 1,
"bagtype": 6,
"index": 1,
"special_type": 0,
@ -18226,7 +18250,7 @@
"text": "棒棒糖"
},
"usetype": 2,
"color": 4,
"color": 1,
"bagtype": 6,
"index": 1,
"special_type": 0,
@ -18318,7 +18342,7 @@
"text": "童话书"
},
"usetype": 2,
"color": 4,
"color": 1,
"bagtype": 6,
"index": 1,
"special_type": 0,
@ -18364,7 +18388,7 @@
"text": "木桶"
},
"usetype": 2,
"color": 4,
"color": 1,
"bagtype": 6,
"index": 1,
"special_type": 0,
@ -18456,7 +18480,7 @@
"text": "竹吊床"
},
"usetype": 2,
"color": 4,
"color": 3,
"bagtype": 6,
"index": 1,
"special_type": 0,
@ -18502,7 +18526,7 @@
"text": "溜冰鞋"
},
"usetype": 2,
"color": 4,
"color": 2,
"bagtype": 6,
"index": 1,
"special_type": 0,
@ -18548,7 +18572,7 @@
"text": "冰淇淋"
},
"usetype": 2,
"color": 4,
"color": 1,
"bagtype": 6,
"index": 1,
"special_type": 0,
@ -18594,7 +18618,7 @@
"text": "弓箭"
},
"usetype": 2,
"color": 4,
"color": 3,
"bagtype": 6,
"index": 1,
"special_type": 0,
@ -18686,7 +18710,7 @@
"text": "捕兽夹"
},
"usetype": 2,
"color": 4,
"color": 2,
"bagtype": 6,
"index": 1,
"special_type": 0,
@ -18732,7 +18756,7 @@
"text": "报纸"
},
"usetype": 2,
"color": 4,
"color": 1,
"bagtype": 6,
"index": 1,
"special_type": 0,
@ -18870,7 +18894,7 @@
"text": "岩铁矿"
},
"usetype": 2,
"color": 4,
"color": 3,
"bagtype": 6,
"index": 1,
"special_type": 0,
@ -18916,7 +18940,7 @@
"text": "气球"
},
"usetype": 2,
"color": 4,
"color": 1,
"bagtype": 6,
"index": 1,
"special_type": 0,
@ -19625,7 +19649,7 @@
"access": [],
"use_skip": 0,
"upper_limit": 0,
"img": "",
"img": "item_24011001",
"intr": {
"key": "item_item_intr_404",
"text": ""
@ -19671,7 +19695,7 @@
"access": [],
"use_skip": 0,
"upper_limit": 0,
"img": "",
"img": "item_24021001",
"intr": {
"key": "item_item_intr_405",
"text": ""
@ -19717,7 +19741,7 @@
"access": [],
"use_skip": 0,
"upper_limit": 0,
"img": "",
"img": "item_24031001",
"intr": {
"key": "item_item_intr_406",
"text": ""
@ -19763,7 +19787,7 @@
"access": [],
"use_skip": 0,
"upper_limit": 0,
"img": "",
"img": "item_24041001",
"intr": {
"key": "item_item_intr_407",
"text": ""

View File

@ -16,6 +16,13 @@
"text": "特色商店"
},
"shopunlock": 11001001,
"venturecurrency": [
{
"a": "item",
"t": "24011001",
"n": 1
}
],
"name": {
"key": "mainchapter_main_chapter_name_1",
"text": "预言之声"
@ -61,6 +68,13 @@
"text": "特色商店"
},
"shopunlock": 11001001,
"venturecurrency": [
{
"a": "item",
"t": "24021001",
"n": 1
}
],
"name": {
"key": "mainchapter_main_chapter_name_2",
"text": "原石危机"
@ -106,6 +120,13 @@
"text": "特色商店"
},
"shopunlock": 11001001,
"venturecurrency": [
{
"a": "item",
"t": "24031001",
"n": 1
}
],
"name": {
"key": "mainchapter_main_chapter_name_3",
"text": "小偷与大盗"
@ -151,6 +172,13 @@
"text": "特色商店"
},
"shopunlock": 11001001,
"venturecurrency": [
{
"a": "item",
"t": "24041001",
"n": 1
}
],
"name": {
"key": "mainchapter_main_chapter_name_4",
"text": "智取邀请函"
@ -196,6 +224,13 @@
"text": "特色商店"
},
"shopunlock": 11001001,
"venturecurrency": [
{
"a": "item",
"t": "24041001",
"n": 1
}
],
"name": {
"key": "mainchapter_main_chapter_name_5",
"text": "交易所风波(上)"
@ -241,6 +276,13 @@
"text": "特色商店"
},
"shopunlock": 11001001,
"venturecurrency": [
{
"a": "item",
"t": "24041001",
"n": 1
}
],
"name": {
"key": "mainchapter_main_chapter_name_6",
"text": "交易所风波(下)"
@ -286,6 +328,13 @@
"text": "特色商店"
},
"shopunlock": 11001001,
"venturecurrency": [
{
"a": "item",
"t": "24041001",
"n": 1
}
],
"name": {
"key": "mainchapter_main_chapter_name_7",
"text": "大龙复仇记"
@ -331,6 +380,13 @@
"text": "特色商店"
},
"shopunlock": 11001001,
"venturecurrency": [
{
"a": "item",
"t": "24041001",
"n": 1
}
],
"name": {
"key": "mainchapter_main_chapter_name_8",
"text": "布兰奇的逃亡"
@ -376,6 +432,13 @@
"text": "特色商店"
},
"shopunlock": 11001001,
"venturecurrency": [
{
"a": "item",
"t": "24041001",
"n": 1
}
],
"name": {
"key": "mainchapter_main_chapter_name_9",
"text": "配方奶工厂"
@ -421,6 +484,13 @@
"text": "特色商店"
},
"shopunlock": 11001001,
"venturecurrency": [
{
"a": "item",
"t": "24041001",
"n": 1
}
],
"name": {
"key": "mainchapter_main_chapter_name_10",
"text": "预言之声"
@ -466,6 +536,13 @@
"text": "特色商店"
},
"shopunlock": 11001001,
"venturecurrency": [
{
"a": "item",
"t": "24041001",
"n": 1
}
],
"name": {
"key": "mainchapter_main_chapter_name_11",
"text": "大龙复仇记"
@ -511,6 +588,13 @@
"text": "特色商店"
},
"shopunlock": 11001001,
"venturecurrency": [
{
"a": "item",
"t": "24041001",
"n": 1
}
],
"name": {
"key": "mainchapter_main_chapter_name_12",
"text": "小偷与大盗"

View File

@ -12,7 +12,7 @@
"need": [
{
"a": "item",
"t": "24010001",
"t": "24011001",
"n": 1
}
],
@ -32,8 +32,8 @@
"need": [
{
"a": "item",
"t": "24010001",
"n": 1
"t": "24011001",
"n": 2
}
],
"bugtime": 1,
@ -52,8 +52,8 @@
"need": [
{
"a": "item",
"t": "24010001",
"n": 1
"t": "24011001",
"n": 3
}
],
"bugtime": 1,
@ -72,8 +72,8 @@
"need": [
{
"a": "item",
"t": "24010001",
"n": 1
"t": "24011001",
"n": 4
}
],
"bugtime": 1,
@ -92,8 +92,8 @@
"need": [
{
"a": "item",
"t": "24010001",
"n": 1
"t": "24011001",
"n": 5
}
],
"bugtime": 1,
@ -112,8 +112,8 @@
"need": [
{
"a": "item",
"t": "24010001",
"n": 1
"t": "24011001",
"n": 6
}
],
"bugtime": 1,
@ -132,8 +132,8 @@
"need": [
{
"a": "item",
"t": "24010001",
"n": 1
"t": "24011001",
"n": 7
}
],
"bugtime": 1,
@ -152,8 +152,8 @@
"need": [
{
"a": "item",
"t": "24010001",
"n": 1
"t": "24011001",
"n": 8
}
],
"bugtime": 1,

File diff suppressed because it is too large Load Diff

View File

@ -199,18 +199,18 @@
},
{
"Id": 12,
"scene": "WuGuanScene",
"scene": "GameMain",
"scenename": {
"key": "navigation_Sheet1_scenename_12",
"text": "熊猫武馆"
"text": "中轴城"
},
"sceneicon": "ty_qp_xmwg",
"sceneicon": "ty_qp_my01",
"functionname": {
"key": "navigation_Sheet1_functionname_12",
"text": "布告栏"
},
"npcName": [
"告示板"
"功能入口_派遣"
],
"functionicon": "ty_qp_gsb",
"jumpId": 10006

View File

@ -7327,7 +7327,7 @@
2,
300986
],
"goto": 1
"goto": 0
},
{
"id": 3202312,
@ -7338,7 +7338,7 @@
"903"
],
"event": [],
"goto": 2
"goto": 0
},
{
"id": 3202319,
@ -7349,7 +7349,7 @@
"904"
],
"event": [],
"goto": 3
"goto": 0
},
{
"id": 320240,
@ -7364,7 +7364,7 @@
2,
301010
],
"goto": 4
"goto": 0
},
{
"id": 320241,
@ -7375,7 +7375,7 @@
"906"
],
"event": [],
"goto": 5
"goto": 0
},
{
"id": 320249,
@ -7386,7 +7386,7 @@
"901"
],
"event": [],
"goto": 6
"goto": 0
},
{
"id": 320250,
@ -7401,7 +7401,7 @@
2,
301030
],
"goto": 7
"goto": 0
},
{
"id": 320251,
@ -7425,6 +7425,51 @@
"event": [],
"goto": 0
},
{
"id": 320260,
"heroid": 25001,
"Levelid": 0,
"datas": [
"WuGuanScene",
"阿宝",
"137"
],
"event": [
2,
301040
],
"goto": 0
},
{
"id": 320261,
"heroid": 25001,
"Levelid": 0,
"datas": [
"WuGuanScene",
"总教习",
"137"
],
"event": [
2,
301042
],
"goto": 0
},
{
"id": 320269,
"heroid": 25001,
"Levelid": 0,
"datas": [
"WuGuanScene",
"总教习",
"137"
],
"event": [
2,
301043
],
"goto": 0
},
{
"id": 50010,
"heroid": 25001,

View File

@ -333,22 +333,22 @@
"id": 10031,
"title": {
"key": "ruledesc_ruledesc_title_31",
"text": "功夫塔挑战说明"
"text": "炼金塔挑战说明"
},
"content": {
"key": "ruledesc_ruledesc_content_31",
"text": "这里可以挑战功夫塔每次挑战胜利都可以获得奖励每挑战胜利10层可以获得相应教习。功夫塔挑战不需要消耗物品)。"
"text": "这里可以挑战炼金塔每次挑战胜利都可以获得奖励每挑战胜利10层可以获得相应教习。炼金塔挑战不需要消耗物品)。"
}
},
{
"id": 10032,
"title": {
"key": "ruledesc_ruledesc_title_32",
"text": "功夫塔挑战说明"
"text": "炼金塔挑战说明"
},
"content": {
"key": "ruledesc_ruledesc_content_32",
"text": "这里可以查看功夫塔每层挑战成功获得的奖励与敌人配置。"
"text": "这里可以查看炼金塔每层挑战成功获得的奖励与敌人配置。"
}
},
{

View File

@ -33261,9 +33261,7 @@
2,
400
],
"FollowSK": [
243004312
],
"FollowSK": [],
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false,
@ -33286,9 +33284,7 @@
4,
5200
],
"FollowSK": [
243004313
],
"FollowSK": [],
"SucFollowSK": [
243004314
],

View File

@ -25169,7 +25169,9 @@
"Target": 2,
"ChildSkill": {
"Id": [
243004311
243004311,
243004312,
243004313
]
},
"passSkill": [],

View File

@ -1253,7 +1253,7 @@
"Priority": 0,
"NotOverlay": 0,
"OverlayTimes": 1,
"SameID": true,
"SameID": false,
"golbalbufficon": "",
"buffIcon": "ty_icon_buff_fs",
"buffeffect": "effect_34002_skill_1_hit_1",
@ -2976,7 +2976,7 @@
"Priority": 0,
"NotOverlay": 0,
"OverlayTimes": 99,
"SameID": true,
"SameID": false,
"golbalbufficon": "",
"buffIcon": "",
"buffeffect": "",
@ -3010,7 +3010,7 @@
"Priority": 0,
"NotOverlay": 0,
"OverlayTimes": 1,
"SameID": true,
"SameID": false,
"golbalbufficon": "",
"buffIcon": "",
"buffeffect": "",
@ -3076,7 +3076,7 @@
"Priority": 0,
"NotOverlay": 0,
"OverlayTimes": 99,
"SameID": true,
"SameID": false,
"golbalbufficon": "",
"buffIcon": "",
"buffeffect": "",
@ -3594,7 +3594,7 @@
"Priority": 0,
"NotOverlay": 0,
"OverlayTimes": 1,
"SameID": true,
"SameID": false,
"golbalbufficon": "",
"buffIcon": "",
"buffeffect": "",
@ -3659,7 +3659,7 @@
"Priority": 0,
"NotOverlay": 0,
"OverlayTimes": 5,
"SameID": true,
"SameID": false,
"golbalbufficon": "",
"buffIcon": "",
"buffeffect": "",
@ -3790,7 +3790,7 @@
"Priority": 0,
"NotOverlay": 0,
"OverlayTimes": 99,
"SameID": true,
"SameID": false,
"golbalbufficon": "",
"buffIcon": "ty_icon_buff_q",
"buffeffect": "",
@ -3821,7 +3821,7 @@
"Priority": 0,
"NotOverlay": 0,
"OverlayTimes": 1,
"SameID": true,
"SameID": false,
"golbalbufficon": "",
"buffIcon": "ty_icon_buff_mzmy",
"buffeffect": "",
@ -3854,7 +3854,7 @@
"Priority": 0,
"NotOverlay": 0,
"OverlayTimes": 99,
"SameID": true,
"SameID": false,
"golbalbufficon": "",
"buffIcon": "ty_icon_buff_dy",
"buffeffect": "",
@ -4219,7 +4219,7 @@
"Priority": 0,
"NotOverlay": 0,
"OverlayTimes": 1,
"SameID": true,
"SameID": false,
"golbalbufficon": "",
"buffIcon": "ty_icon_buff_zhby",
"buffeffect": "",
@ -4768,7 +4768,7 @@
"Priority": 0,
"NotOverlay": 0,
"OverlayTimes": 99,
"SameID": true,
"SameID": false,
"golbalbufficon": "",
"buffIcon": "ty_icon_buff_gjts",
"buffeffect": "",
@ -4801,7 +4801,7 @@
"Priority": 0,
"NotOverlay": 0,
"OverlayTimes": 99,
"SameID": true,
"SameID": false,
"golbalbufficon": "",
"buffIcon": "ty_icon_buff_gjts",
"buffeffect": "",
@ -4834,7 +4834,7 @@
"Priority": 0,
"NotOverlay": 0,
"OverlayTimes": 99,
"SameID": true,
"SameID": false,
"golbalbufficon": "",
"buffIcon": "ty_icon_buff_bjts",
"buffeffect": "",
@ -4867,7 +4867,7 @@
"Priority": 0,
"NotOverlay": 0,
"OverlayTimes": 99,
"SameID": true,
"SameID": false,
"golbalbufficon": "",
"buffIcon": "ty_icon_buff_bjts",
"buffeffect": "",
@ -4900,7 +4900,7 @@
"Priority": 0,
"NotOverlay": 0,
"OverlayTimes": 99,
"SameID": true,
"SameID": false,
"golbalbufficon": "",
"buffIcon": "",
"buffeffect": "",
@ -4933,7 +4933,7 @@
"Priority": 0,
"NotOverlay": 0,
"OverlayTimes": 99,
"SameID": true,
"SameID": false,
"golbalbufficon": "",
"buffIcon": "",
"buffeffect": "",
@ -4966,7 +4966,7 @@
"Priority": 0,
"NotOverlay": 0,
"OverlayTimes": 6,
"SameID": true,
"SameID": false,
"golbalbufficon": "",
"buffIcon": "ty_icon_buff_shts10",
"buffeffect": "",
@ -4999,7 +4999,7 @@
"Priority": 0,
"NotOverlay": 0,
"OverlayTimes": 6,
"SameID": true,
"SameID": false,
"golbalbufficon": "",
"buffIcon": "ty_icon_buff_shts10",
"buffeffect": "",
@ -5032,7 +5032,7 @@
"Priority": 0,
"NotOverlay": 0,
"OverlayTimes": 99,
"SameID": true,
"SameID": false,
"golbalbufficon": "",
"buffIcon": "",
"buffeffect": "",
@ -5097,7 +5097,7 @@
"Priority": 0,
"NotOverlay": 0,
"OverlayTimes": 99,
"SameID": true,
"SameID": false,
"golbalbufficon": "",
"buffIcon": "ty_icon_buff_shts10",
"buffeffect": "",
@ -5130,7 +5130,7 @@
"Priority": 0,
"NotOverlay": 0,
"OverlayTimes": 99,
"SameID": true,
"SameID": false,
"golbalbufficon": "",
"buffIcon": "",
"buffeffect": "",
@ -5163,7 +5163,7 @@
"Priority": 0,
"NotOverlay": 0,
"OverlayTimes": 99,
"SameID": true,
"SameID": false,
"golbalbufficon": "",
"buffIcon": "",
"buffeffect": "",
@ -5196,7 +5196,7 @@
"Priority": 0,
"NotOverlay": 0,
"OverlayTimes": 99,
"SameID": true,
"SameID": false,
"golbalbufficon": "",
"buffIcon": "ty_icon_buff_fyts",
"buffeffect": "",
@ -5229,7 +5229,7 @@
"Priority": 0,
"NotOverlay": 0,
"OverlayTimes": 99,
"SameID": true,
"SameID": false,
"golbalbufficon": "",
"buffIcon": "ty_icon_buff_fyts",
"buffeffect": "",
@ -5262,7 +5262,7 @@
"Priority": 0,
"NotOverlay": 0,
"OverlayTimes": 99,
"SameID": true,
"SameID": false,
"golbalbufficon": "",
"buffIcon": "",
"buffeffect": "",
@ -5295,7 +5295,7 @@
"Priority": 0,
"NotOverlay": 0,
"OverlayTimes": 99,
"SameID": true,
"SameID": false,
"golbalbufficon": "",
"buffIcon": "",
"buffeffect": "",
@ -5328,7 +5328,7 @@
"Priority": 0,
"NotOverlay": 0,
"OverlayTimes": 99,
"SameID": true,
"SameID": false,
"golbalbufficon": "",
"buffIcon": "",
"buffeffect": "",
@ -5361,7 +5361,7 @@
"Priority": 0,
"NotOverlay": 0,
"OverlayTimes": 99,
"SameID": true,
"SameID": false,
"golbalbufficon": "",
"buffIcon": "",
"buffeffect": "",
@ -5394,7 +5394,7 @@
"Priority": 0,
"NotOverlay": 0,
"OverlayTimes": 99,
"SameID": true,
"SameID": false,
"golbalbufficon": "",
"buffIcon": "",
"buffeffect": "",
@ -5427,7 +5427,7 @@
"Priority": 0,
"NotOverlay": 0,
"OverlayTimes": 99,
"SameID": true,
"SameID": false,
"golbalbufficon": "",
"buffIcon": "",
"buffeffect": "",
@ -5460,7 +5460,7 @@
"Priority": 0,
"NotOverlay": 0,
"OverlayTimes": 99,
"SameID": true,
"SameID": false,
"golbalbufficon": "",
"buffIcon": "ty_icon_buff_fyts",
"buffeffect": "",
@ -5493,7 +5493,7 @@
"Priority": 0,
"NotOverlay": 0,
"OverlayTimes": 99,
"SameID": true,
"SameID": false,
"golbalbufficon": "",
"buffIcon": "ty_icon_buff_fyts",
"buffeffect": "",
@ -5528,7 +5528,7 @@
"Priority": 0,
"NotOverlay": 0,
"OverlayTimes": 99,
"SameID": true,
"SameID": false,
"golbalbufficon": "",
"buffIcon": "ty_icon_buff_hd",
"buffeffect": "",
@ -5563,7 +5563,7 @@
"Priority": 0,
"NotOverlay": 0,
"OverlayTimes": 99,
"SameID": true,
"SameID": false,
"golbalbufficon": "",
"buffIcon": "ty_icon_buff_hd",
"buffeffect": "",
@ -5596,7 +5596,7 @@
"Priority": 0,
"NotOverlay": 0,
"OverlayTimes": 6,
"SameID": true,
"SameID": false,
"golbalbufficon": "",
"buffIcon": "",
"buffeffect": "",
@ -5629,7 +5629,7 @@
"Priority": 0,
"NotOverlay": 0,
"OverlayTimes": 6,
"SameID": true,
"SameID": false,
"golbalbufficon": "",
"buffIcon": "",
"buffeffect": "",
@ -5662,7 +5662,7 @@
"Priority": 0,
"NotOverlay": 0,
"OverlayTimes": 99,
"SameID": true,
"SameID": false,
"golbalbufficon": "",
"buffIcon": "ty_icon_buff_fyts",
"buffeffect": "",
@ -5695,7 +5695,7 @@
"Priority": 0,
"NotOverlay": 0,
"OverlayTimes": 99,
"SameID": true,
"SameID": false,
"golbalbufficon": "",
"buffIcon": "ty_icon_buff_fyts",
"buffeffect": "",
@ -5760,7 +5760,7 @@
"Priority": 0,
"NotOverlay": 0,
"OverlayTimes": 99,
"SameID": true,
"SameID": false,
"golbalbufficon": "",
"buffIcon": "ty_icon_buff_sm",
"buffeffect": "effect_debuff_sleep",
@ -5926,7 +5926,7 @@
"Priority": 0,
"NotOverlay": 0,
"OverlayTimes": 99,
"SameID": true,
"SameID": false,
"golbalbufficon": "",
"buffIcon": "",
"buffeffect": "",
@ -5959,7 +5959,7 @@
"Priority": 0,
"NotOverlay": 0,
"OverlayTimes": 99,
"SameID": true,
"SameID": false,
"golbalbufficon": "",
"buffIcon": "",
"buffeffect": "",
@ -5995,7 +5995,7 @@
"Priority": 0,
"NotOverlay": 0,
"OverlayTimes": 99,
"SameID": true,
"SameID": false,
"golbalbufficon": "",
"buffIcon": "",
"buffeffect": "",
@ -6031,7 +6031,7 @@
"Priority": 0,
"NotOverlay": 0,
"OverlayTimes": 99,
"SameID": true,
"SameID": false,
"golbalbufficon": "",
"buffIcon": "",
"buffeffect": "",
@ -6064,7 +6064,7 @@
"Priority": 0,
"NotOverlay": 0,
"OverlayTimes": 99,
"SameID": true,
"SameID": false,
"golbalbufficon": "",
"buffIcon": "",
"buffeffect": "",
@ -6161,7 +6161,7 @@
"Priority": 0,
"NotOverlay": 0,
"OverlayTimes": 99,
"SameID": true,
"SameID": false,
"golbalbufficon": "",
"buffIcon": "ty_icon_buff_shts10",
"buffeffect": "",
@ -6194,7 +6194,7 @@
"Priority": 0,
"NotOverlay": 0,
"OverlayTimes": 99,
"SameID": true,
"SameID": false,
"golbalbufficon": "",
"buffIcon": "ty_icon_buff_shts10",
"buffeffect": "",
@ -6232,7 +6232,7 @@
"Priority": 0,
"NotOverlay": 0,
"OverlayTimes": 10,
"SameID": true,
"SameID": false,
"golbalbufficon": "",
"buffIcon": "",
"buffeffect": "",
@ -6270,7 +6270,7 @@
"Priority": 0,
"NotOverlay": 0,
"OverlayTimes": 10,
"SameID": true,
"SameID": false,
"golbalbufficon": "",
"buffIcon": "",
"buffeffect": "",
@ -6304,7 +6304,7 @@
"Priority": 0,
"NotOverlay": 0,
"OverlayTimes": 99,
"SameID": true,
"SameID": false,
"golbalbufficon": "",
"buffIcon": "ty_icon_buff_hd",
"buffeffect": "",
@ -6341,7 +6341,7 @@
"Priority": 0,
"NotOverlay": 0,
"OverlayTimes": 99,
"SameID": true,
"SameID": false,
"golbalbufficon": "",
"buffIcon": "ty_icon_buff_hd",
"buffeffect": "",
@ -6504,7 +6504,7 @@
"Priority": 0,
"NotOverlay": 0,
"OverlayTimes": 99,
"SameID": true,
"SameID": false,
"golbalbufficon": "",
"buffIcon": "",
"buffeffect": "",
@ -6538,7 +6538,7 @@
"Priority": 0,
"NotOverlay": 0,
"OverlayTimes": 99,
"SameID": true,
"SameID": false,
"golbalbufficon": "",
"buffIcon": "",
"buffeffect": "",
@ -6603,7 +6603,7 @@
"Priority": 0,
"NotOverlay": 0,
"OverlayTimes": 99,
"SameID": true,
"SameID": false,
"golbalbufficon": "",
"buffIcon": "",
"buffeffect": "",
@ -6636,7 +6636,7 @@
"Priority": 0,
"NotOverlay": 0,
"OverlayTimes": 6,
"SameID": true,
"SameID": false,
"golbalbufficon": "",
"buffIcon": "ty_icon_buff_gjts",
"buffeffect": "",
@ -6669,7 +6669,7 @@
"Priority": 0,
"NotOverlay": 0,
"OverlayTimes": 6,
"SameID": true,
"SameID": false,
"golbalbufficon": "",
"buffIcon": "ty_icon_buff_gjts",
"buffeffect": "",
@ -6702,7 +6702,7 @@
"Priority": 0,
"NotOverlay": 0,
"OverlayTimes": 6,
"SameID": true,
"SameID": false,
"golbalbufficon": "",
"buffIcon": "ty_icon_buff_fyts",
"buffeffect": "",
@ -6735,7 +6735,7 @@
"Priority": 0,
"NotOverlay": 0,
"OverlayTimes": 6,
"SameID": true,
"SameID": false,
"golbalbufficon": "",
"buffIcon": "ty_icon_buff_fyts",
"buffeffect": "",
@ -6768,7 +6768,7 @@
"Priority": 0,
"NotOverlay": 0,
"OverlayTimes": 6,
"SameID": true,
"SameID": false,
"golbalbufficon": "",
"buffIcon": "",
"buffeffect": "",
@ -6801,7 +6801,7 @@
"Priority": 0,
"NotOverlay": 0,
"OverlayTimes": 6,
"SameID": true,
"SameID": false,
"golbalbufficon": "",
"buffIcon": "",
"buffeffect": "",
@ -6834,7 +6834,7 @@
"Priority": 0,
"NotOverlay": 0,
"OverlayTimes": 99,
"SameID": true,
"SameID": false,
"golbalbufficon": "",
"buffIcon": "",
"buffeffect": "",
@ -6867,7 +6867,7 @@
"Priority": 0,
"NotOverlay": 0,
"OverlayTimes": 99,
"SameID": true,
"SameID": false,
"golbalbufficon": "",
"buffIcon": "",
"buffeffect": "",
@ -6932,7 +6932,7 @@
"Priority": 0,
"NotOverlay": 0,
"OverlayTimes": 99,
"SameID": true,
"SameID": false,
"golbalbufficon": "",
"buffIcon": "",
"buffeffect": "",
@ -6962,7 +6962,7 @@
"Priority": 0,
"NotOverlay": 0,
"OverlayTimes": 99,
"SameID": true,
"SameID": false,
"golbalbufficon": "",
"buffIcon": "",
"buffeffect": "",
@ -6995,7 +6995,7 @@
"Priority": 0,
"NotOverlay": 0,
"OverlayTimes": 99,
"SameID": true,
"SameID": false,
"golbalbufficon": "",
"buffIcon": "",
"buffeffect": "",
@ -7028,7 +7028,7 @@
"Priority": 0,
"NotOverlay": 0,
"OverlayTimes": 99,
"SameID": true,
"SameID": false,
"golbalbufficon": "",
"buffIcon": "",
"buffeffect": "",
@ -7058,7 +7058,7 @@
"Priority": 0,
"NotOverlay": 0,
"OverlayTimes": 99,
"SameID": true,
"SameID": false,
"golbalbufficon": "",
"buffIcon": "",
"buffeffect": "",
@ -7091,7 +7091,7 @@
"Priority": 0,
"NotOverlay": 0,
"OverlayTimes": 99,
"SameID": true,
"SameID": false,
"golbalbufficon": "",
"buffIcon": "",
"buffeffect": "",
@ -7124,7 +7124,7 @@
"Priority": 0,
"NotOverlay": 0,
"OverlayTimes": 99,
"SameID": true,
"SameID": false,
"golbalbufficon": "",
"buffIcon": "",
"buffeffect": "",
@ -7157,7 +7157,7 @@
"Priority": 0,
"NotOverlay": 0,
"OverlayTimes": 99,
"SameID": true,
"SameID": false,
"golbalbufficon": "",
"buffIcon": "",
"buffeffect": "",
@ -7187,7 +7187,7 @@
"Priority": 0,
"NotOverlay": 0,
"OverlayTimes": 99,
"SameID": true,
"SameID": false,
"golbalbufficon": "",
"buffIcon": "",
"buffeffect": "",
@ -7222,7 +7222,7 @@
"Priority": 0,
"NotOverlay": 0,
"OverlayTimes": 99,
"SameID": true,
"SameID": false,
"golbalbufficon": "",
"buffIcon": "ty_icon_buff_fyts",
"buffeffect": "",
@ -7257,7 +7257,7 @@
"Priority": 0,
"NotOverlay": 0,
"OverlayTimes": 99,
"SameID": true,
"SameID": false,
"golbalbufficon": "",
"buffIcon": "ty_icon_buff_fyts",
"buffeffect": "",
@ -7292,7 +7292,7 @@
"Priority": 0,
"NotOverlay": 0,
"OverlayTimes": 99,
"SameID": true,
"SameID": false,
"golbalbufficon": "",
"buffIcon": "",
"buffeffect": "",
@ -7327,7 +7327,7 @@
"Priority": 0,
"NotOverlay": 0,
"OverlayTimes": 99,
"SameID": true,
"SameID": false,
"golbalbufficon": "",
"buffIcon": "",
"buffeffect": "",
@ -7360,7 +7360,7 @@
"Priority": 0,
"NotOverlay": 0,
"OverlayTimes": 1,
"SameID": true,
"SameID": false,
"golbalbufficon": "",
"buffIcon": "",
"buffeffect": "",
@ -7394,7 +7394,7 @@
"Priority": 0,
"NotOverlay": 0,
"OverlayTimes": 99,
"SameID": true,
"SameID": false,
"golbalbufficon": "",
"buffIcon": "",
"buffeffect": "",
@ -7428,7 +7428,7 @@
"Priority": 0,
"NotOverlay": 0,
"OverlayTimes": 99,
"SameID": true,
"SameID": false,
"golbalbufficon": "",
"buffIcon": "",
"buffeffect": "",
@ -7461,7 +7461,7 @@
"Priority": 0,
"NotOverlay": 0,
"OverlayTimes": 99,
"SameID": true,
"SameID": false,
"golbalbufficon": "",
"buffIcon": "",
"buffeffect": "",
@ -7494,7 +7494,7 @@
"Priority": 0,
"NotOverlay": 0,
"OverlayTimes": 99,
"SameID": true,
"SameID": false,
"golbalbufficon": "",
"buffIcon": "",
"buffeffect": "",
@ -7528,7 +7528,7 @@
"Priority": 0,
"NotOverlay": 0,
"OverlayTimes": 99,
"SameID": true,
"SameID": false,
"golbalbufficon": "",
"buffIcon": "ty_icon_buff_gjxj",
"buffeffect": "",
@ -7562,7 +7562,7 @@
"Priority": 0,
"NotOverlay": 0,
"OverlayTimes": 99,
"SameID": true,
"SameID": false,
"golbalbufficon": "",
"buffIcon": "ty_icon_buff_gjxj",
"buffeffect": "",
@ -7596,7 +7596,7 @@
"Priority": 0,
"NotOverlay": 0,
"OverlayTimes": 99,
"SameID": true,
"SameID": false,
"golbalbufficon": "",
"buffIcon": "ty_icon_buff_fyxj",
"buffeffect": "",
@ -7630,7 +7630,7 @@
"Priority": 0,
"NotOverlay": 0,
"OverlayTimes": 99,
"SameID": true,
"SameID": false,
"golbalbufficon": "",
"buffIcon": "ty_icon_buff_fyxj",
"buffeffect": "",
@ -7663,7 +7663,7 @@
"Priority": 0,
"NotOverlay": 0,
"OverlayTimes": 99,
"SameID": true,
"SameID": false,
"golbalbufficon": "",
"buffIcon": "",
"buffeffect": "",
@ -7696,7 +7696,7 @@
"Priority": 0,
"NotOverlay": 0,
"OverlayTimes": 99,
"SameID": true,
"SameID": false,
"golbalbufficon": "",
"buffIcon": "",
"buffeffect": "",
@ -7730,7 +7730,7 @@
"Priority": 0,
"NotOverlay": 0,
"OverlayTimes": 5,
"SameID": true,
"SameID": false,
"golbalbufficon": "",
"buffIcon": "ty_icon_buff_sdxj",
"buffeffect": "",
@ -7764,7 +7764,7 @@
"Priority": 0,
"NotOverlay": 0,
"OverlayTimes": 5,
"SameID": true,
"SameID": false,
"golbalbufficon": "",
"buffIcon": "ty_icon_buff_sdxj",
"buffeffect": "",
@ -7799,7 +7799,7 @@
"Priority": 0,
"NotOverlay": 0,
"OverlayTimes": 99,
"SameID": true,
"SameID": false,
"golbalbufficon": "",
"buffIcon": "",
"buffeffect": "",
@ -7832,7 +7832,7 @@
"Priority": 0,
"NotOverlay": 0,
"OverlayTimes": 99,
"SameID": true,
"SameID": false,
"golbalbufficon": "",
"buffIcon": "",
"buffeffect": "",
@ -7862,7 +7862,7 @@
"Priority": 0,
"NotOverlay": 0,
"OverlayTimes": 99,
"SameID": true,
"SameID": false,
"golbalbufficon": "",
"buffIcon": "",
"buffeffect": "",
@ -7892,7 +7892,7 @@
"Priority": 0,
"NotOverlay": 0,
"OverlayTimes": 99,
"SameID": true,
"SameID": false,
"golbalbufficon": "",
"buffIcon": "",
"buffeffect": "",
@ -7927,7 +7927,7 @@
"Priority": 0,
"NotOverlay": 0,
"OverlayTimes": 99,
"SameID": true,
"SameID": false,
"golbalbufficon": "",
"buffIcon": "",
"buffeffect": "",
@ -7960,7 +7960,7 @@
"Priority": 0,
"NotOverlay": 0,
"OverlayTimes": 99,
"SameID": true,
"SameID": false,
"golbalbufficon": "",
"buffIcon": "",
"buffeffect": "",
@ -7992,7 +7992,7 @@
"Priority": 0,
"NotOverlay": 0,
"OverlayTimes": 99,
"SameID": true,
"SameID": false,
"golbalbufficon": "",
"buffIcon": "",
"buffeffect": "",
@ -8025,7 +8025,7 @@
"Priority": 0,
"NotOverlay": 0,
"OverlayTimes": 99,
"SameID": true,
"SameID": false,
"golbalbufficon": "",
"buffIcon": "",
"buffeffect": "",
@ -8058,7 +8058,7 @@
"Priority": 0,
"NotOverlay": 0,
"OverlayTimes": 99,
"SameID": true,
"SameID": false,
"golbalbufficon": "",
"buffIcon": "",
"buffeffect": "",
@ -8091,7 +8091,7 @@
"Priority": 0,
"NotOverlay": 0,
"OverlayTimes": 99,
"SameID": true,
"SameID": false,
"golbalbufficon": "",
"buffIcon": "",
"buffeffect": "",
@ -8154,7 +8154,7 @@
"Priority": 0,
"NotOverlay": 0,
"OverlayTimes": 99,
"SameID": true,
"SameID": false,
"golbalbufficon": "",
"buffIcon": "",
"buffeffect": "",
@ -8187,7 +8187,7 @@
"Priority": 0,
"NotOverlay": 0,
"OverlayTimes": 99,
"SameID": true,
"SameID": false,
"golbalbufficon": "",
"buffIcon": "",
"buffeffect": "",
@ -8220,7 +8220,7 @@
"Priority": 0,
"NotOverlay": 0,
"OverlayTimes": 99,
"SameID": true,
"SameID": false,
"golbalbufficon": "",
"buffIcon": "",
"buffeffect": "",
@ -8253,7 +8253,7 @@
"Priority": 0,
"NotOverlay": 0,
"OverlayTimes": 99,
"SameID": true,
"SameID": false,
"golbalbufficon": "",
"buffIcon": "",
"buffeffect": "",
@ -8285,7 +8285,7 @@
"Priority": 0,
"NotOverlay": 0,
"OverlayTimes": 99,
"SameID": true,
"SameID": false,
"golbalbufficon": "",
"buffIcon": "",
"buffeffect": "",
@ -8318,7 +8318,7 @@
"Priority": 0,
"NotOverlay": 0,
"OverlayTimes": 99,
"SameID": true,
"SameID": false,
"golbalbufficon": "",
"buffIcon": "",
"buffeffect": "",
@ -8351,7 +8351,7 @@
"Priority": 0,
"NotOverlay": 0,
"OverlayTimes": 99,
"SameID": true,
"SameID": false,
"golbalbufficon": "",
"buffIcon": "",
"buffeffect": "",
@ -8384,7 +8384,7 @@
"Priority": 0,
"NotOverlay": 0,
"OverlayTimes": 99,
"SameID": true,
"SameID": false,
"golbalbufficon": "",
"buffIcon": "",
"buffeffect": "",
@ -8417,7 +8417,7 @@
"Priority": 0,
"NotOverlay": 0,
"OverlayTimes": 1,
"SameID": true,
"SameID": false,
"golbalbufficon": "",
"buffIcon": "",
"buffeffect": "",
@ -8450,7 +8450,7 @@
"Priority": 0,
"NotOverlay": 0,
"OverlayTimes": 1,
"SameID": true,
"SameID": false,
"golbalbufficon": "",
"buffIcon": "",
"buffeffect": "",
@ -8483,7 +8483,7 @@
"Priority": 0,
"NotOverlay": 0,
"OverlayTimes": 1,
"SameID": true,
"SameID": false,
"golbalbufficon": "",
"buffIcon": "",
"buffeffect": "",
@ -9845,7 +9845,7 @@
"Priority": 0,
"NotOverlay": 0,
"OverlayTimes": 6,
"SameID": true,
"SameID": false,
"golbalbufficon": "",
"buffIcon": "",
"buffeffect": "",
@ -10570,7 +10570,7 @@
"Priority": 0,
"NotOverlay": 0,
"OverlayTimes": 99,
"SameID": true,
"SameID": false,
"golbalbufficon": "",
"buffIcon": "",
"buffeffect": "",
@ -10606,7 +10606,7 @@
"Priority": 0,
"NotOverlay": 0,
"OverlayTimes": 1,
"SameID": true,
"SameID": false,
"golbalbufficon": "",
"buffIcon": "",
"buffeffect": "",
@ -10878,7 +10878,7 @@
"Priority": 0,
"NotOverlay": 0,
"OverlayTimes": 99,
"SameID": true,
"SameID": false,
"golbalbufficon": "",
"buffIcon": "",
"buffeffect": "",
@ -10912,7 +10912,7 @@
"Priority": 0,
"NotOverlay": 0,
"OverlayTimes": 1,
"SameID": true,
"SameID": false,
"golbalbufficon": "",
"buffIcon": "",
"buffeffect": "",
@ -10946,7 +10946,7 @@
"Priority": 0,
"NotOverlay": 0,
"OverlayTimes": 1,
"SameID": true,
"SameID": false,
"golbalbufficon": "",
"buffIcon": "",
"buffeffect": "",
@ -10981,7 +10981,7 @@
"Priority": 0,
"NotOverlay": 0,
"OverlayTimes": 1,
"SameID": true,
"SameID": false,
"golbalbufficon": "",
"buffIcon": "",
"buffeffect": "",
@ -11015,7 +11015,7 @@
"Priority": 0,
"NotOverlay": 0,
"OverlayTimes": 1,
"SameID": true,
"SameID": false,
"golbalbufficon": "",
"buffIcon": "",
"buffeffect": "",
@ -11113,7 +11113,7 @@
"Priority": 0,
"NotOverlay": 0,
"OverlayTimes": 1,
"SameID": true,
"SameID": false,
"golbalbufficon": "",
"buffIcon": "",
"buffeffect": "",
@ -11146,7 +11146,7 @@
"Priority": 0,
"NotOverlay": 0,
"OverlayTimes": 1,
"SameID": true,
"SameID": false,
"golbalbufficon": "",
"buffIcon": "",
"buffeffect": "",

View File

@ -2282,9 +2282,7 @@
"MaxEmitTimes": 0,
"MaxEmitTimesInRound": 99,
"Callback": [
1,
1000,
214002214
255002213
]
},
{
@ -2302,10 +2300,11 @@
"Type": "BeatBack",
"MaxEmitTimesInRoundByRole": 0,
"MaxEmitTimes": 0,
"MaxEmitTimesInRound": 99,
"MaxEmitTimesInRound": 1,
"Callback": [
1,
1000
1000,
214002214
]
},
{
@ -2323,7 +2322,7 @@
"Type": "BeatBack",
"MaxEmitTimesInRoundByRole": 0,
"MaxEmitTimes": 0,
"MaxEmitTimesInRound": 99,
"MaxEmitTimesInRound": 1,
"Callback": [
1,
1000
@ -7556,7 +7555,7 @@
"TargetCheck": "Target=2,HasBuff=1",
"MainSkillCheck": "MainSkillID=115002311",
"AfterSkillCheck": "",
"BuffCheck": "HasBuff=1,Succ=1",
"BuffCheck": "Effect=1,Succ=1",
"DpsCheck": "",
"AddCon": [],
"PasPr": 1000,
@ -7982,7 +7981,7 @@
"TargetCheck": "Target=2,HasBuff=1",
"MainSkillCheck": "",
"AfterSkillCheck": "",
"BuffCheck": "HasBuff=1,Succ=1",
"BuffCheck": "Effect=1,Succ=1",
"DpsCheck": "",
"AddCon": [],
"PasPr": 1000,
@ -8017,12 +8016,12 @@
},
{
"Id": 494500131,
"When": 28,
"FromCheck": "",
"TargetCheck": "Target=2,HasBuff=3",
"When": 18,
"FromCheck": "Target=3",
"TargetCheck": "Target=2",
"MainSkillCheck": "SkillPos=3",
"AfterSkillCheck": "",
"BuffCheck": "HasBuff=3,Succ=1",
"BuffCheck": "Effect=3,Succ=1",
"DpsCheck": "",
"AddCon": [],
"PasPr": 1000,
@ -8037,12 +8036,12 @@
},
{
"Id": 494500132,
"When": 28,
"When": 18,
"FromCheck": "Target=3",
"TargetCheck": "Target=1,HasBuff=1",
"TargetCheck": "Target=1",
"MainSkillCheck": "SkillPos=3",
"AfterSkillCheck": "",
"BuffCheck": "Succ=1",
"BuffCheck": "Effect=1,Succ=1",
"DpsCheck": "",
"AddCon": [],
"PasPr": 1000,
@ -8192,7 +8191,7 @@
"Type": "BeatBack",
"MaxEmitTimesInRoundByRole": 0,
"MaxEmitTimes": 0,
"MaxEmitTimesInRound": 0,
"MaxEmitTimesInRound": 1,
"Callback": [
1,
1000,
@ -8794,7 +8793,7 @@
"Type": "CallSkillPas",
"MaxEmitTimesInRoundByRole": 0,
"MaxEmitTimes": 0,
"MaxEmitTimesInRound": 0,
"MaxEmitTimesInRound": 1,
"Callback": [
944005316
]

View File

@ -5511,7 +5511,7 @@
"opencond": "",
"lock": 1,
"lockend": 999,
"ontxe": 20220,
"ontxe": 20250,
"id_after": 300011,
"group": 301,
"exgroup": 310,
@ -5642,7 +5642,7 @@
"opencond": "",
"lock": 1,
"lockend": 999,
"ontxe": 20060,
"ontxe": 20270,
"id_after": 0,
"group": 301,
"exgroup": 310,
@ -5683,7 +5683,7 @@
"opencond": "",
"lock": 1,
"lockend": 999,
"ontxe": 20220,
"ontxe": 20250,
"id_after": 300050,
"group": 302,
"exgroup": 310,
@ -5935,7 +5935,7 @@
"opencond": "",
"lock": 1,
"lockend": 999,
"ontxe": 20220,
"ontxe": 20250,
"id_after": 0,
"group": 302,
"exgroup": 310,
@ -5976,7 +5976,7 @@
"opencond": "",
"lock": 1,
"lockend": 999,
"ontxe": 20240,
"ontxe": 20280,
"id_after": 0,
"group": 320,
"exgroup": 310,
@ -6314,7 +6314,7 @@
"opencond": "",
"lock": 1,
"lockend": 999,
"ontxe": 20220,
"ontxe": 20250,
"id_after": 0,
"group": 320,
"exgroup": 310,
@ -6355,7 +6355,7 @@
"opencond": "",
"lock": 1,
"lockend": 999,
"ontxe": 20220,
"ontxe": 20250,
"id_after": 0,
"group": 320,
"exgroup": 310,
@ -6396,7 +6396,7 @@
"opencond": "",
"lock": 1,
"lockend": 999,
"ontxe": 20220,
"ontxe": 20250,
"id_after": 0,
"group": 320,
"exgroup": 310,
@ -6437,7 +6437,7 @@
"opencond": "",
"lock": 1,
"lockend": 999,
"ontxe": 20220,
"ontxe": 20250,
"id_after": 0,
"group": 320,
"exgroup": 310,
@ -6478,7 +6478,7 @@
"opencond": "",
"lock": 1,
"lockend": 999,
"ontxe": 20220,
"ontxe": 20250,
"id_after": 0,
"group": 320,
"exgroup": 310,
@ -6519,7 +6519,7 @@
"opencond": "",
"lock": 1,
"lockend": 999,
"ontxe": 20220,
"ontxe": 20250,
"id_after": 320231,
"group": 320,
"exgroup": 310,
@ -6568,15 +6568,15 @@
"icon": "25001",
"task_name": {
"key": "worldtask_world_task_task_name_153",
"text": "商队2"
"text": "商队起航"
},
"task_details": {
"key": "worldtask_world_task_task_details_153",
"text": "商队2"
"text": "商队起航"
},
"npctxt": {
"key": "worldtask_world_task_npctxt_153",
"text": "商队2"
"text": "商队起航"
},
"get_item": [],
"trigger": 0,
@ -6601,7 +6601,7 @@
"opencond": "",
"lock": 1,
"lockend": 999,
"ontxe": 20220,
"ontxe": 20250,
"id_after": 0,
"group": 320,
"exgroup": 310,
@ -6642,7 +6642,7 @@
"opencond": "",
"lock": 1,
"lockend": 999,
"ontxe": 20220,
"ontxe": 20250,
"id_after": 0,
"group": 320,
"exgroup": 310,
@ -6678,6 +6678,49 @@
],
"module": []
},
{
"key": 320260,
"opencond": "",
"lock": 1,
"lockend": 999,
"ontxe": 20250,
"id_after": 0,
"group": 320,
"exgroup": 310,
"des": 3,
"icon": "25001",
"task_name": {
"key": "worldtask_world_task_task_name_156",
"text": "师傅的教诲"
},
"task_details": {
"key": "worldtask_world_task_task_details_156",
"text": "师傅的教诲"
},
"npctxt": {
"key": "worldtask_world_task_npctxt_156",
"text": "师傅的教诲"
},
"get_item": [],
"trigger": 0,
"npc": 320260,
"completetask": [
14000026
],
"deliver_npc": 320269,
"taskend_removeitem": [],
"auto_accept": 0,
"tasktips": 0,
"lock_add": 1,
"reword": [
{
"a": "attr",
"t": "gold",
"n": 500
}
],
"module": []
},
{
"key": 100010,
"opencond": "",
@ -6690,15 +6733,15 @@
"des": 1,
"icon": "25001",
"task_name": {
"key": "worldtask_world_task_task_name_156",
"key": "worldtask_world_task_task_name_157",
"text": "梅林的试炼"
},
"task_details": {
"key": "worldtask_world_task_task_details_156",
"key": "worldtask_world_task_task_details_157",
"text": "梅林的试炼"
},
"npctxt": {
"key": "worldtask_world_task_npctxt_156",
"key": "worldtask_world_task_npctxt_157",
"text": "梅林的试炼"
},
"get_item": [],
@ -6748,15 +6791,15 @@
"des": 1,
"icon": "25001",
"task_name": {
"key": "worldtask_world_task_task_name_157",
"key": "worldtask_world_task_task_name_158",
"text": "梅林的试炼"
},
"task_details": {
"key": "worldtask_world_task_task_details_157",
"key": "worldtask_world_task_task_details_158",
"text": "梅林的试炼"
},
"npctxt": {
"key": "worldtask_world_task_npctxt_157",
"key": "worldtask_world_task_npctxt_158",
"text": "梅林的试炼"
},
"get_item": [],
@ -6806,15 +6849,15 @@
"des": 1,
"icon": "25001",
"task_name": {
"key": "worldtask_world_task_task_name_158",
"key": "worldtask_world_task_task_name_159",
"text": "梅林的试炼"
},
"task_details": {
"key": "worldtask_world_task_task_details_158",
"key": "worldtask_world_task_task_details_159",
"text": "梅林的试炼"
},
"npctxt": {
"key": "worldtask_world_task_npctxt_158",
"key": "worldtask_world_task_npctxt_159",
"text": "梅林的试炼"
},
"get_item": [],
@ -6864,15 +6907,15 @@
"des": 1,
"icon": "25001",
"task_name": {
"key": "worldtask_world_task_task_name_159",
"key": "worldtask_world_task_task_name_160",
"text": "梅林的试炼"
},
"task_details": {
"key": "worldtask_world_task_task_details_159",
"key": "worldtask_world_task_task_details_160",
"text": "梅林的试炼"
},
"npctxt": {
"key": "worldtask_world_task_npctxt_159",
"key": "worldtask_world_task_npctxt_160",
"text": "梅林的试炼"
},
"get_item": [],
@ -6922,15 +6965,15 @@
"des": 1,
"icon": "25001",
"task_name": {
"key": "worldtask_world_task_task_name_160",
"key": "worldtask_world_task_task_name_161",
"text": "梅林的试炼"
},
"task_details": {
"key": "worldtask_world_task_task_details_160",
"key": "worldtask_world_task_task_details_161",
"text": "梅林的试炼"
},
"npctxt": {
"key": "worldtask_world_task_npctxt_160",
"key": "worldtask_world_task_npctxt_161",
"text": "梅林的试炼"
},
"get_item": [],
@ -6980,15 +7023,15 @@
"des": 1,
"icon": "25001",
"task_name": {
"key": "worldtask_world_task_task_name_161",
"key": "worldtask_world_task_task_name_162",
"text": "梅林的试炼"
},
"task_details": {
"key": "worldtask_world_task_task_details_161",
"key": "worldtask_world_task_task_details_162",
"text": "梅林的试炼"
},
"npctxt": {
"key": "worldtask_world_task_npctxt_161",
"key": "worldtask_world_task_npctxt_162",
"text": "梅林的试炼"
},
"get_item": [],
@ -7038,15 +7081,15 @@
"des": 1,
"icon": "25001",
"task_name": {
"key": "worldtask_world_task_task_name_162",
"key": "worldtask_world_task_task_name_163",
"text": "贫嘴驴的烦恼"
},
"task_details": {
"key": "worldtask_world_task_task_details_162",
"key": "worldtask_world_task_task_details_163",
"text": "贫嘴驴的烦恼"
},
"npctxt": {
"key": "worldtask_world_task_npctxt_162",
"key": "worldtask_world_task_npctxt_163",
"text": "贫嘴驴的烦恼"
},
"get_item": [],
@ -7096,15 +7139,15 @@
"des": 1,
"icon": "25001",
"task_name": {
"key": "worldtask_world_task_task_name_163",
"key": "worldtask_world_task_task_name_164",
"text": "亚丝翠的烦恼"
},
"task_details": {
"key": "worldtask_world_task_task_details_163",
"key": "worldtask_world_task_task_details_164",
"text": "亚丝翠的烦恼"
},
"npctxt": {
"key": "worldtask_world_task_npctxt_163",
"key": "worldtask_world_task_npctxt_164",
"text": "亚丝翠的烦恼"
},
"get_item": [],
@ -7154,15 +7197,15 @@
"des": 1,
"icon": "25001",
"task_name": {
"key": "worldtask_world_task_task_name_164",
"key": "worldtask_world_task_task_name_165",
"text": "姜饼人的烦恼"
},
"task_details": {
"key": "worldtask_world_task_task_details_164",
"key": "worldtask_world_task_task_details_165",
"text": "姜饼人的烦恼"
},
"npctxt": {
"key": "worldtask_world_task_npctxt_164",
"key": "worldtask_world_task_npctxt_165",
"text": "姜饼人的烦恼"
},
"get_item": [],
@ -7212,15 +7255,15 @@
"des": 1,
"icon": "25001",
"task_name": {
"key": "worldtask_world_task_task_name_165",
"key": "worldtask_world_task_task_name_166",
"text": "平先生的烦恼"
},
"task_details": {
"key": "worldtask_world_task_task_details_165",
"key": "worldtask_world_task_task_details_166",
"text": "平先生的烦恼"
},
"npctxt": {
"key": "worldtask_world_task_npctxt_165",
"key": "worldtask_world_task_npctxt_166",
"text": "平先生的烦恼"
},
"get_item": [],
@ -7270,15 +7313,15 @@
"des": 1,
"icon": "25001",
"task_name": {
"key": "worldtask_world_task_task_name_166",
"key": "worldtask_world_task_task_name_167",
"text": "匹诺曹的烦恼"
},
"task_details": {
"key": "worldtask_world_task_task_details_166",
"key": "worldtask_world_task_task_details_167",
"text": "匹诺曹的烦恼"
},
"npctxt": {
"key": "worldtask_world_task_npctxt_166",
"key": "worldtask_world_task_npctxt_167",
"text": "匹诺曹的烦恼"
},
"get_item": [],
@ -7328,15 +7371,15 @@
"des": 1,
"icon": "25001",
"task_name": {
"key": "worldtask_world_task_task_name_167",
"key": "worldtask_world_task_task_name_168",
"text": "波比的失物找回"
},
"task_details": {
"key": "worldtask_world_task_task_details_167",
"key": "worldtask_world_task_task_details_168",
"text": "波比的失物找回"
},
"npctxt": {
"key": "worldtask_world_task_npctxt_167",
"key": "worldtask_world_task_npctxt_168",
"text": "波比的失物找回"
},
"get_item": [],
@ -7386,15 +7429,15 @@
"des": 1,
"icon": "25001",
"task_name": {
"key": "worldtask_world_task_task_name_168",
"key": "worldtask_world_task_task_name_169",
"text": "希卡普的失物找回"
},
"task_details": {
"key": "worldtask_world_task_task_details_168",
"key": "worldtask_world_task_task_details_169",
"text": "希卡普的失物找回"
},
"npctxt": {
"key": "worldtask_world_task_npctxt_168",
"key": "worldtask_world_task_npctxt_169",
"text": "希卡普的失物找回"
},
"get_item": [],
@ -7444,15 +7487,15 @@
"des": 1,
"icon": "25001",
"task_name": {
"key": "worldtask_world_task_task_name_169",
"key": "worldtask_world_task_task_name_170",
"text": "菲欧娜的失物找回"
},
"task_details": {
"key": "worldtask_world_task_task_details_169",
"key": "worldtask_world_task_task_details_170",
"text": "菲欧娜的失物找回"
},
"npctxt": {
"key": "worldtask_world_task_npctxt_169",
"key": "worldtask_world_task_npctxt_170",
"text": "菲欧娜的失物找回"
},
"get_item": [],
@ -7502,15 +7545,15 @@
"des": 1,
"icon": "25001",
"task_name": {
"key": "worldtask_world_task_task_name_170",
"key": "worldtask_world_task_task_name_171",
"text": "戈伯的失物找回"
},
"task_details": {
"key": "worldtask_world_task_task_details_170",
"key": "worldtask_world_task_task_details_171",
"text": "戈伯的失物找回"
},
"npctxt": {
"key": "worldtask_world_task_npctxt_170",
"key": "worldtask_world_task_npctxt_171",
"text": "戈伯的失物找回"
},
"get_item": [],
@ -7560,15 +7603,15 @@
"des": 1,
"icon": "25001",
"task_name": {
"key": "worldtask_world_task_task_name_171",
"key": "worldtask_world_task_task_name_172",
"text": "阿比盖尔的失物找回"
},
"task_details": {
"key": "worldtask_world_task_task_details_171",
"key": "worldtask_world_task_task_details_172",
"text": "阿比盖尔的失物找回"
},
"npctxt": {
"key": "worldtask_world_task_npctxt_171",
"key": "worldtask_world_task_npctxt_172",
"text": "阿比盖尔的失物找回"
},
"get_item": [],
@ -7618,15 +7661,15 @@
"des": 1,
"icon": "25001",
"task_name": {
"key": "worldtask_world_task_task_name_172",
"key": "worldtask_world_task_task_name_173",
"text": "骇客蛛的紧急委托"
},
"task_details": {
"key": "worldtask_world_task_task_details_172",
"key": "worldtask_world_task_task_details_173",
"text": "骇客蛛感受到了异样的气息,她需要你的帮助"
},
"npctxt": {
"key": "worldtask_world_task_npctxt_172",
"key": "worldtask_world_task_npctxt_173",
"text": "骇客蛛的紧急委托"
},
"get_item": [],
@ -7676,15 +7719,15 @@
"des": 1,
"icon": "25001",
"task_name": {
"key": "worldtask_world_task_task_name_173",
"key": "worldtask_world_task_task_name_174",
"text": "希卡普的紧急委托"
},
"task_details": {
"key": "worldtask_world_task_task_details_173",
"key": "worldtask_world_task_task_details_174",
"text": "不知为何,羊群近日愈发躁动,或许你能帮助希卡普摆平这件事情。"
},
"npctxt": {
"key": "worldtask_world_task_npctxt_173",
"key": "worldtask_world_task_npctxt_174",
"text": "希卡普的紧急委托"
},
"get_item": [],
@ -7734,15 +7777,15 @@
"des": 1,
"icon": "25001",
"task_name": {
"key": "worldtask_world_task_task_name_174",
"key": "worldtask_world_task_task_name_175",
"text": "邦尼兔的紧急委托"
},
"task_details": {
"key": "worldtask_world_task_task_details_174",
"key": "worldtask_world_task_task_details_175",
"text": "豺狼们再次聚集了起来,在他们壮大之前必须先行捣毁。"
},
"npctxt": {
"key": "worldtask_world_task_npctxt_174",
"key": "worldtask_world_task_npctxt_175",
"text": "邦尼兔的紧急委托"
},
"get_item": [],
@ -7792,15 +7835,15 @@
"des": 1,
"icon": "25001",
"task_name": {
"key": "worldtask_world_task_task_name_175",
"key": "worldtask_world_task_task_name_176",
"text": "骇客蛛的委托"
},
"task_details": {
"key": "worldtask_world_task_task_details_175",
"key": "worldtask_world_task_task_details_176",
"text": "森林传来的低吼,或是豺狼们潜入了进来。"
},
"npctxt": {
"key": "worldtask_world_task_npctxt_175",
"key": "worldtask_world_task_npctxt_176",
"text": "骇客蛛的委托"
},
"get_item": [],
@ -7850,15 +7893,15 @@
"des": 1,
"icon": "25001",
"task_name": {
"key": "worldtask_world_task_task_name_176",
"key": "worldtask_world_task_task_name_177",
"text": "希卡普的发现"
},
"task_details": {
"key": "worldtask_world_task_task_details_176",
"key": "worldtask_world_task_task_details_177",
"text": "诶雷特的手下近日行为有些异常,或许是该敲打一番了。"
},
"npctxt": {
"key": "worldtask_world_task_npctxt_176",
"key": "worldtask_world_task_npctxt_177",
"text": "希卡普的发现"
},
"get_item": [],
@ -7908,15 +7951,15 @@
"des": 1,
"icon": "25001",
"task_name": {
"key": "worldtask_world_task_task_name_177",
"key": "worldtask_world_task_task_name_178",
"text": "清理所有怪物6"
},
"task_details": {
"key": "worldtask_world_task_task_details_177",
"key": "worldtask_world_task_task_details_178",
"text": "清理所有怪物6"
},
"npctxt": {
"key": "worldtask_world_task_npctxt_177",
"key": "worldtask_world_task_npctxt_178",
"text": "清理所有怪物6"
},
"get_item": [],
@ -7966,15 +8009,15 @@
"des": 1,
"icon": "25001",
"task_name": {
"key": "worldtask_world_task_task_name_178",
"key": "worldtask_world_task_task_name_179",
"text": "邦尼兔的请求"
},
"task_details": {
"key": "worldtask_world_task_task_details_178",
"key": "worldtask_world_task_task_details_179",
"text": "邦尼兔的请求"
},
"npctxt": {
"key": "worldtask_world_task_npctxt_178",
"key": "worldtask_world_task_npctxt_179",
"text": "邦尼兔的请求"
},
"get_item": [],
@ -8026,15 +8069,15 @@
"des": 1,
"icon": "25001",
"task_name": {
"key": "worldtask_world_task_task_name_179",
"key": "worldtask_world_task_task_name_180",
"text": "菲欧娜的请求"
},
"task_details": {
"key": "worldtask_world_task_task_details_179",
"key": "worldtask_world_task_task_details_180",
"text": "菲欧娜的请求"
},
"npctxt": {
"key": "worldtask_world_task_npctxt_179",
"key": "worldtask_world_task_npctxt_180",
"text": "菲欧娜的请求"
},
"get_item": [],
@ -8086,15 +8129,15 @@
"des": 1,
"icon": "25001",
"task_name": {
"key": "worldtask_world_task_task_name_180",
"key": "worldtask_world_task_task_name_181",
"text": "戈伯的请求"
},
"task_details": {
"key": "worldtask_world_task_task_details_180",
"key": "worldtask_world_task_task_details_181",
"text": "戈伯的请求"
},
"npctxt": {
"key": "worldtask_world_task_npctxt_180",
"key": "worldtask_world_task_npctxt_181",
"text": "戈伯的请求"
},
"get_item": [],
@ -8146,15 +8189,15 @@
"des": 1,
"icon": "25001",
"task_name": {
"key": "worldtask_world_task_task_name_181",
"key": "worldtask_world_task_task_name_182",
"text": "平先生的请求"
},
"task_details": {
"key": "worldtask_world_task_task_details_181",
"key": "worldtask_world_task_task_details_182",
"text": "平先生的请求"
},
"npctxt": {
"key": "worldtask_world_task_npctxt_181",
"key": "worldtask_world_task_npctxt_182",
"text": "平先生的请求"
},
"get_item": [],
@ -8206,15 +8249,15 @@
"des": 1,
"icon": "25001",
"task_name": {
"key": "worldtask_world_task_task_name_182",
"key": "worldtask_world_task_task_name_183",
"text": "骇客蛛的请求"
},
"task_details": {
"key": "worldtask_world_task_task_details_182",
"key": "worldtask_world_task_task_details_183",
"text": "骇客蛛的请求"
},
"npctxt": {
"key": "worldtask_world_task_npctxt_182",
"key": "worldtask_world_task_npctxt_183",
"text": "骇客蛛的请求"
},
"get_item": [],
@ -8266,15 +8309,15 @@
"des": 1,
"icon": "25001",
"task_name": {
"key": "worldtask_world_task_task_name_183",
"key": "worldtask_world_task_task_name_184",
"text": "阿宝的心事"
},
"task_details": {
"key": "worldtask_world_task_task_details_183",
"key": "worldtask_world_task_task_details_184",
"text": "阿宝的心事"
},
"npctxt": {
"key": "worldtask_world_task_npctxt_183",
"key": "worldtask_world_task_npctxt_184",
"text": "阿宝的心事"
},
"get_item": [],
@ -8322,15 +8365,15 @@
"des": 1,
"icon": "25001",
"task_name": {
"key": "worldtask_world_task_task_name_184",
"key": "worldtask_world_task_task_name_185",
"text": "寻找平先生"
},
"task_details": {
"key": "worldtask_world_task_task_details_184",
"key": "worldtask_world_task_task_details_185",
"text": "寻找平先生"
},
"npctxt": {
"key": "worldtask_world_task_npctxt_184",
"key": "worldtask_world_task_npctxt_185",
"text": "寻找平先生"
},
"get_item": [],
@ -8380,15 +8423,15 @@
"des": 1,
"icon": "25001",
"task_name": {
"key": "worldtask_world_task_task_name_185",
"key": "worldtask_world_task_task_name_186",
"text": "阿宝的想法"
},
"task_details": {
"key": "worldtask_world_task_task_details_185",
"key": "worldtask_world_task_task_details_186",
"text": "阿宝的想法"
},
"npctxt": {
"key": "worldtask_world_task_npctxt_185",
"key": "worldtask_world_task_npctxt_186",
"text": "阿宝的想法"
},
"get_item": [],
@ -8436,15 +8479,15 @@
"des": 1,
"icon": "25001",
"task_name": {
"key": "worldtask_world_task_task_name_186",
"key": "worldtask_world_task_task_name_187",
"text": "寻找金猴"
},
"task_details": {
"key": "worldtask_world_task_task_details_186",
"key": "worldtask_world_task_task_details_187",
"text": "寻找金猴"
},
"npctxt": {
"key": "worldtask_world_task_npctxt_186",
"key": "worldtask_world_task_npctxt_187",
"text": "寻找金猴"
},
"get_item": [],
@ -8494,15 +8537,15 @@
"des": 1,
"icon": "25001",
"task_name": {
"key": "worldtask_world_task_task_name_187",
"key": "worldtask_world_task_task_name_188",
"text": "菲欧娜的心事"
},
"task_details": {
"key": "worldtask_world_task_task_details_187",
"key": "worldtask_world_task_task_details_188",
"text": "菲欧娜的心事"
},
"npctxt": {
"key": "worldtask_world_task_npctxt_187",
"key": "worldtask_world_task_npctxt_188",
"text": "菲欧娜的心事"
},
"get_item": [],
@ -8550,15 +8593,15 @@
"des": 1,
"icon": "25001",
"task_name": {
"key": "worldtask_world_task_task_name_188",
"key": "worldtask_world_task_task_name_189",
"text": "寻找姜饼人"
},
"task_details": {
"key": "worldtask_world_task_task_details_188",
"key": "worldtask_world_task_task_details_189",
"text": "寻找姜饼人"
},
"npctxt": {
"key": "worldtask_world_task_npctxt_188",
"key": "worldtask_world_task_npctxt_189",
"text": "寻找姜饼人"
},
"get_item": [],
@ -8608,15 +8651,15 @@
"des": 1,
"icon": "25001",
"task_name": {
"key": "worldtask_world_task_task_name_189",
"key": "worldtask_world_task_task_name_190",
"text": "黛安狐的心事"
},
"task_details": {
"key": "worldtask_world_task_task_details_189",
"key": "worldtask_world_task_task_details_190",
"text": "黛安狐的心事"
},
"npctxt": {
"key": "worldtask_world_task_npctxt_189",
"key": "worldtask_world_task_npctxt_190",
"text": "黛安狐的心事"
},
"get_item": [],
@ -8666,15 +8709,15 @@
"des": 1,
"icon": "25001",
"task_name": {
"key": "worldtask_world_task_task_name_190",
"key": "worldtask_world_task_task_name_191",
"text": "菲欧娜有事相求"
},
"task_details": {
"key": "worldtask_world_task_task_details_190",
"key": "worldtask_world_task_task_details_191",
"text": "菲欧娜有事相求"
},
"npctxt": {
"key": "worldtask_world_task_npctxt_190",
"key": "worldtask_world_task_npctxt_191",
"text": "菲欧娜有事相求"
},
"get_item": [],
@ -8722,15 +8765,15 @@
"des": 1,
"icon": "25001",
"task_name": {
"key": "worldtask_world_task_task_name_191",
"key": "worldtask_world_task_task_name_192",
"text": "去看看靴子猫"
},
"task_details": {
"key": "worldtask_world_task_task_details_191",
"key": "worldtask_world_task_task_details_192",
"text": "去看看靴子猫"
},
"npctxt": {
"key": "worldtask_world_task_npctxt_191",
"key": "worldtask_world_task_npctxt_192",
"text": "去看看靴子猫"
},
"get_item": [],

View File

@ -293,7 +293,7 @@ func (this *apiComp) Upgrade(session comm.IUserSession, req *pb.EquipmentUpgrade
if len(tasks) > 0 {
go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) {
this.module.ModuleBuried.TriggerBuried(session, comm.GetBuriedParam(comm.Rtype95, 1))
this.module.ModuleBuried.TriggerBuried(session, tasks...)
})
}
return

View File

@ -323,48 +323,49 @@ type TaskParams struct {
}
// 任务条件达成通知
// 废弃 不需要主动推送任务变化 前端主动刷新页面即可
func (this *Sociaty) BuriedsNotify(session comm.IUserSession, conds []*pb.ConIProgress) {
log.Debug("公会任务通知",
log.Field{Key: "uid", Value: session.GetUserId()},
log.Field{Key: "condIds", Value: conds})
// log.Debug("公会任务通知",
// log.Field{Key: "uid", Value: session.GetUserId()},
// log.Field{Key: "condIds", Value: conds})
sociaty := this.modelSociaty.getUserSociaty(session.GetUserId())
if sociaty == nil {
return
}
// sociaty := this.modelSociaty.getUserSociaty(session.GetUserId())
// if sociaty == nil {
// return
// }
sociatyId := sociaty.Id
// sociatyId := sociaty.Id
dt := &pb.DBSociatyTask{}
err := this.service.AcrossClusterRpcCall(context.Background(), this.GetCrossTag(),
comm.Service_Worker, string(comm.Rpc_ModuleSociatyGetTask),
&pb.RPCGeneralReqA2{Param1: sociatyId, Param2: session.GetUserId()}, dt)
// dt := &pb.DBSociatyTask{}
// err := this.service.AcrossClusterRpcCall(context.Background(), this.GetCrossTag(),
// comm.Service_Worker, string(comm.Rpc_ModuleSociatyGetTask),
// &pb.RPCGeneralReqA2{Param1: sociatyId, Param2: session.GetUserId()}, dt)
var flag bool
for _, v := range dt.TaskList {
for _, cond := range conds {
if v.TaskId == cond.Conid && cond.State == pb.BuriedItemFinishState_buried_finish {
v.Status = 1
flag = true
}
}
}
if !flag {
return
}
// var flag bool
// for _, v := range dt.TaskList {
// for _, cond := range conds {
// if v.TaskId == cond.Conid && cond.State == pb.BuriedItemFinishState_buried_finish {
// v.Status = 1
// flag = true
// }
// }
// }
// if !flag {
// return
// }
update := map[string]interface{}{
"taskList": dt.TaskList,
"lastUpdateTime": configure.Now().Unix(),
}
// update := map[string]interface{}{
// "taskList": dt.TaskList,
// "lastUpdateTime": configure.Now().Unix(),
// }
err = this.service.AcrossClusterRpcCall(context.Background(), this.GetCrossTag(),
comm.Service_Worker, string(comm.Rpc_ModuleSociatyTask),
&TaskParams{SociatyId: sociatyId, Uid: session.GetUserId(), Data: update}, &pb.EmptyResp{})
if err != nil {
return
}
return
// err = this.service.AcrossClusterRpcCall(context.Background(), this.GetCrossTag(),
// comm.Service_Worker, string(comm.Rpc_ModuleSociatyTask),
// &TaskParams{SociatyId: sociatyId, Uid: session.GetUserId(), Data: update}, &pb.EmptyResp{})
// if err != nil {
// return
// }
// return
}
func (this *Sociaty) RpcUpdateUserTask(ctx context.Context, p *TaskParams, reply *pb.EmptyResp) error {

View File

@ -102,12 +102,12 @@ func (this *ModelUser) GetUser(uid string) (user *pb.DBUser, err error) {
this.module.Errorln(err)
} else {
if err = model.Get(uid, user); err != nil {
this.module.Errorf("err:%v", err)
this.module.Errorf("uid:%s err:%v", uid, err)
}
}
} else {
if err = this.Get(uid, user); err != nil {
this.module.Errorf("err:%v", err)
this.module.Errorf("uid:%s err:%v", uid, err)
}
}
return