Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Once More, With Feeling #18

Draft
wants to merge 10 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions Assembly-CSharp-Editor.csproj.DotSettings
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=assets_005Cdialoguesystem_005Ceditor/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=assets_005Cdialoguesystem_005Cscripts/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=assets_005Cdialoguesystem_005Cscripts_005Cassetcreators_005Ceditor/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=assets_005Cdialoguesystem_005Cscripts_005Ccharacters_005Ceditor/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=assets_005Cdialoguesystem_005Cscripts_005Cdeleteme_005Ceditor/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=assets_005Cdialoguesystem_005Cscripts_005Cdialogues_005Cnodes_005Ceditor/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=assets_005Cdialoguesystem_005Cscripts_005Ceditor/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
38 changes: 7 additions & 31 deletions Assets/DialogueSystem/Demo/SampleScene.unity
Original file line number Diff line number Diff line change
Expand Up @@ -38,13 +38,13 @@ RenderSettings:
m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 705507994}
m_IndirectSpecularColor: {r: 0.44657874, g: 0.49641258, b: 0.574817, a: 1}
m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1}
m_UseRadianceAmbientProbe: 0
--- !u!157 &3
LightmapSettings:
m_ObjectHideFlags: 0
serializedVersion: 11
m_GIWorkflowMode: 0
m_GIWorkflowMode: 1
m_GISettings:
serializedVersion: 2
m_BounceScale: 1
Expand Down Expand Up @@ -294,20 +294,7 @@ MonoBehaviour:
m_TargetGraphic: {fileID: 922203892}
m_OnClick:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 8786771133028197972}
m_MethodName: PlayDialogue
m_Mode: 2
m_Arguments:
m_ObjectArgument: {fileID: 11400000, guid: dd801a633ca8cda42b8ae8d25e17e64a,
type: 2}
m_ObjectArgumentAssemblyTypeName: lastmilegames.DialogueSystem.DialogueContainer,
Assembly-CSharp
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
m_Calls: []
--- !u!114 &922203892
MonoBehaviour:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -741,7 +728,7 @@ PrefabInstance:
- target: {fileID: 8786771132893712695, guid: 4d8914cb6b33dc34e86ba2b8caea414c,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0.000018605962
value: -0.00007994529
objectReference: {fileID: 0}
- target: {fileID: 8786771132936344443, guid: 4d8914cb6b33dc34e86ba2b8caea414c,
type: 3}
Expand All @@ -751,7 +738,7 @@ PrefabInstance:
- target: {fileID: 8786771132936344443, guid: 4d8914cb6b33dc34e86ba2b8caea414c,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -0.00009074141
value: -0.000049769158
objectReference: {fileID: 0}
- target: {fileID: 8786771132947378257, guid: 4d8914cb6b33dc34e86ba2b8caea414c,
type: 3}
Expand Down Expand Up @@ -1023,17 +1010,6 @@ PrefabInstance:
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedComponents:
- {fileID: 7560019262726077265, guid: 4d8914cb6b33dc34e86ba2b8caea414c, type: 3}
m_SourcePrefab: {fileID: 100100000, guid: 4d8914cb6b33dc34e86ba2b8caea414c, type: 3}
--- !u!114 &8786771133028197972 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 7560019262726077265, guid: 4d8914cb6b33dc34e86ba2b8caea414c,
type: 3}
m_PrefabInstance: {fileID: 8786771133028197971}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 661418d3488d423caf0369b884804cd9, type: 3}
m_Name:
m_EditorClassIdentifier:

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions Assets/DialogueSystem/Images/GameIcons/Attributions.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
"Hazard sign icon" (hazard-sign.png) by (Lorc)[https://lorcblog.blogspot.com/] under CC BY 3.0
7 changes: 7 additions & 0 deletions Assets/DialogueSystem/Images/GameIcons/Attributions.md.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
116 changes: 116 additions & 0 deletions Assets/DialogueSystem/Images/GameIcons/hazard-sign.png.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions Assets/DialogueSystem/Scripts/Characters.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

57 changes: 57 additions & 0 deletions Assets/DialogueSystem/Scripts/Characters/Character.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
using System.Collections.Generic;
using UnityEditor;
using UnityEngine;

namespace lastmilegames.DialogueSystem.Characters
{
[CreateAssetMenu(fileName = "New Character", menuName = "Dialogue System/New Character", order = 0)]
public class Character : ScriptableObject
{
[SerializeField] private List<CharacterSprite> characterSprites = new List<CharacterSprite>();

public IEnumerable<CharacterSprite> GetCharacterSprites()
{
return characterSprites;
}

public void AddSprite(CharacterSprite cSprite)
{
characterSprites.Add(cSprite);
AssetDatabase.AddObjectToAsset(cSprite, this);
AssetDatabase.SaveAssets();
AssetDatabase.Refresh();
}

public void RemoveSprite(CharacterSprite cSprite)
{
AssetDatabase.RemoveObjectFromAsset(cSprite);
characterSprites.Remove(cSprite);
AssetDatabase.SaveAssets();
AssetDatabase.Refresh();
}

public void RemoveAllSprites()
{
for (int i = characterSprites.Count - 1; i >= 0; i--)
{
AssetDatabase.RemoveObjectFromAsset(characterSprites[i]);
characterSprites.RemoveAt(i);
}

AssetDatabase.SaveAssets();
AssetDatabase.Refresh();
}

public void RenameSubAsset(CharacterSprite cSprite)
{
// Remove the old object
AssetDatabase.RemoveObjectFromAsset(cSprite);
AssetDatabase.SaveAssets();

// Add the new object
AssetDatabase.AddObjectToAsset(cSprite, this);
AssetDatabase.SaveAssets();
AssetDatabase.Refresh();
}
}
}
3 changes: 3 additions & 0 deletions Assets/DialogueSystem/Scripts/Characters/Character.cs.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 9 additions & 0 deletions Assets/DialogueSystem/Scripts/Characters/CharacterSprite.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
using UnityEngine;

namespace lastmilegames.DialogueSystem.Characters
{
public class CharacterSprite : ScriptableObject
{
public Sprite sprite;
}
}

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions Assets/DialogueSystem/Scripts/Characters/Editor.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading