Browse Source

Fixed memory leak warning.

master
chrisgregan 10 years ago
parent
commit
4e3e3f8669
  1. 10
      Assets/Fungus/Dialog/Commands/Say.cs
  2. 5
      Assets/Fungus/Dialog/Editor/CharacterEditor.cs
  3. BIN
      Assets/Fungus/Dialog/Prefabs/DefaultDialog.prefab
  4. 2
      Assets/Fungus/Dialog/Prefabs/DefaultDialog.prefab.meta
  5. BIN
      Assets/Fungus/Dialog/Prefabs/Dialog.prefab
  6. BIN
      Assets/Fungus/Dialog/Prefabs/EvilAstronaut.prefab
  7. 4
      Assets/Fungus/Dialog/Prefabs/EvilAstronaut.prefab.meta
  8. BIN
      Assets/Fungus/Dialog/Prefabs/GoodAstronaut.prefab
  9. 4
      Assets/Fungus/Dialog/Prefabs/GoodAstronaut.prefab.meta
  10. BIN
      Assets/Shuttle/NewDialog.unity
  11. BIN
      Assets/Shuttle/ShuttleGame.unity

10
Assets/Fungus/Dialog/Commands/Say.cs

@ -87,7 +87,15 @@ namespace Fungus.Script
public override string GetSummary() public override string GetSummary()
{ {
return "\"" + storyText + "\""; string summary = "";
if (character != null)
{
summary = character.characterName + ": ";
}
summary += "\"" + storyText + "\"";
return summary;
} }
public override void GetConnectedSequences (ref List<Sequence> connectedSequences) public override void GetConnectedSequences (ref List<Sequence> connectedSequences)

5
Assets/Fungus/Dialog/Editor/CharacterEditor.cs

@ -19,6 +19,11 @@ namespace Fungus.Script
} }
} }
void OnDisable()
{
DestroyImmediate(spriteMaterial);
}
public override void OnInspectorGUI() public override void OnInspectorGUI()
{ {
Character t = target as Character; Character t = target as Character;

BIN
Assets/Fungus/Dialog/Prefabs/DefaultDialog.prefab

Binary file not shown.

2
Assets/Fungus/Dialog/Prefabs/Dialog.prefab.meta → Assets/Fungus/Dialog/Prefabs/DefaultDialog.prefab.meta

@ -1,4 +1,4 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: c380eb5097e094010b380ed4e37cca24 guid: 82154cf743e6440cc8ccd1456ffb664f
NativeFormatImporter: NativeFormatImporter:
userData: userData:

BIN
Assets/Fungus/Dialog/Prefabs/Dialog.prefab

Binary file not shown.

BIN
Assets/Fungus/Dialog/Prefabs/EvilAstronaut.prefab

Binary file not shown.

4
Assets/Fungus/Dialog/Prefabs/EvilAstronaut.prefab.meta

@ -0,0 +1,4 @@
fileFormatVersion: 2
guid: 00ef2eb72c35f49e790cff63f0ce1804
NativeFormatImporter:
userData:

BIN
Assets/Fungus/Dialog/Prefabs/GoodAstronaut.prefab

Binary file not shown.

4
Assets/Fungus/Dialog/Prefabs/GoodAstronaut.prefab.meta

@ -0,0 +1,4 @@
fileFormatVersion: 2
guid: e2cd1078c3cb246d78223afcfb058231
NativeFormatImporter:
userData:

BIN
Assets/Shuttle/NewDialog.unity

Binary file not shown.

BIN
Assets/Shuttle/ShuttleGame.unity

Binary file not shown.
Loading…
Cancel
Save