Skip to content

Commit

Permalink
Added to game scene
Browse files Browse the repository at this point in the history
  • Loading branch information
robbobby committed Feb 25, 2021
1 parent 7419847 commit 9cb1a9f
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
1 change: 1 addition & 0 deletions Emerald/Assets/Scenes/GameScene.unity
Original file line number Diff line number Diff line change
Expand Up @@ -29452,6 +29452,7 @@ MonoBehaviour:
Slaying: 0
NPCID: 0
NPCName:
shopController: {fileID: 1198000936}
NextHitTime: 0
--- !u!1 &559140116
GameObject:
Expand Down
2 changes: 1 addition & 1 deletion Emerald/Assets/Scripts/GameSceneManager.cs
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ protected static UserObject User

public uint NPCID;
public string NPCName;
public ShopController shopController;

private MapObject targetObject;
public MapObject TargetObject
Expand Down Expand Up @@ -672,5 +673,4 @@ public void NPCTextButton(string LinkId)
Network.Enqueue(new C.CallNPC { ObjectID = NPCID, Key = "[" + LinkId + "]" });
GameManager.InputDelay = Time.time + 0.5f;
}

}

0 comments on commit 9cb1a9f

Please sign in to comment.