KenSchae
/
fungus
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Removed Fungus from prefab names 

Not really needed, it’s unlikely other code in the project would have
conflicting assets with the same name under a Resources folder.
master
chrisgregan 10 years ago
parent
810131fa9d
commit
4cc2bb454a
13 changed files with 228 additions and 505 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 16
      Assets/Fungus/Dialog/Resources/AudioTag.prefab
  2. 3
      Assets/Fungus/Dialog/Resources/Character.prefab
  3. 3
      Assets/Fungus/Dialog/Resources/EventSystem.prefab
  4. 7
      Assets/Fungus/Dialog/Resources/MenuDialog.prefab
  5. 2
      Assets/Fungus/Dialog/Resources/SayDialog.prefab
  6. 3
      Assets/Fungus/Dialog/Resources/Tag.prefab
  7. 8
      Assets/Fungus/Dialog/Scripts/Commands/Menu.cs
  8. 12
      Assets/Fungus/Dialog/Scripts/MenuDialog.cs
  9. 12
      Assets/Fungus/Dialog/Scripts/SayDialog.cs
  10. 2
      Assets/Fungus/Portrait/Resources/Stage.prefab
  11. 2
      Assets/Fungus/Portrait/Resources/StagePosition.prefab
  12. 51
      Assets/FungusExamples/Sherlock/TheExperiment.unity
  13. 612
      Assets/FungusExamples/TheHunter/TheHunter.unity

16
Assets/Fungus/Dialog/Resources/AudioTag.prefab
Unescape View File

@ -11,7 +11,7 @@ GameObject:
- 114: {fileID: 11477196}
- 82: {fileID: 8249370}
m_Layer: 0
m_Name: FungusAudioTag
m_Name: AudioTag
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@ -36,7 +36,8 @@ AudioSource:
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 177196}
m_Enabled: 1
serializedVersion: 3
serializedVersion: 4
OutputAudioMixerGroup: {fileID: 0}
m_audioClip: {fileID: 0}
m_PlayOnAwake: 0
m_Volume: 1
@ -87,6 +88,16 @@ AudioSource:
tangentMode: 0
m_PreInfinity: 2
m_PostInfinity: 2
reverbZoneMixCustomCurve:
serializedVersion: 2
m_Curve:
- time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
m_PreInfinity: 2
m_PostInfinity: 2
--- !u!114 &11477196
MonoBehaviour:
m_ObjectHideFlags: 1
@ -113,4 +124,3 @@ Prefab:
m_ParentPrefab: {fileID: 0}
m_RootGameObject: {fileID: 177196}
m_IsPrefabParent: 1
m_IsExploded: 1

3
Assets/Fungus/Dialog/Resources/Character.prefab
Unescape View File

@ -10,7 +10,7 @@ GameObject:
- 4: {fileID: 400000}
- 114: {fileID: 11400000}
m_Layer: 0
m_Name: FungusCharacter
m_Name: Character
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@ -57,4 +57,3 @@ Prefab:
m_ParentPrefab: {fileID: 0}
m_RootGameObject: {fileID: 100000}
m_IsPrefabParent: 1
m_IsExploded: 1

3
Assets/Fungus/Dialog/Resources/EventSystem.prefab
Unescape View File

@ -12,7 +12,7 @@ GameObject:
- 114: {fileID: 11479526}
- 114: {fileID: 11479528}
m_Layer: 0
m_Name: FungusEventSystem
m_Name: EventSystem
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@ -84,4 +84,3 @@ Prefab:
m_ParentPrefab: {fileID: 0}
m_RootGameObject: {fileID: 179528}
m_IsPrefabParent: 1
m_IsExploded: 1

7
Assets/Fungus/Dialog/Resources/MenuDialog.prefab
Unescape View File

@ -33,7 +33,7 @@ GameObject:
- 114: {fileID: 11415064}
- 114: {fileID: 11415124}
m_Layer: 5
m_Name: FungusMenuDialog
m_Name: MenuDialog
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@ -366,8 +366,8 @@ MonoBehaviour:
m_Script: {fileID: 1301386320, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
m_Name:
m_EditorClassIdentifier:
ignoreReversedGraphics: 1
blockingObjects: 0
m_IgnoreReversedGraphics: 1
m_BlockingObjects: 0
m_BlockingMask:
serializedVersion: 2
m_Bits: 4294967295
@ -1563,4 +1563,3 @@ Prefab:
m_ParentPrefab: {fileID: 0}
m_RootGameObject: {fileID: 115102}
m_IsPrefabParent: 1
m_IsExploded: 1

2
Assets/Fungus/Dialog/Resources/SayDialog.prefab
Unescape View File

@ -122,7 +122,7 @@ GameObject:
- 225: {fileID: 22588896}
- 114: {fileID: 11488894}
m_Layer: 5
m_Name: FungusSayDialog
m_Name: SayDialog
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0

3
Assets/Fungus/Dialog/Resources/Tag.prefab
Unescape View File

@ -10,7 +10,7 @@ GameObject:
- 4: {fileID: 477196}
- 114: {fileID: 11477196}
m_Layer: 0
m_Name: FungusTag
m_Name: Tag
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@ -54,4 +54,3 @@ Prefab:
m_ParentPrefab: {fileID: 0}
m_RootGameObject: {fileID: 177196}
m_IsPrefabParent: 1
m_IsExploded: 1

8
Assets/Fungus/Dialog/Scripts/Commands/Menu.cs
Unescape View File

@ -66,11 +66,11 @@ namespace Fungus
if (eventSystem == null)
{
// Auto spawn an Event System from the prefab
GameObject go = Resources.Load<GameObject>("FungusEventSystem");
if (go != null)
GameObject prefab = Resources.Load<GameObject>("EventSystem");
if (prefab != null)
{
GameObject spawnedGO = Instantiate(go) as GameObject;
spawnedGO.name = "EventSystem";
GameObject go = Instantiate(prefab) as GameObject;
go.name = "EventSystem";
}
}

12
Assets/Fungus/Dialog/Scripts/MenuDialog.cs
Unescape View File

@ -30,13 +30,13 @@ namespace Fungus
if (activeMenuDialog == null)
{
// Auto spawn a menu dialog object from the prefab
GameObject go = Resources.Load<GameObject>("FungusMenuDialog");
if (go != null)
GameObject prefab = Resources.Load<GameObject>("MenuDialog");
if (prefab != null)
{
GameObject spawnedGO = Instantiate(go) as GameObject;
spawnedGO.name = "DialogMenu";
spawnedGO.SetActive(false);
activeMenuDialog = spawnedGO.GetComponent<MenuDialog>();
GameObject go = Instantiate(prefab) as GameObject;
go.SetActive(false);
go.name = "MenuDialog";
activeMenuDialog = go.GetComponent<MenuDialog>();
}
}
}

12
Assets/Fungus/Dialog/Scripts/SayDialog.cs
Unescape View File

@ -29,13 +29,13 @@ namespace Fungus
if (activeSayDialog == null)
{
// Auto spawn a say dialog object from the prefab
GameObject go = Resources.Load<GameObject>("FungusSayDialog");
if (go != null)
GameObject prefab = Resources.Load<GameObject>("SayDialog");
if (prefab != null)
{
GameObject spawnedGO = Instantiate(go) as GameObject;
spawnedGO.name = "SayDialog";
spawnedGO.SetActive(false);
activeSayDialog = spawnedGO.GetComponent<SayDialog>();
GameObject go = Instantiate(prefab) as GameObject;
go.SetActive(false);
go.name = "SayDialog";
activeSayDialog = go.GetComponent<SayDialog>();
}
}
}

2
Assets/Fungus/Portrait/Resources/Stage.prefab
Unescape View File

@ -44,7 +44,7 @@ GameObject:
- 4: {fileID: 410270}
- 114: {fileID: 11410274}
m_Layer: 0
m_Name: FungusStage
m_Name: Stage
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0

2
Assets/Fungus/Portrait/Resources/StagePosition.prefab
Unescape View File

@ -11,7 +11,7 @@ GameObject:
- 222: {fileID: 22295640}
- 114: {fileID: 11495640}
m_Layer: 0
m_Name: FungusStagePosition
m_Name: StagePosition
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0

51
Assets/FungusExamples/Sherlock/TheExperiment.unity
Unescape View File

@ -3161,6 +3161,7 @@ GameObject:
- 114: {fileID: 1390555394}
- 114: {fileID: 1390555388}
- 114: {fileID: 1390555387}
- 114: {fileID: 1390555396}
- 114: {fileID: 1390555358}
m_Layer: 0
m_Name: FungusScript
@ -3245,7 +3246,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 7a334fe2ffb574b3583ff3b18b4792d3, type: 3}
m_Name:
m_EditorClassIdentifier:
scrollPos: {x: 2885.33252, y: 1204.83801}
scrollPos: {x: 2878.33252, y: 1016.83801}
variablesScrollPos: {x: 0, y: 0}
variablesExpanded: 1
sequenceViewHeight: 411
@ -3256,16 +3257,17 @@ MonoBehaviour:
y: -1729.35046
width: 5969.4458
height: 2818.85034
selectedSequence: {fileID: 1390555307}
selectedCommands: []
variables:
selectedSequence: {fileID: 1390555371}
selectedCommands:
- {fileID: 1390555358}
variables:
- {fileID: 1390555396}
description: 'Example scene from Sherlock: The Game Is On'
runSlowDuration: 0
colorCommands: 1
hideComponents: 1
saveSelection: 1
nextCommandId: 92
nextCommandId: 93
--- !u!4 &1390555296
Transform:
m_ObjectHideFlags: 0
@ -4905,18 +4907,32 @@ MonoBehaviour:
waitUntilFinished: 0
--- !u!114 &1390555358
MonoBehaviour:
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1390555290}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5d02d9822eec54c98afe95bb497211b3, type: 3}
m_Script: {fileID: 11500000, guid: fb77d0ce495044f6e9feb91b31798e8c, type: 3}
m_Name:
m_EditorClassIdentifier:
scope: 0
key: Courage
value: 0
commandId: 92
errorMessage:
indentLevel: 0
variable: {fileID: 1390555396}
setOperator: 2
booleanData:
booleanRef: {fileID: 0}
booleanVal: 0
integerData:
integerRef: {fileID: 0}
integerVal: 1
floatData:
floatRef: {fileID: 0}
floatVal: 0
stringData:
stringRef: {fileID: 0}
stringVal:
--- !u!114 &1390555359
MonoBehaviour:
m_ObjectHideFlags: 2
@ -5207,6 +5223,7 @@ MonoBehaviour:
eventHandler: {fileID: 0}
commandList:
- {fileID: 1390555370}
- {fileID: 1390555358}
- {fileID: 1390555369}
- {fileID: 1390555367}
- {fileID: 1390555344}
@ -5808,6 +5825,20 @@ MonoBehaviour:
indentLevel: 0
spriteRenderer: {fileID: 1612042692}
visible: 0
--- !u!114 &1390555396
MonoBehaviour:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1390555290}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: afb91b566ceda411bad1e9d3c3243ecc, type: 3}
m_Name:
m_EditorClassIdentifier:
scope: 0
key: CouragePoints
value: 0
--- !u!114 &1390555440
MonoBehaviour:
m_ObjectHideFlags: 2

612
Assets/FungusExamples/TheHunter/TheHunter.unity
View File

File diff suppressed because it is too large Load Diff
Write Preview
Loading…
Cancel
Save