配置同步

This commit is contained in:
meixiongfeng 2023-11-28 20:26:16 +08:00
parent bb24e0943b
commit c95159abce
27 changed files with 2420 additions and 253 deletions

View File

@ -1456,7 +1456,7 @@
"scenesfight_08" "scenesfight_08"
], ],
"BGMusic": "", "BGMusic": "",
"LoadingId": 1019, "LoadingId": 1017,
"HideAlienSpace": 0, "HideAlienSpace": 0,
"HideFightUI": 1, "HideFightUI": 1,
"RuleTips": { "RuleTips": {
@ -1493,7 +1493,7 @@
"scenesfight_08" "scenesfight_08"
], ],
"BGMusic": "", "BGMusic": "",
"LoadingId": 1019, "LoadingId": 1017,
"HideAlienSpace": 0, "HideAlienSpace": 0,
"HideFightUI": 1, "HideFightUI": 1,
"RuleTips": { "RuleTips": {
@ -1530,7 +1530,7 @@
"scenesfight_06" "scenesfight_06"
], ],
"BGMusic": "", "BGMusic": "",
"LoadingId": 1019, "LoadingId": 1017,
"HideAlienSpace": 0, "HideAlienSpace": 0,
"HideFightUI": 0, "HideFightUI": 0,
"RuleTips": { "RuleTips": {
@ -1859,7 +1859,7 @@
"BGMusic": "", "BGMusic": "",
"LoadingId": 1031, "LoadingId": 1031,
"HideAlienSpace": 0, "HideAlienSpace": 0,
"HideFightUI": 0, "HideFightUI": 1,
"RuleTips": { "RuleTips": {
"key": "", "key": "",
"text": "" "text": ""
@ -1872,7 +1872,12 @@
"ScoreGroupID": 0, "ScoreGroupID": 0,
"disableAiCamera": 0, "disableAiCamera": 0,
"ChoseCamp": [], "ChoseCamp": [],
"DisableCamp": [], "DisableCamp": [
1,
2,
3,
4
],
"DefaultHero": 720023, "DefaultHero": 720023,
"ChoseHero": [], "ChoseHero": [],
"DisableHero": [], "DisableHero": [],
@ -2078,7 +2083,7 @@
"scenesfight_08" "scenesfight_08"
], ],
"BGMusic": "", "BGMusic": "",
"LoadingId": 1019, "LoadingId": 1033,
"HideAlienSpace": 0, "HideAlienSpace": 0,
"HideFightUI": 1, "HideFightUI": 1,
"RuleTips": { "RuleTips": {
@ -2089,7 +2094,11 @@
"key": "", "key": "",
"text": "" "text": ""
}, },
"battleEvents": [], "battleEvents": [
130,
131,
132
],
"ScoreGroupID": 0, "ScoreGroupID": 0,
"disableAiCamera": 0, "disableAiCamera": 0,
"ChoseCamp": [], "ChoseCamp": [],

View File

@ -1213,7 +1213,7 @@
}, },
{ {
"KeyId": 102, "KeyId": 102,
"GroupID": 2003000311, "GroupID": 20030311,
"Type": 1, "Type": 1,
"TaskIDMin": 0, "TaskIDMin": 0,
"TaskIDMax": 0, "TaskIDMax": 0,
@ -1225,7 +1225,7 @@
}, },
{ {
"KeyId": 103, "KeyId": 103,
"GroupID": 2003000321, "GroupID": 20030321,
"Type": 1, "Type": 1,
"TaskIDMin": 0, "TaskIDMin": 0,
"TaskIDMax": 0, "TaskIDMax": 0,
@ -1237,7 +1237,7 @@
}, },
{ {
"KeyId": 104, "KeyId": 104,
"GroupID": 2003000322, "GroupID": 20030322,
"Type": 1, "Type": 1,
"TaskIDMin": 0, "TaskIDMin": 0,
"TaskIDMax": 0, "TaskIDMax": 0,
@ -1249,7 +1249,7 @@
}, },
{ {
"KeyId": 105, "KeyId": 105,
"GroupID": 2003000323, "GroupID": 20030323,
"Type": 1, "Type": 1,
"TaskIDMin": 0, "TaskIDMin": 0,
"TaskIDMax": 0, "TaskIDMax": 0,
@ -1261,7 +1261,7 @@
}, },
{ {
"KeyId": 106, "KeyId": 106,
"GroupID": 2003000324, "GroupID": 20030324,
"Type": 1, "Type": 1,
"TaskIDMin": 0, "TaskIDMin": 0,
"TaskIDMax": 0, "TaskIDMax": 0,
@ -1273,7 +1273,7 @@
}, },
{ {
"KeyId": 107, "KeyId": 107,
"GroupID": 2003000331, "GroupID": 20030331,
"Type": 1, "Type": 1,
"TaskIDMin": 0, "TaskIDMin": 0,
"TaskIDMax": 0, "TaskIDMax": 0,
@ -1285,7 +1285,7 @@
}, },
{ {
"KeyId": 108, "KeyId": 108,
"GroupID": 2003000332, "GroupID": 20030332,
"Type": 1, "Type": 1,
"TaskIDMin": 0, "TaskIDMin": 0,
"TaskIDMax": 0, "TaskIDMax": 0,
@ -1297,7 +1297,7 @@
}, },
{ {
"KeyId": 109, "KeyId": 109,
"GroupID": 2003000111, "GroupID": 20030111,
"Type": 1, "Type": 1,
"TaskIDMin": 0, "TaskIDMin": 0,
"TaskIDMax": 0, "TaskIDMax": 0,
@ -1309,7 +1309,7 @@
}, },
{ {
"KeyId": 110, "KeyId": 110,
"GroupID": 2003000121, "GroupID": 20030121,
"Type": 1, "Type": 1,
"TaskIDMin": 0, "TaskIDMin": 0,
"TaskIDMax": 0, "TaskIDMax": 0,
@ -1321,7 +1321,7 @@
}, },
{ {
"KeyId": 111, "KeyId": 111,
"GroupID": 2003000122, "GroupID": 20030122,
"Type": 1, "Type": 1,
"TaskIDMin": 0, "TaskIDMin": 0,
"TaskIDMax": 0, "TaskIDMax": 0,
@ -1333,7 +1333,7 @@
}, },
{ {
"KeyId": 112, "KeyId": 112,
"GroupID": 2003000123, "GroupID": 20030123,
"Type": 1, "Type": 1,
"TaskIDMin": 0, "TaskIDMin": 0,
"TaskIDMax": 0, "TaskIDMax": 0,
@ -1345,7 +1345,7 @@
}, },
{ {
"KeyId": 113, "KeyId": 113,
"GroupID": 2003000124, "GroupID": 20030124,
"Type": 1, "Type": 1,
"TaskIDMin": 0, "TaskIDMin": 0,
"TaskIDMax": 0, "TaskIDMax": 0,
@ -1357,7 +1357,7 @@
}, },
{ {
"KeyId": 114, "KeyId": 114,
"GroupID": 2003000131, "GroupID": 20030131,
"Type": 1, "Type": 1,
"TaskIDMin": 0, "TaskIDMin": 0,
"TaskIDMax": 0, "TaskIDMax": 0,
@ -1369,7 +1369,7 @@
}, },
{ {
"KeyId": 115, "KeyId": 115,
"GroupID": 2003000132, "GroupID": 20030132,
"Type": 1, "Type": 1,
"TaskIDMin": 0, "TaskIDMin": 0,
"TaskIDMax": 0, "TaskIDMax": 0,
@ -1381,7 +1381,7 @@
}, },
{ {
"KeyId": 116, "KeyId": 116,
"GroupID": 2003000211, "GroupID": 20030211,
"Type": 1, "Type": 1,
"TaskIDMin": 0, "TaskIDMin": 0,
"TaskIDMax": 0, "TaskIDMax": 0,
@ -1393,7 +1393,7 @@
}, },
{ {
"KeyId": 117, "KeyId": 117,
"GroupID": 2003000222, "GroupID": 20030222,
"Type": 1, "Type": 1,
"TaskIDMin": 0, "TaskIDMin": 0,
"TaskIDMax": 0, "TaskIDMax": 0,
@ -1405,7 +1405,7 @@
}, },
{ {
"KeyId": 118, "KeyId": 118,
"GroupID": 2003000231, "GroupID": 20030231,
"Type": 1, "Type": 1,
"TaskIDMin": 0, "TaskIDMin": 0,
"TaskIDMax": 0, "TaskIDMax": 0,
@ -1417,7 +1417,7 @@
}, },
{ {
"KeyId": 119, "KeyId": 119,
"GroupID": 2003000232, "GroupID": 20030232,
"Type": 1, "Type": 1,
"TaskIDMin": 0, "TaskIDMin": 0,
"TaskIDMax": 0, "TaskIDMax": 0,
@ -1429,7 +1429,7 @@
}, },
{ {
"KeyId": 120, "KeyId": 120,
"GroupID": 2003000233, "GroupID": 20030233,
"Type": 1, "Type": 1,
"TaskIDMin": 0, "TaskIDMin": 0,
"TaskIDMax": 0, "TaskIDMax": 0,
@ -1441,7 +1441,7 @@
}, },
{ {
"KeyId": 121, "KeyId": 121,
"GroupID": 2003000234, "GroupID": 20030234,
"Type": 0, "Type": 0,
"TaskIDMin": 0, "TaskIDMin": 0,
"TaskIDMax": 0, "TaskIDMax": 0,
@ -1453,7 +1453,7 @@
}, },
{ {
"KeyId": 122, "KeyId": 122,
"GroupID": 2003000235, "GroupID": 20030235,
"Type": 0, "Type": 0,
"TaskIDMin": 0, "TaskIDMin": 0,
"TaskIDMax": 0, "TaskIDMax": 0,
@ -1462,5 +1462,53 @@
"key": "bubblegroup_bubblegroup_Text_Bubble_122", "key": "bubblegroup_bubblegroup_Text_Bubble_122",
"text": "阿宝,快和我们一起摆好出场架势!" "text": "阿宝,快和我们一起摆好出场架势!"
} }
},
{
"KeyId": 123,
"GroupID": 20030236,
"Type": 1,
"TaskIDMin": 0,
"TaskIDMax": 0,
"weight": 10,
"Text_Bubble": {
"key": "bubblegroup_bubblegroup_Text_Bubble_123",
"text": "抱歉,邦尼兔。"
}
},
{
"KeyId": 124,
"GroupID": 15000001,
"Type": 0,
"TaskIDMin": 0,
"TaskIDMax": 0,
"weight": 10,
"Text_Bubble": {
"key": "bubblegroup_bubblegroup_Text_Bubble_124",
"text": "小心,无牙仔!前面好像有什么东西靠近。"
}
},
{
"KeyId": 125,
"GroupID": 15000002,
"Type": 0,
"TaskIDMin": 0,
"TaskIDMax": 0,
"weight": 10,
"Text_Bubble": {
"key": "bubblegroup_bubblegroup_Text_Bubble_125",
"text": "呃啊——这些是什么东西?"
}
},
{
"KeyId": 126,
"GroupID": 15000003,
"Type": 0,
"TaskIDMin": 0,
"TaskIDMax": 0,
"weight": 10,
"Text_Bubble": {
"key": "bubblegroup_bubblegroup_Text_Bubble_126",
"text": "无牙仔,往……中轴城飞……"
}
} }
] ]

View File

@ -24388,7 +24388,7 @@
"n": 1 "n": 1
}, },
"Npc_event_type": 0, "Npc_event_type": 0,
"NPC": 100322, "NPC": 100321,
"tipstxt": { "tipstxt": {
"key": "", "key": "",
"text": "" "text": ""
@ -24785,7 +24785,7 @@
"type_sp": 1, "type_sp": 1,
"tasktxt": { "tasktxt": {
"key": "buried_buried_condi_tasktxt_744", "key": "buried_buried_condi_tasktxt_744",
"text": "前往博岛" "text": "前往博岛"
}, },
"type": 61, "type": 61,
"valid": 1, "valid": 1,
@ -24848,7 +24848,7 @@
"type_sp": 1, "type_sp": 1,
"tasktxt": { "tasktxt": {
"key": "buried_buried_condi_tasktxt_746", "key": "buried_buried_condi_tasktxt_746",
"text": "在博岛找到龙之花" "text": "在博岛找到龙之花"
}, },
"type": 61, "type": 61,
"valid": 1, "valid": 1,

View File

@ -85,14 +85,14 @@
}, },
{ {
"id": 10401, "id": 10401,
"drop": 16002001 "drop": 16001001
}, },
{ {
"id": 10402, "id": 10402,
"drop": 16002002 "drop": 16001001
}, },
{ {
"id": 10403, "id": 10403,
"drop": 16002002 "drop": 16001001
} }
] ]

View File

@ -267,7 +267,7 @@
}, },
{ {
"id": 10008, "id": 10008,
"scene": "leveldemo_fcamer_dragoncave", "scene": "leveldemo_chapter_1",
"levelname": "Save the holy tree", "levelname": "Save the holy tree",
"maintask": [ "maintask": [
11187001 11187001

View File

@ -394,9 +394,9 @@
], ],
"award": [ "award": [
{ {
"a": "attr", "a": "item",
"t": "gold", "t": "16001001",
"n": 1650 "n": 4
} }
] ]
} }

View File

@ -7,6 +7,10 @@
"key": "character_move_fast_2", "key": "character_move_fast_2",
"path": "Effect/Character/effect_character_move_fast_2.prefab" "path": "Effect/Character/effect_character_move_fast_2.prefab"
}, },
{
"key": "effect_character_move_fast_2_1",
"path": "Effect/Character/effect_character_move_fast_2_1.prefab"
},
{ {
"key": "character_move_arrow", "key": "character_move_arrow",
"path": "Effect/Character/effect_character_move_arrow.prefab" "path": "Effect/Character/effect_character_move_arrow.prefab"

View File

@ -799,7 +799,7 @@
"AddCon": [], "AddCon": [],
"Execution": 2, "Execution": 2,
"Args": [ "Args": [
"6000090" "6000081"
] ]
}, },
{ {
@ -843,7 +843,7 @@
"AddCon": [], "AddCon": [],
"Execution": 2, "Execution": 2,
"Args": [ "Args": [
"6000100" "6000090"
] ]
}, },
{ {
@ -866,5 +866,70 @@
"Args": [ "Args": [
"2" "2"
] ]
},
{
"Id": 130,
"Count": 1,
"LoopTime": 0,
"desc": {
"key": "",
"text": ""
},
"When": 1,
"FromCheck": "",
"TargetCheck": "",
"MainSkillCheck": "",
"AfterSkillCheck": "",
"BuffCheck": "",
"FightEndCheck": "",
"AddCon": [
"WaveEqual=1"
],
"Execution": 2,
"Args": [
"6000101"
]
},
{
"Id": 131,
"Count": 1,
"LoopTime": 0,
"desc": {
"key": "",
"text": ""
},
"When": 20,
"FromCheck": "Side=1,HeroID=44006",
"TargetCheck": "",
"MainSkillCheck": "",
"AfterSkillCheck": "",
"BuffCheck": "",
"FightEndCheck": "",
"AddCon": [],
"Execution": 2,
"Args": [
"6000102"
]
},
{
"Id": 132,
"Count": 1,
"LoopTime": 0,
"desc": {
"key": "",
"text": ""
},
"When": 20,
"FromCheck": "Side=1,HeroID=25001",
"TargetCheck": "",
"MainSkillCheck": "",
"AfterSkillCheck": "",
"BuffCheck": "",
"FightEndCheck": "",
"AddCon": [],
"Execution": 2,
"Args": [
"6000103"
]
} }
] ]

View File

@ -555,7 +555,7 @@
"key": "gamesummary_node_name_18", "key": "gamesummary_node_name_18",
"text": "扑克对决" "text": "扑克对决"
}, },
"tabId": 13, "tabId": 14,
"mapPos": { "mapPos": {
"x": 4195, "x": 4195,
"y": 2042 "y": 2042
@ -565,7 +565,7 @@
"jumpId": 10061, "jumpId": 10061,
"introduce": { "introduce": {
"key": "gamesummary_node_introdunce_18", "key": "gamesummary_node_introdunce_18",
"text": "扑克对决" "text": "想和伟大的大盗侠客来一场紧张刺激的扑克对决吗?"
}, },
"bg": "hkz_wftj_zxgk", "bg": "hkz_wftj_zxgk",
"icon": "hkz_tx_zxgk", "icon": "hkz_tx_zxgk",
@ -588,7 +588,7 @@
"key": "gamesummary_node_name_19", "key": "gamesummary_node_name_19",
"text": "缤纷乐声" "text": "缤纷乐声"
}, },
"tabId": 13, "tabId": 14,
"mapPos": { "mapPos": {
"x": 4695, "x": 4695,
"y": 2242 "y": 2242
@ -598,7 +598,7 @@
"jumpId": 10062, "jumpId": 10062,
"introduce": { "introduce": {
"key": "gamesummary_node_introdunce_20", "key": "gamesummary_node_introdunce_20",
"text": "缤纷乐声" "text": "华丽的乐章开幕了!咦,这混音器怎么坏掉了?快帮我修一修!"
}, },
"bg": "hkz_wftj_zxgk", "bg": "hkz_wftj_zxgk",
"icon": "hkz_tx_zxgk", "icon": "hkz_tx_zxgk",
@ -619,9 +619,9 @@
"id": 20, "id": 20,
"name": { "name": {
"key": "gamesummary_node_name_20", "key": "gamesummary_node_name_20",
"text": "兔子与猎犬" "text": "监狱抓捕战"
}, },
"tabId": 13, "tabId": 14,
"mapPos": { "mapPos": {
"x": 3595, "x": 3595,
"y": 1742 "y": 1742
@ -631,7 +631,40 @@
"jumpId": 10064, "jumpId": 10064,
"introduce": { "introduce": {
"key": "gamesummary_node_introdunce_21", "key": "gamesummary_node_introdunce_21",
"text": "兔子与猎犬" "text": "你是想做警长去抓捕所有的犯人?还是想当狡猾的果酱教授逃出升天?"
},
"bg": "hkz_wftj_zxgk",
"icon": "hkz_tx_zxgk",
"dropshow": [
{
"a": "attr",
"t": "gold",
"n": 1
},
{
"a": "attr",
"t": "diamond",
"n": 1
}
]
},
{
"id": 21,
"name": {
"key": "gamesummary_node_name_21",
"text": "捕羊大赛"
},
"tabId": 13,
"mapPos": {
"x": 2342,
"y": 75
},
"type": 4,
"params": "",
"jumpId": 10042,
"introduce": {
"key": "gamesummary_node_introdunce_22",
"text": "维京人的欢呼震撼天际!赶紧来加入这场捕羊的盛宴吧!"
}, },
"bg": "hkz_wftj_zxgk", "bg": "hkz_wftj_zxgk",
"icon": "hkz_tx_zxgk", "icon": "hkz_tx_zxgk",

View File

@ -208,16 +208,33 @@
"layer": 0, "layer": 0,
"name": { "name": {
"key": "gamesummary_fathernode_name_13", "key": "gamesummary_fathernode_name_13",
"text": "小游戏合集" "text": "捕羊大赛"
}, },
"mapPos": { "mapPos": {
"x": -1121, "x": -458,
"y": 583 "y": 0
}, },
"scale": 0.4, "scale": 0.4,
"usetext": { "usetext": {
"key": "gamesummary_fathernode_usetext_13", "key": "gamesummary_fathernode_usetext_13",
"text": "小游戏合集" "text": "维京人的欢呼震撼天际!赶紧来加入这场捕羊的盛宴吧!"
}
},
{
"tabId": 14,
"layer": 0,
"name": {
"key": "gamesummary_fathernode_name_14",
"text": "冒险回顾"
},
"mapPos": {
"x": -1021,
"y": 583
},
"scale": 0.4,
"usetext": {
"key": "gamesummary_fathernode_usetext_14",
"text": "那冒险中曾遇见的小小挑战,如今再次回到身边,想去试试吗?"
} }
} }
] ]

File diff suppressed because it is too large Load Diff

View File

@ -21436,7 +21436,7 @@
"id": "10000040", "id": "10000040",
"name": { "name": {
"key": "item_item_name_435", "key": "item_item_name_435",
"text": "辉月" "text": "辉月星尘"
}, },
"usetype": 1, "usetype": 1,
"color": 4, "color": 4,

View File

@ -146,11 +146,11 @@
"icon": "loading_icon_fc", "icon": "loading_icon_fc",
"title": { "title": {
"key": "loading_Sheet1_title_11", "key": "loading_Sheet1_title_11",
"text": "「极北龙岛群」" "text": "「博克岛」"
}, },
"prompt": { "prompt": {
"key": "loading_Sheet1_prompt_11", "key": "loading_Sheet1_prompt_11",
"text": "永远向着太阳的方向奔跑,拥有爱和信念,就会有希望的明天。" "text": "这里是博克岛。</br>一般来说,这个板块会介绍气候、风土、民俗什么的;但提起博克岛,你需要知道的只有——龙!"
} }
}, },
{ {
@ -258,11 +258,11 @@
"icon": "loading_icon_gfxm", "icon": "loading_icon_gfxm",
"title": { "title": {
"key": "loading_Sheet1_title_19", "key": "loading_Sheet1_title_19",
"text": "「中轴城内进入的战斗」" "text": "「神龙大侠」"
}, },
"prompt": { "prompt": {
"key": "loading_Sheet1_prompt_19", "key": "loading_Sheet1_prompt_19",
"text": "伟大守护者的第一次成就,往往是一场看似平平无奇的战斗。" "text": "在翡翠宫接受传承,获得神龙卷轴,就会成为神龙大侠。</br>嗯……没人规定神龙大侠不能是熊猫吧?"
} }
}, },
{ {
@ -446,5 +446,33 @@
"key": "loading_Sheet1_prompt_32", "key": "loading_Sheet1_prompt_32",
"text": "终极之战后,月中人陷入沉睡,为了更好地守护月之大陆,守护者们把力量集中起来,建立了中轴城。</br>这是一座用火球煮咖啡,用扫描仪复制魔法卷轴的神奇城市,坐落于月之大陆的中心,是世界文明交流的枢纽。" "text": "终极之战后,月中人陷入沉睡,为了更好地守护月之大陆,守护者们把力量集中起来,建立了中轴城。</br>这是一座用火球煮咖啡,用扫描仪复制魔法卷轴的神奇城市,坐落于月之大陆的中心,是世界文明交流的枢纽。"
} }
},
{
"id": 1033,
"scene": "GameMain",
"image": "ld_mh_bg01",
"icon": "loading_icon_gfxm",
"title": {
"key": "loading_Sheet1_title_33",
"text": "「恐惧灵」"
},
"prompt": {
"key": "loading_Sheet1_prompt_33",
"text": "由人们的恐惧转化而来,人们越恐惧,它们就越强,应对它们的最好办法是……</br>别怕!"
}
},
{
"id": 1034,
"scene": "CaravanScene",
"image": "ld_mh_bg_sd",
"icon": "loading_icon_jgsd",
"title": {
"key": "loading_Sheet1_title_34",
"text": "「商队列车」"
},
"prompt": {
"key": "loading_Sheet1_prompt_34",
"text": "星辰之下,飞驰的列车在各区间自由穿梭着。"
}
} }
] ]

File diff suppressed because it is too large Load Diff

View File

@ -5,9 +5,9 @@
"starnum": 8, "starnum": 8,
"reward": [ "reward": [
{ {
"a": "attr", "a": "item",
"t": "diamond", "t": "10000040",
"n": 100 "n": 1
} }
] ]
}, },

View File

@ -605,7 +605,7 @@
"captainId": 0, "captainId": 0,
"IsBoss": 0, "IsBoss": 0,
"bossHpCnt": 0, "bossHpCnt": 0,
"heroid": -1, "heroid": 33005,
"star": 3, "star": 3,
"equip": [], "equip": [],
"newskill": [], "newskill": [],
@ -239353,12 +239353,12 @@
"newskill": [], "newskill": [],
"lv": 1, "lv": 1,
"hppro": 1.5, "hppro": 1.5,
"atkpro": 1, "atkpro": 0.6,
"defpro": 1, "defpro": 0.6,
"skill1": 1, "skill1": 1,
"skill2": 1, "skill2": 1,
"skill3": 1, "skill3": 1,
"speed": 80, "speed": 90,
"modelsize": 1 "modelsize": 1
}, },
{ {
@ -239378,7 +239378,7 @@
"skill1": 1, "skill1": 1,
"skill2": 1, "skill2": 1,
"skill3": 1, "skill3": 1,
"speed": 90, "speed": 100,
"modelsize": 1 "modelsize": 1
}, },
{ {
@ -239398,7 +239398,7 @@
"skill1": 1, "skill1": 1,
"skill2": 1, "skill2": 1,
"skill3": 1, "skill3": 1,
"speed": 80, "speed": 85,
"modelsize": 1 "modelsize": 1
}, },
{ {
@ -239418,7 +239418,7 @@
"skill1": 1, "skill1": 1,
"skill2": 1, "skill2": 1,
"skill3": 1, "skill3": 1,
"speed": 80, "speed": 95,
"modelsize": 1 "modelsize": 1
}, },
{ {
@ -239589,13 +239589,13 @@
"captainId": 0, "captainId": 0,
"IsBoss": 0, "IsBoss": 0,
"bossHpCnt": 0, "bossHpCnt": 0,
"heroid": 14003, "heroid": 35002,
"star": 4, "star": 5,
"equip": [], "equip": [],
"newskill": [], "newskill": [],
"lv": 10, "lv": 10,
"hppro": 1, "hppro": 1,
"atkpro": 1, "atkpro": 0.8,
"defpro": 1, "defpro": 1,
"skill1": 1, "skill1": 1,
"skill2": 1, "skill2": 1,

View File

@ -152,7 +152,7 @@
} }
], ],
"wkqbx": 2, "wkqbx": 2,
"img": "icon_sytj", "img": "icon_sd",
"prompt": { "prompt": {
"key": "opencond_opencond_prompt_5", "key": "opencond_opencond_prompt_5",
"text": "主线关卡通关达到第1章的第8关开启" "text": "主线关卡通关达到第1章的第8关开启"
@ -3001,7 +3001,7 @@
} }
], ],
"wkqbx": 0, "wkqbx": 0,
"img": "icon_sytj", "img": "ty_qp_by",
"prompt": { "prompt": {
"key": "opencond_opencond_prompt_88", "key": "opencond_opencond_prompt_88",
"text": "继续完成更多主线任务开启" "text": "继续完成更多主线任务开启"
@ -3057,7 +3057,7 @@
} }
], ],
"wkqbx": 2, "wkqbx": 2,
"img": "ty_icon_shz", "img": "zm_icon_shzl",
"prompt": { "prompt": {
"key": "", "key": "",
"text": "" "text": ""
@ -3085,7 +3085,7 @@
} }
], ],
"wkqbx": 0, "wkqbx": 0,
"img": "", "img": "ty_qp_by",
"prompt": { "prompt": {
"key": "", "key": "",
"text": "" "text": ""

View File

@ -9,7 +9,7 @@
"text": "这好像不是熊猫?" "text": "这好像不是熊猫?"
}, },
"time": 90, "time": 90,
"speed": 3000 "speed": 11426
}, },
{ {
"id": "2", "id": "2",
@ -20,8 +20,8 @@
"key": "playerinfor_barrage_2", "key": "playerinfor_barrage_2",
"text": "看起来像个画家。" "text": "看起来像个画家。"
}, },
"time": 295, "time": 321,
"speed": 3000 "speed": 11163
}, },
{ {
"id": "3", "id": "3",
@ -32,8 +32,8 @@
"key": "playerinfor_barrage_3", "key": "playerinfor_barrage_3",
"text": "为什么会觉得是熊猫啊?" "text": "为什么会觉得是熊猫啊?"
}, },
"time": 455, "time": 470,
"speed": 3000 "speed": 11907
}, },
{ {
"id": "4", "id": "4",
@ -44,8 +44,8 @@
"key": "playerinfor_barrage_4", "key": "playerinfor_barrage_4",
"text": "从石头里蹦出来的人?怎么感觉有点熟悉……" "text": "从石头里蹦出来的人?怎么感觉有点熟悉……"
}, },
"time": 570, "time": 606,
"speed": 3000 "speed": 11347
}, },
{ {
"id": "5", "id": "5",
@ -56,8 +56,8 @@
"key": "playerinfor_barrage_5", "key": "playerinfor_barrage_5",
"text": "你可能是听说过从石头里蹦出来的猴子。" "text": "你可能是听说过从石头里蹦出来的猴子。"
}, },
"time": 806, "time": 803,
"speed": 3000 "speed": 10249
}, },
{ {
"id": "6", "id": "6",
@ -68,8 +68,8 @@
"key": "playerinfor_barrage_6", "key": "playerinfor_barrage_6",
"text": "你是从石头里蹦出来的?!" "text": "你是从石头里蹦出来的?!"
}, },
"time": 1004, "time": 942,
"speed": 3000 "speed": 10281
}, },
{ {
"id": "7", "id": "7",
@ -80,8 +80,8 @@
"key": "playerinfor_barrage_7", "key": "playerinfor_barrage_7",
"text": "不!那不是我!" "text": "不!那不是我!"
}, },
"time": 1129, "time": 1059,
"speed": 3000 "speed": 11227
}, },
{ {
"id": "8", "id": "8",
@ -92,8 +92,8 @@
"key": "playerinfor_barrage_8", "key": "playerinfor_barrage_8",
"text": "哦,传承之人……" "text": "哦,传承之人……"
}, },
"time": 1322, "time": 1213,
"speed": 3000 "speed": 9276
}, },
{ {
"id": "9", "id": "9",
@ -104,8 +104,8 @@
"key": "playerinfor_barrage_9", "key": "playerinfor_barrage_9",
"text": "月光能量都汇集在他身上了!" "text": "月光能量都汇集在他身上了!"
}, },
"time": 1430, "time": 1453,
"speed": 3000 "speed": 9290
}, },
{ {
"id": "10", "id": "10",
@ -116,8 +116,8 @@
"key": "playerinfor_barrage_10", "key": "playerinfor_barrage_10",
"text": "那应该不会爆炸吧?" "text": "那应该不会爆炸吧?"
}, },
"time": 1593, "time": 1584,
"speed": 3000 "speed": 7811
}, },
{ {
"id": "11", "id": "11",
@ -128,8 +128,8 @@
"key": "playerinfor_barrage_11", "key": "playerinfor_barrage_11",
"text": "阿宝,你为什么站那么远?" "text": "阿宝,你为什么站那么远?"
}, },
"time": 1772, "time": 1788,
"speed": 3000 "speed": 7004
}, },
{ {
"id": "312", "id": "312",
@ -141,7 +141,7 @@
"text": "哦!那是什么?" "text": "哦!那是什么?"
}, },
"time": 90, "time": 90,
"speed": 3000 "speed": 10628
}, },
{ {
"id": "313", "id": "313",
@ -152,8 +152,8 @@
"key": "playerinfor_barrage_313", "key": "playerinfor_barrage_313",
"text": "我有种被她注视的感觉……" "text": "我有种被她注视的感觉……"
}, },
"time": 272, "time": 206,
"speed": 3000 "speed": 11134
}, },
{ {
"id": "314", "id": "314",
@ -164,8 +164,8 @@
"key": "playerinfor_barrage_314", "key": "playerinfor_barrage_314",
"text": "好像是一种叫做“照相”的魔法……" "text": "好像是一种叫做“照相”的魔法……"
}, },
"time": 468, "time": 315,
"speed": 3000 "speed": 8012
}, },
{ {
"id": "315", "id": "315",
@ -176,8 +176,8 @@
"key": "playerinfor_barrage_315", "key": "playerinfor_barrage_315",
"text": "我看这魔法不是很疼。" "text": "我看这魔法不是很疼。"
}, },
"time": 674, "time": 468,
"speed": 3000 "speed": 12436
}, },
{ {
"id": "316", "id": "316",
@ -188,8 +188,8 @@
"key": "playerinfor_barrage_316", "key": "playerinfor_barrage_316",
"text": "据说它的作用是封印灵魂?" "text": "据说它的作用是封印灵魂?"
}, },
"time": 866, "time": 618,
"speed": 3000 "speed": 9124
}, },
{ {
"id": "317", "id": "317",
@ -200,8 +200,8 @@
"key": "playerinfor_barrage_317", "key": "playerinfor_barrage_317",
"text": "月中人的传承居然这么可怕?!" "text": "月中人的传承居然这么可怕?!"
}, },
"time": 1022, "time": 850,
"speed": 3000 "speed": 8299
}, },
{ {
"id": "318", "id": "318",
@ -212,8 +212,8 @@
"key": "playerinfor_barrage_318", "key": "playerinfor_barrage_318",
"text": "哦!你们真是够了!" "text": "哦!你们真是够了!"
}, },
"time": 1175, "time": 986,
"speed": 3000 "speed": 10471
}, },
{ {
"id": "319", "id": "319",
@ -224,8 +224,8 @@
"key": "playerinfor_barrage_319", "key": "playerinfor_barrage_319",
"text": "照相不是魔法!也不能封印灵魂!" "text": "照相不是魔法!也不能封印灵魂!"
}, },
"time": 1276, "time": 1138,
"speed": 3000 "speed": 10110
}, },
{ {
"id": "320", "id": "320",
@ -236,8 +236,8 @@
"key": "playerinfor_barrage_320", "key": "playerinfor_barrage_320",
"text": "那她是在干什么?" "text": "那她是在干什么?"
}, },
"time": 1430, "time": 1245,
"speed": 3000 "speed": 8058
}, },
{ {
"id": "321", "id": "321",
@ -248,8 +248,8 @@
"key": "playerinfor_barrage_321", "key": "playerinfor_barrage_321",
"text": "……别问。" "text": "……别问。"
}, },
"time": 1669, "time": 1471,
"speed": 3000 "speed": 8833
}, },
{ {
"id": "322", "id": "322",
@ -260,8 +260,8 @@
"key": "playerinfor_barrage_322", "key": "playerinfor_barrage_322",
"text": "那可以教我吗?" "text": "那可以教我吗?"
}, },
"time": 1853, "time": 1667,
"speed": 3000 "speed": 10965
}, },
{ {
"id": "323", "id": "323",
@ -272,8 +272,8 @@
"key": "playerinfor_barrage_323", "key": "playerinfor_barrage_323",
"text": "我也想学。" "text": "我也想学。"
}, },
"time": 2037, "time": 1810,
"speed": 3000 "speed": 9501
}, },
{ {
"id": "324", "id": "324",
@ -284,7 +284,7 @@
"key": "playerinfor_barrage_324", "key": "playerinfor_barrage_324",
"text": "要不你们问问这个传承者?" "text": "要不你们问问这个传承者?"
}, },
"time": 2186, "time": 1979,
"speed": 3000 "speed": 8500
} }
] ]

View File

@ -404,6 +404,21 @@
], ],
"goto": 0 "goto": 0
}, },
{
"id": 100108,
"heroid": 45001,
"Levelid": 0,
"datas": [
"GameMain",
"功能入口-招募",
"901"
],
"event": [
2,
10041
],
"goto": 0
},
{ {
"id": 100109, "id": 100109,
"heroid": 25001, "heroid": 25001,
@ -515,7 +530,7 @@
"Levelid": 0, "Levelid": 0,
"datas": [ "datas": [
"GameMain", "GameMain",
"20020_阿宝_常驻", "功能入口-招募",
"901" "901"
], ],
"event": [ "event": [
@ -631,7 +646,7 @@
}, },
{ {
"id": 200338, "id": 200338,
"heroid": 45001, "heroid": 35006,
"Levelid": 0, "Levelid": 0,
"datas": [ "datas": [
"GameMain", "GameMain",
@ -670,7 +685,7 @@
], ],
"event": [ "event": [
2, 2,
10010 10111
], ],
"goto": 0 "goto": 0
}, },
@ -696,7 +711,7 @@
], ],
"event": [ "event": [
2, 2,
10010 10112
], ],
"goto": 0 "goto": 0
}, },
@ -706,12 +721,12 @@
"Levelid": 0, "Levelid": 0,
"datas": [ "datas": [
"GameMain", "GameMain",
"熊猫_圣桃树_面对无牙仔", "20033_邦尼兔",
"901" "901"
], ],
"event": [ "event": [
2, 2,
10142 10131
], ],
"goto": 0 "goto": 0
}, },
@ -721,12 +736,12 @@
"Levelid": 0, "Levelid": 0,
"datas": [ "datas": [
"GameMain", "GameMain",
"成群恐惧灵", "熊猫_圣桃树_面对无牙仔",
"901" "901"
], ],
"event": [ "event": [
1, 2,
104 10142
], ],
"goto": 0 "goto": 0
}, },

View File

@ -28260,7 +28260,7 @@
"passSkill": [], "passSkill": [],
"Desc": { "Desc": {
"key": "skill_skill_atk_Desc_135004311_1", "key": "skill_skill_atk_Desc_135004311_1",
"text": "黛安·福克斯顿对敌方所有目标造成攻击力650%的伤害并对敌方所有目标造成攻击力30%的伤害。若目标身上无增益状态则无视目标100%防御。" "text": "黛安·福克斯顿对当前目标造成攻击力650%的伤害并对敌方所有目标造成攻击力30%的伤害。若目标身上无增益状态则无视目标100%防御。"
}, },
"buffid": [], "buffid": [],
"map": "" "map": ""
@ -38068,7 +38068,7 @@
"CorrectPos": 0, "CorrectPos": 0,
"IsMelee": 0, "IsMelee": 0,
"act": "", "act": "",
"Type": 3, "Type": 5,
"CD": 0, "CD": 0,
"Where": [], "Where": [],
"Target": 1, "Target": 1,
@ -38098,7 +38098,7 @@
"CorrectPos": 0, "CorrectPos": 0,
"IsMelee": 0, "IsMelee": 0,
"act": "", "act": "",
"Type": 3, "Type": 5,
"CD": 0, "CD": 0,
"Where": [], "Where": [],
"Target": 1, "Target": 1,
@ -38128,7 +38128,7 @@
"CorrectPos": 0, "CorrectPos": 0,
"IsMelee": 0, "IsMelee": 0,
"act": "", "act": "",
"Type": 3, "Type": 5,
"CD": 0, "CD": 0,
"Where": [], "Where": [],
"Target": 1, "Target": 1,
@ -38158,7 +38158,7 @@
"CorrectPos": 0, "CorrectPos": 0,
"IsMelee": 0, "IsMelee": 0,
"act": "", "act": "",
"Type": 3, "Type": 5,
"CD": 0, "CD": 0,
"Where": [], "Where": [],
"Target": 1, "Target": 1,
@ -38188,7 +38188,7 @@
"CorrectPos": 0, "CorrectPos": 0,
"IsMelee": 0, "IsMelee": 0,
"act": "", "act": "",
"Type": 3, "Type": 5,
"CD": 0, "CD": 0,
"Where": [], "Where": [],
"Target": 1, "Target": 1,
@ -38218,7 +38218,7 @@
"CorrectPos": 0, "CorrectPos": 0,
"IsMelee": 0, "IsMelee": 0,
"act": "", "act": "",
"Type": 3, "Type": 5,
"CD": 0, "CD": 0,
"Where": [], "Where": [],
"Target": 1, "Target": 1,
@ -38248,7 +38248,7 @@
"CorrectPos": 0, "CorrectPos": 0,
"IsMelee": 0, "IsMelee": 0,
"act": "", "act": "",
"Type": 3, "Type": 5,
"CD": 0, "CD": 0,
"Where": [], "Where": [],
"Target": 1, "Target": 1,
@ -38278,7 +38278,7 @@
"CorrectPos": 0, "CorrectPos": 0,
"IsMelee": 0, "IsMelee": 0,
"act": "", "act": "",
"Type": 3, "Type": 5,
"CD": 0, "CD": 0,
"Where": [], "Where": [],
"Target": 1, "Target": 1,
@ -38308,7 +38308,7 @@
"CorrectPos": 0, "CorrectPos": 0,
"IsMelee": 0, "IsMelee": 0,
"act": "", "act": "",
"Type": 3, "Type": 5,
"CD": 0, "CD": 0,
"Where": [], "Where": [],
"Target": 1, "Target": 1,
@ -38338,7 +38338,7 @@
"CorrectPos": 0, "CorrectPos": 0,
"IsMelee": 0, "IsMelee": 0,
"act": "", "act": "",
"Type": 3, "Type": 5,
"CD": 0, "CD": 0,
"Where": [], "Where": [],
"Target": 1, "Target": 1,
@ -38368,7 +38368,7 @@
"CorrectPos": 0, "CorrectPos": 0,
"IsMelee": 0, "IsMelee": 0,
"act": "", "act": "",
"Type": 3, "Type": 5,
"CD": 0, "CD": 0,
"Where": [], "Where": [],
"Target": 1, "Target": 1,
@ -38398,7 +38398,7 @@
"CorrectPos": 0, "CorrectPos": 0,
"IsMelee": 0, "IsMelee": 0,
"act": "", "act": "",
"Type": 3, "Type": 5,
"CD": 0, "CD": 0,
"Where": [], "Where": [],
"Target": 1, "Target": 1,
@ -38428,7 +38428,7 @@
"CorrectPos": 0, "CorrectPos": 0,
"IsMelee": 0, "IsMelee": 0,
"act": "", "act": "",
"Type": 3, "Type": 5,
"CD": 0, "CD": 0,
"Where": [], "Where": [],
"Target": 1, "Target": 1,
@ -38458,7 +38458,7 @@
"CorrectPos": 0, "CorrectPos": 0,
"IsMelee": 0, "IsMelee": 0,
"act": "", "act": "",
"Type": 3, "Type": 5,
"CD": 0, "CD": 0,
"Where": [], "Where": [],
"Target": 1, "Target": 1,
@ -38488,7 +38488,7 @@
"CorrectPos": 0, "CorrectPos": 0,
"IsMelee": 0, "IsMelee": 0,
"act": "", "act": "",
"Type": 3, "Type": 5,
"CD": 0, "CD": 0,
"Where": [], "Where": [],
"Target": 1, "Target": 1,
@ -38518,7 +38518,7 @@
"CorrectPos": 0, "CorrectPos": 0,
"IsMelee": 0, "IsMelee": 0,
"act": "", "act": "",
"Type": 0, "Type": 5,
"CD": 0, "CD": 0,
"Where": [], "Where": [],
"Target": 1, "Target": 1,
@ -38548,7 +38548,7 @@
"CorrectPos": 0, "CorrectPos": 0,
"IsMelee": 0, "IsMelee": 0,
"act": "", "act": "",
"Type": 3, "Type": 5,
"CD": 0, "CD": 0,
"Where": [], "Where": [],
"Target": 1, "Target": 1,
@ -38578,7 +38578,7 @@
"CorrectPos": 0, "CorrectPos": 0,
"IsMelee": 0, "IsMelee": 0,
"act": "", "act": "",
"Type": 3, "Type": 5,
"CD": 0, "CD": 0,
"Where": [], "Where": [],
"Target": 1, "Target": 1,
@ -38608,7 +38608,7 @@
"CorrectPos": 0, "CorrectPos": 0,
"IsMelee": 0, "IsMelee": 0,
"act": "", "act": "",
"Type": 3, "Type": 5,
"CD": 0, "CD": 0,
"Where": [], "Where": [],
"Target": 1, "Target": 1,
@ -38640,7 +38640,7 @@
"CorrectPos": 0, "CorrectPos": 0,
"IsMelee": 0, "IsMelee": 0,
"act": "", "act": "",
"Type": 3, "Type": 5,
"CD": 0, "CD": 0,
"Where": [], "Where": [],
"Target": 1, "Target": 1,
@ -38670,7 +38670,7 @@
"CorrectPos": 0, "CorrectPos": 0,
"IsMelee": 0, "IsMelee": 0,
"act": "", "act": "",
"Type": 3, "Type": 5,
"CD": 0, "CD": 0,
"Where": [], "Where": [],
"Target": 1, "Target": 1,
@ -38702,7 +38702,7 @@
"CorrectPos": 0, "CorrectPos": 0,
"IsMelee": 0, "IsMelee": 0,
"act": "", "act": "",
"Type": 3, "Type": 5,
"CD": 0, "CD": 0,
"Where": [], "Where": [],
"Target": 1, "Target": 1,
@ -38732,7 +38732,7 @@
"CorrectPos": 0, "CorrectPos": 0,
"IsMelee": 0, "IsMelee": 0,
"act": "", "act": "",
"Type": 3, "Type": 5,
"CD": 0, "CD": 0,
"Where": [], "Where": [],
"Target": 1, "Target": 1,
@ -38764,7 +38764,7 @@
"CorrectPos": 0, "CorrectPos": 0,
"IsMelee": 0, "IsMelee": 0,
"act": "", "act": "",
"Type": 3, "Type": 5,
"CD": 0, "CD": 0,
"Where": [], "Where": [],
"Target": 1, "Target": 1,
@ -38794,7 +38794,7 @@
"CorrectPos": 0, "CorrectPos": 0,
"IsMelee": 0, "IsMelee": 0,
"act": "", "act": "",
"Type": 3, "Type": 5,
"CD": 0, "CD": 0,
"Where": [], "Where": [],
"Target": 1, "Target": 1,
@ -38826,7 +38826,7 @@
"CorrectPos": 0, "CorrectPos": 0,
"IsMelee": 0, "IsMelee": 0,
"act": "", "act": "",
"Type": 3, "Type": 5,
"CD": 0, "CD": 0,
"Where": [], "Where": [],
"Target": 1, "Target": 1,
@ -38856,7 +38856,7 @@
"CorrectPos": 0, "CorrectPos": 0,
"IsMelee": 0, "IsMelee": 0,
"act": "", "act": "",
"Type": 3, "Type": 5,
"CD": 0, "CD": 0,
"Where": [], "Where": [],
"Target": 1, "Target": 1,
@ -38886,7 +38886,7 @@
"CorrectPos": 0, "CorrectPos": 0,
"IsMelee": 0, "IsMelee": 0,
"act": "", "act": "",
"Type": 3, "Type": 5,
"CD": 0, "CD": 0,
"Where": [], "Where": [],
"Target": 1, "Target": 1,
@ -39517,7 +39517,7 @@
"CorrectPos": 0, "CorrectPos": 0,
"IsMelee": 0, "IsMelee": 0,
"act": "", "act": "",
"Type": 3, "Type": 5,
"CD": 0, "CD": 0,
"Where": [], "Where": [],
"Target": 1, "Target": 1,
@ -39547,7 +39547,7 @@
"CorrectPos": 0, "CorrectPos": 0,
"IsMelee": 0, "IsMelee": 0,
"act": "", "act": "",
"Type": 3, "Type": 5,
"CD": 0, "CD": 0,
"Where": [], "Where": [],
"Target": 1, "Target": 1,
@ -39577,7 +39577,7 @@
"CorrectPos": 0, "CorrectPos": 0,
"IsMelee": 0, "IsMelee": 0,
"act": "", "act": "",
"Type": 3, "Type": 5,
"CD": 0, "CD": 0,
"Where": [], "Where": [],
"Target": 1, "Target": 1,
@ -39607,7 +39607,7 @@
"CorrectPos": 0, "CorrectPos": 0,
"IsMelee": 0, "IsMelee": 0,
"act": "", "act": "",
"Type": 3, "Type": 5,
"CD": 0, "CD": 0,
"Where": [], "Where": [],
"Target": 1, "Target": 1,
@ -39637,7 +39637,7 @@
"CorrectPos": 0, "CorrectPos": 0,
"IsMelee": 0, "IsMelee": 0,
"act": "", "act": "",
"Type": 3, "Type": 5,
"CD": 0, "CD": 0,
"Where": [], "Where": [],
"Target": 1, "Target": 1,
@ -39667,7 +39667,7 @@
"CorrectPos": 0, "CorrectPos": 0,
"IsMelee": 0, "IsMelee": 0,
"act": "", "act": "",
"Type": 3, "Type": 5,
"CD": 0, "CD": 0,
"Where": [], "Where": [],
"Target": 1, "Target": 1,
@ -39697,7 +39697,7 @@
"CorrectPos": 0, "CorrectPos": 0,
"IsMelee": 0, "IsMelee": 0,
"act": "", "act": "",
"Type": 3, "Type": 5,
"CD": 0, "CD": 0,
"Where": [], "Where": [],
"Target": 1, "Target": 1,
@ -39727,7 +39727,7 @@
"CorrectPos": 0, "CorrectPos": 0,
"IsMelee": 0, "IsMelee": 0,
"act": "", "act": "",
"Type": 3, "Type": 5,
"CD": 0, "CD": 0,
"Where": [], "Where": [],
"Target": 1, "Target": 1,
@ -39757,7 +39757,7 @@
"CorrectPos": 0, "CorrectPos": 0,
"IsMelee": 0, "IsMelee": 0,
"act": "", "act": "",
"Type": 3, "Type": 5,
"CD": 0, "CD": 0,
"Where": [], "Where": [],
"Target": 1, "Target": 1,
@ -39787,7 +39787,7 @@
"CorrectPos": 0, "CorrectPos": 0,
"IsMelee": 0, "IsMelee": 0,
"act": "", "act": "",
"Type": 3, "Type": 5,
"CD": 0, "CD": 0,
"Where": [], "Where": [],
"Target": 1, "Target": 1,
@ -39817,7 +39817,7 @@
"CorrectPos": 0, "CorrectPos": 0,
"IsMelee": 0, "IsMelee": 0,
"act": "", "act": "",
"Type": 3, "Type": 5,
"CD": 0, "CD": 0,
"Where": [], "Where": [],
"Target": 1, "Target": 1,
@ -39847,7 +39847,7 @@
"CorrectPos": 0, "CorrectPos": 0,
"IsMelee": 0, "IsMelee": 0,
"act": "", "act": "",
"Type": 3, "Type": 5,
"CD": 0, "CD": 0,
"Where": [], "Where": [],
"Target": 1, "Target": 1,

View File

@ -11734,7 +11734,8 @@
"RelyCheckArgu": [], "RelyCheckArgu": [],
"CoexistCheckArgu": [], "CoexistCheckArgu": [],
"Effect": [ "Effect": [
1 1,
2
], ],
"AddEffect": false, "AddEffect": false,
"RemoveType": true, "RemoveType": true,

View File

@ -1,17 +1,33 @@
[ [
{ {
"id": 20035, "id": 1,
"topname": { "topname": {
"key": "topname_01", "key": "tipstxt_tipstxt_main_topname_01",
"text": "第一章" "text": "第一章"
}, },
"name": { "name": {
"key": "name_01", "key": "tipstxt_tipstxt_main_name_01",
"text": "测试文本" "text": "第一幕"
}, },
"txt": { "txt": {
"key": "txt_01", "key": "tipstxt_tipstxt_main_txt_01",
"text": "测试文本2" "text": "小嗝嗝要狗带了!(救了他将来或许有好事发生?)"
},
"map": ""
},
{
"id": 20109,
"topname": {
"key": "tipstxt_tipstxt_main_topname_02",
"text": "第一章"
},
"name": {
"key": "tipstxt_tipstxt_main_name_02",
"text": "第二幕"
},
"txt": {
"key": "tipstxt_tipstxt_main_txt_02",
"text": "生存还是毁灭这是一个问题!(但不应由你埃雷特一人决定!)"
}, },
"map": "" "map": ""
} }

View File

@ -56,11 +56,11 @@
}, },
"explain": { "explain": {
"key": "treasuremap_map_explain_1", "key": "treasuremap_map_explain_1",
"text": "在博克岛到处搜索找到的藏宝图,如今终于拼成了一个,上面标记着只在博客岛的宝藏,跟随着藏宝图好好寻找吧" "text": "扭扭曲曲的字大概描写着:一只?两只?三只"
}, },
"describe": { "describe": {
"key": "treasuremap_map_desribe_1", "key": "treasuremap_map_desribe_1",
"text": "扭扭曲曲的字大概描写着:一只?两只?三只" "text": "在博克岛到处搜索找到的藏宝图,如今终于拼成了一个,上面标记着只在博客岛的宝藏,跟随着藏宝图好好寻找吧"
} }
}, },
{ {

File diff suppressed because it is too large Load Diff

View File

@ -27,6 +27,7 @@ type GameGuideData struct {
ObjSize serialization.Vector2 ObjSize serialization.Vector2
ObjOffset serialization.Vector2 ObjOffset serialization.Vector2
Txt string Txt string
Txtoffset serialization.Vector2
Speakerface int32 Speakerface int32
Sound string Sound string
Mask int32 Mask int32
@ -91,6 +92,13 @@ func (_v *GameGuideData)Deserialize(_buf map[string]interface{}) (err error) {
} }
{ var _ok_ bool; if _v.Txt, _ok_ = _buf["txt"].(string); !_ok_ { err = errors.New("txt error"); return } } { var _ok_ bool; if _v.Txt, _ok_ = _buf["txt"].(string); !_ok_ { err = errors.New("txt error"); return } }
{ var _ok_ bool; var _v_ map[string]interface{}; if _v_, _ok_ = _buf["txtoffset"].(map[string]interface{}); !_ok_ { err = errors.New("txtoffset error"); return }
var _x_, _y_ float32;
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _v_["x"].(float64); !_ok_ { err = errors.New("x error"); return }; _x_ = float32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _v_["y"].(float64); !_ok_ { err = errors.New("y error"); return }; _y_ = float32(_tempNum_) }
_v.Txtoffset = serialization.NewVector2(_x_, _y_)
}
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["speakerface"].(float64); !_ok_ { err = errors.New("speakerface error"); return }; _v.Speakerface = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["speakerface"].(float64); !_ok_ { err = errors.New("speakerface error"); return }; _v.Speakerface = int32(_tempNum_) }
{ var _ok_ bool; if _v.Sound, _ok_ = _buf["sound"].(string); !_ok_ { err = errors.New("sound error"); return } } { var _ok_ bool; if _v.Sound, _ok_ = _buf["sound"].(string); !_ok_ { err = errors.New("sound error"); return } }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["mask"].(float64); !_ok_ { err = errors.New("mask error"); return }; _v.Mask = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["mask"].(float64); !_ok_ { err = errors.New("mask error"); return }; _v.Mask = int32(_tempNum_) }

View File

@ -39,6 +39,7 @@ type GameMainStageData struct {
Heroimg string Heroimg string
Bubbletext string Bubbletext string
Animation []string Animation []string
Prewarbubbletext string
Hide int32 Hide int32
Destroy int32 Destroy int32
Progress int32 Progress int32
@ -166,6 +167,7 @@ func (_v *GameMainStageData)Deserialize(_buf map[string]interface{}) (err error)
} }
} }
{var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["prewarbubbletext"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Prewarbubbletext error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Prewarbubbletext, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["hide"].(float64); !_ok_ { err = errors.New("hide error"); return }; _v.Hide = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["hide"].(float64); !_ok_ { err = errors.New("hide error"); return }; _v.Hide = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["destroy"].(float64); !_ok_ { err = errors.New("destroy error"); return }; _v.Destroy = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["destroy"].(float64); !_ok_ { err = errors.New("destroy error"); return }; _v.Destroy = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["progress"].(float64); !_ok_ { err = errors.New("progress error"); return }; _v.Progress = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["progress"].(float64); !_ok_ { err = errors.New("progress error"); return }; _v.Progress = int32(_tempNum_) }

View File

@ -33,6 +33,7 @@ type GameWorldTaskData struct {
AutoAccept int32 AutoAccept int32
Tasktips int32 Tasktips int32
DeliverTask int32 DeliverTask int32
DeliverTaskNpc int32
LockAdd int32 LockAdd int32
Finish []int32 Finish []int32
Finishparameter string Finishparameter string
@ -109,6 +110,7 @@ func (_v *GameWorldTaskData)Deserialize(_buf map[string]interface{}) (err error)
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["auto_accept"].(float64); !_ok_ { err = errors.New("auto_accept error"); return }; _v.AutoAccept = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["auto_accept"].(float64); !_ok_ { err = errors.New("auto_accept error"); return }; _v.AutoAccept = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["tasktips"].(float64); !_ok_ { err = errors.New("tasktips error"); return }; _v.Tasktips = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["tasktips"].(float64); !_ok_ { err = errors.New("tasktips error"); return }; _v.Tasktips = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["deliver_task"].(float64); !_ok_ { err = errors.New("deliver_task error"); return }; _v.DeliverTask = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["deliver_task"].(float64); !_ok_ { err = errors.New("deliver_task error"); return }; _v.DeliverTask = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["deliver_task_npc"].(float64); !_ok_ { err = errors.New("deliver_task_npc error"); return }; _v.DeliverTaskNpc = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["lock_add"].(float64); !_ok_ { err = errors.New("lock_add error"); return }; _v.LockAdd = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["lock_add"].(float64); !_ok_ { err = errors.New("lock_add error"); return }; _v.LockAdd = int32(_tempNum_) }
{ {
var _arr_ []interface{} var _arr_ []interface{}