liwei_3d/go_dreamfactory
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev

Browse Source
This commit is contained in:
liwei1dao 2023-06-08 13:53:50 +08:00
commit 103ae988f4
13 changed files with 2030 additions and 2015 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
bin/json/game_buriedcondi.json
View File

@ -8155,7 +8155,9 @@
"valid": 0, "valid": 0,
"NPC": 10351, "NPC": 10351,
"value": 1, "value": 1,
"filter": [], "filter": [
1
],
"filter2": [ "filter2": [
"套装效果", "套装效果",
"0", "0",
@ -14858,6 +14860,7 @@
"NPC": 0, "NPC": 0,
"value": 1, "value": 1,
"filter": [ "filter": [
1,
1 1
], ],
"filter2": [ "filter2": [
@ -15742,7 +15745,9 @@
"valid": 0, "valid": 0,
"NPC": 0, "NPC": 0,
"value": 3, "value": 3,
"filter": [], "filter": [
1
],
"filter2": [ "filter2": [
"共鸣等级", "共鸣等级",
"0", "0",
@ -15858,7 +15863,9 @@
"valid": 0, "valid": 0,
"NPC": 0, "NPC": 0,
"value": 2, "value": 2,
"filter": [], "filter": [
1
],
"filter2": [ "filter2": [
"段位", "段位",
"0", "0",
@ -16491,7 +16498,9 @@
"valid": 0, "valid": 0,
"NPC": 0, "NPC": 0,
"value": 1, "value": 1,
"filter": [], "filter": [
1
],
"filter2": [ "filter2": [
"套装效果", "套装效果",
"0", "0",
@ -16874,7 +16883,7 @@
"key": "buried_buried_condi_tasktxt_722", "key": "buried_buried_condi_tasktxt_722",
"text": "剧情（月光交互、移动教学）" "text": "剧情（月光交互、移动教学）"
}, },
"type": 200001, "type": 20001,
"valid": 1, "valid": 1,
"NPC": 10014, "NPC": 10014,
"value": 1, "value": 1,
@ -17040,7 +17049,7 @@
"key": "buried_buried_condi_tasktxt_729", "key": "buried_buried_condi_tasktxt_729",
"text": "阿宝武馆剧情" "text": "阿宝武馆剧情"
}, },
"type": 200001, "type": 20001,
"valid": 1, "valid": 1,
"NPC": 10081, "NPC": 10081,
"value": 1, "value": 1,
@ -17064,7 +17073,7 @@
"key": "buried_buried_condi_tasktxt_730", "key": "buried_buried_condi_tasktxt_730",
"text": "邦尼兔木桩剧情" "text": "邦尼兔木桩剧情"
}, },
"type": 200001, "type": 20001,
"valid": 1, "valid": 1,
"NPC": 10081, "NPC": 10081,
"value": 1, "value": 1,
@ -17110,7 +17119,7 @@
"key": "buried_buried_condi_tasktxt_732", "key": "buried_buried_condi_tasktxt_732",
"text": "剧情" "text": "剧情"
}, },
"type": 200001, "type": 20001,
"valid": 1, "valid": 1,
"NPC": 0, "NPC": 0,
"value": 1, "value": 1,
@ -17325,7 +17334,7 @@
"key": "buried_buried_condi_tasktxt_741", "key": "buried_buried_condi_tasktxt_741",
"text": "剧情" "text": "剧情"
}, },
"type": 200001, "type": 20001,
"valid": 0, "valid": 0,
"NPC": 0, "NPC": 0,
"value": 1, "value": 1,
@ -17489,7 +17498,7 @@
"key": "buried_buried_condi_tasktxt_748", "key": "buried_buried_condi_tasktxt_748",
"text": "剧情" "text": "剧情"
}, },
"type": 200001, "type": 20001,
"valid": 0, "valid": 0,
"NPC": 10254, "NPC": 10254,
"value": 1, "value": 1,
@ -17586,7 +17595,7 @@
"key": "buried_buried_condi_tasktxt_752", "key": "buried_buried_condi_tasktxt_752",
"text": "剧情ID" "text": "剧情ID"
}, },
"type": 200001, "type": 20001,
"valid": 0, "valid": 0,
"NPC": 10294, "NPC": 10294,
"value": 1, "value": 1,
@ -17610,7 +17619,7 @@
"key": "buried_buried_condi_tasktxt_753", "key": "buried_buried_condi_tasktxt_753",
"text": "剧情ID" "text": "剧情ID"
}, },
"type": 200001, "type": 20001,
"valid": 0, "valid": 0,
"NPC": 10304, "NPC": 10304,
"value": 1, "value": 1,
@ -17659,7 +17668,7 @@
"key": "buried_buried_condi_tasktxt_755", "key": "buried_buried_condi_tasktxt_755",
"text": "剧情" "text": "剧情"
}, },
"type": 200001, "type": 20001,
"valid": 0, "valid": 0,
"NPC": 10324, "NPC": 10324,
"value": 1, "value": 1,
@ -17732,7 +17741,7 @@
"key": "buried_buried_condi_tasktxt_758", "key": "buried_buried_condi_tasktxt_758",
"text": "装备穿戴、升级/剧情" "text": "装备穿戴、升级/剧情"
}, },
"type": 200001, "type": 20001,
"valid": 0, "valid": 0,
"NPC": 10354, "NPC": 10354,
"value": 1, "value": 1,
@ -17780,7 +17789,7 @@
"key": "buried_buried_condi_tasktxt_760", "key": "buried_buried_condi_tasktxt_760",
"text": "剧情" "text": "剧情"
}, },
"type": 200001, "type": 20001,
"valid": 0, "valid": 0,
"NPC": 10374, "NPC": 10374,
"value": 1, "value": 1,
@ -17923,7 +17932,7 @@
"key": "buried_buried_condi_tasktxt_766", "key": "buried_buried_condi_tasktxt_766",
"text": "剧情" "text": "剧情"
}, },
"type": 200001, "type": 20001,
"valid": 0, "valid": 0,
"NPC": 10434, "NPC": 10434,
"value": 1, "value": 1,
@ -17996,7 +18005,7 @@
"key": "buried_buried_condi_tasktxt_769", "key": "buried_buried_condi_tasktxt_769",
"text": "剧情" "text": "剧情"
}, },
"type": 200001, "type": 20001,
"valid": 0, "valid": 0,
"NPC": 10464, "NPC": 10464,
"value": 1, "value": 1,
@ -18117,7 +18126,7 @@
"key": "buried_buried_condi_tasktxt_774", "key": "buried_buried_condi_tasktxt_774",
"text": "剧情" "text": "剧情"
}, },
"type": 200001, "type": 20001,
"valid": 0, "valid": 0,
"NPC": 10514, "NPC": 10514,
"value": 1, "value": 1,
@ -18141,7 +18150,7 @@
"key": "buried_buried_condi_tasktxt_775", "key": "buried_buried_condi_tasktxt_775",
"text": "剧情" "text": "剧情"
}, },
"type": 200001, "type": 20001,
"valid": 0, "valid": 0,
"NPC": 10524, "NPC": 10524,
"value": 1, "value": 1,
@ -18380,7 +18389,7 @@
"key": "buried_buried_condi_tasktxt_785", "key": "buried_buried_condi_tasktxt_785",
"text": "剧情" "text": "剧情"
}, },
"type": 200001, "type": 20001,
"valid": 0, "valid": 0,
"NPC": 10624, "NPC": 10624,
"value": 1, "value": 1,
@ -18503,7 +18512,9 @@
"valid": 0, "valid": 0,
"NPC": 10674, "NPC": 10674,
"value": 10, "value": 10,
"filter": [], "filter": [
1
],
"filter2": [ "filter2": [
"页签id", "页签id",
"0", "0",
@ -18902,8 +18913,10 @@
"type": 168, "type": 168,
"valid": 0, "valid": 0,
"NPC": 10844, "NPC": 10844,
"value": 20, "value": 10,
"filter": [], "filter": [
2
],
"filter2": [ "filter2": [
"页签id", "页签id",
"0", "0",

2
bin/json/game_caravanevent.json
View File

@ -3,7 +3,7 @@
"id": 1001, "id": 1001,
"eventtype": 1, "eventtype": 1,
"mustdo": 1, "mustdo": 1,
"citystory": 101, "citystory": 601,
"citynormal": 102, "citynormal": 102,
"cityabnormal": 103, "cityabnormal": 103,
"worldtask": 90010, "worldtask": 90010,

3600
bin/json/game_drop.json
View File

File diff suppressed because it is too large Load Diff

3
bin/json/game_global.json
View File

@ -740,6 +740,7 @@
"buzkashi_deathspeed": 800, "buzkashi_deathspeed": 800,
"buzkashi_goal": 2000, "buzkashi_goal": 2000,
"buzkashi_goalspeed": 800, "buzkashi_goalspeed": 800,
"buzkashi_bumpdis": 5 "buzkashi_bumpdis": 5,
"stamina_potion": 10000003
} }
] ]

172
bin/json/game_item.json
View File

@ -4613,7 +4613,7 @@
"key": "item_item_name_144", "key": "item_item_name_144",
"text": "英雄初级升星道具" "text": "英雄初级升星道具"
}, },
"usetype": 6, "usetype": 3,
"color": 2, "color": 2,
"bagtype": 1, "bagtype": 1,
"index": 100, "index": 100,
@ -4652,7 +4652,7 @@
"key": "item_item_name_145", "key": "item_item_name_145",
"text": "英雄中级升星道具" "text": "英雄中级升星道具"
}, },
"usetype": 6, "usetype": 3,
"color": 3, "color": 3,
"bagtype": 1, "bagtype": 1,
"index": 101, "index": 101,
@ -4697,7 +4697,7 @@
"key": "item_item_name_146", "key": "item_item_name_146",
"text": "英雄高级升星道具" "text": "英雄高级升星道具"
}, },
"usetype": 6, "usetype": 3,
"color": 4, "color": 4,
"bagtype": 1, "bagtype": 1,
"index": 102, "index": 102,
@ -4742,7 +4742,7 @@
"key": "item_item_name_147", "key": "item_item_name_147",
"text": "闪闪守护之心" "text": "闪闪守护之心"
}, },
"usetype": 6, "usetype": 3,
"color": 2, "color": 2,
"bagtype": 0, "bagtype": 0,
"index": 99, "index": 99,
@ -4781,7 +4781,7 @@
"key": "item_item_name_148", "key": "item_item_name_148",
"text": "食人鱼先生守护之心" "text": "食人鱼先生守护之心"
}, },
"usetype": 6, "usetype": 3,
"color": 2, "color": 2,
"bagtype": 0, "bagtype": 0,
"index": 99, "index": 99,
@ -4820,7 +4820,7 @@
"key": "item_item_name_149", "key": "item_item_name_149",
"text": "啊啊守护之心" "text": "啊啊守护之心"
}, },
"usetype": 6, "usetype": 3,
"color": 2, "color": 2,
"bagtype": 0, "bagtype": 0,
"index": 99, "index": 99,
@ -4859,7 +4859,7 @@
"key": "item_item_name_150", "key": "item_item_name_150",
"text": "法夸德勋爵守护之心" "text": "法夸德勋爵守护之心"
}, },
"usetype": 6, "usetype": 3,
"color": 2, "color": 2,
"bagtype": 0, "bagtype": 0,
"index": 99, "index": 99,
@ -4898,7 +4898,7 @@
"key": "item_item_name_151", "key": "item_item_name_151",
"text": "大大守护之心" "text": "大大守护之心"
}, },
"usetype": 6, "usetype": 3,
"color": 2, "color": 2,
"bagtype": 0, "bagtype": 0,
"index": 99, "index": 99,
@ -4937,7 +4937,7 @@
"key": "item_item_name_152", "key": "item_item_name_152",
"text": "史图依克守护之心" "text": "史图依克守护之心"
}, },
"usetype": 6, "usetype": 3,
"color": 2, "color": 2,
"bagtype": 0, "bagtype": 0,
"index": 99, "index": 99,
@ -4976,7 +4976,7 @@
"key": "item_item_name_153", "key": "item_item_name_153",
"text": "大龙守护之心" "text": "大龙守护之心"
}, },
"usetype": 6, "usetype": 3,
"color": 2, "color": 2,
"bagtype": 0, "bagtype": 0,
"index": 99, "index": 99,
@ -5015,7 +5015,7 @@
"key": "item_item_name_154", "key": "item_item_name_154",
"text": "亚丝翠守护之心" "text": "亚丝翠守护之心"
}, },
"usetype": 6, "usetype": 3,
"color": 2, "color": 2,
"bagtype": 0, "bagtype": 0,
"index": 99, "index": 99,
@ -5054,7 +5054,7 @@
"key": "item_item_name_155", "key": "item_item_name_155",
"text": "克莱尔·努涅斯守护之心" "text": "克莱尔·努涅斯守护之心"
}, },
"usetype": 6, "usetype": 3,
"color": 2, "color": 2,
"bagtype": 0, "bagtype": 0,
"index": 99, "index": 99,
@ -5093,7 +5093,7 @@
"key": "item_item_name_156", "key": "item_item_name_156",
"text": "鹤大师守护之心" "text": "鹤大师守护之心"
}, },
"usetype": 6, "usetype": 3,
"color": 2, "color": 2,
"bagtype": 0, "bagtype": 0,
"index": 99, "index": 99,
@ -5132,7 +5132,7 @@
"key": "item_item_name_157", "key": "item_item_name_157",
"text": "布兰奇守护之心" "text": "布兰奇守护之心"
}, },
"usetype": 6, "usetype": 3,
"color": 2, "color": 2,
"bagtype": 0, "bagtype": 0,
"index": 99, "index": 99,
@ -5171,7 +5171,7 @@
"key": "item_item_name_158", "key": "item_item_name_158",
"text": "格里斯特王子守护之心" "text": "格里斯特王子守护之心"
}, },
"usetype": 6, "usetype": 3,
"color": 2, "color": 2,
"bagtype": 0, "bagtype": 0,
"index": 99, "index": 99,
@ -5210,7 +5210,7 @@
"key": "item_item_name_159", "key": "item_item_name_159",
"text": "吉姆·莱克守护之心" "text": "吉姆·莱克守护之心"
}, },
"usetype": 6, "usetype": 3,
"color": 2, "color": 2,
"bagtype": 0, "bagtype": 0,
"index": 99, "index": 99,
@ -5249,7 +5249,7 @@
"key": "item_item_name_160", "key": "item_item_name_160",
"text": "船长守护之心" "text": "船长守护之心"
}, },
"usetype": 6, "usetype": 3,
"color": 2, "color": 2,
"bagtype": 0, "bagtype": 0,
"index": 99, "index": 99,
@ -5288,7 +5288,7 @@
"key": "item_item_name_161", "key": "item_item_name_161",
"text": "希沙窦斯守护之心" "text": "希沙窦斯守护之心"
}, },
"usetype": 6, "usetype": 3,
"color": 2, "color": 2,
"bagtype": 0, "bagtype": 0,
"index": 99, "index": 99,
@ -5327,7 +5327,7 @@
"key": "item_item_name_162", "key": "item_item_name_162",
"text": "小欧守护之心" "text": "小欧守护之心"
}, },
"usetype": 6, "usetype": 3,
"color": 2, "color": 2,
"bagtype": 0, "bagtype": 0,
"index": 99, "index": 99,
@ -5366,7 +5366,7 @@
"key": "item_item_name_163", "key": "item_item_name_163",
"text": "斯梅克船长守护之心" "text": "斯梅克船长守护之心"
}, },
"usetype": 6, "usetype": 3,
"color": 2, "color": 2,
"bagtype": 0, "bagtype": 0,
"index": 99, "index": 99,
@ -5405,7 +5405,7 @@
"key": "item_item_name_164", "key": "item_item_name_164",
"text": "警卫队长守护之心" "text": "警卫队长守护之心"
}, },
"usetype": 6, "usetype": 3,
"color": 2, "color": 2,
"bagtype": 0, "bagtype": 0,
"index": 99, "index": 99,
@ -5444,7 +5444,7 @@
"key": "item_item_name_165", "key": "item_item_name_165",
"text": "黛塔黛恩守护之心" "text": "黛塔黛恩守护之心"
}, },
"usetype": 6, "usetype": 3,
"color": 2, "color": 2,
"bagtype": 0, "bagtype": 0,
"index": 99, "index": 99,
@ -5483,7 +5483,7 @@
"key": "item_item_name_166", "key": "item_item_name_166",
"text": "吉姆·普雷斯科特守护之心" "text": "吉姆·普雷斯科特守护之心"
}, },
"usetype": 6, "usetype": 3,
"color": 2, "color": 2,
"bagtype": 0, "bagtype": 0,
"index": 99, "index": 99,
@ -5522,7 +5522,7 @@
"key": "item_item_name_167", "key": "item_item_name_167",
"text": "警长守护之心" "text": "警长守护之心"
}, },
"usetype": 6, "usetype": 3,
"color": 2, "color": 2,
"bagtype": 0, "bagtype": 0,
"index": 99, "index": 99,
@ -5561,7 +5561,7 @@
"key": "item_item_name_168", "key": "item_item_name_168",
"text": "牙仙守护之心" "text": "牙仙守护之心"
}, },
"usetype": 6, "usetype": 3,
"color": 2, "color": 2,
"bagtype": 0, "bagtype": 0,
"index": 99, "index": 99,
@ -5600,7 +5600,7 @@
"key": "item_item_name_169", "key": "item_item_name_169",
"text": "睡神沙人守护之心" "text": "睡神沙人守护之心"
}, },
"usetype": 6, "usetype": 3,
"color": 2, "color": 2,
"bagtype": 0, "bagtype": 0,
"index": 99, "index": 99,
@ -5639,7 +5639,7 @@
"key": "item_item_name_170", "key": "item_item_name_170",
"text": "邦尼兔守护之心" "text": "邦尼兔守护之心"
}, },
"usetype": 6, "usetype": 3,
"color": 2, "color": 2,
"bagtype": 0, "bagtype": 0,
"index": 99, "index": 99,
@ -5678,7 +5678,7 @@
"key": "item_item_name_171", "key": "item_item_name_171",
"text": "金猴守护之心" "text": "金猴守护之心"
}, },
"usetype": 6, "usetype": 3,
"color": 2, "color": 2,
"bagtype": 0, "bagtype": 0,
"index": 99, "index": 99,
@ -5717,7 +5717,7 @@
"key": "item_item_name_172", "key": "item_item_name_172",
"text": "凯尔守护之心" "text": "凯尔守护之心"
}, },
"usetype": 6, "usetype": 3,
"color": 2, "color": 2,
"bagtype": 0, "bagtype": 0,
"index": 99, "index": 99,
@ -5756,7 +5756,7 @@
"key": "item_item_name_173", "key": "item_item_name_173",
"text": "小钱守护之心" "text": "小钱守护之心"
}, },
"usetype": 6, "usetype": 3,
"color": 2, "color": 2,
"bagtype": 0, "bagtype": 0,
"index": 99, "index": 99,
@ -5795,7 +5795,7 @@
"key": "item_item_name_174", "key": "item_item_name_174",
"text": "暴芙那特守护之心" "text": "暴芙那特守护之心"
}, },
"usetype": 6, "usetype": 3,
"color": 2, "color": 2,
"bagtype": 0, "bagtype": 0,
"index": 99, "index": 99,
@ -5834,7 +5834,7 @@
"key": "item_item_name_175", "key": "item_item_name_175",
"text": "云朵先生守护之心" "text": "云朵先生守护之心"
}, },
"usetype": 6, "usetype": 3,
"color": 2, "color": 2,
"bagtype": 0, "bagtype": 0,
"index": 99, "index": 99,
@ -5873,7 +5873,7 @@
"key": "item_item_name_176", "key": "item_item_name_176",
"text": "阿宝守护之心" "text": "阿宝守护之心"
}, },
"usetype": 6, "usetype": 3,
"color": 2, "color": 2,
"bagtype": 0, "bagtype": 0,
"index": 99, "index": 99,
@ -5912,7 +5912,7 @@
"key": "item_item_name_177", "key": "item_item_name_177",
"text": "沃尔夫先生守护之心" "text": "沃尔夫先生守护之心"
}, },
"usetype": 6, "usetype": 3,
"color": 2, "color": 2,
"bagtype": 0, "bagtype": 0,
"index": 99, "index": 99,
@ -5951,7 +5951,7 @@
"key": "item_item_name_178", "key": "item_item_name_178",
"text": "羊仙姑守护之心" "text": "羊仙姑守护之心"
}, },
"usetype": 6, "usetype": 3,
"color": 2, "color": 2,
"bagtype": 0, "bagtype": 0,
"index": 99, "index": 99,
@ -5990,7 +5990,7 @@
"key": "item_item_name_179", "key": "item_item_name_179",
"text": "波比守护之心" "text": "波比守护之心"
}, },
"usetype": 6, "usetype": 3,
"color": 2, "color": 2,
"bagtype": 0, "bagtype": 0,
"index": 99, "index": 99,
@ -6029,7 +6029,7 @@
"key": "item_item_name_180", "key": "item_item_name_180",
"text": "巫嘎守护之心" "text": "巫嘎守护之心"
}, },
"usetype": 6, "usetype": 3,
"color": 2, "color": 2,
"bagtype": 0, "bagtype": 0,
"index": 99, "index": 99,
@ -6068,7 +6068,7 @@
"key": "item_item_name_181", "key": "item_item_name_181",
"text": "坦克守护之心" "text": "坦克守护之心"
}, },
"usetype": 6, "usetype": 3,
"color": 2, "color": 2,
"bagtype": 0, "bagtype": 0,
"index": 99, "index": 99,
@ -6107,7 +6107,7 @@
"key": "item_item_name_182", "key": "item_item_name_182",
"text": "胡德先生守护之心" "text": "胡德先生守护之心"
}, },
"usetype": 6, "usetype": 3,
"color": 2, "color": 2,
"bagtype": 0, "bagtype": 0,
"index": 99, "index": 99,
@ -6146,7 +6146,7 @@
"key": "item_item_name_183", "key": "item_item_name_183",
"text": "普鲁格兰杰守护之心" "text": "普鲁格兰杰守护之心"
}, },
"usetype": 6, "usetype": 3,
"color": 2, "color": 2,
"bagtype": 0, "bagtype": 0,
"index": 99, "index": 99,
@ -6185,7 +6185,7 @@
"key": "item_item_name_184", "key": "item_item_name_184",
"text": "鼻涕粗守护之心" "text": "鼻涕粗守护之心"
}, },
"usetype": 6, "usetype": 3,
"color": 2, "color": 2,
"bagtype": 0, "bagtype": 0,
"index": 99, "index": 99,
@ -6224,7 +6224,7 @@
"key": "item_item_name_185", "key": "item_item_name_185",
"text": "珍妮丝·邓普顿守护之心" "text": "珍妮丝·邓普顿守护之心"
}, },
"usetype": 6, "usetype": 3,
"color": 2, "color": 2,
"bagtype": 0, "bagtype": 0,
"index": 99, "index": 99,
@ -6263,7 +6263,7 @@
"key": "item_item_name_186", "key": "item_item_name_186",
"text": "贫嘴驴守护之心" "text": "贫嘴驴守护之心"
}, },
"usetype": 6, "usetype": 3,
"color": 2, "color": 2,
"bagtype": 0, "bagtype": 0,
"index": 99, "index": 99,
@ -6302,7 +6302,7 @@
"key": "item_item_name_187", "key": "item_item_name_187",
"text": "蒂姆·邓普顿守护之心" "text": "蒂姆·邓普顿守护之心"
}, },
"usetype": 6, "usetype": 3,
"color": 2, "color": 2,
"bagtype": 0, "bagtype": 0,
"index": 99, "index": 99,
@ -6341,7 +6341,7 @@
"key": "item_item_name_188", "key": "item_item_name_188",
"text": "圣诞老人守护之心" "text": "圣诞老人守护之心"
}, },
"usetype": 6, "usetype": 3,
"color": 2, "color": 2,
"bagtype": 0, "bagtype": 0,
"index": 99, "index": 99,
@ -6380,7 +6380,7 @@
"key": "item_item_name_189", "key": "item_item_name_189",
"text": "瓜哥守护之心" "text": "瓜哥守护之心"
}, },
"usetype": 6, "usetype": 3,
"color": 2, "color": 2,
"bagtype": 0, "bagtype": 0,
"index": 99, "index": 99,
@ -6419,7 +6419,7 @@
"key": "item_item_name_190", "key": "item_item_name_190",
"text": "沃尔特·史翠克勒守护之心" "text": "沃尔特·史翠克勒守护之心"
}, },
"usetype": 6, "usetype": 3,
"color": 2, "color": 2,
"bagtype": 0, "bagtype": 0,
"index": 99, "index": 99,
@ -6458,7 +6458,7 @@
"key": "item_item_name_191", "key": "item_item_name_191",
"text": "冰霜杰克守护之心" "text": "冰霜杰克守护之心"
}, },
"usetype": 6, "usetype": 3,
"color": 2, "color": 2,
"bagtype": 0, "bagtype": 0,
"index": 99, "index": 99,
@ -6497,7 +6497,7 @@
"key": "item_item_name_192", "key": "item_item_name_192",
"text": "菲奥娜守护之心" "text": "菲奥娜守护之心"
}, },
"usetype": 6, "usetype": 3,
"color": 2, "color": 2,
"bagtype": 0, "bagtype": 0,
"index": 99, "index": 99,
@ -6536,7 +6536,7 @@
"key": "item_item_name_193", "key": "item_item_name_193",
"text": "悍夫那特守护之心" "text": "悍夫那特守护之心"
}, },
"usetype": 6, "usetype": 3,
"color": 2, "color": 2,
"bagtype": 0, "bagtype": 0,
"index": 99, "index": 99,
@ -6575,7 +6575,7 @@
"key": "item_item_name_194", "key": "item_item_name_194",
"text": "师父守护之心" "text": "师父守护之心"
}, },
"usetype": 6, "usetype": 3,
"color": 2, "color": 2,
"bagtype": 0, "bagtype": 0,
"index": 99, "index": 99,
@ -6614,7 +6614,7 @@
"key": "item_item_name_195", "key": "item_item_name_195",
"text": "希卡普守护之心" "text": "希卡普守护之心"
}, },
"usetype": 6, "usetype": 3,
"color": 2, "color": 2,
"bagtype": 0, "bagtype": 0,
"index": 99, "index": 99,
@ -6653,7 +6653,7 @@
"key": "item_item_name_196", "key": "item_item_name_196",
"text": "漆黑守护之心" "text": "漆黑守护之心"
}, },
"usetype": 6, "usetype": 3,
"color": 2, "color": 2,
"bagtype": 0, "bagtype": 0,
"index": 99, "index": 99,
@ -6692,7 +6692,7 @@
"key": "item_item_name_197", "key": "item_item_name_197",
"text": "黛安·福克斯顿守护之心" "text": "黛安·福克斯顿守护之心"
}, },
"usetype": 6, "usetype": 3,
"color": 2, "color": 2,
"bagtype": 0, "bagtype": 0,
"index": 99, "index": 99,
@ -6731,7 +6731,7 @@
"key": "item_item_name_198", "key": "item_item_name_198",
"text": "幸运·普雷斯科特守护之心" "text": "幸运·普雷斯科特守护之心"
}, },
"usetype": 6, "usetype": 3,
"color": 2, "color": 2,
"bagtype": 0, "bagtype": 0,
"index": 99, "index": 99,
@ -6770,7 +6770,7 @@
"key": "item_item_name_199", "key": "item_item_name_199",
"text": "平先生守护之心" "text": "平先生守护之心"
}, },
"usetype": 6, "usetype": 3,
"color": 2, "color": 2,
"bagtype": 0, "bagtype": 0,
"index": 99, "index": 99,
@ -6809,7 +6809,7 @@
"key": "item_item_name_200", "key": "item_item_name_200",
"text": "阿比盖尔·斯通守护之心" "text": "阿比盖尔·斯通守护之心"
}, },
"usetype": 6, "usetype": 3,
"color": 2, "color": 2,
"bagtype": 0, "bagtype": 0,
"index": 99, "index": 99,
@ -6848,7 +6848,7 @@
"key": "item_item_name_201", "key": "item_item_name_201",
"text": "果酱教授守护之心" "text": "果酱教授守护之心"
}, },
"usetype": 6, "usetype": 3,
"color": 2, "color": 2,
"bagtype": 0, "bagtype": 0,
"index": 99, "index": 99,
@ -6887,7 +6887,7 @@
"key": "item_item_name_202", "key": "item_item_name_202",
"text": "史蒂夫·帕丘克守护之心" "text": "史蒂夫·帕丘克守护之心"
}, },
"usetype": 6, "usetype": 3,
"color": 2, "color": 2,
"bagtype": 0, "bagtype": 0,
"index": 99, "index": 99,
@ -6926,7 +6926,7 @@
"key": "item_item_name_203", "key": "item_item_name_203",
"text": "姜饼人守护之心" "text": "姜饼人守护之心"
}, },
"usetype": 6, "usetype": 3,
"color": 2, "color": 2,
"bagtype": 0, "bagtype": 0,
"index": 99, "index": 99,
@ -6965,7 +6965,7 @@
"key": "item_item_name_204", "key": "item_item_name_204",
"text": "瓦希尔指挥官守护之心" "text": "瓦希尔指挥官守护之心"
}, },
"usetype": 6, "usetype": 3,
"color": 2, "color": 2,
"bagtype": 0, "bagtype": 0,
"index": 99, "index": 99,
@ -7004,7 +7004,7 @@
"key": "item_item_name_205", "key": "item_item_name_205",
"text": "布里奇特守护之心" "text": "布里奇特守护之心"
}, },
"usetype": 6, "usetype": 3,
"color": 2, "color": 2,
"bagtype": 0, "bagtype": 0,
"index": 99, "index": 99,
@ -7043,7 +7043,7 @@
"key": "item_item_name_206", "key": "item_item_name_206",
"text": "戈伯守护之心" "text": "戈伯守护之心"
}, },
"usetype": 6, "usetype": 3,
"color": 2, "color": 2,
"bagtype": 0, "bagtype": 0,
"index": 99, "index": 99,
@ -7082,7 +7082,7 @@
"key": "item_item_name_207", "key": "item_item_name_207",
"text": "美肚鲨守护之心" "text": "美肚鲨守护之心"
}, },
"usetype": 6, "usetype": 3,
"color": 2, "color": 2,
"bagtype": 0, "bagtype": 0,
"index": 99, "index": 99,
@ -7121,7 +7121,7 @@
"key": "item_item_name_208", "key": "item_item_name_208",
"text": "蛇先生守护之心" "text": "蛇先生守护之心"
}, },
"usetype": 6, "usetype": 3,
"color": 2, "color": 2,
"bagtype": 0, "bagtype": 0,
"index": 99, "index": 99,
@ -7160,7 +7160,7 @@
"key": "item_item_name_209", "key": "item_item_name_209",
"text": "匹诺曹守护之心" "text": "匹诺曹守护之心"
}, },
"usetype": 6, "usetype": 3,
"color": 2, "color": 2,
"bagtype": 0, "bagtype": 0,
"index": 99, "index": 99,
@ -7199,7 +7199,7 @@
"key": "item_item_name_210", "key": "item_item_name_210",
"text": "骇客蛛守护之心" "text": "骇客蛛守护之心"
}, },
"usetype": 6, "usetype": 3,
"color": 2, "color": 2,
"bagtype": 0, "bagtype": 0,
"index": 99, "index": 99,
@ -7238,7 +7238,7 @@
"key": "item_item_name_211", "key": "item_item_name_211",
"text": "悍娇虎守护之心" "text": "悍娇虎守护之心"
}, },
"usetype": 6, "usetype": 3,
"color": 2, "color": 2,
"bagtype": 0, "bagtype": 0,
"index": 99, "index": 99,
@ -7277,7 +7277,7 @@
"key": "item_item_name_212", "key": "item_item_name_212",
"text": "乌龟大师守护之心" "text": "乌龟大师守护之心"
}, },
"usetype": 6, "usetype": 3,
"color": 2, "color": 2,
"bagtype": 0, "bagtype": 0,
"index": 99, "index": 99,
@ -7316,7 +7316,7 @@
"key": "item_item_name_213", "key": "item_item_name_213",
"text": "梅林守护之心" "text": "梅林守护之心"
}, },
"usetype": 6, "usetype": 3,
"color": 2, "color": 2,
"bagtype": 0, "bagtype": 0,
"index": 99, "index": 99,
@ -7355,7 +7355,7 @@
"key": "item_item_name_214", "key": "item_item_name_214",
"text": "盖守护之心" "text": "盖守护之心"
}, },
"usetype": 6, "usetype": 3,
"color": 2, "color": 2,
"bagtype": 0, "bagtype": 0,
"index": 99, "index": 99,
@ -7394,7 +7394,7 @@
"key": "item_item_name_215", "key": "item_item_name_215",
"text": "穿靴子的猫守护之心" "text": "穿靴子的猫守护之心"
}, },
"usetype": 6, "usetype": 3,
"color": 2, "color": 2,
"bagtype": 0, "bagtype": 0,
"index": 99, "index": 99,
@ -7433,7 +7433,7 @@
"key": "item_item_name_216", "key": "item_item_name_216",
"text": "小伊守护之心" "text": "小伊守护之心"
}, },
"usetype": 6, "usetype": 3,
"color": 2, "color": 2,
"bagtype": 0, "bagtype": 0,
"index": 99, "index": 99,
@ -7472,7 +7472,7 @@
"key": "item_item_name_217", "key": "item_item_name_217",
"text": "亚力克斯守护之心" "text": "亚力克斯守护之心"
}, },
"usetype": 6, "usetype": 3,
"color": 2, "color": 2,
"bagtype": 0, "bagtype": 0,
"index": 99, "index": 99,
@ -8168,7 +8168,7 @@
"key": "item_item_name_260", "key": "item_item_name_260",
"text": "热火药剂" "text": "热火药剂"
}, },
"usetype": 6, "usetype": 3,
"color": 1, "color": 1,
"bagtype": 1, "bagtype": 1,
"index": 1, "index": 1,
@ -8213,7 +8213,7 @@
"key": "item_item_name_261", "key": "item_item_name_261",
"text": "冷水药剂" "text": "冷水药剂"
}, },
"usetype": 6, "usetype": 3,
"color": 1, "color": 1,
"bagtype": 1, "bagtype": 1,
"index": 1, "index": 1,
@ -8258,7 +8258,7 @@
"key": "item_item_name_262", "key": "item_item_name_262",
"text": "古木药剂" "text": "古木药剂"
}, },
"usetype": 6, "usetype": 3,
"color": 1, "color": 1,
"bagtype": 1, "bagtype": 1,
"index": 1, "index": 1,
@ -8303,7 +8303,7 @@
"key": "item_item_name_263", "key": "item_item_name_263",
"text": "微尘药剂" "text": "微尘药剂"
}, },
"usetype": 6, "usetype": 3,
"color": 1, "color": 1,
"bagtype": 1, "bagtype": 1,
"index": 1, "index": 1,
@ -8348,7 +8348,7 @@
"key": "item_item_name_264", "key": "item_item_name_264",
"text": "烈焰精华" "text": "烈焰精华"
}, },
"usetype": 6, "usetype": 3,
"color": 2, "color": 2,
"bagtype": 1, "bagtype": 1,
"index": 1, "index": 1,
@ -8399,7 +8399,7 @@
"key": "item_item_name_265", "key": "item_item_name_265",
"text": "凝露精华" "text": "凝露精华"
}, },
"usetype": 6, "usetype": 3,
"color": 2, "color": 2,
"bagtype": 1, "bagtype": 1,
"index": 1, "index": 1,
@ -8450,7 +8450,7 @@
"key": "item_item_name_266", "key": "item_item_name_266",
"text": "荆棘精华" "text": "荆棘精华"
}, },
"usetype": 6, "usetype": 3,
"color": 2, "color": 2,
"bagtype": 1, "bagtype": 1,
"index": 1, "index": 1,
@ -8501,7 +8501,7 @@
"key": "item_item_name_267", "key": "item_item_name_267",
"text": "曙光精华" "text": "曙光精华"
}, },
"usetype": 6, "usetype": 3,
"color": 2, "color": 2,
"bagtype": 1, "bagtype": 1,
"index": 1, "index": 1,
@ -8552,7 +8552,7 @@
"key": "item_item_name_268", "key": "item_item_name_268",
"text": "爆炸神水" "text": "爆炸神水"
}, },
"usetype": 6, "usetype": 3,
"color": 3, "color": 3,
"bagtype": 1, "bagtype": 1,
"index": 1, "index": 1,
@ -8597,7 +8597,7 @@
"key": "item_item_name_269", "key": "item_item_name_269",
"text": "深渊神水" "text": "深渊神水"
}, },
"usetype": 6, "usetype": 3,
"color": 3, "color": 3,
"bagtype": 1, "bagtype": 1,
"index": 1, "index": 1,
@ -8642,7 +8642,7 @@
"key": "item_item_name_270", "key": "item_item_name_270",
"text": "魔森神水" "text": "魔森神水"
}, },
"usetype": 6, "usetype": 3,
"color": 3, "color": 3,
"bagtype": 1, "bagtype": 1,
"index": 1, "index": 1,
@ -8687,7 +8687,7 @@
"key": "item_item_name_271", "key": "item_item_name_271",
"text": "秘境神水" "text": "秘境神水"
}, },
"usetype": 6, "usetype": 3,
"color": 3, "color": 3,
"bagtype": 1, "bagtype": 1,
"index": 1, "index": 1,

5
bin/json/game_skillafteratk.json
View File

@ -19702,9 +19702,10 @@
4, 4,
2100 2100
], ],
"FollowSK": [], "FollowSK": [
224001212
],
"SucFollowSK": [ "SucFollowSK": [
224001212,
224001213 224001213
], ],
"FailFollowSK": [], "FailFollowSK": [],

132
bin/json/game_skillatk.json
View File

@ -9365,7 +9365,7 @@
"key": "skill_skill_atk_Name_134008111", "key": "skill_skill_atk_Name_134008111",
"text": "同气连枝" "text": "同气连枝"
}, },
"ico": "jn_icon_054", "ico": "jn_34008_1",
"CorrectPos": 0, "CorrectPos": 0,
"IsMelee": 0, "IsMelee": 0,
"act": "Skill_1", "act": "Skill_1",
@ -9395,7 +9395,7 @@
"key": "skill_skill_atk_Name_134008211", "key": "skill_skill_atk_Name_134008211",
"text": "震慑回马扫" "text": "震慑回马扫"
}, },
"ico": "jn_icon_055", "ico": "jn_34008_2",
"CorrectPos": 0, "CorrectPos": 0,
"IsMelee": 1, "IsMelee": 1,
"act": "Skill_2", "act": "Skill_2",
@ -9427,7 +9427,7 @@
"key": "skill_skill_atk_Name_134008311", "key": "skill_skill_atk_Name_134008311",
"text": "疾风之矛" "text": "疾风之矛"
}, },
"ico": "jn_icon_056", "ico": "jn_34008_3",
"CorrectPos": 0, "CorrectPos": 0,
"IsMelee": 1, "IsMelee": 1,
"act": "Skill_3", "act": "Skill_3",
@ -9609,7 +9609,7 @@
"key": "skill_skill_atk_Name_143002111", "key": "skill_skill_atk_Name_143002111",
"text": "欺诈子弹" "text": "欺诈子弹"
}, },
"ico": "jn_icon_054", "ico": "jn_43002_1",
"CorrectPos": 0, "CorrectPos": 0,
"IsMelee": 0, "IsMelee": 0,
"act": "Skill_1", "act": "Skill_1",
@ -9640,7 +9640,7 @@
"key": "skill_skill_atk_Name_143002211", "key": "skill_skill_atk_Name_143002211",
"text": "诡计注视" "text": "诡计注视"
}, },
"ico": "jn_icon_055", "ico": "jn_43002_2",
"CorrectPos": 0, "CorrectPos": 0,
"IsMelee": 0, "IsMelee": 0,
"act": "Skill_2", "act": "Skill_2",
@ -9672,7 +9672,7 @@
"key": "skill_skill_atk_Name_143002311", "key": "skill_skill_atk_Name_143002311",
"text": "伪善之光" "text": "伪善之光"
}, },
"ico": "jn_icon_056", "ico": "jn_43002_3",
"CorrectPos": 0, "CorrectPos": 0,
"IsMelee": 0, "IsMelee": 0,
"act": "Skill_3", "act": "Skill_3",
@ -10305,7 +10305,7 @@
"key": "skill_skill_atk_Name_113004111", "key": "skill_skill_atk_Name_113004111",
"text": "乘胜追击" "text": "乘胜追击"
}, },
"ico": "jn_icon_054", "ico": "jn_13004_1",
"CorrectPos": 0, "CorrectPos": 0,
"IsMelee": 1, "IsMelee": 1,
"act": "Skill_1", "act": "Skill_1",
@ -10335,7 +10335,7 @@
"key": "skill_skill_atk_Name_113004211", "key": "skill_skill_atk_Name_113004211",
"text": "贵胄荣誉" "text": "贵胄荣誉"
}, },
"ico": "jn_icon_055", "ico": "jn_13004_2",
"CorrectPos": 0, "CorrectPos": 0,
"IsMelee": 1, "IsMelee": 1,
"act": "Skill_2", "act": "Skill_2",
@ -10368,7 +10368,7 @@
"key": "skill_skill_atk_Name_113004311", "key": "skill_skill_atk_Name_113004311",
"text": "皇族审判" "text": "皇族审判"
}, },
"ico": "jn_icon_056", "ico": "jn_13004_3",
"CorrectPos": 0, "CorrectPos": 0,
"IsMelee": 0, "IsMelee": 0,
"act": "Skill_3", "act": "Skill_3",
@ -10520,7 +10520,7 @@
"key": "skill_skill_atk_Name_143001111", "key": "skill_skill_atk_Name_143001111",
"text": "乐园之果" "text": "乐园之果"
}, },
"ico": "jn_icon_054", "ico": "jn_43001_1",
"CorrectPos": 0, "CorrectPos": 0,
"IsMelee": 0, "IsMelee": 0,
"act": "Skill_1", "act": "Skill_1",
@ -10551,7 +10551,7 @@
"key": "skill_skill_atk_Name_143001211", "key": "skill_skill_atk_Name_143001211",
"text": "牧场草长" "text": "牧场草长"
}, },
"ico": "jn_icon_055", "ico": "jn_43001_2",
"CorrectPos": 0, "CorrectPos": 0,
"IsMelee": 0, "IsMelee": 0,
"act": "Skill_2", "act": "Skill_2",
@ -10582,7 +10582,7 @@
"key": "skill_skill_atk_Name_143001311", "key": "skill_skill_atk_Name_143001311",
"text": "默契乐章" "text": "默契乐章"
}, },
"ico": "jn_icon_056", "ico": "jn_43001_3",
"CorrectPos": 0, "CorrectPos": 0,
"IsMelee": 0, "IsMelee": 0,
"act": "Skill_3", "act": "Skill_3",
@ -10643,7 +10643,7 @@
"key": "skill_skill_atk_Name_134003111", "key": "skill_skill_atk_Name_134003111",
"text": "糖果刀光" "text": "糖果刀光"
}, },
"ico": "jn_icon_054", "ico": "jn_34003_1",
"CorrectPos": 0, "CorrectPos": 0,
"IsMelee": 1, "IsMelee": 1,
"act": "Skill_1", "act": "Skill_1",
@ -10674,7 +10674,7 @@
"key": "skill_skill_atk_Name_134003211", "key": "skill_skill_atk_Name_134003211",
"text": "诺斯本色" "text": "诺斯本色"
}, },
"ico": "jn_icon_055", "ico": "jn_34003_2",
"CorrectPos": 0, "CorrectPos": 0,
"IsMelee": 1, "IsMelee": 1,
"act": "Skill_2", "act": "Skill_2",
@ -10705,7 +10705,7 @@
"key": "skill_skill_atk_Name_134003311", "key": "skill_skill_atk_Name_134003311",
"text": "圣诞前夜" "text": "圣诞前夜"
}, },
"ico": "jn_icon_056", "ico": "jn_34003_3",
"CorrectPos": 0, "CorrectPos": 0,
"IsMelee": 1, "IsMelee": 1,
"act": "Skill_3", "act": "Skill_3",
@ -10984,7 +10984,7 @@
"key": "skill_skill_atk_Name_143006111", "key": "skill_skill_atk_Name_143006111",
"text": "轮滑冲锋" "text": "轮滑冲锋"
}, },
"ico": "jn_icon_054", "ico": "jn_43006_1",
"CorrectPos": 0, "CorrectPos": 0,
"IsMelee": 1, "IsMelee": 1,
"act": "Skill_1", "act": "Skill_1",
@ -11015,7 +11015,7 @@
"key": "skill_skill_atk_Name_143006211", "key": "skill_skill_atk_Name_143006211",
"text": "真挚友谊" "text": "真挚友谊"
}, },
"ico": "jn_icon_055", "ico": "jn_43006_2",
"CorrectPos": 0, "CorrectPos": 0,
"IsMelee": 0, "IsMelee": 0,
"act": "Skill_2", "act": "Skill_2",
@ -11047,14 +11047,14 @@
"key": "skill_skill_atk_Name_143006311", "key": "skill_skill_atk_Name_143006311",
"text": "粉红旋舞" "text": "粉红旋舞"
}, },
"ico": "jn_icon_056", "ico": "jn_43006_3",
"CorrectPos": 0, "CorrectPos": 0,
"IsMelee": 0, "IsMelee": 0,
"act": "Skill_3", "act": "Skill_3",
"Type": 1, "Type": 1,
"CD": 3, "CD": 3,
"Where": [], "Where": [],
"Target": 1, "Target": 0,
"ChildSkill": { "ChildSkill": {
"Id": [ "Id": [
243006311, 243006311,
@ -11109,7 +11109,7 @@
"key": "skill_skill_atk_Name_113001111", "key": "skill_skill_atk_Name_113001111",
"text": "眩晕光圈" "text": "眩晕光圈"
}, },
"ico": "jn_icon_054", "ico": "jn_13001_1",
"CorrectPos": 0, "CorrectPos": 0,
"IsMelee": 0, "IsMelee": 0,
"act": "Skill_1", "act": "Skill_1",
@ -11140,7 +11140,7 @@
"key": "skill_skill_atk_Name_113001211", "key": "skill_skill_atk_Name_113001211",
"text": "蔑视法球" "text": "蔑视法球"
}, },
"ico": "jn_icon_055", "ico": "jn_13001_2",
"CorrectPos": 0, "CorrectPos": 0,
"IsMelee": 0, "IsMelee": 0,
"act": "Skill_2", "act": "Skill_2",
@ -11169,7 +11169,7 @@
"key": "skill_skill_atk_Name_113001311", "key": "skill_skill_atk_Name_113001311",
"text": "无惧锁链" "text": "无惧锁链"
}, },
"ico": "jn_icon_056", "ico": "jn_13001_3",
"CorrectPos": 0, "CorrectPos": 0,
"IsMelee": 0, "IsMelee": 0,
"act": "Skill_3", "act": "Skill_3",
@ -12020,7 +12020,7 @@
"key": "skill_skill_atk_Name_124001111", "key": "skill_skill_atk_Name_124001111",
"text": "正义之才" "text": "正义之才"
}, },
"ico": "jn_icon_054", "ico": "jn_24001_1",
"CorrectPos": 0, "CorrectPos": 0,
"IsMelee": 1, "IsMelee": 1,
"act": "Skill_1", "act": "Skill_1",
@ -12050,7 +12050,7 @@
"key": "skill_skill_atk_Name_124001211", "key": "skill_skill_atk_Name_124001211",
"text": "枪弹镣铐" "text": "枪弹镣铐"
}, },
"ico": "jn_icon_055", "ico": "jn_24001_2",
"CorrectPos": 0, "CorrectPos": 0,
"IsMelee": 0, "IsMelee": 0,
"act": "Skill_2", "act": "Skill_2",
@ -12079,7 +12079,7 @@
"key": "skill_skill_atk_Name_124001311", "key": "skill_skill_atk_Name_124001311",
"text": "暴风飞车" "text": "暴风飞车"
}, },
"ico": "jn_icon_056", "ico": "jn_24001_3",
"CorrectPos": 0, "CorrectPos": 0,
"IsMelee": 1, "IsMelee": 1,
"act": "Skill_3", "act": "Skill_3",
@ -12225,7 +12225,7 @@
"key": "skill_skill_atk_Name_133002111", "key": "skill_skill_atk_Name_133002111",
"text": "蚀骨之钉" "text": "蚀骨之钉"
}, },
"ico": "jn_icon_054", "ico": "jn_33002_1",
"CorrectPos": 0, "CorrectPos": 0,
"IsMelee": 0, "IsMelee": 0,
"act": "Skill_1", "act": "Skill_1",
@ -12256,7 +12256,7 @@
"key": "skill_skill_atk_Name_133002211", "key": "skill_skill_atk_Name_133002211",
"text": "清醒拍击" "text": "清醒拍击"
}, },
"ico": "jn_icon_055", "ico": "jn_33002_2",
"CorrectPos": 0, "CorrectPos": 0,
"IsMelee": 1, "IsMelee": 1,
"act": "Skill_2", "act": "Skill_2",
@ -12288,7 +12288,7 @@
"key": "skill_skill_atk_Name_133002311", "key": "skill_skill_atk_Name_133002311",
"text": "搏命飞弹" "text": "搏命飞弹"
}, },
"ico": "jn_icon_056", "ico": "jn_33002_3",
"CorrectPos": 0, "CorrectPos": 0,
"IsMelee": 1, "IsMelee": 1,
"act": "Skill_3", "act": "Skill_3",
@ -12317,7 +12317,7 @@
"key": "skill_skill_atk_Name_155004111", "key": "skill_skill_atk_Name_155004111",
"text": "锋利菜刀" "text": "锋利菜刀"
}, },
"ico": "jn_icon_054", "ico": "jn_55004_1",
"CorrectPos": 0, "CorrectPos": 0,
"IsMelee": 0, "IsMelee": 0,
"act": "Skill_1", "act": "Skill_1",
@ -12346,7 +12346,7 @@
"key": "skill_skill_atk_Name_155004211", "key": "skill_skill_atk_Name_155004211",
"text": "凶恶恐吓" "text": "凶恶恐吓"
}, },
"ico": "jn_icon_055", "ico": "jn_55004_2",
"CorrectPos": 0, "CorrectPos": 0,
"IsMelee": 0, "IsMelee": 0,
"act": "Skill_2", "act": "Skill_2",
@ -12376,7 +12376,7 @@
"key": "skill_skill_atk_Name_155004311", "key": "skill_skill_atk_Name_155004311",
"text": "火焰喷发" "text": "火焰喷发"
}, },
"ico": "jn_icon_056", "ico": "jn_55004_3",
"CorrectPos": 0, "CorrectPos": 0,
"IsMelee": 0, "IsMelee": 0,
"act": "Skill_3", "act": "Skill_3",
@ -12494,7 +12494,7 @@
"key": "skill_skill_atk_Name_155003111", "key": "skill_skill_atk_Name_155003111",
"text": "海盘车" "text": "海盘车"
}, },
"ico": "jn_icon_054", "ico": "jn_55003_1",
"CorrectPos": 0, "CorrectPos": 0,
"IsMelee": 0, "IsMelee": 0,
"act": "Skill_1", "act": "Skill_1",
@ -12523,7 +12523,7 @@
"key": "skill_skill_atk_Name_155003211", "key": "skill_skill_atk_Name_155003211",
"text": "海星之息" "text": "海星之息"
}, },
"ico": "jn_icon_055", "ico": "jn_55003_2",
"CorrectPos": 0, "CorrectPos": 0,
"IsMelee": 0, "IsMelee": 0,
"act": "Skill_2", "act": "Skill_2",
@ -12553,7 +12553,7 @@
"key": "skill_skill_atk_Name_155003311", "key": "skill_skill_atk_Name_155003311",
"text": "光·格尔之怒" "text": "光·格尔之怒"
}, },
"ico": "jn_icon_056", "ico": "jn_55003_3",
"CorrectPos": 0, "CorrectPos": 0,
"IsMelee": 0, "IsMelee": 0,
"act": "Skill_3", "act": "Skill_3",
@ -12582,7 +12582,7 @@
"key": "skill_skill_atk_Name_155001111", "key": "skill_skill_atk_Name_155001111",
"text": "炽烈吐息" "text": "炽烈吐息"
}, },
"ico": "jn_icon_054", "ico": "jn_55001_1",
"CorrectPos": 0, "CorrectPos": 0,
"IsMelee": 0, "IsMelee": 0,
"act": "Skill_1", "act": "Skill_1",
@ -12611,7 +12611,7 @@
"key": "skill_skill_atk_Name_155001211", "key": "skill_skill_atk_Name_155001211",
"text": "怒焰之衣" "text": "怒焰之衣"
}, },
"ico": "jn_icon_055", "ico": "jn_55001_2",
"CorrectPos": 0, "CorrectPos": 0,
"IsMelee": 0, "IsMelee": 0,
"act": "Skill_2", "act": "Skill_2",
@ -12641,7 +12641,7 @@
"key": "skill_skill_atk_Name_155001311", "key": "skill_skill_atk_Name_155001311",
"text": "绝境龙炎" "text": "绝境龙炎"
}, },
"ico": "jn_icon_056", "ico": "jn_55001_3",
"CorrectPos": 0, "CorrectPos": 0,
"IsMelee": 0, "IsMelee": 0,
"act": "Skill_3", "act": "Skill_3",
@ -12670,7 +12670,7 @@
"key": "skill_skill_atk_Name_155002111", "key": "skill_skill_atk_Name_155002111",
"text": "蕉果投掷" "text": "蕉果投掷"
}, },
"ico": "jn_icon_054", "ico": "jn_55002_1",
"CorrectPos": 0, "CorrectPos": 0,
"IsMelee": 0, "IsMelee": 0,
"act": "Skill_1", "act": "Skill_1",
@ -12699,7 +12699,7 @@
"key": "skill_skill_atk_Name_155002211", "key": "skill_skill_atk_Name_155002211",
"text": "嗜血" "text": "嗜血"
}, },
"ico": "jn_icon_055", "ico": "jn_55002_2",
"CorrectPos": 0, "CorrectPos": 0,
"IsMelee": 0, "IsMelee": 0,
"act": "Skill_2", "act": "Skill_2",
@ -12731,7 +12731,7 @@
"key": "skill_skill_atk_Name_155002311", "key": "skill_skill_atk_Name_155002311",
"text": "地裂天倾" "text": "地裂天倾"
}, },
"ico": "jn_icon_056", "ico": "jn_55002_3",
"CorrectPos": 0, "CorrectPos": 0,
"IsMelee": 0, "IsMelee": 0,
"act": "Skill_3", "act": "Skill_3",
@ -12760,7 +12760,7 @@
"key": "skill_skill_atk_Name_155005111", "key": "skill_skill_atk_Name_155005111",
"text": "火焰之拳" "text": "火焰之拳"
}, },
"ico": "jn_icon_054", "ico": "jn_55005_1",
"CorrectPos": 0, "CorrectPos": 0,
"IsMelee": 0, "IsMelee": 0,
"act": "Skill_1", "act": "Skill_1",
@ -12789,7 +12789,7 @@
"key": "skill_skill_atk_Name_155005211", "key": "skill_skill_atk_Name_155005211",
"text": "神之威慑" "text": "神之威慑"
}, },
"ico": "jn_icon_055", "ico": "jn_55005_2",
"CorrectPos": 0, "CorrectPos": 0,
"IsMelee": 0, "IsMelee": 0,
"act": "Skill_2", "act": "Skill_2",
@ -12820,7 +12820,7 @@
"key": "skill_skill_atk_Name_155005311", "key": "skill_skill_atk_Name_155005311",
"text": "诸神黄昏" "text": "诸神黄昏"
}, },
"ico": "jn_icon_056", "ico": "jn_55005_3",
"CorrectPos": 0, "CorrectPos": 0,
"IsMelee": 0, "IsMelee": 0,
"act": "Skill_3", "act": "Skill_3",
@ -12849,7 +12849,7 @@
"key": "skill_skill_atk_Name_155006111", "key": "skill_skill_atk_Name_155006111",
"text": "绿藤烟瘴" "text": "绿藤烟瘴"
}, },
"ico": "jn_icon_054", "ico": "jn_55006_1",
"CorrectPos": 0, "CorrectPos": 0,
"IsMelee": 0, "IsMelee": 0,
"act": "Skill_1", "act": "Skill_1",
@ -12878,7 +12878,7 @@
"key": "skill_skill_atk_Name_155006211", "key": "skill_skill_atk_Name_155006211",
"text": "毒物弥散" "text": "毒物弥散"
}, },
"ico": "jn_icon_055", "ico": "jn_55006_2",
"CorrectPos": 0, "CorrectPos": 0,
"IsMelee": 0, "IsMelee": 0,
"act": "", "act": "",
@ -12908,7 +12908,7 @@
"key": "skill_skill_atk_Name_155006311", "key": "skill_skill_atk_Name_155006311",
"text": "青棘之甲" "text": "青棘之甲"
}, },
"ico": "jn_icon_056", "ico": "jn_55006_3",
"CorrectPos": 0, "CorrectPos": 0,
"IsMelee": 0, "IsMelee": 0,
"act": "", "act": "",
@ -12939,7 +12939,7 @@
"key": "skill_skill_atk_Name_155006312", "key": "skill_skill_atk_Name_155006312",
"text": "毒物弥散" "text": "毒物弥散"
}, },
"ico": "jn_icon_056", "ico": "jn_55006_2",
"CorrectPos": 0, "CorrectPos": 0,
"IsMelee": 0, "IsMelee": 0,
"act": "Skill_2", "act": "Skill_2",
@ -12968,7 +12968,7 @@
"key": "skill_skill_atk_Name_155007111", "key": "skill_skill_atk_Name_155007111",
"text": "暴雪寒锥" "text": "暴雪寒锥"
}, },
"ico": "jn_icon_054", "ico": "jn_55007_1",
"CorrectPos": 0, "CorrectPos": 0,
"IsMelee": 0, "IsMelee": 0,
"act": "Skill_1", "act": "Skill_1",
@ -12998,7 +12998,7 @@
"key": "skill_skill_atk_Name_155007211", "key": "skill_skill_atk_Name_155007211",
"text": "永冻坚甲" "text": "永冻坚甲"
}, },
"ico": "jn_icon_055", "ico": "jn_55007_2",
"CorrectPos": 0, "CorrectPos": 0,
"IsMelee": 0, "IsMelee": 0,
"act": "Skill_2", "act": "Skill_2",
@ -13031,7 +13031,7 @@
"key": "skill_skill_atk_Name_155007311", "key": "skill_skill_atk_Name_155007311",
"text": "灭世神话" "text": "灭世神话"
}, },
"ico": "jn_icon_056", "ico": "jn_55007_3",
"CorrectPos": 0, "CorrectPos": 0,
"IsMelee": 0, "IsMelee": 0,
"act": "", "act": "",
@ -13063,7 +13063,7 @@
"key": "skill_skill_atk_Name_155007312", "key": "skill_skill_atk_Name_155007312",
"text": "灭世神话" "text": "灭世神话"
}, },
"ico": "jn_icon_056", "ico": "jn_55007_3",
"CorrectPos": 0, "CorrectPos": 0,
"IsMelee": 0, "IsMelee": 0,
"act": "Skill_3", "act": "Skill_3",
@ -14121,7 +14121,7 @@
"key": "skill_skill_atk_Name_123004111", "key": "skill_skill_atk_Name_123004111",
"text": "扳手打击" "text": "扳手打击"
}, },
"ico": "jn_icon_054", "ico": "jn_23004_1",
"CorrectPos": 0, "CorrectPos": 0,
"IsMelee": 1, "IsMelee": 1,
"act": "Skill_1", "act": "Skill_1",
@ -14152,7 +14152,7 @@
"key": "skill_skill_atk_Name_123004211", "key": "skill_skill_atk_Name_123004211",
"text": "回旋投掷" "text": "回旋投掷"
}, },
"ico": "jn_icon_055", "ico": "jn_23004_2",
"CorrectPos": 0, "CorrectPos": 0,
"IsMelee": 0, "IsMelee": 0,
"act": "Skill_2", "act": "Skill_2",
@ -14183,7 +14183,7 @@
"key": "skill_skill_atk_Name_123004311", "key": "skill_skill_atk_Name_123004311",
"text": "抵达：终点站" "text": "抵达：终点站"
}, },
"ico": "jn_icon_056", "ico": "jn_23004_3",
"CorrectPos": 0, "CorrectPos": 0,
"IsMelee": 0, "IsMelee": 0,
"act": "Skill_3", "act": "Skill_3",
@ -14508,7 +14508,7 @@
"key": "skill_skill_atk_Name_151010111", "key": "skill_skill_atk_Name_151010111",
"text": "挥斩" "text": "挥斩"
}, },
"ico": "jn_icon_054", "ico": "jn_51010_1",
"CorrectPos": 0, "CorrectPos": 0,
"IsMelee": 1, "IsMelee": 1,
"act": "Skill_1", "act": "Skill_1",
@ -14538,7 +14538,7 @@
"key": "skill_skill_atk_Name_151010211", "key": "skill_skill_atk_Name_151010211",
"text": "刀光剑影" "text": "刀光剑影"
}, },
"ico": "jn_icon_055", "ico": "jn_51010_2",
"CorrectPos": 0, "CorrectPos": 0,
"IsMelee": 1, "IsMelee": 1,
"act": "Skill_2", "act": "Skill_2",
@ -14567,7 +14567,7 @@
"key": "skill_skill_atk_Name_151011111", "key": "skill_skill_atk_Name_151011111",
"text": "横劈" "text": "横劈"
}, },
"ico": "jn_icon_054", "ico": "jn_51011_1",
"CorrectPos": 0, "CorrectPos": 0,
"IsMelee": 1, "IsMelee": 1,
"act": "Skill_1", "act": "Skill_1",
@ -14596,7 +14596,7 @@
"key": "skill_skill_atk_Name_151011211", "key": "skill_skill_atk_Name_151011211",
"text": "蓄力剑气" "text": "蓄力剑气"
}, },
"ico": "jn_icon_055", "ico": "jn_51011_2",
"CorrectPos": 0, "CorrectPos": 0,
"IsMelee": 0, "IsMelee": 0,
"act": "Skill_2", "act": "Skill_2",
@ -14745,7 +14745,7 @@
"key": "skill_skill_atk_Name_115003111", "key": "skill_skill_atk_Name_115003111",
"text": "魔法光束" "text": "魔法光束"
}, },
"ico": "jn_icon_054", "ico": "jn_15003_1",
"CorrectPos": 0, "CorrectPos": 0,
"IsMelee": 0, "IsMelee": 0,
"act": "Skill_1", "act": "Skill_1",
@ -14774,7 +14774,7 @@
"key": "skill_skill_atk_Name_115003211", "key": "skill_skill_atk_Name_115003211",
"text": "窃魂法阵" "text": "窃魂法阵"
}, },
"ico": "jn_icon_055", "ico": "jn_15003_2",
"CorrectPos": 0, "CorrectPos": 0,
"IsMelee": 0, "IsMelee": 0,
"act": "Skill_2", "act": "Skill_2",
@ -14803,7 +14803,7 @@
"key": "skill_skill_atk_Name_115003311", "key": "skill_skill_atk_Name_115003311",
"text": "使魔：阿奇" "text": "使魔：阿奇"
}, },
"ico": "jn_icon_056", "ico": "jn_15003_3",
"CorrectPos": 0, "CorrectPos": 0,
"IsMelee": 0, "IsMelee": 0,
"act": "Skill_3", "act": "Skill_3",
@ -15621,7 +15621,7 @@
"key": "skill_skill_atk_Name_134005111", "key": "skill_skill_atk_Name_134005111",
"text": "祸兆挥击" "text": "祸兆挥击"
}, },
"ico": "jn_icon_054", "ico": "jn_34005_1",
"CorrectPos": 0, "CorrectPos": 0,
"IsMelee": 0, "IsMelee": 0,
"act": "Skill_1", "act": "Skill_1",
@ -15652,7 +15652,7 @@
"key": "skill_skill_atk_Name_134005211", "key": "skill_skill_atk_Name_134005211",
"text": "禁忌咒术" "text": "禁忌咒术"
}, },
"ico": "jn_icon_055", "ico": "jn_34005_2",
"CorrectPos": 0, "CorrectPos": 0,
"IsMelee": 0, "IsMelee": 0,
"act": "Skill_2", "act": "Skill_2",
@ -15683,7 +15683,7 @@
"key": "skill_skill_atk_Name_134005311", "key": "skill_skill_atk_Name_134005311",
"text": "永暗契约" "text": "永暗契约"
}, },
"ico": "jn_icon_056", "ico": "jn_34005_3",
"CorrectPos": 0, "CorrectPos": 0,
"IsMelee": 0, "IsMelee": 0,
"act": "Skill_3", "act": "Skill_3",
@ -16184,7 +16184,7 @@
"key": "skill_skill_atk_Name_153002111", "key": "skill_skill_atk_Name_153002111",
"text": "凶残扑击" "text": "凶残扑击"
}, },
"ico": "jn_icon_054", "ico": "jn_53002_1",
"CorrectPos": 0, "CorrectPos": 0,
"IsMelee": 1, "IsMelee": 1,
"act": "Skill_1", "act": "Skill_1",
@ -16213,7 +16213,7 @@
"key": "skill_skill_atk_Name_153002211", "key": "skill_skill_atk_Name_153002211",
"text": "地裂重锤" "text": "地裂重锤"
}, },
"ico": "jn_icon_055", "ico": "jn_53002_2",
"CorrectPos": 0, "CorrectPos": 0,
"IsMelee": 1, "IsMelee": 1,
"act": "Skill_2", "act": "Skill_2",

6
bin/json/game_skillbuff.json
View File

@ -1667,7 +1667,7 @@
"OverlayTimes": 1, "OverlayTimes": 1,
"SameID": false, "SameID": false,
"golbalbufficon": "", "golbalbufficon": "",
"buffIcon": "ty_zd_buff_z011", "buffIcon": "jn_buff_bbjs",
"buffeffect": "", "buffeffect": "",
"buffpos": "根节点" "buffpos": "根节点"
}, },
@ -1697,7 +1697,7 @@
"OverlayTimes": 0, "OverlayTimes": 0,
"SameID": false, "SameID": false,
"golbalbufficon": "", "golbalbufficon": "",
"buffIcon": "", "buffIcon": "jn_buff_hkqz",
"buffeffect": "", "buffeffect": "",
"buffpos": "" "buffpos": ""
}, },
@ -3052,7 +3052,7 @@
"OverlayTimes": 99, "OverlayTimes": 99,
"SameID": false, "SameID": false,
"golbalbufficon": "", "golbalbufficon": "",
"buffIcon": "", "buffIcon": "jn_buff_bsbs",
"buffeffect": "", "buffeffect": "",
"buffpos": "" "buffpos": ""
}, },

29
modules/hunting/api_challenge.go
View File

@ -80,22 +80,19 @@ func (this *apiComp) Challenge(session comm.IUserSession, req *pb.HuntingChallen
"ps": hunting.Ps, "ps": hunting.Ps,
}) })
} }
// if errdata = this.module.CheckRes(session, cfgData.PsConsume); errdata != nil { if errdata = this.module.CheckRes(session, cfgData.PsConsume); errdata != nil {
// if req.AutoBuy { // 不够的时候看是否能自动购买 if req.AutoBuy { // 不够的时候看是否能自动购买
// var count int32 resSell := this.module.ModuleTools.GetGlobalConf().PsItem
// for _, v := range cfgData.PsConsume { if errdata = this.module.CheckRes(session, []*cfg.Gameatn{resSell}); errdata != nil {
// if v.N > 0 { return
// count += v.N }
// } m := make(map[string]int32, 0)
// } m[resSell.T] = resSell.N
// if errdata = this.module.ModuleItems.BuyUnifiedTicket(session, count); errdata != nil { this.module.ModuleItems.SellItem(session, m, true)
// return } else {
// } return
// } else { }
// code = pb.ErrorCode_VikingMaxChallengeCount }
// return
// }
// }
value, ok := hunting.Boss[req.BossType] value, ok := hunting.Boss[req.BossType]
if !ok { // 类型校验 if !ok { // 类型校验

1
modules/oldtimes/api_getall.go
View File

@ -48,7 +48,6 @@ func (this *apiComp) Getall(session comm.IUserSession, req *pb.OldtimesGetallReq
log.Field{Key: "uid", Value: uid}) log.Field{Key: "uid", Value: uid})
continue continue
} }
unlockLevelIds = append(unlockLevelIds, level.Lid)
} }
} }
} }

4
modules/smithy/api_forgeequip.go
View File

@ -236,6 +236,8 @@ func (this *apiComp) ForgeEquip(session comm.IUserSession, req *pb.SmithyForgeEq
rsp.Equip = append(rsp.Equip, eq) rsp.Equip = append(rsp.Equip, eq)
} }
} }
} else {
return
} }
} }
@ -245,6 +247,8 @@ func (this *apiComp) ForgeEquip(session comm.IUserSession, req *pb.SmithyForgeEq
rsp.Equip = append(rsp.Equip, eq) rsp.Equip = append(rsp.Equip, eq)
} }
} }
} else {
return
} }
} }

30
modules/viking/api_challenge.go
View File

@ -69,22 +69,20 @@ func (this *apiComp) Challenge(session comm.IUserSession, req *pb.VikingChalleng
}) })
} }
// if errdata = this.module.CheckRes(session, cfgData.PsConsume); errdata != nil { if errdata = this.module.CheckRes(session, cfgData.PsConsume); errdata != nil {
// if req.AutoBuy { // 不够的时候自动使用 if req.AutoBuy { // 不够的时候自动使用
// var count int32 resSell := this.module.ModuleTools.GetGlobalConf().PsItem
// for _, v := range cfgData.PsConsume { if errdata = this.module.CheckRes(session, []*cfg.Gameatn{resSell}); errdata != nil {
// if v.N > 0 { return
// count += v.N }
// } m := make(map[string]int32, 0)
// } m[resSell.T] = resSell.N
// if errdata = this.module.ModuleItems.BuyUnifiedTicket(session, count); errdata != nil { this.module.ModuleItems.SellItem(session, m, true)
// return
// } } else { // 体力不够
// } else { return
// code = pb.ErrorCode_VikingMaxChallengeCount }
// return }
// }
// }
if req.Difficulty == 1 && viking.Boss[req.BossId] == 0 { // 当前难度第一次打 if req.Difficulty == 1 && viking.Boss[req.BossId] == 0 { // 当前难度第一次打
viking.Boss[req.BossId] = 1 viking.Boss[req.BossId] = 1

2
sys/configure/structs/game.globalData.go
View File

@ -233,6 +233,7 @@ type GameGlobalData struct {
BuzkashiGoal int32 BuzkashiGoal int32
BuzkashiGoalspeed int32 BuzkashiGoalspeed int32
BuzkashiBumpdis float32 BuzkashiBumpdis float32
StaminaPotion int32
} }
const TypeId_GameGlobalData = 477542761 const TypeId_GameGlobalData = 477542761
@ -945,6 +946,7 @@ func (_v *GameGlobalData)Deserialize(_buf map[string]interface{}) (err error) {
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["buzkashi_goal"].(float64); !_ok_ { err = errors.New("buzkashi_goal error"); return }; _v.BuzkashiGoal = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["buzkashi_goal"].(float64); !_ok_ { err = errors.New("buzkashi_goal error"); return }; _v.BuzkashiGoal = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["buzkashi_goalspeed"].(float64); !_ok_ { err = errors.New("buzkashi_goalspeed error"); return }; _v.BuzkashiGoalspeed = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["buzkashi_goalspeed"].(float64); !_ok_ { err = errors.New("buzkashi_goalspeed error"); return }; _v.BuzkashiGoalspeed = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["buzkashi_bumpdis"].(float64); !_ok_ { err = errors.New("buzkashi_bumpdis error"); return }; _v.BuzkashiBumpdis = float32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["buzkashi_bumpdis"].(float64); !_ok_ { err = errors.New("buzkashi_bumpdis error"); return }; _v.BuzkashiBumpdis = float32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["stamina_potion"].(float64); !_ok_ { err = errors.New("stamina_potion error"); return }; _v.StaminaPotion = int32(_tempNum_) }
return return
} }