Skip to content

Commit

Permalink
Merge pull request #818 from GG-Studio-990001/CH1_NPC위치버그
Browse files Browse the repository at this point in the history
Fix : Set Position After Equipping Translator Pack
  • Loading branch information
jeongopo authored Dec 15, 2024
2 parents be7c078 + 9f55411 commit 36bf929
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 2 deletions.
6 changes: 4 additions & 2 deletions Assets/Scenes/CH1.unity
Original file line number Diff line number Diff line change
Expand Up @@ -55764,7 +55764,7 @@ Camera:
far clip plane: 1000
field of view: 70
orthographic: 0
orthographic size: 11.25
orthographic size: 5
m_Depth: -1
m_CullingMask:
serializedVersion: 2
Expand All @@ -55789,7 +55789,7 @@ Transform:
m_GameObject: {fileID: 1674432335}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -3.925093, y: -0.4651599, z: -10}
m_LocalPosition: {x: -4.32, y: -5.56, z: -10}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
Expand Down Expand Up @@ -63034,6 +63034,7 @@ MonoBehaviour:
- {x: 58.97, y: -13.46, z: 0}
- {x: 65.27, y: -14.8, z: 0}
- {x: 105.05, y: -14.34, z: 0}
- {x: 105.05, y: -14.34, z: 0}
- Locations:
- {x: -4.7500005, y: -7.22, z: 0}
- {x: 5.06, y: -7.22, z: 0}
Expand All @@ -63045,6 +63046,7 @@ MonoBehaviour:
- {x: 60.89, y: -14.42, z: 0}
- {x: 62.94, y: -15.6, z: 0}
- {x: 72.74, y: -17.4, z: 0}
- {x: 72.74, y: -17.4, z: 0}
- Locations:
- {x: -2.67, y: -6.63, z: 0}
- {x: 7.14, y: -6.63, z: 0}
Expand Down
3 changes: 3 additions & 0 deletions Assets/Scripts/Runtime/CH1/Main/Dialogue/CutSceneDialogue.cs
Original file line number Diff line number Diff line change
Expand Up @@ -279,6 +279,9 @@ public void SetNpcPosition(int i)
// 씬4에서 맵3 처음 같이 갔을 때
NpcPos.SetNpcPosition(8);
break;
default:
NpcPos.SetNpcPosition(i);
break;
}
}

Expand Down
1 change: 1 addition & 0 deletions Assets/_CH1/Dialogues/Pack.yarn
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ title: EquipTranslator
<<NewSceneStart>>
: 이상한 기분이 든다.
<<ReverseConnection>>
<<SetNpcPosition 10>>
<<wait 1>>
<<SceneEnd>>
===

0 comments on commit 36bf929

Please sign in to comment.