Browse Source

Fixed Playmaker compatibility issue

The Photon Networking add on for PlayMaker defines a class called
‘Room’ in the global namespace which conflicts with Fungus.Room. To fix
this, I’ve moved all Room derived example classes into the Fungus
namespace.
master
chrisgregan 11 years ago
parent
commit
927df59210
  1. 7
      Assets/Fungus/Scripts/RoomTemplate.cs
  2. 4
      Assets/FungusExample/Scripts/AudioRoom.cs
  3. 6
      Assets/FungusExample/Scripts/ButtonRoom.cs
  4. 4
      Assets/FungusExample/Scripts/MenuRoom.cs
  5. 4
      Assets/FungusExample/Scripts/PageRoom.cs
  6. 4
      Assets/FungusExample/Scripts/ParallaxRoom.cs
  7. 4
      Assets/FungusExample/Scripts/SpriteRoom.cs
  8. 4
      Assets/FungusExample/Scripts/ViewRoom.cs

7
Assets/Fungus/Scripts/RoomTemplate.cs

@ -1,7 +1,11 @@
using UnityEngine;
using System.Collections;
using Fungus;
/**
* We recommend placing your room code in the Fungus namespace to avoid class name conflicts with other Unity libraries.
*/
namespace Fungus
{
/**
* This class is a template to use as a starting point for your own Room scripts.
* 1. Select this script in the Project window in Unity3D
@ -32,3 +36,4 @@ public class RoomTemplate : Room
// See FungusExample/Scripts for examples
}
}
}

4
Assets/FungusExample/Scripts/AudioRoom.cs

@ -1,7 +1,8 @@
using UnityEngine;
using System.Collections;
using Fungus;
namespace Fungus.Example
{
public class AudioRoom : Room
{
public Room menuRoom;
@ -70,3 +71,4 @@ public class AudioRoom : Room
MoveToRoom(menuRoom);
}
}
}

6
Assets/FungusExample/Scripts/ButtonRoom.cs

@ -1,10 +1,11 @@
using UnityEngine;
using System.Collections;
using Fungus;
namespace Fungus.Example
{
public class ButtonRoom : Room
{
public Room menuRoom;
public Fungus.Room menuRoom;
public AudioClip effectClip;
@ -53,3 +54,4 @@ public class ButtonRoom : Room
Say("Sadly we will never know for sure.");
}
}
}

4
Assets/FungusExample/Scripts/MenuRoom.cs

@ -1,7 +1,8 @@
using UnityEngine;
using System.Collections;
using Fungus;
namespace Fungus.Example
{
public class MenuRoom : Room
{
public Room pageRoom;
@ -54,3 +55,4 @@ public class MenuRoom : Room
MoveToRoom(audioRoom);
}
}
}

4
Assets/FungusExample/Scripts/PageRoom.cs

@ -1,7 +1,8 @@
using UnityEngine;
using System.Collections;
using Fungus;
namespace Fungus.Example
{
public class PageRoom : Room
{
// This is a reference to the menu room so we can transition back to the menu using MoveToRoom()
@ -87,3 +88,4 @@ public class PageRoom : Room
Choose("What will I do now?");
}
}
}

4
Assets/FungusExample/Scripts/ParallaxRoom.cs

@ -1,7 +1,8 @@
using UnityEngine;
using System.Collections;
using Fungus;
namespace Fungus.Example
{
// The parallax effect is achieved by attaching a Parallax script to each sprite that requires a
// parallax offset. The offset is then applied automatically whenever the camera moves around the active Room.
// There is a handy parallax sprite prefab in Fungus/Prefabs/ParallaxSprite.prefab
@ -36,3 +37,4 @@ public class ParallaxRoom : Room
MoveToRoom(menuRoom);
}
}
}

4
Assets/FungusExample/Scripts/SpriteRoom.cs

@ -1,7 +1,8 @@
using UnityEngine;
using System.Collections;
using Fungus;
namespace Fungus.Example
{
public class SpriteRoom : Room
{
public Room menuRoom;
@ -59,3 +60,4 @@ public class SpriteRoom : Room
MoveToRoom(menuRoom);
}
}
}

4
Assets/FungusExample/Scripts/ViewRoom.cs

@ -1,7 +1,8 @@
using UnityEngine;
using System.Collections;
using Fungus;
namespace Fungus.Example
{
public class ViewRoom : Room
{
public Room menuRoom;
@ -51,3 +52,4 @@ public class ViewRoom : Room
Call(OnEnter);
}
}
}
Loading…
Cancel
Save