diff --git a/assets/EventConfig/Interacts.json b/assets/EventConfig/Interacts.json index 03b0f74..788713c 100644 --- a/assets/EventConfig/Interacts.json +++ b/assets/EventConfig/Interacts.json @@ -5,9 +5,9 @@ { "$type": "SwitchSection", "section_id": 2, - "transform": "Workshop_PlayerPos_FromStreet", "camera_x": 1, - "camera_y": 6000 + "camera_y": 6000, + "transform": "Workshop_PlayerPos_FromStreet" } ] }, @@ -17,9 +17,9 @@ { "$type": "SwitchSection", "section_id": 3, - "transform": "Garage_PlayerPos_FromStreet", "camera_x": 1, - "camera_y": 6000 + "camera_y": 6000, + "transform": "Garage_PlayerPos_FromStreet" } ] }, @@ -29,9 +29,9 @@ { "$type": "SwitchSection", "section_id": 1, - "transform": "Street_PlayerPos_FromWorkshop", "camera_x": 1, - "camera_y": 6000 + "camera_y": 6000, + "transform": "Street_PlayerPos_FromWorkshop" } ] }, @@ -40,10 +40,10 @@ "actions": [ { "$type": "SwitchSection", - "section_id": 1, - "transform": "Garage_PlayerPos_FromWorkshop", + "section_id": 3, "camera_x": 1, - "camera_y": 6000 + "camera_y": 6000, + "transform": "Garage_PlayerPos_FromWorkshop" } ] }, @@ -53,9 +53,9 @@ { "$type": "SwitchSection", "section_id": 1, - "transform": "Street_PlayerPos_FromGarage", "camera_x": 1, - "camera_y": 6000 + "camera_y": 6000, + "transform": "Street_PlayerPos_FromGarage" } ] }, @@ -64,10 +64,10 @@ "actions": [ { "$type": "SwitchSection", - "section_id": 1, - "transform": "Workshop_PlayerPos_FromGarage", + "section_id": 2, "camera_x": 1, - "camera_y": 6000 + "camera_y": 6000, + "transform": "Workshop_PlayerPos_FromGarage" } ] }, @@ -76,10 +76,10 @@ "actions": [ { "$type": "SwitchSection", - "section_id": 1, - "transform": "Garage_PlayerPos_FromStreet2", + "section_id": 3, "camera_x": 1, - "camera_y": 6000 + "camera_y": 6000, + "transform": "Garage_PlayerPos_FromStreet2" } ] }, @@ -89,9 +89,93 @@ { "$type": "SwitchSection", "section_id": 1, - "transform": "Street_PlayerPos_FromGarage2", "camera_x": 1, - "camera_y": 6000 + "camera_y": 6000, + "transform": "Street_PlayerPos_FromGarage2" + } + ] + }, + { + "event_id": 15001601, + "actions": [ + { + "$type": "SwitchSection", + "section_id": 153, + "camera_x": 1, + "camera_y": 6000, + "transform": "Subway_PlayerPos_FromStreet" + } + ] + }, + { + "event_id": 15001102, + "actions": [ + { + "$type": "SwitchSection", + "section_id": 1, + "camera_x": 1, + "camera_y": 6000, + "transform": "Street_PlayerPos_FromZero" + } + ] + }, + { + "event_id": 15001302, + "actions": [ + { + "$type": "SwitchSection", + "section_id": 101, + "camera_x": 1, + "camera_y": 6000, + "transform": "Square_PlayerPos_FromFortuneHIA" + } + ] + }, + { + "event_id": 15001303, + "actions": [ + { + "$type": "SwitchSection", + "section_id": 101, + "camera_x": 1, + "camera_y": 6000, + "transform": "Square_PlayerPos_FromFortuneHIA" + } + ] + }, + { + "event_id": 15001701, + "actions": [ + { + "$type": "SwitchSection", + "section_id": 153, + "camera_x": 1, + "camera_y": 6000, + "transform": "Subway_PlayerPos_FromFortuneSquare01" + } + ] + }, + { + "event_id": 15001702, + "actions": [ + { + "$type": "SwitchSection", + "section_id": 103, + "camera_x": 1, + "camera_y": 6000, + "transform": "HIA_PlayerPos_FromFortuneSquare01" + } + ] + }, + { + "event_id": 15001701, + "actions": [ + { + "$type": "SwitchSection", + "section_id": 153, + "camera_x": 1, + "camera_y": 6000, + "transform": "Subway_PlayerPos_FromFortuneSquare02" } ] } diff --git a/nap_gameserver/src/handlers/world.rs b/nap_gameserver/src/handlers/world.rs index 02f8ebf..12707c0 100644 --- a/nap_gameserver/src/handlers/world.rs +++ b/nap_gameserver/src/handlers/world.rs @@ -225,6 +225,8 @@ pub async fn on_interact_with_unit( ..Default::default() }) .await?; + } else { + tracing::warn!("no event graph for interaction: {}", req.interaction); } Ok(InteractWithUnitScRsp {