Merge branch 'feature/json' into dev
This commit is contained in:
commit
6efe04ed6d
@ -2884,9 +2884,7 @@
|
|||||||
"type": 3,
|
"type": 3,
|
||||||
"sort": 3,
|
"sort": 3,
|
||||||
"colour": 6,
|
"colour": 6,
|
||||||
"way": [
|
"way": [],
|
||||||
75
|
|
||||||
],
|
|
||||||
"go": "",
|
"go": "",
|
||||||
"icon": "icon_gbsp_5002",
|
"icon": "icon_gbsp_5002",
|
||||||
"describe": "intr_item_describe_5002",
|
"describe": "intr_item_describe_5002",
|
||||||
@ -2927,9 +2925,7 @@
|
|||||||
"type": 3,
|
"type": 3,
|
||||||
"sort": 3,
|
"sort": 3,
|
||||||
"colour": 6,
|
"colour": 6,
|
||||||
"way": [
|
"way": [],
|
||||||
75
|
|
||||||
],
|
|
||||||
"go": "",
|
"go": "",
|
||||||
"icon": "icon_gbsp_5004",
|
"icon": "icon_gbsp_5004",
|
||||||
"describe": "intr_item_describe_5004",
|
"describe": "intr_item_describe_5004",
|
||||||
|
3000
src/json/npc.json
3000
src/json/npc.json
File diff suppressed because it is too large
Load Diff
@ -11,7 +11,7 @@
|
|||||||
"guanqialibao_2"
|
"guanqialibao_2"
|
||||||
],
|
],
|
||||||
"time": 3600,
|
"time": 3600,
|
||||||
"displayCD": 10800,
|
"displayCD": 3600,
|
||||||
"scale": 3000,
|
"scale": 3000,
|
||||||
"icon": "gkts"
|
"icon": "gkts"
|
||||||
},
|
},
|
||||||
|
Loading…
Reference in New Issue
Block a user