sync with upstreaom #2

Open
goatzone wants to merge 545 commits from liza/Questionable:master into master
Showing only changes of commit ab6e3a847f - Show all commits

View File

@ -38,7 +38,7 @@
"Sequence": 255,
"Steps": [
{
"DataId": 1049787,
"DataId": 1049793,
"Position": {
"X": 364.3396,
"Y": 60.125,
@ -46,14 +46,7 @@
},
"TerritoryId": 1186,
"InteractionType": "Interact",
"DialogueChoices": [
{
"Type": "YesNo",
"ExcelSheet": "quest/049/KinGra101_04960",
"Prompt": "TEXT_KINGRA101_04960_SYSTEM_100_030",
"Yes": true
}
],
"TargetTerritoryId": 1224,
"AethernetShortcut": [
"[Solution Nine] True Vue",
"[Solution Nine] The Arcadion"