Skip to content

Commit 574b740

Browse files
committed
fix: Use scriptable object instead monobehaviour
1 parent 49652f6 commit 574b740

File tree

18 files changed

+79
-58
lines changed

18 files changed

+79
-58
lines changed

Assets/JCSUnity/Scenes/Utilities/JCS_ScriptTester.unity

Lines changed: 16 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -858,7 +858,6 @@ GameObject:
858858
m_Component:
859859
- component: {fileID: 1098634726}
860860
- component: {fileID: 1098634725}
861-
- component: {fileID: 1098634727}
862861
m_Layer: 0
863862
m_Name: JCS_ScriptTester
864863
m_TagString: Untagged
@@ -879,7 +878,8 @@ MonoBehaviour:
879878
m_Name:
880879
m_EditorClassIdentifier:
881880
mDialogueSystem: {fileID: 0}
882-
mTestDialogueScript: {fileID: 1098634727}
881+
mTestDialogueScript: {fileID: 11400000, guid: 286e9263d5694d648873eea1a9baa904,
882+
type: 2}
883883
DisposeKey: 113
884884
RunScriptKey: 119
885885
NextOrDispose: 110
@@ -899,22 +899,6 @@ Transform:
899899
m_Children: []
900900
m_Father: {fileID: 0}
901901
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
902-
--- !u!114 &1098634727
903-
MonoBehaviour:
904-
m_ObjectHideFlags: 0
905-
m_CorrespondingSourceObject: {fileID: 0}
906-
m_PrefabInstance: {fileID: 0}
907-
m_PrefabAsset: {fileID: 0}
908-
m_GameObject: {fileID: 1098634724}
909-
m_Enabled: 1
910-
m_EditorHideFlags: 0
911-
m_Script: {fileID: 11500000, guid: ab47c026913b03240ac5acab10521433, type: 3}
912-
m_Name:
913-
m_EditorClassIdentifier:
914-
Status: -1
915-
mCenterSprite: {fileID: 21300000, guid: 1eec70c4e6aa75046918d9708050e17f, type: 3}
916-
mLeftSprite: {fileID: 21300000, guid: fc3ece91e1c120e4687902d60d6458cd, type: 3}
917-
mRightSprite: {fileID: 21300000, guid: d42f6a0de5f4d154cb9d9682e42e0bf4, type: 3}
918902
--- !u!1 &1731246307
919903
GameObject:
920904
m_ObjectHideFlags: 0
@@ -947,11 +931,23 @@ MonoBehaviour:
947931
m_Script: {fileID: 11500000, guid: 2d3ead9775289064eaae6c9fb96c82b3, type: 3}
948932
m_Name:
949933
m_EditorClassIdentifier:
934+
mTest: 0
935+
mKeyShow: 97
936+
mKeyHide: 115
937+
mCanvas: {fileID: 0}
938+
mCanvasGroup: {fileID: 0}
939+
mFadeAlpa: 0
940+
mFading: 0
950941
mResizeUI: {fileID: 0}
951942
mDisplayOnAwake: 1
952943
mMainCanvas: 1
953-
mActiveSound: {fileID: 0}
954-
mDeactiveSound: {fileID: 0}
944+
mShowMethod: 1
945+
mFadeFriction: 0.15
946+
mFadeInAmount: 1
947+
mFadeOutAmount: 0
948+
mTimeType: 7
949+
mSoundOnShow: {fileID: 0}
950+
mSoundOnHide: {fileID: 0}
955951
--- !u!114 &1731246309
956952
MonoBehaviour:
957953
m_ObjectHideFlags: 0

Assets/JCSUnity/Scripts/Interfaces/JCS_DialogueScript.cs

Lines changed: 6 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -7,32 +7,23 @@
77
* Copyright (c) 2016 by Shen, Jen-Chieh $
88
*/
99
using UnityEngine;
10+
using MyBox;
1011

1112
namespace JCSUnity
1213
{
1314
/// <summary>
1415
/// Interface of the dialogue script.
1516
/// </summary>
16-
public abstract class JCS_DialogueScript : MonoBehaviour
17+
public abstract class JCS_DialogueScript : ScriptableObject
1718
{
1819
/* Variables */
1920

20-
[Tooltip("use to design the pages.")]
21-
public int Status = -1;
22-
23-
[Tooltip("Sprite visualize at the center.")]
24-
[SerializeField]
25-
private Sprite mCenterSprite = null;
26-
27-
[Tooltip("Sprite visualize at the left.")]
28-
[SerializeField]
29-
private Sprite mLeftSprite = null;
21+
protected JCS_DialogueSystem mDialogueSystem = null;
3022

31-
[Tooltip("Sprite visualize at the right.")]
32-
[SerializeField]
33-
private Sprite mRightSprite = null;
23+
[Separator("Runtime Variables (JCS_DialogueScript)")]
3424

35-
protected JCS_DialogueSystem mDialogueSystem = null;
25+
[Tooltip("use to design the pages.")]
26+
public int Status = -1;
3627

3728
/* Setter & Getter */
3829

@@ -48,18 +39,8 @@ public JCS_DialogueSystem DialogueSystem
4839
}
4940
protected JCS_DialogueSystem ds { get { return this.DialogueSystem; } }
5041

51-
public Sprite CenterSprite { get { return this.mCenterSprite; } }
52-
public Sprite LeftSprite { get { return this.mLeftSprite; } }
53-
public Sprite RightSprite { get { return this.mRightSprite; } }
54-
5542
/* Functions */
5643

57-
protected virtual void Start()
58-
{
59-
// get dialogue system. (singleton)
60-
mDialogueSystem = JCS_UtilManager.instance.GetDialogueSystem();
61-
}
62-
6344
/// <summary>
6445
/// Starting point of the dialogue.
6546
/// </summary>

Assets/JCSUnity/Scripts/Util/JCS_Util.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -563,7 +563,7 @@ public static bool HasChild(RectTransform trans)
563563
/// </returns>
564564
public static List<Transform> ForceDetachChildren(Transform trans)
565565
{
566-
List<Transform> childs = null;
566+
var childs = new List<Transform>();
567567

568568
while (HasChild(trans))
569569
{
@@ -576,7 +576,7 @@ public static List<Transform> ForceDetachChildren(Transform trans)
576576
}
577577
public static List<RectTransform> ForceDetachChildren(RectTransform trans)
578578
{
579-
List<RectTransform> childs = null;
579+
var childs = new List<RectTransform>();
580580

581581
while (HasChild(trans))
582582
{

Assets/_Project/Resources/Scripts.meta

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!114 &11400000
4+
MonoBehaviour:
5+
m_ObjectHideFlags: 0
6+
m_CorrespondingSourceObject: {fileID: 0}
7+
m_PrefabInstance: {fileID: 0}
8+
m_PrefabAsset: {fileID: 0}
9+
m_GameObject: {fileID: 0}
10+
m_Enabled: 1
11+
m_EditorHideFlags: 0
12+
m_Script: {fileID: 11500000, guid: ab47c026913b03240ac5acab10521433, type: 3}
13+
m_Name: npc2100
14+
m_EditorClassIdentifier:
15+
Status: -1
16+
mCenterSprite: {fileID: 21300000, guid: 799cc00ecb4e72a42a71fc2225d6215d, type: 3}
17+
mLeftSprite: {fileID: 21300000, guid: bcaae22f1dcf34e429817838cbb0dc5d, type: 3}
18+
mRightSprite: {fileID: 21300000, guid: 943da21c7b31b9941a2d28b9a869b6f2, type: 3}

Assets/_Project/Resources/Scripts/npc2100.asset.meta

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
File renamed without changes.

Assets/_Project/Resources/GameObjects/PauseAction.prefab renamed to Assets/_Project/Resources/System/PauseAction.prefab

File renamed without changes.

Assets/_Project/Resources/GameObjects/PauseAction.prefab.meta renamed to Assets/_Project/Resources/System/PauseAction.prefab.meta

File renamed without changes.

0 commit comments

Comments
 (0)